super-page-designer 2.1.47 → 2.1.52

package/dist/es/components/design/views/assemblys/chart/statistical-table/component/font-style-dialog.vue.js

@@ -1,4 +1,6 @@
 import { defineComponent, ref, resolveComponent, openBlock, createElementBlock, Fragment, createElementVNode, createVNode, withCtx, createTextVNode, renderList } from "vue";
+import { ElMessage } from "element-plus";
+const _hoisted_1 = { style: { "padding": "0 10px" } };
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "font-style-dialog",
   props: {
@@ -21,6 +23,19 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     if (props.data) {
       formData.value = props.data;
     }
+    if (!formData.value.style) {
+      formData.value.style = {};
+    }
+    function beforeClose(done) {
+      try {
+        if (formData.value.customStyle) {
+          JSON.parse(formData.value.customStyle);
+        }
+        done();
+      } catch (e) {
+        ElMessage.error("style需要是json格式");
+      }
+    }
     function openDialog() {
       dialogTableVisible.value = true;
     }
@@ -34,6 +49,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       const _component_el_color_picker = resolveComponent("el-color-picker");
       const _component_el_option = resolveComponent("el-option");
       const _component_el_select = resolveComponent("el-select");
+      const _component_el_text = resolveComponent("el-text");
       const _component_el_input = resolveComponent("el-input");
       const _component_el_form = resolveComponent("el-form");
       const _component_el_dialog = resolveComponent("el-dialog");
@@ -54,7 +70,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           "onUpdate:modelValue": _cache[6] || (_cache[6] = ($event) => dialogTableVisible.value = $event),
           title: __props.title,
           width: "900",
-          "append-to-body": ""
+          "append-to-body": "",
+          "before-close": beforeClose
         }, {
           default: withCtx(() => [
             createVNode(_component_el_form, {
@@ -69,18 +86,18 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                         createVNode(_component_el_form_item, { label: "加粗" }, {
                           default: withCtx(() => [
                             createVNode(_component_el_radio_group, {
-                              modelValue: formData.value.fontBold,
-                              "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => formData.value.fontBold = $event),
+                              modelValue: formData.value.style.fontWeight,
+                              "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => formData.value.style.fontWeight = $event),
                               class: "ml-4"
                             }, {
                               default: withCtx(() => [
-                                createVNode(_component_el_radio, { value: true }, {
+                                createVNode(_component_el_radio, { value: "bold" }, {
                                   default: withCtx(() => [
                                     createTextVNode("是")
                                   ]),
                                   _: 1
                                 }),
-                                createVNode(_component_el_radio, { value: false }, {
+                                createVNode(_component_el_radio, { value: "normal" }, {
                                   default: withCtx(() => [
                                     createTextVNode("否")
                                   ]),
@@ -100,18 +117,18 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                         createVNode(_component_el_form_item, { label: "倾斜" }, {
                           default: withCtx(() => [
                             createVNode(_component_el_radio_group, {
-                              modelValue: formData.value.fontItalic,
-                              "onUpdate:modelValue": _cache[1] || (_cache[1] = ($event) => formData.value.fontItalic = $event),
+                              modelValue: formData.value.style.fontStyle,
+                              "onUpdate:modelValue": _cache[1] || (_cache[1] = ($event) => formData.value.style.fontStyle = $event),
                               class: "ml-4"
                             }, {
                               default: withCtx(() => [
-                                createVNode(_component_el_radio, { value: true }, {
+                                createVNode(_component_el_radio, { value: "italic" }, {
                                   default: withCtx(() => [
                                     createTextVNode("是")
                                   ]),
                                   _: 1
                                 }),
-                                createVNode(_component_el_radio, { value: false }, {
+                                createVNode(_component_el_radio, { value: "normal" }, {
                                   default: withCtx(() => [
                                     createTextVNode("否")
                                   ]),
@@ -136,8 +153,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                         createVNode(_component_el_form_item, { label: "字体颜色" }, {
                           default: withCtx(() => [
                             createVNode(_component_el_color_picker, {
-                              modelValue: formData.value.FontColor,
-                              "onUpdate:modelValue": _cache[2] || (_cache[2] = ($event) => formData.value.FontColor = $event)
+                              modelValue: formData.value.style.color,
+                              "onUpdate:modelValue": _cache[2] || (_cache[2] = ($event) => formData.value.style.color = $event)
                             }, null, 8, ["modelValue"])
                           ]),
                           _: 1
@@ -150,8 +167,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                         createVNode(_component_el_form_item, { label: "背景颜色" }, {
                           default: withCtx(() => [
                             createVNode(_component_el_color_picker, {
-                              modelValue: formData.value.backgroundColor,
-                              "onUpdate:modelValue": _cache[3] || (_cache[3] = ($event) => formData.value.backgroundColor = $event)
+                              modelValue: formData.value.style.backgroundColor,
+                              "onUpdate:modelValue": _cache[3] || (_cache[3] = ($event) => formData.value.style.backgroundColor = $event)
                             }, null, 8, ["modelValue"])
                           ]),
                           _: 1
@@ -169,8 +186,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                         createVNode(_component_el_form_item, { label: "字号" }, {
                           default: withCtx(() => [
                             createVNode(_component_el_select, {
-                              modelValue: formData.value.fontSize,
-                              "onUpdate:modelValue": _cache[4] || (_cache[4] = ($event) => formData.value.fontSize = $event),
+                              modelValue: formData.value.style.fontSize,
+                              "onUpdate:modelValue": _cache[4] || (_cache[4] = ($event) => formData.value.style.fontSize = $event),
                               placeholder: "默认",
                               clearable: ""
                             }, {
@@ -199,6 +216,14 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                       default: withCtx(() => [
                         createVNode(_component_el_form_item, { label: "  style" }, {
                           default: withCtx(() => [
+                            createElementVNode("div", _hoisted_1, [
+                              createVNode(_component_el_text, { type: "primary" }, {
+                                default: withCtx(() => [
+                                  createTextVNode('格式如：{"fontSize": "24px", "padding": "10px", "color":"red"}')
+                                ]),
+                                _: 1
+                              })
+                            ]),
                             createVNode(_component_el_input, {
                               modelValue: formData.value.customStyle,
                               "onUpdate:modelValue": _cache[5] || (_cache[5] = ($event) => formData.value.customStyle = $event),

package/dist/es/components/design/views/assemblys/chart/statistical-table/component/link-table.vue.js

@@ -38,11 +38,6 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         linkPage: {}
       });
     }
-    watch(() => tableData.value, (newVal) => {
-      if (Object.keys(newVal[0].style).length > 0) {
-        emit("dataChange", tableData.value);
-      }
-    }, { deep: true });
     function addData(rowItem, index) {
       tableData.value.splice(index + 1, 0, {
         showCondition: [],
@@ -69,11 +64,15 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       tableData.value[linkIndex.value].linkPage = linkData.value;
       dialogTableVisible.value = false;
     }
-    watch(() => tableData.value, (newVal) => {
-      if (Object.keys(newVal[0].linkPage).length > 0) {
-        emit("dataChange", tableData.value);
-      }
-    }, { deep: true });
+    watch(
+      () => tableData.value,
+      (newVal) => {
+        if (Object.keys(newVal[0].linkPage).length > 0) {
+          emit("dataChange", tableData.value);
+        }
+      },
+      { deep: true }
+    );
     return (_ctx, _cache) => {
       const _component_el_table_column = resolveComponent("el-table-column");
       const _component_el_option = resolveComponent("el-option");
@@ -111,6 +110,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                 createVNode(_component_el_select, {
                   modelValue: scope.row.scopeFunc,
                   "onUpdate:modelValue": ($event) => scope.row.scopeFunc = $event,
+                  clearable: "",
                   title: scope.row.scopeFunc,
                   size: "small",
                   placeholder: "请选择"
@@ -155,7 +155,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
               default: withCtx((scope) => [
                 createVNode(_component_el_icon, {
                   size: "14",
-                  style: { "color": "#5893EF", "cursor": "pointer", "font-weight": "bold", "margin-right": "8px" },
+                  style: { "color": "#5893ef", "cursor": "pointer", "font-weight": "bold", "margin-right": "8px" },
                   onClick: ($event) => addData(scope.row, scope.$index)
                 }, {
                   default: withCtx(() => [
@@ -165,7 +165,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                 }, 1032, ["onClick"]),
                 createVNode(_component_el_icon, {
                   size: "14",
-                  style: { "color": "#5893EF", "cursor": "pointer" },
+                  style: { "color": "#5893ef", "cursor": "pointer" },
                   onClick: ($event) => deleteData(scope.row, scope.$index)
                 }, {
                   default: withCtx(() => [

package/dist/es/components/design/views/assemblys/chart/statistical-table/component/row-colmun.vue.js

@@ -0,0 +1,106 @@
+import { defineComponent, resolveComponent, openBlock, createElementBlock, Fragment, createVNode, withCtx, renderList, createBlock } from "vue";
+const _sfc_main = /* @__PURE__ */ defineComponent({
+  __name: "row-colmun",
+  props: {
+    sourceFields: {},
+    tableData: {},
+    type: {}
+  },
+  setup(__props) {
+    return (_ctx, _cache) => {
+      const _component_Delete = resolveComponent("Delete");
+      const _component_el_icon = resolveComponent("el-icon");
+      const _component_el_table_column = resolveComponent("el-table-column");
+      const _component_el_option = resolveComponent("el-option");
+      const _component_el_select = resolveComponent("el-select");
+      const _component_el_input = resolveComponent("el-input");
+      const _component_el_table = resolveComponent("el-table");
+      const _component_el_divider = resolveComponent("el-divider");
+      return openBlock(), createElementBlock(Fragment, null, [
+        createVNode(_component_el_table, {
+          data: _ctx.tableData,
+          style: { "width": "100%", "margin-bottom": "8px" }
+        }, {
+          default: withCtx(() => [
+            createVNode(_component_el_table_column, {
+              "header-align": "center",
+              align: "center",
+              width: "60"
+            }, {
+              default: withCtx((scope) => [
+                createVNode(_component_el_icon, {
+                  size: "14",
+                  style: { "color": "#5893ef", "cursor": "pointer" },
+                  onClick: ($event) => _ctx.tableData.splice(scope.$index, 1)
+                }, {
+                  default: withCtx(() => [
+                    createVNode(_component_Delete)
+                  ]),
+                  _: 2
+                }, 1032, ["onClick"])
+              ]),
+              _: 1
+            }),
+            createVNode(_component_el_table_column, {
+              label: "转换列",
+              "header-align": "center",
+              align: "center"
+            }, {
+              default: withCtx((scope) => [
+                createVNode(_component_el_select, {
+                  modelValue: _ctx.tableData[scope.$index].columns,
+                  "onUpdate:modelValue": ($event) => _ctx.tableData[scope.$index].columns = $event,
+                  multiple: "",
+                  placeholder: "请选择"
+                }, {
+                  default: withCtx(() => [
+                    (openBlock(true), createElementBlock(Fragment, null, renderList(_ctx.sourceFields, (filed, index) => {
+                      return openBlock(), createBlock(_component_el_option, {
+                        key: index,
+                        label: filed.label,
+                        value: filed.value
+                      }, null, 8, ["label", "value"]);
+                    }), 128))
+                  ]),
+                  _: 2
+                }, 1032, ["modelValue", "onUpdate:modelValue"])
+              ]),
+              _: 1
+            }),
+            createVNode(_component_el_table_column, {
+              label: "新变量名",
+              "header-align": "center",
+              align: "center"
+            }, {
+              default: withCtx((scope) => [
+                createVNode(_component_el_input, {
+                  modelValue: _ctx.tableData[scope.$index].prop,
+                  "onUpdate:modelValue": ($event) => _ctx.tableData[scope.$index].prop = $event
+                }, null, 8, ["modelValue", "onUpdate:modelValue"])
+              ]),
+              _: 1
+            }),
+            createVNode(_component_el_table_column, {
+              label: "标题名",
+              "header-align": "center",
+              align: "center"
+            }, {
+              default: withCtx((scope) => [
+                createVNode(_component_el_input, {
+                  modelValue: _ctx.tableData[scope.$index].title,
+                  "onUpdate:modelValue": ($event) => _ctx.tableData[scope.$index].title = $event
+                }, null, 8, ["modelValue", "onUpdate:modelValue"])
+              ]),
+              _: 1
+            })
+          ]),
+          _: 1
+        }, 8, ["data"]),
+        createVNode(_component_el_divider)
+      ], 64);
+    };
+  }
+});
+export {
+  _sfc_main as default
+};

package/dist/es/components/design/views/assemblys/chart/statistical-table/component/row-colmun.vue2.js

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

package/dist/es/components/design/views/assemblys/chart/statistical-table/component/style-table.vue.js

@@ -27,7 +27,13 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     // 变量显示类型
     paramTypes: {
       type: Array,
-      default: () => ["data", "task", "page", "request"]
+      default: () => ["data", "task", "page", "request", "row"]
+    },
+    // 页面信息
+    pageDesign: {
+      type: Object,
+      default: () => {
+      }
     }
   },
   emits: ["dataChange"],
@@ -45,11 +51,16 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         style: {}
       });
     }
-    watch(() => tableData.value, (newVal) => {
-      if (Object.keys(newVal[0].style).length > 0) {
-        emit("dataChange", tableData.value);
-      }
-    }, { deep: true });
+    watch(
+      () => tableData.value,
+      (newVal) => {
+        if (Object.keys(newVal[0].style).length > 0) {
+          debugger;
+          emit("dataChange", tableData.value);
+        }
+      },
+      { deep: true }
+    );
     function addData(rowItem, index) {
       tableData.value.splice(index + 1, 0, {
         matchingCondition: [],
@@ -88,8 +99,10 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
               createVNode(_sfc_main$1, {
                 paramTypes: __props.paramTypes,
                 title: "匹配条件/生效条件",
-                data: scope.row.matchingCondition
-              }, null, 8, ["paramTypes", "data"])
+                data: scope.row.matchingCondition,
+                pageDesign: __props.pageDesign,
+                configure: __props.configure
+              }, null, 8, ["paramTypes", "data", "pageDesign", "configure"])
             ]),
             _: 1
           })) : createCommentVNode("", true),
@@ -129,6 +142,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
               createVNode(_component_el_select, {
                 modelValue: scope.row.scopeFunc,
                 "onUpdate:modelValue": ($event) => scope.row.scopeFunc = $event,
+                clearable: "",
                 title: scope.row.scopeFunc,
                 size: "small",
                 placeholder: "请选择"
@@ -154,7 +168,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           }, {
             default: withCtx((scope) => [
               createVNode(_sfc_main$2, {
-                data: scope.row.style
+                data: scope.row
               }, null, 8, ["data"])
             ]),
             _: 1
@@ -166,7 +180,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             default: withCtx((scope) => [
               createVNode(_component_el_icon, {
                 size: "14",
-                style: { "color": "#5893EF", "cursor": "pointer", "font-weight": "bold", "margin-right": "8px" },
+                style: { "color": "#5893ef", "cursor": "pointer", "font-weight": "bold", "margin-right": "8px" },
                 onClick: ($event) => addData(scope.row, scope.$index)
               }, {
                 default: withCtx(() => [
@@ -176,7 +190,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
               }, 1032, ["onClick"]),
               createVNode(_component_el_icon, {
                 size: "14",
-                style: { "color": "#5893EF", "cursor": "pointer" },
+                style: { "color": "#5893ef", "cursor": "pointer" },
                 onClick: ($event) => deleteData(scope.row, scope.$index)
               }, {
                 default: withCtx(() => [

package/dist/es/components/design/views/assemblys/chart/statistical-table/component/table-showcondition.vue.js

@@ -1,8 +1,10 @@
-import { defineComponent, ref, resolveComponent, openBlock, createElementBlock, Fragment, createElementVNode, createVNode, withCtx, createTextVNode, unref, withDirectives, vShow } from "vue";
+import { defineComponent, ref, resolveComponent, openBlock, createElementBlock, Fragment, createElementVNode, createVNode, withCtx, createTextVNode, unref, createBlock, createCommentVNode, withDirectives, vShow } from "vue";
 import { Plus, Delete } from "@element-plus/icons";
 import BindVariable from "../../../common/common-variable-bind.vue.js";
 import { getUuidv4 } from "../../../../../utils/common-util.js";
 import { usePageContextStore } from "../../../../../../../stores/page-store.js";
+import { statisticsTable } from "../../../../../../../stores/statistics-table-store.js";
+import { getModelOptionsByFields } from "../../../../../utils/page-table-util.js";
 const _hoisted_1 = { style: { "text-align": "center", "margin": "0px -8px", "padding-top": "4px", "padding-left": "2px" } };
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "table-showcondition",
@@ -18,11 +20,23 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     },
     paramTypes: {
       type: Array,
-      default: () => ["data", "task", "page", "request"]
+      default: () => ["data", "task", "page", "request", "row"]
+    },
+    configure: {
+      type: Object,
+      default: () => {
+      }
+    },
+    // 页面信息
+    pageDesign: {
+      type: Object,
+      default: () => {
+      }
     }
   },
   setup(__props) {
     const pageDesignUtil = usePageContextStore();
+    const statisticsTableStore = statisticsTable();
     const props = __props;
     const tableHeight = ref(300);
     const tableDatas = ref([]);
@@ -30,6 +44,19 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       tableDatas.value = props.data;
     }
     const dialogTableVisible = ref(false);
+    let dataFieldNameList;
+    const pageType = props.pageDesign ? props.pageDesign.pageType : null;
+    if (pageType && pageType === "form") {
+      dataFieldNameList = props.pageDesign.modelFields;
+    }
+    const dataModelOptions = ref(null);
+    if (dataFieldNameList && dataFieldNameList.length > 0) {
+      dataModelOptions.value = getModelOptionsByFields(dataFieldNameList);
+    }
+    const rowModelOptions = ref(null);
+    if (props.configure) {
+      rowModelOptions.value = getModelOptionsByFields(props.configure.modelFields);
+    }
     function openDialog() {
       let tempHeight = window.innerHeight - 140 - 176;
       if (tempHeight > 500) {
@@ -96,18 +123,35 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       currentRow.value = val;
     }
     function updatePropValue(val, rowObj, fieldName) {
-      if (fieldName == "propValue") {
+      if (fieldName === "propValue") {
         rowObj.propValue = val;
       } else {
+        let columnList = [];
+        let propName;
         rowObj.propName = val;
         let dataType = "";
         if (val && val.startsWith("${")) {
-          let propName = val.substring(2, val.length - 1);
+          propName = val.substring(2, val.length - 1);
           if (propName.startsWith("page."))
             ;
           else if (propName.startsWith("data.")) {
             propName = propName.substring(5);
-            dataType = pageDesignUtil.getModelField(propName);
+            columnList = dataModelOptions.value;
+            if (!columnList || columnList.length === 0) {
+              columnList = pageDesignUtil.pageContextVarOptions.dataOptions;
+            }
+          } else if (propName.startsWith("row.")) {
+            propName = propName.substring(4);
+            columnList = rowModelOptions.value;
+            if (!columnList || columnList.length === 0) {
+              columnList = statisticsTableStore.columnList;
+            }
+          }
+        }
+        if (columnList && propName) {
+          const item = columnList.find((item2) => item2.value == propName);
+          if (item) {
+            dataType = item.dataType;
           }
         }
         rowObj.dataType = dataType;
@@ -245,9 +289,11 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                   default: withCtx((scope) => [
                     createVNode(BindVariable, {
                       modelValue: scope.row.propName,
+                      dataModelOptions: dataModelOptions.value,
+                      objModelOptions: rowModelOptions.value,
                       paramTypes: __props.paramTypes,
                       "onUpdate:modelValue": (val) => updatePropValue(val, scope.row, "propName")
-                    }, null, 8, ["modelValue", "paramTypes", "onUpdate:modelValue"])
+                    }, null, 8, ["modelValue", "dataModelOptions", "objModelOptions", "paramTypes", "onUpdate:modelValue"])
                   ]),
                   _: 1
                 }),
@@ -264,36 +310,26 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                       placeholder: "请选择"
                     }, {
                       default: withCtx(() => [
-                        withDirectives(createVNode(_component_el_option, {
+                        scope.row.dataType == "int" || scope.row.dataType == "long" || scope.row.dataType == "float" || scope.row.dataType == "double" || scope.row.dataType == "number" ? (openBlock(), createBlock(_component_el_option, {
+                          key: 0,
                           label: "大于",
                           value: "GT"
-                        }, null, 512), [
-                          [
-                            vShow,
-                            scope.row.dataType == "int" || scope.row.dataType == "long" || scope.row.dataType == "float" || scope.row.dataType == "double"
-                          ]
-                        ]),
-                        withDirectives(createVNode(_component_el_option, {
+                        })) : createCommentVNode("", true),
+                        scope.row.dataType == "int" || scope.row.dataType == "long" || scope.row.dataType == "float" || scope.row.dataType == "double" || scope.row.dataType == "number" ? (openBlock(), createBlock(_component_el_option, {
+                          key: 1,
                           label: "小于",
                           value: "LT"
-                        }, null, 512), [
-                          [
-                            vShow,
-                            scope.row.dataType == "int" || scope.row.dataType == "long" || scope.row.dataType == "float" || scope.row.dataType == "double"
-                          ]
-                        ]),
-                        withDirectives(createVNode(_component_el_option, {
+                        })) : createCommentVNode("", true),
+                        scope.row.dataType == "date" || scope.row.dataType == "datetime" ? (openBlock(), createBlock(_component_el_option, {
+                          key: 2,
                           label: "晚于",
                           value: "GT"
-                        }, null, 512), [
-                          [vShow, scope.row.dataType == "date" || scope.row.dataType == "datetime"]
-                        ]),
-                        withDirectives(createVNode(_component_el_option, {
+                        })) : createCommentVNode("", true),
+                        scope.row.dataType == "date" || scope.row.dataType == "datetime" ? (openBlock(), createBlock(_component_el_option, {
+                          key: 3,
                           label: "早于",
                           value: "LT"
-                        }, null, 512), [
-                          [vShow, scope.row.dataType == "date" || scope.row.dataType == "datetime"]
-                        ]),
+                        })) : createCommentVNode("", true),
                         createVNode(_component_el_option, {
                           label: "等于",
                           value: "EQ"
@@ -304,7 +340,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                         }, null, 512), [
                           [
                             vShow,
-                            scope.row.dataType == "int" || scope.row.dataType == "long" || scope.row.dataType == "float" || scope.row.dataType == "double"
+                            scope.row.dataType == "int" || scope.row.dataType == "long" || scope.row.dataType == "float" || scope.row.dataType == "double" || scope.row.dataType == "number"
                           ]
                         ]),
                         withDirectives(createVNode(_component_el_option, {
@@ -313,7 +349,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                         }, null, 512), [
                           [
                             vShow,
-                            scope.row.dataType == "int" || scope.row.dataType == "long" || scope.row.dataType == "float" || scope.row.dataType == "double"
+                            scope.row.dataType == "int" || scope.row.dataType == "long" || scope.row.dataType == "float" || scope.row.dataType == "double" || scope.row.dataType == "number"
                           ]
                         ]),
                         withDirectives(createVNode(_component_el_option, {
@@ -362,8 +398,10 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                   default: withCtx((scope) => [
                     createVNode(BindVariable, {
                       modelValue: scope.row.propValue,
+                      dataModelOptions: dataModelOptions.value,
+                      objModelOptions: rowModelOptions.value,
                       "onUpdate:modelValue": (val) => updatePropValue(val, scope.row, "propValue")
-                    }, null, 8, ["modelValue", "onUpdate:modelValue"])
+                    }, null, 8, ["modelValue", "dataModelOptions", "objModelOptions", "onUpdate:modelValue"])
                   ]),
                   _: 1
                 }),

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

@@ -1,4 +1,4 @@
-import { defineComponent, ref, resolveComponent, openBlock, createBlock, withCtx, createVNode, createElementVNode, createElementBlock, Fragment, renderList, unref } from "vue";
+import { defineComponent, watch, ref, resolveComponent, openBlock, createBlock, withCtx, createVNode, createElementVNode, createElementBlock, Fragment, renderList, unref } from "vue";
 import { Plus, Delete } from "@element-plus/icons-vue";
 import CompositeHeader from "../../data/component/composite-header.vue.js";
 import _sfc_main$1 from "../../common/common-advanced-basic-showcondition.vue.js";
@@ -25,6 +25,13 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
   },
   setup(__props) {
     const props = __props;
+    watch(
+      () => props.configure.props.groupHeaders,
+      (val) => {
+        debugger;
+      },
+      { deep: true }
+    );
     const openCollapseItems = ref(["compositeHeader", "amalgamated", "otherSettings", "summarySetting"]);
     ref([]);
     ref([]);
@@ -103,7 +110,10 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
               }, {
                 default: withCtx(() => [
                   createElementVNode("div", _hoisted_2, [
-                    createVNode(CompositeHeader, { configure: __props.configure }, null, 8, ["configure"])
+                    createVNode(CompositeHeader, {
+                      isStatistical: true,
+                      configure: __props.configure
+                    }, null, 8, ["configure"])
                   ])
                 ]),
                 _: 1
@@ -152,7 +162,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                           default: withCtx((scope) => [
                             createVNode(_component_el_icon, {
                               size: "14",
-                              style: { "color": "#5893EF", "cursor": "pointer", "font-weight": "bold", "margin-right": "8px" },
+                              style: { "color": "#5893ef", "cursor": "pointer", "font-weight": "bold", "margin-right": "8px" },
                               onClick: ($event) => addData(scope.$index)
                             }, {
                               default: withCtx(() => [
@@ -162,7 +172,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                             }, 1032, ["onClick"]),
                             createVNode(_component_el_icon, {
                               size: "14",
-                              style: { "color": "#5893EF", "cursor": "pointer" },
+                              style: { "color": "#5893ef", "cursor": "pointer" },
                               onClick: ($event) => deleteData(scope.$index)
                             }, {
                               default: withCtx(() => [
@@ -182,8 +192,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                     }, {
                       default: withCtx(() => [
                         createVNode(_component_el_select, {
-                          modelValue: __props.configure.props.highOrder.mergeDefined,
-                          "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => __props.configure.props.highOrder.mergeDefined = $event),
+                          modelValue: __props.configure.props.highOrder.mergeRow,
+                          "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => __props.configure.props.highOrder.mergeRow = $event),
                           multiple: "",
                           "allow-create": "",
                           filterable: "",
@@ -213,6 +223,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                           "onUpdate:modelValue": _cache[1] || (_cache[1] = ($event) => __props.configure.props.highOrder.scopeFunc = $event),
                           title: __props.configure.props.highOrder.scopeFunc,
                           size: "small",
+                          clearable: "",
                           placeholder: "请选择"
                         }, {
                           default: withCtx(() => [
@@ -246,8 +257,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                     }, {
                       default: withCtx(() => [
                         createVNode(_component_el_select, {
-                          modelValue: __props.configure.props.highOrder.groupingField,
-                          "onUpdate:modelValue": _cache[2] || (_cache[2] = ($event) => __props.configure.props.highOrder.groupingField = $event),
+                          modelValue: __props.configure.props.highOrder.groupField,
+                          "onUpdate:modelValue": _cache[2] || (_cache[2] = ($event) => __props.configure.props.highOrder.groupField = $event),
                           multiple: "",
                           "allow-create": "",
                           filterable: "",