jtui3.0 1.0.51 → 1.0.52

package/lib/jtui3.0.common.js

@@ -85793,12 +85793,16 @@ function useFilterData() {
 /*
  * @Author: leevan
  * @Date: 2022-07-12 16:59:44
- * @LastEditTime: 2022-11-30 15:33:16
+ * @LastEditTime: 2023-08-21 11:18:17
  * @LastEditors: leevan
  * @FilePath: /jtui3.0/packages/tables/hooks/useFormatter.js
  */
 function useFormatter() {
-  function objectTxt(cellValue) {
+  function objectTxt(cellValue, column) {
+    if (column.editRender && column.editRender.name == 'cascader-select') {
+      return cellValue.label;
+    }
+
     return typeof cellValue == 'object' && cellValue != null ? JSON.stringify(cellValue) : cellValue;
   }
 
@@ -85823,14 +85827,14 @@ function useFormatter() {
                           ></span>`;
               }
             });
-            return str ? str : objectTxt(cellValue);
+            return str ? str : objectTxt(cellValue, column);
           } else {
             let item = data.html.find(item => item.value == cellValue);
-            return item ? `<span class="jtIcon ${item.icon}" style="color:${item.color};font-size:${item.size}px"></span>` : objectTxt(cellValue);
+            return item ? `<span class="jtIcon ${item.icon}" style="color:${item.color};font-size:${item.size}px"></span>` : objectTxt(cellValue, column);
           }
         } else if (data.htmlType == "a") {
           let item = data.html.find(item => item.value == cellValue);
-          return item ? `<a href="javascript:">${item.label}</a>` : objectTxt(cellValue);
+          return item ? `<a href="javascript:">${item.label}</a>` : objectTxt(cellValue, column);
         } else if (data.htmlType == 'tag') {
           let item = data.html.find(item => item.value == cellValue);
           return item ? `<span style="
@@ -85845,17 +85849,17 @@ function useFormatter() {
               border-radius: 4px;
               box-sizing: border-box;
               white-space: nowrap;
-              ">${item.label}</span>` : objectTxt(cellValue);
+              ">${item.label}</span>` : objectTxt(cellValue, column);
         }
       } else if (data && "enum" in data) {
         let item = data.enum.find(item => item.value == cellValue);
-        return item ? item.label : objectTxt(cellValue);
+        return item ? item.label : objectTxt(cellValue, column);
       } else {
-        return objectTxt(cellValue);
+        return objectTxt(cellValue, column);
       }
     } catch (error) {
       console.log(error);
-      return objectTxt(cellValue);
+      return objectTxt(cellValue, column);
     }
   }
 
@@ -94745,18 +94749,16 @@ 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=4c489121
+;// 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
 /* unplugin-vue-components disabled */
 
 
-function cascader_selectvue_type_template_id_4c489121_render(_ctx, _cache, $props, $setup, $data, $options) {
+function cascader_selectvue_type_template_id_5954d7fa_render(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_el_option = ElOption;
 
   const _component_el_select = ElSelect;
 
   return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.openBlock)(), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createElementBlock)("div", null, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.createVNode)(_component_el_select, {
-    modelValue: _ctx.value,
-    "onUpdate:modelValue": _cache[0] || (_cache[0] = $event => _ctx.value = $event),
     placeholder: "请选择",
     onChange: $setup.change,
     onVisibleChange: $setup.visibleChange
@@ -94769,9 +94771,9 @@ function cascader_selectvue_type_template_id_4c489121_render(_ctx, _cache, $prop
       }, null, 8, ["label", "value"]);
     }), 128))]),
     _: 1
-  }, 8, ["modelValue", "onChange", "onVisibleChange"])]);
+  }, 8, ["onChange", "onVisibleChange"])]);
 }
-;// CONCATENATED MODULE: ./packages/tables/hooks/edit-render/cascader-select.vue?vue&type=template&id=4c489121
+;// CONCATENATED MODULE: ./packages/tables/hooks/edit-render/cascader-select.vue?vue&type=template&id=5954d7fa
 /* 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 */
@@ -94792,7 +94794,6 @@ function cascader_selectvue_type_template_id_4c489121_render(_ctx, _cache, $prop
       const {
         options: opts
       } = column.editRender;
-      console.log(column, row);
       selectValue.value = row[column.field];
 
       if (Array.isArray(opts)) {
@@ -94816,7 +94817,7 @@ function cascader_selectvue_type_template_id_4c489121_render(_ctx, _cache, $prop
         options: opts
       } = column.editRender;
       const temp = opts.find(item => item.value === data);
-      row[column.field] = temp.label;
+      row[column.field] = temp;
 
       if (nextProp) {
         const nextCol = $table.getColumnByField(nextProp);
@@ -94857,14 +94858,14 @@ function cascader_selectvue_type_template_id_4c489121_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_4c489121_render]])
+const cascader_select_exports_ = /*#__PURE__*/(0,exportHelper/* default */.Z)(cascader_selectvue_type_script_lang_js, [['render',cascader_selectvue_type_template_id_5954d7fa_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=193da1f9
+;// 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
 /* unplugin-vue-components disabled */
 
 
-function cus_selectvue_type_template_id_193da1f9_render(_ctx, _cache, $props, $setup, $data, $options) {
+function cus_selectvue_type_template_id_411a42b6_render(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_el_option = ElOption;
 
   const _component_el_select = ElSelect;
@@ -94890,7 +94891,7 @@ function cus_selectvue_type_template_id_193da1f9_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=193da1f9
+;// CONCATENATED MODULE: ./packages/tables/hooks/edit-render/cus-select.vue?vue&type=template&id=411a42b6
 /* 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 */
@@ -94913,7 +94914,6 @@ function cus_selectvue_type_template_id_193da1f9_render(_ctx, _cache, $props, $s
       const {
         options: opts
       } = column.editRender.config;
-      console.log(column, row);
 
       if (Array.isArray(opts)) {
         options.value = opts;
@@ -94957,7 +94957,7 @@ function cus_selectvue_type_template_id_193da1f9_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_193da1f9_render]])
+const cus_select_exports_ = /*#__PURE__*/(0,exportHelper/* default */.Z)(cus_selectvue_type_script_lang_js, [['render',cus_selectvue_type_template_id_411a42b6_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

@@ -85803,12 +85803,16 @@ function useFilterData() {
 /*
  * @Author: leevan
  * @Date: 2022-07-12 16:59:44
- * @LastEditTime: 2022-11-30 15:33:16
+ * @LastEditTime: 2023-08-21 11:18:17
  * @LastEditors: leevan
  * @FilePath: /jtui3.0/packages/tables/hooks/useFormatter.js
  */
 function useFormatter() {
-  function objectTxt(cellValue) {
+  function objectTxt(cellValue, column) {
+    if (column.editRender && column.editRender.name == 'cascader-select') {
+      return cellValue.label;
+    }
+
     return typeof cellValue == 'object' && cellValue != null ? JSON.stringify(cellValue) : cellValue;
   }
 
@@ -85833,14 +85837,14 @@ function useFormatter() {
                           ></span>`;
               }
             });
-            return str ? str : objectTxt(cellValue);
+            return str ? str : objectTxt(cellValue, column);
           } else {
             let item = data.html.find(item => item.value == cellValue);
-            return item ? `<span class="jtIcon ${item.icon}" style="color:${item.color};font-size:${item.size}px"></span>` : objectTxt(cellValue);
+            return item ? `<span class="jtIcon ${item.icon}" style="color:${item.color};font-size:${item.size}px"></span>` : objectTxt(cellValue, column);
           }
         } else if (data.htmlType == "a") {
           let item = data.html.find(item => item.value == cellValue);
-          return item ? `<a href="javascript:">${item.label}</a>` : objectTxt(cellValue);
+          return item ? `<a href="javascript:">${item.label}</a>` : objectTxt(cellValue, column);
         } else if (data.htmlType == 'tag') {
           let item = data.html.find(item => item.value == cellValue);
           return item ? `<span style="
@@ -85855,17 +85859,17 @@ function useFormatter() {
               border-radius: 4px;
               box-sizing: border-box;
               white-space: nowrap;
-              ">${item.label}</span>` : objectTxt(cellValue);
+              ">${item.label}</span>` : objectTxt(cellValue, column);
         }
       } else if (data && "enum" in data) {
         let item = data.enum.find(item => item.value == cellValue);
-        return item ? item.label : objectTxt(cellValue);
+        return item ? item.label : objectTxt(cellValue, column);
       } else {
-        return objectTxt(cellValue);
+        return objectTxt(cellValue, column);
       }
     } catch (error) {
       console.log(error);
-      return objectTxt(cellValue);
+      return objectTxt(cellValue, column);
     }
   }
 
@@ -94755,18 +94759,16 @@ 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=4c489121
+;// 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
 /* unplugin-vue-components disabled */
 
 
-function cascader_selectvue_type_template_id_4c489121_render(_ctx, _cache, $props, $setup, $data, $options) {
+function cascader_selectvue_type_template_id_5954d7fa_render(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_el_option = ElOption;
 
   const _component_el_select = ElSelect;
 
   return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.openBlock)(), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createElementBlock)("div", null, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.createVNode)(_component_el_select, {
-    modelValue: _ctx.value,
-    "onUpdate:modelValue": _cache[0] || (_cache[0] = $event => _ctx.value = $event),
     placeholder: "请选择",
     onChange: $setup.change,
     onVisibleChange: $setup.visibleChange
@@ -94779,9 +94781,9 @@ function cascader_selectvue_type_template_id_4c489121_render(_ctx, _cache, $prop
       }, null, 8, ["label", "value"]);
     }), 128))]),
     _: 1
-  }, 8, ["modelValue", "onChange", "onVisibleChange"])]);
+  }, 8, ["onChange", "onVisibleChange"])]);
 }
-;// CONCATENATED MODULE: ./packages/tables/hooks/edit-render/cascader-select.vue?vue&type=template&id=4c489121
+;// CONCATENATED MODULE: ./packages/tables/hooks/edit-render/cascader-select.vue?vue&type=template&id=5954d7fa
 /* 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 */
@@ -94802,7 +94804,6 @@ function cascader_selectvue_type_template_id_4c489121_render(_ctx, _cache, $prop
       const {
         options: opts
       } = column.editRender;
-      console.log(column, row);
       selectValue.value = row[column.field];
 
       if (Array.isArray(opts)) {
@@ -94826,7 +94827,7 @@ function cascader_selectvue_type_template_id_4c489121_render(_ctx, _cache, $prop
         options: opts
       } = column.editRender;
       const temp = opts.find(item => item.value === data);
-      row[column.field] = temp.label;
+      row[column.field] = temp;
 
       if (nextProp) {
         const nextCol = $table.getColumnByField(nextProp);
@@ -94867,14 +94868,14 @@ function cascader_selectvue_type_template_id_4c489121_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_4c489121_render]])
+const cascader_select_exports_ = /*#__PURE__*/(0,exportHelper/* default */.Z)(cascader_selectvue_type_script_lang_js, [['render',cascader_selectvue_type_template_id_5954d7fa_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=193da1f9
+;// 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
 /* unplugin-vue-components disabled */
 
 
-function cus_selectvue_type_template_id_193da1f9_render(_ctx, _cache, $props, $setup, $data, $options) {
+function cus_selectvue_type_template_id_411a42b6_render(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_el_option = ElOption;
 
   const _component_el_select = ElSelect;
@@ -94900,7 +94901,7 @@ function cus_selectvue_type_template_id_193da1f9_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=193da1f9
+;// CONCATENATED MODULE: ./packages/tables/hooks/edit-render/cus-select.vue?vue&type=template&id=411a42b6
 /* 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 */
@@ -94923,7 +94924,6 @@ function cus_selectvue_type_template_id_193da1f9_render(_ctx, _cache, $props, $s
       const {
         options: opts
       } = column.editRender.config;
-      console.log(column, row);
 
       if (Array.isArray(opts)) {
         options.value = opts;
@@ -94967,7 +94967,7 @@ function cus_selectvue_type_template_id_193da1f9_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_193da1f9_render]])
+const cus_select_exports_ = /*#__PURE__*/(0,exportHelper/* default */.Z)(cus_selectvue_type_script_lang_js, [['render',cus_selectvue_type_template_id_411a42b6_render]])
 
 /* harmony default export */ var cus_select = (cus_select_exports_);
 ;// CONCATENATED MODULE: ./packages/tables/hooks/edit-render/edit-render.js