service-flow-designer 2.1.32 → 2.1.35

package/dist/es/designer/common/components/sql-view/index.d.ts

@@ -0,0 +1,4 @@
+import { default as SqlView } from './sql-view.vue';
+import { default as SqlViewDialog } from './sql-view-dialog.vue';
+
+export { SqlView, SqlViewDialog };

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

@@ -0,0 +1,36 @@
+declare const _default: import('vue').DefineComponent<{
+    sql: {
+        type: StringConstructor;
+        default: any;
+    };
+    appendToBody: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
+    modelValue: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
+}, {}, unknown, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
+    "update:modelValue": (...args: any[]) => void;
+}, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{
+    sql: {
+        type: StringConstructor;
+        default: any;
+    };
+    appendToBody: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
+    modelValue: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
+}>> & {
+    "onUpdate:modelValue"?: (...args: any[]) => any;
+}, {
+    modelValue: boolean;
+    appendToBody: boolean;
+    sql: string;
+}, {}>;
+export default _default;

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

@@ -0,0 +1,63 @@
+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 "./sql-view.vue2.js";
+const _sfc_main = /* @__PURE__ */ defineComponent({
+  ...{
+    name: "SqlViewDialog",
+    inheritAttrs: false
+  },
+  __name: "sql-view-dialog",
+  props: {
+    sql: {
+      type: String,
+      default: null
+    },
+    appendToBody: {
+      type: Boolean,
+      default: true
+    },
+    modelValue: {
+      type: Boolean,
+      default: false
+    }
+  },
+  emits: ["update:modelValue"],
+  setup(__props, { emit: __emit }) {
+    const props = __props;
+    const emits = __emit;
+    const showJsonVisible = ref(false);
+    watch(
+      () => props.modelValue,
+      (newVal) => {
+        if (newVal) {
+          showJsonVisible.value = true;
+        }
+      }
+    );
+    const close = () => {
+      showJsonVisible.value = false;
+      emits("update:modelValue", false);
+    };
+    return (_ctx, _cache) => {
+      const _component_el_dialog = ElDialog;
+      return openBlock(), createBlock(_component_el_dialog, {
+        modelValue: showJsonVisible.value,
+        "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => showJsonVisible.value = $event),
+        "append-to-body": __props.appendToBody,
+        title: "SQL预览",
+        width: "600",
+        onClose: close
+      }, {
+        default: withCtx(() => [
+          createVNode(_sfc_main$1, { sql: __props.sql }, null, 8, ["sql"])
+        ]),
+        _: 1
+      }, 8, ["modelValue", "append-to-body"]);
+    };
+  }
+});
+export {
+  _sfc_main as default
+};

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

@@ -0,0 +1,4 @@
+import _sfc_main from "./sql-view-dialog.vue.js";
+export {
+  _sfc_main as default
+};

package/dist/es/designer/common/components/sql-view/sql-view.vue.d.ts

@@ -0,0 +1,32 @@
+declare const _default: import('vue').DefineComponent<{
+    sql: {
+        type: StringConstructor;
+        default: any;
+    };
+    height: {
+        type: NumberConstructor;
+        default: number;
+    };
+    theme: {
+        type: StringConstructor;
+        default: any;
+    };
+}, {}, unknown, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {}, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{
+    sql: {
+        type: StringConstructor;
+        default: any;
+    };
+    height: {
+        type: NumberConstructor;
+        default: number;
+    };
+    theme: {
+        type: StringConstructor;
+        default: any;
+    };
+}>>, {
+    height: number;
+    theme: string;
+    sql: string;
+}, {}>;
+export default _default;

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

@@ -0,0 +1,4 @@
+import _sfc_main from "./sql-view.vue2.js";
+export {
+  _sfc_main as default
+};

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

@@ -0,0 +1,98 @@
+import { defineComponent, ref, onMounted, nextTick, openBlock, createElementBlock } from "vue";
+import { EditorView, basicSetup } from "codemirror";
+import { sql } from "@codemirror/lang-sql";
+import { Facet, EditorState } from "@codemirror/state";
+const _sfc_main = /* @__PURE__ */ defineComponent({
+  ...{
+    name: "SqlView",
+    inheritAttrs: false
+  },
+  __name: "sql-view",
+  props: {
+    sql: {
+      type: String,
+      default: null
+    },
+    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");
+    onMounted(() => {
+      nextTick(() => {
+        loadEditor();
+      });
+    });
+    function loadEditor() {
+      if (editor.value) {
+        editor.value.destroy();
+      }
+      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();
+      let element = document.getElementById("cf-codemirror-view-json");
+      if (element) {
+        editor.value = new EditorView({
+          state,
+          parent: element
+        });
+      }
+    }
+    const readOnlyFacet = Facet.define({ combine: (values) => values.some((a) => a) });
+    function getEditorState() {
+      const mytheme = EditorView.theme({});
+      const baseTheme = EditorView.theme({
+        ".cm-content, .cm-gutter": { minHeight: codemirrorHeight.value },
+        "&": {
+          height: codemirrorHeight.value,
+          maxHeight: codemirrorHeight.value,
+          fontSize: "12px"
+        }
+      });
+      return EditorState.create({
+        doc: props.sql,
+        extensions: [
+          EditorState.tabSize.of(16),
+          basicSetup,
+          sql(),
+          mytheme,
+          baseTheme,
+          readOnlyFacet.of(true),
+          EditorView.updateListener.of(function(value) {
+          })
+        ]
+      });
+    }
+    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-components/database/aggregate-query/config.vue.d.ts

@@ -15,6 +15,14 @@ declare const _default: import('vue').DefineComponent<{
         type: ObjectConstructor;
         default: () => {};
     };
+    pageContext: {
+        type: ObjectConstructor;
+        default: () => {};
+    };
+    service: {
+        type: ObjectConstructor;
+        default: () => {};
+    };
 }, {}, unknown, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {}, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{
     properties: {
         type: ObjectConstructor;
@@ -32,8 +40,18 @@ declare const _default: import('vue').DefineComponent<{
         type: ObjectConstructor;
         default: () => {};
     };
+    pageContext: {
+        type: ObjectConstructor;
+        default: () => {};
+    };
+    service: {
+        type: ObjectConstructor;
+        default: () => {};
+    };
 }>>, {
+    pageContext: Record<string, any>;
     properties: Record<string, any>;
+    service: Record<string, any>;
     logicFlowInstance: Record<string, any>;
     currentNode: Record<string, any>;
 }, {}>;

package/dist/es/designer/service-components/database/aggregate-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-ac2ec342"]]);
+const config = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-dac15197"]]);
 export {
   config as default
 };

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

@@ -8,13 +8,13 @@ import "element-plus/es/components/alert/style/css";
 import "element-plus/es/components/form-item/style/css";
 import "element-plus/es/components/input/style/css";
 import "element-plus/es/components/button/style/css";
-import { defineComponent, ref, onMounted, openBlock, createElementBlock, createVNode, withCtx, unref, createTextVNode, createElementVNode, pushScopeId, popScopeId } from "vue";
-import { Search, Check } from "@element-plus/icons-vue";
+import { defineComponent, ref, onMounted, openBlock, createElementBlock, createVNode, withCtx, unref, createElementVNode, createTextVNode, pushScopeId, popScopeId } from "vue";
+import { Search, View, Check } from "@element-plus/icons-vue";
 import ValueSetInput from "../../../common/components/value-set-input/value-set-input.vue.js";
 import DatatableSelect from "../../../common/components/datatable-select.vue.js";
 import { useServiceFlowStore } from "../../../../stores/page-store.js";
-import { queryTableFields, updateServiceParams, updateServiceReturns } from "../../../../utils/common-util.js";
-import "agilebuilder-ui/src/utils/request";
+import { queryTableFields, updateServiceParams, updateServiceReturns, getBaseUrl } from "../../../../utils/common-util.js";
+import http from "agilebuilder-ui/src/utils/request";
 import "uuid";
 import _sfc_main$2 from "./dimension-statistical.vue.js";
 import "element-plus/es/components/table/style/css";
@@ -27,11 +27,17 @@ import _sfc_main$3 from "./statistical-formula.vue.js";
 import _sfc_main$4 from "./filter-conditions.vue.js";
 import _sfc_main$5 from "./sort-conditions.vue.js";
 import _sfc_main$1 from "../../../common/components/node-base-config.vue.js";
+import { getNodeRuntimeObject } from "../../../service-flow-view/flow-util.js";
+import "codemirror";
+import "@codemirror/lang-sql";
+import "@codemirror/state";
+import _sfc_main$6 from "../../../common/components/sql-view/sql-view-dialog.vue.js";
 import "element-plus/es/components/message/style/css";
-const _withScopeId = (n) => (pushScopeId("data-v-ac2ec342"), n = n(), popScopeId(), n);
-const _hoisted_1 = /* @__PURE__ */ _withScopeId(() => /* @__PURE__ */ createElementVNode("br", null, null, -1));
+const _withScopeId = (n) => (pushScopeId("data-v-dac15197"), n = n(), popScopeId(), n);
+const _hoisted_1 = { style: { "position": "absolute", "right": "0" } };
 const _hoisted_2 = /* @__PURE__ */ _withScopeId(() => /* @__PURE__ */ createElementVNode("br", null, null, -1));
-const _hoisted_3 = { style: { "display": "flex" } };
+const _hoisted_3 = /* @__PURE__ */ _withScopeId(() => /* @__PURE__ */ createElementVNode("br", null, null, -1));
+const _hoisted_4 = { style: { "display": "flex" } };
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "config",
   props: {
@@ -52,6 +58,14 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       default: () => {
         return {};
       }
+    },
+    pageContext: {
+      type: Object,
+      default: () => ({})
+    },
+    service: {
+      type: Object,
+      default: () => ({})
     }
   },
   setup(__props, { expose: __expose }) {
@@ -74,6 +88,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       props.properties.result.valueSetScope = "all";
     }
     const autoCreateFieldType = ref("array");
+    const showSqlViewDialog = ref(false);
+    const sql = ref("");
     function valueSetScopeChange() {
       if (props.properties.result.valueSetScope == "first") {
         autoCreateFieldType.value = "object";
@@ -106,7 +122,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       systemCode.value = props.properties.dataTableSystemCode;
       updateTableColumns();
     };
-    const statisticsColumnChange = (value) => {
+    const statisticsColumnChange = () => {
       sortColumns.value = [];
       const selectColumns = [];
       if (props.properties.statistics) {
@@ -153,6 +169,16 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       const fieldType = props.properties.result.valueSetScope == "first" ? "object" : "array";
       updateServiceReturns(props.properties.result.setTo, fieldType, sortColumns.value);
     }
+    function viewSql() {
+      sql.value = "";
+      const node = getNodeRuntimeObject(props.logicFlowInstance.getNodeModelById(props.currentNode.data.id), props.service);
+      node["props"] = JSON.parse(JSON.stringify(props.properties));
+      const baseUrl = getBaseUrl(props.pageContext.backendUrl, props.pageContext.isTest);
+      http.post(baseUrl + "/dsc/service-flow/test/database-node/show-sql", node).then((res) => {
+        showSqlViewDialog.value = true;
+        sql.value = res;
+      });
+    }
     __expose({});
     return (_ctx, _cache) => {
       const _component_el_button = ElButton;
@@ -187,6 +213,18 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                   ]),
                   _: 1
                 }, 8, ["modelValue"]),
+                createElementVNode("span", _hoisted_1, [
+                  createVNode(_component_el_button, {
+                    type: "primary",
+                    icon: unref(View),
+                    onClick: viewSql
+                  }, {
+                    default: withCtx(() => [
+                      createTextVNode("预览sql")
+                    ]),
+                    _: 1
+                  }, 8, ["icon"])
+                ]),
                 createVNode(DatatableSelect, {
                   visible: showSelectTable.value,
                   "onUpdate:visible": _cache[2] || (_cache[2] = ($event) => showSelectTable.value = $event),
@@ -218,9 +256,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             }, {
               default: withCtx(() => [
                 createTextVNode("说明：1.支持自定义日期格式,同SimpleDateFormat,yyyy表示年,MM表示2位月..."),
-                _hoisted_1,
-                createTextVNode("           2.未指定新字段名时,输出字段名同选择的字段名"),
                 _hoisted_2,
+                createTextVNode("           2.未指定新字段名时,输出字段名同选择的字段名"),
+                _hoisted_3,
                 createTextVNode("           3.动态维度值有填写时需要匹配才会执行此分组")
               ]),
               _: 1
@@ -311,7 +349,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
               style: { "width": "100%" }
             }, {
               default: withCtx(() => [
-                createElementVNode("div", _hoisted_3, [
+                createElementVNode("div", _hoisted_4, [
                   createVNode(unref(ValueSetInput), {
                     width: "260",
                     paramTypes: ["service"],
@@ -347,7 +385,12 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             })
           ]),
           _: 1
-        })
+        }),
+        createVNode(unref(_sfc_main$6), {
+          sql: sql.value,
+          "model-value": showSqlViewDialog.value,
+          "onUpdate:modelValue": _cache[6] || (_cache[6] = ($event) => showSqlViewDialog.value = $event)
+        }, null, 8, ["sql", "model-value"])
       ]);
     };
   }

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

@@ -15,6 +15,14 @@ declare const _default: import('vue').DefineComponent<{
         type: ObjectConstructor;
         default: () => {};
     };
+    pageContext: {
+        type: ObjectConstructor;
+        default: () => {};
+    };
+    service: {
+        type: ObjectConstructor;
+        default: () => {};
+    };
 }, {
     onClose: () => Record<string, any>;
 }, unknown, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {}, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{
@@ -34,8 +42,18 @@ declare const _default: import('vue').DefineComponent<{
         type: ObjectConstructor;
         default: () => {};
     };
+    pageContext: {
+        type: ObjectConstructor;
+        default: () => {};
+    };
+    service: {
+        type: ObjectConstructor;
+        default: () => {};
+    };
 }>>, {
+    pageContext: Record<string, any>;
     properties: Record<string, any>;
+    service: Record<string, any>;
     logicFlowInstance: Record<string, any>;
     currentNode: Record<string, any>;
 }, {}>;

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-65e38bfb"]]);
+const config = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-6fdf85a5"]]);
 export {
   config as default
 };