mooho-base-admin-plus 2.10.46 → 2.10.48

package/package.json

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

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

@@ -1335,8 +1335,6 @@
       },
       // 数据变化事件
       async onDataChange(sender, selected, tableRow, tableSender, tableSelected) {
-        console.log('onDataChange', sender, selected, tableRow, tableSender, tableSelected);
-
         for (let column of this.columns) {
           // 判断是否需要显示
           if (!!(column.showJson || '').trim()) {

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

@@ -109,7 +109,7 @@
 
           if (column.controlType === 'DialogSelect' && !column.readonly) {
             this.$refs.dialogTable.init(column.source, () => {
-              this.$refs.dialogTable.open(this.getParam(data[coords.row], column));
+              this.$refs.dialogTable.open(this.getParam(data[coords.row], column, this.parentData));
             });
           }
         }
@@ -227,7 +227,7 @@
                 column.readOnly = true;
               } else if (item.controlType === 'NumberInput') {
                 column.type = 'numeric';
-                column.numericFormat = '0%';
+                // column.validator = 'numeric';
               } else if (item.controlType === 'Check') {
                 column.type = 'checkbox';
               } else if (item.controlType === 'Select') {
@@ -505,7 +505,7 @@
                   this.$emit('on-remove', rows, val => {
                     b = val;
                   });
-                  console.log(b);
+
                   if (b) {
                     this.$refs.table.hotInstance.alter('remove_row', delArr);
                   }
@@ -517,23 +517,62 @@
 
         // 变更事件
         this.$refs.table.hotInstance.addHook('afterChange', changes => {
+          //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());
-                this.$refs.table.hotInstance.loadData(this.data);
               }
 
-              if (this.columns.find(item => item.code == property).controlType != 'DialogSelect') {
-                this.onDataChange(
-                  this.data[row],
-                  this.columns.find(item => item.code == property)
-                );
+              let column = this.columns.find(item => item.code == property);
+
+              if (column.controlType != 'DialogSelect') {
+                // 弹出框控件不触发数据变更事件，此处手动触发
+                this.onDataChange(this.data[row], column);
+              }
+
+              if (column.controlType == 'Select') {
+                // 校验下拉框选项是否在列表中
+                if (!column.selectOptions.some(item => item == newValue)) {
+                  this.data[row][column.code] = null;
+                }
               }
+
+              this.calc(this.data[row]);
+              this.$refs.table.hotInstance.updateData(this.data);
             });
+          }
+        });
 
-            this.loadData();
+        // 粘贴事件
+        this.$refs.table.hotInstance.addHook('beforePaste', (data, coords) => {
+          //console.log('beforePaste', data, coords);
+          // 不含父级表头
+          let columns = this.columns.filter(item => {
+            return (
+              !!(item.parentCode || '').trim() ||
+              this.columns.filter(i => {
+                return i.parentCode == item.code;
+              }).length == 0
+            );
+          });
+
+          for (let col = coords[0].startCol; col < coords[0].startCol + data[0].length; col++) {
+            for (let row = coords[0].startRow; row < coords[0].startRow + data.length; row++) {
+              if (data[row - coords[0].startRow][col - coords[0].startCol] != null) {
+                // 去除前后空格
+                data[row - coords[0].startRow][col - coords[0].startCol] = data[row - coords[0].startRow][col - coords[0].startCol].trim();
+
+                if (columns[col].controlType == 'NumberInput') {
+                  // 数字类型，去掉逗号
+                  data[row - coords[0].startRow][col - coords[0].startCol] = data[row - coords[0].startRow][col - coords[0].startCol].replace(/,/g, '');
+                  // this.$refs.table.hotInstance.updateData(this.data);
+                }
+              }
+            }
           }
+
+          // return data;
         });
 
         this.loadData([]);
@@ -629,27 +668,23 @@
        * @public
        */
       validate() {
-        for (let i = 0; i < this.staticData.length; i++) {
+        for (let i = 0; i < this.staticData.length - 1; i++) {
           let row = this.staticData[i];
 
           for (let j = 0; j < this.columns.length; j++) {
             let column = this.columns[j];
             let value = this.parseData(row, column.code);
 
-            if (column.slot != 'normal') {
-              continue;
-            }
-
             // 不显示的不验证
-            if (row._isShow && row._isShow[column.code] == false) {
-              continue;
-            } else if (column.isShow == false) {
+            if (column.isShow == false) {
               continue;
             }
 
+            //let name = column.name.replaceAll('<font style="color: red">*</font>', '');
+
             if (column.isRequired) {
               if (value == null || !(String(value) || '').trim()) {
-                this.error('Front_Msg_Row_Column_Required|' + (i + 1) + '|' + name);
+                this.error('Front_Msg_Row_Column_Required|' + (i + 1) + '|' + column.name);
                 return false;
               }
             }
@@ -660,17 +695,17 @@
             // }
 
             if (column.maxValue != null && !isNaN(value) && value > column.maxValue) {
-              this.error('Front_Msg_Row_Validation_Max_Value|' + (i + 1) + '|' + name + '|' + column.maxValue.toString());
+              this.error('Front_Msg_Row_Validation_Max_Value|' + (i + 1) + '|' + column.name + '|' + column.maxValue.toString());
               return false;
             }
 
             if (column.minValue != null && !isNaN(value) && value < column.minValue) {
-              this.error('Front_Msg_Row_Validation_Min_Value|' + (i + 1) + '|' + name + '|' + column.minValue.toString());
+              this.error('Front_Msg_Row_Validation_Min_Value|' + (i + 1) + '|' + column.name + '|' + column.minValue.toString());
               return false;
             }
 
             if (!!(column.pattern || '').trim() && value != null && new RegExp(column.pattern).test(value) == false) {
-              this.error('Front_Msg_Row_Validation_Pattern|' + (i + 1) + '|' + name + '|' + column.pattern);
+              this.error('Front_Msg_Row_Validation_Pattern|' + (i + 1) + '|' + column.name + '|' + column.pattern);
               return false;
             }
           }

package/src/mixins/page.js

@@ -272,8 +272,11 @@ export default {
           // return $filter('date')(value, 'yyyy-MM-dd');
         }
       } else if (dataType === 'Integer') {
-        // 日期
-        if (!!(format || '').trim()) {
+        if (format === 'Thousand') {
+          // 千分位
+          return this.formatThousand(value);
+        } else if (!!(format || '').trim()) {
+          // 日期
           let result = null;
           try {
             result = dateFormat(new Date(value * 1000), format);