jtui3.0 1.0.67 → 1.0.68

package/lib/jtui3.0.common.js

@@ -90447,7 +90447,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
  */
@@ -99449,11 +99449,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-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/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-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/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;
@@ -99473,7 +99473,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-40.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 */
@@ -99497,7 +99497,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];
       }
     }
 
@@ -99513,10 +99518,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) {
@@ -99524,14 +99528,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) {
@@ -99558,14 +99587,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-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/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-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/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;
@@ -99591,7 +99620,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-40.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 */
@@ -99602,7 +99631,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() {
@@ -99657,7 +99685,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

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