super-page-designer 2.0.23 → 2.0.26

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

@@ -1988,26 +1988,15 @@ const pageConf = {
       label: "加载后"
     },
     {
-      name: "resize",
-      label: "尺寸变化",
-      params: [
-        {
-          name: "width",
-          label: "宽度",
-          type: "number"
-        },
-        {
-          name: "height",
-          label: "高度",
-          type: "number"
-        }
-      ]
+      name: "onUnmounted",
+      label: ""
     }
   ]
 };
 function getPageConf() {
   const tempConf = deepCopy(pageConf);
   tempConf.code = getUuidv4();
+  tempConf.uuid = tempConf.code;
   tempConf.label = "页面";
   return tempConf;
 }
@@ -2172,6 +2161,9 @@ function getDesignConfByName(name) {
   if (!name) {
     return null;
   }
+  if (name == "page") {
+    return getPageConf();
+  }
   for (let i = 0; i < assemblyGroups.length; i++) {
     let items = assemblyGroups[i].items;
     for (let j = 0; j < items.length; j++) {
@@ -2208,39 +2200,12 @@ function getFormComponentOptions() {
     }
   }
 }
-function getComponentEventOptions(componentName) {
-  if (componentName && componentName === "page") {
-    return;
-  }
-  for (let assemblyGroup of assemblyGroups) {
-    if (assemblyGroup.name === componentName) {
-      return assemblyGroup.events;
-    } else {
-      for (let item of assemblyGroup.items) {
-        if (item.name === componentName) {
-          return item.events;
-        }
-      }
-    }
-  }
-}
-function getStandardOperationLabel(eventName) {
-  for (let i = 0; i < standardButtonOperations.length; i++) {
-    const parent = standardButtonOperations[i];
-    const result = parent.options.filter((item) => item.value === eventName);
-    if (result && result.length > 0) {
-      return result[0].label;
-    }
-  }
-}
 export {
   assemblyGroups,
   getAttrComponentByName,
-  getComponentEventOptions,
   getDesignComponentByName,
   getDesignConfByName,
   getFormComponentOptions,
   getPageConf,
-  getStandardOperationLabel,
   standardButtonOperations
 };

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

@@ -119,7 +119,7 @@ function getOperators(item) {
           label: "时间范围"
         }
       ];
-    } else if (item.dataType === "text") {
+    } else if (item.dataType === "text" || item.dataType === "string") {
       return [
         {
           name: "EQ",

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

@@ -34,3 +34,4 @@ export declare function initPageDesignState(pageDesign: PageDesign): RemovableRe
  * @param pageVersion
  */
 export declare function getPageDesign(pageCode: string, pageVersion: number): RemovableRef<PageDesign> | null;
+export declare function getFormPropName(prop: any): any;

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

@@ -16,7 +16,15 @@ function addComponentRef(pageDesign, componentIndex, refObj) {
 function getPageRefKey(pageCode, pageVersion) {
   return "pageDesignRef-" + pageCode + "-" + (pageVersion ? pageVersion : 1);
 }
+function getFormPropName(prop) {
+  if (prop && prop.indexOf("${") >= 0) {
+    return prop.substring(prop.indexOf(".") + 1, prop.lastIndexOf("}"));
+  } else {
+    return prop;
+  }
+}
 export {
   addComponentRef,
+  getFormPropName,
   initComponentRefState
 };

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

@@ -20,6 +20,7 @@ function addPermission(pageDesign, eventName, name, uuid) {
   if (!pageDesign.pagePermissions) {
     pageDesign.pagePermissions = [];
   }
+  const pageCode = pageDesign.code;
   const standardPermissionMap = getStandPermissionInfo(eventName);
   if (!standardPermissionMap || !standardPermissionMap.functions) {
     return;
@@ -60,6 +61,8 @@ function addPermission(pageDesign, eventName, name, uuid) {
         uuids: [uuid],
         //组件的uuid
         funcType: f.funcType ? f.funcType : FuncType.AUTHORIZED,
+        code: pageCode + "." + tempCode,
+        path: "/" + pageCode + f.path,
         uuid: getUuidv4()
       };
       pagePermissions.push(item);
@@ -69,6 +72,7 @@ function addPermission(pageDesign, eventName, name, uuid) {
   return allItems;
 }
 function batchUpdatePermissions(configure, pageDesign) {
+  const pageCode = pageDesign.code;
   const events = configure.events ? configure.events : [];
   const propsBase = configure.props && configure.props.base ? configure.props.base : {};
   const autoPermissions = [];
@@ -89,6 +93,8 @@ function batchUpdatePermissions(configure, pageDesign) {
                 simpleCode: f.code ? f.code : evt.eventName,
                 funcType: f.funcType
               };
+              tempP.code = pageCode + "." + tempP.simpleCode;
+              tempP.path = "/" + pageCode + f.path;
               Object.assign(tempP, p);
               autoPermissions.push(tempP);
             }

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

@@ -1,4 +1,5 @@
 import http from "agilebuilder-ui/src/utils/request";
+import { getFormPropName } from "./page-helper-util.js";
 function queryTableFields(systemCode, systemVersion, tableName) {
   let url = window["$vueApp"].config.globalProperties.baseAPI + "/mms/data-tables/table-columns";
   url += "?systemCode=" + (systemCode ? systemCode : "");
@@ -37,10 +38,11 @@ function setTableRuntimesFromConfigure(tableConfigure, pageDesign) {
   delete tableConfigure.runtime;
 }
 function getListView(configureCopy, pageDesign, tableConfigureStr) {
+  const listCode = pageDesign.code + "__V" + pageDesign.pageVersion + "__" + configureCopy.uuid;
   const listView = {
     configure: tableConfigureStr,
     // uuid
-    code: configureCopy.uuid,
+    code: listCode,
     // 名称
     name: configureCopy.label,
     // 合计方式，不合计（no)，当前页(current)，所有页(all),使用radio选择
@@ -112,12 +114,12 @@ function getListColumns(configure, pageDesign) {
   var _a;
   const listColumns = [];
   (_a = configure.items) == null ? void 0 : _a.forEach((item) => {
-    ({ controlName: getControlName(item.name) });
+    const listColumn = { controlName: getControlName(item.name) };
     const temp = {
       // 列头名
       headerName: item.props.base.name,
       //对应数据表字段名字。(listColumn的tableColumn）占位符列和$selection、$index两列时为固定值(listColumn的prop）
-      prop: item.props.base.prop,
+      prop: getFormPropName(item.props.base.prop),
       //列宽
       width: item.props.base.columnWidth,
       //是否排序 true false custom
@@ -147,7 +149,7 @@ function getListColumns(configure, pageDesign) {
       // 编辑时默认值设置
       defaultValue: item.props.base.defaultValue,
       // 编辑时控件类型
-      controlName: item.name,
+      controlName: listColumn.controlName,
       // 控件属性配置
       controlConfig: getControlConfig(item),
       //事件类型,json格式，格式为：{input:funName1,blur:funName2,focus:funName3,...}，funName1、funName2等方法名，通过列表的options.eventCallBack传入

package/dist/es/components/design/views/assemblys/data/bar-code/barcode-attr-base.vue.js

@@ -1,8 +1,9 @@
-import { defineComponent, ref, resolveComponent, openBlock, createBlock, withCtx, createVNode, createElementVNode, createElementBlock, Fragment, renderList, unref, createTextVNode, createCommentVNode } from "vue";
+import { defineComponent, ref, onMounted, resolveComponent, openBlock, createBlock, withCtx, createVNode, createElementVNode, createElementBlock, Fragment, renderList, unref, createTextVNode, createCommentVNode } from "vue";
 import { getFormComponentOptions } from "../../../../utils/assemblys-config.js";
 import _sfc_main$2 from "../../common/common-attr-size.vue.js";
 import _sfc_main$1 from "../../form/common/dataorigin-input-table.vue.js";
 import BindVariable from "../../common/common-variable-bind.vue.js";
+import http from "agilebuilder-ui/src/utils/request";
 const _hoisted_1 = { style: { "padding": "8px 0px 0px 0px" } };
 const _hoisted_2 = { style: { "padding": "8px 0px 0px 0px" } };
 const _hoisted_3 = { key: 2 };
@@ -16,9 +17,23 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const props = __props;
     const openCollapseItems = ref([]);
     const dataRule = ref([]);
+    const formatOptions = ref([]);
+    onMounted(() => {
+      http.get(window["$vueApp"].config.globalProperties.baseAPI + "/dc/setting-barcode-model/select-options").then((res) => {
+        formatOptions.value = res;
+      });
+    });
     function afterBindVariable(modelValue) {
       props.configure.props.base.prop = modelValue;
     }
+    function typeChange(newValue) {
+      if (newValue === "br-code") {
+        props.configure.props.base.brCodeFormat = "CODE128";
+      }
+    }
+    function ruleChange(newValue) {
+      props.configure.props.base.generateRule = "";
+    }
     return (_ctx, _cache) => {
       const _component_el_option = resolveComponent("el-option");
       const _component_el_select = resolveComponent("el-select");
@@ -29,14 +44,15 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       const _component_el_collapse_item = resolveComponent("el-collapse-item");
       const _component_el_collapse = resolveComponent("el-collapse");
       const _component_el_form = resolveComponent("el-form");
-      return openBlock(), createBlock(_component_el_form, {
+      return __props.configure ? (openBlock(), createBlock(_component_el_form, {
+        key: 0,
         "label-width": "80px",
         size: "small"
       }, {
         default: withCtx(() => [
           createVNode(_component_el_collapse, {
             modelValue: openCollapseItems.value,
-            "onUpdate:modelValue": _cache[8] || (_cache[8] = ($event) => openCollapseItems.value = $event),
+            "onUpdate:modelValue": _cache[11] || (_cache[11] = ($event) => openCollapseItems.value = $event),
             style: { "margin-top": "6px" }
           }, {
             default: withCtx(() => [
@@ -106,6 +122,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                         createVNode(_component_el_radio_group, {
                           modelValue: __props.configure.props.base.type,
                           "onUpdate:modelValue": _cache[3] || (_cache[3] = ($event) => __props.configure.props.base.type = $event),
+                          onChange: typeChange,
                           class: "ml-4"
                         }, {
                           default: withCtx(() => [
@@ -127,14 +144,15 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                       ]),
                       _: 1
                     }),
-                    createVNode(_component_el_form_item, {
+                    __props.configure.props.base.type === "br-code" ? (openBlock(), createBlock(_component_el_form_item, {
+                      key: 0,
                       label: "条形码格式",
                       class: "amb-design-attr-item"
                     }, {
                       default: withCtx(() => [
                         createVNode(_component_el_select, {
-                          modelValue: __props.configure.props.base.format,
-                          "onUpdate:modelValue": _cache[4] || (_cache[4] = ($event) => __props.configure.props.base.format = $event),
+                          modelValue: __props.configure.props.base.brCodeFormat,
+                          "onUpdate:modelValue": _cache[4] || (_cache[4] = ($event) => __props.configure.props.base.brCodeFormat = $event),
                           placeholder: "请选择"
                         }, {
                           default: withCtx(() => [
@@ -215,6 +233,66 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                         }, 8, ["modelValue"])
                       ]),
                       _: 1
+                    })) : createCommentVNode("", true),
+                    createVNode(_component_el_form_item, {
+                      label: "生成规则",
+                      class: "amb-design-attr-item"
+                    }, {
+                      default: withCtx(() => [
+                        createVNode(_component_el_radio_group, {
+                          modelValue: __props.configure.props.base.generateRuleType,
+                          "onUpdate:modelValue": _cache[5] || (_cache[5] = ($event) => __props.configure.props.base.generateRuleType = $event),
+                          onChange: ruleChange,
+                          class: "ml-4"
+                        }, {
+                          default: withCtx(() => [
+                            createVNode(_component_el_radio, { value: "fixed" }, {
+                              default: withCtx(() => [
+                                createTextVNode("固定")
+                              ]),
+                              _: 1
+                            }),
+                            createVNode(_component_el_radio, { value: "selected" }, {
+                              default: withCtx(() => [
+                                createTextVNode("选择规则")
+                              ]),
+                              _: 1
+                            })
+                          ]),
+                          _: 1
+                        }, 8, ["modelValue"])
+                      ]),
+                      _: 1
+                    }),
+                    createVNode(_component_el_form_item, {
+                      label: "",
+                      class: "amb-design-attr-item"
+                    }, {
+                      default: withCtx(() => [
+                        __props.configure.props.base.generateRuleType === "fixed" ? (openBlock(), createBlock(_component_el_input, {
+                          key: 0,
+                          modelValue: __props.configure.props.base.generateRule,
+                          "onUpdate:modelValue": _cache[6] || (_cache[6] = ($event) => __props.configure.props.base.generateRule = $event),
+                          type: "textarea"
+                        }, null, 8, ["modelValue"])) : (openBlock(), createBlock(_component_el_select, {
+                          key: 1,
+                          modelValue: __props.configure.props.base.generateRule,
+                          "onUpdate:modelValue": _cache[7] || (_cache[7] = ($event) => __props.configure.props.base.generateRule = $event),
+                          placeholder: "请选择"
+                        }, {
+                          default: withCtx(() => [
+                            (openBlock(true), createElementBlock(Fragment, null, renderList(formatOptions.value, (item) => {
+                              return openBlock(), createBlock(_component_el_option, {
+                                key: item.code,
+                                label: item.name,
+                                value: item.code
+                              }, null, 8, ["label", "value"]);
+                            }), 128))
+                          ]),
+                          _: 1
+                        }, 8, ["modelValue"]))
+                      ]),
+                      _: 1
                     }),
                     createVNode(_component_el_form_item, {
                       label: "状态",
@@ -223,7 +301,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                       default: withCtx(() => [
                         createVNode(_component_el_radio_group, {
                           modelValue: __props.configure.props.base.state,
-                          "onUpdate:modelValue": _cache[5] || (_cache[5] = ($event) => __props.configure.props.base.state = $event),
+                          "onUpdate:modelValue": _cache[8] || (_cache[8] = ($event) => __props.configure.props.base.state = $event),
                           class: "ml-4"
                         }, {
                           default: withCtx(() => [
@@ -263,7 +341,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                       default: withCtx(() => [
                         createVNode(_component_el_radio_group, {
                           modelValue: __props.configure.props.base.way,
-                          "onUpdate:modelValue": _cache[6] || (_cache[6] = ($event) => __props.configure.props.base.way = $event),
+                          "onUpdate:modelValue": _cache[9] || (_cache[9] = ($event) => __props.configure.props.base.way = $event),
                           class: "ml-4"
                         }, {
                           default: withCtx(() => [
@@ -308,7 +386,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                       default: withCtx(() => [
                         createVNode(_sfc_main$1, {
                           modelValue: __props.configure.props.base.regulation,
-                          "onUpdate:modelValue": _cache[7] || (_cache[7] = ($event) => __props.configure.props.base.regulation = $event)
+                          "onUpdate:modelValue": _cache[10] || (_cache[10] = ($event) => __props.configure.props.base.regulation = $event)
                         }, null, 8, ["modelValue"])
                       ]),
                       _: 1
@@ -343,7 +421,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           }, 8, ["modelValue"])
         ]),
         _: 1
-      });
+      })) : createCommentVNode("", true);
     };
   }
 });

package/dist/es/components/design/views/assemblys/data/bar-code/barcode-design.vue2.js

@@ -15,7 +15,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const barcode = ref(null);
     const barcodeFormat = ref("CODE128");
     function createBarCode() {
-      JsBarcode(barcode.value, qrCodeData.value, { format: barcodeFormat.value });
+      if (barcode.value) {
+        JsBarcode(barcode.value, qrCodeData.value, { format: barcodeFormat.value });
+      }
     }
     function createQrCode() {
       qrcode.toDataURL(qrCodeData.value, (err, url) => {
@@ -37,12 +39,14 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       }
       if (defineProps["base"] && defineProps["base"]["type"] === "br-code") {
         createBarCode();
-        tempProps["type"] = defineProps["base"]["type"];
       }
       if (defineProps["base"] && defineProps["base"]["type"] === "QR-code") {
         createQrCode();
-        tempProps["type"] = defineProps["base"]["type"];
       }
+      tempProps["type"] = defineProps["base"]["type"];
+      tempProps["brCodeFormat"] = defineProps["base"]["brCodeFormat"];
+      tempProps["generateRuleType"] = defineProps["base"]["generateRuleType"];
+      tempProps["generateRule"] = defineProps["base"]["generateRule"];
       if (tempProps != {}) {
         for (const tempPropsKey in tempProps) {
           designProperty.value[tempPropsKey] = tempProps[tempPropsKey];
@@ -56,12 +60,21 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const designClass = ref("");
     const designHeaderStyle = ref({});
     const designProperty = ref({});
-    watch(props.configure.style, () => {
-      caculateDetailComponentStyle(props.configure, designStyle, designClass, designHeaderStyle);
-    }, { immediate: true });
-    watch(props.configure.props, () => {
-      caculateComponentProps(props.configure, designProperty), getRestsParameter();
-    }, { immediate: true });
+    watch(
+      props.configure.style,
+      () => {
+        caculateDetailComponentStyle(props.configure, designStyle, designClass, designHeaderStyle);
+      },
+      { immediate: true }
+    );
+    watch(
+      props.configure.props,
+      () => {
+        caculateComponentProps(props.configure, designProperty), getRestsParameter();
+        props.configure.runtime.props = designProperty.value;
+      },
+      { immediate: true }
+    );
     return (_ctx, _cache) => {
       return openBlock(), createElementBlock("div", {
         class: normalizeClass(designClass.value),

package/dist/es/components/design/views/assemblys/data/component/data-origin.vue.js

@@ -1,7 +1,7 @@
 import _sfc_main from "./data-origin.vue2.js";
 import "./data-origin.vue3.js";
 import _export_sfc from "../../../../../../_virtual/_plugin-vue_export-helper.js";
-const DataOrigin = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-2b7f85ce"]]);
+const DataOrigin = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-340eb0cb"]]);
 export {
   DataOrigin as default
 };

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

@@ -2,7 +2,7 @@ import _sfc_main from "./table-design.vue2.js";
 import "./table-design.vue3.js";
 import "./table-design.vue4.js";
 import _export_sfc from "../../../../../../_virtual/_plugin-vue_export-helper.js";
-const tableDesign = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-ad624faf"]]);
+const tableDesign = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-2bfabc94"]]);
 export {
   tableDesign as default
 };

package/dist/es/components/design/views/assemblys/data/table/tablecolumn-attr-base.vue.js

@@ -883,7 +883,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                           class: "ml-4"
                         }, {
                           default: withCtx(() => [
-                            createVNode(_component_el_radio, { value: "no" }, {
+                            createVNode(_component_el_radio, { value: "false" }, {
                               default: withCtx(() => [
                                 createTextVNode("否")
                               ]),

package/dist/es/components/design/views/assemblys/data/table/tablecolumn-attr-event.vue.js

@@ -7,7 +7,6 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
   },
   setup(__props) {
     const props = __props;
-    debugger;
     const events = props.configure.events;
     return (_ctx, _cache) => {
       const _component_el_form = resolveComponent("el-form");

package/dist/es/components/design/views/assemblys/form/common/attr-event.vue.js

@@ -1,7 +1,7 @@
 import _sfc_main from "./attr-event.vue2.js";
 import "./attr-event.vue3.js";
 import _export_sfc from "../../../../../../_virtual/_plugin-vue_export-helper.js";
-const AttrEvent = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-9e57d945"]]);
+const AttrEvent = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-9489015e"]]);
 export {
   AttrEvent as default
 };

package/dist/es/components/design/views/assemblys/form/common/attr-event.vue2.js

@@ -22,7 +22,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
   setup(__props) {
     const props = __props;
     function editEvent(event) {
-      eventBus.$emit("editEvent", { configureObj: props.configure, event });
+      eventBus.$emit("editComponentEvent", { configureObj: props.configure, event });
     }
     return (_ctx, _cache) => {
       const _component_el_col = resolveComponent("el-col");
@@ -56,7 +56,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
               }, {
                 default: withCtx(() => [
                   createVNode(_component_el_icon, {
-                    style: { "cursor": "pointer", "color": "#5893EF", "margin-right": "6px" },
+                    style: { "cursor": "pointer", "color": "#5893ef", "margin-right": "6px" },
                     onClick: ($event) => editEvent(event)
                   }, {
                     default: withCtx(() => [