mooho-base-admin-plus 2.10.93 → 2.10.95

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "mooho-base-admin-plus",
   "description": "MOOHO basic framework for admin by Vue3",
-  "version": "2.10.93",
+  "version": "2.10.95",
   "author": "jinyifan <jinyifan@mooho.com.cn>",
   "license": "MIT",
   "private": false,

package/public/setting.js

@@ -84,9 +84,7 @@ window.setting = {
     // 每页默认数量
     pageSize: 10,
     // 单击行即选中
-    clickRowChecked: true,
-    // 富文本 CKEditor4 脚本地址
-    editorUrl: '/ckeditor/ckeditor.js'
+    clickRowChecked: true
   },
   /**
    * 多语言配置
@@ -105,5 +103,7 @@ window.setting = {
   encrypt: {
     // 是否开启密码加密，开启后，登录、修改密码等操作，都需要进行密码加密处理
     passwordEncrypt: false
-  }
+  },
+  // 富文本 CKEditor4 脚本地址
+  editorUrl: '/ckeditor/ckeditor.js'
 };

package/src/components/view/view-table-excel.vue

@@ -665,11 +665,10 @@
           // return data;
         });
 
-        setTimeout(() => {
-          this.loadData([]);
-        });
-
+        // 必须在 init 的 Promise 完成前同步清空并绑定表格，避免 setTimeout(loadData([])) 晚于
+        // 「await init 后执行的 loadData(真实数据)」而把数据冲掉
         this.inited = true;
+        await this.loadData([]);
 
         setTimeout(() => {
           if (typeof callback === 'function') {
@@ -888,6 +887,11 @@
           cells: (row, col, prop) => {
             let column = this.columns.find(item => item.code == prop);
 
+            if (column == null) {
+              console.log('column not found!', row, col, prop);
+              return;
+            }
+
             let isShow = column.isShow;
             let isReadonly = column.isReadonly;