super-page-runtime 2.3.10 → 2.3.12-sit1

package/dist/es/components/runtime/views/assemblys/data/table/main-table-runtime.vue.js

@@ -176,27 +176,27 @@ const z = ["id"], W = e({ __name: "main-table-runtime", props: { pageContext: {}
       d(Y, J, { originalValue: e3, formatValue: t2, row: n2, column: o2, rowIndex: i2 });
     }
   }
-  function Ve(e3) {
-    if (!Y.dataTypeMaps) return;
-    const t2 = Y.dataTypeMaps;
-    let n2 = [];
-    if (e3) for (var o2 in e3) {
-      const a2 = e3[o2];
-      if (null != a2 && "" !== a2) if (a2 instanceof Array) {
-        if (a2.length > 0) {
+  function Ve(e3, t2) {
+    if (!t2 && !Y.dataTypeMaps) return;
+    const n2 = t2 || Y.dataTypeMaps;
+    let o2 = [];
+    if (e3) for (var i2 in e3) {
+      const t3 = e3[i2];
+      if (null != t3 && "" !== t3) if (t3 instanceof Array) {
+        if (t3.length > 0) {
           const e4 = [];
-          for (var i2 = 0; i2 < a2.length; i2++) {
-            const n3 = {};
-            n3.leftBracket = 0 === i2 ? "((" : "(", n3.propName = o2, n3.propDbName = o2, n3.dataType = t2[o2] ? t2[o2] : "TEXT", n3.operator = "EQ", n3.propValue = a2[i2], i2 === a2.length - 1 ? (n3.rightBracket = "))", n3.joinSign = "and") : (n3.rightBracket = ")", n3.joinSign = "or"), e4.push(n3);
+          for (var a2 = 0; a2 < t3.length; a2++) {
+            const o3 = {};
+            o3.leftBracket = 0 === a2 ? "((" : "(", o3.propName = i2, o3.propDbName = i2, o3.dataType = n2[i2] ? n2[i2] : "TEXT", o3.operator = "EQ", o3.propValue = t3[a2], a2 === t3.length - 1 ? (o3.rightBracket = "))", o3.joinSign = "and") : (o3.rightBracket = ")", o3.joinSign = "or"), e4.push(o3);
           }
-          n2 = n2.concat(e4);
+          o2 = o2.concat(e4);
         }
       } else {
         const e4 = { leftBracket: "(" };
-        e4.propName = o2, e4.propDbName = o2, e4.dataType = t2[o2] ? t2[o2] : "TEXT", e4.operator = "EQ", e4.propValue = a2, Ze(e4, o2), e4.rightBracket = ")", e4.joinSign = "and", n2.push(e4);
+        e4.propName = i2, e4.propDbName = i2, e4.dataType = n2[i2] ? n2[i2] : "TEXT", e4.operator = "EQ", e4.propValue = t3, Ze(e4, i2), e4.rightBracket = ")", e4.joinSign = "and", o2.push(e4);
       }
     }
-    ue.value.toolbarRefresh(null, null, n2);
+    ue.value.toolbarRefresh(null, null, o2);
   }
   function je(e3) {
     const t2 = Ne();
@@ -207,7 +207,6 @@ const z = ["id"], W = e({ __name: "main-table-runtime", props: { pageContext: {}
   }
   function Ne() {
     if (!ue.value) return;
-    Q.configure.name, Q.configure;
     const e3 = U(Q.pageContext, Q.configure);
     if (e3) {
       if (e3.isCalcHeight) {
@@ -283,7 +282,7 @@ const z = ["id"], W = e({ __name: "main-table-runtime", props: { pageContext: {}
   }
   n(() => {
     const e3 = Ke();
-    ue.value && e3 && e3.distanceToBottom && (ue.value.tableHeight = e3.distanceToBottom - 110), Q.pageContext.pageRuntimeStyle && Q.pageContext.pageRuntimeStyle.height, window.addEventListener("message", Pe), F.$on(pe + "-close-component-page-dialog", function({ jumpInfo: e4, popEntity: t2, popPageCode: n2 }) {
+    ue.value && e3 && e3.distanceToBottom && (ue.value.tableHeight = e3.distanceToBottom - 110), Q.pageContext.pageRuntimeStyle, window.addEventListener("message", Pe), F.$on(pe + "-close-component-page-dialog", function({ jumpInfo: e4, popEntity: t2, popPageCode: n2 }) {
       ue.value.closePageDialog({ entity: t2, pageCode: n2, jumpInfo: e4 });
     }), F.$on(pe + "_close-dialog-get-entity", () => {
       F.$emit(pe + "_close-super-dialog");
@@ -365,7 +364,7 @@ const z = ["id"], W = e({ __name: "main-table-runtime", props: { pageContext: {}
   }, getTableData: function() {
     var _a;
     return (_a = ue.value) == null ? void 0 : _a.getTableData();
-  } }), (e3, t2) => {
+  }, searchGridData: Ve }), (e3, t2) => {
     const n2 = a("super-grid");
     return r(), l("div", { ref_key: "tableDivRef", ref: re, id: u(ce) + "_tableDiv" }, [s(n2, { ref_key: "gridRef", ref: ue, url: u(se), options: le.value, code: u(ce), settings: u(ve), "search-form-info": ge.value, "list-toolbar-form-data": u(fe), onSelect: Fe, onSelectAll: He, onSelectionChange: Ue, onCellClick: Le, onCellDblclick: Me, onRowClick: $e, onRowDblclick: _e, onHeaderClick: Ae, onRefresh: Ge, onNewOpenGridDialog: u(P), onCanShowMobileSearch: ze, onGridOnmounted: we }, null, 8, ["url", "options", "code", "settings", "search-form-info", "list-toolbar-form-data", "onNewOpenGridDialog"])], 8, z);
   };

package/dist/es/components/runtime/views/assemblys/data/table/table-runtime.vue2.js

@@ -1,4 +1,4 @@
-import { defineComponent as e, ref as t, onUnmounted as n, createElementBlock as u, openBlock as o, createBlock as a, createCommentVNode as l, unref as r } from "vue";
+import { defineComponent as e, ref as t, onUnmounted as n, createElementBlock as u, openBlock as a, createBlock as o, createCommentVNode as l, unref as r } from "vue";
 import i from "./sub-table-runtime.vue.js";
 import c from "./main-table-runtime.vue.js";
 const f = e({ __name: "table-runtime", props: { pageContext: {}, configure: {} }, setup(e2, { expose: f2 }) {
@@ -72,7 +72,10 @@ const f = e({ __name: "table-runtime", props: { pageContext: {}, configure: {} }
   }, addRequiredClass: function(e3, t2, n2) {
     var _a;
     (_a = b.value) == null ? void 0 : _a.addRequiredClass(e3, t2, n2);
-  } }), (e3, t2) => (o(), u("div", null, [r(g) && "form" === r(g) && C.value ? (o(), a(i, { key: 0, ref_key: "gridRef", ref: b, pageContext: e3.pageContext, configure: d.value, onSetSafeDeleteTableCode: E }, null, 8, ["pageContext", "configure"])) : r(g) && "form" === r(g) ? l("", true) : (o(), a(c, { key: 1, ref_key: "gridRef", ref: b, pageContext: e3.pageContext, configure: d.value, onSetSafeDeleteTableCode: E }, null, 8, ["pageContext", "configure"]))]));
+  }, searchGridData: function(e3, t2) {
+    var _a;
+    (_a = b.value) == null ? void 0 : _a.searchGridData(e3, t2);
+  } }), (e3, t2) => (a(), u("div", null, [r(g) && "form" === r(g) && C.value ? (a(), o(i, { key: 0, ref_key: "gridRef", ref: b, pageContext: e3.pageContext, configure: d.value, onSetSafeDeleteTableCode: E }, null, 8, ["pageContext", "configure"])) : r(g) && "form" === r(g) ? l("", true) : (a(), o(c, { key: 1, ref_key: "gridRef", ref: b, pageContext: e3.pageContext, configure: d.value, onSetSafeDeleteTableCode: E }, null, 8, ["pageContext", "configure"]))]));
 } });
 export {
   f as default

package/dist/es/components/runtime/views/assemblys/form/custom/custom-runtime.vue2.js

@@ -1,62 +1,67 @@
-import { defineComponent as e, ref as t, computed as o, onMounted as a, nextTick as n, onUnmounted as i, resolveComponent as u, createBlock as l, createElementBlock as r, createCommentVNode as s, openBlock as p, normalizeStyle as c, normalizeClass as g, unref as m, withCtx as d, resolveDynamicComponent as f, toDisplayString as v } from "vue";
+import { defineComponent as e, computed as t, ref as o, onMounted as n, nextTick as a, onUnmounted as i, resolveComponent as u, createBlock as l, createElementBlock as r, createCommentVNode as s, openBlock as p, normalizeStyle as c, normalizeClass as f, unref as m, withCtx as d, resolveDynamicComponent as g, toDisplayString as v } from "vue";
 import { getFormModelFields as C } from "../../../../utils/page-init-util.js";
 import { setVariableValue as x, getVariableValue as y, formatVariableValue as b, getFormPropName as h, setVariableValueWithProp as j } from "../../../../utils/page-helper-util.js";
 import { handleAfterInitEvent as R, handleEvent as k } from "../../../../utils/events/event-util.js";
 import { updateFormItemEditState as V } from "../../../../utils/events/validator-util.js";
-import { getListCode as _, addRequiredClassUtil as D } from "../../../../utils/common-util.js";
-import { getComponentRef as E } from "../../../../utils/global-refs.js";
+import { getListCode as _ } from "../../../../utils/common-util.js";
+import { getComponentRef as D } from "../../../../utils/global-refs.js";
 import { getAdditionalParamMap as w } from "../../../../utils/events/standard-event.js";
-import { $t as S } from "../../../../utils/i18n-util.js";
-import U from "../../../../utils/eventBus.js";
-import { functions as F } from "../../../../utils/api/page-expose-util.js";
-const q = { key: 0, style: { width: "100%", height: "100%" } }, O = { key: 1, style: { width: "100%", height: "100%" }, class: "amb-widget-richtext-single" }, $ = e({ __name: "custom-runtime", props: { pageContext: {}, configure: {} }, setup(e2, { expose: $2 }) {
-  const z = e2, G = t(null), H = z.pageContext.entity ? z.pageContext.entity : {}, P = C(z.pageContext, z.configure), I = o({ get: () => y(H, P), set(e3) {
-    x(H, P, e3), null != e3 && (G.value = "");
-  } }), A = z.configure.runtime ? z.configure.runtime : {}, B = A.style, W = A.class, J = A.headerStyle, K = t(A.props ? A.props : {}), L = function(e3) {
+import { $t as E } from "../../../../utils/i18n-util.js";
+import F from "../../../../utils/eventBus.js";
+import { functions as S } from "../../../../utils/api/page-expose-util.js";
+const U = { key: 0, style: { width: "100%", height: "100%" } }, q = { key: 1, style: { width: "100%", height: "100%" }, class: "amb-widget-richtext-single" }, $ = e({ __name: "custom-runtime", props: { pageContext: {}, configure: {} }, setup(e2, { expose: $2 }) {
+  const O = e2, z = O.pageContext.entity ? O.pageContext.entity : {}, G = C(O.pageContext, O.configure), H = t({ get: () => y(z, G), set(e3) {
+    x(z, G, e3);
+  } }), P = O.configure.runtime ? O.configure.runtime : {}, I = P.style, A = P.class, B = P.headerStyle, W = o(P.props ? P.props : {}), J = function(e3) {
     let t2 = {};
     if (e3) for (let o2 in e3) {
-      const a2 = e3[o2];
-      t2[o2] = b(z.pageContext, a2);
+      const n2 = e3[o2];
+      t2[o2] = b(O.pageContext, n2);
     }
     return t2;
-  }(A.customParams ? A.customParams : {}), M = w(z.pageContext), N = t(z.configure.props && z.configure.props.base ? z.configure.props.base.name : null);
-  function Q(e3, t2) {
-    j(H, e3, t2);
+  }(P.customParams ? P.customParams : {}), K = w(O.pageContext), L = o(O.configure.props && O.configure.props.base ? O.configure.props.base.name : null);
+  function M(e3, t2) {
+    j(z, e3, t2);
   }
-  function T(e3) {
-    F.isHasFieldAuthPermission(z.configure) ? V(z.pageContext, e3) : console.error("没有该字段的权限,dynamicFields=", P ? P.join(".") : "");
+  function N(e3) {
+    S.isHasFieldAuthPermission(O.configure) && V(O.pageContext, e3);
   }
-  function X() {
-    const e3 = z.pageContext.tableUuids;
+  function Q() {
+    const e3 = O.pageContext.tableUuids;
     e3 && e3.forEach((e4) => {
-      const t2 = _(z.pageContext.code, z.pageContext.version, z.configure.uuid), o2 = E(z.pageContext, e4);
+      const t2 = _(O.pageContext.code, O.pageContext.version, O.configure.uuid), o2 = D(O.pageContext, e4);
       o2 && o2.restoreGridEdit(t2);
     });
   }
-  z.configure.props.verification.custom && z.configure.props.verification.custom.enabled && (z.pageContext.customValidatorUuids || (z.pageContext.customValidatorUuids = []), z.pageContext.customValidatorUuids.push(z.configure.uuid));
-  const Y = z.pageContext.code, Z = t(P && P.length > 0 ? Y + "__" + P.join("__") : null), ee = t(null), te = t(null), oe = t(null);
-  function ae(e3) {
-    k(I.value, z.pageContext, z.configure, e3);
+  O.configure.props.verification.custom && O.configure.props.verification.custom.enabled && (O.pageContext.customValidatorUuids || (O.pageContext.customValidatorUuids = []), O.pageContext.customValidatorUuids.push(O.configure.uuid));
+  const T = O.pageContext.code, X = o(G && G.length > 0 ? T + "__" + G.join("__") : null), Y = o(null), Z = o(null), ee = o(null);
+  function te(e3) {
+    k(H.value, O.pageContext, O.configure, e3);
   }
-  return a(() => {
-    U.$on(Z.value + "-scanDone", (e3) => {
+  return n(() => {
+    F.$on(X.value + "-scanDone", (e3) => {
       const t2 = e3.result;
-      x(H, P, t2);
-    }), U.$on(Z.value + "-pickFileDone", (e3) => {
-      Z.value, ee.value.pickFileDone(e3);
-    }), n(() => {
-      const e3 = I.value;
-      R(e3, z.pageContext, z.configure, { formItemRef: te.value, componentRef: ee.value, titleRef: oe.value, value: e3, entity: z.pageContext.entity.data, pageData: z.pageContext.entity.page });
+      x(z, G, t2);
+    }), F.$on(X.value + "-pickFileDone", (e3) => {
+      Y.value.pickFileDone(e3);
+    }), a(() => {
+      const e3 = H.value;
+      R(e3, O.pageContext, O.configure, { formItemRef: Z.value, componentRef: Y.value, titleRef: ee.value, value: e3, entity: O.pageContext.entity.data, pageData: O.pageContext.entity.page });
     });
   }), i(() => {
-    U.$off(Z.value + "-scanDone"), U.$off(Z.value + "-pickFileDone");
+    F.$off(X.value + "-scanDone"), F.$off(X.value + "-pickFileDone");
   }), $2({ getCustomRef: function() {
-    return ee.value;
+    return Y.value;
+  }, invokeCustomFunction: function(e3, ...t2) {
+    if (Y.value && "function" == typeof Y.value[e3]) return Y.value[e3](...t2);
+    throw new Error(`执行失败：Function '${e3}' not found in custom component`);
+  }, hasCustomFunction: function(e3) {
+    return Y.value && "function" == typeof Y.value[e3];
   }, addRequiredClass: function() {
-    G.value = D();
+    requiredClass.value = addRequiredClassUtil();
   } }), (e3, t2) => {
     const o2 = u("el-form-item");
-    return K.value.tittleShow ? (p(), l(o2, { key: 0, ref_key: "formItemRef", ref: te, required: K.value.required, class: g(m(W) + (G.value ? " " + G.value : "")), "label-width": K.value.labelWidth, style: c(m(B)) }, { label: d(() => [K.value.tittleShow ? (p(), r("div", { key: 0, ref_key: "titleRef", ref: oe, style: c({ ...m(J) }) }, v(m(S)(K.value.title)), 5)) : s("", true)]), default: d(() => [N.value ? (p(), r("div", q, [(p(), l(f(N.value), { ref_key: "customRef", ref: ee, size: K.value.size, entity: e3.pageContext.entity.data, pageData: e3.pageContext.entity.page, pageContext: e3.pageContext, configureObj: e3.configure, prop: m(h)(e3.configure.props && e3.configure.props.base ? e3.configure.props.base.prop : null), "custom-params": m(L), modelValue: I.value, "onUpdate:modelValue": t2[0] || (t2[0] = (e4) => I.value = e4), disabled: "disabled" === K.value.state, "additional-param-map": m(M), "component-id": Z.value, onSetEntityValue: Q, onSetCustomRules: T, onRestoreGridEdit: X, onHandleEvent: ae, onChange: t2[1] || (t2[1] = (t3) => m(k)(I.value, e3.pageContext, e3.configure, "change")) }, null, 40, ["size", "entity", "pageData", "pageContext", "configureObj", "prop", "custom-params", "modelValue", "disabled", "additional-param-map", "component-id"]))])) : s("", true)]), _: 1 }, 8, ["required", "class", "label-width", "style"])) : N.value ? (p(), r("div", O, [(p(), l(f(N.value), { ref_key: "customRef", ref: ee, entity: e3.pageContext.entity.data, pageData: e3.pageContext.entity.page, pageContext: e3.pageContext, configureObj: e3.configure, prop: m(h)(e3.configure.props && e3.configure.props.base ? e3.configure.props.base.prop : null), "custom-params": m(L), modelValue: I.value, "onUpdate:modelValue": t2[2] || (t2[2] = (e4) => I.value = e4), disabled: "disabled" === K.value.state, "additional-param-map": m(M), "component-id": Z.value, onSetEntityValue: Q, onSetCustomRules: T, onRestoreGridEdit: X, onHandleEvent: ae, onChange: t2[3] || (t2[3] = (t3) => m(k)(I.value, e3.pageContext, e3.configure, "change")) }, null, 40, ["entity", "pageData", "pageContext", "configureObj", "prop", "custom-params", "modelValue", "disabled", "additional-param-map", "component-id"]))])) : s("", true);
+    return W.value.tittleShow ? (p(), l(o2, { key: 0, ref_key: "formItemRef", ref: Z, required: W.value.required, class: f(m(A)), "label-width": W.value.labelWidth, style: c(m(I)) }, { label: d(() => [W.value.tittleShow ? (p(), r("div", { key: 0, ref_key: "titleRef", ref: ee, style: c({ ...m(B) }) }, v(m(E)(W.value.title)), 5)) : s("", true)]), default: d(() => [L.value ? (p(), r("div", U, [(p(), l(g(L.value), { ref_key: "customRef", ref: Y, size: W.value.size, entity: e3.pageContext.entity.data, pageData: e3.pageContext.entity.page, pageContext: e3.pageContext, configureObj: e3.configure, prop: m(h)(e3.configure.props && e3.configure.props.base ? e3.configure.props.base.prop : null), "custom-params": m(J), modelValue: H.value, "onUpdate:modelValue": t2[0] || (t2[0] = (e4) => H.value = e4), disabled: "disabled" === W.value.state, "additional-param-map": m(K), "component-id": X.value, onSetEntityValue: M, onSetCustomRules: N, onRestoreGridEdit: Q, onHandleEvent: te, onChange: t2[1] || (t2[1] = (t3) => m(k)(H.value, e3.pageContext, e3.configure, "change")) }, null, 40, ["size", "entity", "pageData", "pageContext", "configureObj", "prop", "custom-params", "modelValue", "disabled", "additional-param-map", "component-id"]))])) : s("", true)]), _: 1 }, 8, ["required", "class", "label-width", "style"])) : L.value ? (p(), r("div", q, [(p(), l(g(L.value), { ref_key: "customRef", ref: Y, entity: e3.pageContext.entity.data, pageData: e3.pageContext.entity.page, pageContext: e3.pageContext, configureObj: e3.configure, prop: m(h)(e3.configure.props && e3.configure.props.base ? e3.configure.props.base.prop : null), "custom-params": m(J), modelValue: H.value, "onUpdate:modelValue": t2[2] || (t2[2] = (e4) => H.value = e4), disabled: "disabled" === W.value.state, "additional-param-map": m(K), "component-id": X.value, onSetEntityValue: M, onSetCustomRules: N, onRestoreGridEdit: Q, onHandleEvent: te, onChange: t2[3] || (t2[3] = (t3) => m(k)(H.value, e3.pageContext, e3.configure, "change")) }, null, 40, ["entity", "pageData", "pageContext", "configureObj", "prop", "custom-params", "modelValue", "disabled", "additional-param-map", "component-id"]))])) : s("", true);
   };
 } });
 export {

package/dist/es/components/runtime/views/assemblys/form/date-picker/datepicker-runtime.vue2.js

@@ -1,4 +1,4 @@
-import { defineComponent as e, ref as a, onMounted as l, nextTick as t, computed as o, resolveComponent as r, createBlock as u, openBlock as n, normalizeStyle as i, normalizeClass as p, unref as s, withCtx as c, createElementBlock as d, createCommentVNode as v, Fragment as f, createTextVNode as g, toDisplayString as m } from "vue";
+import { defineComponent as e, ref as a, onMounted as l, nextTick as t, computed as o, resolveComponent as u, createBlock as r, openBlock as n, normalizeStyle as i, normalizeClass as p, unref as s, withCtx as c, createElementBlock as d, createCommentVNode as v, Fragment as f, createTextVNode as g, toDisplayString as m } from "vue";
 import { getFormModelFields as h } from "../../../../utils/page-init-util.js";
 import { getDateShortCuts as y } from "../../../../utils/form/date-shortcuts.js";
 import { getModelFieldFromPageContext as C, getValueFromVariable as x, setVariableValue as b, getVariableValue as F, isDateDataType as k } from "../../../../utils/page-helper-util.js";
@@ -8,24 +8,24 @@ import Y from "dayjs";
 import { $t as _ } from "../../../../utils/i18n-util.js";
 import { addRequiredClassUtil as z } from "../../../../utils/common-util.js";
 const P = e({ __name: "datepicker-runtime", props: { pageContext: {}, configure: {} }, setup(e2, { expose: P2 }) {
-  const S = e2, w = a(null), q = S.pageContext.entity ? S.pageContext.entity : {}, A = S.configure.runtime ? S.configure.runtime : {}, D = A.style, $ = A.class, I = A.headerStyle, M = A.titleExceedStyle, B = a(A.props ? A.props : {});
-  let N = h(S.pageContext, S.configure, B.value.prop);
-  if (S.pageContext.modelFieldsMap && N && N.length > 0 && "data" === N[0]) {
-    const e3 = C(N, S.pageContext);
+  const S = e2, w = a(null), q = S.pageContext.entity ? S.pageContext.entity : {}, A = S.configure.runtime ? S.configure.runtime : {}, D = A.style, I = A.class, M = A.headerStyle, B = A.titleExceedStyle, N = a(A.props ? A.props : {});
+  let U = h(S.pageContext, S.configure, N.value.prop);
+  if (S.pageContext.modelFieldsMap && U && U.length > 0 && "data" === U[0]) {
+    const e3 = C(U, S.pageContext);
     e3 && function(e4) {
       const a2 = e4.dataType;
-      k(a2) && ("year" === B.value.dateType && "YYYY" === B.value.valueFormat || "month" === B.value.dateType && "YYYY-MM" === B.value.valueFormat) && (B.value.valueFormat = "x");
+      k(a2) && ("year" === N.value.dateType && "YYYY" === N.value.valueFormat || "month" === N.value.dateType && "YYYY-MM" === N.value.valueFormat) && (N.value.valueFormat = "x");
     }(e3);
   }
-  let U = null, W = false;
-  if (B.value.dateType && B.value.dateType.includes("range")) {
-    W = true;
-    let e3 = B.value.prop2;
+  let W = null, $ = false;
+  if (N.value.dateType && N.value.dateType.includes("range")) {
+    $ = true;
+    let e3 = N.value.prop2;
     e3 && e3.startsWith("${") || (e3 = "${page." + S.configure.uuid + "-2}");
     const a2 = x(q, e3, null);
-    if (e3 = e3.substring(2, e3.length - 1), U = e3.split("."), !(a2 || q.data && (q.data.id || q.data.ID)) && B.value.defaultValue2) {
-      const e4 = x(q, B.value.defaultValue2);
-      b(q, U, e4);
+    if (e3 = e3.substring(2, e3.length - 1), W = e3.split("."), !(a2 || q.data && (q.data.id || q.data.ID)) && N.value.defaultValue2) {
+      const e4 = x(q, N.value.defaultValue2);
+      b(q, W, e4);
     }
   }
   const E = a(null), O = a(null), G = a(null);
@@ -38,7 +38,7 @@ const P = e({ __name: "datepicker-runtime", props: { pageContext: {}, configure:
         let t2 = null;
         return t2 = "x" === a2 ? l2.toDate().getTime() : Y(e3).format(a2), t2;
       } catch (a3) {
-        return console.error("日期值格式化错误", a3), console.error(`value: ${e3} ,valueFormat: ${B.value.valueFormat}`), e3;
+        return e3;
       }
     }
     return e3;
@@ -48,28 +48,28 @@ const P = e({ __name: "datepicker-runtime", props: { pageContext: {}, configure:
       const e3 = J.value;
       T(e3, S.pageContext, S.configure, { formItemRef: E.value, componentRef: O.value, titleRef: G.value, value: e3, entity: S.pageContext.entity.data, pageData: S.pageContext.entity.page });
     });
-  }), N) {
-    const e3 = F(q, N), a2 = H(e3, B.value.valueFormat);
-    e3 !== a2 && b(q, N, a2);
-  }
-  if (U) {
-    const e3 = F(q, U), a2 = H(e3, B.value.valueFormat);
+  }), U) {
+    const e3 = F(q, U), a2 = H(e3, N.value.valueFormat);
     e3 !== a2 && b(q, U, a2);
   }
+  if (W) {
+    const e3 = F(q, W), a2 = H(e3, N.value.valueFormat);
+    e3 !== a2 && b(q, W, a2);
+  }
   const J = o({ get() {
-    if (W) {
+    if ($) {
       const e3 = [];
-      let a2 = F(q, N);
-      e3.push(H(a2, B.value.valueFormat));
-      let l2 = F(q, U);
-      return e3.push(H(l2, B.value.valueFormat)), e3;
+      let a2 = F(q, U);
+      e3.push(H(a2, N.value.valueFormat));
+      let l2 = F(q, W);
+      return e3.push(H(l2, N.value.valueFormat)), e3;
     }
-    return H(F(q, N), B.value.valueFormat);
+    return H(F(q, U), N.value.valueFormat);
   }, set(e3) {
-    W ? Array.isArray(e3) ? (b(q, N, e3[0]), b(q, U, e3[1]), w.value = "") : null === e3 && (b(q, N, null), b(q, U, null)) : (b(q, N, e3), null != e3 && (w.value = ""));
-  } }), K = a(y(B.value.dateScopeDetails, B.value.sourceType, B.value.dateType));
-  if (B.value.shortcutsFunc) {
-    const e3 = V(S.pageContext, B.value.shortcutsFunc);
+    $ ? Array.isArray(e3) ? (b(q, U, e3[0]), b(q, W, e3[1]), w.value = "") : null === e3 && (b(q, U, null), b(q, W, null)) : (b(q, U, e3), null != e3 && (w.value = ""));
+  } }), K = a(y(N.value.dateScopeDetails, N.value.sourceType, N.value.dateType));
+  if (N.value.shortcutsFunc) {
+    const e3 = V(S.pageContext, N.value.shortcutsFunc);
     if (e3) {
       let a2 = e3.apply(e3, [{ pageContext: S.pageContext, configureObj: S.configure }]);
       if (a2) {
@@ -81,8 +81,8 @@ const P = e({ __name: "datepicker-runtime", props: { pageContext: {}, configure:
   return P2({ addRequiredClass: function() {
     w.value = z();
   } }), (e3, a2) => {
-    const l2 = r("el-time-picker"), t2 = r("el-date-picker"), o2 = r("el-form-item");
-    return n(), u(o2, { ref_key: "formItemRef", ref: E, required: B.value.required, class: p(s($) + (w.value ? " " + w.value : "")), "label-width": B.value.labelWidth, style: i(s(D)) }, { label: c(() => [B.value.tittleShow ? (n(), d("div", { key: 0, ref_key: "titleRef", ref: G, style: i({ ...s(I), ...s(M) }) }, [B.value.prefixType ? (n(), u(R, { key: 0, pageContext: e3.pageContext, property: B.value }, null, 8, ["pageContext", "property"])) : (n(), d(f, { key: 1 }, [g(m(s(_)(B.value.title)), 1)], 64))], 4)) : v("", true)]), default: c(() => ["time" == B.value.dateType || "timerange" == B.value.dateType ? (n(), u(l2, { key: 0, ref_key: "componentRef", ref: O, "is-range": "timerange" == B.value.dateType, style: { width: "100%" }, "range-separator": "-", clearable: B.value.clearable, disabled: "disabled" === B.value.state, readonly: "readonly" === B.value.state, size: B.value.size, placeholder: B.value.placeholder, "start-placeholder": B.value.placeholder, "end-placeholder": B.value.endPlaceholder ? B.value.endPlaceholder : B.value.placeholder, "unlink-panels": true, format: B.value.format, "value-format": B.value.valueFormat, modelValue: J.value, "onUpdate:modelValue": a2[0] || (a2[0] = (e4) => J.value = e4), shortcuts: K.value, type: B.value.dateType, onChange: a2[1] || (a2[1] = (a3) => s(j)(a3, e3.pageContext, e3.configure, "change")), onBlur: a2[2] || (a2[2] = (a3) => s(j)(a3, e3.pageContext, e3.configure, "blur")), onFocus: a2[3] || (a2[3] = (a3) => s(j)(a3, e3.pageContext, e3.configure, "focus")), onVisibleChange: a2[4] || (a2[4] = (a3) => s(j)(a3, e3.pageContext, e3.configure, "visible-change")), onPanelChange: a2[5] || (a2[5] = (a3) => s(j)(a3, e3.pageContext, e3.configure, "panel-change")), onClear: a2[6] || (a2[6] = (a3) => s(j)(a3, e3.pageContext, e3.configure, "clear")) }, null, 8, ["is-range", "clearable", "disabled", "readonly", "size", "placeholder", "start-placeholder", "end-placeholder", "format", "value-format", "modelValue", "shortcuts", "type"])) : (n(), u(t2, { key: 1, ref_key: "componentRef", ref: O, clearable: B.value.clearable, style: { width: "100%" }, "unlink-panels": true, disabled: "disabled" === B.value.state, readonly: "readonly" === B.value.state, size: B.value.size, placeholder: B.value.placeholder, "start-placeholder": B.value.placeholder, "end-placeholder": B.value.endPlaceholder ? B.value.endPlaceholder : B.value.placeholder, format: B.value.format, "value-format": B.value.valueFormat, modelValue: J.value, "onUpdate:modelValue": a2[7] || (a2[7] = (e4) => J.value = e4), shortcuts: K.value, type: B.value.dateType, onChange: a2[8] || (a2[8] = (a3) => s(j)(a3, e3.pageContext, e3.configure, "change")), onBlur: a2[9] || (a2[9] = (a3) => s(j)(a3, e3.pageContext, e3.configure, "blur")), onFocus: a2[10] || (a2[10] = (a3) => s(j)(a3, e3.pageContext, e3.configure, "focus")), onVisibleChange: a2[11] || (a2[11] = (a3) => s(j)(a3, e3.pageContext, e3.configure, "visible-change")), onPanelChange: a2[12] || (a2[12] = (a3) => s(j)(a3, e3.pageContext, e3.configure, "panel-change")), onClear: a2[13] || (a2[13] = (a3) => s(j)(a3, e3.pageContext, e3.configure, "clear")) }, null, 8, ["clearable", "disabled", "readonly", "size", "placeholder", "start-placeholder", "end-placeholder", "format", "value-format", "modelValue", "shortcuts", "type"]))]), _: 1 }, 8, ["required", "class", "label-width", "style"]);
+    const l2 = u("el-time-picker"), t2 = u("el-date-picker"), o2 = u("el-form-item");
+    return n(), r(o2, { ref_key: "formItemRef", ref: E, required: N.value.required, class: p(s(I) + (w.value ? " " + w.value : "")), "label-width": N.value.labelWidth, style: i(s(D)) }, { label: c(() => [N.value.tittleShow ? (n(), d("div", { key: 0, ref_key: "titleRef", ref: G, style: i({ ...s(M), ...s(B) }) }, [N.value.prefixType ? (n(), r(R, { key: 0, pageContext: e3.pageContext, property: N.value }, null, 8, ["pageContext", "property"])) : (n(), d(f, { key: 1 }, [g(m(s(_)(N.value.title)), 1)], 64))], 4)) : v("", true)]), default: c(() => ["time" == N.value.dateType || "timerange" == N.value.dateType ? (n(), r(l2, { key: 0, ref_key: "componentRef", ref: O, "is-range": "timerange" == N.value.dateType, style: { width: "100%" }, "range-separator": "-", clearable: N.value.clearable, disabled: "disabled" === N.value.state, readonly: "readonly" === N.value.state, size: N.value.size, placeholder: N.value.placeholder, "start-placeholder": N.value.placeholder, "end-placeholder": N.value.endPlaceholder ? N.value.endPlaceholder : N.value.placeholder, "unlink-panels": true, format: N.value.format, "value-format": N.value.valueFormat, modelValue: J.value, "onUpdate:modelValue": a2[0] || (a2[0] = (e4) => J.value = e4), shortcuts: K.value, type: N.value.dateType, onChange: a2[1] || (a2[1] = (a3) => s(j)(a3, e3.pageContext, e3.configure, "change")), onBlur: a2[2] || (a2[2] = (a3) => s(j)(a3, e3.pageContext, e3.configure, "blur")), onFocus: a2[3] || (a2[3] = (a3) => s(j)(a3, e3.pageContext, e3.configure, "focus")), onVisibleChange: a2[4] || (a2[4] = (a3) => s(j)(a3, e3.pageContext, e3.configure, "visible-change")), onPanelChange: a2[5] || (a2[5] = (a3) => s(j)(a3, e3.pageContext, e3.configure, "panel-change")), onClear: a2[6] || (a2[6] = (a3) => s(j)(a3, e3.pageContext, e3.configure, "clear")) }, null, 8, ["is-range", "clearable", "disabled", "readonly", "size", "placeholder", "start-placeholder", "end-placeholder", "format", "value-format", "modelValue", "shortcuts", "type"])) : (n(), r(t2, { key: 1, ref_key: "componentRef", ref: O, clearable: N.value.clearable, style: { width: "100%" }, "unlink-panels": true, disabled: "disabled" === N.value.state, readonly: "readonly" === N.value.state, size: N.value.size, placeholder: N.value.placeholder, "start-placeholder": N.value.placeholder, "end-placeholder": N.value.endPlaceholder ? N.value.endPlaceholder : N.value.placeholder, format: N.value.format, "value-format": N.value.valueFormat, modelValue: J.value, "onUpdate:modelValue": a2[7] || (a2[7] = (e4) => J.value = e4), shortcuts: K.value, type: N.value.dateType, onChange: a2[8] || (a2[8] = (a3) => s(j)(a3, e3.pageContext, e3.configure, "change")), onBlur: a2[9] || (a2[9] = (a3) => s(j)(a3, e3.pageContext, e3.configure, "blur")), onFocus: a2[10] || (a2[10] = (a3) => s(j)(a3, e3.pageContext, e3.configure, "focus")), onVisibleChange: a2[11] || (a2[11] = (a3) => s(j)(a3, e3.pageContext, e3.configure, "visible-change")), onPanelChange: a2[12] || (a2[12] = (a3) => s(j)(a3, e3.pageContext, e3.configure, "panel-change")), onClear: a2[13] || (a2[13] = (a3) => s(j)(a3, e3.pageContext, e3.configure, "clear")) }, null, 8, ["clearable", "disabled", "readonly", "size", "placeholder", "start-placeholder", "end-placeholder", "format", "value-format", "modelValue", "shortcuts", "type"]))]), _: 1 }, 8, ["required", "class", "label-width", "style"]);
   };
 } });
 export {

package/dist/es/components/runtime/views/assemblys/form/file-upload/fileupload-runtime.vue2.js

@@ -1,70 +1,72 @@
-import { defineComponent as e, ref as l, watch as t, onMounted as o, nextTick as a, onUnmounted as i, resolveComponent as n, createBlock as s, createCommentVNode as u, openBlock as p, normalizeStyle as r, normalizeClass as d, unref as v, withCtx as m, createElementBlock as f, toDisplayString as c } from "vue";
+import { defineComponent as e, ref as l, watch as t, onMounted as a, nextTick as o, onUnmounted as i, resolveComponent as n, createBlock as s, createCommentVNode as r, openBlock as u, normalizeStyle as p, normalizeClass as d, unref as m, withCtx as v, createElementBlock as f, toDisplayString as c } from "vue";
 import { getVariableValue as h, setVariableValue as y } from "../../../../utils/page-helper-util.js";
 import { handleAfterInitEvent as g, fileUploadBeforeUpload as C } from "../../../../utils/events/event-util.js";
-import b from "agilebuilder-ui/src/utils/request";
-import { FsUploadNew as w } from "agilebuilder-ui";
-import x from "../../../../utils/eventBus.js";
-import { $t as k } from "../../../../utils/i18n-util.js";
+import w from "agilebuilder-ui/src/utils/request";
+import { FsUploadNew as b } from "agilebuilder-ui";
+import k from "../../../../utils/eventBus.js";
+import { $t as x } from "../../../../utils/i18n-util.js";
 import { addRequiredClassUtil as P } from "../../../../utils/common-util.js";
 const _ = e({ __name: "fileupload-runtime", props: { pageContext: {}, configure: {} }, setup(e2, { expose: _2 }) {
-  const j = e2, N = l(null), R = j.configure.runtime ? j.configure.runtime : {}, T = l(R.props ? R.props : {}), z = R.style, D = R.class, I = R.headerStyle, O = R.titleExceedStyle, S = j.pageContext.entity ? j.pageContext.entity : {}, q = j.configure.props.base ? j.configure.props.base : {}, F = K(q.prop), U = K(q.propName);
-  F && F.length > 1 && t(() => j.pageContext.entity[F[0]][F[1]], (e3) => {
-    J(h(S, F));
+  var _a, _b, _c, _d, _e, _f, _g;
+  const j = e2, N = l(null), S = j.configure.runtime ? j.configure.runtime : {}, R = l(S.props ? S.props : {}), T = S.style, z = S.class, D = S.headerStyle, I = S.titleExceedStyle, O = j.pageContext.entity ? j.pageContext.entity : {}, q = j.configure.props.base ? j.configure.props.base : {}, F = L(q.prop), W = L(q.propName);
+  let U = l({});
+  U.value.isShowWatermark = void 0 === ((_b = (_a = j.configure.props) == null ? void 0 : _a.watermark) == null ? void 0 : _b.isShowWatermark) ? "true" : ((_c = j.configure.props) == null ? void 0 : _c.watermark.isShowWatermark) + "", U.value.content = ((_e = (_d = j.configure.props) == null ? void 0 : _d.watermark) == null ? void 0 : _e.content) ? (_g = (_f = j.configure.props) == null ? void 0 : _f.watermark) == null ? void 0 : _g.content : "", F && F.length > 1 && t(() => j.pageContext.entity[F[0]][F[1]], (e3) => {
+    K(h(O, F));
   });
-  const $ = j.pageContext.code, W = l(F ? $ + "__" + F.join("__") : null), B = h(S, F), E = l(null), A = l(false), G = l([]), H = l({});
-  function J(e3) {
+  const $ = j.pageContext.code, B = l(F ? $ + "__" + F.join("__") : null), E = h(O, F), A = l(null), G = l(false), H = l([]), J = l({});
+  function K(e3) {
     if (e3) {
       const l2 = e3.split(",");
       if (l2.length > 0) {
         const e4 = j.pageContext.backendUrl;
-        b.post(e4 + "/common/fs-upload/search-file-names", l2).then((e5) => {
-          G.value = [];
+        w.post(e4 + "/common/fs-upload/search-file-names", l2).then((e5) => {
+          H.value = [];
           const t2 = [];
-          for (let o2 = 0; o2 < l2.length; o2++) {
-            const a2 = l2[o2];
-            t2.push(e5[a2]), G.value.push({ showName: e5[a2], serverPath: a2 });
+          for (let a2 = 0; a2 < l2.length; a2++) {
+            const o2 = l2[a2];
+            t2.push(e5[o2]), H.value.push({ showName: e5[o2], serverPath: o2 });
           }
-          "input" === T.value.displayType && (H.value.showName = t2.join(","), H.value.serverPath = l2.join(","));
+          "input" === R.value.displayType && (J.value.showName = t2.join(","), J.value.serverPath = l2.join(","));
         }).finally(() => {
-          A.value = true;
+          G.value = true;
         });
-      } else A.value = true;
-    } else G.value = [], H.value = {}, A.value = true;
+      } else G.value = true;
+    } else H.value = [], J.value = {}, G.value = true;
   }
-  function K(e3) {
+  function L(e3) {
     return e3 ? (e3.startsWith("${") && (e3 = e3.substring(2, e3.length - 1)), e3.split(".")) : [];
   }
-  function L(e3) {
+  function M(e3) {
     return C(e3);
   }
-  J(B);
-  const M = (e3, l2, t2) => {
-    V();
-  }, Q = (e3) => {
-    V();
-  }, V = () => {
+  K(E);
+  const Q = (e3, l2, t2) => {
+    X();
+  }, V = (e3) => {
+    X();
+  }, X = () => {
     const e3 = [], l2 = [];
-    if (T.value.limit && G.value.length > T.value.limit) {
-      const e4 = G.value.length - T.value.limit;
-      for (let l3 = 0; l3 < e4; l3++) G.value.shift();
+    if (R.value.limit && H.value.length > R.value.limit) {
+      const e4 = H.value.length - R.value.limit;
+      for (let l3 = 0; l3 < e4; l3++) H.value.shift();
     }
-    for (let t2 = 0; t2 < G.value.length; t2++) e3.push(G.value[t2].showName), l2.push(G.value[t2].serverPath);
-    y(j.pageContext.entity, F, l2.join(",")), y(j.pageContext.entity, U, e3.join(",")), l2.length > 0 && (N.value = "");
-  }, X = l(null), Y = l(null);
-  return o(() => {
-    x.$on(W.value + "-pickFileDone", (e3) => {
-      W.value, E.value.pickFileDone(e3);
-    }), a(() => {
-      const e3 = h(S, F), l2 = { showName: h(S, U), serverPath: e3 };
-      g(l2, j.pageContext, j.configure, { formItemRef: X.value, componentRef: E.value, titleRef: Y.value, value: l2, entity: j.pageContext.entity.data, pageData: j.pageContext.entity.page });
+    for (let t2 = 0; t2 < H.value.length; t2++) e3.push(H.value[t2].showName), l2.push(H.value[t2].serverPath);
+    y(j.pageContext.entity, F, l2.join(",")), y(j.pageContext.entity, W, e3.join(",")), l2.length > 0 && (N.value = "");
+  }, Y = l(null), Z = l(null);
+  return a(() => {
+    k.$on(B.value + "-pickFileDone", (e3) => {
+      A.value.pickFileDone(e3);
+    }), o(() => {
+      const e3 = h(O, F), l2 = { showName: h(O, W), serverPath: e3 };
+      g(l2, j.pageContext, j.configure, { formItemRef: Y.value, componentRef: A.value, titleRef: Z.value, value: l2, entity: j.pageContext.entity.data, pageData: j.pageContext.entity.page });
     });
   }), i(() => {
-    x.$off(W.value + "-pickFileDone");
+    k.$off(B.value + "-pickFileDone");
   }), _2({ addRequiredClass: function() {
     N.value = P();
   } }), (e3, l2) => {
     const t2 = n("el-form-item");
-    return T.value.tittleShow ? (p(), s(t2, { key: 0, ref_key: "formItemRef", ref: X, required: T.value.required, class: d(v(D) + (N.value ? " " + N.value : "")), "label-width": T.value.labelWidth, style: r(v(z)) }, { label: m(() => [T.value.tittleShow ? (p(), f("div", { key: 0, ref_key: "titleRef", ref: Y, style: r({ ...v(I), ...v(O) }) }, c(v(k)(T.value.title)), 5)) : u("", true)]), default: m(() => [A.value ? (p(), s(v(w), { key: 0, ref_key: "fileUploadRef", ref: E, style: { width: "100%" }, disabled: "disabled" === T.value.state, displayType: T.value.displayType, accept: T.value.accept, multiple: T.value.multiple, placeholder: T.value.placeholder, limit: T.value.limit, "limit-file-size": T.value.limitFileSize, "disabled-no-preview": T.value.disabledNoPreview, "disabled-no-download": T.value.disabledNoDownload, openCameraOrChoosePhoto: T.value.openCameraOrChoosePhoto, "file-info": H.value, "file-list": G.value, "system-code": e3.pageContext.systemCode, componentId: W.value, "on-success": M, "on-remove": Q, "before-upload": L, pageContext: e3.pageContext }, null, 8, ["disabled", "displayType", "accept", "multiple", "placeholder", "limit", "limit-file-size", "disabled-no-preview", "disabled-no-download", "openCameraOrChoosePhoto", "file-info", "file-list", "system-code", "componentId", "pageContext"])) : u("", true)]), _: 1 }, 8, ["required", "class", "label-width", "style"])) : A.value ? (p(), s(v(w), { key: 1, ref_key: "fileUploadRef", ref: E, style: { width: "100%" }, disabled: "disabled" === T.value.state, displayType: T.value.displayType, accept: T.value.accept, multiple: T.value.multiple, placeholder: T.value.placeholder, limit: T.value.limit, "limit-file-size": T.value.limitFileSize, "disabled-no-preview": T.value.disabledNoPreview, "disabled-no-download": T.value.disabledNoDownload, openCameraOrChoosePhoto: T.value.openCameraOrChoosePhoto, "file-info": H.value, "file-list": G.value, "system-code": e3.pageContext.systemCode, componentId: W.value, "on-success": M, "on-remove": Q, "before-upload": L, pageContext: e3.pageContext }, null, 8, ["disabled", "displayType", "accept", "multiple", "placeholder", "limit", "limit-file-size", "disabled-no-preview", "disabled-no-download", "openCameraOrChoosePhoto", "file-info", "file-list", "system-code", "componentId", "pageContext"])) : u("", true);
+    return R.value.tittleShow ? (u(), s(t2, { key: 0, ref_key: "formItemRef", ref: Y, required: R.value.required, class: d(m(z) + (N.value ? " " + N.value : "")), "label-width": R.value.labelWidth, style: p(m(T)) }, { label: v(() => [R.value.tittleShow ? (u(), f("div", { key: 0, ref_key: "titleRef", ref: Z, style: p({ ...m(D), ...m(I) }) }, c(m(x)(R.value.title)), 5)) : r("", true)]), default: v(() => [G.value ? (u(), s(m(b), { key: 0, ref_key: "fileUploadRef", ref: A, style: { width: "100%" }, disabled: "disabled" === R.value.state, displayType: R.value.displayType, accept: R.value.accept, multiple: R.value.multiple, placeholder: R.value.placeholder, limit: R.value.limit, "limit-file-size": R.value.limitFileSize, "disabled-no-preview": R.value.disabledNoPreview, "disabled-no-download": R.value.disabledNoDownload, openCameraOrChoosePhoto: R.value.openCameraOrChoosePhoto, "file-info": J.value, "file-list": H.value, "system-code": e3.pageContext.systemCode, componentId: B.value, watermark: m(U), "on-success": Q, "on-remove": V, "before-upload": M, pageContext: e3.pageContext }, null, 8, ["disabled", "displayType", "accept", "multiple", "placeholder", "limit", "limit-file-size", "disabled-no-preview", "disabled-no-download", "openCameraOrChoosePhoto", "file-info", "file-list", "system-code", "componentId", "watermark", "pageContext"])) : r("", true)]), _: 1 }, 8, ["required", "class", "label-width", "style"])) : G.value ? (u(), s(m(b), { key: 1, ref_key: "fileUploadRef", ref: A, style: { width: "100%" }, disabled: "disabled" === R.value.state, displayType: R.value.displayType, accept: R.value.accept, multiple: R.value.multiple, placeholder: R.value.placeholder, limit: R.value.limit, "limit-file-size": R.value.limitFileSize, "disabled-no-preview": R.value.disabledNoPreview, "disabled-no-download": R.value.disabledNoDownload, openCameraOrChoosePhoto: R.value.openCameraOrChoosePhoto, "file-info": J.value, "file-list": H.value, "system-code": e3.pageContext.systemCode, componentId: B.value, watermark: m(U), "on-success": Q, "on-remove": V, "before-upload": M, pageContext: e3.pageContext }, null, 8, ["disabled", "displayType", "accept", "multiple", "placeholder", "limit", "limit-file-size", "disabled-no-preview", "disabled-no-download", "openCameraOrChoosePhoto", "file-info", "file-list", "system-code", "componentId", "watermark", "pageContext"])) : r("", true);
   };
 } });
 export {