jtui3.0 1.0.68 → 1.0.70

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -91092,7 +91092,7 @@ const ElMessage = withInstallFunction(message, "$message");
91092
91092
  /*
91093
91093
  * @Author: leevan
91094
91094
  * @Date: 2022-07-04 14:32:14
91095
- * @LastEditTime: 2023-05-11 20:22:18
91095
+ * @LastEditTime: 2024-03-04 17:40:17
91096
91096
  * @LastEditors: leevan
91097
91097
  * @FilePath: /jtui3.0/packages/tables/hooks/usePublicAPI.js
91098
91098
  */
@@ -91151,6 +91151,7 @@ function usePublicAPI(emit, activeRef, props) {
91151
91151
 
91152
91152
 
91153
91153
  function treeTxtClick(row) {
91154
+ activeRef.value.setCurrentRow(row);
91154
91155
  let treePath = [];
91155
91156
  const result = xe_utils_default().findTree(activeRef.value.data, item => {
91156
91157
  return item.rowid === row.rowid;
@@ -105096,7 +105097,7 @@ const ElColorPicker = _ColorPicker;
105096
105097
 
105097
105098
 
105098
105099
 
105099
- ;// CONCATENATED MODULE: ./node_modules/unplugin/dist/webpack/loaders/transform.js??ruleSet[1].rules[33].use[0]!./node_modules/unplugin/dist/webpack/loaders/transform.js??ruleSet[1].rules[34].use[0]!./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-82.use[1]!./node_modules/vue-loader/dist/templateLoader.js??ruleSet[1].rules[3]!./node_modules/vue-loader/dist/index.js??ruleSet[0].use[0]!./packages/echarts/index.vue?vue&type=template&id=422c2ffa&scoped=true
105100
+ ;// CONCATENATED MODULE: ./node_modules/unplugin/dist/webpack/loaders/transform.js??ruleSet[1].rules[33].use[0]!./node_modules/unplugin/dist/webpack/loaders/transform.js??ruleSet[1].rules[34].use[0]!./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-82.use[1]!./node_modules/vue-loader/dist/templateLoader.js??ruleSet[1].rules[3]!./node_modules/vue-loader/dist/index.js??ruleSet[0].use[0]!./packages/echarts/index.vue?vue&type=template&id=c5c6e504&scoped=true
105100
105101
  /* unplugin-vue-components disabled */
105101
105102
 
105102
105103
 
@@ -105106,26 +105107,26 @@ const ElColorPicker = _ColorPicker;
105106
105107
 
105107
105108
 
105108
105109
 
105109
- const echartsvue_type_template_id_422c2ffa_scoped_true_withScopeId = n => (_pushScopeId("data-v-422c2ffa"), n = n(), _popScopeId(), n);
105110
+ const echartsvue_type_template_id_c5c6e504_scoped_true_withScopeId = n => (_pushScopeId("data-v-c5c6e504"), n = n(), _popScopeId(), n);
105110
105111
 
105111
- const echartsvue_type_template_id_422c2ffa_scoped_true_hoisted_1 = {
105112
+ const echartsvue_type_template_id_c5c6e504_scoped_true_hoisted_1 = {
105112
105113
  class: "echarts-wapper"
105113
105114
  };
105114
- const echartsvue_type_template_id_422c2ffa_scoped_true_hoisted_2 = ["id"];
105115
+ const echartsvue_type_template_id_c5c6e504_scoped_true_hoisted_2 = ["id"];
105115
105116
 
105116
- const echartsvue_type_template_id_422c2ffa_scoped_true_hoisted_3 = /*#__PURE__*/(0,external_commonjs_vue_commonjs2_vue_root_Vue_.createTextVNode)("实线");
105117
+ const echartsvue_type_template_id_c5c6e504_scoped_true_hoisted_3 = /*#__PURE__*/(0,external_commonjs_vue_commonjs2_vue_root_Vue_.createTextVNode)("实线");
105117
105118
 
105118
- const echartsvue_type_template_id_422c2ffa_scoped_true_hoisted_4 = /*#__PURE__*/(0,external_commonjs_vue_commonjs2_vue_root_Vue_.createTextVNode)("虚线");
105119
+ const echartsvue_type_template_id_c5c6e504_scoped_true_hoisted_4 = /*#__PURE__*/(0,external_commonjs_vue_commonjs2_vue_root_Vue_.createTextVNode)("虚线");
105119
105120
 
105120
- const echartsvue_type_template_id_422c2ffa_scoped_true_hoisted_5 = /*#__PURE__*/(0,external_commonjs_vue_commonjs2_vue_root_Vue_.createTextVNode)("点");
105121
+ const echartsvue_type_template_id_c5c6e504_scoped_true_hoisted_5 = /*#__PURE__*/(0,external_commonjs_vue_commonjs2_vue_root_Vue_.createTextVNode)("点");
105121
105122
 
105122
- const echartsvue_type_template_id_422c2ffa_scoped_true_hoisted_6 = /*#__PURE__*/(0,external_commonjs_vue_commonjs2_vue_root_Vue_.createTextVNode)("实线");
105123
+ const echartsvue_type_template_id_c5c6e504_scoped_true_hoisted_6 = /*#__PURE__*/(0,external_commonjs_vue_commonjs2_vue_root_Vue_.createTextVNode)("实线");
105123
105124
 
105124
- const echartsvue_type_template_id_422c2ffa_scoped_true_hoisted_7 = /*#__PURE__*/(0,external_commonjs_vue_commonjs2_vue_root_Vue_.createTextVNode)("虚线");
105125
+ const echartsvue_type_template_id_c5c6e504_scoped_true_hoisted_7 = /*#__PURE__*/(0,external_commonjs_vue_commonjs2_vue_root_Vue_.createTextVNode)("虚线");
105125
105126
 
105126
- const echartsvue_type_template_id_422c2ffa_scoped_true_hoisted_8 = /*#__PURE__*/(0,external_commonjs_vue_commonjs2_vue_root_Vue_.createTextVNode)("点");
105127
+ const echartsvue_type_template_id_c5c6e504_scoped_true_hoisted_8 = /*#__PURE__*/(0,external_commonjs_vue_commonjs2_vue_root_Vue_.createTextVNode)("点");
105127
105128
 
105128
- function echartsvue_type_template_id_422c2ffa_scoped_true_render(_ctx, _cache, $props, $setup, $data, $options) {
105129
+ function echartsvue_type_template_id_c5c6e504_scoped_true_render(_ctx, _cache, $props, $setup, $data, $options) {
105129
105130
  const _component_el_switch = ElSwitch;
105130
105131
 
105131
105132
  const _component_el_form_item = ElFormItem;
@@ -105140,11 +105141,11 @@ function echartsvue_type_template_id_422c2ffa_scoped_true_render(_ctx, _cache, $
105140
105141
 
105141
105142
  const _component_el_dialog = ElDialog;
105142
105143
 
105143
- return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.openBlock)(), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createElementBlock)("div", echartsvue_type_template_id_422c2ffa_scoped_true_hoisted_1, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.createElementVNode)("div", {
105144
+ return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.openBlock)(), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createElementBlock)("div", echartsvue_type_template_id_c5c6e504_scoped_true_hoisted_1, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.createElementVNode)("div", {
105144
105145
  ref: el => $setup.setRef(el),
105145
105146
  id: $props.id,
105146
105147
  class: "jt-chart-vm"
105147
- }, null, 8, echartsvue_type_template_id_422c2ffa_scoped_true_hoisted_2), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createElementVNode)("span", {
105148
+ }, null, 8, echartsvue_type_template_id_c5c6e504_scoped_true_hoisted_2), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createElementVNode)("span", {
105148
105149
  class: "jtIcon iconpeizhi41 eitid-icon",
105149
105150
  onClick: _cache[0] || (_cache[0] = $event => $setup.dialogVisible = true)
105150
105151
  }), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createVNode)(_component_el_dialog, {
@@ -105227,21 +105228,21 @@ function echartsvue_type_template_id_422c2ffa_scoped_true_render(_ctx, _cache, $
105227
105228
  "onUpdate:modelValue": _cache[8] || (_cache[8] = $event => $setup.gridLineConfig.lineType = $event),
105228
105229
  label: "solid"
105229
105230
  }, {
105230
- default: (0,external_commonjs_vue_commonjs2_vue_root_Vue_.withCtx)(() => [echartsvue_type_template_id_422c2ffa_scoped_true_hoisted_3]),
105231
+ default: (0,external_commonjs_vue_commonjs2_vue_root_Vue_.withCtx)(() => [echartsvue_type_template_id_c5c6e504_scoped_true_hoisted_3]),
105231
105232
  _: 1
105232
105233
  }, 8, ["modelValue"]), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createVNode)(_component_el_radio, {
105233
105234
  modelValue: $setup.gridLineConfig.lineType,
105234
105235
  "onUpdate:modelValue": _cache[9] || (_cache[9] = $event => $setup.gridLineConfig.lineType = $event),
105235
105236
  label: "dashed"
105236
105237
  }, {
105237
- default: (0,external_commonjs_vue_commonjs2_vue_root_Vue_.withCtx)(() => [echartsvue_type_template_id_422c2ffa_scoped_true_hoisted_4]),
105238
+ default: (0,external_commonjs_vue_commonjs2_vue_root_Vue_.withCtx)(() => [echartsvue_type_template_id_c5c6e504_scoped_true_hoisted_4]),
105238
105239
  _: 1
105239
105240
  }, 8, ["modelValue"]), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createVNode)(_component_el_radio, {
105240
105241
  modelValue: $setup.gridLineConfig.lineType,
105241
105242
  "onUpdate:modelValue": _cache[10] || (_cache[10] = $event => $setup.gridLineConfig.lineType = $event),
105242
105243
  label: "dotted"
105243
105244
  }, {
105244
- default: (0,external_commonjs_vue_commonjs2_vue_root_Vue_.withCtx)(() => [echartsvue_type_template_id_422c2ffa_scoped_true_hoisted_5]),
105245
+ default: (0,external_commonjs_vue_commonjs2_vue_root_Vue_.withCtx)(() => [echartsvue_type_template_id_c5c6e504_scoped_true_hoisted_5]),
105245
105246
  _: 1
105246
105247
  }, 8, ["modelValue"])]),
105247
105248
  _: 1
@@ -105288,21 +105289,21 @@ function echartsvue_type_template_id_422c2ffa_scoped_true_render(_ctx, _cache, $
105288
105289
  "onUpdate:modelValue": _cache[15] || (_cache[15] = $event => $setup.tickLineConfig.lineType = $event),
105289
105290
  label: "solid"
105290
105291
  }, {
105291
- default: (0,external_commonjs_vue_commonjs2_vue_root_Vue_.withCtx)(() => [echartsvue_type_template_id_422c2ffa_scoped_true_hoisted_6]),
105292
+ default: (0,external_commonjs_vue_commonjs2_vue_root_Vue_.withCtx)(() => [echartsvue_type_template_id_c5c6e504_scoped_true_hoisted_6]),
105292
105293
  _: 1
105293
105294
  }, 8, ["modelValue"]), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createVNode)(_component_el_radio, {
105294
105295
  modelValue: $setup.tickLineConfig.lineType,
105295
105296
  "onUpdate:modelValue": _cache[16] || (_cache[16] = $event => $setup.tickLineConfig.lineType = $event),
105296
105297
  label: "dashed"
105297
105298
  }, {
105298
- default: (0,external_commonjs_vue_commonjs2_vue_root_Vue_.withCtx)(() => [echartsvue_type_template_id_422c2ffa_scoped_true_hoisted_7]),
105299
+ default: (0,external_commonjs_vue_commonjs2_vue_root_Vue_.withCtx)(() => [echartsvue_type_template_id_c5c6e504_scoped_true_hoisted_7]),
105299
105300
  _: 1
105300
105301
  }, 8, ["modelValue"]), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createVNode)(_component_el_radio, {
105301
105302
  modelValue: $setup.tickLineConfig.lineType,
105302
105303
  "onUpdate:modelValue": _cache[17] || (_cache[17] = $event => $setup.tickLineConfig.lineType = $event),
105303
105304
  label: "dotted"
105304
105305
  }, {
105305
- default: (0,external_commonjs_vue_commonjs2_vue_root_Vue_.withCtx)(() => [echartsvue_type_template_id_422c2ffa_scoped_true_hoisted_8]),
105306
+ default: (0,external_commonjs_vue_commonjs2_vue_root_Vue_.withCtx)(() => [echartsvue_type_template_id_c5c6e504_scoped_true_hoisted_8]),
105306
105307
  _: 1
105307
105308
  }, 8, ["modelValue"])]),
105308
105309
  _: 1
@@ -105312,7 +105313,7 @@ function echartsvue_type_template_id_422c2ffa_scoped_true_render(_ctx, _cache, $
105312
105313
  _: 1
105313
105314
  }, 8, ["modelValue"])]);
105314
105315
  }
105315
- ;// CONCATENATED MODULE: ./packages/echarts/index.vue?vue&type=template&id=422c2ffa&scoped=true
105316
+ ;// CONCATENATED MODULE: ./packages/echarts/index.vue?vue&type=template&id=c5c6e504&scoped=true
105316
105317
  /* unplugin-vue-components disabled */
105317
105318
  ;// CONCATENATED MODULE: ./node_modules/echarts/node_modules/tslib/tslib.es6.js
105318
105319
 
@@ -223848,6 +223849,14 @@ const erd = element_resize_detector_default()();
223848
223849
  //自定义事件间隔
223849
223850
  customIntrerVal: {
223850
223851
  type: Number
223852
+ },
223853
+ yLeft: {
223854
+ type: String,
223855
+ default: ''
223856
+ },
223857
+ yRight: {
223858
+ type: String,
223859
+ default: ''
223851
223860
  }
223852
223861
  },
223853
223862
 
@@ -223866,22 +223875,29 @@ const erd = element_resize_detector_default()();
223866
223875
 
223867
223876
  let chartVM;
223868
223877
  let option;
223869
- let tempArray = [];
223878
+ const isDoubleY = props.data.findIndex(item => 'yAxisIndex' in item && item.yAxisIndex == 1) != -1;
223879
+ let tempArray = []; //左边y轴的数据
223880
+
223881
+ let tempArrayRight = []; //右边y轴的数据
223882
+
223870
223883
  props.data.forEach(item => {
223871
- tempArray = tempArray.concat(item.data);
223884
+ if ('yAxisIndex' in item && item.yAxisIndex == 1) {
223885
+ tempArrayRight = tempArrayRight.concat(item.data);
223886
+ } else {
223887
+ tempArray = tempArray.concat(item.data);
223888
+ }
223872
223889
  });
223873
223890
 
223874
223891
  if (timeRange.value && tempArray.length != 0) {
223875
- const {
223876
- minVal,
223877
- maxVal
223878
- } = getMaxAndMinValue();
223879
223892
  option = {
223880
223893
  xAxis: {
223881
223894
  type: "value",
223882
223895
  min: new Date(timeRange.value[0]).getTime(),
223883
223896
  max: new Date(timeRange.value[1]).getTime(),
223884
223897
  interval: 6 * 60 * 60 * 1000,
223898
+ nameTextStyle: {
223899
+ padding: [0, 0, 0, 20]
223900
+ },
223885
223901
  axisLabel: {
223886
223902
  formatter: function (e) {
223887
223903
  let temp;
@@ -223929,17 +223945,35 @@ const erd = element_resize_detector_default()();
223929
223945
  tooltip: {
223930
223946
  trigger: 'axis',
223931
223947
  formatter: params => {
223932
- return `${dayjs_dayjs_min_default()(params[0].data[0]).format('YYYY-MM-DD HH:mm')}
223933
- <br/>${params[0].seriesName}:${params[0].data[1]}`;
223948
+ let str = '';
223949
+ params.forEach(item => {
223950
+ str += `<br/>${item.seriesName}:${item.data[1]}`;
223951
+ });
223952
+ return `${dayjs_dayjs_min_default()(params[0].data[0]).format('YYYY-MM-DD HH:mm')}${str}`;
223934
223953
  }
223935
223954
  },
223955
+ grid: {
223956
+ bottom: 80
223957
+ },
223936
223958
  legend: {
223937
223959
  data: []
223938
223960
  },
223939
- yAxis: {
223940
- type: 'value',
223941
- min: minVal,
223942
- max: maxVal,
223961
+ yAxis: [],
223962
+ dataZoom: [{
223963
+ type: 'inside',
223964
+ xAxisIndex: 0
223965
+ }, {
223966
+ type: 'slider',
223967
+ xAxisIndex: 0
223968
+ }],
223969
+ series: props.data
223970
+ };
223971
+
223972
+ if (isDoubleY) {
223973
+ option.yAxis = [{
223974
+ name: props.yLeft,
223975
+ min: 0,
223976
+ max: 0,
223943
223977
  minorTick: {
223944
223978
  show: true,
223945
223979
  lineStyle: {}
@@ -223956,16 +223990,66 @@ const erd = element_resize_detector_default()();
223956
223990
  color: '#333'
223957
223991
  }
223958
223992
  }
223959
- },
223960
- dataZoom: [{
223961
- type: 'inside',
223962
- xAxisIndex: 0
223963
223993
  }, {
223964
- type: 'slider',
223965
- xAxisIndex: 0
223966
- }],
223967
- series: props.data
223968
- };
223994
+ name: props.yRight,
223995
+ min: 0,
223996
+ max: 5,
223997
+ minorTick: {
223998
+ show: true,
223999
+ lineStyle: {}
224000
+ },
224001
+ minorSplitLine: {
224002
+ show: true,
224003
+ lineStyle: {
224004
+ color: '#ccc'
224005
+ }
224006
+ },
224007
+ splitLine: {
224008
+ show: true,
224009
+ lineStyle: {
224010
+ color: '#333'
224011
+ }
224012
+ }
224013
+ }];
224014
+ } else {
224015
+ option.yAxis = [{
224016
+ name: props.yLeft,
224017
+ min: 0,
224018
+ max: 0,
224019
+ minorTick: {
224020
+ show: true,
224021
+ lineStyle: {}
224022
+ },
224023
+ minorSplitLine: {
224024
+ show: true,
224025
+ lineStyle: {
224026
+ color: '#ccc'
224027
+ }
224028
+ },
224029
+ splitLine: {
224030
+ show: true,
224031
+ lineStyle: {
224032
+ color: '#333'
224033
+ }
224034
+ }
224035
+ }];
224036
+ }
224037
+
224038
+ const {
224039
+ minVal,
224040
+ maxVal
224041
+ } = getMaxAndMinValue(tempArray);
224042
+ option.yAxis[0].min = minVal;
224043
+ option.yAxis[0].max = maxVal;
224044
+
224045
+ if (isDoubleY) {
224046
+ const {
224047
+ minVal: minValRight,
224048
+ maxValRight
224049
+ } = getMaxAndMinValue(tempArrayRight);
224050
+ option.yAxis[1].min = minValRight;
224051
+ option.yAxis[1].max = maxValRight;
224052
+ }
223969
224053
  } else {
223970
224054
  option = {
223971
224055
  title: {
@@ -224057,7 +224141,6 @@ const erd = element_resize_detector_default()();
224057
224141
  option.xAxis.max = maxTime;
224058
224142
  option.legend.data = option.series.map(item => item.name);
224059
224143
  setGridLine(gridLineConfig);
224060
- console.log(option, 111);
224061
224144
  chartVM.setOption(option, true);
224062
224145
  } //监听网格线相关设置操作
224063
224146
 
@@ -224074,36 +224157,95 @@ const erd = element_resize_detector_default()();
224074
224157
 
224075
224158
  function setGridLine(obj) {
224076
224159
  option.xAxis.minorTick.show = obj.tickX;
224077
- option.yAxis.minorTick.show = obj.tickY;
224160
+ option.yAxis[0].minorTick.show = obj.tickY;
224161
+
224162
+ if (isDoubleY) {
224163
+ option.yAxis[1].minorTick.show = obj.tickY;
224164
+ }
224165
+
224078
224166
  option.xAxis.minorSplitLine.show = obj.lineX;
224079
- option.yAxis.minorSplitLine.show = obj.lineY;
224167
+ option.yAxis[0].minorSplitLine.show = obj.lineY;
224168
+
224169
+ if (isDoubleY) {
224170
+ option.yAxis[1].minorSplitLine.show = obj.lineY;
224171
+ }
224172
+
224080
224173
  option.xAxis.minorSplitLine.lineStyle.color = obj.lineColor;
224081
- option.yAxis.minorSplitLine.lineStyle.color = obj.lineColor;
224174
+ option.yAxis[0].minorSplitLine.lineStyle.color = obj.lineColor;
224175
+
224176
+ if (isDoubleY) {
224177
+ option.yAxis[1].minorSplitLine.lineStyle.color = obj.lineColor;
224178
+ }
224179
+
224082
224180
  option.xAxis.minorTick.lineStyle.width = obj.lineWidth;
224083
- option.yAxis.minorTick.lineStyle.width = obj.lineWidth;
224181
+ option.yAxis[0].minorTick.lineStyle.width = obj.lineWidth;
224182
+
224183
+ if (isDoubleY) {
224184
+ option.yAxis[1].minorTick.lineStyle.width = obj.lineWidth;
224185
+ }
224186
+
224084
224187
  option.xAxis.minorSplitLine.lineStyle.width = obj.lineWidth;
224085
- option.yAxis.minorSplitLine.lineStyle.width = obj.lineWidth;
224188
+ option.yAxis[0].minorSplitLine.lineStyle.width = obj.lineWidth;
224189
+
224190
+ if (isDoubleY) {
224191
+ option.yAxis[1].minorSplitLine.lineStyle.width = obj.lineWidth;
224192
+ }
224193
+
224086
224194
  option.xAxis.minorTick.lineStyle.type = obj.lineType;
224087
- option.yAxis.minorTick.lineStyle.type = obj.lineType;
224195
+ option.yAxis[0].minorTick.lineStyle.type = obj.lineType;
224196
+
224197
+ if (isDoubleY) {
224198
+ option.yAxis[1].minorTick.lineStyle.type = obj.lineType;
224199
+ }
224200
+
224088
224201
  option.xAxis.minorSplitLine.lineStyle.type = obj.lineType;
224089
- option.yAxis.minorSplitLine.lineStyle.type = obj.lineType;
224202
+ option.yAxis[0].minorSplitLine.lineStyle.type = obj.lineType;
224203
+
224204
+ if (isDoubleY) {
224205
+ option.yAxis[1].minorSplitLine.lineStyle.type = obj.lineType;
224206
+ }
224207
+
224090
224208
  option.xAxis.minorTick.splitNumber = obj.splitNumber;
224209
+ option.yAxis[0].minorTick.splitNumber = obj.splitNumber;
224210
+
224211
+ if (isDoubleY) {
224212
+ option.yAxis[1].minorTick.splitNumber = obj.splitNumber;
224213
+ }
224091
224214
  } //刻度线相关设置
224092
224215
 
224093
224216
 
224094
224217
  function setTickLine(obj) {
224095
224218
  //显隐
224096
224219
  option.xAxis.splitLine.show = obj.tickX;
224097
- option.yAxis.splitLine.show = obj.tickY; //颜色
224220
+ option.yAxis[0].splitLine.show = obj.tickY;
224221
+
224222
+ if (isDoubleY) {
224223
+ option.yAxis[1].splitLine.show = obj.tickY;
224224
+ } //颜色
224225
+
224098
224226
 
224099
224227
  option.xAxis.splitLine.lineStyle.color = obj.lineColor;
224100
- option.yAxis.splitLine.lineStyle.color = obj.lineColor; //线宽
224228
+ option.yAxis[0].splitLine.lineStyle.color = obj.lineColor;
224229
+
224230
+ if (isDoubleY) {
224231
+ option.yAxis[1].splitLine.lineStyle.color = obj.lineColor;
224232
+ } //线宽
224233
+
224101
224234
 
224102
224235
  option.xAxis.splitLine.lineStyle.width = obj.lineWidth;
224103
- option.yAxis.splitLine.lineStyle.width = obj.lineWidth; //类型
224236
+ option.yAxis[0].splitLine.lineStyle.width = obj.lineWidth;
224237
+
224238
+ if (isDoubleY) {
224239
+ option.yAxis[1].splitLine.lineStyle.width = obj.lineWidth;
224240
+ } //类型
224241
+
224104
224242
 
224105
224243
  option.xAxis.splitLine.lineStyle.type = obj.lineType;
224106
- option.yAxis.splitLine.lineStyle.type = obj.lineType;
224244
+ option.yAxis[0].splitLine.lineStyle.type = obj.lineType;
224245
+
224246
+ if (isDoubleY) {
224247
+ option.yAxis[1].splitLine.lineStyle.type = obj.lineType;
224248
+ }
224107
224249
  } //自定义配置持久化
224108
224250
 
224109
224251
 
@@ -224126,13 +224268,19 @@ const erd = element_resize_detector_default()();
224126
224268
  } //计算图表y轴最大值和最小值
224127
224269
 
224128
224270
 
224129
- function getMaxAndMinValue() {
224271
+ function getMaxAndMinValue(tempArray) {
224130
224272
  let minVal, maxVal;
224131
- const tempArraySort = tempArray.sort((a, b) => {
224273
+ const tempArraySort = tempArray.filter(item => item[1] != null).sort((a, b) => {
224132
224274
  return a[1] - b[1];
224133
224275
  });
224134
- minVal = tempArraySort[0][1];
224135
- maxVal = tempArraySort[tempArraySort.length - 1][1];
224276
+
224277
+ if (tempArraySort.length == 0) {
224278
+ minVal = 0, maxVal = 1;
224279
+ } else {
224280
+ minVal = tempArraySort[0][1];
224281
+ maxVal = tempArraySort[tempArraySort.length - 1][1];
224282
+ }
224283
+
224136
224284
  const sub = maxVal - minVal;
224137
224285
  minVal = Math.floor((minVal - sub * props.maxAndMinLevel) * Math.pow(10, props.yMaxAndMinkeepDecimal)) / Math.pow(10, props.yMaxAndMinkeepDecimal);
224138
224286
  maxVal = Math.ceil((maxVal + sub * props.maxAndMinLevel) * Math.pow(10, props.yMaxAndMinkeepDecimal)) / Math.pow(10, props.yMaxAndMinkeepDecimal);
@@ -224158,10 +224306,10 @@ const erd = element_resize_detector_default()();
224158
224306
  });
224159
224307
  ;// CONCATENATED MODULE: ./packages/echarts/index.vue?vue&type=script&lang=js
224160
224308
  /* unplugin-vue-components disabled */
224161
- ;// CONCATENATED MODULE: ./node_modules/unplugin/dist/webpack/loaders/transform.js??ruleSet[1].rules[33].use[0]!./node_modules/unplugin/dist/webpack/loaders/transform.js??ruleSet[1].rules[34].use[0]!./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-64.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-64.use[1]!./node_modules/vue-loader/dist/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-64.use[2]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-64.use[3]!./node_modules/vue-loader/dist/index.js??ruleSet[0].use[0]!./packages/echarts/index.vue?vue&type=style&index=0&id=422c2ffa&lang=scss&scoped=true
224309
+ ;// CONCATENATED MODULE: ./node_modules/unplugin/dist/webpack/loaders/transform.js??ruleSet[1].rules[33].use[0]!./node_modules/unplugin/dist/webpack/loaders/transform.js??ruleSet[1].rules[34].use[0]!./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-64.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-64.use[1]!./node_modules/vue-loader/dist/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-64.use[2]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-64.use[3]!./node_modules/vue-loader/dist/index.js??ruleSet[0].use[0]!./packages/echarts/index.vue?vue&type=style&index=0&id=c5c6e504&lang=scss&scoped=true
224162
224310
  /* unplugin-vue-components disabled */// extracted by mini-css-extract-plugin
224163
224311
 
224164
- ;// CONCATENATED MODULE: ./packages/echarts/index.vue?vue&type=style&index=0&id=422c2ffa&lang=scss&scoped=true
224312
+ ;// CONCATENATED MODULE: ./packages/echarts/index.vue?vue&type=style&index=0&id=c5c6e504&lang=scss&scoped=true
224165
224313
  /* unplugin-vue-components disabled */
224166
224314
  ;// CONCATENATED MODULE: ./packages/echarts/index.vue
224167
224315
  /* unplugin-vue-components disabled */
@@ -224171,7 +224319,7 @@ const erd = element_resize_detector_default()();
224171
224319
  ;
224172
224320
 
224173
224321
 
224174
- const echarts_exports_ = /*#__PURE__*/(0,exportHelper/* default */.Z)(echartsvue_type_script_lang_js, [['render',echartsvue_type_template_id_422c2ffa_scoped_true_render],['__scopeId',"data-v-422c2ffa"]])
224322
+ const echarts_exports_ = /*#__PURE__*/(0,exportHelper/* default */.Z)(echartsvue_type_script_lang_js, [['render',echartsvue_type_template_id_c5c6e504_scoped_true_render],['__scopeId',"data-v-c5c6e504"]])
224175
224323
 
224176
224324
  /* harmony default export */ var echarts = (echarts_exports_);
224177
224325
  ;// CONCATENATED MODULE: ./packages/echarts/index.js