jtui3.0 1.0.66 → 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
  */
@@ -97610,19 +97610,19 @@ table_big_datavue_type_script_lang_js_default_.setup = table_big_datavue_type_sc
 const table_big_data_exports_ = /*#__PURE__*/(0,exportHelper/* default */.Z)(table_big_datavue_type_script_lang_js, [['render',table_big_datavue_type_template_id_f60cf5ba_scoped_true_render],['__scopeId',"data-v-f60cf5ba"]])
 
 /* harmony default export */ var table_big_data = (table_big_data_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/tree-table.vue?vue&type=template&id=77a43d98&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-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/tree-table.vue?vue&type=template&id=21189d3c&scoped=true
 /* unplugin-vue-components disabled */
 
-const tree_tablevue_type_template_id_77a43d98_scoped_true_withScopeId = n => (_pushScopeId("data-v-77a43d98"), n = n(), _popScopeId(), n);
+const tree_tablevue_type_template_id_21189d3c_scoped_true_withScopeId = n => (_pushScopeId("data-v-21189d3c"), n = n(), _popScopeId(), n);
 
-const tree_tablevue_type_template_id_77a43d98_scoped_true_hoisted_1 = {
+const tree_tablevue_type_template_id_21189d3c_scoped_true_hoisted_1 = {
   key: 0,
   style: {
     "position": "relative"
   }
 };
-const tree_tablevue_type_template_id_77a43d98_scoped_true_hoisted_2 = ["onClick"];
-function tree_tablevue_type_template_id_77a43d98_scoped_true_render(_ctx, _cache, $props, $setup, $data, $options) {
+const tree_tablevue_type_template_id_21189d3c_scoped_true_hoisted_2 = ["onClick"];
+function tree_tablevue_type_template_id_21189d3c_scoped_true_render(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_vxe_toolbar = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.resolveComponent)("vxe-toolbar");
 
   const _component_vxe_column = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.resolveComponent)("vxe-column");
@@ -97637,7 +97637,7 @@ function tree_tablevue_type_template_id_77a43d98_scoped_true_render(_ctx, _cache
 
   const _component_vxe_table = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.resolveComponent)("vxe-table");
 
-  return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.openBlock)(), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createElementBlock)(external_commonjs_vue_commonjs2_vue_root_Vue_.Fragment, null, [_ctx.isTool ? ((0,external_commonjs_vue_commonjs2_vue_root_Vue_.openBlock)(), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createElementBlock)("div", tree_tablevue_type_template_id_77a43d98_scoped_true_hoisted_1, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.createVNode)(_component_vxe_toolbar, {
+  return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.openBlock)(), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createElementBlock)(external_commonjs_vue_commonjs2_vue_root_Vue_.Fragment, null, [_ctx.isTool ? ((0,external_commonjs_vue_commonjs2_vue_root_Vue_.openBlock)(), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createElementBlock)("div", tree_tablevue_type_template_id_21189d3c_scoped_true_hoisted_1, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.createVNode)(_component_vxe_toolbar, {
     class: "jt-toolbar",
     ref: "jtToolbarRef",
     custom: {
@@ -97722,7 +97722,7 @@ function tree_tablevue_type_template_id_77a43d98_scoped_true_render(_ctx, _cache
         }, null, 2)) : ((0,external_commonjs_vue_commonjs2_vue_root_Vue_.openBlock)(), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createElementBlock)("i", {
           key: 1,
           class: (0,external_commonjs_vue_commonjs2_vue_root_Vue_.normalizeClass)(["jtIcon jt-iconFile", row.icon ? row.icon : 'icon21file'])
-        }, null, 2)), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createElementVNode)("span", null, (0,external_commonjs_vue_commonjs2_vue_root_Vue_.toDisplayString)(row[item.prop]), 1)], 8, tree_tablevue_type_template_id_77a43d98_scoped_true_hoisted_2)])
+        }, null, 2)), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createElementVNode)("span", null, (0,external_commonjs_vue_commonjs2_vue_root_Vue_.toDisplayString)(row[item.prop]), 1)], 8, tree_tablevue_type_template_id_21189d3c_scoped_true_hoisted_2)])
       } : undefined]), 1040, ["tree-node", "cellRender"]);
     }), 128)), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createVNode)(_component_table_expand_row, null, {
       expandContent: (0,external_commonjs_vue_commonjs2_vue_root_Vue_.withCtx)(row => [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.renderSlot)(_ctx.$slots, "expandContent", {
@@ -97737,7 +97737,7 @@ function tree_tablevue_type_template_id_77a43d98_scoped_true_render(_ctx, _cache
     _: 3
   }, 16, ["class", "sort-config", "data", "tree-config", "show-header", "onCheckboxChange", "onCheckboxAll", "onRadioChange", "onCellClick", "onKeydown"])], 64);
 }
-;// CONCATENATED MODULE: ./packages/tables/tree-table.vue?vue&type=template&id=77a43d98&scoped=true
+;// CONCATENATED MODULE: ./packages/tables/tree-table.vue?vue&type=template&id=21189d3c&scoped=true
 /* 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/tree-table.vue?vue&type=script&lang=js
 /* unplugin-vue-components disabled */
@@ -97842,7 +97842,7 @@ const tree_tablevue_type_script_lang_js_default_ = {
           if (tempAry.length == 2) {
             url = tempAry[0] + '?' + encodeURIComponent(tempAry[1]);
           } else {
-            url = empAry[0];
+            url = tempAry[0];
           }
 
           const {
@@ -97900,9 +97900,9 @@ const tree_tablevue_type_script_lang_js_default_ = {
 
 const tree_tablevue_type_script_lang_js_injectCSSVars_ = () => {
   (0,external_commonjs_vue_commonjs2_vue_root_Vue_.useCssVars)(_ctx => ({
-    "7d1fcf6b": _ctx.headerBg,
-    "2a97dd2b": _ctx.stripeBg,
-    "5ac36f05": _ctx.currentBg
+    "92efb12e": _ctx.headerBg,
+    "64003529": _ctx.stripeBg,
+    "4e6616c7": _ctx.currentBg
   }));
 };
 
@@ -97915,10 +97915,10 @@ tree_tablevue_type_script_lang_js_default_.setup = tree_tablevue_type_script_lan
 /* harmony default export */ var tree_tablevue_type_script_lang_js = (tree_tablevue_type_script_lang_js_default_);
 ;// CONCATENATED MODULE: ./packages/tables/tree-table.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-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/tables/tree-table.vue?vue&type=style&index=0&id=77a43d98&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-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/tables/tree-table.vue?vue&type=style&index=0&id=21189d3c&lang=scss&scoped=true
 /* unplugin-vue-components disabled */// extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./packages/tables/tree-table.vue?vue&type=style&index=0&id=77a43d98&lang=scss&scoped=true
+;// CONCATENATED MODULE: ./packages/tables/tree-table.vue?vue&type=style&index=0&id=21189d3c&lang=scss&scoped=true
 /* unplugin-vue-components disabled */
 ;// CONCATENATED MODULE: ./packages/tables/tree-table.vue
 /* unplugin-vue-components disabled */
@@ -97928,7 +97928,7 @@ tree_tablevue_type_script_lang_js_default_.setup = tree_tablevue_type_script_lan
 ;
 
 
-const tree_table_exports_ = /*#__PURE__*/(0,exportHelper/* default */.Z)(tree_tablevue_type_script_lang_js, [['render',tree_tablevue_type_template_id_77a43d98_scoped_true_render],['__scopeId',"data-v-77a43d98"]])
+const tree_table_exports_ = /*#__PURE__*/(0,exportHelper/* default */.Z)(tree_tablevue_type_script_lang_js, [['render',tree_tablevue_type_template_id_21189d3c_scoped_true_render],['__scopeId',"data-v-21189d3c"]])
 
 /* harmony default export */ var tree_table = (tree_table_exports_);
 // EXTERNAL MODULE: ./node_modules/vxe-table/lib/v-x-e-table/style/index.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