mooho-base-admin-plus 2.10.48 → 2.10.50

package/package.json

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

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

@@ -25,6 +25,7 @@
   import { mapActions } from 'vuex';
   import dateFormat from 'date-fns/format';
 
+  import Handsontable from 'handsontable';
   import { HotTable } from '@handsontable/vue3';
   import { ContextMenu } from 'handsontable/plugins/contextMenu';
   import { registerAllModules } from 'handsontable/registry';
@@ -208,6 +209,46 @@
         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()) {
+            callback(false);
+          } else {
+            callback(true);
+          }
+        });
+
+        // 数字必填
+        Handsontable.validators.registerValidator('numeric-required', (value, callback) => {
+          if (value === null || value === void 0) {
+            callback(false);
+          } else {
+            Handsontable.validators.NumericValidator(value, callback);
+          }
+        });
+
+        console.log('Handsontable.validators.NumericValidator', Handsontable.validators.DateValidator);
+
+        // 日期必填
+        Handsontable.validators.registerValidator('date-required', (value, callback) => {
+          if (!(value || '').trim()) {
+            callback(false);
+          } else {
+            Handsontable.validators.DateValidator.apply({ instance: this.$refs.table.hotInstance }, [value, callback]);
+          }
+        });
+
+        // 选择必填
+        Handsontable.validators.registerValidator('select-required', (value, callback) => {
+          if (!(value || '').trim()) {
+            callback(false);
+          } else {
+            Handsontable.validators.AutocompleteValidator(value, callback);
+          }
+        });
+
         // 初始化数据源
         // this.initDataSource();
 
@@ -225,13 +266,25 @@
             if (!this.readonly) {
               if (item.controlType === 'Label' || item.isReadonly == true) {
                 column.readOnly = true;
+              } else if (item.controlType === 'TextInput') {
+                column.type = 'text';
+
+                if (column.isRequired) {
+                  column.validator = 'text-required';
+                }
               } else if (item.controlType === 'NumberInput') {
                 column.type = 'numeric';
+                if (column.isRequired) {
+                  column.validator = 'numeric-required';
+                }
                 // column.validator = 'numeric';
               } else if (item.controlType === 'Check') {
                 column.type = 'checkbox';
               } else if (item.controlType === 'Select') {
                 column.editor = 'select';
+                if (column.isRequired) {
+                  column.validator = 'select-required';
+                }
 
                 let dataSource = [];
 
@@ -321,6 +374,9 @@
                 });
               } else if (item.controlType === 'Date') {
                 column.type = 'date';
+                if (column.isRequired) {
+                  column.validator = 'date-required';
+                }
                 column.dateFormat = 'YYYY-MM-DD';
                 column.correctFormat = true;
                 // column.renderer = function (instance, td, row, col, prop, value, cellProperties) {
@@ -668,50 +724,68 @@
        * @public
        */
       validate() {
-        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.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) + '|' + column.name);
-                return false;
-              }
-            }
-
-            // if (column.maxLength != null && value != null && String(value).length > column.maxLength) {
-            //   this.error('Front_Msg_Row_Validation_Max_Length|' + (i + 1) + '|' + column.name + '|' + column.maxLength.toString());
-            //   return false;
-            // }
+        let rows = [];
 
-            if (column.maxValue != null && !isNaN(value) && value > column.maxValue) {
-              this.error('Front_Msg_Row_Validation_Max_Value|' + (i + 1) + '|' + column.name + '|' + column.maxValue.toString());
-              return false;
-            }
+        for (let i = 0; i < this.staticData.length - 1; i++) {
+          rows.push(i);
+        }
+        console.log('rows', rows);
 
-            if (column.minValue != null && !isNaN(value) && value < column.minValue) {
-              this.error('Front_Msg_Row_Validation_Min_Value|' + (i + 1) + '|' + column.name + '|' + column.minValue.toString());
-              return false;
-            }
+        let valid = this.$refs.table.hotInstance.validateRows(rows, valid => {
+          console.log('valid', valid);
+        });
 
-            if (!!(column.pattern || '').trim() && value != null && new RegExp(column.pattern).test(value) == false) {
-              this.error('Front_Msg_Row_Validation_Pattern|' + (i + 1) + '|' + column.name + '|' + column.pattern);
-              return false;
-            }
-          }
+        if (!valid) {
+          this.error('Front_Msg_Form_Validate_Fail');
+          return false;
+        } else {
+          return true;
         }
 
-        return true;
+        // 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.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) + '|' + column.name);
+        //         return false;
+        //       }
+        //     }
+
+        //     // if (column.maxLength != null && value != null && String(value).length > column.maxLength) {
+        //     //   this.error('Front_Msg_Row_Validation_Max_Length|' + (i + 1) + '|' + column.name + '|' + column.maxLength.toString());
+        //     //   return false;
+        //     // }
+
+        //     if (column.maxValue != null && !isNaN(value) && value > column.maxValue) {
+        //       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) + '|' + 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) + '|' + column.name + '|' + column.pattern);
+        //       return false;
+        //     }
+        //   }
+        // }
+
+        //return true;
       },
       /**
        * 获取数据
@@ -721,7 +795,9 @@
       getData() {
         let data = this.copy(this.staticData);
 
-        data.pop();
+        if (!this.readonly && this.tableView.createEnable) {
+          data.pop();
+        }
 
         data.forEach(item => {
           for (let key in item) {