super-page-runtime 2.2.26 → 2.2.29-tmp2

package/dist/es/components/runtime/utils/form/date-shortcuts.js

@@ -1,36 +1,96 @@
-function e(e2, t, n) {
-  if (!e2) return;
-  const a = [];
-  if (e2.includes("today") && !["week", "month", "year"].includes(t)) {
-    const e3 = { text: "今天", value: () => /* @__PURE__ */ new Date() };
-    n.endsWith("range") && (e3.value = () => [/* @__PURE__ */ new Date(), /* @__PURE__ */ new Date()]), a.push(e3);
+function getDateShortCuts(dateScopeDetails, dateType, rangeType) {
+  if (!dateScopeDetails) {
+    return void 0;
   }
-  if (e2.includes("yesterday") && !["week", "month", "year"].includes(t)) {
-    const e3 = /* @__PURE__ */ new Date();
-    e3.setTime(e3.getTime() - 864e5);
-    const t2 = { text: "昨天", value: () => e3 };
-    n.endsWith("range") && (t2.value = () => [e3, /* @__PURE__ */ new Date()]), a.push(t2);
+  const shortcuts = [];
+  if (dateScopeDetails.includes("today") && !["week", "month", "year"].includes(dateType)) {
+    const dateParams = {
+      text: "今天",
+      value: () => {
+        return /* @__PURE__ */ new Date();
+      }
+    };
+    if (rangeType.endsWith("range")) {
+      dateParams.value = () => {
+        return [/* @__PURE__ */ new Date(), /* @__PURE__ */ new Date()];
+      };
+    }
+    shortcuts.push(dateParams);
   }
-  if (e2.includes("oneWeek") && !["month", "year"].includes(t)) {
-    const e3 = /* @__PURE__ */ new Date();
-    e3.setTime(e3.getTime() - 6048e5);
-    const t2 = { text: "一周前", value: () => e3 };
-    n.endsWith("range") && (t2.text = "一周", t2.value = () => [e3, /* @__PURE__ */ new Date()]), a.push(t2);
+  if (dateScopeDetails.includes("yesterday") && !["week", "month", "year"].includes(dateType)) {
+    const date = /* @__PURE__ */ new Date();
+    date.setTime(date.getTime() - 3600 * 1e3 * 24);
+    const dateParams = {
+      text: "昨天",
+      value: () => {
+        return date;
+      }
+    };
+    if (rangeType.endsWith("range")) {
+      dateParams.value = () => {
+        return [date, /* @__PURE__ */ new Date()];
+      };
+    }
+    shortcuts.push(dateParams);
   }
-  if (e2.includes("oneMonth") && !["year"].includes(t)) {
-    const e3 = /* @__PURE__ */ new Date();
-    e3.getMonth() > 0 ? e3.setMonth(e3.getMonth() - 1) : (e3.setMonth(12), e3.setFullYear(e3.getFullYear() - 1));
-    const t2 = { text: "一月前", value: () => e3 };
-    n.endsWith("range") && (t2.text = "一月", t2.value = () => [e3, /* @__PURE__ */ new Date()]), a.push(t2);
+  if (dateScopeDetails.includes("oneWeek") && !["month", "year"].includes(dateType)) {
+    const date = /* @__PURE__ */ new Date();
+    date.setTime(date.getTime() - 3600 * 1e3 * 24 * 7);
+    const dateParams = {
+      text: "一周前",
+      value: () => {
+        return date;
+      }
+    };
+    if (rangeType.endsWith("range")) {
+      dateParams.text = "一周";
+      dateParams.value = () => {
+        return [date, /* @__PURE__ */ new Date()];
+      };
+    }
+    shortcuts.push(dateParams);
   }
-  if (e2.includes("oneYear")) {
-    const e3 = /* @__PURE__ */ new Date();
-    e3.setFullYear(e3.getFullYear() - 1);
-    const t2 = { text: "一年前", value: () => e3 };
-    n.endsWith("range") && (t2.text = "一年", t2.value = () => [e3, /* @__PURE__ */ new Date()]), a.push(t2);
+  if (dateScopeDetails.includes("oneMonth") && !["year"].includes(dateType)) {
+    const date = /* @__PURE__ */ new Date();
+    if (date.getMonth() > 0) {
+      date.setMonth(date.getMonth() - 1);
+    } else {
+      date.setMonth(12);
+      date.setFullYear(date.getFullYear() - 1);
+    }
+    const dateParams = {
+      text: "一月前",
+      value: () => {
+        return date;
+      }
+    };
+    if (rangeType.endsWith("range")) {
+      dateParams.text = "一月";
+      dateParams.value = () => {
+        return [date, /* @__PURE__ */ new Date()];
+      };
+    }
+    shortcuts.push(dateParams);
   }
-  return a;
+  if (dateScopeDetails.includes("oneYear")) {
+    const date = /* @__PURE__ */ new Date();
+    date.setFullYear(date.getFullYear() - 1);
+    const dateParams = {
+      text: "一年前",
+      value: () => {
+        return date;
+      }
+    };
+    if (rangeType.endsWith("range")) {
+      dateParams.text = "一年";
+      dateParams.value = () => {
+        return [date, /* @__PURE__ */ new Date()];
+      };
+    }
+    shortcuts.push(dateParams);
+  }
+  return shortcuts;
 }
 export {
-  e as getDateShortCuts
+  getDateShortCuts
 };

package/dist/es/components/runtime/utils/form/scan-util.js

@@ -1,89 +1,190 @@
 import http from "agilebuilder-ui/src/utils/request";
 import { setValueForVariableName } from "../page-helper-util.js";
-function formatScanRuleSets(e) {
-  const t = {};
-  return e.forEach((e2) => {
-    "group" === e2.type ? e2.outs.forEach((e3) => {
-      t[e3.ruleCode] || (t[e3.ruleCode] = { outs: [], adaptations: [] }), t[e3.ruleCode].outs.push(e3);
-    }) : t[e2.code] = { outs: e2.outs, adaptations: [] };
-  }), packageScanRuleSets(t);
+function formatScanRuleSets(ruleList) {
+  const scanRuleSets2 = {};
+  ruleList.forEach((ruleSet) => {
+    if (ruleSet.type === "group") {
+      ruleSet.outs.forEach((valueSet) => {
+        if (!scanRuleSets2[valueSet.ruleCode]) {
+          scanRuleSets2[valueSet.ruleCode] = { outs: [], adaptations: [] };
+        }
+        scanRuleSets2[valueSet.ruleCode].outs.push(valueSet);
+      });
+    } else {
+      scanRuleSets2[ruleSet.code] = { outs: ruleSet.outs, adaptations: [] };
+    }
+  });
+  return packageScanRuleSets(scanRuleSets2);
 }
-function packageScanRuleSets(e) {
-  return new Promise((t, a) => {
-    Object.keys(e).length > 0 ? http.post(window.$vueApp.config.globalProperties.baseAPI + "/dc/setting-barcode-analysis/by-codes", Object.keys(e)).then((a2) => {
-      a2.forEach((a3) => {
-        const s = JSON.parse(a3.barcodeAnalysisOuts), n = /* @__PURE__ */ new Set(), l = {};
-        e[a3.code].outs.forEach((e2) => {
-          n.add(e2.returnedValue), l[e2.returnedValue] = e2.pageVariable;
+function packageScanRuleSets(scanRuleSets2) {
+  return new Promise((resolve, reject) => {
+    if (Object.keys(scanRuleSets2).length > 0) {
+      http.post(
+        window["$vueApp"].config.globalProperties.baseAPI + "/dc/setting-barcode-analysis/by-codes",
+        Object.keys(scanRuleSets2)
+      ).then((res2) => {
+        res2.forEach((rule) => {
+          const ruleOuts = JSON.parse(rule.barcodeAnalysisOuts);
+          const needOutsFields = /* @__PURE__ */ new Set();
+          const outsFiledsSet = {};
+          scanRuleSets2[rule.code].outs.forEach((valueSet) => {
+            needOutsFields.add(valueSet.returnedValue);
+            outsFiledsSet[valueSet.returnedValue] = valueSet.pageVariable;
+          });
+          const filteredOutsField = [];
+          ruleOuts.forEach((outFiled) => {
+            if (needOutsFields.has(outFiled.code)) {
+              outFiled.pageVariable = outsFiledsSet[outFiled.code];
+              filteredOutsField.push(outFiled);
+            }
+          });
+          scanRuleSets2[rule.code].outs = filteredOutsField;
+          scanRuleSets2[rule.code].adaptations = JSON.parse(rule.barcodeAnalysisAdaptations);
+          resolve(scanRuleSets2);
         });
-        const i2 = [];
-        s.forEach((e2) => {
-          n.has(e2.code) && (e2.pageVariable = l[e2.code], i2.push(e2));
-        }), e[a3.code].outs = i2, e[a3.code].adaptations = JSON.parse(a3.barcodeAnalysisAdaptations), t(e);
       });
-    }) : t(null);
+    } else {
+      resolve(null);
+    }
   });
 }
 function analysisScanValue(scanValue, scanRuleSets) {
-  if (!scanValue) return null;
+  if (!scanValue) {
+    return null;
+  }
   const scanSets = Object.values(scanRuleSets);
   for (let i = 0; i < scanSets.length; i++) {
-    const scanSet = scanSets[i], adaptations = scanSet.adaptations;
+    const scanSet = scanSets[i];
+    const adaptations = scanSet.adaptations;
     let validStr = "";
-    for (let e = 0; e < adaptations.length; e++) {
-      const t = adaptations[e], a = _getScanIndexs(scanValue, t.startIndex, t.endIndex), s = a[0], n = a[1];
-      let l = scanValue.substring(s, n), i2 = t.value, r = t.operate;
-      if ("times" == r) {
-        const e2 = l.split(null == i2 ? "" : i2).length - 1;
-        i2 = e2, l = t.times, r = "=";
+    for (let k = 0; k < adaptations.length; k++) {
+      const adap = adaptations[k];
+      const indexs = _getScanIndexs(scanValue, adap.startIndex, adap.endIndex);
+      const startIndex = indexs[0];
+      const endIndex = indexs[1];
+      let paramValue = scanValue.substring(startIndex, endIndex);
+      let compareValue = adap.value;
+      let operate = adap.operate;
+      if (operate == "times") {
+        const realValue = paramValue.split(compareValue == void 0 ? "" : compareValue).length - 1;
+        compareValue = realValue;
+        paramValue = adap.times;
+        operate = "=";
+      }
+      if (isNaN(paramValue) || isNaN(compareValue)) {
+        paramValue = "'" + paramValue + "'";
+        compareValue = "'" + compareValue + "'";
+      }
+      if (adap.leftBracket) {
+        validStr += adap.leftBracket;
+      }
+      if (operate == "<>") {
+        operate = "!=";
+      } else if (operate == "=") {
+        operate = "==";
       }
-      if ((isNaN(l) || isNaN(i2)) && (l = "'" + l + "'", i2 = "'" + i2 + "'"), t.leftBracket && (validStr += t.leftBracket), "<>" == r ? r = "!=" : "=" == r && (r = "=="), "include" == r || "notinclude" == r ? (validStr += l + ".indexOf(" + i2 + ")", validStr += "include" == r ? ">-1" : "<0") : validStr += l + r + i2, t.rightBracket && (validStr += t.rightBracket), t.joinStr && e + 1 < adaptations.length) {
-        const e2 = "and" == t.joinStr ? "&&" : "||";
-        validStr += e2;
+      if (operate == "include" || operate == "notinclude") {
+        validStr += paramValue + ".indexOf(" + compareValue + ")";
+        if (operate == "include") {
+          validStr += ">-1";
+        } else {
+          validStr += "<0";
+        }
+      } else {
+        validStr += paramValue + operate + compareValue;
+      }
+      if (adap.rightBracket) {
+        validStr += adap.rightBracket;
+      }
+      if (adap.joinStr && k + 1 < adaptations.length) {
+        const joinStr = adap.joinStr == "and" ? "&&" : "||";
+        validStr += joinStr;
       }
     }
     let res = false;
-    if (validStr) try {
-      res = eval("(" + validStr + ")");
-    } catch (e) {
+    if (validStr) {
+      try {
+        console.log("validStr", validStr);
+        res = eval("(" + validStr + ")");
+        console.log("res", res);
+      } catch (e) {
+        console.log(e);
+      }
+    } else {
+      res = true;
+    }
+    if (res) {
+      return executeAnalysisForScan(scanValue, scanSet);
     }
-    else res = true;
-    if (res) return executeAnalysisForScan(scanValue, scanSet);
   }
   return null;
 }
-function executeAnalysisForScan(e, t) {
-  if (!t || !e) return;
-  const a = t.outs, s = {};
-  return a.forEach((t2) => {
-    const a2 = t2.fieldName;
-    if (null != t2.fixedValue) s[a2] = t2.fixedValue;
-    else {
-      let n = e;
-      if (t2.splitChar && t2.splitNum) {
-        const a3 = (t2.splitChar, t2.splitChar), s2 = e.split(a3), l = t2.splitNum < 1 ? 1 : t2.splitNum;
-        n = l <= s2.length ? s2[l - 1] : "";
+function executeAnalysisForScan(scanValue2, scanSet2) {
+  if (!scanSet2 || !scanValue2) {
+    return;
+  }
+  const outs = scanSet2.outs;
+  const params = {};
+  outs.forEach((outJson) => {
+    const fieldName = outJson.fieldName;
+    if (outJson.fixedValue != void 0) {
+      params[fieldName] = outJson.fixedValue;
+    } else {
+      let pValue = scanValue2;
+      if (outJson.splitChar && outJson.splitNum) {
+        const splitChar = outJson.splitChar == "|" ? outJson.splitChar : outJson.splitChar;
+        const strs = scanValue2.split(splitChar);
+        const splitNum = outJson.splitNum < 1 ? 1 : outJson.splitNum;
+        console.log(pValue, splitChar, strs, splitNum);
+        if (splitNum <= strs.length) {
+          pValue = strs[splitNum - 1];
+        } else {
+          pValue = "";
+        }
       }
-      if (t2.splitChar2 && t2.splitNum2) {
-        const e2 = (t2.splitChar2, t2.splitChar2), a3 = n.split(e2), s2 = t2.splitNum2 < 1 ? 1 : t2.splitNum2;
-        n = s2 <= a3.length ? a3[s2 - 1] : "";
+      if (outJson.splitChar2 && outJson.splitNum2) {
+        const splitChar2 = outJson.splitChar2 == "|" ? outJson.splitChar2 : outJson.splitChar2;
+        const strs = pValue.split(splitChar2);
+        const splitNum2 = outJson.splitNum2 < 1 ? 1 : outJson.splitNum2;
+        console.log(pValue, splitChar2, strs, splitNum2);
+        if (splitNum2 <= strs.length) {
+          pValue = strs[splitNum2 - 1];
+        } else {
+          pValue = "";
+        }
       }
-      if (n.length > 0) {
-        const e2 = _getScanIndexs(n, t2.startIndex, t2.endIndex), a3 = e2[0], s2 = e2[1];
-        n = n.substring(a3, s2);
+      if (pValue.length > 0) {
+        const indexs = _getScanIndexs(pValue, outJson.startIndex, outJson.endIndex);
+        const startIndex = indexs[0];
+        const endIndex = indexs[1];
+        pValue = pValue.substring(startIndex, endIndex);
       }
-      s[a2] = n;
+      params[fieldName] = pValue;
     }
-  }), { value: e, params: s, scanSet: t };
+  });
+  return { value: scanValue2, params, scanSet: scanSet2 };
 }
-function _getScanIndexs(e, t, a) {
-  return t = (t = (t = null == t ? 0 : t - 1) < 0 ? 0 : t) > e.length - 1 ? e.length - 1 : t, (a = (a = (a = null == a ? e.length : a) > e.length ? e.length : a) < 1 ? 1 : a) < t && (a = t), [t, a];
+function _getScanIndexs(value, startIndex, endIndex) {
+  startIndex = startIndex == void 0 ? 0 : startIndex - 1;
+  startIndex = startIndex < 0 ? 0 : startIndex;
+  startIndex = startIndex > value.length - 1 ? value.length - 1 : startIndex;
+  endIndex = endIndex == void 0 ? value.length : endIndex;
+  endIndex = endIndex > value.length ? value.length : endIndex;
+  endIndex = endIndex < 1 ? 1 : endIndex;
+  if (endIndex < startIndex) {
+    endIndex = startIndex;
+  }
+  return [startIndex, endIndex];
 }
-function setScanAnalysisValue(e, t, a) {
-  if (!t) return;
-  t.outs.forEach((t2) => {
-    const s = t2.fieldName, n = a[s];
-    setValueForVariableName(e.entity, t2.pageVariable, n);
+function setScanAnalysisValue(pageContext, scanSet2, params) {
+  if (!scanSet2) {
+    return;
+  }
+  const outs = scanSet2.outs;
+  outs.forEach((outField) => {
+    const fieldName = outField.fieldName;
+    const value = params[fieldName];
+    setValueForVariableName(pageContext.entity, outField.pageVariable, value);
   });
 }
 export {

package/dist/es/components/runtime/utils/global-refs.js

@@ -1,57 +1,88 @@
 import "vue";
-window.globalRefs || (window.globalRefs = {});
-const n = window.globalRefs;
-function o(o2, e2, r2) {
-  if (!o2) return;
-  const t2 = u(o2.code, o2.version);
-  return n[t2] || (n[t2] = {}), n[t2][e2] = r2, n[t2];
-}
-function e(o2, e2, r2) {
-  if (!o2) return;
-  const t2 = f(o2.code, o2.version);
-  return n[t2] || (n[t2] = {}), n[t2][e2] = r2, n[t2];
-}
-function r(o2, e2) {
-  if (!o2 || !e2) return;
-  const r2 = u(o2.code, o2.version);
-  n[r2] || (n[r2] = {});
-  const t2 = n[r2][e2];
-  return t2 ? t2.value : t2;
-}
-function t(o2, e2) {
-  if (!o2) return;
-  const r2 = f(o2.code, o2.version);
-  n[r2] || (n[r2] = {});
-  const t2 = n[r2][e2];
-  return t2 ? t2.value : t2;
-}
-function i(o2) {
-  if (!o2) return;
-  const e2 = u(o2.code, o2.version);
-  n[e2] = {};
-}
-function c(o2) {
-  if (!o2) return;
-  const e2 = u(o2.code, o2.version);
-  n[e2] = {};
-}
-function u(n2, o2) {
-  return "pageRuntimeRef-" + n2 + "-" + (o2 || 1);
-}
-function f(n2, o2) {
-  return u(n2, o2) + "-code";
-}
-function s(o2) {
-  if (!o2) return;
-  const e2 = f(o2.code, o2.version);
-  return n[e2] || (n[e2] = {}), n[e2];
+if (!window["globalRefs"]) {
+  window["globalRefs"] = {};
+}
+const globalRefs = window["globalRefs"];
+function addComponentRef(pageContext, componentUuid, refObj) {
+  if (!pageContext) {
+    return;
+  }
+  const cacheKey = getPageRefKey(pageContext.code, pageContext.version);
+  if (!globalRefs[cacheKey]) {
+    globalRefs[cacheKey] = {};
+  }
+  globalRefs[cacheKey][componentUuid] = refObj;
+  return globalRefs[cacheKey];
+}
+function addComponentRefByCode(pageContext, componentCode, refObj) {
+  if (!pageContext) {
+    return;
+  }
+  const cacheKey = getPageRefKeyByCode(pageContext.code, pageContext.version);
+  if (!globalRefs[cacheKey]) {
+    globalRefs[cacheKey] = {};
+  }
+  globalRefs[cacheKey][componentCode] = refObj;
+  return globalRefs[cacheKey];
+}
+function getComponentRef(pageContext, componentUuid) {
+  if (!pageContext || !componentUuid) {
+    return;
+  }
+  const cacheKey = getPageRefKey(pageContext.code, pageContext.version);
+  if (!globalRefs[cacheKey]) {
+    globalRefs[cacheKey] = {};
+  }
+  const objRef = globalRefs[cacheKey][componentUuid];
+  return objRef ? objRef.value : objRef;
+}
+function getComponentRefByCode(pageContext, componentCode) {
+  if (!pageContext) {
+    return;
+  }
+  const cacheKey = getPageRefKeyByCode(pageContext.code, pageContext.version);
+  if (!globalRefs[cacheKey]) {
+    globalRefs[cacheKey] = {};
+  }
+  const objRef = globalRefs[cacheKey][componentCode];
+  return objRef ? objRef.value : objRef;
+}
+function removePageAllRef(pageContext) {
+  if (!pageContext) {
+    return;
+  }
+  const cacheKey = getPageRefKey(pageContext.code, pageContext.version);
+  globalRefs[cacheKey] = {};
+}
+function initComponentRefState(pageContext) {
+  if (!pageContext) {
+    return;
+  }
+  const cacheKey = getPageRefKey(pageContext.code, pageContext.version);
+  globalRefs[cacheKey] = {};
+}
+function getPageRefKey(pageCode, pageVersion) {
+  return "pageRuntimeRef-" + pageCode + "-" + (pageVersion ? pageVersion : 1);
+}
+function getPageRefKeyByCode(pageCode, pageVersion) {
+  return getPageRefKey(pageCode, pageVersion) + "-code";
+}
+function getAllComponentRefs(pageContext) {
+  if (!pageContext) {
+    return;
+  }
+  const cacheKey = getPageRefKeyByCode(pageContext.code, pageContext.version);
+  if (!globalRefs[cacheKey]) {
+    globalRefs[cacheKey] = {};
+  }
+  return globalRefs[cacheKey];
 }
 export {
-  o as addComponentRef,
-  e as addComponentRefByCode,
-  s as getAllComponentRefs,
-  r as getComponentRef,
-  t as getComponentRefByCode,
-  c as initComponentRefState,
-  i as removePageAllRef
+  addComponentRef,
+  addComponentRefByCode,
+  getAllComponentRefs,
+  getComponentRef,
+  getComponentRefByCode,
+  initComponentRefState,
+  removePageAllRef
 };

package/dist/es/components/runtime/utils/i18n-util.js

@@ -1,14 +1,23 @@
-import { usePageContextStore as t } from "./page-store.js";
-import { getEnableI18nState as e } from "agilebuilder-ui/src/utils/i18n-util";
-import { useI18n as o } from "vue-i18n";
-let r = null, i = null;
-const l = (l2, ...n) => {
-  i || (i = o());
-  const s = t().pageContext;
-  if (null === r && (r = !!e(s.systemCode)), !r) return l2;
-  const u = `${s.systemCode}.${l2}`, m = i.t(u, n || []);
-  return m !== u ? m : l2;
+import { usePageContextStore } from "./page-store.js";
+import { getEnableI18nState } from "agilebuilder-ui/src/utils/i18n-util";
+import { useI18n } from "vue-i18n";
+let enableI18n = null;
+let i18n = null;
+const $t = (key, ...args) => {
+  if (!i18n) {
+    i18n = useI18n();
+  }
+  const pageContext = usePageContextStore().pageContext;
+  if (enableI18n === null) {
+    enableI18n = getEnableI18nState(pageContext.systemCode) ? true : false;
+  }
+  if (!enableI18n) {
+    return key;
+  }
+  const i18nKey = `${pageContext.systemCode}.${key}`;
+  const i18nValue = i18n.t(i18nKey, args || []);
+  return i18nValue !== i18nKey ? i18nValue : key;
 };
 export {
-  l as $t
+  $t
 };

package/dist/es/components/runtime/utils/interfaces/page-design-types.js

@@ -1,4 +1,9 @@
-var p = ((p2) => (p2.PC = "pc", p2.IPAD = "ipad", p2.PHONE = "phone", p2))(p || {});
+var PageDimensions = /* @__PURE__ */ ((PageDimensions2) => {
+  PageDimensions2["PC"] = "pc";
+  PageDimensions2["IPAD"] = "ipad";
+  PageDimensions2["PHONE"] = "phone";
+  return PageDimensions2;
+})(PageDimensions || {});
 export {
-  p as PageDimensions
+  PageDimensions
 };