agilebuilder-ui 1.0.85-temp2 → 1.0.85-temp3

package/lib/super-ui.js

@@ -18478,54 +18478,18 @@ function initialization(e, t, n, o, l, s, d, m) {
       debugger;
       for (let k = 0; k < e.length; k++) {
         const O = e[k];
-        if (O.jumpConditionType === "none")
-          return initialization(
-            O.jumpPageSetting,
-            t,
-            n,
-            o,
-            l,
-            s,
-            d,
-            m
-          );
-        if (O.jumpConditionType === "config")
-          if (O.conditions && O.conditions.length > 0) {
-            if (analysisCondition(
-              JSON.stringify(O.conditions),
-              t,
-              E,
-              S,
-              n,
-              s,
-              d,
-              m
-            ))
-              return initialization(
-                O.jumpPageSetting,
-                t,
-                n,
-                o,
-                l,
-                s,
-                d,
-                m
-              );
-          } else
-            return initialization(
-              O.jumpPageSetting,
-              t,
-              n,
-              o,
-              l,
-              s,
-              d,
-              m
-            );
-        else
-          O.jumpConditionType;
+        O.jumpConditionType === "none" || (O.jumpConditionType === "config" ? O.conditions && O.conditions.length > 0 && analysisCondition(
+          JSON.stringify(O.conditions),
+          t,
+          E,
+          S,
+          n,
+          s,
+          d,
+          m
+        ) : O.jumpConditionType);
         const B = initialization(
-          O,
+          O.jumpPageSetting,
           t,
           n,
           o,
@@ -18534,8 +18498,10 @@ function initialization(e, t, n, o, l, s, d, m) {
           d,
           m
         );
-        if (B && B.visible)
-          return B;
+        if (B && B.visible) {
+          const R = { ...B };
+          return R.jumpPageSetting = JSON.stringify(O.jumpPageSetting), R;
+        }
       }
     }
     y.visible = !0;
@@ -20929,14 +20895,7 @@ const DynamicInput = /* @__PURE__ */ _export_sfc$1(_sfc_main$1m, [["render", _sf
     if (this.customFormat) {
       let l = e[t];
       this.isObjectProp(t) && (l = this.objectPropOriginalValue(e, t));
-      const s = doFormat$1(this.column, l), d = n.call(
-        this,
-        l,
-        s,
-        e,
-        this.column,
-        o
-      );
+      const s = doFormat$1(this.column, l), d = n.call(this, l, s, e, this.column, o);
       return typeof d > "u" ? !1 : (window.$vueApp.component(t + o, d), !0);
     } else
       return !1;
@@ -20968,12 +20927,7 @@ const DynamicInput = /* @__PURE__ */ _export_sfc$1(_sfc_main$1m, [["render", _sf
       if (n.childAnnexDataTableCode) {
         const o = analysisFileSetObj(n, this.isSql), l = this.objectPropValue(e, t.prop);
         if (l && l.length > 0) {
-          const s = otherFilesToStandard(
-            n,
-            o,
-            l,
-            null
-          );
+          const s = otherFilesToStandard(n, o, l, null);
           return s[s.length - 1].showName;
         }
       } else
@@ -20983,12 +20937,7 @@ const DynamicInput = /* @__PURE__ */ _export_sfc$1(_sfc_main$1m, [["render", _sf
       if (n.childAnnexDataTableCode) {
         const o = analysisFileSetObj(n, this.isSql), l = this.objectPropValue(e, t.prop);
         if (l && l.length > 0) {
-          const s = otherFilesToStandard(
-            n,
-            o,
-            l,
-            null
-          );
+          const s = otherFilesToStandard(n, o, l, null);
           return s[s.length - 1].showName;
         }
       } else
@@ -21030,29 +20979,14 @@ const DynamicInput = /* @__PURE__ */ _export_sfc$1(_sfc_main$1m, [["render", _sf
   },
   onClickFun(e, t, n, o, l) {
     const s = this.getColumnValue(e, t);
-    n.call(
-      this,
-      s.originalValue,
-      s.formatValue,
-      e,
-      t,
-      o,
-      l
-    );
+    n.call(this, s.originalValue, s.formatValue, e, t, o, l);
   },
   isShowButtonFun(e, t, n, o) {
     if (n === void 0)
       return !0;
     if (typeof n == "function") {
       const l = this.getColumnValue(e, t);
-      let s = n.call(
-        this,
-        l.originalValue,
-        l.formatValue,
-        e,
-        t,
-        o
-      );
+      let s = n.call(this, l.originalValue, l.formatValue, e, t, o);
       return s === void 0 && (s = !0), s;
     } else
       return n;
@@ -21074,7 +21008,8 @@ const DynamicInput = /* @__PURE__ */ _export_sfc$1(_sfc_main$1m, [["render", _sf
         y,
         m.pageContext
       );
-      k && k.label && k.label !== "" ? console.log("label存在") : k.label = this.objectPropValueTwo(t, e), k && k.title && k.title !== "" ? console.log("title存在") : k.title = k.label, E = k;
+      debugger;
+      k.jumpPageSetting && (e.formatter.options.format = k.jumpPageSetting), k && k.label && k.label !== "" ? console.log("label存在") : k.label = this.objectPropValueTwo(t, e), k && k.title && k.title !== "" ? console.log("title存在") : k.title = k.label, E = k;
     } else
       E.visible = !0, E.label = this.objectPropValueTwo(t, e), E.title = E.label;
     return E;
@@ -21085,15 +21020,9 @@ const DynamicInput = /* @__PURE__ */ _export_sfc$1(_sfc_main$1m, [["render", _sf
     if (e && e.formatter && e.formatter.options && e.formatter.options.format && (l = e.formatter.options.format), l && l !== "") {
       let s = !0;
       const d = store$1.get(n), m = JSON.parse(l);
-      if (console.log(
-        "gupre-grid---clickHyperLink--jumpPageSetting=",
-        m
-      ), m.beforeClick) {
+      if (console.log("gupre-grid---clickHyperLink--jumpPageSetting=", m), m.beforeClick) {
         const y = m.beforeClick;
-        if (console.log(
-          "gupre-grid---clickHyperLink--jumpPageSetting.beforeClick=",
-          y
-        ), console.log(
+        if (console.log("gupre-grid---clickHyperLink--jumpPageSetting.beforeClick=", y), console.log(
           "gupre-grid---clickHyperLink--gridParams.options[eventCallBack]=",
           d.options.eventCallBack
         ), d.options && d.options.eventCallBack && d.options.eventCallBack[y] && typeof d.options.eventCallBack[y] == "function") {
@@ -21104,36 +21033,20 @@ const DynamicInput = /* @__PURE__ */ _export_sfc$1(_sfc_main$1m, [["render", _sf
             listCode: n,
             additionalParamMap: d.additionalParamMap
           };
-          s = d.options.eventCallBack[y].call(
-            this,
-            E
-          );
+          s = d.options.eventCallBack[y].call(this, E);
         }
       }
       isPromise$1(s) ? s.then((y) => {
-        this.doClickHyperLink(
-          t,
-          n,
-          o,
-          m,
-          d
-        );
-      }) : this.doClickHyperLink(
-        t,
-        n,
-        o,
-        m,
-        d
-      );
+        this.doClickHyperLink(t, n, o, m, d);
+      }) : this.doClickHyperLink(t, n, o, m, d);
     }
   },
   doClickHyperLink(e, t, n, o, l) {
     let s = null;
-    l.options.extraParam && l.options.extraParam.entityMap && (s = l.options.extraParam.entityMap), console.log(
-      "ridParams.options.extraParam.entityMap",
-      l.options.extraParam
+    l.options.extraParam && l.options.extraParam.entityMap && (s = l.options.extraParam.entityMap), console.log("ridParams.options.extraParam.entityMap", l.options.extraParam);
+    const d = JSON.parse(
+      JSON.stringify(l.pageContext && l.pageContext.page ? l.pageContext.page : {})
     );
-    const d = JSON.parse(JSON.stringify(l.pageContext && l.pageContext.page ? l.pageContext.page : {}));
     o._pageData = d, jumpToPage(
       o,
       l.system,
@@ -21156,7 +21069,16 @@ const DynamicInput = /* @__PURE__ */ _export_sfc$1(_sfc_main$1m, [["render", _sf
     o.options.extraParam && o.options.extraParam.entityMap && (y = o.options.extraParam.entityMap);
     let E = {}, S;
     if (e && e.formatter && e.formatter.options && e.formatter.options.format && (S = e.formatter.options.format), S && S !== "") {
-      const k = initialization(JSON.parse(S), t, n, d, m, s, y, o.pageContext);
+      const k = initialization(
+        JSON.parse(S),
+        t,
+        n,
+        d,
+        m,
+        s,
+        y,
+        o.pageContext
+      );
       k && k.label && k.label !== "" ? console.log("label存在") : k.label = this.objectPropValueTwo(t, e), k && k.title && k.title !== "" ? console.log("title存在") : k.title = k.label, E = k;
     } else
       E.visible = !0, E.label = this.objectPropValueTwo(t, e), E.title = E.label;