cnhis-design-vue 2.1.138 → 2.1.141

package/packages/select-person/select-person.vue

@@ -18,70 +18,72 @@
             <div class="type-btn" :class="{ 'type-active': typeActiveIndex === 1 }" @click="onTypeClick(1)">选科室</div>
             <div class="type-btn" :class="{ 'type-active': typeActiveIndex === 2 }" @click="onTypeClick(2)">选角色</div>
           </div>
-          <template v-if="!isSingleCheck">
-            <a-checkbox v-if="searchTreeVisable" v-model="searchChecked" :indeterminate="searchIndeterminate" @change="radioChange">
-              <!-- {{ $t("1.10.139") }} -->
-              全选
-            </a-checkbox>
-
-            <a-checkbox v-else v-model="singleChecked" :indeterminate="indeterminate" @change="radioChange">
-              <!-- {{ $t("1.10.139") }} -->
-              全选
-            </a-checkbox>
-          </template>
-
-          <div v-show="search.status == 3 || (search.status == 0 && treeData.temp && treeData.temp.length == 0)" class="no-data-tips">
-            查无结果
-          </div>
-          <!-- main tree -->
-          <a-tree
-            class="main-tree-container"
-            v-show="search.status == 0"
-            ref="antTree"
-            v-model="checkedKeys.temp"
-            @expand="onExpand"
-            @check="onTreeCheck"
-            checkable
-            :expandedKeys="expandedKeys"
-            :autoExpandParent="autoExpandParent"
-            :checkStrictly="checkStrictly"
-            :selectable="false"
-            :treeData="treeData.temp"
-            :load-data="getLoadChildData"
-            :disabled="isDetail"
-          >
-            <template slot="custom" slot-scope="scope">
-              <span v-if="scope.isLeaf">
-                <a-tooltip :title="`${scope.title} ${scope.sub_title}`" :mouseEnterDelay="0.3">
-                  <span class="c-title">{{ scope.title || scope.key }}&thinsp; </span>
-                  <span class="c-sub-title">{{ scope.sub_title }}</span>
-                </a-tooltip>
-              </span>
-              <span v-else class="p-title">
-                <span v-if="scope.title">{{ scope.title }}</span>
-                <span v-else>{{ scope.key }}</span>
-                {{ treeCount(scope.count) }}
-              </span>
+          <div class="tree-wrap">
+            <template v-if="!isSingleCheck">
+              <a-checkbox v-if="searchTreeVisable" v-model="searchChecked" :indeterminate="searchIndeterminate" @change="radioChange">
+                <!-- {{ $t("1.10.139") }} -->
+                全选
+              </a-checkbox>
+
+              <a-checkbox v-else v-model="singleChecked" :indeterminate="indeterminate" @change="radioChange">
+                <!-- {{ $t("1.10.139") }} -->
+                全选
+              </a-checkbox>
             </template>
-          </a-tree>
-          <!-- search tree -->
-          <searchTree
-            v-on="$listeners"
-            ref="searchTree"
-            :visable="searchTreeVisable"
-            :formatTreeData="treeData.search"
-            :searchValue="searchValue"
-            :allCheckedKeys="checkedKeys"
-            :defaultExpandedKeys="search.defaultExpandedKeys"
-            :dataListKeys="search.dataListKeys"
-            :searchNoMore="searchNoMore"
-            :loadMorenLoadinng="loadMorenLoadinng"
-            @addCheckedkeysMain="addCheckedkeysMain"
-            @removeCheckedkeysMain="removeCheckedkeysMain"
-            @addCheckedkeysOther="addCheckedkeysOther"
-            @removeCheckedkeysOther="removeCheckedkeysOther"
-            @searchOnloadMore="searchOnloadMore"
-          ></searchTree>
+
+            <div v-show="search.status == 3 || (search.status == 0 && treeData.temp && treeData.temp.length == 0)" class="no-data-tips">
+              查无结果
+            </div>
+            <!-- main tree -->
+            <a-tree
+              class="main-tree-container"
+              v-show="search.status == 0"
+              ref="antTree"
+              v-model="checkedKeys.temp"
+              @expand="onExpand"
+              @check="onTreeCheck"
+              checkable
+              :expandedKeys="expandedKeys"
+              :autoExpandParent="autoExpandParent"
+              :checkStrictly="checkStrictly"
+              :selectable="false"
+              :treeData="treeData.temp"
+              :load-data="getLoadChildData"
+              :disabled="isDetail"
+            >
+              <template slot="custom" slot-scope="scope">
+                <span v-if="scope.isLeaf">
+                  <a-tooltip :title="`${scope.title} ${scope.sub_title}`" :mouseEnterDelay="0.3">
+                    <span class="c-title">{{ scope.title || scope.key }}&thinsp; </span>
+                    <span class="c-sub-title">{{ scope.sub_title }}</span>
+                  </a-tooltip>
+                </span>
+                <span v-else class="p-title">
+                  <span v-if="scope.title">{{ scope.title }}</span>
+                  <span v-else>{{ scope.key }}</span>
+                  {{ treeCount(scope.count) }}
+                </span>
+              </template>
+            </a-tree>
+            <!-- search tree -->
+            <searchTree
+              v-on="$listeners"
+              ref="searchTree"
+              :visable="searchTreeVisable"
+              :formatTreeData="treeData.search"
+              :searchValue="searchValue"
+              :allCheckedKeys="checkedKeys"
+              :defaultExpandedKeys="search.defaultExpandedKeys"
+              :dataListKeys="search.dataListKeys"
+              :searchNoMore="searchNoMore"
+              :loadMorenLoadinng="loadMorenLoadinng"
+              @addCheckedkeysMain="addCheckedkeysMain"
+              @removeCheckedkeysMain="removeCheckedkeysMain"
+              @addCheckedkeysOther="addCheckedkeysOther"
+              @removeCheckedkeysOther="removeCheckedkeysOther"
+              @searchOnloadMore="searchOnloadMore"
+            ></searchTree>
+          </div>
         </div>
         <!-- 树已选的数据 -->
         <div class="select-wrap">
@@ -425,6 +427,13 @@ export default create({
     data: {
       immediate: true,
       handler() {
+        this.$set(this.dataList, 'main', []);
+        this.$set(this.dataList, 'dept', []);
+        this.$set(this.checkedKeys, 'main', []);
+        this.$set(this.checkedKeys, 'dept', []);
+        this.$set(this.checkedKeys, 'temp', []);
+        this.singleChecked = false;
+        this.indeterminate = false;
         this.handleData();
         this.staticDataInit();
         this.staticDeptAndRoleDataInit();
@@ -451,17 +460,16 @@ export default create({
       if (this.getLoadChildData) {
         this.getDefaultList();
       } else {
-        this.$nextTick(() => {
+        setTimeout(() => {
           const userIds = this.defaultList.filter(item => item.itemType === 'person').map(item => item.id);
           const deptIds = this.defaultList.filter(item => item.itemType === 'dept').map(item => item.id);
           const roleIds = this.defaultList.filter(item => item.itemType === 'role').map(item => item.id);
           const key = ['main', 'dept', 'role'][this.typeActiveIndex];
-          console.log(deptIds, key, '666 init');
           this.checkedKeys.main = userIds;
           this.checkedKeys.dept = deptIds;
           this.checkedKeys.role = roleIds;
           this.checkedKeys.temp = this.checkedKeys[key];
-        });
+        }, 300);
       }
     },
 
@@ -1387,7 +1395,10 @@ export default create({
           childKeys.push(item.key);
         });
         const allParentIds = getAllParentId(this.treeData[propStr], node.eventKey)?.filter(Boolean) || [];
-        totalCheckedKeys = [...new Set(preChecked.concat(checkedKeys, childKeys))].filter(id => !allParentIds.includes(id));
+        totalCheckedKeys = [...new Set(preChecked.concat(checkedKeys, childKeys))];
+        if (!this.checkStrictly) {
+          totalCheckedKeys = totalCheckedKeys.filter(id => !allParentIds.includes(id));
+        }
       } else {
         // 如果是取消从之前的选择中把当前点击的及其子级去除选中作为temp值（兼容搜索的情况）
         let keyData = {};
@@ -1522,7 +1533,6 @@ export default create({
     padding: 22px 12px 0;
     max-height: 376px;
     height: 376px;
-    overflow-y: auto;
     &.people-tree-left {
       display: flex;
       flex-direction: column;
@@ -1545,6 +1555,10 @@ export default create({
         border-bottom-left-radius: 0;
       }
     }
+    .tree-wrap {
+      flex: 1;
+      overflow-y: auto;
+    }
     /deep/ .main-tree-container {
       > li {
         width: 100%;

package/packages/table-filter/src/components/render-widget/components/CheckboxGroup.vue

@@ -14,10 +14,10 @@ export default {
     value: {
       type: [Array, String, Number],
     },
-    multiple: {
-      type: Boolean,
-      default: false,
-    }
+    multiple: {type: Boolean, default: false},
+    explicitRequired: {type: Number, default: 0},
+    filterExplicit: {type: Number, default: 0},
+    showMode: {type: String, default: 'DROPDOWN'},
   },
   model: {
     prop: "value",
@@ -31,6 +31,10 @@ export default {
       get() {
         return Array.isArray(this.value) ? this.value : this.value ? [this.value] : [];
       }
+    },
+    // 筛选外显, 外显必填并且为平铺时, 最少得一个选项
+    isNotEmpty() {
+      return this.explicitRequired == 1 && this.filterExplicit == 1 && this.showMode === 'TILE'
     }
   },
   methods: {
@@ -38,11 +42,23 @@ export default {
       return val.filter((v) => !this.valueCp.includes(v));
     },
     onChange(val) {
+      if(this.isNotEmpty) {
+        if(Array.isArray(val) && (!val || !val.length)){
+          this.$message.warning('至少选中一个');
+          return
+        }
+        if(!Array.isArray(val) && !val){
+          this.$message.warning('至少选中一个');
+          return
+        }
+      }
       if (!this.multiple && Array.isArray(val)) {
         this.valueCp = this.filterNewVal(val)[0];
+        this.$emit("change");
         return;
       }
       this.valueCp = val;
+      this.$emit("change");
     },
   },
 }

package/packages/table-filter/src/components/render-widget/index.vue

@@ -69,17 +69,21 @@ export default {
       return `${width||defW}px`;
     },
     getEleMinWidth(cfg){
-      if(!this.isQuick) return `${cfg.advanceColWidth|| 195}px`;
       const { widgetType } = cfg;
+      if(!this.isQuick) {
+        if(widgetType === WidgetTypeEnums.CHECKBOX_GROUP) return;
+        return `${cfg.advanceColWidth|| 195}px`;
+      }
+      
       if (!unsetMinWidth.includes(widgetType)) return;
       return `unset`;
     },
     initComponentProps(cfg) {
-      const { widgetType, alias, title, placeholder: customPlaceholder, widgetCfg, fieldType, explicitRequired, optionSetting } = cfg;
+      const { widgetType, alias, title, placeholder: customPlaceholder, widgetCfg, fieldType, explicitRequired, optionSetting, filterExplicit } = cfg;
       const { props, handlerProps } = WidgetCfgMaps.get(widgetType);
       let Props = { ...props };
       if (handlerProps) {
-        Props = handlerProps(Props, { ...widgetCfg, title: alias || title, fieldType, isQuick: this.isQuick, explicitRequired, optionSetting });
+        Props = handlerProps(Props, { ...widgetCfg, title: alias || title, fieldType, isQuick: this.isQuick, explicitRequired, optionSetting, filterExplicit });
       }
       if (customPlaceholder) {
         Props.placeholder = customPlaceholder;

package/packages/table-filter/src/components/render-widget/widgetCfgMaps.js

@@ -149,9 +149,20 @@ export const WidgetCfgMaps = new Map([
       style: {
         'line-height': '32px'
       },
-      handlerProps(props, { valueList, multiple, explicitRequired } = {}) {
+      eventsBySearch: [
+        {
+          name: 'change',
+          handler(e, search, props, item) {
+            const { filterExplicit, widgetCfg = {} } = item || {};
+            const { multiple, showMode } = widgetCfg;
+            if (filterExplicit != 1 || multiple || showMode != 'TILE') return;
+            search();
+          }
+        }
+      ],
+      handlerProps(props, { valueList, multiple, explicitRequired, filterExplicit, showMode } = {}) {
         const allowClear = explicitRequired != 1;
-        const Props = { ...props, multiple, allowClear };
+        const Props = { ...props, multiple, allowClear, explicitRequired, filterExplicit, showMode };
         if (Array.isArray(valueList)) Props.options = valueList.map(({ value, label }) => ({ value, label }));
         return Props;
       },