jtui3.0 1.0.67 → 1.0.69

package/lib/jtui3.0.umd.js

@@ -34734,7 +34734,7 @@ Object.defineProperty(exports, "__esModule", ({
 }));
 exports.commands = void 0;
 
-var _store = _interopRequireDefault(__webpack_require__(7992));
+var _store = _interopRequireDefault(__webpack_require__(3482));
 
 function _interopRequireDefault(obj) {
   return obj && obj.__esModule ? obj : {
@@ -35113,7 +35113,7 @@ Object.defineProperty(exports, "__esModule", ({
 }));
 exports.formats = void 0;
 
-var _store = _interopRequireDefault(__webpack_require__(7992));
+var _store = _interopRequireDefault(__webpack_require__(3482));
 
 function _interopRequireDefault(obj) {
   return obj && obj.__esModule ? obj : {
@@ -35139,7 +35139,7 @@ Object.defineProperty(exports, "__esModule", ({
 }));
 exports.hooks = void 0;
 
-var _store = _interopRequireDefault(__webpack_require__(7992));
+var _store = _interopRequireDefault(__webpack_require__(3482));
 
 function _interopRequireDefault(obj) {
   return obj && obj.__esModule ? obj : {
@@ -35233,7 +35233,7 @@ Object.defineProperty(exports, "__esModule", ({
 }));
 exports.menus = void 0;
 
-var _store = _interopRequireDefault(__webpack_require__(7992));
+var _store = _interopRequireDefault(__webpack_require__(3482));
 
 function _interopRequireDefault(obj) {
   return obj && obj.__esModule ? obj : {
@@ -36147,7 +36147,7 @@ exports.setup = setup;
 
 /***/ }),
 
-/***/ 7992:
+/***/ 3482:
 /***/ (function(__unused_webpack_module, exports, __webpack_require__) {
 
 "use strict";
@@ -90457,7 +90457,7 @@ function useFilterData() {
 /*
  * @Author: leevan
  * @Date: 2022-07-12 16:59:44
- * @LastEditTime: 2023-08-31 14:40:14
+ * @LastEditTime: 2024-02-04 15:10:57
  * @LastEditors: leevan
  * @FilePath: /jtui3.0/packages/tables/hooks/useFormatter.js
  */
@@ -99459,11 +99459,11 @@ function cascadervue_type_template_id_6775b4a7_render(_ctx, _cache, $props, $set
 const cascader_exports_ = /*#__PURE__*/(0,exportHelper/* default */.Z)(cascadervue_type_script_lang_js, [['render',cascadervue_type_template_id_6775b4a7_render]])
 
 /* harmony default export */ var cascader = (cascader_exports_);
-;// 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/tables/hooks/edit-render/cascader-select.vue?vue&type=template&id=5954d7fa
+;// 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/tables/hooks/edit-render/cascader-select.vue?vue&type=template&id=33ac6616
 /* unplugin-vue-components disabled */
 
 
-function cascader_selectvue_type_template_id_5954d7fa_render(_ctx, _cache, $props, $setup, $data, $options) {
+function cascader_selectvue_type_template_id_33ac6616_render(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_el_option = ElOption;
 
   const _component_el_select = ElSelect;
@@ -99483,7 +99483,7 @@ function cascader_selectvue_type_template_id_5954d7fa_render(_ctx, _cache, $prop
     _: 1
   }, 8, ["onChange", "onVisibleChange"])]);
 }
-;// CONCATENATED MODULE: ./packages/tables/hooks/edit-render/cascader-select.vue?vue&type=template&id=5954d7fa
+;// CONCATENATED MODULE: ./packages/tables/hooks/edit-render/cascader-select.vue?vue&type=template&id=33ac6616
 /* unplugin-vue-components disabled */
 ;// 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/index.js??ruleSet[0].use[0]!./packages/tables/hooks/edit-render/cascader-select.vue?vue&type=script&lang=js
 /* unplugin-vue-components disabled */
@@ -99507,7 +99507,12 @@ function cascader_selectvue_type_template_id_5954d7fa_render(_ctx, _cache, $prop
       selectValue.value = row[column.field];
 
       if (Array.isArray(opts)) {
-        options.value = opts;
+        row.cascaderOpt = {};
+        row.cascaderOpt[column.field] = opts;
+      }
+
+      if ('cascaderOpt' in row && column.field in row.cascaderOpt) {
+        options.value = row.cascaderOpt[column.field];
       }
     }
 
@@ -99523,10 +99528,9 @@ function cascader_selectvue_type_template_id_5954d7fa_render(_ctx, _cache, $prop
       const {
         path,
         params,
-        nextProp,
-        options: opts
+        nextProp
       } = column.editRender;
-      const temp = opts.find(item => item.value === data);
+      const temp = row.cascaderOpt[column.field].find(item => item.value === data);
       row[column.field] = temp;
 
       if (nextProp) {
@@ -99534,14 +99538,39 @@ function cascader_selectvue_type_template_id_5954d7fa_render(_ctx, _cache, $prop
         axios.post(path + '/' + data, params).then(async ({
           data: res
         }) => {
-          nextCol.editRender.options = res;
+          if ('cascaderOpt' in row && nextCol) {
+            row.cascaderOpt[nextCol.field] = res;
+            clearNextCol(nextCol);
+          }
 
           if ($table) {
             await $table.clearEdit();
           }
         });
       }
-    }
+
+      function clearNextCol(nextCol) {
+        if (nextCol) {
+          row[nextCol.field] = '';
+          const {
+            nextProp
+          } = nextCol.editRender;
+          const nextColChild = $table.getColumnByField(nextProp);
+          clearNextCol(nextColChild);
+        }
+      }
+    } // function mockChild(){
+    //     return [
+    //         {
+    //             label:`这是${Math.floor(Math.random() * 1000) + 1}`,
+    //             value:Math.floor(Math.random() * 1000) + 1
+    //         },{
+    //             label:`这是${Math.floor(Math.random() * 1000) + 1}`,
+    //             value:Math.floor(Math.random() * 1000) + 1
+    //         }
+    //     ]
+    // }
+
 
     async function visibleChange(val) {
       if (val === false) {
@@ -99568,14 +99597,14 @@ function cascader_selectvue_type_template_id_5954d7fa_render(_ctx, _cache, $prop
 
 
 ;
-const cascader_select_exports_ = /*#__PURE__*/(0,exportHelper/* default */.Z)(cascader_selectvue_type_script_lang_js, [['render',cascader_selectvue_type_template_id_5954d7fa_render]])
+const cascader_select_exports_ = /*#__PURE__*/(0,exportHelper/* default */.Z)(cascader_selectvue_type_script_lang_js, [['render',cascader_selectvue_type_template_id_33ac6616_render]])
 
 /* harmony default export */ var cascader_select = (cascader_select_exports_);
-;// 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/tables/hooks/edit-render/cus-select.vue?vue&type=template&id=411a42b6
+;// 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/tables/hooks/edit-render/cus-select.vue?vue&type=template&id=61f3ece2
 /* unplugin-vue-components disabled */
 
 
-function cus_selectvue_type_template_id_411a42b6_render(_ctx, _cache, $props, $setup, $data, $options) {
+function cus_selectvue_type_template_id_61f3ece2_render(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_el_option = ElOption;
 
   const _component_el_select = ElSelect;
@@ -99601,7 +99630,7 @@ function cus_selectvue_type_template_id_411a42b6_render(_ctx, _cache, $props, $s
     _: 1
   }, 8, ["modelValue", "filterable", "allow-create", "multiple", "onChange", "onVisibleChange"])]);
 }
-;// CONCATENATED MODULE: ./packages/tables/hooks/edit-render/cus-select.vue?vue&type=template&id=411a42b6
+;// CONCATENATED MODULE: ./packages/tables/hooks/edit-render/cus-select.vue?vue&type=template&id=61f3ece2
 /* unplugin-vue-components disabled */
 ;// 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/index.js??ruleSet[0].use[0]!./packages/tables/hooks/edit-render/cus-select.vue?vue&type=script&lang=js
 /* unplugin-vue-components disabled */
@@ -99612,7 +99641,6 @@ function cus_selectvue_type_template_id_411a42b6_render(_ctx, _cache, $props, $s
     const tableVM = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.toRef)(props, 'params');
     const value = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.ref)('');
     const options = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.ref)([]);
-    console.log(tableVM);
     load();
 
     function load() {
@@ -99667,7 +99695,7 @@ function cus_selectvue_type_template_id_411a42b6_render(_ctx, _cache, $props, $s
 
 
 ;
-const cus_select_exports_ = /*#__PURE__*/(0,exportHelper/* default */.Z)(cus_selectvue_type_script_lang_js, [['render',cus_selectvue_type_template_id_411a42b6_render]])
+const cus_select_exports_ = /*#__PURE__*/(0,exportHelper/* default */.Z)(cus_selectvue_type_script_lang_js, [['render',cus_selectvue_type_template_id_61f3ece2_render]])
 
 /* harmony default export */ var cus_select = (cus_select_exports_);
 ;// CONCATENATED MODULE: ./packages/tables/hooks/edit-render/edit-render.js
@@ -105068,7 +105096,7 @@ const ElColorPicker = _ColorPicker;
 
 
 
-;// 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
+;// 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
 /* unplugin-vue-components disabled */
 
 
@@ -105078,26 +105106,26 @@ const ElColorPicker = _ColorPicker;
 
 
 
-const echartsvue_type_template_id_422c2ffa_scoped_true_withScopeId = n => (_pushScopeId("data-v-422c2ffa"), n = n(), _popScopeId(), n);
+const echartsvue_type_template_id_c5c6e504_scoped_true_withScopeId = n => (_pushScopeId("data-v-c5c6e504"), n = n(), _popScopeId(), n);
 
-const echartsvue_type_template_id_422c2ffa_scoped_true_hoisted_1 = {
+const echartsvue_type_template_id_c5c6e504_scoped_true_hoisted_1 = {
   class: "echarts-wapper"
 };
-const echartsvue_type_template_id_422c2ffa_scoped_true_hoisted_2 = ["id"];
+const echartsvue_type_template_id_c5c6e504_scoped_true_hoisted_2 = ["id"];
 
-const echartsvue_type_template_id_422c2ffa_scoped_true_hoisted_3 = /*#__PURE__*/(0,external_commonjs_vue_commonjs2_vue_root_Vue_.createTextVNode)("实线");
+const echartsvue_type_template_id_c5c6e504_scoped_true_hoisted_3 = /*#__PURE__*/(0,external_commonjs_vue_commonjs2_vue_root_Vue_.createTextVNode)("实线");
 
-const echartsvue_type_template_id_422c2ffa_scoped_true_hoisted_4 = /*#__PURE__*/(0,external_commonjs_vue_commonjs2_vue_root_Vue_.createTextVNode)("虚线");
+const echartsvue_type_template_id_c5c6e504_scoped_true_hoisted_4 = /*#__PURE__*/(0,external_commonjs_vue_commonjs2_vue_root_Vue_.createTextVNode)("虚线");
 
-const echartsvue_type_template_id_422c2ffa_scoped_true_hoisted_5 = /*#__PURE__*/(0,external_commonjs_vue_commonjs2_vue_root_Vue_.createTextVNode)("点");
+const echartsvue_type_template_id_c5c6e504_scoped_true_hoisted_5 = /*#__PURE__*/(0,external_commonjs_vue_commonjs2_vue_root_Vue_.createTextVNode)("点");
 
-const echartsvue_type_template_id_422c2ffa_scoped_true_hoisted_6 = /*#__PURE__*/(0,external_commonjs_vue_commonjs2_vue_root_Vue_.createTextVNode)("实线");
+const echartsvue_type_template_id_c5c6e504_scoped_true_hoisted_6 = /*#__PURE__*/(0,external_commonjs_vue_commonjs2_vue_root_Vue_.createTextVNode)("实线");
 
-const echartsvue_type_template_id_422c2ffa_scoped_true_hoisted_7 = /*#__PURE__*/(0,external_commonjs_vue_commonjs2_vue_root_Vue_.createTextVNode)("虚线");
+const echartsvue_type_template_id_c5c6e504_scoped_true_hoisted_7 = /*#__PURE__*/(0,external_commonjs_vue_commonjs2_vue_root_Vue_.createTextVNode)("虚线");
 
-const echartsvue_type_template_id_422c2ffa_scoped_true_hoisted_8 = /*#__PURE__*/(0,external_commonjs_vue_commonjs2_vue_root_Vue_.createTextVNode)("点");
+const echartsvue_type_template_id_c5c6e504_scoped_true_hoisted_8 = /*#__PURE__*/(0,external_commonjs_vue_commonjs2_vue_root_Vue_.createTextVNode)("点");
 
-function echartsvue_type_template_id_422c2ffa_scoped_true_render(_ctx, _cache, $props, $setup, $data, $options) {
+function echartsvue_type_template_id_c5c6e504_scoped_true_render(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_el_switch = ElSwitch;
 
   const _component_el_form_item = ElFormItem;
@@ -105112,11 +105140,11 @@ function echartsvue_type_template_id_422c2ffa_scoped_true_render(_ctx, _cache, $
 
   const _component_el_dialog = ElDialog;
 
-  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", {
+  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", {
     ref: el => $setup.setRef(el),
     id: $props.id,
     class: "jt-chart-vm"
-  }, null, 8, echartsvue_type_template_id_422c2ffa_scoped_true_hoisted_2), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createElementVNode)("span", {
+  }, null, 8, echartsvue_type_template_id_c5c6e504_scoped_true_hoisted_2), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createElementVNode)("span", {
     class: "jtIcon iconpeizhi41 eitid-icon",
     onClick: _cache[0] || (_cache[0] = $event => $setup.dialogVisible = true)
   }), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createVNode)(_component_el_dialog, {
@@ -105199,21 +105227,21 @@ function echartsvue_type_template_id_422c2ffa_scoped_true_render(_ctx, _cache, $
           "onUpdate:modelValue": _cache[8] || (_cache[8] = $event => $setup.gridLineConfig.lineType = $event),
           label: "solid"
         }, {
-          default: (0,external_commonjs_vue_commonjs2_vue_root_Vue_.withCtx)(() => [echartsvue_type_template_id_422c2ffa_scoped_true_hoisted_3]),
+          default: (0,external_commonjs_vue_commonjs2_vue_root_Vue_.withCtx)(() => [echartsvue_type_template_id_c5c6e504_scoped_true_hoisted_3]),
           _: 1
         }, 8, ["modelValue"]), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createVNode)(_component_el_radio, {
           modelValue: $setup.gridLineConfig.lineType,
           "onUpdate:modelValue": _cache[9] || (_cache[9] = $event => $setup.gridLineConfig.lineType = $event),
           label: "dashed"
         }, {
-          default: (0,external_commonjs_vue_commonjs2_vue_root_Vue_.withCtx)(() => [echartsvue_type_template_id_422c2ffa_scoped_true_hoisted_4]),
+          default: (0,external_commonjs_vue_commonjs2_vue_root_Vue_.withCtx)(() => [echartsvue_type_template_id_c5c6e504_scoped_true_hoisted_4]),
           _: 1
         }, 8, ["modelValue"]), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createVNode)(_component_el_radio, {
           modelValue: $setup.gridLineConfig.lineType,
           "onUpdate:modelValue": _cache[10] || (_cache[10] = $event => $setup.gridLineConfig.lineType = $event),
           label: "dotted"
         }, {
-          default: (0,external_commonjs_vue_commonjs2_vue_root_Vue_.withCtx)(() => [echartsvue_type_template_id_422c2ffa_scoped_true_hoisted_5]),
+          default: (0,external_commonjs_vue_commonjs2_vue_root_Vue_.withCtx)(() => [echartsvue_type_template_id_c5c6e504_scoped_true_hoisted_5]),
           _: 1
         }, 8, ["modelValue"])]),
         _: 1
@@ -105260,21 +105288,21 @@ function echartsvue_type_template_id_422c2ffa_scoped_true_render(_ctx, _cache, $
           "onUpdate:modelValue": _cache[15] || (_cache[15] = $event => $setup.tickLineConfig.lineType = $event),
           label: "solid"
         }, {
-          default: (0,external_commonjs_vue_commonjs2_vue_root_Vue_.withCtx)(() => [echartsvue_type_template_id_422c2ffa_scoped_true_hoisted_6]),
+          default: (0,external_commonjs_vue_commonjs2_vue_root_Vue_.withCtx)(() => [echartsvue_type_template_id_c5c6e504_scoped_true_hoisted_6]),
           _: 1
         }, 8, ["modelValue"]), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createVNode)(_component_el_radio, {
           modelValue: $setup.tickLineConfig.lineType,
           "onUpdate:modelValue": _cache[16] || (_cache[16] = $event => $setup.tickLineConfig.lineType = $event),
           label: "dashed"
         }, {
-          default: (0,external_commonjs_vue_commonjs2_vue_root_Vue_.withCtx)(() => [echartsvue_type_template_id_422c2ffa_scoped_true_hoisted_7]),
+          default: (0,external_commonjs_vue_commonjs2_vue_root_Vue_.withCtx)(() => [echartsvue_type_template_id_c5c6e504_scoped_true_hoisted_7]),
           _: 1
         }, 8, ["modelValue"]), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createVNode)(_component_el_radio, {
           modelValue: $setup.tickLineConfig.lineType,
           "onUpdate:modelValue": _cache[17] || (_cache[17] = $event => $setup.tickLineConfig.lineType = $event),
           label: "dotted"
         }, {
-          default: (0,external_commonjs_vue_commonjs2_vue_root_Vue_.withCtx)(() => [echartsvue_type_template_id_422c2ffa_scoped_true_hoisted_8]),
+          default: (0,external_commonjs_vue_commonjs2_vue_root_Vue_.withCtx)(() => [echartsvue_type_template_id_c5c6e504_scoped_true_hoisted_8]),
           _: 1
         }, 8, ["modelValue"])]),
         _: 1
@@ -105284,7 +105312,7 @@ function echartsvue_type_template_id_422c2ffa_scoped_true_render(_ctx, _cache, $
     _: 1
   }, 8, ["modelValue"])]);
 }
-;// CONCATENATED MODULE: ./packages/echarts/index.vue?vue&type=template&id=422c2ffa&scoped=true
+;// CONCATENATED MODULE: ./packages/echarts/index.vue?vue&type=template&id=c5c6e504&scoped=true
 /* unplugin-vue-components disabled */
 ;// CONCATENATED MODULE: ./node_modules/echarts/node_modules/tslib/tslib.es6.js
 
@@ -223820,6 +223848,14 @@ const erd = element_resize_detector_default()();
     //自定义事件间隔
     customIntrerVal: {
       type: Number
+    },
+    yLeft: {
+      type: String,
+      default: ''
+    },
+    yRight: {
+      type: String,
+      default: ''
     }
   },
 
@@ -223838,22 +223874,29 @@ const erd = element_resize_detector_default()();
 
     let chartVM;
     let option;
-    let tempArray = [];
+    const isDoubleY = props.data.findIndex(item => 'yAxisIndex' in item && item.yAxisIndex == 1) != -1;
+    let tempArray = []; //左边y轴的数据
+
+    let tempArrayRight = []; //右边y轴的数据
+
     props.data.forEach(item => {
-      tempArray = tempArray.concat(item.data);
+      if ('yAxisIndex' in item && item.yAxisIndex == 1) {
+        tempArrayRight = tempArrayRight.concat(item.data);
+      } else {
+        tempArray = tempArray.concat(item.data);
+      }
     });
 
     if (timeRange.value && tempArray.length != 0) {
-      const {
-        minVal,
-        maxVal
-      } = getMaxAndMinValue();
       option = {
         xAxis: {
           type: "value",
           min: new Date(timeRange.value[0]).getTime(),
           max: new Date(timeRange.value[1]).getTime(),
           interval: 6 * 60 * 60 * 1000,
+          nameTextStyle: {
+            padding: [0, 0, 0, 20]
+          },
           axisLabel: {
             formatter: function (e) {
               let temp;
@@ -223901,17 +223944,35 @@ const erd = element_resize_detector_default()();
         tooltip: {
           trigger: 'axis',
           formatter: params => {
-            return `${dayjs_dayjs_min_default()(params[0].data[0]).format('YYYY-MM-DD HH:mm')}
-            <br/>${params[0].seriesName}：${params[0].data[1]}`;
+            let str = '';
+            params.forEach(item => {
+              str += `<br/>${item.seriesName}：${item.data[1]}`;
+            });
+            return `${dayjs_dayjs_min_default()(params[0].data[0]).format('YYYY-MM-DD HH:mm')}${str}`;
           }
         },
+        grid: {
+          bottom: 80
+        },
         legend: {
           data: []
         },
-        yAxis: {
-          type: 'value',
-          min: minVal,
-          max: maxVal,
+        yAxis: [],
+        dataZoom: [{
+          type: 'inside',
+          xAxisIndex: 0
+        }, {
+          type: 'slider',
+          xAxisIndex: 0
+        }],
+        series: props.data
+      };
+
+      if (isDoubleY) {
+        option.yAxis = [{
+          name: props.yLeft,
+          min: 0,
+          max: 0,
           minorTick: {
             show: true,
             lineStyle: {}
@@ -223928,16 +223989,66 @@ const erd = element_resize_detector_default()();
               color: '#333'
             }
           }
-        },
-        dataZoom: [{
-          type: 'inside',
-          xAxisIndex: 0
         }, {
-          type: 'slider',
-          xAxisIndex: 0
-        }],
-        series: props.data
-      };
+          name: props.yRight,
+          min: 0,
+          max: 5,
+          minorTick: {
+            show: true,
+            lineStyle: {}
+          },
+          minorSplitLine: {
+            show: true,
+            lineStyle: {
+              color: '#ccc'
+            }
+          },
+          splitLine: {
+            show: true,
+            lineStyle: {
+              color: '#333'
+            }
+          }
+        }];
+      } else {
+        option.yAxis = [{
+          name: props.yLeft,
+          min: 0,
+          max: 0,
+          minorTick: {
+            show: true,
+            lineStyle: {}
+          },
+          minorSplitLine: {
+            show: true,
+            lineStyle: {
+              color: '#ccc'
+            }
+          },
+          splitLine: {
+            show: true,
+            lineStyle: {
+              color: '#333'
+            }
+          }
+        }];
+      }
+
+      const {
+        minVal,
+        maxVal
+      } = getMaxAndMinValue(tempArray);
+      option.yAxis[0].min = minVal;
+      option.yAxis[0].max = maxVal;
+
+      if (isDoubleY) {
+        const {
+          minVal: minValRight,
+          maxValRight
+        } = getMaxAndMinValue(tempArrayRight);
+        option.yAxis[1].min = minValRight;
+        option.yAxis[1].max = maxValRight;
+      }
     } else {
       option = {
         title: {
@@ -224029,7 +224140,6 @@ const erd = element_resize_detector_default()();
       option.xAxis.max = maxTime;
       option.legend.data = option.series.map(item => item.name);
       setGridLine(gridLineConfig);
-      console.log(option, 111);
       chartVM.setOption(option, true);
     } //监听网格线相关设置操作
 
@@ -224046,36 +224156,95 @@ const erd = element_resize_detector_default()();
 
     function setGridLine(obj) {
       option.xAxis.minorTick.show = obj.tickX;
-      option.yAxis.minorTick.show = obj.tickY;
+      option.yAxis[0].minorTick.show = obj.tickY;
+
+      if (isDoubleY) {
+        option.yAxis[1].minorTick.show = obj.tickY;
+      }
+
       option.xAxis.minorSplitLine.show = obj.lineX;
-      option.yAxis.minorSplitLine.show = obj.lineY;
+      option.yAxis[0].minorSplitLine.show = obj.lineY;
+
+      if (isDoubleY) {
+        option.yAxis[1].minorSplitLine.show = obj.lineY;
+      }
+
       option.xAxis.minorSplitLine.lineStyle.color = obj.lineColor;
-      option.yAxis.minorSplitLine.lineStyle.color = obj.lineColor;
+      option.yAxis[0].minorSplitLine.lineStyle.color = obj.lineColor;
+
+      if (isDoubleY) {
+        option.yAxis[1].minorSplitLine.lineStyle.color = obj.lineColor;
+      }
+
       option.xAxis.minorTick.lineStyle.width = obj.lineWidth;
-      option.yAxis.minorTick.lineStyle.width = obj.lineWidth;
+      option.yAxis[0].minorTick.lineStyle.width = obj.lineWidth;
+
+      if (isDoubleY) {
+        option.yAxis[1].minorTick.lineStyle.width = obj.lineWidth;
+      }
+
       option.xAxis.minorSplitLine.lineStyle.width = obj.lineWidth;
-      option.yAxis.minorSplitLine.lineStyle.width = obj.lineWidth;
+      option.yAxis[0].minorSplitLine.lineStyle.width = obj.lineWidth;
+
+      if (isDoubleY) {
+        option.yAxis[1].minorSplitLine.lineStyle.width = obj.lineWidth;
+      }
+
       option.xAxis.minorTick.lineStyle.type = obj.lineType;
-      option.yAxis.minorTick.lineStyle.type = obj.lineType;
+      option.yAxis[0].minorTick.lineStyle.type = obj.lineType;
+
+      if (isDoubleY) {
+        option.yAxis[1].minorTick.lineStyle.type = obj.lineType;
+      }
+
       option.xAxis.minorSplitLine.lineStyle.type = obj.lineType;
-      option.yAxis.minorSplitLine.lineStyle.type = obj.lineType;
+      option.yAxis[0].minorSplitLine.lineStyle.type = obj.lineType;
+
+      if (isDoubleY) {
+        option.yAxis[1].minorSplitLine.lineStyle.type = obj.lineType;
+      }
+
       option.xAxis.minorTick.splitNumber = obj.splitNumber;
+      option.yAxis[0].minorTick.splitNumber = obj.splitNumber;
+
+      if (isDoubleY) {
+        option.yAxis[1].minorTick.splitNumber = obj.splitNumber;
+      }
     } //刻度线相关设置 
 
 
     function setTickLine(obj) {
       //显隐
       option.xAxis.splitLine.show = obj.tickX;
-      option.yAxis.splitLine.show = obj.tickY; //颜色
+      option.yAxis[0].splitLine.show = obj.tickY;
+
+      if (isDoubleY) {
+        option.yAxis[1].splitLine.show = obj.tickY;
+      } //颜色
+
 
       option.xAxis.splitLine.lineStyle.color = obj.lineColor;
-      option.yAxis.splitLine.lineStyle.color = obj.lineColor; //线宽
+      option.yAxis[0].splitLine.lineStyle.color = obj.lineColor;
+
+      if (isDoubleY) {
+        option.yAxis[1].splitLine.lineStyle.color = obj.lineColor;
+      } //线宽
+
 
       option.xAxis.splitLine.lineStyle.width = obj.lineWidth;
-      option.yAxis.splitLine.lineStyle.width = obj.lineWidth; //类型
+      option.yAxis[0].splitLine.lineStyle.width = obj.lineWidth;
+
+      if (isDoubleY) {
+        option.yAxis[1].splitLine.lineStyle.width = obj.lineWidth;
+      } //类型
+
 
       option.xAxis.splitLine.lineStyle.type = obj.lineType;
-      option.yAxis.splitLine.lineStyle.type = obj.lineType;
+      option.yAxis[0].splitLine.lineStyle.type = obj.lineType;
+
+      if (isDoubleY) {
+        option.yAxis[1].splitLine.lineStyle.type = obj.lineType;
+      }
     } //自定义配置持久化
 
 
@@ -224098,13 +224267,19 @@ const erd = element_resize_detector_default()();
     } //计算图表y轴最大值和最小值
 
 
-    function getMaxAndMinValue() {
+    function getMaxAndMinValue(tempArray) {
       let minVal, maxVal;
-      const tempArraySort = tempArray.sort((a, b) => {
+      const tempArraySort = tempArray.filter(item => item[1] != null).sort((a, b) => {
         return a[1] - b[1];
       });
-      minVal = tempArraySort[0][1];
-      maxVal = tempArraySort[tempArraySort.length - 1][1];
+
+      if (tempArraySort.length == 0) {
+        minVal = 0, maxVal = 1;
+      } else {
+        minVal = tempArraySort[0][1];
+        maxVal = tempArraySort[tempArraySort.length - 1][1];
+      }
+
       const sub = maxVal - minVal;
       minVal = Math.floor((minVal - sub * props.maxAndMinLevel) * Math.pow(10, props.yMaxAndMinkeepDecimal)) / Math.pow(10, props.yMaxAndMinkeepDecimal);
       maxVal = Math.ceil((maxVal + sub * props.maxAndMinLevel) * Math.pow(10, props.yMaxAndMinkeepDecimal)) / Math.pow(10, props.yMaxAndMinkeepDecimal);
@@ -224130,10 +224305,10 @@ const erd = element_resize_detector_default()();
 });
 ;// CONCATENATED MODULE: ./packages/echarts/index.vue?vue&type=script&lang=js
 /* unplugin-vue-components disabled */ 
-;// 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
+;// 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
 /* unplugin-vue-components disabled */// extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./packages/echarts/index.vue?vue&type=style&index=0&id=422c2ffa&lang=scss&scoped=true
+;// CONCATENATED MODULE: ./packages/echarts/index.vue?vue&type=style&index=0&id=c5c6e504&lang=scss&scoped=true
 /* unplugin-vue-components disabled */
 ;// CONCATENATED MODULE: ./packages/echarts/index.vue
 /* unplugin-vue-components disabled */
@@ -224143,7 +224318,7 @@ const erd = element_resize_detector_default()();
 ;
 
 
-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"]])
+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"]])
 
 /* harmony default export */ var echarts = (echarts_exports_);
 ;// CONCATENATED MODULE: ./packages/echarts/index.js