super-page-designer 2.0.23 → 2.0.26

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

@@ -65,7 +65,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         props.configure.events,
         (newVal) => {
           batchUpdatePermissions(props.configure, props.pageDesign);
-          const bindEvents = props.configure.events.filter((event) => event.eventName);
+          const bindEvents = props.configure.events.filter((event) => {
+            return !event.isStandard && event.jsContent || event.isStandard && event.eventName;
+          });
           console.log("bindEvents=========", bindEvents);
           if (!props.configure.runtime) {
             props.configure.runtime = {};
@@ -103,7 +105,11 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           if (!props.configure.runtime) {
             props.configure.runtime = {};
           }
-          console.log("%c描述-183859", "color:#2E3435;background:#F8BB07;padding:3px;border-radius:2px", props.configure.runtime.customParams);
+          console.log(
+            "%c描述-183859",
+            "color:#2E3435;background:#F8BB07;padding:3px;border-radius:2px",
+            props.configure.runtime.customParams
+          );
           props.configure.runtime.customParams = customParams;
         },
         { immediate: true }
@@ -141,12 +147,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           }
         );
       }
-      watch(
-        props.configure.props.verification,
-        (newValue, oldValue) => {
-          watchValidate(props.configure, newValue, fieldInfo);
-        }
-      );
+      watch(props.configure.props.verification, (newValue, oldValue) => {
+        watchValidate(props.configure, newValue, fieldInfo);
+      });
     }
     const thisRef = ref(null);
     const designStyle = ref({});

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

@@ -27,15 +27,29 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
   emits: ["remove", "save", "close"],
   setup(__props, { emit: __emit }) {
     const props = __props;
-    console.log("%c描述-094410", "color:#2E3435;background:#F8BB07;padding:3px;border-radius:2px", props.fieldNameList);
     const $emit = __emit;
     const currentRow = ref({});
     const tableData = ref([]);
     const operationArr = ref([]);
-    if (props.conditionList) {
-      tableData.value = JSON.parse(props.conditionList);
-    } else {
-      tableData.value = props.list;
+    initTable();
+    function initTable() {
+      if (props.conditionList) {
+        tableData.value = JSON.parse(props.conditionList);
+      } else {
+        tableData.value = props.list;
+      }
+      if (tableData.value.length > 0) {
+        tableData.value.forEach((item, index) => {
+          console.log("%c描述-112048", "color:#2E3435;background:#F8BB07;padding:3px;border-radius:2px", item);
+          if (item.type === "date") {
+            tableData.value[index].isData = true;
+          } else {
+            tableData.value[index].isData = false;
+          }
+          let fieldItem = props.fieldMap[item.propName];
+          operationArr.value[index] = getOperators(fieldItem);
+        });
+      }
     }
     function remove() {
       if (Object.keys(currentRow.value).length !== 0) {

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

@@ -12,6 +12,8 @@ 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";
+import _sfc_main$2 from "./page-event/page-event-view.vue.js";
+import eventBus from "../../utils/eventBus.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" };
@@ -33,6 +35,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const props = __props;
     const pageDesign = ref(null);
     const ViewDesignRef = ref(null);
+    const pageEventContainerRef = ref(null);
     const pageDesignUtil = usePageContextStore();
     const clickType = ref("page");
     const definitionId = ref(null);
@@ -42,6 +45,15 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const selectWfVersion = ref(null);
     const isShowWfEditor = ref(false);
     const viewDesignComponentKey = ref(0);
+    eventBus.$on("editComponentEvent", () => {
+      clickFrontLogic();
+    });
+    function clickFrontLogic() {
+      clickType.value = "front";
+      if (pageEventContainerRef.value && pageEventContainerRef.value.resize) {
+        pageEventContainerRef.value.resize();
+      }
+    }
     if (props.pageId) {
       fetchPageDesignData(props.pageId).then((appPageDesign) => {
         if (appPageDesign && appPageDesign.designJson) {
@@ -82,9 +94,13 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         });
       }
       pageDesignUtil.setPageContext(pageDesign2);
-      watch(() => pageDesign2, (newVal) => {
-        changePageDesign();
-      }, { deep: true });
+      watch(
+        () => pageDesign2,
+        (newVal) => {
+          changePageDesign();
+        },
+        { deep: true }
+      );
       watch(
         pageDesign2.events,
         (newVal) => {
@@ -92,8 +108,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             pageDesign2.runtime = {};
           }
           if (pageDesign2.events) {
-            const bindEvents = pageDesign2.events.filter((event) => event.eventName);
-            console.log("bindEvents=========", bindEvents);
+            const bindEvents = pageDesign2.events.filter((event) => {
+              return !event.isStandard && event.jsContent || event.isStandard && event.eventName;
+            });
             pageDesign2.runtime.events = bindEvents;
           }
         },
@@ -122,6 +139,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           { immediate: true }
         );
       }
+      eventBus.$emit("changePageDesign");
     }
     let changePageDesign = debounce(() => {
       undoRedoStore.addSnapshot(pageDesign.value);
@@ -289,14 +307,14 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
               class: normalizeClass({ selected: clickType.value === "page" }),
               onClick: _cache[0] || (_cache[0] = ($event) => clickType.value = "page")
             }, "页面设计", 2),
+            createElementVNode("label", {
+              class: normalizeClass({ selected: clickType.value === "front" }),
+              onClick: _cache[1] || (_cache[1] = ($event) => clickFrontLogic())
+            }, "页面逻辑", 2),
             createElementVNode("label", {
               class: normalizeClass({ selected: clickType.value === "workflow" }),
-              onClick: _cache[1] || (_cache[1] = ($event) => clickWorkflow())
+              onClick: _cache[2] || (_cache[2] = ($event) => clickWorkflow())
             }, "工作流设计", 2),
-            createElementVNode("label", {
-              class: normalizeClass({ selected: clickType.value === "front" }),
-              onClick: _cache[2] || (_cache[2] = ($event) => clickType.value = "front")
-            }, "前端逻辑", 2),
             createElementVNode("label", {
               class: normalizeClass({ selected: clickType.value === "service" }),
               onClick: _cache[3] || (_cache[3] = ($event) => clickType.value = "service")
@@ -328,6 +346,13 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           ]) : createCommentVNode("", true),
           withDirectives(createVNode(unref(ServiceFlowDesginer), { pageContext: pageDesign.value }, null, 8, ["pageContext"]), [
             [vShow, clickType.value === "service"]
+          ]),
+          withDirectives(createVNode(_sfc_main$2, {
+            ref_key: "pageEventContainerRef",
+            ref: pageEventContainerRef,
+            configure: pageDesign.value
+          }, null, 8, ["configure"]), [
+            [vShow, clickType.value === "front"]
           ])
         ])) : createCommentVNode("", true)
       ]);

package/dist/es/components/design/views/design/page-event/config.vue.d.ts

@@ -1,9 +1,20 @@
+/**
+ * 重新计算编辑框尺寸
+ */
+declare function resize(): void;
+/**
+ * 更新内容
+ */
+declare function updateJsContent(newEvent: any): void;
 declare const _default: import('vue').DefineComponent<{
     eventForm: {
         type: ObjectConstructor;
         default: () => {};
     };
-}, {}, unknown, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
+}, {
+    resize: typeof resize;
+    updateJsContent: typeof updateJsContent;
+}, unknown, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
     fullScreen: (...args: any[]) => void;
 }, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{
     eventForm: {

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

@@ -1,7 +1,7 @@
-import _sfc_main from "./config.vue2.js";
-import "./config.vue3.js";
+import _sfc_main from "./config.vue3.js";
+import "./config.vue2.js";
 import _export_sfc from "../../../../../_virtual/_plugin-vue_export-helper.js";
-const config = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-24e5130d"]]);
+const config = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-26f79956"]]);
 export {
   config as default
 };

package/dist/es/components/design/views/design/page-event/config.vue2.js

@@ -1,325 +1 @@
-import { defineComponent, ref, onMounted, resolveComponent, openBlock, createElementBlock, createElementVNode, createTextVNode, toDisplayString, createVNode, withCtx, unref, pushScopeId, popScopeId } from "vue";
-import { useLocalStorage } from "@vueuse/core";
-import { Search, FullScreen } from "@element-plus/icons-vue";
-import { EditorView, basicSetup } from "codemirror";
-import { javascriptLanguage, javascript } from "@codemirror/lang-javascript";
-import { EditorState } from "@codemirror/state";
-import "@codemirror/autocomplete";
-import "@codemirror/language";
-import { openSearchPanel } from "@codemirror/search";
-const _withScopeId = (n) => (pushScopeId("data-v-24e5130d"), n = n(), popScopeId(), n);
-const _hoisted_1 = { style: { "height": "400px" } };
-const _hoisted_2 = {
-  style: { "padding": "8px 16px", "margin": "10px 0px", "background-color": "#f4f4f5" },
-  class: "pppp"
-};
-const _hoisted_3 = { style: { "color": "#909399", "font-size": "14px" } };
-const _hoisted_4 = { key: 0 };
-const _hoisted_5 = { key: 1 };
-const _hoisted_6 = { class: "editorTool" };
-const _hoisted_7 = /* @__PURE__ */ _withScopeId(() => /* @__PURE__ */ createElementVNode("div", {
-  style: {
-    minHeight: "400px",
-    maxHeight: "700px",
-    backgroundColor: "#fff",
-    color: "#333",
-    outline: "1px dotted #212121",
-    overflow: "auto"
-  },
-  id: "cf-codemirror"
-}, null, -1));
-const _hoisted_8 = /* @__PURE__ */ _withScopeId(() => /* @__PURE__ */ createElementVNode("span", { style: { "color": "gray" } }, " }", -1));
-const _sfc_main = /* @__PURE__ */ defineComponent({
-  __name: "config",
-  props: {
-    eventForm: {
-      type: Object,
-      default: () => {
-        return {};
-      }
-    }
-  },
-  emits: ["fullScreen"],
-  setup(__props, { expose: __expose, emit: __emit }) {
-    const props = __props;
-    const emits = __emit;
-    const fullScreenDrawer = ref(false);
-    const editorStyle = ref({ theme: "default", fontSize: 14, searchOpen: false });
-    const editor = ref(null);
-    onMounted(() => {
-      console.log("eventForm===", props.eventForm);
-      let cacheEditorStyle = useLocalStorage("editorStyle", "").value;
-      if (cacheEditorStyle) {
-        cacheEditorStyle = JSON.parse(cacheEditorStyle);
-        editorStyle.value.theme = cacheEditorStyle.theme || "default";
-        editorStyle.value.fontSize = cacheEditorStyle.fontSize || 14;
-      }
-      loadEditor();
-    });
-    function showFullScreen() {
-      if (fullScreenDrawer.value === true) {
-        fullScreenDrawer.value = false;
-        emits("fullScreen", { withHeader: true, drawerWidth: "50%" });
-      } else {
-        fullScreenDrawer.value = true;
-        emits("fullScreen", { withHeader: false, drawerWidth: "100%" });
-      }
-    }
-    const jsDocCompletions = javascriptLanguage.data.of({
-      autocomplete: myCompletions
-    });
-    function changeEditorState() {
-      useLocalStorage("editorStyle", editorStyle.value).value = editorStyle.value;
-      if (editor.value) {
-        if (editor.value) {
-          editor.value.destroy();
-        }
-        loadEditor();
-      }
-    }
-    function getEditorState() {
-      const mytheme = getTheme();
-      const baseTheme = EditorView.theme({
-        ".cm-content, .cm-gutter": { minHeight: "400px" },
-        "&": {
-          fontSize: editorStyle.value.fontSize + "px"
-        }
-      });
-      return EditorState.create({
-        doc: props.eventForm.jsContent,
-        extensions: [
-          EditorState.tabSize.of(16),
-          basicSetup,
-          javascript(),
-          jsDocCompletions,
-          mytheme,
-          baseTheme,
-          EditorView.updateListener.of(function(value) {
-            props.eventForm.jsContent = value.state.doc.toString();
-          })
-        ]
-      });
-    }
-    function getTheme() {
-      return EditorView.theme({});
-    }
-    function loadEditor() {
-      const state = getEditorState();
-      editor.value = new EditorView({
-        state,
-        parent: document.getElementById("cf-codemirror")
-      });
-    }
-    function myCompletions(context) {
-      let word = context.matchBefore(/\w*|logicContext\./);
-      if (word) {
-        if (word.from == word.to && !context.explicit)
-          return null;
-        if ((word == null ? void 0 : word.text) === "logicContext.") {
-          return {
-            from: word.from,
-            options: [
-              { label: "logicContext.page", type: "property", info: "页面变量" },
-              { label: "logicContext.logic", type: "property", info: "页面变量" },
-              { label: "logicContext.task", type: "property", info: "任务变量" },
-              { label: "logicContext.context", type: "property", info: "上下文变量" },
-              { label: "logicContext.system", type: "property", info: "系统变量" },
-              { label: "logicContext.data", type: "property", info: "数据模型变量" }
-            ]
-          };
-        } else {
-          return {
-            from: word.from,
-            options: [{ label: "logicContext", type: "property" }]
-          };
-        }
-      } else {
-        return null;
-      }
-    }
-    function openSearch() {
-      if (editor.value) {
-        editor.value.focus();
-        let newState = openSearchPanel(editor.value);
-        if (newState) {
-          editor.value.update([transaction]);
-        }
-      }
-    }
-    __expose({});
-    return (_ctx, _cache) => {
-      const _component_el_option = resolveComponent("el-option");
-      const _component_el_select = resolveComponent("el-select");
-      const _component_el_tooltip = resolveComponent("el-tooltip");
-      const _component_el_icon = resolveComponent("el-icon");
-      return openBlock(), createElementBlock("div", _hoisted_1, [
-        createElementVNode("div", _hoisted_2, [
-          createElementVNode("span", _hoisted_3, [
-            createTextVNode(" function "),
-            __props.eventForm.name === "customFunc" ? (openBlock(), createElementBlock("span", _hoisted_4, " $page_" + toDisplayString(__props.eventForm.eventName) + "(" + toDisplayString(__props.eventForm.funcParam ? __props.eventForm.funcParam : "") + ") ", 1)) : (openBlock(), createElementBlock("span", _hoisted_5, toDisplayString(__props.eventForm.eventName) + "(params) ", 1)),
-            createTextVNode("{")
-          ]),
-          createElementVNode("span", _hoisted_6, [
-            createVNode(_component_el_tooltip, {
-              class: "box-item",
-              effect: "dark",
-              content: "切换主题",
-              placement: "top"
-            }, {
-              default: withCtx(() => [
-                createVNode(_component_el_select, {
-                  class: "editorOption",
-                  onChange: changeEditorState,
-                  modelValue: editorStyle.value.theme,
-                  "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => editorStyle.value.theme = $event),
-                  placeholder: "",
-                  size: "small",
-                  style: { "width": "120px" }
-                }, {
-                  default: withCtx(() => [
-                    createVNode(_component_el_option, {
-                      label: "默认",
-                      value: "default"
-                    }),
-                    createVNode(_component_el_option, {
-                      label: "VScodeDark",
-                      value: "vscodeDark"
-                    }),
-                    createVNode(_component_el_option, {
-                      label: "Dracula",
-                      value: "dracula"
-                    }),
-                    createVNode(_component_el_option, {
-                      label: "GithubLight",
-                      value: "githubLight"
-                    }),
-                    createVNode(_component_el_option, {
-                      label: "GithubDark",
-                      value: "githubDark"
-                    }),
-                    createVNode(_component_el_option, {
-                      label: "Eclipse",
-                      value: "eclipse"
-                    }),
-                    createVNode(_component_el_option, {
-                      label: "XcodeLight",
-                      value: "xcodeLight"
-                    }),
-                    createVNode(_component_el_option, {
-                      label: "XcodeDark",
-                      value: "xcodeDark"
-                    })
-                  ]),
-                  _: 1
-                }, 8, ["modelValue"])
-              ]),
-              _: 1
-            }),
-            createVNode(_component_el_tooltip, {
-              class: "box-item",
-              effect: "dark",
-              content: "切换字体大小",
-              placement: "top"
-            }, {
-              default: withCtx(() => [
-                createVNode(_component_el_select, {
-                  class: "editorOption",
-                  modelValue: editorStyle.value.fontSize,
-                  "onUpdate:modelValue": _cache[1] || (_cache[1] = ($event) => editorStyle.value.fontSize = $event),
-                  placeholder: "",
-                  onChange: changeEditorState,
-                  size: "small",
-                  style: { "width": "80px" }
-                }, {
-                  default: withCtx(() => [
-                    createVNode(_component_el_option, {
-                      label: "12",
-                      value: 12
-                    }),
-                    createVNode(_component_el_option, {
-                      label: "14",
-                      value: 14
-                    }),
-                    createVNode(_component_el_option, {
-                      label: "16",
-                      value: 16
-                    }),
-                    createVNode(_component_el_option, {
-                      label: "18",
-                      value: 18
-                    }),
-                    createVNode(_component_el_option, {
-                      label: "20",
-                      value: 20
-                    }),
-                    createVNode(_component_el_option, {
-                      label: "22",
-                      value: 22
-                    }),
-                    createVNode(_component_el_option, {
-                      label: "24",
-                      value: 24
-                    }),
-                    createVNode(_component_el_option, {
-                      label: "26",
-                      value: 26
-                    }),
-                    createVNode(_component_el_option, {
-                      label: "28",
-                      value: 28
-                    })
-                  ]),
-                  _: 1
-                }, 8, ["modelValue"])
-              ]),
-              _: 1
-            })
-          ]),
-          createVNode(_component_el_tooltip, {
-            class: "box-item",
-            effect: "dark",
-            content: "打开搜索",
-            placement: "top"
-          }, {
-            default: withCtx(() => [
-              createVNode(_component_el_icon, {
-                class: "editorOption",
-                onClick: openSearch
-              }, {
-                default: withCtx(() => [
-                  createVNode(unref(Search))
-                ]),
-                _: 1
-              })
-            ]),
-            _: 1
-          }),
-          createVNode(_component_el_tooltip, {
-            class: "box-item",
-            effect: "dark",
-            content: fullScreenDrawer.value ? "退出全屏" : "全屏",
-            placement: "top"
-          }, {
-            default: withCtx(() => [
-              createVNode(_component_el_icon, {
-                style: { "cursor": "pointer" },
-                onClick: showFullScreen
-              }, {
-                default: withCtx(() => [
-                  createVNode(unref(FullScreen))
-                ]),
-                _: 1
-              })
-            ]),
-            _: 1
-          }, 8, ["content"])
-        ]),
-        _hoisted_7,
-        _hoisted_8
-      ]);
-    };
-  }
-});
-export {
-  _sfc_main as default
-};
+