mooho-base-admin-plus 2.10.50 → 2.10.51

package/package.json

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

package/src/components/view/modal-form.vue

@@ -31,7 +31,16 @@
         </div>
       </template>
       <div class="ivu-ml-8 ivu-mr-8">
-        <view-form ref="form" :view-code="viewCode" :readonly="!canSave()" :defaultData="defaultData" :setting-enable="settingEnable" @on-change="onChange" @on-ready="onReady">
+        <view-form
+          ref="form"
+          :view-code="viewCode"
+          :readonly="!canSave()"
+          :defaultData="defaultData"
+          :setting-enable="settingEnable"
+          @on-change="onChange"
+          @on-ready="onReady"
+          @on-blur="onBlur"
+        >
           <template #top="{ form }">
             <!--
                 @slot 顶部
@@ -130,6 +139,7 @@
   export default {
     mixins: [mixinPage],
     components: { formSetting, formSettingLayout },
+    emits: ['on-after-save', 'on-before-save', 'on-blur', 'on-change', 'on-close'],
     data() {
       return {
         opened: false,
@@ -382,6 +392,14 @@
       onReady(formView) {
         this.formView = formView;
       },
+      // 输入框失去焦点事件
+      onBlur(sender) {
+        /**
+         * 数据变化事件
+         * @property {object} sender 触发的列对象
+         */
+        this.$emit('on-blur', sender);
+      },
       onVisibleChange(show) {
         // 关闭时清空数据
         if (!show) {

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

@@ -63,7 +63,10 @@
         @create="create"
         @edit="edit"
         @show="show"
+        @on-blur="onBlur"
+        @on-change="onChange"
         @on-ready="onReady"
+        @on-remove="onRemove"
         @on-load-data="onLoadData"
         @after-init="afterInit"
         @on-drag-drop="(index1, index2) => this.$emit('on-drag-drop', index1, index2)"
@@ -71,6 +74,7 @@
         @on-row-click="onRowClick"
         @on-row-dblclick="onRowDblclick"
         @on-cell-click="onCellClick"
+        @on-select-change="onSelectChange"
       >
         <template #top>
           <!--
@@ -154,6 +158,7 @@
   export default {
     mixins: [mixinPage],
     components: {},
+    emits: ['after-init', 'create', 'on-close', 'edit', 'on-blur', 'on-cell-click', 'on-change', 'on-load-data', 'on-row-click', 'on-row-dblclick', 'on-select-change', 'show'],
     data() {
       return {
         opened: false,
@@ -621,6 +626,32 @@
         this.$refs.table.isMaxHight = isFullscreen;
 
         this.isFullscreen = isFullscreen;
+      },
+      // 失去焦点事件
+      onBlur(data, sender) {
+        /**
+         * 失去焦点事件
+         * @property {object} data 行对象
+         * @property {object} sender 触发的列对象
+         */
+        this.$emit('on-blur', data, sender);
+      },
+      // 变更事件
+      onChange(data, sender, selected) {
+        /**
+         * 数据变化事件
+         * @property {object} data 行对象
+         * @property {object} sender 触发的列对象
+         * @property {object} selected 选中对象（弹出选择框等有效）
+         */
+        this.$emit('on-change', data, sender, selected);
+      },
+      // 选中项变化事件
+      onSelectChange() {
+        /**
+         * 数据变化事件
+         */
+        this.$emit('on-select-change');
       }
     }
   };

package/src/components/view/view-form.vue

@@ -551,6 +551,7 @@
   export default {
     mixins: [mixin, mixinPage],
     components: { richEditor, uploadAttachment, uploadImage, CheckGroup },
+    emits: ['on-blur', 'on-change', 'on-ready'],
     data() {
       return {
         formView: {},

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

@@ -47,7 +47,7 @@
   export default {
     mixins: [mixin, mixinPage],
     components: { HotTable, tableSetting },
-    emits: ['onChange'],
+    emits: ['after-init', 'on-change', 'on-load-data'],
     data() {
       return {
         inited: false,
@@ -75,7 +75,6 @@
           licenseKey: 'non-commercial-and-evaluation'
         },
         coords: {},
-        data: [],
         staticData: [],
         setting: false,
         tableSettingActive: false,
@@ -161,7 +160,11 @@
         default: null
       }
     },
-    computed: {},
+    computed: {
+      data() {
+        return this.staticData;
+      }
+    },
     watch: {
       // value() {
       //     if (this.embedded) {
@@ -209,8 +212,6 @@
         this.tableView = view.dataView;
         this.tableView.columns = view.viewColumns;
 
-        console.log('this.$refs.table.hotInstance', this.$refs.table.hotInstance);
-
         // 文本必填
         Handsontable.validators.registerValidator('text-required', (value, callback) => {
           if (!(value || '').trim()) {
@@ -229,8 +230,6 @@
           }
         });
 
-        console.log('Handsontable.validators.NumericValidator', Handsontable.validators.DateValidator);
-
         // 日期必填
         Handsontable.validators.registerValidator('date-required', (value, callback) => {
           if (!(value || '').trim()) {
@@ -506,7 +505,7 @@
                   let data = this.$refs.table.hotInstance.getSourceData();
                   let delRows = data.splice(index, 1);
                   data.splice(index - 1, 0, delRows[0]);
-                  this.$refs.table.hotInstance.loadData(data);
+                  this.$refs.table.hotInstance.updateData(data);
                 }
               }
             };
@@ -518,7 +517,7 @@
                 if (index < data.length - 1) {
                   let delRows = data.splice(index, 1);
                   data.splice(index + 1, 0, delRows[0]);
-                  this.$refs.table.hotInstance.loadData(data);
+                  this.$refs.table.hotInstance.updateData(data);
                 }
               }
             };
@@ -553,18 +552,7 @@
                 }
 
                 this.confirm('确定要删除该行吗？', async () => {
-                  // if (ids.length > 0) {
-                  //     await modelApi.delete(this.viewCode, ids);
-                  // }
-                  let b = true;
-
-                  this.$emit('on-remove', rows, val => {
-                    b = val;
-                  });
-
-                  if (b) {
-                    this.$refs.table.hotInstance.alter('remove_row', delArr);
-                  }
+                  this.$refs.table.hotInstance.alter('remove_row', delArr);
                 });
               }
             };
@@ -576,26 +564,26 @@
           //console.log('afterChange', changes);
           if (changes) {
             changes.forEach(([row, property, oldValue, newValue]) => {
-              if (!this.readonly && this.tableView.createEnable && row == this.data.length - 1 && (oldValue ?? '') != (newValue ?? '')) {
-                this.data.push(this.getDefaultData());
+              if (!this.readonly && this.tableView.createEnable && row == this.staticData.length - 1 && (oldValue ?? '') != (newValue ?? '')) {
+                this.staticData.push(this.getDefaultData());
               }
 
               let column = this.columns.find(item => item.code == property);
 
               if (column.controlType != 'DialogSelect') {
                 // 弹出框控件不触发数据变更事件，此处手动触发
-                this.onDataChange(this.data[row], column);
+                this.onDataChange(this.staticData[row], column);
               }
 
               if (column.controlType == 'Select') {
                 // 校验下拉框选项是否在列表中
                 if (!column.selectOptions.some(item => item == newValue)) {
-                  this.data[row][column.code] = null;
+                  this.staticData[row][column.code] = null;
                 }
               }
 
-              this.calc(this.data[row]);
-              this.$refs.table.hotInstance.updateData(this.data);
+              this.calc(this.staticData[row]);
+              this.$refs.table.hotInstance.updateData(this.staticData);
             });
           }
         });
@@ -668,10 +656,10 @@
           });
         }
 
-        this.data = this.staticData;
+        //this.data = this.staticData;
 
         if (!this.readonly && staticData && this.tableView.createEnable) {
-          this.data.push(this.getDefaultData());
+          this.staticData.push(this.getDefaultData());
         }
 
         //this.hotSetting.data = this.data;
@@ -688,11 +676,11 @@
         //this.initDataSource();
 
         // 重新计算公式
-        for (let i = 0; i < this.data.length; i++) {
-          this.calc(this.data[i]);
+        for (let i = 0; i < this.staticData.length; i++) {
+          this.calc(this.staticData[i]);
         }
 
-        this.$refs.table.hotInstance.loadData(this.data);
+        this.$refs.table.hotInstance.loadData(this.staticData);
 
         setTimeout(() => {
           this.$refs.table.hotInstance.render();
@@ -719,7 +707,15 @@
         // }
       },
       /**
-       * 必填验证
+       * 刷新
+       *
+       * @public
+       */
+      refresh() {
+        this.$refs.table.hotInstance.updateData(this.staticData);
+      },
+      /**
+       * 验证
        *
        * @public
        */
@@ -729,10 +725,9 @@
         for (let i = 0; i < this.staticData.length - 1; i++) {
           rows.push(i);
         }
-        console.log('rows', rows);
 
         let valid = this.$refs.table.hotInstance.validateRows(rows, valid => {
-          console.log('valid', valid);
+          // console.log('valid', valid);
         });
 
         if (!valid) {
@@ -865,7 +860,7 @@
       },
       // 行数据
       rowData(row, index) {
-        return this.data[index];
+        return this.staticData[index];
       },
       // 获取多语言名称
       getNameI18n(column) {
@@ -888,7 +883,7 @@
       // 清空数据
       clear() {
         this.staticData = [];
-        this.data = [];
+        //this.data = [];
       },
       // 弹出选择框选中
 

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

@@ -726,6 +726,21 @@
   export default {
     mixins: [mixin, mixinPage],
     components: { tableFilter, tableSetting, filterSetting },
+    emits: [
+      'after-init',
+      'create',
+      'edit',
+      'on-blur',
+      'on-cell-click',
+      'on-change',
+      'on-load-data',
+      'on-ready',
+      'on-remove',
+      'on-row-click',
+      'on-row-dblclick',
+      'on-select-change',
+      'show'
+    ],
     data() {
       return {
         inited: false,