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.
@@ -91082,7 +91082,7 @@ const ElMessage = withInstallFunction(message, "$message");
91082
91082
  /*
91083
91083
  * @Author: leevan
91084
91084
  * @Date: 2022-07-04 14:32:14
91085
- * @LastEditTime: 2023-05-11 20:22:18
91085
+ * @LastEditTime: 2024-03-04 17:40:17
91086
91086
  * @LastEditors: leevan
91087
91087
  * @FilePath: /jtui3.0/packages/tables/hooks/usePublicAPI.js
91088
91088
  */
@@ -91141,6 +91141,7 @@ function usePublicAPI(emit, activeRef, props) {
91141
91141
 
91142
91142
 
91143
91143
  function treeTxtClick(row) {
91144
+ activeRef.value.setCurrentRow(row);
91144
91145
  let treePath = [];
91145
91146
  const result = xe_utils_default().findTree(activeRef.value.data, item => {
91146
91147
  return item.rowid === row.rowid;
@@ -105086,7 +105087,7 @@ const ElColorPicker = _ColorPicker;
105086
105087
 
105087
105088
 
105088
105089
 
105089
- ;// 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-40.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
105090
+ ;// 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-40.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
105090
105091
  /* unplugin-vue-components disabled */
105091
105092
 
105092
105093
 
@@ -105096,26 +105097,26 @@ const ElColorPicker = _ColorPicker;
105096
105097
 
105097
105098
 
105098
105099
 
105099
- const echartsvue_type_template_id_422c2ffa_scoped_true_withScopeId = n => (_pushScopeId("data-v-422c2ffa"), n = n(), _popScopeId(), n);
105100
+ const echartsvue_type_template_id_c5c6e504_scoped_true_withScopeId = n => (_pushScopeId("data-v-c5c6e504"), n = n(), _popScopeId(), n);
105100
105101
 
105101
- const echartsvue_type_template_id_422c2ffa_scoped_true_hoisted_1 = {
105102
+ const echartsvue_type_template_id_c5c6e504_scoped_true_hoisted_1 = {
105102
105103
  class: "echarts-wapper"
105103
105104
  };
105104
- const echartsvue_type_template_id_422c2ffa_scoped_true_hoisted_2 = ["id"];
105105
+ const echartsvue_type_template_id_c5c6e504_scoped_true_hoisted_2 = ["id"];
105105
105106
 
105106
- const echartsvue_type_template_id_422c2ffa_scoped_true_hoisted_3 = /*#__PURE__*/(0,external_commonjs_vue_commonjs2_vue_root_Vue_.createTextVNode)("实线");
105107
+ const echartsvue_type_template_id_c5c6e504_scoped_true_hoisted_3 = /*#__PURE__*/(0,external_commonjs_vue_commonjs2_vue_root_Vue_.createTextVNode)("实线");
105107
105108
 
105108
- const echartsvue_type_template_id_422c2ffa_scoped_true_hoisted_4 = /*#__PURE__*/(0,external_commonjs_vue_commonjs2_vue_root_Vue_.createTextVNode)("虚线");
105109
+ const echartsvue_type_template_id_c5c6e504_scoped_true_hoisted_4 = /*#__PURE__*/(0,external_commonjs_vue_commonjs2_vue_root_Vue_.createTextVNode)("虚线");
105109
105110
 
105110
- const echartsvue_type_template_id_422c2ffa_scoped_true_hoisted_5 = /*#__PURE__*/(0,external_commonjs_vue_commonjs2_vue_root_Vue_.createTextVNode)("点");
105111
+ const echartsvue_type_template_id_c5c6e504_scoped_true_hoisted_5 = /*#__PURE__*/(0,external_commonjs_vue_commonjs2_vue_root_Vue_.createTextVNode)("点");
105111
105112
 
105112
- const echartsvue_type_template_id_422c2ffa_scoped_true_hoisted_6 = /*#__PURE__*/(0,external_commonjs_vue_commonjs2_vue_root_Vue_.createTextVNode)("实线");
105113
+ const echartsvue_type_template_id_c5c6e504_scoped_true_hoisted_6 = /*#__PURE__*/(0,external_commonjs_vue_commonjs2_vue_root_Vue_.createTextVNode)("实线");
105113
105114
 
105114
- const echartsvue_type_template_id_422c2ffa_scoped_true_hoisted_7 = /*#__PURE__*/(0,external_commonjs_vue_commonjs2_vue_root_Vue_.createTextVNode)("虚线");
105115
+ const echartsvue_type_template_id_c5c6e504_scoped_true_hoisted_7 = /*#__PURE__*/(0,external_commonjs_vue_commonjs2_vue_root_Vue_.createTextVNode)("虚线");
105115
105116
 
105116
- const echartsvue_type_template_id_422c2ffa_scoped_true_hoisted_8 = /*#__PURE__*/(0,external_commonjs_vue_commonjs2_vue_root_Vue_.createTextVNode)("点");
105117
+ const echartsvue_type_template_id_c5c6e504_scoped_true_hoisted_8 = /*#__PURE__*/(0,external_commonjs_vue_commonjs2_vue_root_Vue_.createTextVNode)("点");
105117
105118
 
105118
- function echartsvue_type_template_id_422c2ffa_scoped_true_render(_ctx, _cache, $props, $setup, $data, $options) {
105119
+ function echartsvue_type_template_id_c5c6e504_scoped_true_render(_ctx, _cache, $props, $setup, $data, $options) {
105119
105120
  const _component_el_switch = ElSwitch;
105120
105121
 
105121
105122
  const _component_el_form_item = ElFormItem;
@@ -105130,11 +105131,11 @@ function echartsvue_type_template_id_422c2ffa_scoped_true_render(_ctx, _cache, $
105130
105131
 
105131
105132
  const _component_el_dialog = ElDialog;
105132
105133
 
105133
- 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", {
105134
+ 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", {
105134
105135
  ref: el => $setup.setRef(el),
105135
105136
  id: $props.id,
105136
105137
  class: "jt-chart-vm"
105137
- }, null, 8, echartsvue_type_template_id_422c2ffa_scoped_true_hoisted_2), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createElementVNode)("span", {
105138
+ }, null, 8, echartsvue_type_template_id_c5c6e504_scoped_true_hoisted_2), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createElementVNode)("span", {
105138
105139
  class: "jtIcon iconpeizhi41 eitid-icon",
105139
105140
  onClick: _cache[0] || (_cache[0] = $event => $setup.dialogVisible = true)
105140
105141
  }), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createVNode)(_component_el_dialog, {
@@ -105217,21 +105218,21 @@ function echartsvue_type_template_id_422c2ffa_scoped_true_render(_ctx, _cache, $
105217
105218
  "onUpdate:modelValue": _cache[8] || (_cache[8] = $event => $setup.gridLineConfig.lineType = $event),
105218
105219
  label: "solid"
105219
105220
  }, {
105220
- default: (0,external_commonjs_vue_commonjs2_vue_root_Vue_.withCtx)(() => [echartsvue_type_template_id_422c2ffa_scoped_true_hoisted_3]),
105221
+ default: (0,external_commonjs_vue_commonjs2_vue_root_Vue_.withCtx)(() => [echartsvue_type_template_id_c5c6e504_scoped_true_hoisted_3]),
105221
105222
  _: 1
105222
105223
  }, 8, ["modelValue"]), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createVNode)(_component_el_radio, {
105223
105224
  modelValue: $setup.gridLineConfig.lineType,
105224
105225
  "onUpdate:modelValue": _cache[9] || (_cache[9] = $event => $setup.gridLineConfig.lineType = $event),
105225
105226
  label: "dashed"
105226
105227
  }, {
105227
- default: (0,external_commonjs_vue_commonjs2_vue_root_Vue_.withCtx)(() => [echartsvue_type_template_id_422c2ffa_scoped_true_hoisted_4]),
105228
+ default: (0,external_commonjs_vue_commonjs2_vue_root_Vue_.withCtx)(() => [echartsvue_type_template_id_c5c6e504_scoped_true_hoisted_4]),
105228
105229
  _: 1
105229
105230
  }, 8, ["modelValue"]), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createVNode)(_component_el_radio, {
105230
105231
  modelValue: $setup.gridLineConfig.lineType,
105231
105232
  "onUpdate:modelValue": _cache[10] || (_cache[10] = $event => $setup.gridLineConfig.lineType = $event),
105232
105233
  label: "dotted"
105233
105234
  }, {
105234
- default: (0,external_commonjs_vue_commonjs2_vue_root_Vue_.withCtx)(() => [echartsvue_type_template_id_422c2ffa_scoped_true_hoisted_5]),
105235
+ default: (0,external_commonjs_vue_commonjs2_vue_root_Vue_.withCtx)(() => [echartsvue_type_template_id_c5c6e504_scoped_true_hoisted_5]),
105235
105236
  _: 1
105236
105237
  }, 8, ["modelValue"])]),
105237
105238
  _: 1
@@ -105278,21 +105279,21 @@ function echartsvue_type_template_id_422c2ffa_scoped_true_render(_ctx, _cache, $
105278
105279
  "onUpdate:modelValue": _cache[15] || (_cache[15] = $event => $setup.tickLineConfig.lineType = $event),
105279
105280
  label: "solid"
105280
105281
  }, {
105281
- default: (0,external_commonjs_vue_commonjs2_vue_root_Vue_.withCtx)(() => [echartsvue_type_template_id_422c2ffa_scoped_true_hoisted_6]),
105282
+ default: (0,external_commonjs_vue_commonjs2_vue_root_Vue_.withCtx)(() => [echartsvue_type_template_id_c5c6e504_scoped_true_hoisted_6]),
105282
105283
  _: 1
105283
105284
  }, 8, ["modelValue"]), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createVNode)(_component_el_radio, {
105284
105285
  modelValue: $setup.tickLineConfig.lineType,
105285
105286
  "onUpdate:modelValue": _cache[16] || (_cache[16] = $event => $setup.tickLineConfig.lineType = $event),
105286
105287
  label: "dashed"
105287
105288
  }, {
105288
- default: (0,external_commonjs_vue_commonjs2_vue_root_Vue_.withCtx)(() => [echartsvue_type_template_id_422c2ffa_scoped_true_hoisted_7]),
105289
+ default: (0,external_commonjs_vue_commonjs2_vue_root_Vue_.withCtx)(() => [echartsvue_type_template_id_c5c6e504_scoped_true_hoisted_7]),
105289
105290
  _: 1
105290
105291
  }, 8, ["modelValue"]), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createVNode)(_component_el_radio, {
105291
105292
  modelValue: $setup.tickLineConfig.lineType,
105292
105293
  "onUpdate:modelValue": _cache[17] || (_cache[17] = $event => $setup.tickLineConfig.lineType = $event),
105293
105294
  label: "dotted"
105294
105295
  }, {
105295
- default: (0,external_commonjs_vue_commonjs2_vue_root_Vue_.withCtx)(() => [echartsvue_type_template_id_422c2ffa_scoped_true_hoisted_8]),
105296
+ default: (0,external_commonjs_vue_commonjs2_vue_root_Vue_.withCtx)(() => [echartsvue_type_template_id_c5c6e504_scoped_true_hoisted_8]),
105296
105297
  _: 1
105297
105298
  }, 8, ["modelValue"])]),
105298
105299
  _: 1
@@ -105302,7 +105303,7 @@ function echartsvue_type_template_id_422c2ffa_scoped_true_render(_ctx, _cache, $
105302
105303
  _: 1
105303
105304
  }, 8, ["modelValue"])]);
105304
105305
  }
105305
- ;// CONCATENATED MODULE: ./packages/echarts/index.vue?vue&type=template&id=422c2ffa&scoped=true
105306
+ ;// CONCATENATED MODULE: ./packages/echarts/index.vue?vue&type=template&id=c5c6e504&scoped=true
105306
105307
  /* unplugin-vue-components disabled */
105307
105308
  ;// CONCATENATED MODULE: ./node_modules/echarts/node_modules/tslib/tslib.es6.js
105308
105309
 
@@ -223838,6 +223839,14 @@ const erd = element_resize_detector_default()();
223838
223839
  //自定义事件间隔
223839
223840
  customIntrerVal: {
223840
223841
  type: Number
223842
+ },
223843
+ yLeft: {
223844
+ type: String,
223845
+ default: ''
223846
+ },
223847
+ yRight: {
223848
+ type: String,
223849
+ default: ''
223841
223850
  }
223842
223851
  },
223843
223852
 
@@ -223856,22 +223865,29 @@ const erd = element_resize_detector_default()();
223856
223865
 
223857
223866
  let chartVM;
223858
223867
  let option;
223859
- let tempArray = [];
223868
+ const isDoubleY = props.data.findIndex(item => 'yAxisIndex' in item && item.yAxisIndex == 1) != -1;
223869
+ let tempArray = []; //左边y轴的数据
223870
+
223871
+ let tempArrayRight = []; //右边y轴的数据
223872
+
223860
223873
  props.data.forEach(item => {
223861
- tempArray = tempArray.concat(item.data);
223874
+ if ('yAxisIndex' in item && item.yAxisIndex == 1) {
223875
+ tempArrayRight = tempArrayRight.concat(item.data);
223876
+ } else {
223877
+ tempArray = tempArray.concat(item.data);
223878
+ }
223862
223879
  });
223863
223880
 
223864
223881
  if (timeRange.value && tempArray.length != 0) {
223865
- const {
223866
- minVal,
223867
- maxVal
223868
- } = getMaxAndMinValue();
223869
223882
  option = {
223870
223883
  xAxis: {
223871
223884
  type: "value",
223872
223885
  min: new Date(timeRange.value[0]).getTime(),
223873
223886
  max: new Date(timeRange.value[1]).getTime(),
223874
223887
  interval: 6 * 60 * 60 * 1000,
223888
+ nameTextStyle: {
223889
+ padding: [0, 0, 0, 20]
223890
+ },
223875
223891
  axisLabel: {
223876
223892
  formatter: function (e) {
223877
223893
  let temp;
@@ -223919,17 +223935,35 @@ const erd = element_resize_detector_default()();
223919
223935
  tooltip: {
223920
223936
  trigger: 'axis',
223921
223937
  formatter: params => {
223922
- return `${dayjs_dayjs_min_default()(params[0].data[0]).format('YYYY-MM-DD HH:mm')}
223923
- <br/>${params[0].seriesName}:${params[0].data[1]}`;
223938
+ let str = '';
223939
+ params.forEach(item => {
223940
+ str += `<br/>${item.seriesName}:${item.data[1]}`;
223941
+ });
223942
+ return `${dayjs_dayjs_min_default()(params[0].data[0]).format('YYYY-MM-DD HH:mm')}${str}`;
223924
223943
  }
223925
223944
  },
223945
+ grid: {
223946
+ bottom: 80
223947
+ },
223926
223948
  legend: {
223927
223949
  data: []
223928
223950
  },
223929
- yAxis: {
223930
- type: 'value',
223931
- min: minVal,
223932
- max: maxVal,
223951
+ yAxis: [],
223952
+ dataZoom: [{
223953
+ type: 'inside',
223954
+ xAxisIndex: 0
223955
+ }, {
223956
+ type: 'slider',
223957
+ xAxisIndex: 0
223958
+ }],
223959
+ series: props.data
223960
+ };
223961
+
223962
+ if (isDoubleY) {
223963
+ option.yAxis = [{
223964
+ name: props.yLeft,
223965
+ min: 0,
223966
+ max: 0,
223933
223967
  minorTick: {
223934
223968
  show: true,
223935
223969
  lineStyle: {}
@@ -223946,16 +223980,66 @@ const erd = element_resize_detector_default()();
223946
223980
  color: '#333'
223947
223981
  }
223948
223982
  }
223949
- },
223950
- dataZoom: [{
223951
- type: 'inside',
223952
- xAxisIndex: 0
223953
223983
  }, {
223954
- type: 'slider',
223955
- xAxisIndex: 0
223956
- }],
223957
- series: props.data
223958
- };
223984
+ name: props.yRight,
223985
+ min: 0,
223986
+ max: 5,
223987
+ minorTick: {
223988
+ show: true,
223989
+ lineStyle: {}
223990
+ },
223991
+ minorSplitLine: {
223992
+ show: true,
223993
+ lineStyle: {
223994
+ color: '#ccc'
223995
+ }
223996
+ },
223997
+ splitLine: {
223998
+ show: true,
223999
+ lineStyle: {
224000
+ color: '#333'
224001
+ }
224002
+ }
224003
+ }];
224004
+ } else {
224005
+ option.yAxis = [{
224006
+ name: props.yLeft,
224007
+ min: 0,
224008
+ max: 0,
224009
+ minorTick: {
224010
+ show: true,
224011
+ lineStyle: {}
224012
+ },
224013
+ minorSplitLine: {
224014
+ show: true,
224015
+ lineStyle: {
224016
+ color: '#ccc'
224017
+ }
224018
+ },
224019
+ splitLine: {
224020
+ show: true,
224021
+ lineStyle: {
224022
+ color: '#333'
224023
+ }
224024
+ }
224025
+ }];
224026
+ }
224027
+
224028
+ const {
224029
+ minVal,
224030
+ maxVal
224031
+ } = getMaxAndMinValue(tempArray);
224032
+ option.yAxis[0].min = minVal;
224033
+ option.yAxis[0].max = maxVal;
224034
+
224035
+ if (isDoubleY) {
224036
+ const {
224037
+ minVal: minValRight,
224038
+ maxValRight
224039
+ } = getMaxAndMinValue(tempArrayRight);
224040
+ option.yAxis[1].min = minValRight;
224041
+ option.yAxis[1].max = maxValRight;
224042
+ }
223959
224043
  } else {
223960
224044
  option = {
223961
224045
  title: {
@@ -224047,7 +224131,6 @@ const erd = element_resize_detector_default()();
224047
224131
  option.xAxis.max = maxTime;
224048
224132
  option.legend.data = option.series.map(item => item.name);
224049
224133
  setGridLine(gridLineConfig);
224050
- console.log(option, 111);
224051
224134
  chartVM.setOption(option, true);
224052
224135
  } //监听网格线相关设置操作
224053
224136
 
@@ -224064,36 +224147,95 @@ const erd = element_resize_detector_default()();
224064
224147
 
224065
224148
  function setGridLine(obj) {
224066
224149
  option.xAxis.minorTick.show = obj.tickX;
224067
- option.yAxis.minorTick.show = obj.tickY;
224150
+ option.yAxis[0].minorTick.show = obj.tickY;
224151
+
224152
+ if (isDoubleY) {
224153
+ option.yAxis[1].minorTick.show = obj.tickY;
224154
+ }
224155
+
224068
224156
  option.xAxis.minorSplitLine.show = obj.lineX;
224069
- option.yAxis.minorSplitLine.show = obj.lineY;
224157
+ option.yAxis[0].minorSplitLine.show = obj.lineY;
224158
+
224159
+ if (isDoubleY) {
224160
+ option.yAxis[1].minorSplitLine.show = obj.lineY;
224161
+ }
224162
+
224070
224163
  option.xAxis.minorSplitLine.lineStyle.color = obj.lineColor;
224071
- option.yAxis.minorSplitLine.lineStyle.color = obj.lineColor;
224164
+ option.yAxis[0].minorSplitLine.lineStyle.color = obj.lineColor;
224165
+
224166
+ if (isDoubleY) {
224167
+ option.yAxis[1].minorSplitLine.lineStyle.color = obj.lineColor;
224168
+ }
224169
+
224072
224170
  option.xAxis.minorTick.lineStyle.width = obj.lineWidth;
224073
- option.yAxis.minorTick.lineStyle.width = obj.lineWidth;
224171
+ option.yAxis[0].minorTick.lineStyle.width = obj.lineWidth;
224172
+
224173
+ if (isDoubleY) {
224174
+ option.yAxis[1].minorTick.lineStyle.width = obj.lineWidth;
224175
+ }
224176
+
224074
224177
  option.xAxis.minorSplitLine.lineStyle.width = obj.lineWidth;
224075
- option.yAxis.minorSplitLine.lineStyle.width = obj.lineWidth;
224178
+ option.yAxis[0].minorSplitLine.lineStyle.width = obj.lineWidth;
224179
+
224180
+ if (isDoubleY) {
224181
+ option.yAxis[1].minorSplitLine.lineStyle.width = obj.lineWidth;
224182
+ }
224183
+
224076
224184
  option.xAxis.minorTick.lineStyle.type = obj.lineType;
224077
- option.yAxis.minorTick.lineStyle.type = obj.lineType;
224185
+ option.yAxis[0].minorTick.lineStyle.type = obj.lineType;
224186
+
224187
+ if (isDoubleY) {
224188
+ option.yAxis[1].minorTick.lineStyle.type = obj.lineType;
224189
+ }
224190
+
224078
224191
  option.xAxis.minorSplitLine.lineStyle.type = obj.lineType;
224079
- option.yAxis.minorSplitLine.lineStyle.type = obj.lineType;
224192
+ option.yAxis[0].minorSplitLine.lineStyle.type = obj.lineType;
224193
+
224194
+ if (isDoubleY) {
224195
+ option.yAxis[1].minorSplitLine.lineStyle.type = obj.lineType;
224196
+ }
224197
+
224080
224198
  option.xAxis.minorTick.splitNumber = obj.splitNumber;
224199
+ option.yAxis[0].minorTick.splitNumber = obj.splitNumber;
224200
+
224201
+ if (isDoubleY) {
224202
+ option.yAxis[1].minorTick.splitNumber = obj.splitNumber;
224203
+ }
224081
224204
  } //刻度线相关设置
224082
224205
 
224083
224206
 
224084
224207
  function setTickLine(obj) {
224085
224208
  //显隐
224086
224209
  option.xAxis.splitLine.show = obj.tickX;
224087
- option.yAxis.splitLine.show = obj.tickY; //颜色
224210
+ option.yAxis[0].splitLine.show = obj.tickY;
224211
+
224212
+ if (isDoubleY) {
224213
+ option.yAxis[1].splitLine.show = obj.tickY;
224214
+ } //颜色
224215
+
224088
224216
 
224089
224217
  option.xAxis.splitLine.lineStyle.color = obj.lineColor;
224090
- option.yAxis.splitLine.lineStyle.color = obj.lineColor; //线宽
224218
+ option.yAxis[0].splitLine.lineStyle.color = obj.lineColor;
224219
+
224220
+ if (isDoubleY) {
224221
+ option.yAxis[1].splitLine.lineStyle.color = obj.lineColor;
224222
+ } //线宽
224223
+
224091
224224
 
224092
224225
  option.xAxis.splitLine.lineStyle.width = obj.lineWidth;
224093
- option.yAxis.splitLine.lineStyle.width = obj.lineWidth; //类型
224226
+ option.yAxis[0].splitLine.lineStyle.width = obj.lineWidth;
224227
+
224228
+ if (isDoubleY) {
224229
+ option.yAxis[1].splitLine.lineStyle.width = obj.lineWidth;
224230
+ } //类型
224231
+
224094
224232
 
224095
224233
  option.xAxis.splitLine.lineStyle.type = obj.lineType;
224096
- option.yAxis.splitLine.lineStyle.type = obj.lineType;
224234
+ option.yAxis[0].splitLine.lineStyle.type = obj.lineType;
224235
+
224236
+ if (isDoubleY) {
224237
+ option.yAxis[1].splitLine.lineStyle.type = obj.lineType;
224238
+ }
224097
224239
  } //自定义配置持久化
224098
224240
 
224099
224241
 
@@ -224116,13 +224258,19 @@ const erd = element_resize_detector_default()();
224116
224258
  } //计算图表y轴最大值和最小值
224117
224259
 
224118
224260
 
224119
- function getMaxAndMinValue() {
224261
+ function getMaxAndMinValue(tempArray) {
224120
224262
  let minVal, maxVal;
224121
- const tempArraySort = tempArray.sort((a, b) => {
224263
+ const tempArraySort = tempArray.filter(item => item[1] != null).sort((a, b) => {
224122
224264
  return a[1] - b[1];
224123
224265
  });
224124
- minVal = tempArraySort[0][1];
224125
- maxVal = tempArraySort[tempArraySort.length - 1][1];
224266
+
224267
+ if (tempArraySort.length == 0) {
224268
+ minVal = 0, maxVal = 1;
224269
+ } else {
224270
+ minVal = tempArraySort[0][1];
224271
+ maxVal = tempArraySort[tempArraySort.length - 1][1];
224272
+ }
224273
+
224126
224274
  const sub = maxVal - minVal;
224127
224275
  minVal = Math.floor((minVal - sub * props.maxAndMinLevel) * Math.pow(10, props.yMaxAndMinkeepDecimal)) / Math.pow(10, props.yMaxAndMinkeepDecimal);
224128
224276
  maxVal = Math.ceil((maxVal + sub * props.maxAndMinLevel) * Math.pow(10, props.yMaxAndMinkeepDecimal)) / Math.pow(10, props.yMaxAndMinkeepDecimal);
@@ -224148,10 +224296,10 @@ const erd = element_resize_detector_default()();
224148
224296
  });
224149
224297
  ;// CONCATENATED MODULE: ./packages/echarts/index.vue?vue&type=script&lang=js
224150
224298
  /* unplugin-vue-components disabled */
224151
- ;// 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-22.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22.use[1]!./node_modules/vue-loader/dist/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[2]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22.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
224299
+ ;// 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-22.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22.use[1]!./node_modules/vue-loader/dist/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[2]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22.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
224152
224300
  /* unplugin-vue-components disabled */// extracted by mini-css-extract-plugin
224153
224301
 
224154
- ;// CONCATENATED MODULE: ./packages/echarts/index.vue?vue&type=style&index=0&id=422c2ffa&lang=scss&scoped=true
224302
+ ;// CONCATENATED MODULE: ./packages/echarts/index.vue?vue&type=style&index=0&id=c5c6e504&lang=scss&scoped=true
224155
224303
  /* unplugin-vue-components disabled */
224156
224304
  ;// CONCATENATED MODULE: ./packages/echarts/index.vue
224157
224305
  /* unplugin-vue-components disabled */
@@ -224161,7 +224309,7 @@ const erd = element_resize_detector_default()();
224161
224309
  ;
224162
224310
 
224163
224311
 
224164
- 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"]])
224312
+ 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"]])
224165
224313
 
224166
224314
  /* harmony default export */ var echarts = (echarts_exports_);
224167
224315
  ;// CONCATENATED MODULE: ./packages/echarts/index.js