mooho-base-admin-plus 2.10.17 → 2.10.19

package/history.md

@@ -188,3 +188,5 @@ mooho-base-admin-plus@2.10.14 - 内嵌表格增加筛选栏按钮插槽
 mooho-base-admin-plus@2.10.15 - 修复上一版本bug
 mooho-base-admin-plus@2.10.16 - 修复上一版本bug
 mooho-base-admin-plus@2.10.17 - 内嵌表格默认增加行数可配置
+mooho-base-admin-plus@2.10.18 - 优化表格、表单、筛选项默认值
+mooho-base-admin-plus@2.10.19 - 解决标签控件值为null报错的bug

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

@@ -30283,13 +30283,13 @@ const comboSelect = /* @__PURE__ */ _export_sfc(_sfc_main$F, [["render", _sfc_re
         a[this.sourceDataCode] = JSON.parse(this.modelValue).join(","), this.loadDataView(this.source).then(async (r) => {
           if (r.dataView.isCustom) {
             let o = await customModelApi.query(r.dataView.model, a, [this.sourceDataCode, this.sourceDisplayCode]);
-            o.data.length > 0 && (this.selected = o.data.map((s) => this.parseData(s, this.sourceDisplayCode)).join(","), console.log("res.data", o.data), this.selectedData = o.data);
+            o.data.length > 0 && (this.selected = o.data.map((s) => this.parseData(s, this.sourceDisplayCode)).join(","), this.selectedData = o.data);
           } else if (r.dataView.isDataSource) {
             let o = await dataSourceApi.query(r.dataView.dataSource, a);
             o.table.length > 0 && (this.selected = o.table.map((s) => this.parseData(s, this.sourceDisplayCode)).join(","), this.selectedData = o.table);
           } else {
             let o = await modelApi.query(r.dataView.model, a, [this.sourceDataCode, this.sourceDisplayCode]);
-            o.data.length > 0 && (this.selected = o.data.map((s) => this.parseData(s, this.sourceDisplayCode)).join(","), console.log("res.data", o.data), this.selectedData = o.data);
+            o.data.length > 0 && (this.selected = o.data.map((s) => this.parseData(s, this.sourceDisplayCode)).join(","), this.selectedData = o.data);
           }
         });
       } else {
@@ -33444,17 +33444,42 @@ const columnEdit = /* @__PURE__ */ _export_sfc(_sfc_main$w, [["render", _sfc_ren
     },
     // 获取标签颜色
     getTagColor(a, r) {
-      let o = [];
+      let o = "default";
+      if (r == null)
+        return o;
+      let s = [];
       if (a.param)
         try {
-          o = JSON.parse(a.param);
+          s = JSON.parse(a.param);
         } catch (l) {
           console.log(l);
         }
-      let s = "default";
-      return o.forEach((l) => {
-        l.value.split(",").some((u) => u.trim() == r.trim()) && (s = l.color);
-      }), s;
+      return s.forEach((l) => {
+        l.value.split(",").some((u) => u.trim() == r.trim()) && (o = l.color);
+      }), o;
+    },
+    /**
+     * 获取默认值
+     *
+     * @public
+     */
+    getDefaultData(a = (o, s, l) => this.setData(o, s.code, l), r = (o, s, l) => this.setArrayData(o, s.code, l)) {
+      let o = {};
+      if (this.columns.forEach((s) => {
+        if (s.defaultValue)
+          if (s.defaultValue == "{today}") {
+            let u = (/* @__PURE__ */ new Date()).toISOString().replace(/T.*/, "");
+            a(o, s, new Date(u));
+          } else if (s.defaultValue.startsWith("{today(") && s.defaultValue.endsWith(")}")) {
+            let l = s.defaultValue.substr(7, s.defaultValue.length - 9);
+            a(o, s, format$4(/* @__PURE__ */ new Date(), l));
+          } else s.defaultValue == "{currentUserID}" ? a(o, s, this.info.id) : s.defaultValue == "{currentUser}" ? a(o, s, this.info.name) : s.controlType == "MultiSelect" || s.controlType == "MultiTreeSelect" || s.controlType == "MultiComboSelect" ? r(o, s, s.defaultValue.split(",")) : s.dataType === "Integer" ? a(o, s, parseInt(s.defaultValue)) : s.dataType === "Decimal" ? a(o, s, parseFloat(s.defaultValue)) : s.dataType === "Boolean" && s.defaultValue.toUpperCase == "TRUE" ? a(o, s, !0) : s.dataType === "Boolean" && s.defaultValue.toUpperCase == "FALSE" ? a(o, s, !1) : a(o, s, s.defaultValue);
+        else
+          (s.controlType == "Check" || s.controlType == "Switch") && s.dataType === "Boolean" ? a(o, s, !1) : a(o, s, null);
+      }), this.defaultData)
+        for (let s in this.defaultData)
+          a(o, s, this.defaultData[s]);
+      return o;
     }
   }
 };
@@ -38086,25 +38111,6 @@ const draggable = /* @__PURE__ */ getDefaultExportFromCjs(vuedraggable_umdExport
         r.needClear = !1, r.needRefresh = !1;
       }
     },
-    // 获取默认值
-    getDefaultData() {
-      let a = {};
-      this.columns.forEach((r) => {
-        if (r.defaultValue)
-          if (r.defaultValue == "{today}") {
-            let s = (/* @__PURE__ */ new Date()).toISOString().replace(/T.*/, "");
-            this.setData(a, r.code, new Date(s));
-          } else if (r.defaultValue.startsWith("{today(") && r.defaultValue.endsWith(")}")) {
-            let o = r.defaultValue.substr(7, r.defaultValue.length - 9);
-            this.setData(a, r.code, format$4(/* @__PURE__ */ new Date(), o));
-          } else r.defaultValue == "{currentUserID}" ? this.setData(a, r.code, this.info.id) : r.defaultValue == "{currentUser}" ? this.setData(a, r.code, this.info.name) : r.dataType === "Integer" ? this.setData(a, r.code, parseInt(r.defaultValue)) : r.dataType === "Decimal" ? this.setData(a, r.code, parseFloat(r.defaultValue)) : r.dataType === "Boolean" && r.defaultValue.toUpperCase == "TRUE" ? this.setData(a, r.code, !0) : r.dataType === "Boolean" && r.defaultValue.toUpperCase == "FALSE" ? this.setData(a, r.code, !1) : this.setData(a, r.code, r.defaultValue);
-        else
-          r.dataType === "Boolean" ? this.setData(a, r.code, !1) : this.setData(a, r.code, null);
-      });
-      for (let r in this.defaultData)
-        this.setData(a, r, this.defaultData[r]);
-      return a;
-    },
     // 编辑
     edit(a, r) {
       this.$emit("edit", { column: a, index: r });
@@ -40400,17 +40406,10 @@ const modalTable = /* @__PURE__ */ _export_sfc(_sfc_main$r, [["render", _sfc_ren
   computed: {},
   methods: {
     init() {
-      let a = this.data;
-      this.columns.forEach((r) => {
-        if (r.defaultValue)
-          if (r.defaultValue == "{today}") {
-            let s = (/* @__PURE__ */ new Date()).toISOString().replace(/T.*/, "");
-            this.setFilterData(a, r, new Date(s));
-          } else if (r.defaultValue.startsWith("{today(") && r.defaultValue.endsWith(")}")) {
-            let o = r.defaultValue.substr(7, r.defaultValue.length - 9);
-            this.setFilterData(a, r, format$4(/* @__PURE__ */ new Date(), o));
-          } else r.defaultValue == "{currentUserID}" ? this.setFilterData(a, r, this.info.id) : r.defaultValue == "{currentUser}" ? this.setFilterData(a, r, this.info.name) : r.dataType === "Integer" ? this.setFilterData(a, r, parseInt(r.defaultValue)) : r.dataType === "Decimal" ? this.setFilterData(a, r, parseFloat(r.defaultValue)) : r.dataType === "Boolean" && r.defaultValue.toUpperCase == "TRUE" ? this.setFilterData(a, r, !0) : r.dataType === "Boolean" && r.defaultValue.toUpperCase == "FALSE" ? this.setFilterData(a, r, !1) : this.setFilterData(a, r, r.defaultValue);
-      }), setTimeout(() => {
+      let a = this.getDefaultData(this.setFilterData, this.setArrayFilterData);
+      for (let r in a)
+        this.data[r] = a[r];
+      setTimeout(() => {
         this.initStaticItem(), this.initTrigger(), this.onDataChange();
       });
     },
@@ -41687,29 +41686,6 @@ const tableSetting = /* @__PURE__ */ _export_sfc(_sfc_main$p, [["render", _sfc_r
         this.initTab(), this.initStaticItem(), this.initTrigger(), this.onDataChange();
       });
     },
-    /**
-     * 获取默认值
-     *
-     * @public
-     */
-    getDefaultData() {
-      let a = {};
-      this.columns.forEach((r) => {
-        if (r.defaultValue)
-          if (r.defaultValue == "{today}") {
-            let s = (/* @__PURE__ */ new Date()).toISOString().replace(/T.*/, "");
-            this.setData(a, r.code, new Date(s));
-          } else if (r.defaultValue.startsWith("{today(") && r.defaultValue.endsWith(")}")) {
-            let o = r.defaultValue.substr(7, r.defaultValue.length - 9);
-            this.setData(a, r.code, format$4(/* @__PURE__ */ new Date(), o));
-          } else r.defaultValue == "{currentUserID}" ? this.setData(a, r.code, this.info.id) : r.defaultValue == "{currentUser}" ? this.setData(a, r.code, this.info.name) : r.dataType === "Integer" ? this.setData(a, r.code, parseInt(r.defaultValue)) : r.dataType === "Decimal" ? this.setData(a, r.code, parseFloat(r.defaultValue)) : r.dataType === "Boolean" && r.defaultValue.toUpperCase == "TRUE" ? this.setData(a, r.code, !0) : r.dataType === "Boolean" && r.defaultValue.toUpperCase == "FALSE" ? this.setData(a, r.code, !1) : this.setData(a, r.code, r.defaultValue);
-        else
-          (r.controlType == "Check" || r.controlType == "Switch") && r.dataType === "Boolean" ? this.setData(a, r.code, !1) : this.setData(a, r.code, null);
-      });
-      for (let r in this.defaultData)
-        this.setData(a, r, this.defaultData[r]);
-      return a;
-    },
     /**
      * 重置
      *
@@ -43252,26 +43228,6 @@ const _sfc_main$n = {
         }));
       });
     },
-    /**
-     * 获取默认值
-     *
-     * @public
-     */
-    getDefaultData() {
-      let a = {};
-      return this.columns.forEach((r) => {
-        if (r.defaultValue)
-          if (r.defaultValue == "{today}") {
-            let s = (/* @__PURE__ */ new Date()).toISOString().replace(/T.*/, "");
-            this.setData(a, r.code, new Date(s));
-          } else if (r.defaultValue.startsWith("{today(") && r.defaultValue.endsWith(")}")) {
-            let o = r.defaultValue.substr(7, r.defaultValue.length - 9);
-            this.setData(a, r.code, format$4(/* @__PURE__ */ new Date(), o));
-          } else r.defaultValue == "{currentUserID}" ? this.setData(a, r.code, this.info.id) : r.defaultValue == "{currentUser}" ? this.setData(a, r.code, this.info.name) : r.dataType === "Integer" ? this.setData(a, r.code, parseInt(r.defaultValue)) : r.dataType === "Decimal" ? this.setData(a, r.code, parseFloat(r.defaultValue)) : r.dataType === "Boolean" && r.defaultValue.toUpperCase == "TRUE" ? this.setData(a, r.code, !0) : r.dataType === "Boolean" && r.defaultValue.toUpperCase == "FALSE" ? this.setData(a, r.code, !1) : this.setData(a, r.code, r.defaultValue);
-        else
-          r.dataType === "Boolean" ? this.setData(a, r.code, !1) : this.setData(a, r.code, null);
-      }), a;
-    },
     /**
      * 添加新行
      *
@@ -43345,7 +43301,7 @@ const _sfc_main$n = {
       if (this.static ? a = this.copy(this.staticData) : a = this.copy(this.data), a.forEach((r) => {
         for (let o in r)
           o.startsWith("_") && delete r[o];
-      }), console.log("data", a), this.tableView.adjustEnable) {
+      }), this.tableView.adjustEnable) {
         let r = 0;
         for (let o of a)
           o.orderNo = r, r += 10;
@@ -43862,7 +43818,6 @@ const _sfc_main$n = {
     },
     // 打开弹出表单
     async openModalForm(a, r) {
-      console.log("control", a);
       let o;
       a.formView.isCustom ? o = await customModelApi.get(a.formView.model, r) : o = await modelApi.get(a.formView.model, r), a.open(o);
     }
@@ -44684,7 +44639,7 @@ function _sfc_render$n(a, r, o, s, l, u) {
     ], 2)
   ], 2);
 }
-const viewTable = /* @__PURE__ */ _export_sfc(_sfc_main$n, [["render", _sfc_render$n], ["__scopeId", "data-v-89d27d4b"]]), __vite_glob_1_32 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+const viewTable = /* @__PURE__ */ _export_sfc(_sfc_main$n, [["render", _sfc_render$n], ["__scopeId", "data-v-4273ba1a"]]), __vite_glob_1_32 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
   default: viewTable
 }, Symbol.toStringTag, { value: "Module" })), _sfc_main$m = {