service-flow-designer 2.0.21 → 2.0.29

package/dist/es/designer/common/components/json-view/json-view-dialog.vue.js

@@ -2,7 +2,7 @@ import { ElDialog } from "element-plus/es";
 import "element-plus/es/components/base/style/css";
 import "element-plus/es/components/dialog/style/css";
 import { defineComponent, ref, watch, openBlock, createBlock, withCtx, createVNode } from "vue";
-import _sfc_main$1 from "./json-view.vue.js";
+import _sfc_main$1 from "./json-view.vue2.js";
 const _sfc_main = /* @__PURE__ */ defineComponent({
   ...{
     name: "JsonViewDialog",

package/dist/es/designer/common/components/json-view/json-view.vue.js

@@ -1,142 +1,4 @@
-import { defineComponent, ref, watch, onMounted, nextTick, openBlock, createElementBlock } from "vue";
-import { EditorView, basicSetup } from "codemirror";
-import { jsonLanguage } from "@codemirror/lang-json";
-import { EditorState, Facet } from "@codemirror/state";
-import { eclipse, githubDark, githubLight, dracula, vscodeDark, xcodeDark, xcodeLight } from "@uiw/codemirror-themes-all";
-const _sfc_main = /* @__PURE__ */ defineComponent({
-  ...{
-    name: "JsonView",
-    inheritAttrs: false
-  },
-  __name: "json-view",
-  props: {
-    jsonObject: {
-      type: Object,
-      default: () => {
-      }
-    },
-    height: {
-      type: Number,
-      default: 0
-    },
-    theme: {
-      type: String,
-      default: null
-    }
-  },
-  setup(__props) {
-    const props = __props;
-    const editor = ref(null);
-    const cfCodemirrorJsonViewRef = ref();
-    const codemirrorHeight = ref("400px");
-    watch(
-      () => props.jsonObject,
-      (newVal) => {
-        if (editor.value) {
-          loadEditor();
-        }
-      },
-      { deep: true }
-    );
-    onMounted(() => {
-      nextTick(() => {
-        loadEditor();
-      });
-    });
-    function loadEditor() {
-      if (editor.value) {
-        editor.value.destroy();
-      }
-      const jsonStr = props.jsonObject ? JSON.stringify(props.jsonObject, null, 2) : "";
-      if (props.height) {
-        codemirrorHeight.value = props.height + "px";
-      } else {
-        if (cfCodemirrorJsonViewRef.value) {
-          const rect = cfCodemirrorJsonViewRef.value.getBoundingClientRect();
-          if (rect.y || rect.y === 0) {
-            console.log("window.innerHeight - rect.y", window.innerHeight, rect.y);
-            codemirrorHeight.value = window.innerHeight - rect.y - 100 + "px";
-          }
-        }
-      }
-      const state = getEditorState(jsonStr);
-      let element = document.getElementById("cf-codemirror-view-json");
-      if (element) {
-        editor.value = new EditorView({
-          state,
-          parent: element
-        });
-      }
-    }
-    function getEditorState(jsonStr) {
-      const mytheme = getTheme();
-      const baseTheme = EditorView.theme({
-        ".cm-content, .cm-gutter": { minHeight: codemirrorHeight.value },
-        "&": {
-          height: codemirrorHeight.value,
-          maxHeight: codemirrorHeight.value,
-          fontSize: "12px"
-        }
-      });
-      return EditorState.create({
-        doc: jsonStr,
-        extensions: [
-          EditorState.tabSize.of(16),
-          basicSetup,
-          jsonLanguage,
-          mytheme,
-          baseTheme,
-          readOnlyFacet.of(true),
-          preventChanges
-        ]
-      });
-    }
-    const readOnlyFacet = Facet.define({ combine: (values) => values.some((a) => a) });
-    const preventChanges = EditorState.transactionFilter.of((tr) => {
-      if (tr.isUserEvent && tr.docChanged && tr.state.facet(readOnlyFacet)) {
-        return {
-          changes: {
-            from: tr.changes.from,
-            to: tr.changes.to,
-            insert: tr.startState.doc.sliceString(tr.changes.from, tr.changes.to)
-          }
-        };
-      }
-      return tr;
-    });
-    function getTheme() {
-      if (props.theme) {
-        switch (props.theme) {
-          case "xcodeLight":
-            return xcodeLight;
-          case "xcodeDark":
-            return xcodeDark;
-          case "vscodeDark":
-            return vscodeDark;
-          case "dracula":
-            return dracula;
-          case "githubLight":
-            return githubLight;
-          case "githubDark":
-            return githubDark;
-          case "eclipse":
-            return eclipse;
-        }
-      }
-      return EditorView.theme({});
-    }
-    return (_ctx, _cache) => {
-      return openBlock(), createElementBlock("div", {
-        style: {
-          width: "100%"
-        },
-        ref_key: "cfCodemirrorJsonViewRef",
-        ref: cfCodemirrorJsonViewRef,
-        id: "cf-codemirror-view-json"
-      }, null, 512);
-    };
-  }
-});
+import _sfc_main from "./json-view.vue2.js";
 export {
   _sfc_main as default
 };

package/dist/es/designer/common/components/json-view/json-view.vue2.js

@@ -1,4 +1,142 @@
-import _sfc_main from "./json-view.vue.js";
+import { defineComponent, ref, watch, onMounted, nextTick, openBlock, createElementBlock } from "vue";
+import { EditorView, basicSetup } from "codemirror";
+import { jsonLanguage } from "@codemirror/lang-json";
+import { EditorState, Facet } from "@codemirror/state";
+import { eclipse, githubDark, githubLight, dracula, vscodeDark, xcodeDark, xcodeLight } from "@uiw/codemirror-themes-all";
+const _sfc_main = /* @__PURE__ */ defineComponent({
+  ...{
+    name: "JsonView",
+    inheritAttrs: false
+  },
+  __name: "json-view",
+  props: {
+    jsonObject: {
+      type: Object,
+      default: () => {
+      }
+    },
+    height: {
+      type: Number,
+      default: 0
+    },
+    theme: {
+      type: String,
+      default: null
+    }
+  },
+  setup(__props) {
+    const props = __props;
+    const editor = ref(null);
+    const cfCodemirrorJsonViewRef = ref();
+    const codemirrorHeight = ref("400px");
+    watch(
+      () => props.jsonObject,
+      (newVal) => {
+        if (editor.value) {
+          loadEditor();
+        }
+      },
+      { deep: true }
+    );
+    onMounted(() => {
+      nextTick(() => {
+        loadEditor();
+      });
+    });
+    function loadEditor() {
+      if (editor.value) {
+        editor.value.destroy();
+      }
+      const jsonStr = props.jsonObject ? JSON.stringify(props.jsonObject, null, 2) : "";
+      if (props.height) {
+        codemirrorHeight.value = props.height + "px";
+      } else {
+        if (cfCodemirrorJsonViewRef.value) {
+          const rect = cfCodemirrorJsonViewRef.value.getBoundingClientRect();
+          if (rect.y || rect.y === 0) {
+            console.log("window.innerHeight - rect.y", window.innerHeight, rect.y);
+            codemirrorHeight.value = window.innerHeight - rect.y - 100 + "px";
+          }
+        }
+      }
+      const state = getEditorState(jsonStr);
+      let element = document.getElementById("cf-codemirror-view-json");
+      if (element) {
+        editor.value = new EditorView({
+          state,
+          parent: element
+        });
+      }
+    }
+    function getEditorState(jsonStr) {
+      const mytheme = getTheme();
+      const baseTheme = EditorView.theme({
+        ".cm-content, .cm-gutter": { minHeight: codemirrorHeight.value },
+        "&": {
+          height: codemirrorHeight.value,
+          maxHeight: codemirrorHeight.value,
+          fontSize: "12px"
+        }
+      });
+      return EditorState.create({
+        doc: jsonStr,
+        extensions: [
+          EditorState.tabSize.of(16),
+          basicSetup,
+          jsonLanguage,
+          mytheme,
+          baseTheme,
+          readOnlyFacet.of(true),
+          preventChanges
+        ]
+      });
+    }
+    const readOnlyFacet = Facet.define({ combine: (values) => values.some((a) => a) });
+    const preventChanges = EditorState.transactionFilter.of((tr) => {
+      if (tr.isUserEvent && tr.docChanged && tr.state.facet(readOnlyFacet)) {
+        return {
+          changes: {
+            from: tr.changes.from,
+            to: tr.changes.to,
+            insert: tr.startState.doc.sliceString(tr.changes.from, tr.changes.to)
+          }
+        };
+      }
+      return tr;
+    });
+    function getTheme() {
+      if (props.theme) {
+        switch (props.theme) {
+          case "xcodeLight":
+            return xcodeLight;
+          case "xcodeDark":
+            return xcodeDark;
+          case "vscodeDark":
+            return vscodeDark;
+          case "dracula":
+            return dracula;
+          case "githubLight":
+            return githubLight;
+          case "githubDark":
+            return githubDark;
+          case "eclipse":
+            return eclipse;
+        }
+      }
+      return EditorView.theme({});
+    }
+    return (_ctx, _cache) => {
+      return openBlock(), createElementBlock("div", {
+        style: {
+          width: "100%"
+        },
+        ref_key: "cfCodemirrorJsonViewRef",
+        ref: cfCodemirrorJsonViewRef,
+        id: "cf-codemirror-view-json"
+      }, null, 512);
+    };
+  }
+});
 export {
   _sfc_main as default
 };

package/dist/es/designer/service-flow-view/service-test/service-test.vue.js

@@ -14,7 +14,7 @@ import { json } from "@codemirror/lang-json";
 import { EditorState } from "@codemirror/state";
 import http from "agilebuilder-ui/src/utils/request";
 import LogicFlow from "@logicflow/core";
-import _sfc_main$2 from "../../common/components/json-view/json-view.vue.js";
+import _sfc_main$2 from "../../common/components/json-view/json-view.vue2.js";
 import { vscodeDark } from "@uiw/codemirror-themes-all";
 import _sfc_main$1 from "./request-params.vue.js";
 const _hoisted_1 = { class: "dialog-footer" };

package/dist/es/designer/service-flow-view/view-index.vue.js

@@ -1,7 +1,7 @@
 import _sfc_main from "./view-index.vue2.js";
 import "./view-index.vue3.js";
 import _export_sfc from "../../_virtual/_plugin-vue_export-helper.js";
-const ServiceFlowView = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-ff04c7d7"]]);
+const ServiceFlowView = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-c4ef30f9"]]);
 export {
   ServiceFlowView as default
 };

package/dist/es/designer/service-flow-view/view-index.vue2.js

@@ -18,7 +18,7 @@ import "../service-components/index.js";
 import { findServcieByCode, isDeepEqual } from "../common/util/node-util.js";
 import { useServiceFlowStore } from "../../stores/page-store.js";
 import { ElMessageBox, ElMessage } from "element-plus";
-const _withScopeId = (n) => (pushScopeId("data-v-ff04c7d7"), n = n(), popScopeId(), n);
+const _withScopeId = (n) => (pushScopeId("data-v-c4ef30f9"), n = n(), popScopeId(), n);
 const _hoisted_1 = {
   class: "amb-design-content",
   ref: "ambServiceFlowContent"
@@ -223,7 +223,10 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         saveService2.log = JSON.stringify(saveService2.log);
         saveService2.flow = JSON.stringify(saveService2.flow);
         saveService2.returnValues = JSON.stringify(saveService2.returnValues);
-        http.post("/component/super-page-design/service-flow", { designLog: description, appServiceFlow: saveService2 }).then((res) => {
+        http.post(window["$vueApp"].config.globalProperties.baseAPI + "/component/super-page-design/service-flow", {
+          designLog: description,
+          appServiceFlow: saveService2
+        }).then((res) => {
           if (res) {
             ElMessage({
               message: "保存成功",

package/dist/es/designer/service-panel/service-list.vue.js

@@ -1,7 +1,7 @@
 import _sfc_main from "./service-list.vue2.js";
 import "./service-list.vue3.js";
 import _export_sfc from "../../_virtual/_plugin-vue_export-helper.js";
-const ServiceList = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-2badb0bb"]]);
+const ServiceList = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-286d914e"]]);
 export {
   ServiceList as default
 };

package/dist/es/designer/service-panel/service-list.vue2.js

@@ -15,8 +15,8 @@ import { v4 } from "uuid";
 import http from "agilebuilder-ui/src/utils/request";
 import { findServcieByCode } from "../common/util/node-util.js";
 import { useServiceFlowStore } from "../../stores/page-store.js";
-import { ElMessage } from "element-plus";
-const _withScopeId = (n) => (pushScopeId("data-v-2badb0bb"), n = n(), popScopeId(), n);
+import { ElMessage, ElMessageBox } from "element-plus";
+const _withScopeId = (n) => (pushScopeId("data-v-286d914e"), n = n(), popScopeId(), n);
 const _hoisted_1 = { class: "custom-tree-node" };
 const _hoisted_2 = { style: { "margin-left": "5px", "line-height": "14px", "font-size": "14px" } };
 const _hoisted_3 = { class: "dialog-footer" };
@@ -108,9 +108,11 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         ElMessage.warning("名称不能为空");
         return;
       }
-      if (!serviceFlow.value.customCode) {
-        ElMessage.warning("自定义编码不能为空");
-        return;
+      if ("MENU" !== serviceFlow.value.type) {
+        if (!serviceFlow.value.customCode) {
+          ElMessage.warning("自定义编码不能为空");
+          return;
+        }
       }
       console.log("保存服务基本信息：", serviceFlow.value);
       if (!serviceFlow.value.systemCode) {
@@ -150,6 +152,15 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         ElMessage.warning("该节点下存在子节点，不能删除！");
         return;
       }
+      ElMessageBox.confirm("确定要删除吗?", "确认", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(({ value }) => {
+        _deleteService();
+      });
+    };
+    const _deleteService = () => {
       http.delete(window["$vueApp"].config.globalProperties.baseAPI + "/component/super-page-design/service-flow", {
         data: [contextMenuData.value.id]
       }).then((res) => {
@@ -247,6 +258,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           ref: serviceTreeRef,
           data: __props.serviceTreeData,
           props: treeProps,
+          "expand-on-click-node": false,
           "default-expand-all": true,
           "check-strictly": true,
           "highlight-current": "",
@@ -308,18 +320,6 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             ])
           ]),
           default: withCtx(() => [
-            createVNode(_component_el_form_item, {
-              label: "名称：",
-              required: true
-            }, {
-              default: withCtx(() => [
-                createVNode(_component_el_input, {
-                  modelValue: serviceFlow.value.name,
-                  "onUpdate:modelValue": _cache[1] || (_cache[1] = ($event) => serviceFlow.value.name = $event)
-                }, null, 8, ["modelValue"])
-              ]),
-              _: 1
-            }),
             editType.value === "SERVICE" ? (openBlock(), createBlock(_component_el_form_item, {
               key: 0,
               label: "自定义编码：",
@@ -329,11 +329,23 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                 createVNode(_component_el_input, {
                   disabled: serviceFlow.value.id,
                   modelValue: serviceFlow.value.customCode,
-                  "onUpdate:modelValue": _cache[2] || (_cache[2] = ($event) => serviceFlow.value.customCode = $event)
+                  "onUpdate:modelValue": _cache[1] || (_cache[1] = ($event) => serviceFlow.value.customCode = $event)
                 }, null, 8, ["disabled", "modelValue"])
               ]),
               _: 1
-            })) : createCommentVNode("", true)
+            })) : createCommentVNode("", true),
+            createVNode(_component_el_form_item, {
+              label: "          名称：",
+              required: true
+            }, {
+              default: withCtx(() => [
+                createVNode(_component_el_input, {
+                  modelValue: serviceFlow.value.name,
+                  "onUpdate:modelValue": _cache[2] || (_cache[2] = ($event) => serviceFlow.value.name = $event)
+                }, null, 8, ["modelValue"])
+              ]),
+              _: 1
+            })
           ]),
           _: 1
         }, 8, ["modelValue", "title"]),