@yoooloo42/joker 1.0.136 → 1.0.138

package/dist/index.cjs.js

@@ -41436,7 +41436,7 @@ const props = __props;
 // props属性包装，继承了顶层组件的响应性，页面和js可以使用相同的命名
 const tableProps_box = props.tableProps;
 
-let checkedAll = vue.ref(true); // 是否全选状态
+let checkedAll = vue.ref(false); // 是否全选状态
 let isIndeterminate = vue.ref(false); // 不确定状态：非全选、非全空
 let itemsChecked = vue.reactive([]); // 已选中条目
 
@@ -41445,25 +41445,37 @@ const hdl = {
     getKeys(p) {
         let a = [];
         p.forEach(i => {
-            a.push(i.key);
+            a.push(i.fieldName);
         });
         return a
     },
     // 全选
     checkedAll(val) {
         itemsChecked = val ? hdl.getKeys(tableProps_box.table.pickCol.colsInit) : [];
-        isIndeterminate.value = false;
+        isIndeterminate.value = !val;
     },
     // 选中或取消某一条
     checkedItemsChange(val) {
-        checkedAll.value = val.length === tableProps_box.table.pickCol.colsInit.length;
-        isIndeterminate.value = val.length > 0 && val.length < tableProps_box.table.pickCol.colsInit.length;
+        if(val.length > 0 && val.length === tableProps_box.table.pickCol.colsInit.length){
+            checkedAll.value = true;
+            isIndeterminate.value = false;
+            return
+        }
+        if(val.length > 0 && val.length !== tableProps_box.table.pickCol.colsInit.length){
+            checkedAll.value = false;
+            isIndeterminate.value = true;
+            return
+        }
+        if(val.length === 0){
+            checkedAll.value = false;
+            isIndeterminate.value = false;
+        }
     },
     confirm() { // 确认提交
         tableProps_box.table.cols = [];
         itemsChecked.forEach(i => {
             tableProps_box.table.cols.push(tableProps_box.table.pickCol.colsInit.find(j => {
-                return j.key === i
+                return j.fieldName === i
             }));
         });
         tableProps_box.table.pickCol.popup.visible = false;
@@ -41521,8 +41533,8 @@ return (_ctx, _cache) => {
             (vue.openBlock(true), vue.createElementBlock(vue.Fragment, null, vue.renderList(vue.unref(tableProps_box).table.pickCol.colsInit, (item) => {
               return (vue.openBlock(), vue.createBlock(_component_el_checkbox, {
                 style: {"display":"block","margin-bottom":"10px"},
-                label: item ? item.key : '',
-                key: item ? item.key : ''
+                label: item ? item.fieldName : '',
+                key: item ? item.fieldName : ''
               }, {
                 default: vue.withCtx(() => [
                   vue.createTextVNode(vue.toDisplayString(item ? item.label : ''), 1 /* TEXT */)