three-trees-ui 1.0.22 → 1.0.23

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "three-trees-ui",
-  "version": "1.0.22",
+  "version": "1.0.23",
   "publicPath": "/ui",
   "author": "hotent",
   "private": false,

package/packages/DimensionSelector/src/main.vue

@@ -128,9 +128,17 @@
             />
             <p
               class="selector-selected__label"
-              :title="`${select[selectLabel]}(${select['code']})`"
+              :title="
+                `${select[selectLabel]}${
+                  select['code'] ? `(${select['code']})` : ''
+                }`
+              "
             >
-              {{ `${select[selectLabel]}(${select['code']})` }}
+              {{
+                `${select[selectLabel]}${
+                  select['code'] ? `(${select['code']})` : ''
+                }`
+              }}
             </p>
           </template>
         </ht-list-selector>

package/packages/JobSelector/src/JobSelectorDialog.vue

@@ -63,9 +63,17 @@
           />
           <p
             class="selector-selected__label"
-            :title="`${select[selectLabel]}(${select['code']})`"
+            :title="
+              `${select[selectLabel]}${
+                select['code'] ? `(${select['code']})` : ''
+              }`
+            "
           >
-            {{ `${select[selectLabel]}(${select['code']})` }}
+            {{
+              `${select[selectLabel]}${
+                select['code'] ? `(${select['code']})` : ''
+              }`
+            }}
           </p>
         </template>
       </ht-list-selector>

package/packages/ListSelector/src/ListSelector.vue

@@ -14,6 +14,15 @@
         </div>
         <div class="selector-main__body">
           <el-scrollbar v-if="data.length > 0" class="selector-list__scroll">
+            <el-checkbox
+              v-if="!single"
+              v-model="checkAll"
+              class="check-all"
+              :indeterminate="isIndeterminate"
+              @change="handleCheckAllChange"
+            >
+              全选
+            </el-checkbox>
             <ul
               class="selector-main__list"
               :class="{ 'two-columns': isSearchMode }"
@@ -112,7 +121,8 @@
 <script>
   import Locale from '@/mixins/locale'
   import mobileMode from '@/mixins/mobileMode.js'
-  import { debounce } from 'lodash'
+  import { debounce, cloneDeep } from 'lodash'
+  import utils from '@/utils.js'
   const draggable = require('vuedraggable')
 
   export default {
@@ -172,6 +182,8 @@
         currentSelectData: [],
         noDataImg: require('@/assets/no-data.png'),
         pageSizeArr: [10, 50, 100, 200, 300],
+        checkAll: false,
+        isIndeterminate: false,
       }
     },
     computed: {
@@ -239,6 +251,10 @@
         },
         deep: true,
       },
+      currentPageSelectedCount(val) {
+        this.checkAll = val === this.data.length
+        this.isIndeterminate = val > 0 && val < this.data.length
+      },
     },
     methods: {
       getSelectedData() {
@@ -294,6 +310,26 @@
       clearAllSelects() {
         this.selects = []
       },
+      handleCheckAllChange(val) {
+        if (val) {
+          const currentPageData = cloneDeep(this.data)
+          this.selects = this.selects.length
+            ? utils.uniqueArrayObject(
+                [...this.selects, ...currentPageData],
+                'id'
+              )
+            : currentPageData
+        } else {
+          if (this.selects.length > this.data.length) {
+            const cancelSelectedIds = this.data.map((it) => it.id)
+            this.selects = this.selects.filter(
+              (item) => !cancelSelectedIds.includes(item.id)
+            )
+          } else {
+            this.selects = []
+          }
+        }
+      },
     },
   }
 </script>
@@ -356,7 +392,9 @@
         .selector-list__scroll {
           height: calc(100% - 42px);
         }
-
+        .check-all {
+          padding: 16px 20px 2px 20px;
+        }
         .selector-main__list {
           list-style: none;
           padding: 10px 20px;

package/packages/OrgSelector/src/OrgSelectorDialog.vue

@@ -84,9 +84,17 @@
           />
           <p
             class="selector-selected__label"
-            :title="`${select[selectLabel]}(${select['code']})`"
+            :title="
+              `${select[selectLabel]}${
+                select['code'] ? `(${select['code']})` : ''
+              }`
+            "
           >
-            {{ `${select[selectLabel]}(${select['code']})` }}
+            {{
+              `${select[selectLabel]}${
+                select['code'] ? `(${select['code']})` : ''
+              }`
+            }}
           </p>
         </template>
       </ht-list-selector>

package/packages/PostSelector/src/PostSelectorDialog.vue

@@ -87,9 +87,17 @@
           />
           <p
             class="selector-selected__label"
-            :title="`${select[selectLabel]}(${select['code']})`"
+            :title="
+              `${select[selectLabel]}${
+                select['code'] ? `(${select['code']})` : ''
+              }`
+            "
           >
-            {{ `${select[selectLabel]}(${select['code']})` }}
+            {{
+              `${select[selectLabel]}${
+                select['code'] ? `(${select['code']})` : ''
+              }`
+            }}
           </p>
         </template>
       </ht-list-selector>

package/packages/RoleSelector/src/RoleSelectorDialog.vue

@@ -63,9 +63,17 @@
           />
           <p
             class="selector-selected__label"
-            :title="`${select[selectLabel]}(${select['code']})`"
+            :title="
+              `${select[selectLabel]}${
+                select['code'] ? `(${select['code']})` : ''
+              }`
+            "
           >
-            {{ `${select[selectLabel]}(${select['code']})` }}
+            {{
+              `${select[selectLabel]}${
+                select['code'] ? `(${select['code']})` : ''
+              }`
+            }}
           </p>
         </template>
       </ht-list-selector>

package/packages/UserSelector/src/UserSelectorDialog.vue

@@ -111,9 +111,17 @@
           />
           <p
             class="selector-selected__label"
-            :title="`${select[selectLabel]}(${select['account']})`"
+            :title="
+              `${select[selectLabel]}${
+                select['account'] ? `(${select['account']})` : ''
+              }`
+            "
           >
-            {{ `${select[selectLabel]}(${select['account']})` }}
+            {{
+              `${select[selectLabel]}${
+                select['account'] ? `(${select['account']})` : ''
+              }`
+            }}
           </p>
         </template>
       </ht-list-selector>

package/src/utils.js

@@ -51,6 +51,20 @@ var utils = {
     })
     return result
   },
+  /**
+   *数组对象去重
+   *
+   * @export
+   * @param {any[]} array 要去重的数组
+   * @param {string} key 要去重的对象属性值
+   * @return {*}  {any[]}
+   */
+  uniqueArrayObject(array, key) {
+    return array.reduce((pre, cur) => {
+      const keys = pre.map((item) => item[key])
+      return keys.includes(cur[key]) ? pre : [...pre, cur]
+    }, [])
+  },
   // 获取随机的名称
   getName: () => {
     return Math.random()