service-flow-designer 0.0.2-tmp7 → 1.0.1

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

@@ -1,37 +1,25 @@
-import { ElMessage, ElButton, ElInput, ElFormItem, ElAlert, ElText, ElRadio, ElRadioGroup, ElForm } from "element-plus/es";
+import { ElCheckbox, ElInput, ElButton, ElFormItem, ElAlert, 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 "element-plus/es/components/input/style/css";
+import "element-plus/es/components/checkbox/style/css";
+import { defineComponent, ref, onMounted, openBlock, createElementBlock, createVNode, withCtx, unref, createTextVNode } from "vue";
+import { Search } 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 "uuid";
+import http from "agilebuilder-ui/src/utils/request";
 import _sfc_main$2 from "./dimension-statistical.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$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 _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: {
@@ -66,127 +54,107 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const dataTableColumns = ref([]);
     const groupColumns = ref([]);
     const sortColumns = ref([]);
-    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;
+    onMounted(() => {
+      if (!props.properties.dataTable || props.properties.dataTable === serviceFlowStoreUtil.pageContext.tableName) {
+        specifyDataTableChange(false);
+        statisticsColumnChange();
       } else {
-        queryTableFields(systemCode2, systemVersion2, tableName).then((tableColumns) => {
-          dataTableColumns.value = tableColumns;
-          groupColumns.value = dataTableColumns.value;
+        if (props.properties.specifyDataTable && props.properties.dataTable) {
+          systemCode.value = props.properties.dataTableSystemCode;
+        }
+        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();
+          });
         });
       }
-    }
-    onMounted(() => {
-      updateTableColumns();
-      statisticsColumnChange();
     });
     const selectChange = (result) => {
       props.properties.dataTable = result.dataTable.name;
       props.properties.dataTableSystemCode = result.system.code;
-      props.properties.dataTableSystemVersion = result.system.publishVersion;
-      updateTableColumns();
+      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;
+      }
     };
     const statisticsColumnChange = (value) => {
       sortColumns.value = [];
       const selectColumns = [];
       if (props.properties.statistics) {
         props.properties.statistics.forEach((item) => {
-          const fieldName = item.newName ? item.newName : item.name;
-          if (fieldName) {
-            selectColumns.push({
-              type: "string",
-              name: fieldName,
-              alias: fieldName
-            });
-          }
+          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
-              });
-            }
+      if (props.properties.additional) {
+        props.properties.additional.forEach((item) => {
+          if (sortColumns.value.indexOf(item.name) === -1) {
+            selectColumns.push(item.name);
           }
         });
       }
-      sortColumns.value = selectColumns;
+      sortColumns.value = groupColumns.value.filter((item) => selectColumns.indexOf(item.name) > -1);
     };
-    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_button = ElButton;
+      const _component_el_checkbox = ElCheckbox;
       const _component_el_input = ElInput;
+      const _component_el_button = ElButton;
       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",
-          size: "small"
+          "label-position": "left"
         }, {
           default: withCtx(() => [
             createVNode(_sfc_main$1, { properties: __props.properties }, null, 8, ["properties"]),
-            createVNode(_component_el_form_item, { label: "选择数据表" }, {
+            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"])
+              ]),
               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%" }
-                }, {
-                  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"]),
+                }, 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"]),
                 createVNode(DatatableSelect, {
                   visible: showSelectTable.value,
-                  "onUpdate:visible": _cache[2] || (_cache[2] = ($event) => showSelectTable.value = $event),
+                  "onUpdate:visible": _cache[3] || (_cache[3] = ($event) => showSelectTable.value = $event),
                   modelValue: __props.properties.dataTable,
-                  "onUpdate:modelValue": _cache[3] || (_cache[3] = ($event) => __props.properties.dataTable = $event),
+                  "onUpdate:modelValue": _cache[4] || (_cache[4] = ($event) => __props.properties.dataTable = $event),
                   systemCode: systemCode.value,
                   systemVersion: systemVersion.value,
                   onSelect: selectChange
@@ -204,24 +172,10 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             createVNode(_sfc_main$2, {
               properties: __props.properties,
               dataTableColumns: groupColumns.value,
-              onChange: statisticsColumnChange,
-              style: { "margin-bottom": "10 px" }
+              onChange: statisticsColumnChange
             }, 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,
@@ -229,18 +183,20 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             }),
             createVNode(_sfc_main$3, {
               properties: __props.properties,
-              dataTableColumns: dataTableColumns.value,
+              dataTableColumns: groupColumns.value,
               onChange: statisticsColumnChange
             }, null, 8, ["properties", "dataTableColumns"]),
-            createVNode(_component_el_text, {
-              style: { "margin-top": "10px", "margin-bottom": "10px", "display": "block" },
-              type: "success"
-            }, {
-              default: withCtx(() => [
-                createTextVNode("说明：1.支持自定义统计公式,如sum(字段1+字段2)")
-              ]),
-              _: 1
+            createVNode(_component_el_alert, {
+              title: "统计公式",
+              type: "info",
+              size: "small",
+              closable: false,
+              style: { "margin-bottom": "20px" }
             }),
+            createVNode(_sfc_main$4, {
+              properties: __props.properties,
+              dataTableColumns: dataTableColumns.value
+            }, null, 8, ["properties", "dataTableColumns"]),
             createVNode(_component_el_alert, {
               title: "过滤条件",
               type: "info",
@@ -248,7 +204,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
               closable: false,
               style: { "margin-bottom": "20px" }
             }),
-            createVNode(_sfc_main$4, {
+            createVNode(_sfc_main$5, {
               properties: __props.properties,
               dataTableColumns: dataTableColumns.value
             }, null, 8, ["properties", "dataTableColumns"]),
@@ -259,7 +215,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
               closable: false,
               style: { "margin-bottom": "20px" }
             }),
-            createVNode(_sfc_main$5, {
+            createVNode(_sfc_main$6, {
               properties: __props.properties,
               dataTableColumns: sortColumns.value
             }, null, 8, ["properties", "dataTableColumns"]),
@@ -278,8 +234,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
               default: withCtx(() => [
                 createVNode(_component_el_radio_group, {
                   modelValue: __props.properties.result.valueSetScope,
-                  "onUpdate:modelValue": _cache[4] || (_cache[4] = ($event) => __props.properties.result.valueSetScope = $event),
-                  onChange: valueSetScopeChange,
+                  "onUpdate:modelValue": _cache[5] || (_cache[5] = ($event) => __props.properties.result.valueSetScope = $event),
                   class: "ml-4"
                 }, {
                   default: withCtx(() => [
@@ -306,37 +261,14 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
               style: { "width": "100%" }
             }, {
               default: withCtx(() => [
-                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"])
-                ])
+                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"])
               ]),
               _: 1
             })

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

@@ -0,0 +1,186 @@
+import { ElTableColumn, ElOption, ElSelect, 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/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 _sfc_main = /* @__PURE__ */ defineComponent({
+  __name: "dimension-additional",
+  props: {
+    properties: {
+      type: Object,
+      default: () => {
+        return { additional: {} };
+      }
+    },
+    dataTableColumns: {
+      type: Array,
+      default: () => {
+        return [];
+      }
+    }
+  },
+  emits: ["change"],
+  setup(__props, { emit: __emit }) {
+    const props = __props;
+    const emits = __emit;
+    const rowDblclick = () => {
+    };
+    const handleDelete = (index, row) => {
+      props.properties.additional.splice(index, 1);
+      statisticsColumnChange("", null);
+    };
+    const addRow = () => {
+      if (!props.properties.additional) {
+        props.properties.additional = [];
+      }
+      props.properties.additional.push({ $editing: true });
+    };
+    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") {
+              row.dateFormat = "";
+            }
+          }
+        });
+      }
+      emits("change", value);
+    };
+    return (_ctx, _cache) => {
+      const _component_el_table_column = ElTableColumn;
+      const _component_el_option = ElOption;
+      const _component_el_select = ElSelect;
+      const _component_el_button = ElButton;
+      const _component_el_tooltip = ElTooltip;
+      const _component_el_table = ElTable;
+      return openBlock(), createBlock(_component_el_table, {
+        data: __props.properties.additional,
+        style: { "width": "100%", "margin-bottom": "20px" },
+        "row-key": "name",
+        onRowDblclick: rowDblclick,
+        size: "small",
+        border: "",
+        "default-expand-all": ""
+      }, {
+        default: withCtx(() => [
+          createVNode(_component_el_table_column, {
+            type: "index",
+            width: "50",
+            label: "序号"
+          }),
+          createVNode(_component_el_table_column, {
+            prop: "name",
+            label: "字段名"
+          }, {
+            default: withCtx((scope) => [
+              !scope.row.$editing ? (openBlock(), createElementBlock("span", _hoisted_1, toDisplayString(scope.row.name), 1)) : (openBlock(), createBlock(_component_el_select, {
+                key: 1,
+                modelValue: scope.row.name,
+                "onUpdate:modelValue": ($event) => scope.row.name = $event,
+                placeholder: "",
+                onChange: ($event) => statisticsColumnChange($event, scope.row),
+                size: "small"
+              }, {
+                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
+                    }, null, 8, ["label", "value"]);
+                  }), 128))
+                ]),
+                _: 2
+              }, 1032, ["modelValue", "onUpdate:modelValue", "onChange"]))
+            ]),
+            _: 1
+          }),
+          createVNode(_component_el_table_column, {
+            prop: "name",
+            label: "日期格式化"
+          }, {
+            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",
+                modelValue: scope.row.dateFormat,
+                "onUpdate:modelValue": ($event) => scope.row.dateFormat = $event,
+                placeholder: "",
+                filterable: true,
+                "allow-create": true,
+                size: "small"
+              }, {
+                default: withCtx(() => [
+                  (openBlock(true), createElementBlock(Fragment, null, renderList(unref(dateFormats), (item) => {
+                    return openBlock(), createBlock(_component_el_option, {
+                      key: item.value,
+                      label: item.label,
+                      value: item.value
+                    }, null, 8, ["label", "value"]);
+                  }), 128))
+                ]),
+                _: 2
+              }, 1032, ["disabled", "modelValue", "onUpdate:modelValue"]))
+            ]),
+            _: 1
+          }),
+          createVNode(_component_el_table_column, { align: "right" }, {
+            header: withCtx(() => [
+              createVNode(_component_el_tooltip, {
+                effect: "dark",
+                content: "添加",
+                placement: "top"
+              }, {
+                default: withCtx(() => [
+                  createVNode(_component_el_button, {
+                    type: "primary",
+                    size: "small",
+                    icon: unref(Plus),
+                    circle: "",
+                    onClick: _cache[0] || (_cache[0] = ($event) => addRow())
+                  }, null, 8, ["icon"])
+                ]),
+                _: 1
+              })
+            ]),
+            default: withCtx((scope) => [
+              createElementVNode("span", null, [
+                createVNode(_component_el_tooltip, {
+                  effect: "dark",
+                  content: "删除",
+                  placement: "top"
+                }, {
+                  default: withCtx(() => [
+                    createVNode(_component_el_button, {
+                      type: "danger",
+                      size: "small",
+                      icon: unref(Minus),
+                      circle: "",
+                      onClick: ($event) => handleDelete(scope.$index, scope.row)
+                    }, null, 8, ["icon", "onClick"])
+                  ]),
+                  _: 2
+                }, 1024)
+              ])
+            ]),
+            _: 1
+          })
+        ]),
+        _: 1
+      }, 8, ["data"]);
+    };
+  }
+});
+export {
+  _sfc_main as default
+};

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

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

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

@@ -13,7 +13,6 @@ 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: {
@@ -50,12 +49,11 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const statisticsColumnChange = (value, row) => {
       if (row) {
         props.dataTableColumns.forEach((item) => {
-          if (item.dbColumnName === value) {
-            row.dataType = item.dataType;
-            if (row.dataType !== "DATE" && item.dataType !== "TIME") {
+          if (item.name === value) {
+            row.type = item.dataType;
+            if (row.type !== "DATE" && item.dataType !== "TIME") {
               row.dateFormat = "";
             }
-            console.log("new Type", item);
           }
         });
       }
@@ -82,8 +80,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           createVNode(_component_el_table_column, {
             type: "index",
             width: "50",
-            label: "序号",
-            align: "center"
+            label: "序号"
           }),
           createVNode(_component_el_table_column, {
             prop: "name",
@@ -96,15 +93,14 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                 modelValue: scope.row.name,
                 "onUpdate:modelValue": ($event) => scope.row.name = $event,
                 placeholder: "",
-                size: "small",
-                filterable: ""
+                size: "small"
               }, {
                 default: withCtx(() => [
                   (openBlock(true), createElementBlock(Fragment, null, renderList(__props.dataTableColumns, (item) => {
                     return openBlock(), createBlock(_component_el_option, {
-                      key: item.dbColumnName,
-                      label: item.alias + "(" + item.dbColumnName + ")",
-                      value: item.dbColumnName
+                      key: item.name,
+                      label: item.alias,
+                      value: item.name
                     }, null, 8, ["label", "value"]);
                   }), 128))
                 ]),
@@ -115,13 +111,12 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           }),
           createVNode(_component_el_table_column, {
             prop: "name",
-            label: "日期格式化",
-            width: "120"
+            label: "日期格式化"
           }, {
             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.dataType !== "DATE" && scope.row.dataType !== "TIME",
+                disabled: scope.row.type !== "DATE" && scope.row.type !== "TIME",
                 filterable: true,
                 "allow-create": true,
                 modelValue: scope.row.dateFormat,
@@ -144,27 +139,11 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             _: 1
           }),
           createVNode(_component_el_table_column, {
-            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",
+            prop: "name",
             label: "动态维度值"
           }, {
             default: withCtx((scope) => [
-              !scope.row.$editing ? (openBlock(), createElementBlock("span", _hoisted_4, toDisplayString(scope.row.dynamicValue), 1)) : (openBlock(), createBlock(_component_el_input, {
+              !scope.row.$editing ? (openBlock(), createElementBlock("span", _hoisted_3, toDisplayString(scope.row.dynamicValue), 1)) : (openBlock(), createBlock(_component_el_input, {
                 key: 1,
                 modelValue: scope.row.dynamicValue,
                 "onUpdate:modelValue": ($event) => scope.row.dynamicValue = $event,
@@ -173,10 +152,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             ]),
             _: 1
           }),
-          createVNode(_component_el_table_column, {
-            align: "center",
-            width: "80"
-          }, {
+          createVNode(_component_el_table_column, { align: "right" }, {
             header: withCtx(() => [
               createVNode(_component_el_tooltip, {
                 effect: "dark",