service-flow-designer 0.0.2-tmp3 → 1.0.1

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

@@ -29,10 +29,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       }
     }
   },
-  emits: ["change"],
-  setup(__props, { emit: __emit }) {
+  setup(__props) {
     const props = __props;
-    const emits = __emit;
     const rowDblclick = () => {
     };
     const handleDelete = (index, row) => {
@@ -54,6 +52,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       const _component_el_table = ElTable;
       return openBlock(), createBlock(_component_el_table, {
         data: __props.properties.statisticalFormulas,
+        style: { "width": "100%", "margin-bottom": "20px" },
         "row-key": "name",
         onRowDblclick: rowDblclick,
         size: "small",
@@ -74,18 +73,18 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
               !scope.row.$editing ? (openBlock(), createElementBlock("span", _hoisted_1, toDisplayString(scope.row.name), 1)) : (openBlock(), createBlock(_component_el_select, {
                 key: 1,
                 filterable: true,
+                "allow-create": true,
                 modelValue: scope.row.name,
                 "onUpdate:modelValue": ($event) => scope.row.name = $event,
                 placeholder: "",
-                size: "small",
-                onChange: _cache[0] || (_cache[0] = ($event) => emits("change"))
+                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))
                 ]),
@@ -106,8 +105,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                 modelValue: scope.row.formula,
                 "onUpdate:modelValue": ($event) => scope.row.formula = $event,
                 placeholder: "",
-                size: "small",
-                onChange: _cache[1] || (_cache[1] = ($event) => emits("change"))
+                size: "small"
               }, {
                 default: withCtx(() => [
                   (openBlock(true), createElementBlock(Fragment, null, renderList(unref(formulas), (item) => {
@@ -124,26 +122,21 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             _: 1
           }),
           createVNode(_component_el_table_column, {
-            prop: "newName",
-            label: "新字段名",
-            width: "160"
+            prop: "alias",
+            label: "别名"
           }, {
             default: withCtx((scope) => [
-              !scope.row.$editing ? (openBlock(), createElementBlock("span", _hoisted_3, toDisplayString(scope.row.newName), 1)) : (openBlock(), createBlock(_component_el_input, {
+              !scope.row.$editing ? (openBlock(), createElementBlock("span", _hoisted_3, toDisplayString(scope.row.alias), 1)) : (openBlock(), createBlock(_component_el_input, {
                 key: 1,
-                modelValue: scope.row.newName,
-                "onUpdate:modelValue": ($event) => scope.row.newName = $event,
+                modelValue: scope.row.alias,
+                "onUpdate:modelValue": ($event) => scope.row.alias = $event,
                 placeholder: "",
-                size: "small",
-                onChange: _cache[2] || (_cache[2] = ($event) => emits("change"))
+                size: "small"
               }, null, 8, ["modelValue", "onUpdate:modelValue"]))
             ]),
             _: 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",
@@ -156,7 +149,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                     size: "small",
                     icon: unref(Plus),
                     circle: "",
-                    onClick: _cache[3] || (_cache[3] = ($event) => addRow())
+                    onClick: _cache[0] || (_cache[0] = ($event) => addRow())
                   }, null, 8, ["icon"])
                 ]),
                 _: 1

package/dist/es/designer/service-components/database/dynamic-sql/index.css

@@ -23,7 +23,7 @@
   text-overflow: ellipsis; /* 使用省略号表示被截断的文本 */
 }
 .nodeContent[data-v-5911272d] {
-  /* width: 100%; */
+  width: 112px;
   height: 15px;
   font-weight: 400;
   font-size: 14px;
@@ -32,13 +32,11 @@
   text-align: left;
   font-style: normal;
   text-transform: none;
-  padding: 0px 0px;
+  padding: 0px 24px;
   white-space: nowrap; /* 确保文本在一行内显示 */
   overflow: hidden; /* 隐藏超出div宽度的文本 */
   text-overflow: ellipsis; /* 使用省略号表示被截断的文本 */
 }
-.nodeContent-desc[data-v-5911272d]{
-}
 .el-divider--horizontal[data-v-5911272d] {
   margin: 12px 0;
 }

package/dist/es/designer/service-components/database/regular-query/index.css

@@ -23,7 +23,7 @@
   text-overflow: ellipsis; /* 使用省略号表示被截断的文本 */
 }
 .nodeContent[data-v-4c6dfa4a] {
-  /* width: 100%; */
+  width: 112px;
   height: 15px;
   font-weight: 400;
   font-size: 14px;
@@ -32,13 +32,11 @@
   text-align: left;
   font-style: normal;
   text-transform: none;
-  padding: 0px 0px;
+  padding: 0px 24px;
   white-space: nowrap; /* 确保文本在一行内显示 */
   overflow: hidden; /* 隐藏超出div宽度的文本 */
   text-overflow: ellipsis; /* 使用省略号表示被截断的文本 */
 }
-.nodeContent-desc[data-v-4c6dfa4a]{
-}
 .el-divider--horizontal[data-v-4c6dfa4a] {
   margin: 12px 0;
 }

package/dist/es/designer/service-components/service/custom-bean/index.css

@@ -23,7 +23,7 @@
   text-overflow: ellipsis; /* 使用省略号表示被截断的文本 */
 }
 .nodeContent[data-v-b01d3a50] {
-  /* width: 100%; */
+  width: 112px;
   height: 15px;
   font-weight: 400;
   font-size: 14px;
@@ -32,13 +32,11 @@
   text-align: left;
   font-style: normal;
   text-transform: none;
-  padding: 0px 0px;
+  padding: 0px 24px;
   white-space: nowrap; /* 确保文本在一行内显示 */
   overflow: hidden; /* 隐藏超出div宽度的文本 */
   text-overflow: ellipsis; /* 使用省略号表示被截断的文本 */
 }
-.nodeContent-desc[data-v-b01d3a50]{
-}
 .el-divider--horizontal[data-v-b01d3a50] {
   margin: 12px 0;
 }

package/dist/es/designer/service-components/service/http-service/index.css

@@ -23,7 +23,7 @@
   text-overflow: ellipsis; /* 使用省略号表示被截断的文本 */
 }
 .nodeContent[data-v-df366d04] {
-  /* width: 100%; */
+  width: 112px;
   height: 15px;
   font-weight: 400;
   font-size: 14px;
@@ -32,13 +32,11 @@
   text-align: left;
   font-style: normal;
   text-transform: none;
-  padding: 0px 0px;
+  padding: 0px 24px;
   white-space: nowrap; /* 确保文本在一行内显示 */
   overflow: hidden; /* 隐藏超出div宽度的文本 */
   text-overflow: ellipsis; /* 使用省略号表示被截断的文本 */
 }
-.nodeContent-desc[data-v-df366d04]{
-}
 .el-divider--horizontal[data-v-df366d04] {
   margin: 12px 0;
 }

package/dist/es/designer/service-components/util/common-options.js

@@ -75,18 +75,16 @@ function getLabel(value, options) {
   }
 }
 const dateFormats = [
-  { value: "yyyy", label: "年(yyyy)" },
-  { value: "yyyyMM", label: "年月(yyyyMM)" },
-  { value: "yyyy-MM", label: "年-月(yyyy-MM)" },
-  { value: "yyyyMMdd", label: "年月日(yyyyMMdd)" },
-  { value: "yyyy-MM-dd", label: "年-月-日(yyyy-MM-dd)" }
+  { value: "year", label: "年" },
+  { value: "month", label: "月" },
+  { value: "day", label: "日" }
 ];
 const formulas = [
-  { value: "count", label: "总数(count)" },
-  { value: "sum", label: "求和(sum)" },
-  { value: "max", label: "最大(max)" },
-  { value: "min", label: "最小(min)" },
-  { value: "avg", label: "均值(avg)" }
+  { value: "count", label: "总数" },
+  { value: "sum", label: "求和" },
+  { value: "max", label: "最大" },
+  { value: "min", label: "最小" },
+  { value: "avg", label: "均值" }
 ];
 const operators = [
   { value: "gt", label: "大于" },

package/dist/es/designer/service-flow-view/service-node-config.css

@@ -5,6 +5,6 @@
 /**
 解决右侧弹出属性配置遮罩层打开后页面其他地方无法点击问题
  */
-[data-v-c51cce99] .el-overlay {
+[data-v-aa025314] .el-overlay {
   position: static;
 }

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

@@ -1,7 +1,7 @@
 import _sfc_main from "./service-node-config.vue2.js";
 /* empty css                         */
 import _export_sfc from "../../_virtual/_plugin-vue_export-helper.js";
-const serviceNodeConfig = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-c51cce99"]]);
+const serviceNodeConfig = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-aa025314"]]);
 export {
   serviceNodeConfig as default
 };

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

@@ -73,7 +73,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     }
     function updateNodeValue() {
       console.log(" 关闭配置窗口时时自动赋值", props.currentNode);
-      if (configComponentRef.value && configComponentRef.value.hasOwnProperty("onClose") && typeof configComponentRef.value.onClose === "function") {
+      if (configComponentRef.value.hasOwnProperty("onClose") && typeof configComponentRef.value.onClose === "function") {
         configComponentRef.value.onClose();
       }
       if (!["start", "end"].includes(props.currentNode.type)) {

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

@@ -1,8 +1,7 @@
-import { ElInput, ElFormItem, ElDivider, ElTableColumn, ElOption, ElSelect, ElButton, ElDropdownItem, ElDropdownMenu, ElDropdown, ElTable, ElAlert, ElText, ElCheckbox, ElForm } from "element-plus/es";
+import { ElInput, ElFormItem, ElDivider, ElTableColumn, ElOption, ElSelect, ElButton, ElDropdownItem, ElDropdownMenu, ElDropdown, ElTable, ElAlert, ElCheckbox, 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/checkbox/style/css";
-import "element-plus/es/components/text/style/css";
 import "element-plus/es/components/alert/style/css";
 import "element-plus/es/components/table/style/css";
 import "element-plus/es/components/dropdown/style/css";
@@ -41,17 +40,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       props.service.log = {};
     }
     const typeOptions = ["string", "int", "boolean", "array", "object", "number"];
-    let selEditRow = null;
     const rowDblclick = (row) => {
       row.$editing = true;
-      updateEditRow(row);
     };
-    function updateEditRow(newRow) {
-      if (selEditRow != null && selEditRow.code != newRow.code) {
-        selEditRow.$editing = false;
-      }
-      selEditRow = newRow;
-    }
     const typeChange = (value, index, row) => {
       if (value === "array") {
         row.items = [];
@@ -76,9 +67,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       }
     };
     const addRootRow = () => {
-      const newRow = getNewItem();
-      props.service.variables.push(newRow);
-      updateEditRow(newRow);
+      props.service.variables.push(getNewItem());
     };
     const addChildrenItem = (index, row) => {
       if (!row.items) {
@@ -87,7 +76,6 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       const item = getNewItem();
       item.level = row.level + 1;
       row.items.push(item);
-      updateEditRow(item);
     };
     const addAdjacentNode = (index, row) => {
       clidNodeAddAdjacentNode(props.service.variables, row);
@@ -98,7 +86,6 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           const item = getNewItem();
           item.level = row.level;
           tableData.splice(index + 1, 0, item);
-          updateEditRow(item);
         } else {
           if (row.items && row.items.length > 0) {
             clidNodeAddAdjacentNode(row.items, clickRow);
@@ -110,14 +97,15 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       deleteClidNode(props.service.variables, row);
     };
     const deleteClidNode = (tableData, clickRow) => {
-      console.log(clickRow, tableData);
       for (let index = 0; index < tableData.length; index++) {
         const row = tableData[index];
-        if (row.code === clickRow.code) {
-          tableData.splice(index, 1);
-          return;
-        } else if (row.items && row.items.length > 0) {
+        if (row.items && row.items.length > 0) {
           deleteClidNode(row.items, clickRow);
+        } else {
+          if (row.code === clickRow.code) {
+            tableData.splice(index, 1);
+            return;
+          }
         }
       }
     };
@@ -147,14 +135,12 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       const _component_el_dropdown = ElDropdown;
       const _component_el_table = ElTable;
       const _component_el_alert = ElAlert;
-      const _component_el_text = ElText;
       const _component_el_checkbox = ElCheckbox;
       const _component_el_form = ElForm;
       return openBlock(), createElementBlock("div", null, [
         createVNode(_component_el_form, {
           "label-width": "auto",
-          "label-position": "left",
-          size: "small"
+          "label-position": "left"
         }, {
           default: withCtx(() => [
             createVNode(_component_el_form_item, { label: "服务名称：" }, {
@@ -173,7 +159,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
               style: { "width": "100%", "margin-top": "20px", "margin-bottom": "20px" },
               "row-key": "code",
               size: "small",
-              onRowClick: rowDblclick,
+              onRowDblclick: rowDblclick,
               border: "",
               "tree-props": { children: "items" },
               "default-expand-all": ""
@@ -182,12 +168,11 @@ 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",
-                  width: "170",
+                  width: "80",
                   label: "变量名"
                 }, {
                   default: withCtx((scope) => [
@@ -197,15 +182,14 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                       disabled: scope.row.isArrayElement,
                       modelValue: scope.row.name,
                       "onUpdate:modelValue": ($event) => scope.row.name = $event,
-                      placeholder: "",
-                      style: { "margin-right": "10px" }
+                      placeholder: ""
                     }, null, 8, ["disabled", "modelValue", "onUpdate:modelValue"]))
                   ]),
                   _: 1
                 }),
                 createVNode(_component_el_table_column, {
                   prop: "alias",
-                  width: "110",
+                  width: "80",
                   label: "别名"
                 }, {
                   default: withCtx((scope) => [
@@ -223,7 +207,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                 }),
                 createVNode(_component_el_table_column, {
                   prop: "type",
-                  width: "90",
+                  width: "100",
                   label: "类型"
                 }, {
                   default: withCtx((scope) => [
@@ -251,8 +235,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                 }),
                 createVNode(_component_el_table_column, {
                   prop: "defaultValue",
-                  label: "默认值",
-                  width: "160"
+                  label: "默认值"
                 }, {
                   default: withCtx((scope) => [
                     !scope.row.isArrayElement ? (openBlock(), createBlock(unref(ValueSetInput), {
@@ -267,8 +250,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                   _: 1
                 }),
                 createVNode(_component_el_table_column, {
-                  align: "center",
-                  width: 90
+                  align: "right",
+                  width: 150
                 }, {
                   header: withCtx(() => [
                     createVNode(_component_el_button, {
@@ -352,15 +335,6 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
               style: { "margin-bottom": "10px" }
             }),
             createVNode(_sfc_main$1, { service: __props.service }, null, 8, ["service"]),
-            createVNode(_component_el_text, {
-              style: { "margin-top": "10px", "margin-bottom": "10px", "display": "block" },
-              type: "success"
-            }, {
-              default: withCtx(() => [
-                createTextVNode("说明：可不设置变量名，未设置时以值来源的字段名为变量名")
-              ]),
-              _: 1
-            }),
             createVNode(_component_el_alert, {
               title: "执行异常消息格式化",
               type: "info",

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

@@ -9,7 +9,7 @@ import "element-plus/es/components/select/style/css";
 import "element-plus/es/components/option/style/css";
 import "element-plus/es/components/input/style/css";
 import "element-plus/es/components/table-column/style/css";
-import { defineComponent, openBlock, createBlock, withCtx, createVNode, createElementBlock, toDisplayString, Fragment, createCommentVNode, renderList, unref, createTextVNode } from "vue";
+import { defineComponent, openBlock, createBlock, withCtx, createVNode, createElementBlock, toDisplayString, unref, Fragment, renderList, createTextVNode, createCommentVNode } from "vue";
 import ValueSetInput from "../common/components/value-set-input/value-set-input.vue.js";
 import { v4 } from "uuid";
 const _hoisted_1 = { key: 0 };
@@ -31,30 +31,43 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       props.service.returnValues = [];
     }
     const typeOptions = ["any", "array", "object"];
-    let selEditRow = null;
     const rowDblclick = (row) => {
       row.$editing = true;
-      updateEditRow(row);
-    };
-    function updateEditRow(newRow) {
-      if (selEditRow != null && selEditRow.code != newRow.code) {
-        selEditRow.$editing = false;
-      }
-      selEditRow = newRow;
-    }
-    const addRootRow = () => {
-      const newRow = getNewItem();
-      props.service.returnValues.push(newRow);
-      updateEditRow(newRow);
     };
     const addChildrenItem = (index, row) => {
       if (!row.items) {
         row.items = [];
       }
+      row.name = null;
       const item = getNewItem();
       item.level = row.level + 1;
       row.items.push(item);
-      updateEditRow(item);
+    };
+    const addReturnValueRow = () => {
+      if (!props.service.returnValues) {
+        props.service.returnValues = [];
+      }
+      props.service.returnValues.push({
+        code: v4(),
+        alias: "",
+        name: "",
+        type: "any",
+        $editing: true
+      });
+    };
+    const typeChange = (value, index, row) => {
+      if (value === "array")
+        ;
+      else if (row.items && row.items.length > 0) {
+        delete row.isArrayElement;
+        if (value === "object") {
+          row.items = [];
+        } else {
+          if (row.items) {
+            delete row.items;
+          }
+        }
+      }
     };
     const addAdjacentNode = (index, row) => {
       clidNodeAddAdjacentNode(props.service.returnValues, row);
@@ -65,7 +78,6 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           const item = getNewItem();
           item.level = row.level;
           tableData.splice(index + 1, 0, item);
-          updateEditRow(item);
         } else {
           if (row.items && row.items.length > 0) {
             clidNodeAddAdjacentNode(row.items, clickRow);
@@ -77,42 +89,20 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       deleteClidNode(props.service.returnValues, row);
     };
     const deleteClidNode = (tableData, clickRow) => {
-      console.log(clickRow, tableData);
       for (let index = 0; index < tableData.length; index++) {
         const row = tableData[index];
+        if (row.items && row.items.length > 0) {
+          deleteClidNode(row.items, clickRow);
+        }
         if (row.code === clickRow.code) {
           tableData.splice(index, 1);
           return;
-        } else if (row.items && row.items.length > 0) {
-          deleteClidNode(row.items, clickRow);
-        }
-      }
-    };
-    const typeChange = (value, index, row) => {
-      if (value === "array") {
-        row.items = [];
-        row.items.push({
-          level: row.level + 1,
-          code: v4(),
-          name: "items",
-          isArrayElement: true,
-          alias: "",
-          type: "object",
-          value: "",
-          items: []
-        });
-      } else if (row.items && row.items.length > 0) {
-        if (value === "object") {
-          row.items = [];
-        } else {
-          if (row.items) {
-            delete row.items;
-          }
         }
       }
     };
     const getNewItem = () => {
       return {
+        level: 0,
         code: v4(),
         name: "",
         type: "any",
@@ -134,10 +124,10 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       const _component_el_table = ElTable;
       return openBlock(), createBlock(_component_el_table, {
         data: __props.service.returnValues,
-        style: { "width": "100%", "margin-top": "20px", "margin-bottom": "10px" },
+        style: { "width": "100%", "margin-bottom": "10px" },
         "row-key": "code",
         size: "small",
-        onRowClick: rowDblclick,
+        onRowDblclick: rowDblclick,
         border: "",
         "tree-props": { children: "items" },
         "default-expand-all": ""
@@ -145,49 +135,44 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         default: withCtx(() => [
           createVNode(_component_el_table_column, {
             type: "index",
+            align: "center",
             width: "50",
-            label: "序号",
-            align: "center"
+            label: "序号"
           }),
           createVNode(_component_el_table_column, {
-            prop: "name",
-            width: "170",
-            label: "变量名"
+            prop: "alias",
+            align: "center",
+            label: "自定义名称"
           }, {
             default: withCtx((scope) => [
-              !scope.row.$editing ? (openBlock(), createElementBlock("span", _hoisted_1, toDisplayString(scope.row.name), 1)) : (openBlock(), createBlock(_component_el_input, {
+              !scope.row.$editing ? (openBlock(), createElementBlock("span", _hoisted_1, toDisplayString(scope.row.alias), 1)) : (openBlock(), createBlock(_component_el_input, {
                 key: 1,
                 size: "small",
-                disabled: scope.row.isArrayElement,
-                modelValue: scope.row.name,
-                "onUpdate:modelValue": ($event) => scope.row.name = $event,
-                placeholder: "",
-                style: { "margin-right": "10px" }
-              }, null, 8, ["disabled", "modelValue", "onUpdate:modelValue"]))
+                modelValue: scope.row.alias,
+                "onUpdate:modelValue": ($event) => scope.row.alias = $event,
+                placeholder: ""
+              }, null, 8, ["modelValue", "onUpdate:modelValue"]))
             ]),
             _: 1
           }),
           createVNode(_component_el_table_column, {
-            prop: "alias",
-            width: "110",
-            label: "别名"
+            prop: "name",
+            align: "center",
+            label: "值来源"
           }, {
             default: withCtx((scope) => [
-              !scope.row.$editing ? (openBlock(), createElementBlock("span", _hoisted_2, toDisplayString(scope.row.alias), 1)) : (openBlock(), createElementBlock(Fragment, { key: 1 }, [
-                !scope.row.isArrayElement ? (openBlock(), createBlock(_component_el_input, {
-                  key: 0,
-                  size: "small",
-                  modelValue: scope.row.alias,
-                  "onUpdate:modelValue": ($event) => scope.row.alias = $event,
-                  placeholder: ""
-                }, null, 8, ["modelValue", "onUpdate:modelValue"])) : createCommentVNode("", true)
-              ], 64))
+              !scope.row.$editing || scope.row.items && scope.row.items.length > 0 ? (openBlock(), createElementBlock("span", _hoisted_2, toDisplayString(scope.row.name), 1)) : (openBlock(), createBlock(unref(ValueSetInput), {
+                key: 1,
+                size: "small",
+                modelValue: scope.row.name,
+                "onUpdate:modelValue": ($event) => scope.row.name = $event
+              }, null, 8, ["modelValue", "onUpdate:modelValue"]))
             ]),
             _: 1
           }),
           createVNode(_component_el_table_column, {
             prop: "type",
-            width: "90",
+            align: "center",
             label: "类型"
           }, {
             default: withCtx((scope) => [
@@ -214,31 +199,14 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             _: 1
           }),
           createVNode(_component_el_table_column, {
-            prop: "value",
-            label: "值来源",
-            width: "160"
-          }, {
-            default: withCtx((scope) => [
-              !scope.row.isArrayElement ? (openBlock(), createBlock(unref(ValueSetInput), {
-                key: 0,
-                showLabel: !scope.row.$editing,
-                size: "small",
-                paramTypes: ["request", "service", "data", "system", "context", "fixed"],
-                modelValue: scope.row.value,
-                "onUpdate:modelValue": ($event) => scope.row.value = $event
-              }, null, 8, ["showLabel", "modelValue", "onUpdate:modelValue"])) : createCommentVNode("", true)
-            ]),
-            _: 1
-          }),
-          createVNode(_component_el_table_column, {
-            align: "center",
-            width: 90
+            align: "right",
+            width: 150
           }, {
             header: withCtx(() => [
               createVNode(_component_el_button, {
                 type: "primary",
                 size: "small",
-                onClick: addRootRow,
+                onClick: addReturnValueRow,
                 link: ""
               }, {
                 default: withCtx(() => [