super-page-runtime 2.1.64 → 2.1.67

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

@@ -3,7 +3,7 @@ import { getComponentRefByCode, getComponentRef } from "../global-refs.js";
 import eventBus from "../eventBus.js";
 import http from "agilebuilder-ui/src/utils/request";
 import { getAdditionalParamMap, refreshPage } from "../events/standard-event.js";
-import { updateFormItemEditState, disabledAllFields } from "../events/validator-util.js";
+import { updateFormItemEditState, disabledAllFields, dynamicControlTableEdit } from "../events/validator-util.js";
 import { getBaseUrl, deepCopy } from "../common-util.js";
 import { isMobileBrowser } from "agilebuilder-ui/src/utils/common-util";
 import { getFormModelFields, getModelFields } from "../page-init-util.js";
@@ -187,8 +187,10 @@ const functions = {
    * 控制表格编辑权限
    * @param pageContext 页面上下文
    * @param rules
+   * @param tableCode 列表的“自定义编码”配置
    */
-  dynamicControlTableEdit(pageContext, rules) {
+  dynamicControlTableEdit(pageContext, rules, tableCode) {
+    dynamicControlTableEdit(pageContext, rules, tableCode);
   },
   /**
    * 调用服务流,

package/dist/es/components/runtime/utils/charts/chart-columnline-util.js

@@ -31,6 +31,7 @@ function updateChartOption(pageContext, configure, chartOption, resultData) {
   if ((_a = configure.runtime.dataConfig) == null ? void 0 : _a.resultSet) {
     setValueForVariableName(pageContext.entity, configure.runtime.dataConfig.resultSet, datas);
   }
+  configure.runtime.dataConfig.runtimeData = datas;
   let confGroups = configure.props ? configure.props.groups : null;
   if (!confGroups) {
     confGroups = [];

package/dist/es/components/runtime/utils/events/standard-event.js

@@ -1015,6 +1015,7 @@ function downloadTemplateFunc(params) {
   window.open(baseUrl + "/dsc/commons/download-files" + param);
 }
 function doImportFinally(params, fileObj) {
+  var _a;
   const pageContext = params.pageContext;
   const buttonConfigureObj = params.configureObj;
   const tableConfigure = params.tableConfigure;
@@ -1032,7 +1033,7 @@ function doImportFinally(params, fileObj) {
   if (pageContext.beanName) {
     param.append("beanName", pageContext.beanName);
   }
-  const listViewImportDuplicate = tableConfigure.props.listViewImportDuplicate;
+  const listViewImportDuplicate = (_a = tableConfigure.props.importSetting) == null ? void 0 : _a.listViewImportDuplicate;
   if (listViewImportDuplicate) {
     param.append("importDuplicateRule", listViewImportDuplicate);
   }

package/dist/es/components/runtime/utils/events/validator-util.d.ts

@@ -15,5 +15,5 @@ export declare function i18nValidatePropRulesMessage(propRules: any, isResetMess
 export declare function getWorkflowRules(pageContext: any): any;
 export declare function updateFormItemEditState(pageContext: PageContext, customRules: any[]): void;
 export declare function disabledAllFields(pageContext: PageContext): void;
-export declare function dynamicControlTableEdit(pageContext: PageContext, customRules: any[]): void;
+export declare function dynamicControlTableEdit(pageContext: PageContext, customRules: any[], tableCode?: any): void;
 export declare function updateComponentDisplayState(ref: any, item: any): void;

package/dist/es/components/runtime/utils/events/validator-util.js

@@ -4,7 +4,7 @@ import { getComponentRef, getComponentRefByCode, getAllComponentRefs } from "../
 import { getI18n } from "agilebuilder-ui/src/utils/util";
 import { getAdditionalParamMap } from "./standard-event.js";
 import { isPromise } from "agilebuilder-ui/src/utils/common-util";
-import { isWorkflowPage } from "../common-util.js";
+import { isWorkflowPage, getListCode } from "../common-util.js";
 function setObjectPropRule(prop, rules, leafRule) {
   const rule = {};
   if (!rules) {
@@ -512,6 +512,24 @@ function disabledAllFields(pageContext) {
     updateComponentDisplayState(ref, { disabled: true });
   });
 }
+function dynamicControlTableEdit(pageContext, customRules, tableCode) {
+  let gridRef;
+  let tableUuid;
+  if (tableCode) {
+    gridRef = getComponentRefByCode(pageContext, tableCode);
+    tableUuid = gridRef ? gridRef.getTableUuid() : null;
+  } else {
+    tableUuid = pageContext.tableUuids && pageContext.tableUuids.length > 0 ? pageContext.tableUuids[0] : null;
+    gridRef = tableUuid ? getComponentRef(pageContext, tableUuid) : null;
+  }
+  if (!gridRef) {
+    return;
+  }
+  const pageCode = pageContext.code;
+  const pageVersion = pageContext.version;
+  const listCode = getListCode(pageCode, pageVersion, tableUuid);
+  gridRef.dynamicControlTableEdit(pageContext, customRules, listCode);
+}
 function updateComponentDisplayState(ref, item) {
   if (ref) {
     const configure = ref.getConfigure();
@@ -531,6 +549,7 @@ function updateComponentDisplayState(ref, item) {
 }
 export {
   disabledAllFields,
+  dynamicControlTableEdit,
   getWorkflowRules,
   i18nValidatePropRulesMessage,
   i18nValidateRulesMessage,

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

@@ -106,9 +106,18 @@ const standardFuncUrlMap = {
     label: "暂存",
     functions: [
       {
+        label: "暂存",
+        code: "save",
         funcType: "AUTHENTICATED",
         //公用
         path: "/workflow-commons$POST"
+      },
+      {
+        label: "修改",
+        code: "update",
+        funcType: "AUTHENTICATED",
+        //公用
+        path: "/workflow-commons$PUT"
       }
     ]
   },

package/dist/es/components/runtime/views/assemblys/chart/table/chart-table-util.js

@@ -1,7 +1,6 @@
 import { getParamNames, getValueFromVariable } from "../../../../utils/page-helper-util.js";
 import { getCustomFunc } from "../../../../utils/events/event-util.js";
 import { getMinValue, getMaxValue, getSumValue, getAvgValue } from "../../../../utils/charts/chart-util.js";
-import "element-plus/es/locale/index.mjs";
 class ExpressionEvaluator {
   static evaluate(pageContext, conditions, data2) {
     const expressions = conditions.map(
@@ -197,7 +196,6 @@ function getHeaderCellStyleUtil(data2, runtimeStyle, props) {
 }
 function getRowStyleUtil(data2, groupSummaryDataRowIndex, props) {
   const returnStyle = {};
-  console.log("getRowStyleUtil---props.configure---", props.configure);
   if (props.configure.style.rowStyle) {
     for (let i = 0; i < props.configure.style.rowStyle.length; i++) {
       const rowStyle = props.configure.style.rowStyle[i];
@@ -219,13 +217,11 @@ function getRowStyleUtil(data2, groupSummaryDataRowIndex, props) {
           copyStyle(returnStyle, rowStyle);
         }
       } else {
-        console.log("getRowStyleUtil---rowStyle---", rowStyle);
         copyStyle(returnStyle, rowStyle);
       }
     }
   }
   if (groupSummaryDataRowIndex && groupSummaryDataRowIndex.length > 0 && groupSummaryDataRowIndex.indexOf(data2.rowIndex) !== -1) {
-    console.log("getRowStyleUtil---groupSummaryDataRowIndex---", groupSummaryDataRowIndex);
     const result = {};
     if (props.configure.style.collectStyle && props.configure.style.collectStyle.length > 0) {
       for (let i = 0; i < props.configure.style.collectStyle.length; i++) {
@@ -238,7 +234,6 @@ function getRowStyleUtil(data2, groupSummaryDataRowIndex, props) {
     }
     return result;
   }
-  console.log("getRowStyleUtil---returnStyle---", returnStyle);
   return returnStyle;
 }
 function getCellStyleUtil(data2, cellStyles, props) {
@@ -246,30 +241,42 @@ function getCellStyleUtil(data2, cellStyles, props) {
   if (cellStyles) {
     for (let i = 0; i < cellStyles.length; i++) {
       const columnsStyleSetting = cellStyles[i];
-      if (columnsStyleSetting.scopeFunc) {
-        const func = getCustomFunc(props.pageContext, columnsStyleSetting.scopeFunc);
-        if (func) {
-          const funcResult = func.apply(func, [{ data: data2 }]);
-          if (funcResult !== false) {
+      if (isSetStyle(columnsStyleSetting)) {
+        if (columnsStyleSetting.scopeFunc) {
+          const func = getCustomFunc(props.pageContext, columnsStyleSetting.scopeFunc);
+          if (func) {
+            const funcResult = func.apply(func, [{ data: data2 }]);
+            if (funcResult !== false) {
+              copyStyle(cellStyle, columnsStyleSetting);
+            }
+          }
+        } else if (columnsStyleSetting.matchingCondition) {
+          const result = ExpressionEvaluator.evaluate(
+            props.pageContext,
+            columnsStyleSetting.matchingCondition,
+            data2.row
+          );
+          if (result || result === void 0) {
             copyStyle(cellStyle, columnsStyleSetting);
           }
-        }
-      } else if (columnsStyleSetting.matchingCondition) {
-        const result = ExpressionEvaluator.evaluate(
-          props.pageContext,
-          columnsStyleSetting.matchingCondition,
-          data2.row
-        );
-        if (result || result === void 0) {
+        } else {
           copyStyle(cellStyle, columnsStyleSetting);
         }
-      } else {
-        copyStyle(cellStyle, columnsStyleSetting);
       }
     }
   }
   return cellStyle;
 }
+function isSetStyle(columnsStyleSetting) {
+  let customStyle;
+  if (columnsStyleSetting.customStyle) {
+    customStyle = JSON.parse(columnsStyleSetting.customStyle);
+  }
+  if (columnsStyleSetting.style && Object.keys(columnsStyleSetting.style).length > 0 || customStyle && Object.keys(customStyle).length > 0) {
+    return true;
+  }
+  return false;
+}
 function copyStyle(target, source) {
   Object.assign(target, source.style);
   if (source.customStyle) {

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

@@ -118,7 +118,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         isSql: true,
         extraParam: {
           beanName: pageContext.beanName,
-          functionCode: permissionPrefix + ".list",
+          functionCode: permissionPrefix + ".listData",
           tableName,
           systemCode: systemCode2,
           // 系统编码传给列表数据后台请求
@@ -766,6 +766,12 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         return gridRef.value.getTableSelectOptions(listCode);
       }
     }
+    function dynamicControlTableEdit(pageContext2, customRules, listCode2) {
+      if (gridRef.value) {
+        debugger;
+        gridRef.value.dynamicControlTableEdit(pageContext2, customRules, listCode2);
+      }
+    }
     __expose({
       refresh,
       createRow,
@@ -776,7 +782,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       isDeleteChange,
       validatorSunTableListData,
       showMobileSearch,
-      getTableSelectOptions
+      getTableSelectOptions,
+      dynamicControlTableEdit
     });
     return (_ctx, _cache) => {
       const _component_super_grid = resolveComponent("super-grid");

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

@@ -524,6 +524,11 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         return gridRef.value.getTableSelectOptions(listCode);
       }
     }
+    function dynamicControlTableEdit(pageContext2, customRules, listCode2) {
+      if (gridRef.value) {
+        gridRef.value.dynamicControlTableEdit(pageContext2, customRules, listCode2);
+      }
+    }
     __expose({
       createRow,
       getSelections,
@@ -533,7 +538,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       validatorSunTableListData,
       getValue,
       setValue,
-      getTableSelectOptions
+      getTableSelectOptions,
+      dynamicControlTableEdit
     });
     return (_ctx, _cache) => {
       const _component_super_grid = resolveComponent("super-grid");

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

@@ -69,6 +69,14 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         return gridRef.value.getTableSelectOptions();
       }
     }
+    function dynamicControlTableEdit(pageContext, customRules, listCode) {
+      if (gridRef.value) {
+        gridRef.value.dynamicControlTableEdit(pageContext, customRules, listCode);
+      }
+    }
+    function getTableUuid() {
+      return props.configure.uuid;
+    }
     __expose({
       refresh,
       createRow,
@@ -79,7 +87,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       isDeleteChange,
       validatorSunTableListData,
       showMobileSearch,
-      getTableSelectOptions
+      getTableSelectOptions,
+      dynamicControlTableEdit,
+      getTableUuid
     });
     return (_ctx, _cache) => {
       return openBlock(), createElementBlock("div", null, [

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

@@ -19,22 +19,60 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const headerStyle = runtimeInfo.headerStyle;
     const titleExceedStyle = runtimeInfo.titleExceedStyle;
     const designProperty = ref(runtimeInfo.props ? runtimeInfo.props : {});
-    if (designProperty.value.activeValue === void 0 || designProperty.value.activeValue === null) {
-      designProperty.value.activeValue = "1";
+    let val = getVariableValue(entity, dynamicFields);
+    if (val !== void 0 && val !== null && (val + "" === "1" || val + "" === "0")) {
+      if (designProperty.value.activeValue === void 0 || designProperty.value.activeValue === null) {
+        designProperty.value.activeValue = "1";
+      }
+      if (designProperty.value.inactiveValue === void 0 || designProperty.value.inactiveValue === null) {
+        designProperty.value.inactiveValue = "0";
+      }
+    }
+    if (val !== void 0 && val !== null && (val + "" === "true" || val + "" === "false")) {
+      if (designProperty.value.activeValue === void 0 || designProperty.value.activeValue === null) {
+        designProperty.value.activeValue = "true";
+      }
+      if (designProperty.value.inactiveValue === void 0 || designProperty.value.inactiveValue === null) {
+        designProperty.value.inactiveValue = "false";
+      }
     }
-    if (designProperty.value.inactiveValue === void 0 || designProperty.value.inactiveValue === null) {
-      designProperty.value.inactiveValue = "0";
+    if (designProperty.value.activeValue === void 0 || designProperty.value.activeValue === null || designProperty.value.activeValue === "") {
+      designProperty.value.activeValue = true;
+    }
+    if (designProperty.value.inactiveValue === void 0 || designProperty.value.inactiveValue === null || designProperty.value.inactiveValue === "") {
+      designProperty.value.inactiveValue = false;
     }
     const switchStyle = runtimeInfo.switchStyle;
     const dynamicModelMethod = computed({
       get() {
-        let val = getVariableValue(entity, dynamicFields);
-        if (val !== void 0 && val !== null) {
-          val = val + "";
+        let val2 = getVariableValue(entity, dynamicFields);
+        if (val2 !== void 0 && val2 !== null) {
+          if (designProperty.value.activeValue === true) {
+            if (val2 + "" === "1") {
+              val2 = true;
+            }
+            if (val2 + "" === "0") {
+              val2 = false;
+            }
+          } else {
+            val2 = val2 + "";
+          }
         }
-        return val;
+        return val2;
       },
       set(value) {
+        if (value !== void 0 && value !== null) {
+          if (designProperty.value.activeValue === true) {
+            if (value + "" === "1") {
+              value = true;
+            }
+            if (value + "" === "0") {
+              value = false;
+            }
+          } else {
+            value = value + "";
+          }
+        }
         setVariableValue(entity, dynamicFields, value);
       }
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "super-page-runtime",
-  "version": "2.1.64",
+  "version": "2.1.67",
   "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.0.90",
+    "agilebuilder-ui": "1.0.91",
     "axios": "^1.6.8",
     "cypress": "^13.6.6",
     "element-plus": "^2.6.1",