super-page-designer 2.0.82 → 2.0.83

package/dist/es/components/design/utils/assemblys-config.js

@@ -289,7 +289,7 @@ const assemblyGroups = [{
     name: "form",
     label: "表单",
     icon: containerForm,
-    props: { size: { widthType: "flex", flexSpan: 24 } },
+    props: { base: {}, size: { widthType: "flex", flexSpan: 24 } },
     style: {},
     events: [
       { name: "beforeFormLoad", label: "加载表单数据前", tip: "还没有加载表单数据时" },
@@ -2689,8 +2689,7 @@ function getInitialInformationByName(name) {
   return null;
 }
 function getDesignEvents(name) {
-  if (!name)
-    return [];
+  if (!name) return [];
   for (let i = 0; i < assemblyGroups.length; i++) {
     let items = assemblyGroups[i].items;
     for (let j = 0; j < items.length; j++) {

package/dist/es/components/design/utils/chart-design-util.js

@@ -142,8 +142,7 @@ function generateChartOption(configure, chartOption) {
   const isGauge = configure.name == "chart-gauge";
   const isRadar = configure.name == "chart-radar";
   const isScatter = configure.name == "chart-scatter";
-  if (thisProps.title)
-    ;
+  if (thisProps.title) ;
   if (thisProps.subTitle) {
     tempOption.title[0].subtext = thisProps.subTitle;
     if (thisStyle.subtitleTextAlign) {

package/dist/es/components/design/utils/form-design-util.d.ts

@@ -184,3 +184,18 @@ export declare function deleteRule(pageDesign: any, configure: any): void;
  */
 export declare function resetConfigIndo(configure: any, val: string): boolean;
 export declare function componentNameChange(configure: Component, componentName: any, emit: any): void;
+/**
+ * 获得引用表字段集合（例如：1对1子表字段、主表字段）
+ * @param configure 字段配置，主要使用prop属性名，例如：data.DEMO_SUPPPLIER.MY_NAME
+ * @param runtimePropMap
+ * @param oldProp 修改之前的属性名
+ * @return {tableName:[字段名,... ...],tableName:[字段名,... ...]}
+ */
+export declare function getRefrencePropMap(newProp: string, oldProp: string, runtimePropMap: any): void;
+/**
+ * 删除指定引用字段
+ * @param prop
+ * @param runtimePropMap
+ * @returns
+ */
+export declare function removePropFromRefrencePropMap(prop: string, runtimePropMap: any): void;

package/dist/es/components/design/utils/form-design-util.js

@@ -231,8 +231,7 @@ function caculateComponentProps(configure, property) {
     }
     const optionConf = getComponentOptionConfigs(configure, pageDesign);
     if (optionConf) {
-      if (dataOrigin)
-        pageDesign.initOptionConfigs.push(optionConf);
+      if (dataOrigin) pageDesign.initOptionConfigs.push(optionConf);
       tempProps["optionconfigInfo"] = optionConf;
       if (optionConf.props && optionConf.props.monitorFields) {
         for (let fieldName of optionConf.props.monitorFields) {
@@ -540,13 +539,49 @@ function componentNameChange(configure, componentName, emit) {
     emit("changeAssembly", configure);
   }
 }
+function getRefrencePropMap(newProp, oldProp, runtimePropMap) {
+  removePropFromRefrencePropMap(oldProp, runtimePropMap);
+  let props = [];
+  if (newProp) {
+    props = newProp.split(".");
+  }
+  if (props.length >= 3) {
+    const refrenceTableName = props[1];
+    const fieldName = props[2].substring(0, props[2].lastIndexOf("}"));
+    if (!runtimePropMap[refrenceTableName]) {
+      runtimePropMap[refrenceTableName] = [];
+    }
+    if (runtimePropMap[refrenceTableName].indexOf(fieldName) < 0) {
+      runtimePropMap[refrenceTableName].push(fieldName);
+    }
+  }
+}
+function removePropFromRefrencePropMap(prop, runtimePropMap) {
+  let props = [];
+  if (prop) {
+    props = prop.split(".");
+  }
+  if (props.length >= 3) {
+    const refrenceTableName = props[1];
+    const fieldName = props[2].substring(0, props[2].lastIndexOf("}"));
+    if (!runtimePropMap[refrenceTableName]) {
+      return;
+    }
+    if (runtimePropMap[refrenceTableName].indexOf(fieldName) > 0) {
+      const newArr = runtimePropMap[refrenceTableName].filter((item) => item !== fieldName);
+      runtimePropMap[refrenceTableName] = newArr;
+    }
+  }
+}
 export {
   caculateComponentProps,
   caculateDetailComponentStyle,
   columnCustomTittleClass,
   columnTittleStyle,
   componentNameChange,
+  getRefrencePropMap,
   removComponentOptionConfigs,
+  removePropFromRefrencePropMap,
   resetConfigIndo,
   watchMaxOrMinValidate,
   watchPatternValidate,

package/dist/es/components/design/utils/interfaces/page-design-types.d.ts

@@ -249,7 +249,7 @@ export interface ListColumn {
     displayOrder: number;
     fileSet: string | null | undefined;
     orgTreeSet: string | null | undefined;
-    dynamicColumnJson?: string;
+    dynamicColumnJson?: string | null | undefined;
     valueSetOptions: string | null | undefined;
     required: boolean;
     pattern: string;

package/dist/es/components/design/utils/page-table-util.js

@@ -37,7 +37,12 @@ function setTableRuntimesFromConfigure(tableConfigure, pageDesign) {
   delete tableConfigure.btnList;
   delete tableConfigure.items;
   delete tableConfigure.modelFields;
-  delete tableConfigure.runtime;
+  if (tableConfigure.runtime && tableConfigure.runtime.events) {
+    const { events } = tableConfigure.runtime;
+    tableConfigure.runtime = { events };
+  } else {
+    delete tableConfigure.runtime;
+  }
 }
 function getListView(configureCopy, pageDesign, tableConfigureStr) {
   const listCode = "V" + pageDesign.version + "__" + pageDesign.code + "__" + configureCopy.uuid;
@@ -167,7 +172,7 @@ function getListColumns(configure, pageDesign) {
       //组织结构树参数设置
       orgTreeSet: getOrgTreeSet(item),
       // 字段为动态列时，json
-      // dynamicColumnJson: string
+      dynamicColumnJson: getDynamicColumnJson(item),
       // 值设置，设置多个
       valueSetOptions: getValueSetOptions(item),
       // 是否必填
@@ -187,9 +192,6 @@ function getListColumns(configure, pageDesign) {
        */
       // ifMultiData: boolean
     };
-    if (item.props.base.prop && item.props.base.prop === "dynamicColumnSelect") {
-      formatDynamicColumnData(item, temp);
-    }
     listColumns.push(temp);
   });
   return listColumns;
@@ -424,9 +426,6 @@ function getNameFromProp(prop) {
   }
   return prop;
 }
-function formatDynamicColumnData(item, temp) {
-  temp.dynamicColumnJson = JSON.stringify(item.props.dataOrigin.dynamicColumnJson);
-}
 function getListColumnEvent(item, pageDesign) {
   let result = null;
   if (item.events) {
@@ -435,7 +434,7 @@ function getListColumnEvent(item, pageDesign) {
         if (!result) {
           result = {};
         }
-        result[event.name] = event.componentUuid;
+        result[event.name] = event.componentUuid + "_" + event.name;
       }
     });
     if (result) {
@@ -444,6 +443,12 @@ function getListColumnEvent(item, pageDesign) {
   }
   return result;
 }
+function getDynamicColumnJson(item) {
+  if (item.props.base.prop && item.props.base.prop === "dynamicColumnSelect") {
+    return JSON.stringify(item.props.dynamicColumnData);
+  }
+  return null;
+}
 function tableResetConfigIndo(configure, moduleValue) {
   let newColumnInfo = {
     uuid: configure.uuid,

package/dist/es/components/design/views/assemblys/button/button/button-attr-advanced.vue.js

@@ -91,7 +91,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       combinationVisible.value = false;
     }
     function saveCondition(table) {
-      props.configure.props.base.showCondition = JSON.stringify(table);
+      props.configure.props.base.showConditions = JSON.stringify(table);
     }
     return (_ctx, _cache) => {
       const _component_el_option = resolveComponent("el-option");
@@ -108,7 +108,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         default: withCtx(() => [
           createVNode(_component_el_collapse, {
             modelValue: openCollapseItems.value,
-            "onUpdate:modelValue": _cache[6] || (_cache[6] = ($event) => openCollapseItems.value = $event),
+            "onUpdate:modelValue": _cache[5] || (_cache[5] = ($event) => openCollapseItems.value = $event),
             style: { "margin-top": "6px" }
           }, {
             default: withCtx(() => [
@@ -230,15 +230,11 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                       class: "amb-design-attr-item"
                     }, {
                       default: withCtx(() => [
-                        createVNode(_component_el_button, {
-                          type: "primary",
-                          onClick: _cache[4] || (_cache[4] = ($event) => combinationVisible.value = true)
-                        }, {
-                          default: withCtx(() => [
-                            createTextVNode("编辑")
-                          ]),
-                          _: 1
-                        })
+                        (openBlock(), createBlock(_sfc_main$1, {
+                          key: __props.configure.uuid + "_show",
+                          configure: __props.configure,
+                          type: "showConditions"
+                        }, null, 8, ["configure"]))
                       ]),
                       _: 1
                     }),
@@ -249,7 +245,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                       default: withCtx(() => [
                         createVNode(_component_el_button, {
                           type: "primary",
-                          onClick: _cache[5] || (_cache[5] = ($event) => journalSetVisible.value = true)
+                          onClick: _cache[4] || (_cache[4] = ($event) => journalSetVisible.value = true)
                         }, {
                           default: withCtx(() => [
                             createTextVNode("编辑")
@@ -278,7 +274,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
               }, null, 8, ["pageDesign", "configure"])) : createCommentVNode("", true),
               combinationVisible.value ? (openBlock(), createBlock(_sfc_main$4, {
                 key: 2,
-                conditionList: __props.configure.props.base.showCondition,
+                conditionList: __props.configure.props.base.showConditions,
                 fieldNameList: __props.pageDesign.modelFields,
                 fieldMap: __props.pageDesign.modelFieldsMap,
                 onSave: saveCondition,

package/dist/es/components/design/views/assemblys/button/button/button-attr-base.vue.js

@@ -1,7 +1,7 @@
 import { defineComponent, ref, onMounted, resolveComponent, openBlock, createBlock, withCtx, createVNode, createElementVNode, createElementBlock, Fragment, renderList, unref, createTextVNode, withDirectives, vShow } from "vue";
 import { getFormComponentOptions } from "../../../../utils/assemblys-config.js";
 import "../../../../../../stores/page-store.js";
-import "../../form/common/dimension-input.vue.js";
+/* empty css                                    */
 import _sfc_main$2 from "../../common/common-icon-bind.vue.js";
 import http from "agilebuilder-ui/src/utils/request";
 import _sfc_main$1 from "../../common/common-function-code.vue.js";

package/dist/es/components/design/views/assemblys/button/button-group/buttongroup-attr.vue.js

@@ -1,5 +1,5 @@
 import _sfc_main from "./buttongroup-attr.vue2.js";
-import "./buttongroup-attr.vue3.js";
+/* empty css                      */
 export {
   _sfc_main as default
 };

package/dist/es/components/design/views/assemblys/button/component/combination.vue.js

@@ -69,10 +69,10 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     }
     function savebuttonSetting() {
       if (tableData.value && tableData.value.length > 0) {
-        for (var i = 0; i < tableData.value.length; i++) {
+        for (let i = 0; i < tableData.value.length; i++) {
           const item = tableData.value[i];
-          if (!item.propName) {
-            return ElMessage.warning("字段名或值有空白");
+          if (!item.propName || !item.propValue) {
+            return ElMessage.warning("第" + i + "行字段名或值有空白");
           }
         }
       }
@@ -184,6 +184,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                     modelValue: scope.row.propDbName,
                     "onUpdate:modelValue": ($event) => scope.row.propDbName = $event,
                     clearable: "",
+                    filterable: "",
                     size: "default",
                     onChange: ($event) => changeFieldName(scope.$index, scope.row, scope.row.propDbName)
                   }, {
@@ -232,7 +233,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
               }, {
                 default: withCtx((scope) => [
                   createVNode(BindVariable, {
-                    modelValue: scope.row.defaultValue,
+                    modelValue: scope.row.propValue,
                     "onUpdate:modelValue": (data) => afterBindDefaultValue(data, scope.row)
                   }, null, 8, ["modelValue", "onUpdate:modelValue"])
                 ]),

package/dist/es/components/design/views/assemblys/button/component/journal-set-dialog.vue.js

@@ -1,5 +1,5 @@
 import _sfc_main from "./journal-set-dialog.vue2.js";
-import "./journal-set-dialog.vue3.js";
+/* empty css                        */
 import _export_sfc from "../../../../../../_virtual/_plugin-vue_export-helper.js";
 const JournalSetDialog = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-665d3bf4"]]);
 export {

package/dist/es/components/design/views/assemblys/button/dropdown/dropdown-attr.vue.js

@@ -1,5 +1,5 @@
 import _sfc_main from "./dropdown-attr.vue2.js";
-import "./dropdown-attr.vue3.js";
+/* empty css                   */
 export {
   _sfc_main as default
 };

package/dist/es/components/design/views/assemblys/button/export-pdf/exportpdf-attr-advanced.vue.js

@@ -75,7 +75,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       combinationVisible.value = false;
     }
     function saveCondition(table) {
-      props.configure.props.base.showCondition = JSON.stringify(table);
+      props.configure.props.base.showConditions = JSON.stringify(table);
     }
     return (_ctx, _cache) => {
       const _component_el_option = resolveComponent("el-option");
@@ -216,7 +216,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
               }, null, 8, ["configure"])) : createCommentVNode("", true),
               combinationVisible.value ? (openBlock(), createBlock(_sfc_main$4, {
                 key: 2,
-                conditionList: __props.configure.props.base.showCondition,
+                conditionList: __props.configure.props.base.showConditions,
                 fieldNameList: attributeMap.value,
                 fieldMap: fieldMap.value,
                 onSave: saveCondition,

package/dist/es/components/design/views/assemblys/button/export-pdf/exportpdf-attr.vue.js

@@ -1,5 +1,5 @@
 import _sfc_main from "./exportpdf-attr.vue2.js";
-import "./exportpdf-attr.vue3.js";
+/* empty css                    */
 export {
   _sfc_main as default
 };

package/dist/es/components/design/views/assemblys/button/print-label/printlabel-attr-advanced.vue.js

@@ -75,7 +75,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       combinationVisible.value = false;
     }
     function saveCondition(table) {
-      props.configure.props.base.showCondition = JSON.stringify(table);
+      props.configure.props.base.showConditions = JSON.stringify(table);
     }
     return (_ctx, _cache) => {
       const _component_el_option = resolveComponent("el-option");
@@ -216,7 +216,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
               }, null, 8, ["configure"])) : createCommentVNode("", true),
               combinationVisible.value ? (openBlock(), createBlock(_sfc_main$4, {
                 key: 2,
-                conditionList: __props.configure.props.base.showCondition,
+                conditionList: __props.configure.props.base.showConditions,
                 fieldNameList: attributeMap.value,
                 fieldMap: fieldMap.value,
                 onSave: saveCondition,

package/dist/es/components/design/views/assemblys/button/print-label/printlabel-attr.vue.js

@@ -1,5 +1,5 @@
 import _sfc_main from "./printlabel-attr.vue2.js";
-import "./printlabel-attr.vue3.js";
+/* empty css                     */
 export {
   _sfc_main as default
 };

package/dist/es/components/design/views/assemblys/chart/common/common-attr-groupby.vue.js

@@ -78,10 +78,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       }
     }
     function afterBindVariable(modelValue, field) {
-      if (field == "groupVariable") {
+      {
         props.configure.props.groupVariable = modelValue;
-      } else if (field == "selGroupVariable") {
-        props.configure.props.selGroupVariable = modelValue;
       }
     }
     const sourceFields = ref([]);
@@ -376,7 +374,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                 createVNode(BindVariable, {
                   modelValue: __props.configure.props.groupVariable,
                   paramTypes: ["data", "page"],
-                  "onUpdate:modelValue": _cache[4] || (_cache[4] = (value) => afterBindVariable(value, "groupVariable"))
+                  "onUpdate:modelValue": _cache[4] || (_cache[4] = (value) => afterBindVariable(value))
                 }, null, 8, ["modelValue"])
               ]),
               _: 1

package/dist/es/components/design/views/assemblys/chart/gauge/series/styles/style-axislabel.vue.js

@@ -13,8 +13,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const props = __props;
     const fontSizes = ["8", "10", "12", "14", "16", "18", "20", "24", "28"];
     const isPieAttr = ref(true);
-    if (props.chartType == "seriesChart")
-      ;
+    if (props.chartType == "seriesChart") ;
     else {
       isPieAttr.value = false;
     }

package/dist/es/components/design/views/assemblys/common/common-advanced-basic-showcondition.vue.js

@@ -22,22 +22,23 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     }
   },
   setup(__props) {
+    var _a;
     const pageDesignUtil = usePageContextStore();
     const props = __props;
     if (!props.configure.props) {
-      props.configure.props = {};
+      props.configure.props = { base: {} };
     }
     let tableDatas = null;
     if (props.type === "editConditions") {
-      if (!props.configure.props.editConditions) {
-        props.configure.props.editConditions = [];
+      if (!props.configure.props.base.editConditions) {
+        props.configure.props.base.editConditions = [];
       }
-      tableDatas = props.configure.props.editConditions;
+      tableDatas = props.configure.props.base.editConditions;
     } else {
-      if (!props.configure.props.showConditions) {
-        props.configure.props.showConditions = [];
+      if (!((_a = props.configure.props.base) == null ? void 0 : _a.showConditions)) {
+        props.configure.props.base.showConditions = [];
       }
-      tableDatas = props.configure.props.showConditions;
+      tableDatas = props.configure.props.base.showConditions;
     }
     const tableHeight = ref(300);
     const dialogTableVisible = ref(false);
@@ -114,8 +115,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         let dataType = "";
         if (val && val.startsWith("${")) {
           let propName = val.substring(2, val.length - 1);
-          if (propName.startsWith("page."))
-            ;
+          if (propName.startsWith("page.")) ;
           else if (propName.startsWith("data.")) {
             propName = propName.substring(5);
             dataType = pageDesignUtil.getModelField(propName);

package/dist/es/components/design/views/assemblys/common/common-variable-bind.vue.js

@@ -1,5 +1,5 @@
-import _sfc_main from "./common-variable-bind.vue2.js";
-import "./common-variable-bind.vue3.js";
+import _sfc_main from "./common-variable-bind.vue3.js";
+/* empty css                          */
 import _export_sfc from "../../../../../_virtual/_plugin-vue_export-helper.js";
 const BindVariable = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-468275d2"]]);
 export {