agilebuilder-ui 1.1.2-tmp7 → 1.1.2-tmp9

package/lib/super-ui.js

@@ -18431,6 +18431,7 @@ const customFormatter$1 = {
     bus.$off(this.componentId + "-pickFileDone"), bus.$off(this.componentId + "-uploadFileDone"), bus.$off(this.componentId + "-scanDone");
   },
   methods: {
+    ...customFormatter$1,
     /**
      * @author: 梁旭
      * @description: 获取提示标题
@@ -18926,10 +18927,6 @@ const customFormatter$1 = {
           return this.dataSourceType === "mysql" ? !0 : 1;
         if (e === "inactiveValue")
           return this.dataSourceType === "mysql" ? !1 : 0;
-        if (e === "offColor")
-          return "#ff4949";
-        if (e === "onColor")
-          return "#13ce66";
       }
     },
     scanClick() {
@@ -18965,7 +18962,7 @@ const customFormatter$1 = {
         const o = JSON.parse(JSON.stringify(n));
         o && Array.isArray(o) ? (format.multPage = !0, o.forEach((l) => {
           l.jumpPageSetting.displayTextJudge && l.jumpPageSetting.dynamicTags && l.jumpPageSetting.dynamicTags.length > 0 && (l.jumpPageSetting.displayText = l.jumpPageSetting.dynamicTags.join("-#-#"));
-        })) : o.displayTextJudge && o.dynamicTags && o.dynamicTags.length > 0 && (o.displayText = o.dynamicTags.join("-#-#")), customFormatter$1.jumpPageLink(this.column, this.row, this.listCode, this.rowIndex, o);
+        })) : o.displayTextJudge && o.dynamicTags && o.dynamicTags.length > 0 && (o.displayText = o.dynamicTags.join("-#-#")), this.jumpPageLink(this.column, this.row, this.listCode, this.rowIndex, o);
       } else
         this.callCustomEvent(e);
     }
@@ -19345,11 +19342,9 @@ function _sfc_render$_(e, t, n, o, l, u) {
       disabled: n.disabled,
       "inactive-text": u.getSwitchConfig("inactiveText"),
       "inactive-value": u.getSwitchConfig("inactiveValue"),
-      "active-color": u.getSwitchConfig("onColor"),
-      "inactive-color": u.getSwitchConfig("offColor"),
       onChange: t[82] || (t[82] = (ne) => u.cellEvent("change", ne)),
       onInput: t[83] || (t[83] = (ne) => u.cellEvent("input", ne, !0))
-    }, null, 8, ["modelValue", "active-text", "active-value", "disabled", "inactive-text", "inactive-value", "active-color", "inactive-color"])) : n.type === "slider" ? (openBlock(), createBlock(X, {
+    }, null, 8, ["modelValue", "active-text", "active-value", "disabled", "inactive-text", "inactive-value"])) : n.type === "slider" ? (openBlock(), createBlock(X, {
       key: 16,
       ref: "item",
       modelValue: l.innerValue,
@@ -36481,6 +36476,11 @@ const _sfc_main$s = {
     openTree: {
       type: Boolean,
       default: !0
+    },
+    // 当前表单变量数据信息
+    pageModels: {
+      type: Object,
+      default: null
     }
   },
   data() {
@@ -36514,14 +36514,18 @@ const _sfc_main$s = {
       }
     },
     getPropName(e, t, n) {
-      return getPropNameWhenJoinTable(e, t, n);
+      return e && e.startsWith("${") && (e = e.substring(e.indexOf(".") + 1, e.length - 1)), getPropNameWhenJoinTable(e, t, n);
+    },
+    getPropType(e) {
+      let t = "data";
+      return e && e.startsWith("${") && (t = e.substring(2, e.indexOf("."))), t;
     },
     // 清空已选的结果
     emptyOrganizationResult() {
       const e = this.fields;
       e && e.length > 0 && (e.forEach((t) => {
-        const n = this.getPropName(t.model);
-        this.setValue(n, null);
+        const n = this.getPropName(t.model), o = this.getPropType(t.model);
+        this.setValue(n, null, o);
       }), this.selectOrganizationAllInfo = {}, this.selectOrganizationInfo = null, this.searchField = null);
     },
     // 关闭组织树
@@ -36533,23 +36537,31 @@ const _sfc_main$s = {
       typeof o > "u" && (o = !1);
       const l = this.treeType, u = this.fields;
       u && u.length > 0 && u.forEach((d) => {
-        const v = d.type, _ = this.getOrgSelectData(v, e, this.isUserTree(l), o), E = this.getPropName(d.model);
-        this.getOrgDataModel(E, _, o, v, t, n);
+        const v = d.type, _ = this.getOrgSelectData(v, e, this.isUserTree(l), o), E = this.getPropName(d.model), S = this.getPropType(d.model);
+        this.getOrgDataModel(E, _, o, v, t, n, S);
       });
     },
     /**
      * @param orgDataType 字段属性：id、name、loginName、code、email、telephone
      */
-    getOrgDataModel(e, t, n, o, l, u) {
+    getOrgDataModel(e, t, n, o, l, u, d) {
       if (n) {
-        const d = this.getModelValue(e);
-        this.selectOrganizationAllInfo[o] = t, this.setValue(e, t), this.$emit("replace", e, d, t);
+        const v = this.getModelValue(e, d);
+        this.selectOrganizationAllInfo[o] = t, this.setValue(e, t, d), this.$emit("replace", e, v, t);
       } else
-        this.setValue(e, t);
-    },
-    getModelValue(e) {
-      let t = "";
-      return this.isJoinTable === !1 && e && e.indexOf(".") > 0 ? t = this.getParentObject(e, this.models)[e.substring(e.lastIndexOf(".") + 1)] : (e = this.getPropName(e), t = this.models[e]), t;
+        this.setValue(e, t, d);
+    },
+    getModelValue(e, t) {
+      let n = this.models;
+      t && t === "page" && (n = this.pageModels);
+      let o = "";
+      if (this.isJoinTable === !1 && e && e.indexOf(".") > 0)
+        o = this.getParentObject(e, n)[e.substring(e.lastIndexOf(".") + 1)];
+      else {
+        const l = this.getPropName(e);
+        t && t === "page" ? o = n ? n[l] : null : o = n[l];
+      }
+      return o;
     },
     // 是否是人员树
     isUserTree(e) {
@@ -36673,9 +36685,9 @@ const _sfc_main$s = {
           if (l && l.length > 0) {
             const u = l[0];
             if (u) {
-              const d = this.getPropName(u.model), v = this.getModelValue(d);
-              if (v && v !== null && v !== "") {
-                this.selectOrganizationInfo = v, this.searchField = o;
+              const d = this.getPropName(u.model), v = this.getPropType(u.model), _ = this.getModelValue(d, v);
+              if (_ && _ !== null && _ !== "") {
+                this.selectOrganizationInfo = _, this.searchField = o;
                 break;
               }
             }
@@ -36690,14 +36702,21 @@ const _sfc_main$s = {
           }
         }
     },
-    setValue(e, t) {
-      if (this.models) {
+    setValue(e, t, n) {
+      n || (n = this.getPropType(e));
+      let o = this.models;
+      n && n === "page" && (o = this.pageModels), this.setEntityValue(e, t, o);
+    },
+    setEntityValue(e, t, n) {
+      if (n) {
         if (this.isJoinTable === !1 && e && e.indexOf(".") > 0) {
-          const n = this.getParentObject(e, this.models);
-          n && setEntityFieldValue(n, e.substring(e.lastIndexOf(".") + 1), t);
-        } else
-          e = this.getPropName(e), setEntityFieldValue(this.models, e, t);
-        console.log("this.value", this.models), this.$emit("setValue", e, t), (t == null || t === "") && this.$emit("clear", e);
+          const o = this.getParentObject(e, n);
+          o && setEntityFieldValue(o, e.substring(e.lastIndexOf(".") + 1), t);
+        } else {
+          const o = this.getPropName(e);
+          setEntityFieldValue(n, o, t);
+        }
+        console.log("this.value===models=", n), this.$emit("setValue", e, t), (t == null || t === "") && this.$emit("clear", e);
       }
     },
     getParentObject(e, t) {