super-page-designer 2.0.9 → 2.0.14

package/dist/es/components/design/utils/form-design-util.js

@@ -313,60 +313,45 @@ function columnCustomTittleClass(configure) {
   }
   return tempTittleClass;
 }
-function watchRequiredValidate(pageDesign, configure, isRequired, fieldInfo) {
-  if (isRequired) {
-    if (!pageDesign.rules) {
-      pageDesign.rules = {};
-    }
-    const prop = configure.props.base.prop;
-    if (prop) {
-      const propName = getFormPropName(prop);
-      if (!pageDesign.rules[propName]) {
-        pageDesign.rules[propName] = [];
+function watchRequiredValidate(configure, fieldInfo) {
+  const prop = configure.props.base.prop;
+  if (prop) {
+    const rule = {
+      required: true,
+      message: `${configure.props.base.title}必填`,
+      label: configure.props.base.title
+    };
+    packageRuleByDataType(fieldInfo, rule);
+    configure.props.rules.push(rule);
+  }
+}
+function watchValidate(configure, verification, fieldInfo) {
+  configure.props.rules = [];
+  const prop = configure.props.base.prop;
+  if (prop) {
+    if (verification) {
+      if (verification.required) {
+        watchRequiredValidate(configure, fieldInfo);
       }
-      const validations = pageDesign.rules[propName];
-      const ruleIndex = validations.findIndex((item) => item.required);
-      if (ruleIndex !== void 0 && ruleIndex !== null && ruleIndex >= 0) {
-        validations.splice(ruleIndex, 1);
+      if (verification.type) {
+        watchValidateType(configure, verification.type, fieldInfo);
       }
-      const rule = {
-        required: true,
-        message: `${configure.props.base.title}必填`,
-        label: configure.props.base.title
-      };
-      packageRuleByDataType(fieldInfo, rule);
-      pageDesign.rules[propName].push(rule);
-    }
-  } else {
-    const prop = configure.props.base.prop;
-    if (prop) {
-      const propName = getFormPropName(prop);
-      if (pageDesign.rules && pageDesign.rules[propName]) {
-        const validations = pageDesign.rules[propName];
-        const ruleIndex = validations.findIndex((item) => item.required);
-        if (ruleIndex !== void 0 && ruleIndex !== null && ruleIndex >= 0) {
-          validations.splice(ruleIndex, 1);
-        }
+      if (verification.verifyRegex && verification.regex) {
+        watchPatternValidate(configure, verification.regex, fieldInfo);
+      }
+      if (verification.verifyMaxLength && verification.maxLength) {
+        watchMaxOrMinValidate(configure, "max", verification.maxLength, fieldInfo);
+      }
+      if (verification.verifyMinLength && verification.minLength) {
+        watchMaxOrMinValidate(configure, "min", verification.minLength, fieldInfo);
       }
     }
   }
 }
-function watchValidateType(pageDesign, configure, type, fieldInfo) {
+function watchValidateType(configure, type, fieldInfo) {
   if (type) {
-    if (!pageDesign.rules) {
-      pageDesign.rules = {};
-    }
     const prop = configure.props.base.prop;
     if (prop) {
-      const propName = getFormPropName(prop);
-      if (!pageDesign.rules[propName]) {
-        pageDesign.rules[propName] = [];
-      }
-      const validations = pageDesign.rules[propName];
-      const ruleIndex = validations.findIndex((item) => item.type === type);
-      if (ruleIndex !== void 0 && ruleIndex !== null && ruleIndex >= 0) {
-        validations.splice(ruleIndex, 1);
-      }
       const rule = {
         type,
         message: `${configure.props.base.title}格式不匹配`,
@@ -375,121 +360,38 @@ function watchValidateType(pageDesign, configure, type, fieldInfo) {
         // 删除格式时需要用该属性
       };
       packageStringRuleByDataType(fieldInfo, type, rule);
-      pageDesign.rules[propName].push(rule);
-    }
-  } else {
-    const prop = configure.props.base.prop;
-    if (prop) {
-      const propName = getFormPropName(prop);
-      if (pageDesign.rules && pageDesign.rules[propName]) {
-        const validations = pageDesign.rules[propName];
-        const ruleIndex = validations.findIndex((item) => item.myType);
-        if (ruleIndex !== void 0 && ruleIndex !== null && ruleIndex >= 0) {
-          validations.splice(ruleIndex, 1);
-        }
-      }
-    }
-  }
-}
-function watchPatternValidate(pageDesign, configure, pattern, fieldInfo) {
-  if (configure.props.verification && configure.props.verification.verifyRegex && pattern) {
-    if (!pageDesign.rules) {
-      pageDesign.rules = {};
-    }
-    const prop = configure.props.base.prop;
-    if (prop) {
-      const propName = getFormPropName(prop);
-      if (!pageDesign.rules[propName]) {
-        pageDesign.rules[propName] = [];
-      }
-      const validations = pageDesign.rules[propName];
-      const ruleIndex = validations.findIndex((item) => item.patternType);
-      if (ruleIndex !== void 0 && ruleIndex !== null && ruleIndex >= 0) {
-        validations.splice(ruleIndex, 1);
-      }
-      const rule = {
-        pattern,
-        message: `${configure.props.base.title}格式不匹配`,
-        label: configure.props.base.title,
-        patternType: "pattern"
-        // 删除格式时需要用该属性
-      };
-      packageRuleByDataType(fieldInfo, rule);
-      pageDesign.rules[propName].push(rule);
-    }
-  } else {
-    const prop = configure.props.base.prop;
-    if (prop) {
-      const propName = getFormPropName(prop);
-      if (pageDesign.rules && pageDesign.rules[propName]) {
-        const validations = pageDesign.rules[propName];
-        const ruleIndex = validations.findIndex((item) => item.patternType);
-        if (ruleIndex !== void 0 && ruleIndex !== null && ruleIndex >= 0) {
-          validations.splice(ruleIndex, 1);
-        }
-      }
+      configure.props.rules.push(rule);
     }
   }
 }
-function watchMaxOrMinValidate(pageDesign, configure, type, isEnable, value, fieldInfo) {
-  if (isEnable && type && value !== void 0 && value !== null) {
-    if (!pageDesign.rules) {
-      pageDesign.rules = {};
-    }
-    const prop = configure.props.base.prop;
-    if (prop) {
-      const propName = getFormPropName(prop);
-      if (!pageDesign.rules[propName]) {
-        pageDesign.rules[propName] = [];
-      }
-      const validations = pageDesign.rules[propName];
-      const ruleIndex = validations.findIndex((item) => item[type]);
-      if (ruleIndex !== void 0 && ruleIndex !== null && ruleIndex >= 0) {
-        validations.splice(ruleIndex, 1);
-      }
-      const rule = {
-        label: configure.props.base.title
-      };
-      rule[type] = value;
-      if (type === "max") {
-        rule["message"] = `${configure.props.base.title}最多只能输入${value}字符`;
-      } else {
-        rule["message"] = `${configure.props.base.title}至少输入${value}字符`;
-      }
-      packageRuleByDataType(fieldInfo, rule);
-      pageDesign.rules[propName].push(rule);
-    }
-  } else {
-    const prop = configure.props.base.prop;
-    if (prop) {
-      const propName = getFormPropName(prop);
-      if (pageDesign.rules && pageDesign.rules[propName]) {
-        const validations = pageDesign.rules[propName];
-        const ruleIndex = validations.findIndex((item) => item[type]);
-        if (ruleIndex !== void 0 && ruleIndex !== null && ruleIndex >= 0) {
-          validations.splice(ruleIndex, 1);
-        }
-      }
-    }
+function watchPatternValidate(configure, pattern, fieldInfo) {
+  const prop = configure.props.base.prop;
+  if (prop) {
+    const rule = {
+      pattern,
+      message: `${configure.props.base.title}格式不匹配`,
+      label: configure.props.base.title,
+      patternType: "pattern"
+      // 删除格式时需要用该属性
+    };
+    packageRuleByDataType(fieldInfo, rule);
+    configure.props.rules.push(rule);
   }
 }
-function deleteRule(pageDesign, configure) {
-  if (!configure.props || !configure.props.base) {
-    return;
-  }
+function watchMaxOrMinValidate(configure, type, value, fieldInfo) {
   const prop = configure.props.base.prop;
   if (prop) {
-    const propName = getFormPropName(prop);
-    if (pageDesign.rules && pageDesign.rules[propName]) {
-      delete pageDesign.rules[propName];
+    const rule = {
+      label: configure.props.base.title
+    };
+    rule[type] = value;
+    if (type === "max") {
+      rule["message"] = `${configure.props.base.title}最多只能输入${value}字符`;
+    } else {
+      rule["message"] = `${configure.props.base.title}至少输入${value}字符`;
     }
-  }
-}
-function getFormPropName(prop) {
-  if (prop && prop.indexOf("${") >= 0) {
-    return prop.substring(prop.indexOf(".") + 1, prop.lastIndexOf("}"));
-  } else {
-    return prop;
+    packageRuleByDataType(fieldInfo, rule);
+    configure.props.rules.push(rule);
   }
 }
 function packageRuleByDataType(fieldInfo, rule) {
@@ -540,10 +442,10 @@ export {
   caculateDetailComponentStyle,
   columnCustomTittleClass,
   columnTittleStyle,
-  deleteRule,
   removComponentOptionConfigs,
   watchMaxOrMinValidate,
   watchPatternValidate,
   watchRequiredValidate,
+  watchValidate,
   watchValidateType
 };

package/dist/es/components/design/utils/interfaces/page-design-types.d.ts

@@ -69,7 +69,6 @@ export interface PageDesign extends Component {
     label: string;
     notIdInitializationList?: Array<any>;
     subTablePageInfo?: object;
-    customValidatorUuids?: Array<string>;
     customEvents?: Array<any>;
     tableRuntimes?: {
         [uuid: string]: object;

package/dist/es/components/design/utils/page-design-util.d.ts

@@ -1,3 +1,4 @@
 export declare function queryWorkflowsRequest(tableName: any): any;
 export declare function createWorkflowRequest(tableName: any, pageName: any): any;
-export declare function getHighestVersionDefinition(wfDefinitionCode: any, defVersion: any): any;
+export declare function getHighestVersionDefinition(wfDefinitionCode: any, defVersion: any, publishVersion: any): any;
+export declare function getPublishVersionsByCode(systemCode: any): any;

package/dist/es/components/design/utils/page-design-util.js

@@ -23,10 +23,10 @@ function createWorkflowRequest(tableName, pageName) {
     params
   );
 }
-function getHighestVersionDefinition(wfDefinitionCode, defVersion) {
+function getHighestVersionDefinition(wfDefinitionCode, defVersion, publishVersion) {
   const params = {
     wfDefinitionCode,
-    publishVersion: getPublishVersion()
+    publishVersion
   };
   if (defVersion !== void 0) {
     params["defVersion"] = defVersion;
@@ -36,8 +36,14 @@ function getHighestVersionDefinition(wfDefinitionCode, defVersion) {
     params
   );
 }
+function getPublishVersionsByCode(systemCode) {
+  return http.get(
+    window["$vueApp"].config.globalProperties.baseAPI + `/mms/systems/getPublishVersionsByCode/${systemCode}`
+  );
+}
 export {
   createWorkflowRequest,
   getHighestVersionDefinition,
+  getPublishVersionsByCode,
   queryWorkflowsRequest
 };

package/dist/es/components/design/utils/page-service-util.d.ts

@@ -0,0 +1,15 @@
+/**
+ * 查询服务信息
+ * @param systemCode
+ * @param systemVersion
+ * @param tableName
+ * @returns
+ */
+export declare function queryServiceInfo(serivceId: number): Promise<any>;
+/**
+ * 查询服务的返回字段信息
+ * @param serviceInfo
+ * @returns
+ */
+export declare function queryServiceReturnFields(serivceId: number): Promise<any>;
+export declare function fetchPageDesignData(pageId: number): any;

package/dist/es/components/design/utils/page-service-util.js

@@ -49,7 +49,12 @@ function convertReturnValuesToFields(parentFieldName, returnValues, fieldInfos)
     }
   }
 }
+function fetchPageDesignData(pageId) {
+  let url = window["$vueApp"].config.globalProperties.baseAPI + "/component/super-page-design/" + pageId;
+  return http.get(url);
+}
 export {
+  fetchPageDesignData,
   queryServiceInfo,
   queryServiceReturnFields
 };

package/dist/es/components/design/views/assemblys/button/button/button-attr-base.vue.js

@@ -1,13 +1,15 @@
 import { defineComponent, ref, onMounted, resolveComponent, openBlock, createBlock, withCtx, createVNode, createElementVNode, createElementBlock, Fragment, renderList, unref, createTextVNode, withDirectives, vShow } from "vue";
 import { getFormComponentOptions } from "../../../../utils/assemblys-config.js";
 import "../../../../../../stores/page-store.js";
-import "../../form/common/dimension-input.vue.js";
+/* empty css                                     */
 import _sfc_main$2 from "../../common/common-icon-bind.vue.js";
 import http from "agilebuilder-ui/src/utils/request";
 import _sfc_main$1 from "../../common/common-function-code.vue.js";
+import _sfc_main$3 from "../../form/common/suffixmodule.vue.js";
 const _hoisted_1 = { style: { "padding": "8px 0px 0px 0px" } };
 const _hoisted_2 = { style: { "padding": "8px 0px 0px 0px" } };
 const _hoisted_3 = { style: { "padding": "8px 0px 0px 0px" } };
+const _hoisted_4 = { style: { "padding": "8px 0px 0px 0px" } };
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "button-attr-base",
   props: {
@@ -22,7 +24,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
   },
   setup(__props) {
     const props = __props;
-    const openCollapseItems = ref(["base", "appearance", "otherSettings"]);
+    const openCollapseItems = ref(["base", "appearance", "otherSettings", "linkPage"]);
     const templateList = ref({});
     const tableList = ref([]);
     function getTableList() {
@@ -493,13 +495,28 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                 ]),
                 _: 1
               }),
+              createVNode(_component_el_collapse_item, {
+                title: "跳转配置",
+                name: "linkPage",
+                class: "amb-design-attr-group-header"
+              }, {
+                default: withCtx(() => [
+                  createElementVNode("div", _hoisted_3, [
+                    createVNode(_sfc_main$3, {
+                      configure: __props.configure,
+                      pageDesign: __props.pageDesign
+                    }, null, 8, ["configure", "pageDesign"])
+                  ])
+                ]),
+                _: 1
+              }),
               createVNode(_component_el_collapse_item, {
                 title: "其他设置",
                 name: "otherSettings",
                 class: "amb-design-attr-group-header"
               }, {
                 default: withCtx(() => [
-                  createElementVNode("div", _hoisted_3, [
+                  createElementVNode("div", _hoisted_4, [
                     createVNode(_component_el_form_item, {
                       label: "回填赋值",
                       class: "amb-design-attr-item"

package/dist/es/components/design/views/assemblys/button/button/button-attr-event.vue.js

@@ -1,4 +1,4 @@
-import { defineComponent, resolveComponent, openBlock, createBlock, withCtx, createVNode, unref } from "vue";
+import { defineComponent, ref, watch, resolveComponent, openBlock, createBlock, withCtx, createVNode } from "vue";
 import AttrEvent from "../../form/common/attr-event.vue.js";
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "button-attr-event",
@@ -7,7 +7,10 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
   },
   setup(__props) {
     const props = __props;
-    const events = props.configure.events;
+    const events = ref([]);
+    watch(() => props.configure.events, (newVal) => {
+      events.value = props.configure.events;
+    }, { immediate: true });
     return (_ctx, _cache) => {
       const _component_el_form = resolveComponent("el-form");
       return openBlock(), createBlock(_component_el_form, {
@@ -17,7 +20,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         default: withCtx(() => [
           createVNode(AttrEvent, {
             configure: __props.configure,
-            events: unref(events)
+            events: events.value
           }, null, 8, ["configure", "events"])
         ]),
         _: 1

package/dist/es/components/design/views/assemblys/button/button/button-attr.vue.js

@@ -1,5 +1,5 @@
 import _sfc_main from "./button-attr.vue2.js";
-import "./button-attr.vue3.js";
+/* empty css                 */
 export {
   _sfc_main as default
 };

package/dist/es/components/design/views/assemblys/button/button-group/buttongroup-attr.vue.js

@@ -1,5 +1,5 @@
 import _sfc_main from "./buttongroup-attr.vue2.js";
-import "./buttongroup-attr.vue3.js";
+/* empty css                      */
 export {
   _sfc_main as default
 };

package/dist/es/components/design/views/assemblys/button/component/journal-set-dialog.css

@@ -0,0 +1,4 @@
+
+.el-tag[data-v-665d3bf4]{
+	margin-left: 10px;
+}

package/dist/es/components/design/views/assemblys/button/component/journal-set-dialog.vue.js

@@ -1,5 +1,5 @@
 import _sfc_main from "./journal-set-dialog.vue2.js";
-import "./journal-set-dialog.vue3.js";
+/* empty css                        */
 import _export_sfc from "../../../../../../_virtual/_plugin-vue_export-helper.js";
 const JournalSetDialog = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-665d3bf4"]]);
 export {

package/dist/es/components/design/views/assemblys/button/dropdown/dropdown-attr.vue.js

@@ -1,5 +1,5 @@
 import _sfc_main from "./dropdown-attr.vue2.js";
-import "./dropdown-attr.vue3.js";
+/* empty css                   */
 export {
   _sfc_main as default
 };

package/dist/es/components/design/views/assemblys/chart/column-line/column-line-attr-base.vue.js

@@ -3,7 +3,7 @@ import _sfc_main$1 from "../common/common-attr-base.vue.js";
 import _sfc_main$2 from "../common/common-attr-serieslist.vue.js";
 import _sfc_main$4 from "../common/common-attr-groupby.vue.js";
 import _sfc_main$5 from "../common/common-attr-sortby.vue.js";
-import _sfc_main$6 from "../common/common-attr-drill.vue.js";
+import _sfc_main$6 from "../../form/common/data-linkage.vue.js";
 import _sfc_main$7 from "../common/common-attr-assistant.vue.js";
 import _sfc_main$8 from "../../common/common-attr-size.vue.js";
 import _sfc_main$3 from "../common/common-attr-data.vue.js";
@@ -24,7 +24,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       "attrSize",
       "propsSort",
       "propsDrill",
-      "propsAssistant"
+      "propsAssistant",
+      "linkage"
     ]);
     return (_ctx, _cache) => {
       const _component_el_collapse = resolveComponent("el-collapse");
@@ -51,7 +52,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
               createVNode(_sfc_main$3, { configure: __props.configure }, null, 8, ["configure"]),
               createVNode(_sfc_main$4, { configure: __props.configure }, null, 8, ["configure"]),
               createVNode(_sfc_main$5, { configure: __props.configure }, null, 8, ["configure"]),
-              createVNode(_sfc_main$6, { configure: __props.configure }, null, 8, ["configure"]),
+              createVNode(_sfc_main$6, {
+                configureProps: __props.configure.props
+              }, null, 8, ["configureProps"]),
               createVNode(_sfc_main$7, { configure: __props.configure }, null, 8, ["configure"]),
               createVNode(_sfc_main$8, {
                 size: __props.configure.props.size

package/dist/es/components/design/views/assemblys/chart/column-line/column-line-attr-style.vue.js

@@ -29,7 +29,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     if (props.configure.style.yaxisRight == void 0) {
       props.configure.style.yaxisRight = {};
     }
-    const openCollapseItems = ref(["titleFont"]);
+    const openCollapseItems = ref(["titleFont", "subtitleFont", "styleLegend", "styleGrid"]);
     return (_ctx, _cache) => {
       const _component_el_input_number = resolveComponent("el-input-number");
       const _component_el_text = resolveComponent("el-text");

package/dist/es/components/design/views/assemblys/chart/column-line/column-line-design.vue2.js

@@ -1,7 +1,7 @@
 import { defineComponent, ref, watch, onUnmounted, openBlock, createElementBlock, normalizeStyle, normalizeClass, withModifiers, withDirectives, createVNode, vShow, unref, createElementVNode, Fragment, renderList, toDisplayString } from "vue";
 import { getUuidv4 } from "../../../../utils/common-util.js";
 import { caculateComponentStyle } from "../../../../utils/container-design-util.js";
-import { initComponentDataConfig, removComponentDataConfig, generateChartHeader, generateChartOption } from "../../../../utils/chart-design-util.js";
+import { removComponentDataConfig, generateChartHeader, generateChartOption, initComponentDataConfig } from "../../../../utils/chart-design-util.js";
 import { getCustomTheme } from "super-page-runtime";
 import _sfc_main$2 from "./series/column-line-series-attr.vue.js";
 import _sfc_main$1 from "../common/common-chart-header.vue.js";
@@ -69,15 +69,19 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       },
       { immediate: true }
     );
+    function updateDataConfig() {
+      const dataConfig = initComponentDataConfig(props.configure, headerInfo.value);
+      props.configure.runtime.dataConfig = dataConfig;
+    }
     watch(props.configure.props, () => {
       customChartOption();
-      initComponentDataConfig(props.configure, headerInfo.value);
+      updateDataConfig();
     });
     watch(props.configure.items, () => {
       customChartOption();
     });
     setTimeout(() => {
-      initComponentDataConfig(props.configure, headerInfo.value);
+      updateDataConfig();
     }, 100);
     onUnmounted(() => {
       removComponentDataConfig(props.configure);

package/dist/es/components/design/views/assemblys/chart/column-line/series/column-line-series-attr-base.vue.js

@@ -126,7 +126,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                 _: 1
               }),
               createVNode(_sfc_main$1, { configure: __props.configure }, null, 8, ["configure"]),
-              createVNode(_sfc_main$2, { configure: __props.configure }, null, 8, ["configure"]),
+              withDirectives(createVNode(_sfc_main$2, { configure: __props.configure }, null, 8, ["configure"]), [
+                [vShow, __props.configure.props.yaxisSource != "fix"]
+              ]),
               createVNode(_sfc_main$3, { configure: __props.configure }, null, 8, ["configure"])
             ]),
             _: 1

package/dist/es/components/design/views/assemblys/chart/column-line/series/column-line-series-attr-style.vue.js

@@ -17,7 +17,10 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     return (_ctx, _cache) => {
       const _component_el_collapse = resolveComponent("el-collapse");
       const _component_el_form = resolveComponent("el-form");
-      return openBlock(), createBlock(_component_el_form, { "label-width": "80px" }, {
+      return openBlock(), createBlock(_component_el_form, {
+        "label-width": "80px",
+        size: "small"
+      }, {
         default: withCtx(() => [
           createVNode(_component_el_collapse, {
             modelValue: openCollapseItems.value,

package/dist/es/components/design/views/assemblys/chart/common/common-attr-data.vue.js

@@ -1,10 +1,12 @@
-import { defineComponent, ref, computed, resolveComponent, openBlock, createBlock, withCtx, createElementVNode, createVNode, unref, createElementBlock, Fragment, renderList, toDisplayString, createTextVNode } from "vue";
+import { defineComponent, ref, computed, resolveComponent, openBlock, createBlock, withCtx, createElementVNode, createVNode, unref, createElementBlock, Fragment, renderList, toDisplayString, createTextVNode, withDirectives, vShow } from "vue";
 import _sfc_main$1 from "../../common/page-permission-select.vue.js";
 import { usePageContextStore } from "../../../../../../stores/page-store.js";
 import { queryServiceReturnFields } from "../../../../utils/page-service-util.js";
 const _hoisted_1 = { style: { "padding": "8px 0px 0px 0px" } };
 const _hoisted_2 = { style: { "float": "left" } };
 const _hoisted_3 = { style: { "float": "right", "color": "var(--el-text-color-secondary)", "font-size": "13px" } };
+const _hoisted_4 = { style: { "float": "left" } };
+const _hoisted_5 = { style: { "float": "right", "color": "var(--el-text-color-secondary)", "font-size": "13px" } };
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "common-attr-data",
   props: {
@@ -15,6 +17,10 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     defaultType: {
       type: String,
       default: ""
+    },
+    chartType: {
+      type: String,
+      default: ""
     }
   },
   setup(__props) {
@@ -24,7 +30,28 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const serviceFields = ref([]);
     const showFields = computed(() => {
       return serviceFields.value.filter((item) => {
-        return true;
+        return item.type == "array" || item.type == "any" || !item.type;
+      });
+    });
+    const yaxisFields = computed(() => {
+      return serviceFields.value.filter((item) => {
+        if (item.type == "number" || item.type == "any" || !item.type) {
+          const prevField = props.configure.serviceDataField;
+          if (!prevField || item.value.startsWith(prevField + ".")) {
+            let numValue = item.value;
+            let numLabel = item.label;
+            if (prevField) {
+              numValue = numValue.substring(prevField.length + 1);
+              if (numLabel) {
+                numLabel = numLabel.replace(prevField + ".", "");
+              }
+            }
+            item.numValue = numValue;
+            item.numLabel = numLabel;
+            return true;
+          }
+        }
+        return false;
       });
     });
     if (!props.configure.props.dataOrigin) {
@@ -147,7 +174,45 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                 })
               ]),
               _: 1
-            })
+            }),
+            withDirectives(createVNode(_component_el_form_item, {
+              label: "数据字段",
+              style: { "margin-top": "15px", "margin-bottom": "-15px" }
+            }, {
+              default: withCtx(() => [
+                createVNode(_component_el_select, {
+                  size: "small",
+                  modelValue: __props.configure.props.yaxisField,
+                  "onUpdate:modelValue": _cache[2] || (_cache[2] = ($event) => __props.configure.props.yaxisField = $event),
+                  title: __props.configure.props.yaxisField,
+                  style: { "width": "160px" },
+                  filterable: "",
+                  "allow-create": "",
+                  clearable: "",
+                  placeholder: "请选择"
+                }, {
+                  default: withCtx(() => [
+                    (openBlock(true), createElementBlock(Fragment, null, renderList(yaxisFields.value, (item) => {
+                      return openBlock(), createBlock(_component_el_option, {
+                        key: item.numValue,
+                        label: item.numLabel,
+                        value: item.numValue
+                      }, {
+                        default: withCtx(() => [
+                          createElementVNode("span", _hoisted_4, toDisplayString(item.numLabel), 1),
+                          createElementVNode("span", _hoisted_5, toDisplayString(item.type), 1)
+                        ]),
+                        _: 2
+                      }, 1032, ["label", "value"]);
+                    }), 128))
+                  ]),
+                  _: 1
+                }, 8, ["modelValue", "title"])
+              ]),
+              _: 1
+            }, 512), [
+              [vShow, __props.chartType == "pie"]
+            ])
           ])
         ]),
         _: 1