super-page-runtime 2.2.92-sit1 → 2.2.92-sit4

package/dist/es/components/runtime/utils/page-helper-util.d.ts

@@ -6,7 +6,14 @@ import { PageContext, Component } from './interfaces/page-design-types';
  * @param pageContext
  * @returns
  */
-export declare function getComponentOptionConfigs(component: Component, pageContext: PageContext): any;
+export declare function getComponentOptionConfigs(component: Component, pageContext: PageContext, systemCode: any, systemVersion: any): any;
+/**
+ * 获取选项组类需要查询的配置信息
+ * @param component
+ * @param pageContext
+ * @returns
+ */
+export declare function getComponentOptionConfigsBase(component: Component, systemCode: any, systemVersion: any): any;
 /**
  * 初始化需要查询数据的信息
  * @param component

package/dist/es/components/runtime/utils/page-helper-util.js

@@ -4,31 +4,34 @@ import { executeExpression } from "agilebuilder-ui/src/utils/calculator/calculat
 import { getComponentRef } from "./global-refs.js";
 import { watch } from "vue";
 import { deepCopy, getBaseUrl } from "./common-util.js";
-function getComponentOptionConfigs(t, e) {
+function getComponentOptionConfigs(t, e, o, n) {
+  return getComponentOptionConfigsBase(t, (e == null ? void 0 : e.systemCode) ? e.systemCode : o, (e == null ? void 0 : e.systemVersion) ? e == null ? void 0 : e.systemVersion : n);
+}
+function getComponentOptionConfigsBase(t, e, o) {
   if (!t.props || !t.props.dataOrigin) return;
   if (t.name && "table" === t.name) return;
-  const o = t.props.dataOrigin, n = { uuid: t.uuid };
-  if ("optionGroup" == o.optionValueSetType) n.type = "optionGroup", n.props = { code: o.optionGroup };
-  else if ("dynamicData" == o.optionValueSetType) n.type = "dynamicData", n.filterType = o.filterType, n.props = { code: o.dynamicDataSourceCode };
-  else if ("dataTable" == o.optionValueSetType) {
-    n.filterType = o.filterType;
-    const t2 = getTableQueryInfo(o, e);
-    Object.assign(n, t2);
-  } else if ("service" == o.optionValueSetType) {
-    n.filterType = o.filterType;
-    const t2 = getServiceQueryInfo(o, e);
-    Object.assign(n, t2);
+  const n = t.props.dataOrigin, a = { uuid: t.uuid };
+  if ("optionGroup" == n.optionValueSetType) a.type = "optionGroup", a.props = { code: n.optionGroup };
+  else if ("dynamicData" == n.optionValueSetType) a.type = "dynamicData", a.filterType = n.filterType, a.props = { code: n.dynamicDataSourceCode };
+  else if ("dataTable" == n.optionValueSetType) {
+    a.filterType = n.filterType;
+    const t2 = getTableQueryInfo(n, e, o);
+    Object.assign(a, t2);
+  } else if ("service" == n.optionValueSetType) {
+    a.filterType = n.filterType;
+    const t2 = getServiceQueryInfo(n, e, o);
+    Object.assign(a, t2);
   }
-  return n.type ? n : void 0;
+  return a.type ? a : void 0;
 }
-function getTableQueryInfo(t, e) {
-  const o = { type: "dataTable" };
-  if (o.props = { tableName: t.tableName, systemCode: t.tableSysCode ? t.tableSysCode : e.systemCode, systemVersion: t.tableSysCode ? t.tableSysVersion : e.systemVersion }, t.sortFields) {
+function getTableQueryInfo(t, e, o) {
+  const n = { type: "dataTable" };
+  if (n.valueLabelSwitch = !!t.valueLabelSwitch, n.props = { tableName: t.tableName, systemCode: t.tableSysCode ? t.tableSysCode : e, systemVersion: t.tableSysVersion ? t.tableSysVersion : o }, t.sortFields) {
     const e2 = [];
     for (const o2 of t.sortFields) o2.name && e2.push({ prop: o2.name, order: o2.type ? o2.type : "asc" });
-    o.props.sorts = e2;
+    n.props.sorts = e2;
   }
-  const n = [];
+  const a = [];
   if (t.filterList) {
     const e2 = [];
     for (const o2 of t.filterList) {
@@ -36,29 +39,29 @@ function getTableQueryInfo(t, e) {
       o2.propDbName || (o2.propDbName = o2.propName);
       const t2 = {};
       Object.assign(t2, o2);
-      const a2 = getParamNames(o2.propValue);
-      for (const t3 of a2) t3 && (t3.startsWith("${data.") || t3.startsWith("${task.") || t3.startsWith("${page.")) && (n.includes(t3) || n.push(t3));
+      const n2 = getParamNames(o2.propValue);
+      for (const t3 of n2) t3 && (t3.startsWith("${data.") || t3.startsWith("${task.") || t3.startsWith("${page.")) && (a.includes(t3) || a.push(t3));
       o2.propValue, e2.push(t2);
     }
-    o.props.searchForm = e2;
+    n.props.searchForm = e2;
   }
-  o.props.monitorFields = n;
-  const a = [];
-  if (t.tableValueField && (o.props.valueField = t.tableValueField), t.tableLableField && -1 == a.indexOf(t.tableLableField) && (o.props.lableField = t.tableLableField), t.autoSets) for (const e2 of t.autoSets) e2.source && -1 == a.indexOf(e2.source) && a.push(e2.source);
-  return o.props.queryFields = a, o.props.pageSize = t.displayQuantity, o;
-}
-function getServiceQueryInfo(t, e) {
-  const o = { type: "service" };
-  if (o.props = { serivceCode: t.serviceCode, systemCode: t.tableSysCode ? t.tableSysCode : e.systemCode, systemVersion: t.tableSysCode ? t.tableSysCode : e.systemCode }, t.serviceInputs) {
+  n.props.monitorFields = a;
+  const r = [];
+  if (t.tableValueField && (n.props.valueField = t.tableValueField), t.tableLableField && -1 == r.indexOf(t.tableLableField) && (n.props.lableField = t.tableLableField), t.autoSets) for (const e2 of t.autoSets) e2.source && -1 == r.indexOf(e2.source) && r.push(e2.source);
+  return n.props.queryFields = r, n.props.pageSize = t.displayQuantity, n;
+}
+function getServiceQueryInfo(t, e, o) {
+  const n = { type: "service" };
+  if (n.valueLabelSwitch = !!t.valueLabelSwitch, n.props = { serivceCode: t.serviceCode, systemCode: t.tableSysCode ? t.tableSysCode : e, systemVersion: t.tableSysVersion ? t.tableSysVersion : o }, t.serviceInputs) {
     const e2 = [];
     for (const o2 of t.serviceInputs) {
       if (!o2.name || o2.value) continue;
       const t2 = {};
       Object.assign(t2, o2), e2.push(t2);
     }
-    o.props.inputs = e2;
+    n.props.inputs = e2;
   }
-  return o.props.dataSetField = t.serviceDataSetField, o.props.valueField = t.serviceValueField, o.props.labelField = t.serviceLabelField, o;
+  return n.props.dataSetField = t.serviceDataSetField, n.props.valueField = t.serviceValueField, n.props.labelField = t.serviceLabelField, n;
 }
 function updateChartDatasources(t, e, o, n) {
   return new Promise((a, r) => {
@@ -358,6 +361,7 @@ export {
   formatVariableValue,
   getChartDatasFromPage,
   getComponentOptionConfigs,
+  getComponentOptionConfigsBase,
   getComponentOptionDatasFromPage,
   getFormPropName,
   getModelFieldFromPageContext,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "super-page-runtime",
-  "version": "2.2.92-sit1",
+  "version": "2.2.92-sit4",
   "description": "AgileBuilder super page runtime",
   "license": "ISC",
   "main": "dist/es/index.js",
@@ -48,7 +48,7 @@
     "@vitejs/plugin-vue-jsx": "^3.1.0",
     "@vue/eslint-config-prettier": "^8.0.0",
     "@vue/test-utils": "^2.4.4",
-    "agilebuilder-ui": "1.1.35-sit1",
+    "agilebuilder-ui": "1.1.35-sit2",
     "axios": "^1.6.8",
     "cypress": "^13.6.6",
     "element-plus": "^2.6.1",