service-flow-designer 1.1.18-tmp1 → 2.0.1

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

@@ -1,15 +1,37 @@
-import { defineComponent, ref, onMounted, resolveComponent, openBlock, createElementBlock, createVNode, withCtx, unref, createTextVNode } from "vue";
-import { Search } from "@element-plus/icons-vue";
+import { ElMessage, ElButton, ElInput, ElFormItem, ElAlert, ElText, ElRadio, ElRadioGroup, ElForm } from "element-plus/es";
+import "element-plus/es/components/base/style/css";
+import "element-plus/es/components/form/style/css";
+import "element-plus/es/components/radio-group/style/css";
+import "element-plus/es/components/radio/style/css";
+import "element-plus/es/components/text/style/css";
+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 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 http from "agilebuilder-ui/src/utils/request";
+import { queryTableFields, updateServiceParams, updateServiceReturns } from "../../../../utils/common-util.js";
+import "agilebuilder-ui/src/utils/request";
+import "uuid";
 import _sfc_main$2 from "./dimension-statistical.vue.js";
-import _sfc_main$3 from "./dimension-additional.vue.js";
-import _sfc_main$4 from "./statistical-formula.vue.js";
-import _sfc_main$5 from "./filter-conditions.vue.js";
-import _sfc_main$6 from "./sort-conditions.vue.js";
+import "element-plus/es/components/table/style/css";
+import "element-plus/es/components/tooltip/style/css";
+import "element-plus/es/components/select/style/css";
+import "element-plus/es/components/option/style/css";
+import "element-plus/es/components/table-column/style/css";
+import "../../util/common-options.js";
+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 "element-plus/es/components/message/style/css";
+const _withScopeId = (n) => (pushScopeId("data-v-808a13e1"), n = n(), popScopeId(), n);
+const _hoisted_1 = /* @__PURE__ */ _withScopeId(() => /* @__PURE__ */ createElementVNode("br", null, null, -1));
+const _hoisted_2 = /* @__PURE__ */ _withScopeId(() => /* @__PURE__ */ createElementVNode("br", null, null, -1));
+const _hoisted_3 = { style: { "display": "flex" } };
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "config",
   props: {
@@ -33,7 +55,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     }
   },
   setup(__props, { expose: __expose }) {
-    const serviceFlowStoreUtil = useServiceFlowStore(window["$pinia"]);
+    const serviceFlowStoreUtil = useServiceFlowStore();
     const props = __props;
     if (!props.properties.result) {
       props.properties.result = {};
@@ -44,107 +66,127 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const dataTableColumns = ref([]);
     const groupColumns = ref([]);
     const sortColumns = ref([]);
-    onMounted(() => {
-      if (!props.properties.dataTable || props.properties.dataTable === serviceFlowStoreUtil.pageContext.tableName) {
-        specifyDataTableChange(false);
-        statisticsColumnChange();
+    if (!props.properties.result.valueSetScope) {
+      props.properties.result.valueSetScope = "all";
+    }
+    const autoCreateFieldType = ref("array");
+    function valueSetScopeChange() {
+      if (props.properties.result.valueSetScope == "first") {
+        autoCreateFieldType.value = "object";
+      } else {
+        autoCreateFieldType.value = "array";
+      }
+    }
+    function updateTableColumns() {
+      const tableName = props.properties.dataTable;
+      const systemCode2 = props.properties.dataTableSystemCode;
+      const systemVersion2 = props.properties.dataTableSystemVersion;
+      if (!tableName) {
+        dataTableColumns.value = [];
+        groupColumns.value = dataTableColumns.value;
       } else {
-        if (props.properties.specifyDataTable && props.properties.dataTable) {
-          systemCode.value = props.properties.dataTableSystemCode;
-        }
-        window["$http"].get("/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
-          ).then((res) => {
-            dataTableColumns.value = res;
-            groupColumns.value = dataTableColumns.value;
-            statisticsColumnChange();
-          });
+        queryTableFields(systemCode2, systemVersion2, tableName).then((tableColumns) => {
+          dataTableColumns.value = tableColumns;
+          groupColumns.value = dataTableColumns.value;
         });
       }
+    }
+    onMounted(() => {
+      updateTableColumns();
+      statisticsColumnChange();
     });
     const selectChange = (result) => {
       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
-      ).then((res) => {
-        dataTableColumns.value = res;
-        groupColumns.value = dataTableColumns.value;
-      });
-    };
-    const specifyDataTableChange = (val) => {
-      if (!val) {
-        props.properties.dataTable = null;
-        dataTableColumns.value = serviceFlowStoreUtil.pageContext.modelFields;
-        groupColumns.value = dataTableColumns.value;
-      }
+      props.properties.dataTableSystemVersion = result.system.publishVersion;
+      updateTableColumns();
     };
     const statisticsColumnChange = (value) => {
       sortColumns.value = [];
       const selectColumns = [];
       if (props.properties.statistics) {
         props.properties.statistics.forEach((item) => {
-          selectColumns.push(item.name);
+          const fieldName = item.newName ? item.newName : item.name;
+          if (fieldName) {
+            selectColumns.push({
+              type: "string",
+              name: fieldName,
+              alias: fieldName
+            });
+          }
         });
       }
-      if (props.properties.additional) {
-        props.properties.additional.forEach((item) => {
-          if (sortColumns.value.indexOf(item.name) === -1) {
-            selectColumns.push(item.name);
+      if (props.properties.statisticalFormulas) {
+        props.properties.statisticalFormulas.forEach((item) => {
+          if (item.formula) {
+            const fieldName = item.newName ? item.newName : item.name;
+            if (fieldName && !selectColumns.includes(fieldName)) {
+              selectColumns.push({
+                type: "number",
+                name: fieldName,
+                alias: fieldName
+              });
+            }
           }
         });
       }
-      sortColumns.value = groupColumns.value.filter((item) => selectColumns.indexOf(item.name) > -1);
+      sortColumns.value = selectColumns;
     };
+    function updateParamsToService() {
+      if (!props.properties.result.setTo) {
+        ElMessage.error("请先设置结果参数!");
+        return;
+      }
+      const fieldType = props.properties.result.valueSetScope == "first" ? "object" : "array";
+      updateServiceParams(props.properties.result.setTo, fieldType, sortColumns.value);
+    }
+    function updateParamsToServiceReturns() {
+      if (!props.properties.result.setTo) {
+        ElMessage.error("请先设置结果参数!");
+        return;
+      }
+      const fieldType = props.properties.result.valueSetScope == "first" ? "object" : "array";
+      updateServiceReturns(props.properties.result.setTo, fieldType, sortColumns.value);
+    }
     __expose({});
     return (_ctx, _cache) => {
-      const _component_el_checkbox = resolveComponent("el-checkbox");
-      const _component_el_input = resolveComponent("el-input");
-      const _component_el_button = resolveComponent("el-button");
-      const _component_el_form_item = resolveComponent("el-form-item");
-      const _component_el_alert = resolveComponent("el-alert");
-      const _component_el_radio = resolveComponent("el-radio");
-      const _component_el_radio_group = resolveComponent("el-radio-group");
-      const _component_el_form = resolveComponent("el-form");
+      const _component_el_button = ElButton;
+      const _component_el_input = ElInput;
+      const _component_el_form_item = ElFormItem;
+      const _component_el_alert = ElAlert;
+      const _component_el_text = ElText;
+      const _component_el_radio = ElRadio;
+      const _component_el_radio_group = ElRadioGroup;
+      const _component_el_form = ElForm;
       return openBlock(), createElementBlock("div", null, [
         createVNode(_component_el_form, {
           "label-width": "100",
-          "label-position": "left"
+          "label-position": "left",
+          size: "small"
         }, {
           default: withCtx(() => [
             createVNode(_sfc_main$1, { properties: __props.properties }, null, 8, ["properties"]),
-            createVNode(_component_el_form_item, { label: "" }, {
-              label: withCtx((scope) => [
-                createVNode(_component_el_checkbox, {
-                  onChange: specifyDataTableChange,
-                  modelValue: __props.properties.specifyDataTable,
-                  "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => __props.properties.specifyDataTable = $event),
-                  label: "指定数据表",
-                  style: { "width": "100px" }
-                }, null, 8, ["modelValue"])
-              ]),
+            createVNode(_component_el_form_item, { label: "选择数据表" }, {
               default: withCtx(() => [
                 createVNode(_component_el_input, {
-                  disabled: !__props.properties.specifyDataTable,
                   modelValue: __props.properties.dataTable,
                   "onUpdate:modelValue": _cache[1] || (_cache[1] = ($event) => __props.properties.dataTable = $event),
                   readonly: "",
                   style: { "width": "85%" }
-                }, null, 8, ["disabled", "modelValue"]),
-                createVNode(_component_el_button, {
-                  icon: unref(Search),
-                  type: "primary",
-                  circle: "",
-                  disabled: !__props.properties.specifyDataTable,
-                  onClick: _cache[2] || (_cache[2] = ($event) => showSelectTable.value = !showSelectTable.value),
-                  style: { "position": "absolute", "right": "0" }
-                }, null, 8, ["icon", "disabled"]),
+                }, {
+                  append: withCtx(() => [
+                    createVNode(_component_el_button, {
+                      icon: unref(Search),
+                      onClick: _cache[0] || (_cache[0] = ($event) => showSelectTable.value = !showSelectTable.value)
+                    }, null, 8, ["icon"])
+                  ]),
+                  _: 1
+                }, 8, ["modelValue"]),
                 createVNode(DatatableSelect, {
                   visible: showSelectTable.value,
-                  "onUpdate:visible": _cache[3] || (_cache[3] = ($event) => showSelectTable.value = $event),
+                  "onUpdate:visible": _cache[2] || (_cache[2] = ($event) => showSelectTable.value = $event),
                   modelValue: __props.properties.dataTable,
-                  "onUpdate:modelValue": _cache[4] || (_cache[4] = ($event) => __props.properties.dataTable = $event),
+                  "onUpdate:modelValue": _cache[3] || (_cache[3] = ($event) => __props.properties.dataTable = $event),
                   systemCode: systemCode.value,
                   systemVersion: systemVersion.value,
                   onSelect: selectChange
@@ -162,10 +204,24 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             createVNode(_sfc_main$2, {
               properties: __props.properties,
               dataTableColumns: groupColumns.value,
-              onChange: statisticsColumnChange
+              onChange: statisticsColumnChange,
+              style: { "margin-bottom": "10 px" }
             }, null, 8, ["properties", "dataTableColumns"]),
+            createVNode(_component_el_text, {
+              style: { "margin-top": "10px", "margin-bottom": "10px", "display": "block" },
+              type: "success"
+            }, {
+              default: withCtx(() => [
+                createTextVNode("说明：1.支持自定义日期格式,同SimpleDateFormat,yyyy表示年,MM表示2位月..."),
+                _hoisted_1,
+                createTextVNode("           2.未指定新字段名时,输出字段名同选择的字段名"),
+                _hoisted_2,
+                createTextVNode("           3.动态维度值有填写时需要匹配才会执行此分组")
+              ]),
+              _: 1
+            }),
             createVNode(_component_el_alert, {
-              title: "附加维度",
+              title: "统计公式",
               type: "info",
               size: "small",
               closable: false,
@@ -173,20 +229,18 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             }),
             createVNode(_sfc_main$3, {
               properties: __props.properties,
-              dataTableColumns: groupColumns.value,
+              dataTableColumns: dataTableColumns.value,
               onChange: statisticsColumnChange
             }, null, 8, ["properties", "dataTableColumns"]),
-            createVNode(_component_el_alert, {
-              title: "统计公式",
-              type: "info",
-              size: "small",
-              closable: false,
-              style: { "margin-bottom": "20px" }
+            createVNode(_component_el_text, {
+              style: { "margin-top": "10px", "margin-bottom": "10px", "display": "block" },
+              type: "success"
+            }, {
+              default: withCtx(() => [
+                createTextVNode("说明：1.支持自定义统计公式,如sum(字段1+字段2)")
+              ]),
+              _: 1
             }),
-            createVNode(_sfc_main$4, {
-              properties: __props.properties,
-              dataTableColumns: dataTableColumns.value
-            }, null, 8, ["properties", "dataTableColumns"]),
             createVNode(_component_el_alert, {
               title: "过滤条件",
               type: "info",
@@ -194,7 +248,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
               closable: false,
               style: { "margin-bottom": "20px" }
             }),
-            createVNode(_sfc_main$5, {
+            createVNode(_sfc_main$4, {
               properties: __props.properties,
               dataTableColumns: dataTableColumns.value
             }, null, 8, ["properties", "dataTableColumns"]),
@@ -205,7 +259,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
               closable: false,
               style: { "margin-bottom": "20px" }
             }),
-            createVNode(_sfc_main$6, {
+            createVNode(_sfc_main$5, {
               properties: __props.properties,
               dataTableColumns: sortColumns.value
             }, null, 8, ["properties", "dataTableColumns"]),
@@ -224,7 +278,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
               default: withCtx(() => [
                 createVNode(_component_el_radio_group, {
                   modelValue: __props.properties.result.valueSetScope,
-                  "onUpdate:modelValue": _cache[5] || (_cache[5] = ($event) => __props.properties.result.valueSetScope = $event),
+                  "onUpdate:modelValue": _cache[4] || (_cache[4] = ($event) => __props.properties.result.valueSetScope = $event),
+                  onChange: valueSetScopeChange,
                   class: "ml-4"
                 }, {
                   default: withCtx(() => [
@@ -251,14 +306,37 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
               style: { "width": "100%" }
             }, {
               default: withCtx(() => [
-                createVNode(unref(ValueSetInput), {
-                  width: "70%",
-                  inputSize: "default",
-                  paramTypes: ["service"],
-                  size: "small",
-                  modelValue: __props.properties.result.setTo,
-                  "onUpdate:modelValue": _cache[6] || (_cache[6] = ($event) => __props.properties.result.setTo = $event)
-                }, null, 8, ["modelValue"])
+                createElementVNode("div", _hoisted_3, [
+                  createVNode(unref(ValueSetInput), {
+                    width: "260",
+                    paramTypes: ["service"],
+                    modelValue: __props.properties.result.setTo,
+                    "onUpdate:modelValue": _cache[5] || (_cache[5] = ($event) => __props.properties.result.setTo = $event),
+                    autoCreateFieldType: autoCreateFieldType.value
+                  }, null, 8, ["modelValue", "autoCreateFieldType"]),
+                  createVNode(_component_el_button, {
+                    icon: unref(Check),
+                    type: "primary",
+                    onClick: updateParamsToService,
+                    style: { "margin-left": "10px" }
+                  }, {
+                    default: withCtx(() => [
+                      createTextVNode(" 更新服务变量 ")
+                    ]),
+                    _: 1
+                  }, 8, ["icon"]),
+                  createVNode(_component_el_button, {
+                    icon: unref(Check),
+                    type: "primary",
+                    onClick: updateParamsToServiceReturns,
+                    style: { "margin-left": "10px" }
+                  }, {
+                    default: withCtx(() => [
+                      createTextVNode(" 设置为返回值 ")
+                    ]),
+                    _: 1
+                  }, 8, ["icon"])
+                ])
               ]),
               _: 1
             })

package/dist/es/designer/service-components/database/aggregate-query/dimension-statistical.vue.js

@@ -1,9 +1,19 @@
-import { defineComponent, resolveComponent, openBlock, createBlock, withCtx, createVNode, createElementBlock, toDisplayString, Fragment, renderList, unref, createElementVNode } from "vue";
+import { ElTableColumn, ElOption, ElSelect, ElInput, ElButton, ElTooltip, ElTable } from "element-plus/es";
+import "element-plus/es/components/base/style/css";
+import "element-plus/es/components/table/style/css";
+import "element-plus/es/components/tooltip/style/css";
+import "element-plus/es/components/button/style/css";
+import "element-plus/es/components/input/style/css";
+import "element-plus/es/components/select/style/css";
+import "element-plus/es/components/option/style/css";
+import "element-plus/es/components/table-column/style/css";
+import { defineComponent, openBlock, createBlock, withCtx, createVNode, createElementBlock, toDisplayString, Fragment, renderList, unref, createElementVNode } from "vue";
 import { Plus, Minus } from "@element-plus/icons-vue";
 import { dateFormats } from "../../util/common-options.js";
 const _hoisted_1 = { key: 0 };
 const _hoisted_2 = { key: 0 };
 const _hoisted_3 = { key: 0 };
+const _hoisted_4 = { key: 0 };
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "dimension-statistical",
   props: {
@@ -40,24 +50,25 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const statisticsColumnChange = (value, row) => {
       if (row) {
         props.dataTableColumns.forEach((item) => {
-          if (item.name === value) {
-            row.type = item.dataType;
-            if (row.type !== "DATE" && item.dataType !== "TIME") {
+          if (item.dbColumnName === value) {
+            row.dataType = item.dataType;
+            if (row.dataType !== "DATE" && item.dataType !== "TIME") {
               row.dateFormat = "";
             }
+            console.log("new Type", item);
           }
         });
       }
       emits("change", value);
     };
     return (_ctx, _cache) => {
-      const _component_el_table_column = resolveComponent("el-table-column");
-      const _component_el_option = resolveComponent("el-option");
-      const _component_el_select = resolveComponent("el-select");
-      const _component_el_input = resolveComponent("el-input");
-      const _component_el_button = resolveComponent("el-button");
-      const _component_el_tooltip = resolveComponent("el-tooltip");
-      const _component_el_table = resolveComponent("el-table");
+      const _component_el_table_column = ElTableColumn;
+      const _component_el_option = ElOption;
+      const _component_el_select = ElSelect;
+      const _component_el_input = ElInput;
+      const _component_el_button = ElButton;
+      const _component_el_tooltip = ElTooltip;
+      const _component_el_table = ElTable;
       return openBlock(), createBlock(_component_el_table, {
         data: __props.properties.statistics,
         style: { "width": "100%", "margin-bottom": "20px" },
@@ -71,7 +82,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           createVNode(_component_el_table_column, {
             type: "index",
             width: "50",
-            label: "序号"
+            label: "序号",
+            align: "center"
           }),
           createVNode(_component_el_table_column, {
             prop: "name",
@@ -84,14 +96,15 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                 modelValue: scope.row.name,
                 "onUpdate:modelValue": ($event) => scope.row.name = $event,
                 placeholder: "",
-                size: "small"
+                size: "small",
+                filterable: ""
               }, {
                 default: withCtx(() => [
                   (openBlock(true), createElementBlock(Fragment, null, renderList(__props.dataTableColumns, (item) => {
                     return openBlock(), createBlock(_component_el_option, {
-                      key: item.name,
-                      label: item.alias,
-                      value: item.name
+                      key: item.dbColumnName,
+                      label: item.alias + "(" + item.dbColumnName + ")",
+                      value: item.dbColumnName
                     }, null, 8, ["label", "value"]);
                   }), 128))
                 ]),
@@ -102,12 +115,13 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           }),
           createVNode(_component_el_table_column, {
             prop: "name",
-            label: "日期格式化"
+            label: "日期格式化",
+            width: "120"
           }, {
             default: withCtx((scope) => [
               !scope.row.$editing ? (openBlock(), createElementBlock("span", _hoisted_2, toDisplayString(scope.row.dateFormat), 1)) : (openBlock(), createBlock(_component_el_select, {
                 key: 1,
-                disabled: scope.row.type !== "DATE" && scope.row.type !== "TIME",
+                disabled: scope.row.dataType !== "DATE" && scope.row.dataType !== "TIME",
                 filterable: true,
                 "allow-create": true,
                 modelValue: scope.row.dateFormat,
@@ -130,11 +144,27 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             _: 1
           }),
           createVNode(_component_el_table_column, {
-            prop: "name",
+            prop: "newName",
+            label: "新字段名",
+            width: "160"
+          }, {
+            default: withCtx((scope) => [
+              !scope.row.$editing ? (openBlock(), createElementBlock("span", _hoisted_3, toDisplayString(scope.row.newName), 1)) : (openBlock(), createBlock(_component_el_input, {
+                key: 1,
+                modelValue: scope.row.newName,
+                "onUpdate:modelValue": ($event) => scope.row.newName = $event,
+                size: "small",
+                onChange: ($event) => emits("change", scope.row)
+              }, null, 8, ["modelValue", "onUpdate:modelValue", "onChange"]))
+            ]),
+            _: 1
+          }),
+          createVNode(_component_el_table_column, {
+            prop: "dynamicValue",
             label: "动态维度值"
           }, {
             default: withCtx((scope) => [
-              !scope.row.$editing ? (openBlock(), createElementBlock("span", _hoisted_3, toDisplayString(scope.row.dynamicValue), 1)) : (openBlock(), createBlock(_component_el_input, {
+              !scope.row.$editing ? (openBlock(), createElementBlock("span", _hoisted_4, toDisplayString(scope.row.dynamicValue), 1)) : (openBlock(), createBlock(_component_el_input, {
                 key: 1,
                 modelValue: scope.row.dynamicValue,
                 "onUpdate:modelValue": ($event) => scope.row.dynamicValue = $event,
@@ -143,7 +173,10 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             ]),
             _: 1
           }),
-          createVNode(_component_el_table_column, { align: "right" }, {
+          createVNode(_component_el_table_column, {
+            align: "center",
+            width: "80"
+          }, {
             header: withCtx(() => [
               createVNode(_component_el_tooltip, {
                 effect: "dark",