super-page-designer 2.0.17 → 2.0.23

package/dist/es/components/design/views/assemblys/workflow/component/combination.vue.d.ts

@@ -17,8 +17,8 @@ declare const _default: import('vue').DefineComponent<{
     };
 }, {}, unknown, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
     close: (...args: any[]) => void;
-    save: (...args: any[]) => void;
     remove: (...args: any[]) => void;
+    save: (...args: any[]) => void;
 }, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{
     conditionList: {
         type: StringConstructor;

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

@@ -1,7 +1,7 @@
 import { defineComponent, ref, resolveComponent, openBlock, createBlock, withCtx, createVNode, unref, createTextVNode, createElementBlock, Fragment, renderList } from "vue";
 import { CirclePlus, Delete, Top, Bottom } from "@element-plus/icons-vue";
 import BindVariable from "../../common/common-variable-bind.vue.js";
-import { ElMessage } from "element-plus";
+import "element-plus";
 import { getOperators } from "../../../../utils/data-table-util.js";
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "combination",
@@ -38,7 +38,11 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       tableData.value = props.list;
     }
     function remove() {
-      tableData.value = tableData.value.filter((item) => item != currentRow.value);
+      if (Object.keys(currentRow.value).length !== 0) {
+        tableData.value = tableData.value.filter((item) => item != currentRow.value);
+      } else {
+        tableData.value.pop();
+      }
     }
     function handleCurrentChange(val) {
       currentRow.value = val;
@@ -57,8 +61,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       row.defaultValue = modelValue;
     }
     function changeFieldName(index, propName) {
+      console.log("%c描述-164035", "color:#2E3435;background:#F8BB07;padding:3px;border-radius:2px", props.fieldMap);
       const item = props.fieldMap[propName];
-      if (item.type === "DATE") {
+      if (item.type === "date") {
         tableData.value[index].isData = true;
       } else {
         tableData.value[index].isData = false;
@@ -66,14 +71,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       operationArr.value[index] = getOperators(item);
     }
     function savebuttonSetting() {
-      if (tableData.value && tableData.value.length > 0) {
-        for (var i = 0; i < tableData.value.length; i++) {
-          const item = tableData.value[i];
-          if (!item.propName) {
-            return ElMessage.warning("字段名或值有空白");
-          }
-        }
-      }
+      tableData.value = tableData.value.filter((item) => item.propName);
       $emit("save", tableData.value);
       $emit("close");
     }

package/dist/es/components/design/views/assemblys/workflow/picture-flow/pictureflow-attr-base.vue.js

@@ -26,7 +26,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         default: withCtx(() => [
           createVNode(_component_el_collapse, {
             modelValue: openCollapseItems.value,
-            "onUpdate:modelValue": _cache[3] || (_cache[3] = ($event) => openCollapseItems.value = $event),
+            "onUpdate:modelValue": _cache[4] || (_cache[4] = ($event) => openCollapseItems.value = $event),
             style: { "margin-top": "6px" }
           }, {
             default: withCtx(() => [
@@ -61,6 +61,20 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                       ]),
                       _: 1
                     }),
+                    createVNode(_component_el_form_item, {
+                      label: "唯一编码",
+                      class: "amb-design-attr-item"
+                    }, {
+                      default: withCtx(() => [
+                        createVNode(_component_el_input, {
+                          modelValue: __props.configure.uuid,
+                          "onUpdate:modelValue": _cache[1] || (_cache[1] = ($event) => __props.configure.uuid = $event),
+                          readonly: "",
+                          title: __props.configure.uuid
+                        }, null, 8, ["modelValue", "title"])
+                      ]),
+                      _: 1
+                    }),
                     createVNode(_component_el_form_item, {
                       label: "组件名",
                       class: "amb-design-attr-item"
@@ -68,7 +82,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                       default: withCtx(() => [
                         createVNode(_component_el_input, {
                           modelValue: __props.configure.props.base.name,
-                          "onUpdate:modelValue": _cache[1] || (_cache[1] = ($event) => __props.configure.props.base.name = $event),
+                          "onUpdate:modelValue": _cache[2] || (_cache[2] = ($event) => __props.configure.props.base.name = $event),
                           placeholder: "请输入"
                         }, null, 8, ["modelValue"])
                       ]),
@@ -81,7 +95,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                       default: withCtx(() => [
                         createVNode(_component_el_input, {
                           modelValue: __props.configure.props.base.prop,
-                          "onUpdate:modelValue": _cache[2] || (_cache[2] = ($event) => __props.configure.props.base.prop = $event),
+                          "onUpdate:modelValue": _cache[3] || (_cache[3] = ($event) => __props.configure.props.base.prop = $event),
                           placeholder: "请输入"
                         }, null, 8, ["modelValue"])
                       ]),
@@ -91,9 +105,10 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                 ]),
                 _: 1
               }),
-              createVNode(_sfc_main$1, {
+              (openBlock(), createBlock(_sfc_main$1, {
+                key: __props.configure.uuid,
                 size: __props.configure.props.size
-              }, null, 8, ["size"])
+              }, null, 8, ["size"]))
             ]),
             _: 1
           }, 8, ["modelValue"])

package/dist/es/components/design/views/assemblys/workflow/text-history/texthistory-attr-base.vue.js

@@ -65,15 +65,16 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                       _: 1
                     }),
                     createVNode(_component_el_form_item, {
-                      label: "组件名",
+                      label: "唯一编码",
                       class: "amb-design-attr-item"
                     }, {
                       default: withCtx(() => [
                         createVNode(_component_el_input, {
-                          modelValue: __props.configure.props.base.name,
-                          "onUpdate:modelValue": _cache[1] || (_cache[1] = ($event) => __props.configure.props.base.name = $event),
-                          placeholder: "请输入"
-                        }, null, 8, ["modelValue"])
+                          modelValue: __props.configure.uuid,
+                          "onUpdate:modelValue": _cache[1] || (_cache[1] = ($event) => __props.configure.uuid = $event),
+                          readonly: "",
+                          title: __props.configure.uuid
+                        }, null, 8, ["modelValue", "title"])
                       ]),
                       _: 1
                     }),
@@ -153,9 +154,10 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                 ]),
                 _: 1
               }),
-              createVNode(_sfc_main$1, {
+              (openBlock(), createBlock(_sfc_main$1, {
+                key: __props.configure.uuid,
                 size: __props.configure.props.size
-              }, null, 8, ["size"])
+              }, null, 8, ["size"]))
             ]),
             _: 1
           }, 8, ["modelValue"])

package/dist/es/components/design/views/design/page-design.vue.js

@@ -7,14 +7,19 @@ import { usePageContextStore } from "../../../../stores/page-store.js";
 import ServiceFlowDesginer from "service-flow-designer";
 import { getSystemCode, getPublishVersion } from "../../utils/system.js";
 import { getPublishVersionsByCode, getHighestVersionDefinition } from "../../utils/page-design-util.js";
+import { getPageConf } from "../../utils/assemblys-config.js";
 import { fetchPageDesignData } from "../../utils/page-service-util.js";
 import { ElMessage, ElLoading } from "element-plus";
 import PageSwitch from "./view/page-switch.vue.js";
+import { undoRedo } from "../../../../stores/undo-redo-store.js";
 const _hoisted_1 = { class: "amb-page-container" };
 const _hoisted_2 = { class: "amb-page-container-header-page" };
 const _hoisted_3 = { class: "amb-page-container-header" };
 const _hoisted_4 = { class: "amb-page-container-header-type" };
-const _hoisted_5 = { class: "amb-page-container-main" };
+const _hoisted_5 = {
+  key: 0,
+  class: "amb-page-container-main"
+};
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "page-design",
   props: {
@@ -24,155 +29,144 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     }
   },
   setup(__props) {
+    const undoRedoStore = undoRedo();
     const props = __props;
     const pageDesign = ref(null);
+    const ViewDesignRef = ref(null);
+    const pageDesignUtil = usePageContextStore();
+    const clickType = ref("page");
+    const definitionId = ref(null);
+    const systemCode = ref(getSystemCode());
+    const publishVersion = ref(getPublishVersion());
+    const selectWfCode = ref(null);
+    const selectWfVersion = ref(null);
+    const isShowWfEditor = ref(false);
+    const viewDesignComponentKey = ref(0);
     if (props.pageId) {
       fetchPageDesignData(props.pageId).then((appPageDesign) => {
         if (appPageDesign && appPageDesign.designJson) {
           const designJson = appPageDesign.designJson;
-          pageDesign.value = JSON.parse(designJson);
+          const pageConf = getPageDesignConf(JSON.parse(designJson));
+          pageDesign.value = pageConf;
+          initPageDesign(pageDesign.value);
         } else {
-          pageDesign.value = initPageDesign();
+          pageDesign.value = getPageDesignConf(null);
+          initPageDesign(pageDesign.value);
         }
       });
     } else {
-      pageDesign.value = initPageDesign();
+      pageDesign.value = getPageDesignConf(null);
+      initPageDesign(pageDesign.value);
     }
-    const pageContextUtil = usePageContextStore();
-    const clickType = ref("page");
-    function initPageDesign() {
-      const pageDesign2 = {
-        id: 31,
-        code: "9307994b-2668-44e9-a266-5662780ba084",
-        name: "page",
-        label: "页面",
-        version: 1,
-        systemCode: "vms",
-        systemVersion: 3,
-        dbName: "",
-        tableName: "",
-        tableAlias: "",
-        workflowCode: "",
-        workflowVersion: 0,
-        //模型的字段
-        modelFields: [],
-        logicDesigns: [],
-        //子集对象
-        items: [],
-        props: {
-          // 无ID初始化条件
-          notIdInitializationList: "[]",
-          // 判重组合字段
-          judgeHeavyList: []
+    function getPageDesignConf(initConf) {
+      const pageConf = getPageConf();
+      if (initConf) {
+        Object.assign(pageConf, initConf);
+      } else {
+        if (!pageConf.systemCode) {
+          pageConf.systemCode = "vms";
+          pageConf.systemVersion = 3;
+        }
+      }
+      return pageConf;
+    }
+    function initPageDesign(pageDesign2) {
+      pageDesign2.id = props.pageId;
+      initComponentRefState(pageDesign2);
+      if (pageDesign2.tableName) {
+        const systemCode2 = pageDesign2.tableSysCode ? pageDesign2.tableSysCode : pageDesign2.systemCode;
+        const systemVersion = pageDesign2.tableSysVersion ? pageDesign2.tableSysVersion : pageDesign2.systemVersion;
+        queryTableFields(systemCode2, systemVersion, pageDesign2.tableName).then((tableFields) => {
+          pageDesign2.modelFields = tableFields;
+          pageDesignUtil.setPageContext(pageDesign2);
+        });
+      }
+      pageDesignUtil.setPageContext(pageDesign2);
+      watch(() => pageDesign2, (newVal) => {
+        changePageDesign();
+      }, { deep: true });
+      watch(
+        pageDesign2.events,
+        (newVal) => {
+          if (!pageDesign2.runtime) {
+            pageDesign2.runtime = {};
+          }
+          if (pageDesign2.events) {
+            const bindEvents = pageDesign2.events.filter((event) => event.eventName);
+            console.log("bindEvents=========", bindEvents);
+            pageDesign2.runtime.events = bindEvents;
+          }
         },
-        style: {},
-        events: [
-          {
-            // 页面布局等加载后，但数据加载前时
-            name: "beforeload",
-            label: "加载前"
-          },
-          {
-            // 数据加载后
-            name: "load",
-            label: "加载后"
+        { immediate: true }
+      );
+      watch(
+        () => pageDesign2.label,
+        () => {
+          managePagePermission(pageDesign2);
+        },
+        { immediate: true }
+      );
+      watch(
+        () => pageDesign2.pageType,
+        () => {
+          managePagePermission(pageDesign2);
+        },
+        { immediate: true }
+      );
+      if (pageDesign2.props) {
+        watch(
+          () => pageDesign2.props.activeWorkflow,
+          () => {
+            managePagePermission(pageDesign2);
           },
-          {
-            name: "resize",
-            label: "尺寸变化",
-            params: [
-              {
-                name: "width",
-                label: "宽度",
-                type: "number"
-              },
-              {
-                name: "height",
-                label: "高度",
-                type: "number"
-              }
-            ]
-          }
-        ]
-      };
-      if (!pageDesign2.systemCode) {
-        pageDesign2.systemCode = "vms";
-        pageDesign2.systemVersion = 3;
+          { immediate: true }
+        );
       }
-      return pageDesign2;
     }
-    ref(null);
-    ref(null);
-    const definitionId = ref(null);
-    const systemCode = ref(getSystemCode());
-    const publishVersion = ref(getPublishVersion());
-    const selectWfCode = ref(null);
-    const selectWfVersion = ref(null);
-    const isShowWfEditor = ref(false);
-    const viewDesignComponentKey = ref(0);
-    initComponentRefState(pageDesign.value);
-    if (pageDesign.value.tableName) {
-      const systemCode2 = pageDesign.value.tableSysCode ? pageDesign.value.tableSysCode : pageDesign.value.systemCode;
-      const systemVersion = pageDesign.value.tableSysVersion ? pageDesign.value.tableSysVersion : pageDesign.value.systemVersion;
-      queryTableFields(systemCode2, systemVersion, pageDesign.value.tableName).then((tableFields) => {
-        pageDesign.value.modelFields = tableFields;
-        pageContextUtil.setPageContext(pageDesign.value);
-      });
+    let changePageDesign = debounce(() => {
+      undoRedoStore.addSnapshot(pageDesign.value);
+    }, 400);
+    function revocation() {
+      viewDesignComponentKey.value++;
+      undoRedoStore.undo(pageDesign.value);
+    }
+    function regain() {
+      viewDesignComponentKey.value++;
+      undoRedoStore.record(pageDesign.value);
+    }
+    function debounce(fn, wait) {
+      let timeout = null;
+      return function() {
+        let context = this;
+        let args = arguments;
+        if (timeout)
+          clearTimeout(timeout);
+        let callNow = !timeout;
+        timeout = setTimeout(() => {
+          timeout = null;
+        }, wait);
+        if (callNow)
+          fn.apply(context, args);
+      };
     }
-    pageContextUtil.setPageContext(pageDesign.value);
-    watch(
-      pageDesign.value.events,
-      (newVal) => {
-        const bindEvents = pageDesign.value.events.filter((event) => event.eventName);
-        console.log("bindEvents=========", bindEvents);
-        if (!pageDesign.value.runtime) {
-          pageDesign.value.runtime = {};
-        }
-        pageDesign.value.runtime.events = bindEvents;
-      },
-      { immediate: true }
-    );
-    watch(
-      () => pageDesign.value.label,
-      () => {
-        managePagePermission(pageDesign.value);
-      },
-      { immediate: true }
-    );
-    watch(
-      () => pageDesign.value.pageType,
-      () => {
-        managePagePermission(pageDesign.value);
-      },
-      { immediate: true }
-    );
-    watch(
-      () => pageDesign.value.props.activeWorkflow,
-      () => {
-        managePagePermission(pageDesign.value);
-      },
-      { immediate: true }
-    );
     watch(
       () => systemCode.value,
       (newVal) => {
         if (newVal) {
-          getSystempublishVersions(pageDesign.id, true);
+          getSystempublishVersions();
         }
       },
       { immediate: true }
     );
     const publishVersions = ref([]);
-    async function getSystempublishVersions(systemId, refreshVersion) {
-      if (systemId) {
-        if (refreshVersion) {
-          await getPublishVersionsByCode(systemCode.value).then((data) => {
-            publishVersions.value = data;
-            if (publishVersions.value.length > 0) {
-              publishVersion.value = publishVersions.value[0].publishVersion;
-            }
-          });
-        }
+    async function getSystempublishVersions() {
+      if (systemCode.value) {
+        await getPublishVersionsByCode(systemCode.value).then((data) => {
+          publishVersions.value = data;
+          if (publishVersions.value.length > 0) {
+            publishVersion.value = publishVersions.value[0].publishVersion;
+          }
+        });
       } else {
         publishVersions.value = [];
       }
@@ -228,7 +222,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         if (!selectWfCode.value && !selectWfVersion.value || selectWfCode.value !== workflowCode || selectWfVersion.value !== defVersion) {
           isShowWfEditor.value = false;
           getProcessDefinition(workflowCode, defVersion, publishVersion.value);
-          getSystempublishVersions(pageDesign.id, true);
+          getSystempublishVersions();
         } else {
           clickType.value = "workflow";
         }
@@ -250,13 +244,17 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         loading.close();
         if (appPageDesign && appPageDesign.designJson) {
           const designJson = appPageDesign.designJson;
-          pageDesign.value = JSON.parse(designJson);
+          pageDesign.value = getPageDesignConf(JSON.parse(designJson));
           if (!pageDesign.value.items) {
             pageDesign.value.items = [];
           }
-          pageDesign.value.id = appPageDesign.id;
+          if (!pageDesign.value.props) {
+            pageDesign.value.props = {};
+          }
+          initPageDesign(pageDesign.value);
         } else {
-          pageDesign.value = initPageDesign();
+          pageDesign.value = getPageDesignConf(null);
+          initPageDesign(pageDesign.value);
         }
       });
     }
@@ -273,7 +271,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                 style: {}
               }, {
                 default: withCtx(() => [
-                  pageDesign.value.code ? (openBlock(), createBlock(PageSwitch, {
+                  pageDesign.value && pageDesign.value.code ? (openBlock(), createBlock(PageSwitch, {
                     key: 0,
                     pageDesign: pageDesign.value,
                     onChangePage: changePage
@@ -305,10 +303,14 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             }, "服务编排", 2)
           ])
         ]),
-        createElementVNode("div", _hoisted_5, [
+        pageDesign.value ? (openBlock(), createElementBlock("div", _hoisted_5, [
           withDirectives((openBlock(), createBlock(_sfc_main$1, {
+            ref_key: "ViewDesignRef",
+            ref: ViewDesignRef,
             key: viewDesignComponentKey.value,
-            configure: pageDesign.value
+            configure: pageDesign.value,
+            onRegain: regain,
+            onRevocation: revocation
           }, null, 8, ["configure"])), [
             [vShow, clickType.value === "page"]
           ]),
@@ -327,7 +329,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           withDirectives(createVNode(unref(ServiceFlowDesginer), { pageContext: pageDesign.value }, null, 8, ["pageContext"]), [
             [vShow, clickType.value === "service"]
           ])
-        ])
+        ])) : createCommentVNode("", true)
       ]);
     };
   }

package/dist/es/components/design/views/design/view/attr-container.vue.js

@@ -64,6 +64,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         ref: ambDesignAttrContent
       }, [
         (openBlock(), createBlock(resolveDynamicComponent(dynamicComponent.value), {
+          key: "attr_" + dynamicConfigure.value.uuid,
           indexObj: indexObj.value,
           pageDesign: __props.pageInfo,
           configure: dynamicConfigure.value

package/dist/es/components/design/views/design/view/components/quick-add-dialog.vue.d.ts

@@ -0,0 +1,18 @@
+/**
+ * 打开对象框
+ */
+declare function openDialog(): void;
+declare const _default: import('vue').DefineComponent<Readonly<import('vue').ComponentPropsOptions<{
+    [x: string]: unknown;
+}>>, {
+    openDialog: typeof openDialog;
+}, unknown, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
+    close: (...args: any[]) => void;
+}, string, import('vue').PublicProps, Readonly<readonly string[] | import('vue').ExtractPropTypes<Readonly<import('vue').ComponentObjectPropsOptions<{
+    [x: string]: unknown;
+}>>>> & {
+    onClose?: (...args: any[]) => any;
+}, {
+    readonly [x: number]: string;
+} | {}, {}>;
+export default _default;