|
@@ -235,22 +235,32 @@ export default {
|
|
|
}
|
|
|
let contentArr = this.from.content.split("\n");
|
|
|
for (let i = 0; i < contentArr.length; i++) {
|
|
|
- if(contentArr[i].length==1){
|
|
|
- if(/^[\u4e00-\u9fa5]/.test(contentArr[i])){
|
|
|
- let obj = {
|
|
|
- con: contentArr[i],
|
|
|
- };
|
|
|
- data.option.push(obj);
|
|
|
- }
|
|
|
- }else{
|
|
|
- for(let m=0;m<contentArr[i].length;m++){
|
|
|
- if(/^[\u4e00-\u9fa5]/.test(contentArr[i][m])){
|
|
|
+ if(data.typeIndex == 0){
|
|
|
+ if(contentArr[i].length==1){
|
|
|
+ if(/^[\u4e00-\u9fa5]/.test(contentArr[i])){
|
|
|
let obj = {
|
|
|
- con: contentArr[i][m],
|
|
|
+ con: contentArr[i],
|
|
|
};
|
|
|
data.option.push(obj);
|
|
|
}
|
|
|
+ }else{
|
|
|
+ for(let m=0;m<contentArr[i].length;m++){
|
|
|
+ if(/^[\u4e00-\u9fa5]/.test(contentArr[i][m])){
|
|
|
+ let obj = {
|
|
|
+ con: contentArr[i][m],
|
|
|
+ };
|
|
|
+ data.option.push(obj);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }else{
|
|
|
+ let contentItem = ""
|
|
|
+ for(let s=0;s<contentArr[i].length;s++){
|
|
|
+ if(/^[\u4e00-\u9fa5]/.test(contentArr[i][s])){
|
|
|
+ contentItem += contentArr[i][s]
|
|
|
+ }
|
|
|
}
|
|
|
+ if(contentItem) data.option.push(contentItem);
|
|
|
}
|
|
|
}
|
|
|
// 字模式 笔顺打开
|
|
@@ -285,11 +295,14 @@ export default {
|
|
|
if (!this.loading) {
|
|
|
data.option.forEach((item) => {
|
|
|
let arr = [];
|
|
|
+ let hzLength = 1;
|
|
|
+ let arrOption = []
|
|
|
// 拆分字和笔画为每一项
|
|
|
arr.push({
|
|
|
con: item.con,
|
|
|
});
|
|
|
if(item.hzDetail&&item.hzDetail.hz_json&&item.hzDetail.hz_json.medians){
|
|
|
+ hzLength += item.hzDetail.hz_json.medians.length
|
|
|
item.hzDetail.hz_json.medians.forEach((items, indexs) => {
|
|
|
arr.push({
|
|
|
con: item.con,
|
|
@@ -459,20 +472,68 @@ export default {
|
|
|
// 处理句模式数据
|
|
|
let allArr = [];
|
|
|
data.option.forEach((item) => {
|
|
|
- let spltArr = item.con.split("");
|
|
|
- let arr = [];
|
|
|
- spltArr.forEach((item) => {
|
|
|
- arr.push({ con: item });
|
|
|
- });
|
|
|
- // 如果不满一行则补满
|
|
|
- if (arr.length % data.rowNumber != 0) {
|
|
|
- let num = data.rowNumber - (arr.length % data.rowNumber);
|
|
|
- for (let i = 0; i < num; i++) {
|
|
|
- arr.push({});
|
|
|
+ let sentence = Math.ceil(item.length/data.rowNumber)
|
|
|
+ for(let k=0; k<sentence; k++){
|
|
|
+ let sentenceItem = []
|
|
|
+ for(let s=0; s< data.rowNumber; s++){
|
|
|
+ if(k*data.rowNumber+s<item.length){
|
|
|
+ sentenceItem.push({
|
|
|
+ con: item[k*data.rowNumber+s],
|
|
|
+ });
|
|
|
+ }else{
|
|
|
+ sentenceItem.push({})
|
|
|
+ }
|
|
|
+ }
|
|
|
+ allArr.push(JSON.parse(JSON.stringify(sentenceItem)))
|
|
|
}
|
|
|
- }
|
|
|
- console.log(arr);
|
|
|
+ let sentenceMiao = []
|
|
|
+ for(let k=0; k<sentence; k++){
|
|
|
+ let sentenceItemMiao = []
|
|
|
+ this.loading = true
|
|
|
+ for(let s=0; s< data.rowNumber; s++){
|
|
|
+ if(k*data.rowNumber+s<item.length){
|
|
|
+ sentenceItemMiao[s] = {
|
|
|
+ con: item[k*data.rowNumber+s],
|
|
|
+ miaoRed: true,
|
|
|
+ hzDetail: null
|
|
|
+ }
|
|
|
+ let MethodName = "hz_resource_manager-GetHZStrokesContent";
|
|
|
+ getLogin(MethodName, {hz:item[k*data.rowNumber+s]})
|
|
|
+ .then((res) => {
|
|
|
+ this.$set(sentenceItemMiao[s].hzDetail,"hz_json",res)
|
|
|
+ })
|
|
|
+ .catch(() => {
|
|
|
+ this.loading = false;
|
|
|
+ });
|
|
|
+
|
|
|
+ }else{
|
|
|
+ sentenceItemMiao[s] = {}
|
|
|
+ }
|
|
|
+ }
|
|
|
+ sentenceMiao.push(sentenceItemMiao)
|
|
|
+ }
|
|
|
+ this.loading = false;
|
|
|
+ for(let l=0; l< data.miaoRedBoxNumber; l++){
|
|
|
+ for(let j=0; j<sentenceMiao.length; j++){
|
|
|
+ allArr.push(sentenceMiao[j])
|
|
|
+ }
|
|
|
+ }
|
|
|
+ // let spltArr = item.con.split("");
|
|
|
+ // let arr = [];
|
|
|
+ // spltArr.forEach((item) => {
|
|
|
+ // arr.push({ con: item });
|
|
|
+ // });
|
|
|
+ // // 如果不满一行则补满
|
|
|
+ // if (arr.length % data.rowNumber != 0) {
|
|
|
+ // let num = data.rowNumber - (arr.length % data.rowNumber);
|
|
|
+ // for (let i = 0; i < num; i++) {
|
|
|
+ // arr.push({});
|
|
|
+ // }
|
|
|
+ // }
|
|
|
+ // console.log(arr);
|
|
|
});
|
|
|
+ data.result = this.arrSplice(allArr, data.pageNumber);
|
|
|
+ this.writeTableData = data
|
|
|
}
|
|
|
},
|
|
|
arrSplice(arr, chunkSize) {
|