service-flow-designer 2.1.43 → 2.1.51

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

@@ -51,7 +51,10 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         onClose: close
       }, {
         default: withCtx(() => [
-          createVNode(_sfc_main$1, { sql: __props.sql }, null, 8, ["sql"])
+          createVNode(_sfc_main$1, {
+            sql: __props.sql,
+            height: 400
+          }, null, 8, ["sql"])
         ]),
         _: 1
       }, 8, ["modelValue", "append-to-body"]);

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

@@ -1,4 +1,4 @@
-import { defineComponent, ref, onMounted, nextTick, openBlock, createElementBlock } from "vue";
+import { defineComponent, ref, onMounted, nextTick, watch, openBlock, createElementBlock } from "vue";
 import { EditorView, basicSetup } from "codemirror";
 import { sql } from "@codemirror/lang-sql";
 import { Facet, EditorState } from "@codemirror/state";
@@ -32,6 +32,12 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         loadEditor();
       });
     });
+    watch(
+      () => props.sql,
+      () => {
+        loadEditor();
+      }
+    );
     function loadEditor() {
       if (editor.value) {
         editor.value.destroy();

package/dist/es/designer/service-components/database/regular-query/config.vue.js

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

package/dist/es/designer/service-components/database/regular-query/config.vue2.js

@@ -88,9 +88,10 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       if (!props.properties.dataTable || props.properties.dataTable === serviceFlowStoreUtil.pageContext.tableName) {
         dataTableColumns.value = serviceFlowStoreUtil.pageContext.modelFields;
       } else {
-        http.get("/mms/systems/getPublishVersionsByCode/" + props.properties.dataTableSystemCode).then((systems) => {
+        const baseAPI = window["$vueApp"].config.globalProperties.baseAPI;
+        http.get(baseAPI + "/mms/systems/getPublishVersionsByCode/" + props.properties.dataTableSystemCode).then((systems) => {
           http.get(
-            "/mms/data-tables/table-columns?tableName=" + props.properties.dataTable + "&systemCode=" + props.properties.dataTableSystemCode + "&publishVersion=" + systems[systems.length - 1].publishVersion
+            baseAPI + "/mms/data-tables/table-columns?tableName=" + props.properties.dataTable + "&systemCode=" + props.properties.dataTableSystemCode + "&publishVersion=" + systems[systems.length - 1].publishVersion
           ).then((res) => {
             dataTableColumns.value = res;
           });
@@ -100,8 +101,12 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const rowDblclick = (row, column, event) => {
       row.$editing = true;
     };
-    const handleDelete = (index, row, search) => {
-      search.conditions.splice(index, 1);
+    const handleDelete = (index, row, type) => {
+      if (type === "sort") {
+        props.properties.sort.splice(index, 1);
+      } else if (type === "search") {
+        props.properties.search.conditions.splice(index, 1);
+      }
     };
     const addSortColumn = () => {
       if (!props.properties.sort) {
@@ -119,7 +124,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       props.properties.dataTable = result.dataTable.name;
       props.properties.dataTableSystemCode = result.system.code;
       http.get(
-        "/mms/data-tables/table-columns?tableName=" + result.dataTable.name + "&systemCode=" + result.system.code + "&publishVersion=" + result.system.publishVersion
+        window["$vueApp"].config.globalProperties.baseAPI + "/mms/data-tables/table-columns?tableName=" + result.dataTable.name + "&systemCode=" + result.system.code + "&publishVersion=" + result.system.publishVersion
       ).then((res) => {
         dataTableColumns.value = res;
       });
@@ -450,7 +455,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                             size: "small",
                             icon: unref(Minus),
                             circle: "",
-                            onClick: ($event) => handleDelete(scope.$index, scope.row, __props.properties.search)
+                            onClick: ($event) => handleDelete(scope.$index, scope.row, "search")
                           }, null, 8, ["icon", "onClick"])
                         ]),
                         _: 2
@@ -591,7 +596,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                             size: "small",
                             icon: unref(Minus),
                             circle: "",
-                            onClick: ($event) => handleDelete(scope.$index, scope.row, __props.properties.search)
+                            onClick: ($event) => handleDelete(scope.$index, scope.row, "sort")
                           }, null, 8, ["icon", "onClick"])
                         ]),
                         _: 2

package/dist/es/designer/service-flow-view/flow-util.js

@@ -123,10 +123,12 @@ function getNodeRuntimeObject(node, service) {
     tempNode.children = node.children;
   }
   tempNode.tos = [];
-  const nextNodes = getNextNodeById(node, service.flow);
-  nextNodes.forEach((nextNode) => {
-    tempNode.tos.push({ code: nextNode.id });
-  });
+  if (service.flow) {
+    const nextNodes = getNextNodeById(node, service.flow);
+    nextNodes.forEach((nextNode) => {
+      tempNode.tos.push({ code: nextNode.id });
+    });
+  }
   return tempNode;
 }
 export {

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

@@ -30,7 +30,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     if (!props.service.returnValues) {
       props.service.returnValues = [];
     }
-    const typeOptions = ["any", "array", "object"];
+    const typeOptions = ["any", "array", "object", "string", "number", "date"];
     let selEditRow = null;
     const rowDblclick = (row) => {
       row.$editing = true;

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-286d914e"]]);
+const ServiceList = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-da8fc67a"]]);
 export {
   ServiceList as default
 };

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

@@ -1,22 +1,22 @@
-import { ElIcon, ElInput, ElCol, ElButton, ElTooltip, ElRow, ElTree, ElFormItem, ElDialog } from "element-plus/es";
+import { ElIcon, ElInput, ElCol, ElRow, ElButton, ElTooltip, ElTree, ElFormItem, ElDialog } from "element-plus/es";
 import "element-plus/es/components/base/style/css";
 import "element-plus/es/components/dialog/style/css";
 import "element-plus/es/components/form-item/style/css";
 import "element-plus/es/components/tree/style/css";
-import "element-plus/es/components/row/style/css";
 import "element-plus/es/components/tooltip/style/css";
 import "element-plus/es/components/button/style/css";
+import "element-plus/es/components/row/style/css";
 import "element-plus/es/components/col/style/css";
 import "element-plus/es/components/input/style/css";
 import "element-plus/es/components/icon/style/css";
-import { defineComponent, ref, openBlock, createElementBlock, createVNode, withCtx, unref, createElementVNode, createBlock, toDisplayString, createTextVNode, createCommentVNode, withDirectives, vShow, pushScopeId, popScopeId } from "vue";
+import { defineComponent, ref, openBlock, createElementBlock, createVNode, withCtx, unref, createElementVNode, createTextVNode, createBlock, toDisplayString, createCommentVNode, withDirectives, vShow, pushScopeId, popScopeId } from "vue";
 import { Search, Plus, Menu, Promotion } from "@element-plus/icons-vue";
 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, ElMessageBox } from "element-plus";
-const _withScopeId = (n) => (pushScopeId("data-v-286d914e"), n = n(), popScopeId(), n);
+const _withScopeId = (n) => (pushScopeId("data-v-da8fc67a"), 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" };
@@ -77,11 +77,11 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     };
     const addRootServiceMenu = () => {
       editType.value = "MENU";
-      createService();
+      createService("root");
     };
     const addServce = (type) => {
       editType.value = type;
-      createService();
+      createService("leaf");
     };
     const editServiceBaseInfo = () => {
       editType.value = contextMenuData.value.type;
@@ -91,18 +91,89 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       }
       dialogVisible.value = true;
     };
-    const createService = () => {
+    const createService = (addType) => {
       serviceFlow.value = {
         code: v4(),
         name: "",
         customCode: "",
         type: editType.value
       };
-      if (contextMenuData.value.id) {
+      if (contextMenuData.value.id && addType === "leaf") {
         serviceFlow.value.parentCode = contextMenuData.value.code;
       }
       dialogVisible.value = true;
     };
+    const selectIds = ref([]);
+    const handleCheckChange = (data, checked, indeterminate) => {
+      if (checked) {
+        selectIds.value.push(data.id);
+        if (data.children && data.children.length > 0) {
+          data.children.forEach((item) => {
+            if (selectIds.value.indexOf(item.id) == -1) {
+              selectIds.value.push(item.id);
+            }
+          });
+        }
+      } else {
+        selectIds.value.splice(selectIds.value.indexOf(data.id), 1);
+        if (data.children && data.children.length > 0) {
+          data.children.forEach((item) => {
+            let index = selectIds.value.indexOf(item.id);
+            if (index > -1) {
+              selectIds.value.splice(index, 1);
+            }
+          });
+        }
+      }
+    };
+    const systemCode = serviceFlowStoreUtil.pageContext.systemCode;
+    const publishVersion = serviceFlowStoreUtil.pageContext.systemVersion;
+    const derive = () => {
+      if (selectIds.value.length > 0) {
+        http({
+          url: window["$vueApp"].config.globalProperties.baseAPI + `/component/super-page-design/service-flow/export/${systemCode}/${publishVersion}`,
+          method: "post",
+          data: selectIds.value,
+          responseType: "blob"
+        }).then((res) => {
+          let blob = new Blob([res], {
+            type: "application/zip"
+          });
+          let link = document.createElement("a");
+          link.href = window.URL.createObjectURL(blob);
+          link.download = "服务编排.zip";
+          link.click();
+          window.URL.revokeObjectURL(link.href);
+        });
+      } else {
+        ElMessage.warning("请选择服务或菜单");
+      }
+    };
+    const processFile = ref(null);
+    const selectDataFile = (command) => {
+      processFile.value.click();
+    };
+    const importPage = () => {
+      const fileObj = processFile.value.files[0];
+      if (fileObj) {
+        processFile.value.value = null;
+        const param = new FormData();
+        param.append("multipartFile", fileObj);
+        http({
+          url: window["$vueApp"].config.globalProperties.baseAPI + `/component/super-page-design/service-flow/import/${systemCode}/${publishVersion}`,
+          method: "post",
+          headers: { "Content-Type": "multipart/form-data" },
+          data: param
+        }).then(() => {
+          ElMessage.success("导入成功");
+          emits("load-tree-data");
+        }).catch((error) => {
+          console.log("error==", error);
+        });
+      } else {
+        ElMessage.warning("未选择文件");
+      }
+    };
     const saveServiceBaseInfo = () => {
       if (!serviceFlow.value.name) {
         ElMessage.warning("名称不能为空");
@@ -198,16 +269,16 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       const _component_el_icon = ElIcon;
       const _component_el_input = ElInput;
       const _component_el_col = ElCol;
+      const _component_el_row = ElRow;
       const _component_el_button = ElButton;
       const _component_el_tooltip = ElTooltip;
-      const _component_el_row = ElRow;
       const _component_el_tree = ElTree;
       const _component_el_form_item = ElFormItem;
       const _component_el_dialog = ElDialog;
       return openBlock(), createElementBlock("div", null, [
-        createVNode(_component_el_row, null, {
+        createVNode(_component_el_row, { style: { "margin-bottom": "10px" } }, {
           default: withCtx(() => [
-            createVNode(_component_el_col, { span: 18 }, {
+            createVNode(_component_el_col, { span: 24 }, {
               default: withCtx(() => [
                 createVNode(_component_el_input, {
                   modelValue: search.value,
@@ -226,12 +297,59 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                 }, 8, ["modelValue"])
               ]),
               _: 1
-            }),
-            createVNode(_component_el_col, {
-              span: 6,
-              style: { "text-align": "right" }
-            }, {
+            })
+          ]),
+          _: 1
+        }),
+        createVNode(_component_el_row, null, {
+          default: withCtx(() => [
+            createVNode(_component_el_col, { span: 24 }, {
               default: withCtx(() => [
+                createVNode(_component_el_tooltip, {
+                  effect: "dark",
+                  content: "导入",
+                  placement: "top"
+                }, {
+                  default: withCtx(() => [
+                    createVNode(_component_el_button, {
+                      type: "primary",
+                      onClick: selectDataFile
+                    }, {
+                      default: withCtx(() => [
+                        createElementVNode("input", {
+                          ref_key: "processFile",
+                          ref: processFile,
+                          accept: ".zip",
+                          name: "processFile",
+                          style: { "display": "none" },
+                          type: "file",
+                          onChange: importPage
+                        }, null, 544),
+                        createTextVNode(" 导入 ")
+                      ]),
+                      _: 1
+                    })
+                  ]),
+                  _: 1
+                }),
+                createVNode(_component_el_tooltip, {
+                  effect: "dark",
+                  content: "导出",
+                  placement: "top"
+                }, {
+                  default: withCtx(() => [
+                    createVNode(_component_el_button, {
+                      type: "primary",
+                      onClick: derive
+                    }, {
+                      default: withCtx(() => [
+                        createTextVNode("导出")
+                      ]),
+                      _: 1
+                    })
+                  ]),
+                  _: 1
+                }),
                 createVNode(_component_el_tooltip, {
                   effect: "dark",
                   content: "添加根菜单",
@@ -257,13 +375,15 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           ref_key: "serviceTreeRef",
           ref: serviceTreeRef,
           data: __props.serviceTreeData,
+          "node-key": "id",
           props: treeProps,
+          "show-checkbox": "",
           "expand-on-click-node": false,
           "default-expand-all": true,
-          "check-strictly": true,
           "highlight-current": "",
           onNodeClick: nodeClick,
-          onNodeContextmenu: nodeContextmenu
+          onNodeContextmenu: nodeContextmenu,
+          onCheckChange: handleCheckChange
         }, {
           default: withCtx(({ node, data }) => [
             createElementVNode("span", _hoisted_1, [