super-page-designer 2.0.20 → 2.0.26

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

@@ -1,24 +1,34 @@
 import { defineComponent, ref, reactive, computed, watch, onMounted, resolveComponent, openBlock, createElementBlock, Fragment, createElementVNode, normalizeStyle, withDirectives, normalizeClass, createVNode, withCtx, unref, vShow, renderList, createBlock, createCommentVNode } from "vue";
-import { Monitor, Cellphone, Iphone, ArrowLeft, ArrowRight, Check, View } from "@element-plus/icons";
+import { Monitor, Cellphone, Iphone, Plus, Check, View } from "@element-plus/icons";
 import { useDraggable } from "vue-draggable-plus";
 import _sfc_main$1 from "../../assemblys/object-design.vue.js";
 import { deepCopy, getUuidv4, findDesignItemByUuid } from "../../../utils/common-util.js";
 import { addComponentRef } from "../../../utils/page-helper-util.js";
 import { caculatePageStyle } from "../../../utils/container-design-util.js";
 import _sfc_main$2 from "./view-design-preview.vue.js";
-import pageEventContent from "../page-event/page-event-content.vue.js";
+import { ElMessageBox, ElMessage } from "element-plus";
+import "@vueuse/core";
+import "@element-plus/icons-vue";
+import "codemirror";
+import "@codemirror/lang-javascript";
+import "@codemirror/state";
+import "@codemirror/autocomplete";
+import "@codemirror/language";
+import "@codemirror/search";
+import "../page-event/config.vue2.js";
+import "../../../utils/assemblys-config.js";
+import "../../../../../stores/page-store.js";
+import "../../../../../stores/event-undo-redo-store.js";
+import "../../../utils/eventBus.js";
+import "../page-event/page-event-content.vue3.js";
+import _sfc_main$3 from "./components/quick-add-dialog.vue.js";
 import { setTableRuntimesFromConfigure } from "../../../utils/page-table-util.js";
 import http from "agilebuilder-ui/src/utils/request";
-import { ElMessage } from "element-plus";
 const _hoisted_1 = { class: "amb-design-tool" };
-const _hoisted_2 = {
-  class: "amb-page-type",
-  style: { "margin-left": "0px" }
-};
-const _hoisted_3 = { class: "amb-page-type" };
-const _hoisted_4 = { style: { "float": "right", "margin-right": "10px" } };
-const _hoisted_5 = /* @__PURE__ */ createElementVNode("label", null, "保存", -1);
-const _hoisted_6 = /* @__PURE__ */ createElementVNode("label", null, "预览", -1);
+const _hoisted_2 = { style: { "float": "right", "margin-right": "10px" } };
+const _hoisted_3 = /* @__PURE__ */ createElementVNode("label", null, "快捷添加", -1);
+const _hoisted_4 = /* @__PURE__ */ createElementVNode("label", null, "保存", -1);
+const _hoisted_5 = /* @__PURE__ */ createElementVNode("label", null, "预览", -1);
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "view-design-display",
   props: {
@@ -31,10 +41,13 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     "onCustomAttrWidget",
     "changeSelectEvent",
     "addEvent",
-    "changeSelectStandardEvent"
+    "changeSelectStandardEvent",
+    "revocation",
+    "regain"
   ],
   setup(__props, { expose: __expose, emit: __emit }) {
     const props = __props;
+    const quickAddDialogRef = ref(null);
     const $emits = __emit;
     if (props.configure.props == void 0) {
       props.configure.props = {};
@@ -98,6 +111,12 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         addComponentRef(props.configure, -1, ambPageDesignContent);
       }
     });
+    function revocation() {
+      $emits("revocation");
+    }
+    function regain() {
+      $emits("regain");
+    }
     function pageDesignClick(evt) {
       $emits("onSelectWidget", -1);
     }
@@ -115,10 +134,20 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     }
     function deleteItem(sourceItem) {
       if (sourceItem.items && sourceItem.items.length > 0) {
-        if (!confirm("还有子元素，确定要删除吗?")) {
-          return;
-        }
+        ElMessageBox.confirm("还有子元素，确定要删除吗?", "删除", {
+          confirmButtonText: "确认",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+          _deleteItem(sourceItem);
+        }).catch((err) => {
+          console.log(err);
+        });
+      } else {
+        _deleteItem(sourceItem);
       }
+    }
+    function _deleteItem(sourceItem) {
       const index = pageItems.indexOf(sourceItem);
       if (index > -1) {
         pageItems.splice(index, 1);
@@ -126,6 +155,10 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     }
     const pageDesignBoardMain = ref(null);
     useDraggable(pageDesignBoardMain, pageItems, {
+      filter: ".el-scrollbar__bar",
+      // 拖动表格滚动条时，不拖拽表格需要的配置
+      preventOnFilter: false,
+      // 拖动表格滚动条时，不拖拽表格需要的配置
       group: "amb-assembly-item",
       animation: 300,
       ghostClass: "amb-item-ghost",
@@ -144,7 +177,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           }
         });
       }
-      http.post("/component/super-page-design/save", { id: props.configure.id, designJson: JSON.stringify(configureCopy) }).then((res) => {
+      http.post(window["$vueApp"].config.globalProperties.baseAPI + "/component/super-page-design/save", { id: props.configure.id, designJson: JSON.stringify(configureCopy) }).then((res) => {
         console.log(res);
         ElMessage({
           message: "保存成功",
@@ -174,6 +207,11 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       pageDesignPreview.value = configureCopy;
       previewVisible.value = true;
     }
+    function quickAdd() {
+      if (quickAddDialogRef.value) {
+        quickAddDialogRef.value.openDialog();
+      }
+    }
     const handleTypeVal = ref(null);
     const eventFormContent = ref({});
     const customEventContent = ref({});
@@ -227,15 +265,6 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         }
       }
     }
-    function changeSelectEvent(customEvent) {
-      $emits("changeSelectEvent", customEvent);
-    }
-    function addEventClick(eventForm) {
-      $emits("addEvent", eventForm);
-    }
-    function changeSelectStandardEvent(eventName, eventLabel) {
-      $emits("changeSelectStandardEvent", eventName, eventLabel);
-    }
     __expose({ onSelectEvent, addEvent, changeEvent });
     return (_ctx, _cache) => {
       const _component_el_icon = resolveComponent("el-icon");
@@ -293,26 +322,45 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             }, null, 512), [
               [vShow, _ctx.selAsselbyType === "assembly"]
             ]),
-            createElementVNode("label", _hoisted_2, [
-              createVNode(_component_el_icon, { size: 23 }, {
-                default: withCtx(() => [
-                  createVNode(unref(ArrowLeft))
-                ]),
-                _: 1
+            createElementVNode("label", {
+              class: "amb-page-type",
+              style: { "margin-left": "0px" }
+            }, [
+              createElementVNode("span", {
+                class: "iconfont icon-chexiaozuo",
+                style: { "font-size": "23px" },
+                onClick: revocation,
+                title: "撤销"
               })
             ]),
-            createElementVNode("label", _hoisted_3, [
-              createVNode(_component_el_icon, { size: 23 }, {
-                default: withCtx(() => [
-                  createVNode(unref(ArrowRight))
-                ]),
-                _: 1
+            createElementVNode("label", { class: "amb-page-type" }, [
+              createElementVNode("span", {
+                class: "iconfont icon-chexiaoyou",
+                style: { "font-size": "23px" },
+                onClick: regain,
+                title: "恢复"
               })
             ]),
-            createElementVNode("div", _hoisted_4, [
+            createElementVNode("div", _hoisted_2, [
               createElementVNode("label", {
                 class: "amb-page-type",
-                onClick: _cache[3] || (_cache[3] = ($event) => saveForm())
+                onClick: _cache[3] || (_cache[3] = ($event) => quickAdd())
+              }, [
+                createVNode(_component_el_icon, { size: 18 }, {
+                  default: withCtx(() => [
+                    createVNode(unref(Plus))
+                  ]),
+                  _: 1
+                }),
+                _hoisted_3
+              ]),
+              createVNode(_component_el_divider, {
+                direction: "vertical",
+                class: "amb-design-tool-split"
+              }),
+              createElementVNode("label", {
+                class: "amb-page-type",
+                onClick: _cache[4] || (_cache[4] = ($event) => saveForm())
               }, [
                 createVNode(_component_el_icon, { size: 18 }, {
                   default: withCtx(() => [
@@ -320,7 +368,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                   ]),
                   _: 1
                 }),
-                _hoisted_5
+                _hoisted_4
               ]),
               createVNode(_component_el_divider, {
                 direction: "vertical",
@@ -329,7 +377,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
               createElementVNode("label", {
                 class: "amb-page-type",
                 style: { "margin-left": "0px" },
-                onClick: _cache[4] || (_cache[4] = ($event) => preview())
+                onClick: _cache[5] || (_cache[5] = ($event) => preview())
               }, [
                 createVNode(_component_el_icon, { size: 18 }, {
                   default: withCtx(() => [
@@ -337,7 +385,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                   ]),
                   _: 1
                 }),
-                _hoisted_6
+                _hoisted_5
               ])
             ])
           ]),
@@ -350,7 +398,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           }, [
             (openBlock(true), createElementBlock(Fragment, null, renderList(unref(pageItems), (element, itemIndex) => {
               return openBlock(), createBlock(_sfc_main$1, {
-                key: element,
+                key: element.uuid,
                 indexObj: componentIndexObj,
                 configure: element,
                 pageDesign: _ctx.configure,
@@ -363,31 +411,19 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             }), 128))
           ], 6), [
             [vShow, _ctx.selAsselbyType === "assembly"]
-          ]),
-          isShowEventContent.value ? (openBlock(), createElementBlock("div", {
-            key: 0,
-            class: normalizeClass(["amb-design-board", designClass.value]),
-            style: normalizeStyle(dynamicPageSizeStyle.value)
-          }, [
-            createVNode(pageEventContent, {
-              ref: "pageEventContentRef",
-              configure: _ctx.configure,
-              handleType: handleTypeVal.value,
-              eventForm: eventFormContent.value,
-              customEvent: customEventContent.value,
-              onChangeSelectEvent: changeSelectEvent,
-              onAddEvent: addEventClick,
-              onChangeSelectStandardEvent: changeSelectStandardEvent
-            }, null, 8, ["configure", "handleType", "eventForm", "customEvent"])
-          ], 6)) : createCommentVNode("", true)
+          ])
         ], 4),
         previewVisible.value ? (openBlock(), createBlock(_sfc_main$2, {
           key: 0,
           pageDesign: pageDesignPreview.value,
           modelValue: previewVisible.value,
-          "onUpdate:modelValue": _cache[5] || (_cache[5] = ($event) => previewVisible.value = $event),
-          onClose: _cache[6] || (_cache[6] = ($event) => previewVisible.value = false)
-        }, null, 8, ["pageDesign", "modelValue"])) : createCommentVNode("", true)
+          "onUpdate:modelValue": _cache[6] || (_cache[6] = ($event) => previewVisible.value = $event),
+          onClose: _cache[7] || (_cache[7] = ($event) => previewVisible.value = false)
+        }, null, 8, ["pageDesign", "modelValue"])) : createCommentVNode("", true),
+        createVNode(_sfc_main$3, {
+          ref_key: "quickAddDialogRef",
+          ref: quickAddDialogRef
+        }, null, 512)
       ], 64);
     };
   }

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

@@ -18,7 +18,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       const _component_el_dialog = resolveComponent("el-dialog");
       return openBlock(), createBlock(_component_el_dialog, {
         fullscreen: "",
-        "close-on-press-escape": "",
+        "close-on-press-escape": false,
         title: title.value,
         onClose: _cache[0] || (_cache[0] = ($event) => emits("close"))
       }, {

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

@@ -3,14 +3,26 @@ import { PageDesign } from '../../../utils/interfaces/page-design-types';
 interface MyProps {
     configure: PageDesign;
 }
-declare const _default: import('vue').DefineComponent<__VLS_TypePropsToRuntimeProps<MyProps>, {}, unknown, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
+/**watch(selectWidget,(newNum)=>{
+        if(attrContainerRef&&attrContainerRef.value){
+          attrContainerRef.value.changeAssembly('input-text',{});
+        }
+    });*/
+declare function onSelectWidget(selIndex: any, objConfigure: any): void;
+declare const _default: import('vue').DefineComponent<__VLS_TypePropsToRuntimeProps<MyProps>, {
+    onSelectWidget: typeof onSelectWidget;
+}, unknown, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
     addEvent: (...args: any[]) => void;
     changeEvent: (...args: any[]) => void;
     onSelectEvent: (...args: any[]) => void;
+    revocation: (...args: any[]) => void;
+    regain: (...args: any[]) => void;
 }, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<__VLS_TypePropsToRuntimeProps<MyProps>>> & {
     onAddEvent?: (...args: any[]) => any;
     onChangeEvent?: (...args: any[]) => any;
     onOnSelectEvent?: (...args: any[]) => any;
+    onRevocation?: (...args: any[]) => any;
+    onRegain?: (...args: any[]) => any;
 }, {}, {}>;
 export default _default;
 type __VLS_NonUndefinedable<T> = T extends undefined ? never : T;

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

@@ -7,9 +7,10 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
   props: {
     configure: {}
   },
-  emits: ["addEvent", "changeEvent", "onSelectEvent"],
-  setup(__props, { emit: __emit }) {
+  emits: ["addEvent", "changeEvent", "onSelectEvent", "revocation", "regain"],
+  setup(__props, { expose: __expose, emit: __emit }) {
     const props = __props;
+    const emits = __emit;
     if (props.configure.items == void 0) {
       props.configure.items = [];
     }
@@ -55,6 +56,12 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     function changeEvent(eventForm) {
       viewDesignDisplayRef.value.changeEvent(eventForm);
     }
+    function revocation() {
+      emits("revocation");
+    }
+    function regain() {
+      emits("regain");
+    }
     const assemblysContainerRef = ref(null);
     function changeSelectEvent(customEvent) {
       assemblysContainerRef.value.changeSelectEvent(customEvent);
@@ -65,6 +72,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     function changeSelectStandardEvent(eventName, eventLabel) {
       assemblysContainerRef.value.changeSelectStandardEvent(eventName, eventLabel);
     }
+    __expose({ onSelectWidget });
     return (_ctx, _cache) => {
       const _component_el_aside = resolveComponent("el-aside");
       const _component_el_main = resolveComponent("el-main");
@@ -99,7 +107,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                 onOnCustomAttrWidget: onCustomAttrWidget,
                 onChangeSelectEvent: changeSelectEvent,
                 onAddEvent: addEventClick,
-                onChangeSelectStandardEvent: changeSelectStandardEvent
+                onChangeSelectStandardEvent: changeSelectStandardEvent,
+                onRevocation: revocation,
+                onRegain: regain
               }, null, 8, ["configure", "selectWidget", "selAsselbyType"])
             ]),
             _: 1

package/dist/es/index.d.ts

@@ -1,3 +1,3 @@
-import { default as Design } from './components/design/index.ts';
+import { default as Design } from './components/design';
 
 export { Design };

package/dist/es/index.js

@@ -1,4 +1,5 @@
 import "./assets/design-attr.css.js";
+import "./assets/fonts/iconfont.css.js";
 import { default as default2 } from "./components/design/views/design/page-design.vue.js";
 export {
   default2 as Design

package/dist/es/stores/event-undo-redo-store.d.ts

@@ -0,0 +1,22 @@
+export declare const undoRedo: import('pinia').StoreDefinition<"event-snapshot", import('pinia')._UnwrapAll<Pick<{
+    addSnapshot: (configure: any, callback: any) => void;
+    undo: (configure: any) => void;
+    record: (configure: any) => void;
+    clearSnapshot: () => void;
+    getCurrentIndex: () => number;
+    getTotalLen: () => number;
+}, never>>, Pick<{
+    addSnapshot: (configure: any, callback: any) => void;
+    undo: (configure: any) => void;
+    record: (configure: any) => void;
+    clearSnapshot: () => void;
+    getCurrentIndex: () => number;
+    getTotalLen: () => number;
+}, never>, Pick<{
+    addSnapshot: (configure: any, callback: any) => void;
+    undo: (configure: any) => void;
+    record: (configure: any) => void;
+    clearSnapshot: () => void;
+    getCurrentIndex: () => number;
+    getTotalLen: () => number;
+}, "addSnapshot" | "undo" | "record" | "clearSnapshot" | "getCurrentIndex" | "getTotalLen">>;

package/dist/es/stores/event-undo-redo-store.js

@@ -0,0 +1,56 @@
+import { ref } from "vue";
+import { defineStore } from "pinia";
+const undoRedo = defineStore("event-snapshot", () => {
+  const snapshotData = ref([]);
+  const maxStep = ref(30);
+  const curIndex = ref(-1);
+  const isSnapshot = ref(true);
+  let timeoutObj = null;
+  function getCurrentIndex() {
+    return curIndex.value;
+  }
+  function getTotalLen() {
+    return snapshotData.value ? snapshotData.value.length : 0;
+  }
+  function clearSnapshot() {
+    snapshotData.value = [];
+    curIndex.value = -1;
+    isSnapshot.value = true;
+  }
+  function addSnapshot(configure, callback) {
+    if (timeoutObj) {
+      clearTimeout(timeoutObj);
+    }
+    timeoutObj = setTimeout(function() {
+      snapshotData.value.push(JSON.stringify(configure.value));
+      curIndex.value++;
+      if (snapshotData.value.length > maxStep.value) {
+        snapshotData.value.splice(0, 1);
+        curIndex.value--;
+      }
+      if (callback) {
+        callback();
+      }
+    }, 400);
+  }
+  function undo(configure) {
+    isSnapshot.value = false;
+    if (curIndex.value > 0) {
+      let t = JSON.parse(snapshotData.value[curIndex.value - 1]);
+      configure.value = t;
+      curIndex.value--;
+    }
+  }
+  function record(configure) {
+    if (curIndex.value > -1 && curIndex.value + 1 < snapshotData.value.length) {
+      const valueStr = snapshotData.value[curIndex.value + 1];
+      let t = JSON.parse(valueStr);
+      configure.value = t;
+      curIndex.value++;
+    }
+  }
+  return { addSnapshot, undo, record, clearSnapshot, getCurrentIndex, getTotalLen };
+});
+export {
+  undoRedo
+};

package/dist/es/stores/page-store.js

@@ -14,7 +14,7 @@ const usePageContextStore = defineStore("pageContextUtil", () => {
     setPageContextVarOptions(newPageContext);
   }
   function setPageContextVarOptions(pageObject) {
-    if (pageObject) {
+    if (pageObject && pageObject.modelFields) {
       pageContextVarOptions.value.dataOptions = [];
       pageObject.modelFields.forEach((element) => {
         pageContextVarOptions.value.dataOptions.push({

package/dist/es/stores/undo-redo-store.d.ts

@@ -0,0 +1,13 @@
+export declare const undoRedo: import('pinia').StoreDefinition<"snapshot", import('pinia')._UnwrapAll<Pick<{
+    addSnapshot: (configure: any) => void;
+    undo: (pageDesign: any) => void;
+    record: (pageDesign: any) => void;
+}, never>>, Pick<{
+    addSnapshot: (configure: any) => void;
+    undo: (pageDesign: any) => void;
+    record: (pageDesign: any) => void;
+}, never>, Pick<{
+    addSnapshot: (configure: any) => void;
+    undo: (pageDesign: any) => void;
+    record: (pageDesign: any) => void;
+}, "addSnapshot" | "undo" | "record">>;

package/dist/es/stores/undo-redo-store.js

@@ -0,0 +1,44 @@
+import { ref } from "vue";
+import { defineStore } from "pinia";
+const undoRedo = defineStore("snapshot", () => {
+  const snapshotData = ref([]);
+  const maxStep = ref(30);
+  const curIndex = ref(-1);
+  const isSnapshot = ref(true);
+  function addSnapshot(configure) {
+    if (isSnapshot.value) {
+      isFull();
+      let n = snapshotData.value.length;
+      if (curIndex.value < n - 1) {
+        snapshotData.value.splice(curIndex.value + 1);
+      }
+      snapshotData.value.push(JSON.stringify(configure.value));
+      curIndex.value++;
+    }
+    isSnapshot.value = true;
+  }
+  function isFull() {
+    if (snapshotData.value.length == maxStep.value) {
+      snapshotData.value.shift();
+    }
+  }
+  function undo(pageDesign) {
+    if (curIndex.value > 0) {
+      isSnapshot.value = false;
+      let t = JSON.parse(snapshotData.value[--curIndex.value]);
+      pageDesign.value = t;
+      console.log("%c描述-165857", "color:#2E3435;background:#F8BB07;padding:3px;border-radius:2px", pageDesign.value);
+    }
+  }
+  function record(pageDesign) {
+    if (curIndex.value < snapshotData.value.length - 1) {
+      isSnapshot.value = false;
+      let t = JSON.parse(snapshotData.value[++curIndex.value]);
+      pageDesign.value = t;
+    }
+  }
+  return { addSnapshot, undo, record };
+});
+export {
+  undoRedo
+};