super-page-designer 2.1.49 → 2.1.55

package/dist/es/components/design/views/assemblys/chart/statistical-table/statisticalTable-attr-base.vue.js

@@ -1,25 +1,23 @@
-import { defineComponent, ref, watch, resolveComponent, openBlock, createBlock, withCtx, createVNode, createElementVNode, createElementBlock, Fragment, renderList, unref, createTextVNode, createCommentVNode, toDisplayString } from "vue";
+import { defineComponent, ref, resolveComponent, openBlock, createBlock, withCtx, createVNode, createElementVNode, createElementBlock, Fragment, renderList, unref, createTextVNode, createCommentVNode, toDisplayString } from "vue";
 import { getFormComponentOptions, getStatisticsTableColumn } from "../../../../utils/assemblys-config.js";
+import DataOrigin from "./component/data-origin.vue.js";
+import _sfc_main$4 from "./component/style-table.vue.js";
 import "@element-plus/icons";
+import { InfoFilled } from "@element-plus/icons-vue";
 import "agilebuilder-ui/src/utils/request";
-import "@vueuse/core";
-import "@element-plus/icons-vue";
 import { getUuidv4 } from "../../../../utils/common-util.js";
 import "../../../../../../stores/page-store.js";
 import "../../../../../../stores/table-store.js";
-import "../../../../../../stores/statistics-table-store.js";
-import "../../common/common-variable-bind.vue3.js";
-import "element-plus";
+import { statisticsTable } from "../../../../../../stores/statistics-table-store.js";
+import "../../common/common-variable-bind.vue2.js";
+import "@vueuse/core";
 import { getCustomFuncs } from "../../../../utils/page-event-util.js";
-import "./component/data-origin.vue.js";
-import _sfc_main$2 from "../common/common-attr-data.vue.js";
-import _sfc_main$7 from "../../common/common-attr-size.vue.js";
-import _sfc_main$3 from "../../form/common/data-linkage.vue.js";
+import _sfc_main$5 from "./component/table-pageination.vue.js";
+import _sfc_main$6 from "../../common/common-attr-size.vue.js";
+import _sfc_main$2 from "../../form/common/data-linkage.vue.js";
 import { addColumnToGroupHeaders, getColumnsWithGroupHeader } from "../../../../utils/data-table-util.js";
 import _sfc_main$1 from "../../common/common-function-code.vue.js";
-import _sfc_main$4 from "../../data/component/formatting-icon-label.vue.js";
-import _sfc_main$5 from "./component/style-table.vue.js";
-import _sfc_main$6 from "./component/link-table.vue.js";
+import _sfc_main$3 from "../../data/component/formatting-icon-label.vue.js";
 import eventBus from "../../../../utils/eventBus.js";
 const _hoisted_1 = { style: { "padding": "8px 0px 0px 0px" } };
 const _hoisted_2 = { style: { "padding": "8px 0px 0px 0px" } };
@@ -40,7 +38,19 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
   },
   setup(__props) {
     const props = __props;
-    const openCollapseItems = ref(["base", "appearance", "dataOrigin", "linkage", "attrSize", "columnModel", "dataSet"]);
+    const openCollapseItems = ref([
+      "base",
+      "appearance",
+      "dataOrigin",
+      "linkage",
+      "attrSize",
+      "columnModel",
+      "dataSet",
+      "pageination"
+    ]);
+    const statisticsTableStore = statisticsTable();
+    const selectedServiceResultFields = ref([]);
+    const sourceFields = ref([]);
     if (!props.configure.items) {
       props.configure.items = [
         {
@@ -50,12 +60,18 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           format: {}
         }
       ];
+    } else {
+      statisticsTableStore.addFieldList(props.configure.items);
     }
     function columnStyleChange(data, index) {
       props.configure.items[index].style = data;
     }
-    function linkChange(data, index) {
-      props.configure.items[index].linkPage = data;
+    function addRow() {
+      const fieldInfo = {
+        alias: "",
+        displayOrder: props.configure.items.length + 1
+      };
+      props.configure.items.push(getStatisticsTableColumn(fieldInfo));
     }
     function addData(rowItem, index) {
       const fieldInfo = {
@@ -71,10 +87,6 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       }
     }
     function deleteData(rowItem, index) {
-      if (props.configure.items.length == 1) {
-        rowItem.format = {};
-        return;
-      }
       props.configure.items.splice(index, 1);
     }
     const expandedRowKeys = ref([]);
@@ -86,19 +98,32 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         expandedRowKeys.value.push(row.uuid);
       }
     }
-    const sourceFields = ref([]);
-    let hisServiceFields = null;
-    let hisServiceDataField = null;
-    function updateBindFields() {
-      if (props.configure.serviceFields == hisServiceFields && props.configure.serviceDataField == hisServiceDataField) {
-        return;
+    function updateBindVariableFields(variableField) {
+      if (!variableField) {
+        sourceFields.value = [];
+      }
+      if (variableField.startsWith("${page.")) {
+        const varName = variableField.substring(7, variableField.length - 1);
+        const pageField = props.pageDesign.variables.find((item) => item.name === varName);
+        if (pageField && pageField.type === "array" && pageField.items && pageField.items.length > 0) {
+          const copyItems = JSON.parse(JSON.stringify(pageField.items[0].items));
+          sourceFields.value = copyItems.map((item) => {
+            return {
+              label: item.alias,
+              value: item.name,
+              type: item.type
+            };
+          });
+        }
       }
-      hisServiceFields = props.configure.serviceFields;
-      hisServiceDataField = props.configure.serviceDataField;
+    }
+    function updateBindFields(serviceFields) {
       const newFields = [];
-      if (hisServiceFields) {
-        const prevField = hisServiceDataField ? hisServiceDataField : "";
-        for (let f of hisServiceFields) {
+      selectedServiceResultFields.value = serviceFields;
+      if (serviceFields) {
+        const serviceDataCollection = props.configure.props.dataOrigin.service.serviceDataField;
+        const prevField = serviceDataCollection ? serviceDataCollection : "";
+        for (let f of serviceFields) {
           if (!prevField || f.value.startsWith(prevField + ".")) {
             const tempField = {};
             Object.assign(tempField, f);
@@ -117,15 +142,67 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     }
     function columnItemChange(value, row) {
       row.props.base.prop = value;
-      row.props.base.name = sourceFields.value.find((item) => item.value === value).label;
+      const soureField = sourceFields.value.find((item) => item.value === value);
+      if (soureField) {
+        row.props.base.name = sourceFields.value.find((item) => item.value === value).label;
+        row.props.base.dataType = sourceFields.value.find((item) => item.value === value).type;
+      } else {
+        row.props.base.name = value;
+        row.props.base.dataType = "string";
+      }
+    }
+    function summaryChange(value, row) {
+      if (!props.configure.props.summaries) {
+        props.configure.props.summaries = { titleColumn: [], dataColumn: [] };
+      }
+      if (props.configure.props.summaries) {
+        if (props.configure.props.summaries.titleColumn) {
+          props.configure.props.summaries.titleColumn = props.configure.props.summaries.titleColumn.filter(
+            (item) => item.prop !== row.props.base.prop
+          );
+        }
+        if (props.configure.props.summaries.dataColumn) {
+          props.configure.props.summaries.dataColumn = props.configure.props.summaries.dataColumn.filter(
+            (item) => item.prop !== row.props.base.prop
+          );
+        }
+      }
+      if (value === "titleColumn") {
+        props.configure.props.summaries.titleColumn.push({ prop: row.props.base.prop, label: row.props.base.summaryTitle });
+      } else if (value === "dataColumn") {
+        props.configure.props.summaries.dataColumn.push({
+          prop: row.props.base.prop,
+          summaryMode: row.props.base.summaryMode,
+          customRollup: row.props.base.customRollup
+        });
+      }
+    }
+    function summaryTitleChange(value, row) {
+      props.configure.props.summaries.titleColumn.forEach((item) => {
+        if (item.prop === row.props.base.prop) {
+          item.label = value;
+        }
+      });
+    }
+    function summaryModeChange(value, row) {
+      props.configure.props.summaries.dataColumn.forEach((item) => {
+        if (item.prop === row.props.base.prop) {
+          item.summaryMode = value;
+          if (value === "custom") {
+            item.customRollup = row.props.base.customRollup;
+          } else {
+            delete item.customRollup;
+          }
+        }
+      });
+    }
+    function formatChange(value, index) {
+      if (value) {
+        props.configure.items[index].props.format = {
+          type: value
+        };
+      }
     }
-    watch(
-      props.configure,
-      () => {
-        updateBindFields();
-      },
-      { immediate: true }
-    );
     return (_ctx, _cache) => {
       const _component_el_option = resolveComponent("el-option");
       const _component_el_select = resolveComponent("el-select");
@@ -138,9 +215,12 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       const _component_el_input_number = resolveComponent("el-input-number");
       const _component_el_color_picker = resolveComponent("el-color-picker");
       const _component_el_divider = resolveComponent("el-divider");
+      const _component_el_col = resolveComponent("el-col");
+      const _component_el_icon = resolveComponent("el-icon");
+      const _component_el_tooltip = resolveComponent("el-tooltip");
+      const _component_el_checkbox = resolveComponent("el-checkbox");
       const _component_el_table_column = resolveComponent("el-table-column");
       const _component_Plus = resolveComponent("Plus");
-      const _component_el_icon = resolveComponent("el-icon");
       const _component_Delete = resolveComponent("Delete");
       const _component_el_table = resolveComponent("el-table");
       const _component_el_collapse = resolveComponent("el-collapse");
@@ -152,7 +232,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         default: withCtx(() => [
           createVNode(_component_el_collapse, {
             modelValue: openCollapseItems.value,
-            "onUpdate:modelValue": _cache[8] || (_cache[8] = ($event) => openCollapseItems.value = $event),
+            "onUpdate:modelValue": _cache[10] || (_cache[10] = ($event) => openCollapseItems.value = $event),
             style: { "margin-top": "6px" }
           }, {
             default: withCtx(() => [
@@ -273,8 +353,16 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                 ]),
                 _: 1
               }),
-              createVNode(_sfc_main$2, { configure: __props.configure }, null, 8, ["configure"]),
-              createVNode(_sfc_main$3, {
+              createVNode(DataOrigin, {
+                title: "数据",
+                pageDesign: __props.pageDesign,
+                sourceFields: sourceFields.value,
+                configure: __props.configure,
+                remote: false,
+                onBindVariableChange: updateBindVariableFields,
+                onServiceFieldChange: updateBindFields
+              }, null, 8, ["pageDesign", "sourceFields", "configure"]),
+              createVNode(_sfc_main$2, {
                 configureProps: __props.configure.props
               }, null, 8, ["configureProps"]),
               createVNode(_component_el_collapse_item, {
@@ -298,10 +386,12 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                         }, {
                           default: withCtx((props2) => [
                             createVNode(_component_el_form_item, {
-                              label: "数据公式",
                               class: "amb-design-attr-item",
                               "label-position": "top"
                             }, {
+                              label: withCtx(() => [
+                                createTextVNode(" 数据公式 ")
+                              ]),
                               default: withCtx(() => [
                                 createVNode(_component_el_input, {
                                   modelValue: props2.row.formula,
@@ -319,6 +409,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                             }, {
                               default: withCtx(() => [
                                 createVNode(_component_el_select, {
+                                  onChange: ($event) => formatChange($event, props2.$index),
                                   modelValue: props2.row.props.format.type,
                                   "onUpdate:modelValue": ($event) => props2.row.props.format.type = $event,
                                   clearable: "",
@@ -355,7 +446,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                                     })
                                   ]),
                                   _: 2
-                                }, 1032, ["modelValue", "onUpdate:modelValue"])
+                                }, 1032, ["onChange", "modelValue", "onUpdate:modelValue"])
                               ]),
                               _: 2
                             }, 1024),
@@ -467,9 +558,10 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                               ]),
                               _: 2
                             }, 1024)) : createCommentVNode("", true),
-                            props2.row.props.format && props2.row.props.format.type === "icon" ? (openBlock(), createBlock(_sfc_main$4, {
+                            props2.row.props.format && props2.row.props.format.type === "icon" ? (openBlock(), createBlock(_sfc_main$3, {
                               key: 7,
-                              setting: props2.row.props.format
+                              setting: props2.row.props.format,
+                              "show-event": false
                             }, null, 8, ["setting"])) : createCommentVNode("", true),
                             props2.row.props.format && props2.row.props.format.type === "custom" ? (openBlock(), createBlock(_component_el_form_item, {
                               key: 8,
@@ -477,236 +569,227 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                               class: "amb-design-attr-item"
                             }, {
                               default: withCtx(() => [
-                                createVNode(_component_el_input, {
-                                  modelValue: props2.row.props.format.customControl,
-                                  "onUpdate:modelValue": ($event) => props2.row.props.format.customControl = $event
-                                }, null, 8, ["modelValue", "onUpdate:modelValue"])
-                              ]),
-                              _: 2
-                            }, 1024)) : createCommentVNode("", true),
-                            props2.row.props.format && props2.row.props.format.type === "progress" ? (openBlock(), createBlock(_component_el_form_item, {
-                              key: 9,
-                              label: "最大值",
-                              class: "amb-design-attr-item"
-                            }, {
-                              default: withCtx(() => [
-                                createVNode(_component_el_input_number, {
-                                  modelValue: props2.row.props.format.max,
-                                  "onUpdate:modelValue": ($event) => props2.row.props.format.max = $event
-                                }, null, 8, ["modelValue", "onUpdate:modelValue"])
-                              ]),
-                              _: 2
-                            }, 1024)) : createCommentVNode("", true),
-                            props2.row.props.format && props2.row.props.format.type === "progress" ? (openBlock(), createBlock(_component_el_form_item, {
-                              key: 10,
-                              label: "进度条类型",
-                              class: "amb-design-attr-item"
-                            }, {
-                              default: withCtx(() => [
-                                createVNode(_component_el_radio_group, {
-                                  modelValue: props2.row.props.format.progressType,
-                                  "onUpdate:modelValue": ($event) => props2.row.props.format.progressType = $event,
-                                  class: "ml-4"
-                                }, {
-                                  default: withCtx(() => [
-                                    createVNode(_component_el_radio, { value: "line" }, {
-                                      default: withCtx(() => [
-                                        createTextVNode("line")
-                                      ]),
-                                      _: 1
-                                    }),
-                                    createVNode(_component_el_radio, { value: "circle" }, {
-                                      default: withCtx(() => [
-                                        createTextVNode("circle")
-                                      ]),
-                                      _: 1
-                                    }),
-                                    createVNode(_component_el_radio, { value: "dashboard" }, {
-                                      default: withCtx(() => [
-                                        createTextVNode("dashboard")
-                                      ]),
-                                      _: 1
-                                    })
-                                  ]),
-                                  _: 2
-                                }, 1032, ["modelValue", "onUpdate:modelValue"])
-                              ]),
-                              _: 2
-                            }, 1024)) : createCommentVNode("", true),
-                            props2.row.props.format && props2.row.props.format.type === "progress" ? (openBlock(), createBlock(_component_el_form_item, {
-                              key: 11,
-                              label: "显示文字",
-                              class: "amb-design-attr-item"
-                            }, {
-                              default: withCtx(() => [
-                                createVNode(_component_el_radio_group, {
-                                  modelValue: props2.row.props.format.showText,
-                                  "onUpdate:modelValue": ($event) => props2.row.props.format.showText = $event,
-                                  class: "ml-4"
-                                }, {
-                                  default: withCtx(() => [
-                                    createVNode(_component_el_radio, { value: true }, {
-                                      default: withCtx(() => [
-                                        createTextVNode("是")
-                                      ]),
-                                      _: 1
-                                    }),
-                                    createVNode(_component_el_radio, { value: false }, {
-                                      default: withCtx(() => [
-                                        createTextVNode("否")
-                                      ]),
-                                      _: 1
-                                    })
-                                  ]),
-                                  _: 2
-                                }, 1032, ["modelValue", "onUpdate:modelValue"])
-                              ]),
-                              _: 2
-                            }, 1024)) : createCommentVNode("", true),
-                            props2.row.props.format && props2.row.props.format.type === "progress" && props2.row.props.format.progressType === "line" ? (openBlock(), createBlock(_component_el_form_item, {
-                              key: 12,
-                              label: "文本内显",
-                              class: "amb-design-attr-item"
-                            }, {
-                              default: withCtx(() => [
-                                createVNode(_component_el_radio_group, {
-                                  modelValue: props2.row.props.format.textInside,
-                                  "onUpdate:modelValue": ($event) => props2.row.props.format.textInside = $event,
-                                  class: "ml-4"
-                                }, {
-                                  default: withCtx(() => [
-                                    createVNode(_component_el_radio, { value: true }, {
-                                      default: withCtx(() => [
-                                        createTextVNode("是")
-                                      ]),
-                                      _: 1
-                                    }),
-                                    createVNode(_component_el_radio, { value: false }, {
-                                      default: withCtx(() => [
-                                        createTextVNode("否")
-                                      ]),
-                                      _: 1
-                                    })
-                                  ]),
-                                  _: 2
-                                }, 1032, ["modelValue", "onUpdate:modelValue"])
-                              ]),
-                              _: 2
-                            }, 1024)) : createCommentVNode("", true),
-                            props2.row.props.format && props2.row.props.format.type === "progress" ? (openBlock(), createBlock(_component_el_form_item, {
-                              key: 13,
-                              label: "进度条状态",
-                              class: "amb-design-attr-item"
-                            }, {
-                              default: withCtx(() => [
-                                createVNode(_component_el_radio_group, {
-                                  modelValue: props2.row.props.format.status,
-                                  "onUpdate:modelValue": ($event) => props2.row.props.format.status = $event,
-                                  class: "ml-4"
-                                }, {
-                                  default: withCtx(() => [
-                                    createVNode(_component_el_radio, { value: null }, {
-                                      default: withCtx(() => [
-                                        createTextVNode("无")
-                                      ]),
-                                      _: 1
-                                    }),
-                                    createVNode(_component_el_radio, { value: "success" }, {
-                                      default: withCtx(() => [
-                                        createTextVNode("success")
-                                      ]),
-                                      _: 1
-                                    }),
-                                    createVNode(_component_el_radio, { value: "warning" }, {
-                                      default: withCtx(() => [
-                                        createTextVNode("warning")
-                                      ]),
-                                      _: 1
-                                    }),
-                                    createVNode(_component_el_radio, { value: "exception" }, {
-                                      default: withCtx(() => [
-                                        createTextVNode("exception")
-                                      ]),
-                                      _: 1
-                                    })
-                                  ]),
-                                  _: 2
-                                }, 1032, ["modelValue", "onUpdate:modelValue"])
-                              ]),
-                              _: 2
-                            }, 1024)) : createCommentVNode("", true),
-                            props2.row.props.format && props2.row.props.format.type === "progress" ? (openBlock(), createBlock(_component_el_form_item, {
-                              key: 14,
-                              label: "自定义颜色",
-                              class: "amb-design-attr-item"
-                            }, {
-                              default: withCtx(() => [
-                                createVNode(_component_el_radio_group, {
-                                  modelValue: props2.row.props.format.colorType,
-                                  "onUpdate:modelValue": ($event) => props2.row.props.format.colorType = $event,
-                                  class: "ml-4"
-                                }, {
-                                  default: withCtx(() => [
-                                    createVNode(_component_el_radio, { value: "default" }, {
-                                      default: withCtx(() => [
-                                        createTextVNode("默认")
-                                      ]),
-                                      _: 1
-                                    }),
-                                    createVNode(_component_el_radio, { value: "custom" }, {
-                                      default: withCtx(() => [
-                                        createTextVNode("指定颜色")
-                                      ]),
-                                      _: 1
-                                    })
-                                  ]),
-                                  _: 2
-                                }, 1032, ["modelValue", "onUpdate:modelValue"])
-                              ]),
-                              _: 2
-                            }, 1024)) : createCommentVNode("", true),
-                            props2.row.props.format && props2.row.props.format.type === "progress" && props2.row.props.format.colorType === "custom" ? (openBlock(), createBlock(_component_el_form_item, {
-                              key: 15,
-                              label: "颜色"
-                            }, {
-                              default: withCtx(() => [
-                                createVNode(_component_el_color_picker, {
-                                  modelValue: props2.row.props.format.color,
-                                  "onUpdate:modelValue": ($event) => props2.row.props.format.color = $event
-                                }, null, 8, ["modelValue", "onUpdate:modelValue"])
-                              ]),
-                              _: 2
-                            }, 1024)) : createCommentVNode("", true),
-                            props2.row.props.format && props2.row.props.format.type === "progress" ? (openBlock(), createBlock(_component_el_form_item, {
-                              key: 16,
-                              label: "自定义颜色",
-                              class: "amb-design-attr-item"
-                            }, {
-                              default: withCtx(() => [
-                                createVNode(_component_el_radio_group, {
-                                  modelValue: props2.row.props.format.colorType,
-                                  "onUpdate:modelValue": ($event) => props2.row.props.format.colorType = $event,
-                                  class: "ml-4"
+                                createVNode(_component_el_select, {
+                                  modelValue: props2.row.props.format.customFunc,
+                                  "onUpdate:modelValue": ($event) => props2.row.props.format.customFunc = $event,
+                                  clearable: ""
                                 }, {
                                   default: withCtx(() => [
-                                    createVNode(_component_el_radio, { value: "default" }, {
-                                      default: withCtx(() => [
-                                        createTextVNode("默认")
-                                      ]),
-                                      _: 1
-                                    }),
-                                    createVNode(_component_el_radio, { value: "custom" }, {
-                                      default: withCtx(() => [
-                                        createTextVNode("指定颜色")
-                                      ]),
-                                      _: 1
-                                    })
+                                    (openBlock(true), createElementBlock(Fragment, null, renderList(unref(getCustomFuncs)(), (item) => {
+                                      return openBlock(), createBlock(_component_el_option, {
+                                        key: item.value,
+                                        label: item.label,
+                                        value: item.value
+                                      }, null, 8, ["label", "value"]);
+                                    }), 128))
                                   ]),
                                   _: 2
                                 }, 1032, ["modelValue", "onUpdate:modelValue"])
                               ]),
                               _: 2
                             }, 1024)) : createCommentVNode("", true),
+                            props2.row.props.format && props2.row.props.format.type === "progress" ? (openBlock(), createElementBlock(Fragment, { key: 9 }, [
+                              createVNode(_component_el_form_item, {
+                                label: "进度条高度",
+                                class: "amb-design-attr-item"
+                              }, {
+                                default: withCtx(() => [
+                                  createVNode(_component_el_input_number, {
+                                    modelValue: props2.row.props.format.strokeWidth,
+                                    "onUpdate:modelValue": ($event) => props2.row.props.format.strokeWidth = $event
+                                  }, null, 8, ["modelValue", "onUpdate:modelValue"])
+                                ]),
+                                _: 2
+                              }, 1024),
+                              createVNode(_component_el_form_item, {
+                                label: "最大值",
+                                class: "amb-design-attr-item"
+                              }, {
+                                default: withCtx(() => [
+                                  createVNode(_component_el_input_number, {
+                                    modelValue: props2.row.props.format.max,
+                                    "onUpdate:modelValue": ($event) => props2.row.props.format.max = $event
+                                  }, null, 8, ["modelValue", "onUpdate:modelValue"])
+                                ]),
+                                _: 2
+                              }, 1024),
+                              createVNode(_component_el_form_item, {
+                                label: "进度条类型",
+                                class: "amb-design-attr-item"
+                              }, {
+                                default: withCtx(() => [
+                                  createVNode(_component_el_radio_group, {
+                                    modelValue: props2.row.props.format.progressType,
+                                    "onUpdate:modelValue": ($event) => props2.row.props.format.progressType = $event,
+                                    class: "ml-4"
+                                  }, {
+                                    default: withCtx(() => [
+                                      createVNode(_component_el_radio, { value: "line" }, {
+                                        default: withCtx(() => [
+                                          createTextVNode("line")
+                                        ]),
+                                        _: 1
+                                      }),
+                                      createVNode(_component_el_radio, { value: "circle" }, {
+                                        default: withCtx(() => [
+                                          createTextVNode("circle")
+                                        ]),
+                                        _: 1
+                                      }),
+                                      createVNode(_component_el_radio, { value: "dashboard" }, {
+                                        default: withCtx(() => [
+                                          createTextVNode("dashboard")
+                                        ]),
+                                        _: 1
+                                      })
+                                    ]),
+                                    _: 2
+                                  }, 1032, ["modelValue", "onUpdate:modelValue"])
+                                ]),
+                                _: 2
+                              }, 1024),
+                              createVNode(_component_el_form_item, {
+                                label: "显示文字",
+                                class: "amb-design-attr-item"
+                              }, {
+                                default: withCtx(() => [
+                                  createVNode(_component_el_radio_group, {
+                                    modelValue: props2.row.props.format.showText,
+                                    "onUpdate:modelValue": ($event) => props2.row.props.format.showText = $event,
+                                    class: "ml-4"
+                                  }, {
+                                    default: withCtx(() => [
+                                      createVNode(_component_el_radio, { value: true }, {
+                                        default: withCtx(() => [
+                                          createTextVNode("是")
+                                        ]),
+                                        _: 1
+                                      }),
+                                      createVNode(_component_el_radio, { value: false }, {
+                                        default: withCtx(() => [
+                                          createTextVNode("否")
+                                        ]),
+                                        _: 1
+                                      })
+                                    ]),
+                                    _: 2
+                                  }, 1032, ["modelValue", "onUpdate:modelValue"])
+                                ]),
+                                _: 2
+                              }, 1024),
+                              props2.row.props.format.progressType === "line" ? (openBlock(), createBlock(_component_el_form_item, {
+                                key: 0,
+                                label: "文本内显",
+                                class: "amb-design-attr-item"
+                              }, {
+                                default: withCtx(() => [
+                                  createVNode(_component_el_radio_group, {
+                                    modelValue: props2.row.props.format.textInside,
+                                    "onUpdate:modelValue": ($event) => props2.row.props.format.textInside = $event,
+                                    class: "ml-4"
+                                  }, {
+                                    default: withCtx(() => [
+                                      createVNode(_component_el_radio, { value: true }, {
+                                        default: withCtx(() => [
+                                          createTextVNode("是")
+                                        ]),
+                                        _: 1
+                                      }),
+                                      createVNode(_component_el_radio, { value: false }, {
+                                        default: withCtx(() => [
+                                          createTextVNode("否")
+                                        ]),
+                                        _: 1
+                                      })
+                                    ]),
+                                    _: 2
+                                  }, 1032, ["modelValue", "onUpdate:modelValue"])
+                                ]),
+                                _: 2
+                              }, 1024)) : createCommentVNode("", true),
+                              createVNode(_component_el_form_item, {
+                                label: "进度条状态",
+                                class: "amb-design-attr-item"
+                              }, {
+                                default: withCtx(() => [
+                                  createVNode(_component_el_radio_group, {
+                                    modelValue: props2.row.props.format.status,
+                                    "onUpdate:modelValue": ($event) => props2.row.props.format.status = $event,
+                                    class: "ml-4"
+                                  }, {
+                                    default: withCtx(() => [
+                                      createVNode(_component_el_radio, { value: null }, {
+                                        default: withCtx(() => [
+                                          createTextVNode("无")
+                                        ]),
+                                        _: 1
+                                      }),
+                                      createVNode(_component_el_radio, { value: "success" }, {
+                                        default: withCtx(() => [
+                                          createTextVNode("success")
+                                        ]),
+                                        _: 1
+                                      }),
+                                      createVNode(_component_el_radio, { value: "warning" }, {
+                                        default: withCtx(() => [
+                                          createTextVNode("warning")
+                                        ]),
+                                        _: 1
+                                      }),
+                                      createVNode(_component_el_radio, { value: "exception" }, {
+                                        default: withCtx(() => [
+                                          createTextVNode("exception")
+                                        ]),
+                                        _: 1
+                                      })
+                                    ]),
+                                    _: 2
+                                  }, 1032, ["modelValue", "onUpdate:modelValue"])
+                                ]),
+                                _: 2
+                              }, 1024),
+                              createVNode(_component_el_form_item, {
+                                label: "自定义颜色",
+                                class: "amb-design-attr-item"
+                              }, {
+                                default: withCtx(() => [
+                                  createVNode(_component_el_radio_group, {
+                                    modelValue: props2.row.props.format.colorType,
+                                    "onUpdate:modelValue": ($event) => props2.row.props.format.colorType = $event,
+                                    class: "ml-4"
+                                  }, {
+                                    default: withCtx(() => [
+                                      createVNode(_component_el_radio, { value: "default" }, {
+                                        default: withCtx(() => [
+                                          createTextVNode("默认")
+                                        ]),
+                                        _: 1
+                                      }),
+                                      createVNode(_component_el_radio, { value: "custom" }, {
+                                        default: withCtx(() => [
+                                          createTextVNode("指定颜色")
+                                        ]),
+                                        _: 1
+                                      })
+                                    ]),
+                                    _: 2
+                                  }, 1032, ["modelValue", "onUpdate:modelValue"])
+                                ]),
+                                _: 2
+                              }, 1024),
+                              props2.row.props.format.colorType === "custom" ? (openBlock(), createBlock(_component_el_form_item, {
+                                key: 1,
+                                label: "颜色"
+                              }, {
+                                default: withCtx(() => [
+                                  createVNode(_component_el_color_picker, {
+                                    modelValue: props2.row.props.format.color,
+                                    "onUpdate:modelValue": ($event) => props2.row.props.format.color = $event
+                                  }, null, 8, ["modelValue", "onUpdate:modelValue"])
+                                ]),
+                                _: 2
+                              }, 1024)) : createCommentVNode("", true)
+                            ], 64)) : createCommentVNode("", true),
                             createVNode(_component_el_divider, null, {
                               default: withCtx(() => [
                                 createTextVNode("列属性")
@@ -870,6 +953,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                                 createVNode(_component_el_radio_group, {
                                   modelValue: props2.row.props.base.collectColumn,
                                   "onUpdate:modelValue": ($event) => props2.row.props.base.collectColumn = $event,
+                                  onChange: ($event) => summaryChange($event, props2.row),
                                   class: "ml-4"
                                 }, {
                                   default: withCtx(() => [
@@ -893,30 +977,53 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                                     })
                                   ]),
                                   _: 2
-                                }, 1032, ["modelValue", "onUpdate:modelValue"])
+                                }, 1032, ["modelValue", "onUpdate:modelValue", "onChange"])
                               ]),
                               _: 2
                             }, 1024),
-                            createVNode(_component_el_form_item, {
+                            props2.row.props.base.collectColumn === "titleColumn" ? (openBlock(), createBlock(_component_el_form_item, {
+                              key: 10,
                               label: "汇总标题",
                               class: "amb-design-attr-item"
                             }, {
                               default: withCtx(() => [
-                                createVNode(_component_el_input, {
-                                  modelValue: props2.row.props.base.sortTitle,
-                                  "onUpdate:modelValue": ($event) => props2.row.props.base.sortTitle = $event
-                                }, null, 8, ["modelValue", "onUpdate:modelValue"])
+                                createVNode(_component_el_col, { span: 20 }, {
+                                  default: withCtx(() => [
+                                    createVNode(_component_el_input, {
+                                      modelValue: props2.row.props.base.summaryTitle,
+                                      "onUpdate:modelValue": ($event) => props2.row.props.base.summaryTitle = $event,
+                                      onChange: ($event) => summaryTitleChange($event, props2.row)
+                                    }, null, 8, ["modelValue", "onUpdate:modelValue", "onChange"])
+                                  ]),
+                                  _: 2
+                                }, 1024),
+                                createVNode(_component_el_tooltip, {
+                                  class: "box-item",
+                                  content: "支持${row.行属性}方式拼接标题"
+                                }, {
+                                  default: withCtx(() => [
+                                    createVNode(_component_el_icon, null, {
+                                      default: withCtx(() => [
+                                        createVNode(unref(InfoFilled))
+                                      ]),
+                                      _: 1
+                                    })
+                                  ]),
+                                  _: 1
+                                })
                               ]),
                               _: 2
-                            }, 1024),
-                            createVNode(_component_el_form_item, {
+                            }, 1024)) : createCommentVNode("", true),
+                            props2.row.props.base.collectColumn === "dataColumn" ? (openBlock(), createBlock(_component_el_form_item, {
+                              key: 11,
                               label: "汇总方式",
                               class: "amb-design-attr-item"
                             }, {
                               default: withCtx(() => [
                                 createVNode(_component_el_select, {
-                                  modelValue: props2.row.props.base.sortMode,
-                                  "onUpdate:modelValue": ($event) => props2.row.props.base.sortMode = $event,
+                                  modelValue: props2.row.props.base.summaryMode,
+                                  "onUpdate:modelValue": ($event) => props2.row.props.base.summaryMode = $event,
+                                  onChange: ($event) => summaryModeChange($event, props2.row),
                                   clearable: ""
                                 }, {
                                   default: withCtx(() => [
@@ -926,7 +1033,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                                     }),
                                     createVNode(_component_el_option, {
                                       label: "均值",
-                                      value: "mean"
+                                      value: "avg"
                                     }),
                                     createVNode(_component_el_option, {
                                       label: "最大值",
@@ -942,12 +1049,30 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                                     })
                                   ]),
                                   _: 2
-                                }, 1032, ["modelValue", "onUpdate:modelValue"])
+                                }, 1032, ["modelValue", "onUpdate:modelValue", "onChange"])
                               ]),
                               _: 2
-                            }, 1024),
-                            props2.row.props.base.sortMode === "custom" ? (openBlock(), createBlock(_component_el_form_item, {
-                              key: 17,
+                            }, 1024)) : createCommentVNode("", true),
+                            props2.row.props.base.collectColumn === "dataColumn" ? (openBlock(), createBlock(_component_el_form_item, {
+                              key: 12,
+                              class: "amb-design-attr-item"
+                            }, {
+                              default: withCtx(() => [
+                                createVNode(_component_el_checkbox, {
+                                  modelValue: props2.row.props.base.groupSummary,
+                                  "onUpdate:modelValue": ($event) => props2.row.props.base.groupSummary = $event,
+                                  label: "分组合计"
+                                }, null, 8, ["modelValue", "onUpdate:modelValue"]),
+                                createVNode(_component_el_checkbox, {
+                                  modelValue: props2.row.props.base.tableSummary,
+                                  "onUpdate:modelValue": ($event) => props2.row.props.base.tableSummary = $event,
+                                  label: "表尾合计"
+                                }, null, 8, ["modelValue", "onUpdate:modelValue"])
+                              ]),
+                              _: 2
+                            }, 1024)) : createCommentVNode("", true),
+                            props2.row.props.base.summaryMode === "custom" ? (openBlock(), createBlock(_component_el_form_item, {
+                              key: 13,
                               label: "自定义汇总",
                               class: "amb-design-attr-item"
                             }, {
@@ -955,6 +1080,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                                 createVNode(_component_el_select, {
                                   modelValue: props2.row.props.base.customRollup,
                                   "onUpdate:modelValue": ($event) => props2.row.props.base.customRollup = $event,
+                                  onChange: ($event) => summaryModeChange($event, props2.row),
                                   clearable: ""
                                 }, {
                                   default: withCtx(() => [
@@ -967,7 +1093,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                                     }), 128))
                                   ]),
                                   _: 2
-                                }, 1032, ["modelValue", "onUpdate:modelValue"])
+                                }, 1032, ["modelValue", "onUpdate:modelValue", "onChange"])
                               ]),
                               _: 2
                             }, 1024)) : createCommentVNode("", true),
@@ -977,25 +1103,13 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                               ]),
                               _: 1
                             }),
-                            createVNode(_sfc_main$5, {
+                            createVNode(_sfc_main$4, {
                               configure: __props.configure,
                               showCondition: true,
                               paramTypes: ["data", "task", "page", "request", "row"],
-                              data: props2.row.props.Contentstyle,
+                              data: props2.row.style,
                               onDataChange: (data) => columnStyleChange(data, props2.$index)
-                            }, null, 8, ["configure", "data", "onDataChange"]),
-                            createVNode(_component_el_divider, null, {
-                              default: withCtx(() => [
-                                createTextVNode("链接设置")
-                              ]),
-                              _: 1
-                            }),
-                            createVNode(_sfc_main$6, {
-                              pageDesign: __props.pageDesign,
-                              paramTypes: ["data", "task", "page", "request", "row"],
-                              data: props2.row.props.link,
-                              onDataChange: (data) => linkChange(data, props2.$index)
-                            }, null, 8, ["pageDesign", "data", "onDataChange"])
+                            }, null, 8, ["configure", "data", "onDataChange"])
                           ]),
                           _: 1
                         }),
@@ -1008,6 +1122,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                               modelValue: scope.row.props.base.prop,
                               "onUpdate:modelValue": ($event) => scope.row.props.base.prop = $event,
                               placeholder: "Select",
+                              "allow-create": "",
+                              filterable: "",
                               onChange: ($event) => columnItemChange($event, scope.row)
                             }, {
                               default: withCtx(() => [
@@ -1049,6 +1165,18 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                           label: "操作",
                           align: "center"
                         }, {
+                          header: withCtx(() => [
+                            createVNode(_component_el_icon, {
+                              size: "14",
+                              style: { "color": "#5893ef", "cursor": "pointer", "font-weight": "bold", "margin-right": "8px" },
+                              onClick: _cache[5] || (_cache[5] = ($event) => addRow())
+                            }, {
+                              default: withCtx(() => [
+                                createVNode(_component_Plus)
+                              ]),
+                              _: 1
+                            })
+                          ]),
                           default: withCtx((scope) => [
                             createVNode(_component_el_icon, {
                               size: "14",
@@ -1083,7 +1211,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                       default: withCtx(() => [
                         createVNode(_component_el_select, {
                           modelValue: __props.configure.props.modelCustom,
-                          "onUpdate:modelValue": _cache[5] || (_cache[5] = ($event) => __props.configure.props.modelCustom = $event),
+                          "onUpdate:modelValue": _cache[6] || (_cache[6] = ($event) => __props.configure.props.modelCustom = $event),
                           clearable: ""
                         }, {
                           default: withCtx(() => [
@@ -1104,6 +1232,11 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                 ]),
                 _: 1
               }),
+              createVNode(_sfc_main$5, {
+                configure: __props.configure,
+                pageDesign: __props.pageDesign,
+                serviceFields: selectedServiceResultFields.value
+              }, null, 8, ["configure", "pageDesign", "serviceFields"]),
               createVNode(_component_el_collapse_item, {
                 title: "外观",
                 name: "appearance",
@@ -1118,7 +1251,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                       default: withCtx(() => [
                         createVNode(_component_el_radio_group, {
                           modelValue: __props.configure.props.base.showIndex,
-                          "onUpdate:modelValue": _cache[6] || (_cache[6] = ($event) => __props.configure.props.base.showIndex = $event),
+                          "onUpdate:modelValue": _cache[7] || (_cache[7] = ($event) => __props.configure.props.base.showIndex = $event),
                           class: "ml-4"
                         }, {
                           default: withCtx(() => [
@@ -1147,7 +1280,36 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                       default: withCtx(() => [
                         createVNode(_component_el_radio_group, {
                           modelValue: __props.configure.props.base.stripe,
-                          "onUpdate:modelValue": _cache[7] || (_cache[7] = ($event) => __props.configure.props.base.stripe = $event),
+                          "onUpdate:modelValue": _cache[8] || (_cache[8] = ($event) => __props.configure.props.base.stripe = $event),
+                          class: "ml-4"
+                        }, {
+                          default: withCtx(() => [
+                            createVNode(_component_el_radio, { value: true }, {
+                              default: withCtx(() => [
+                                createTextVNode("是")
+                              ]),
+                              _: 1
+                            }),
+                            createVNode(_component_el_radio, { value: false }, {
+                              default: withCtx(() => [
+                                createTextVNode("否")
+                              ]),
+                              _: 1
+                            })
+                          ]),
+                          _: 1
+                        }, 8, ["modelValue"])
+                      ]),
+                      _: 1
+                    }),
+                    createVNode(_component_el_form_item, {
+                      label: "表尾合计行",
+                      class: "amb-design-attr-item"
+                    }, {
+                      default: withCtx(() => [
+                        createVNode(_component_el_radio_group, {
+                          modelValue: __props.configure.props.base.showSummary,
+                          "onUpdate:modelValue": _cache[9] || (_cache[9] = ($event) => __props.configure.props.base.showSummary = $event),
                           class: "ml-4"
                         }, {
                           default: withCtx(() => [
@@ -1173,7 +1335,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                 ]),
                 _: 1
               }),
-              createVNode(_sfc_main$7, {
+              createVNode(_sfc_main$6, {
                 size: __props.configure.props.size,
                 showMaxHeight: true,
                 showCalcHeight: true