mooho-base-admin-plus 2.4.48 → 2.4.50

package/history.md

@@ -80,3 +80,5 @@ mooho-base-admin-plus@2.4.45 - 修复多选可筛选选择框无法删除的问
 mooho-base-admin-plus@2.4.46 - 分页增加直接跳转
 mooho-base-admin-plus@2.4.47 - 多选可筛选选择框清空内容不重新刷新
 mooho-base-admin-plus@2.4.48 - 修复弹出选择框多加载一次的bug
+mooho-base-admin-plus@2.4.49 - 筛选条件增加了日期范围控件支持
+mooho-base-admin-plus@2.4.50 - 静态选项增加bool类型支持，优化表格中的静态选项支持

package/package/mooho-base-admin-plus.min.esm.js

@@ -23967,7 +23967,11 @@ const _sfc_main$1k = {
     },
     importFileSuccess(res2) {
       this.end();
-      this.$emit("on-success", res2);
+      if (res2.code == 0) {
+        this.$emit("on-success", res2);
+      } else {
+        this.error(res2.message);
+      }
     },
     importFileError(error2) {
       this.end();
@@ -24056,7 +24060,13 @@ const _sfc_main$1j = {
       this.fileList = list;
       this.defaultList = list;
     },
-    beforeUpload() {
+    beforeUpload(file) {
+      if (this.maxSize != null) {
+        if (file.size > this.maxSize * 1024 * 1024) {
+          this.error("Front_Msg_Max_Quantity|" + this.maxSize);
+          return false;
+        }
+      }
       if (this.maxCount != null) {
         let list = this.fileList;
         if (list.length >= this.maxCount) {
@@ -34844,27 +34854,27 @@ const _sfc_main$1b = {
           trigger: "blur,change"
         });
       }
-      if (column.maxValue != null) {
+      if (column.maxValue != null && (column.controlType == "NumberInput" || column.controlType == "Slider")) {
         rules.push({
           type: this.getDataType(column),
           max: column.maxValue,
-          message: this.$t("Front_Msg_Validation_Max_Value|" + column.maxValue),
+          message: this.tParam("Front_Msg_Validation_Max_Value|" + column.maxValue),
           trigger: "blur,change"
         });
       }
-      if (column.minValue != null) {
+      if (column.minValue != null && (column.controlType == "NumberInput" || column.controlType == "Slider")) {
         rules.push({
           type: this.getDataType(column),
           min: column.minValue,
-          message: this.$t("Front_Msg_Validation_Min_Value|" + column.minValue),
+          message: this.tParam("Front_Msg_Validation_Min_Value|" + column.minValue),
           trigger: "blur,change"
         });
       }
-      if (column.maxLength != null) {
+      if (column.maxLength != null && (column.controlType == "TextInput" || column.controlType == "TextArea")) {
         rules.push({
           type: this.getDataType(column),
           length: column.maxLength,
-          message: this.$t("Front_Msg_Validation_Max_Length|" + column.maxLength),
+          message: this.tParam("Front_Msg_Validation_Max_Length|" + column.maxLength),
           trigger: "blur,change"
         });
       }
@@ -34939,6 +34949,11 @@ const _sfc_main$1b = {
                       id: parseFloat(key),
                       name: value
                     });
+                  } else if (column.dataType == "Boolean") {
+                    column.dataSource.push({
+                      id: key.toUpperCase() == "TRUE",
+                      name: value
+                    });
                   } else {
                     column.dataSource.push({
                       id: key,
@@ -34956,6 +34971,11 @@ const _sfc_main$1b = {
                       id: parseFloat(item),
                       name: item
                     });
+                  } else if (column.dataType == "Boolean") {
+                    column.dataSource.push({
+                      id: item.toUpperCase() == "TRUE",
+                      name: item
+                    });
                   } else {
                     column.dataSource.push({
                       id: item,
@@ -35066,17 +35086,17 @@ const _sfc_main$1b = {
       return result2;
     },
     getDataSource(data2, column) {
-      if (!column.isStaticItem && column.dataType && column.dataType.startsWith("Enum:")) {
+      if (!column.isStaticItem && column.dataType.startsWith("Enum:")) {
         return this.getEnumList(column.dataType.split(":")[1]);
       } else {
         return column.dataSource == null ? [] : column.dataSource;
       }
     },
     async onDataChange(sender) {
-      if (sender == null || sender.triggers !== []) {
+      if (sender == null || sender.triggers && sender.triggers !== []) {
         this.columns.forEach(function(column) {
-          if (!!(column.source || "").trim() && !(column.dataType && column.dataType.startsWith("Enum:")) && (sender == null || sender.triggers.some((item) => {
-            return item.id === column.id;
+          if (!column.isStaticItem && !!(column.source || "").trim() && !(column.dataType && column.dataType.startsWith("Enum:")) && (sender == null || sender.triggers.some((item) => {
+            return item.code == column.code;
           }))) {
             column.needRefresh = true;
           }
@@ -38711,6 +38731,11 @@ const _sfc_main$12 = {
                       id: parseFloat(key),
                       name: value
                     });
+                  } else if (column.dataType == "Boolean") {
+                    column.dataSource.push({
+                      id: key.toUpperCase() == "TRUE",
+                      name: value
+                    });
                   } else {
                     column.dataSource.push({
                       id: key,
@@ -38728,6 +38753,11 @@ const _sfc_main$12 = {
                       id: parseFloat(item),
                       name: item
                     });
+                  } else if (column.dataType == "Boolean") {
+                    column.dataSource.push({
+                      id: item.toUpperCase() == "TRUE",
+                      name: item
+                    });
                   } else {
                     column.dataSource.push({
                       id: item,
@@ -38981,6 +39011,9 @@ const _sfc_main$12 = {
         case "Year":
           key = "y_" + key;
           break;
+        case "DateRange":
+          key = key + "_c";
+          return key;
       }
       switch (column.operator) {
         case "GreaterThan":
@@ -40806,7 +40839,7 @@ const _sfc_main$$ = {
         rules.push({
           type: this.getDataType(column),
           max: column.maxValue,
-          message: this.$t("Front_Msg_Validation_Max_Value|" + column.maxValue),
+          message: this.tParam("Front_Msg_Validation_Max_Value|" + column.maxValue),
           trigger: "blur,change"
         });
       }
@@ -40814,7 +40847,7 @@ const _sfc_main$$ = {
         rules.push({
           type: this.getDataType(column),
           min: column.minValue,
-          message: this.$t("Front_Msg_Validation_Min_Value|" + column.minValue),
+          message: this.tParam("Front_Msg_Validation_Min_Value|" + column.minValue),
           trigger: "blur,change"
         });
       }
@@ -40822,7 +40855,7 @@ const _sfc_main$$ = {
         rules.push({
           type: this.getDataType(column),
           length: column.maxLength,
-          message: this.$t("Front_Msg_Validation_Max_Length|" + column.maxLength),
+          message: this.tParam("Front_Msg_Validation_Max_Length|" + column.maxLength),
           trigger: "blur,change"
         });
       }
@@ -40856,6 +40889,11 @@ const _sfc_main$$ = {
                       id: parseFloat(key),
                       name: value
                     });
+                  } else if (column.dataType == "Boolean") {
+                    column.dataSource.push({
+                      id: key.toUpperCase() == "TRUE",
+                      name: value
+                    });
                   } else {
                     column.dataSource.push({
                       id: key,
@@ -40873,6 +40911,11 @@ const _sfc_main$$ = {
                       id: parseFloat(item),
                       name: item
                     });
+                  } else if (column.dataType == "Boolean") {
+                    column.dataSource.push({
+                      id: item.toUpperCase() == "TRUE",
+                      name: item
+                    });
                   } else {
                     column.dataSource.push({
                       id: item,
@@ -42623,15 +42666,49 @@ const _sfc_main$_ = {
                     if (item.split(":").length > 1) {
                       let key = item.split(":")[0];
                       let value = item.split(":")[1];
-                      row._dataSource[column.code].push({
-                        id: key,
-                        name: value
-                      });
+                      if (column.dataType == "Integer" || column.dataType == "BigInteger") {
+                        row._dataSource[column.code].push({
+                          id: parseInt(key),
+                          name: value
+                        });
+                      } else if (column.dataType == "Decimal" || column.dataType == "Float" || column.dataType == "Double") {
+                        row._dataSource[column.code].push({
+                          id: parseFloat(key),
+                          name: value
+                        });
+                      } else if (column.dataType == "Boolean") {
+                        row._dataSource[column.code].push({
+                          id: key.toUpperCase() == "TRUE",
+                          name: value
+                        });
+                      } else {
+                        row._dataSource[column.code].push({
+                          id: key,
+                          name: value
+                        });
+                      }
                     } else {
-                      row._dataSource[column.code].push({
-                        id: item,
-                        name: item
-                      });
+                      if (column.dataType == "Integer" || column.dataType == "BigInteger") {
+                        row._dataSource[column.code].push({
+                          id: parseInt(item),
+                          name: item
+                        });
+                      } else if (column.dataType == "Decimal" || column.dataType == "Float" || column.dataType == "Double") {
+                        row._dataSource[column.code].push({
+                          id: parseFloat(item),
+                          name: item
+                        });
+                      } else if (column.dataType == "Boolean") {
+                        row._dataSource[column.code].push({
+                          id: item.toUpperCase() == "TRUE",
+                          name: item
+                        });
+                      } else {
+                        row._dataSource[column.code].push({
+                          id: item,
+                          name: item
+                        });
+                      }
                     }
                   }
                 });
@@ -42913,6 +42990,8 @@ const _sfc_main$_ = {
       for (let key in filter2) {
         if (this.isJSON(filter2[key])) {
           filter2[key] = JSON.parse(filter2[key]).join(",");
+        } else if (Object.prototype.toString.call(filter2[key]) === "[object Array]") {
+          filter2[key] = filter2[key].join(",");
         } else if (typeof filter2[key] == "object" && !(filter2[key] instanceof Date)) {
           delete filter2[key];
         }