cnhis-design-vue 0.2.42-beta → 0.2.45-beta

package/packages/grid/src/grid.js

@@ -6,9 +6,12 @@
 import Vue from 'vue';
 import 'xe-utils';
 import VXETable from 'vxe-table';
+import VXETablePluginAntd from 'vxe-table-plugin-antd'
 import Grid from 'vxe-table/lib/grid';
 import 'vxe-table/lib/style.css';
+import 'vxe-table-plugin-antd/dist/style.css'
 
+VXETable.use(VXETablePluginAntd);
 import create from '@/core/create';
 import tableMethods from '@/core/table-methods';
 

package/packages/multi-chat/chat/chatMain.vue

@@ -332,7 +332,7 @@ export default {
       return this.assemblySetting.portraitPanelSetting?.targetIs;
     },
     showBroadcast() {
-      let res = (!this.isServer && this.assemblySetting.broadcast && this.assemblySetting.broadcast.PC.isChecked == 'Y' && this.assemblySetting.broadcast.PC.list.length > 0) || false;
+      let res = (!this.isServer && this.assemblySetting?.broadcast?.PC?.isChecked == 'Y' && this.assemblySetting?.broadcast?.PC?.list?.length > 0) || false;
       return res;
     },
     broadcastCarousel() {

package/packages/multi-chat/setting/index.vue

@@ -56,6 +56,11 @@ export default {
     },
     assemblyId: {
       type: [String, Number]
+    },
+    // 是否单独配置的菜单，比如系统设置->配置管理->进入本页面
+    isOtherEntry: {
+      type: Boolean,
+      default: false
     }
   },
   data() {
@@ -125,7 +130,7 @@ export default {
     },
     useMenuList() {
       let exclude = [];
-      if (!this.isOrgAdmin) {
+      if (!this.isOtherEntry && !this.isOrgAdmin) {
         exclude = exclude.concat([
           "authority",
           "base-info",

package/packages/multi-chat/store/actions.js

@@ -53,7 +53,10 @@ export default {
       userType,
       relateId: getters.accessParams.relateId
     };
-    !isServer && (params.source = 1);
+    if (!isServer) {
+      params.source = 1;
+      params.serviceId = getters.queryParams.serviceId;
+    }
     return fetch
       .get(`/chat/${isServer ? 'service' : 'access'}/getHistoryRecord`, {
         params

package/packages/select/src/CustomSelect/index.vue

@@ -1,13 +1,14 @@
 <template>
-  <a-select v-on="$listeners" v-bind="$attrs" :showSearch="true" :not-found-content="fetching ? undefined : null">
+  <a-select v-on="$listeners" v-bind="$attrs" :showSearch="true" @search="debounceSearch" :filterOption="false">
     <div slot="dropdownRender" slot-scope="menu">
-      <a-spin v-if="fetching" slot="notFoundContent" />
+      <a-spin style="width: 100%;margin: 100px 0 100px" v-if="fetching" />
       <template v-else>
         <v-nodes :vnodes="menu" />
-        <selectPages v-if="PagerConfig.total > 1" :PagerConfig="searchPageConfig" :handleSearchChangePage="ChangePage" />
+        <selectPages v-if="PagerConfig.total > 1" :searchPageConfig="PagerConfig" :handleSearchChangePage="ChangePage" />
       </template>
     </div>
-    <a-select-option v-for="(item, i) in items" :key="i" :value="item.value" :disabled="i === 0">
+    
+    <a-select-option v-for="(item, i) in items" :key="item.value" :value="item.value" :disabled="showTitle && i === 0">
       <div :class="['custom-select-option', { 'title-line': i === 0 }]">
         <span v-for="(label, k) in item.showLabel" :key="(k + 9).toString(36) + k">{{ label }}</span>
       </div>
@@ -23,8 +24,8 @@
 import Vue from 'vue';
 import { Select, Divider, Icon, Spin } from 'ant-design-vue';
 import create from '@/core/create';
-// import selectPages from './components/select-pages';
 import selectPages from '@/component/select-pages';
+import vexutils from '@/utils/vexutils';
 
 export default create({
   name: 'custom-select',
@@ -36,6 +37,10 @@ export default create({
     optionItems: {
       type: Array,
       default: () => []
+    },
+    showTitle: {
+      type: Boolean,
+      default: false
     }
   },
   beforeCreate() {
@@ -54,6 +59,7 @@ export default create({
     selectPages
   },
   data() {
+    this.debounceSearch = vexutils.debounce(this.debounceSearch, 800);
     return {
       fetching: false,
       items: [],
@@ -62,15 +68,28 @@ export default create({
     };
   },
   mounted() {
-    this.fetching = true;
-    setTimeout(() => {
-      this.allItems = this.group(this.optionItems, 20);
-      this.PagerConfig.total = this.allItems.length;
-      this.items.push(...this.allItems[0]);
-      this.fetching = false;
-    }, 1000);
+    if (this.optionItems.length) {
+      this.fetching = true;
+      setTimeout(() => {
+        this.allItems = this.group(this.showTitle ? this.optionItems.slice(1) : this.optionItems, 20);
+        this.PagerConfig.total = this.allItems.length;
+        this.items.push(...this.allItems[0]);
+        this.fetching = false;
+      }, 1000);
+    }
   },
   methods: {
+    debounceSearch(value) {
+      this.PagerConfig.page = 1;
+      const filters = this.optionItems.filter(v => v.showLabel.some(k => String(k).includes(value)));
+      this.allItems = this.group(this.showTitle && !value ? filters.slice(1) : filters, 20);
+      this.PagerConfig.total = this.allItems.length;
+      if (this.allItems.length) {
+        this.items.splice(0, this.items.length, ...this.allItems[0]);
+      } else {
+        this.items.splice(0, this.items.length);
+      }
+    },
     ChangePage(type) {
       this.fetching = true;
       setTimeout(() => {
@@ -82,8 +101,16 @@ export default create({
     group(array, subGroupLength) {
       let index = 0;
       let newArray = [];
+      
       while (index < array.length) {
-        newArray.push(array.slice(index, (index += subGroupLength)));
+        if (!this.showTitle) {
+          newArray.push(array.slice(index, (index += subGroupLength)));
+        } else {
+          newArray.push([{
+            value: `${index}${Date.now()}`,
+            showLabel: this.optionItems[0].showLabel
+          }, ...array.slice(index, (index += subGroupLength))]);
+        }
       }
       return newArray;
     }

package/packages/select/src/TableSelect/index.vue

@@ -22,9 +22,8 @@
       :dropdownStyle="{ 'z-index': 100 }"
       @blur="isSearch = false"
       @focus="isSearch = true"
-      @search="search"
+      @search="debounceSearch"
       @change="valueChange"
-      @dropdownVisibleChange="dropdownVisibleChange"
       :getPopupContainer="
         triggerNode => {
           return triggerNode.parentNode || document.body;
@@ -54,6 +53,7 @@
             :data="tableData"
             :radio-config="{ trigger: 'row', checkRowKey: defaultSelecteRow }"
             :edit-config="{ trigger: 'click', mode: 'cell' }"
+            :edit-rules="rules"
             @radio-change="radioChangeEvent"
             @cell-click="cellClick"
           >
@@ -61,6 +61,26 @@
               <span class="opt-btn" @click="deleteRow(row)">删除</span>
             </template>
 
+            <template v-for="item in colSelectList" #[item.slots.edit]="scope">
+              <a-select
+                :key="item.slots.edit"
+                show-search
+                :placeholder="`请选择${item.title}`"
+                style="width: 100%"
+                :default-active-first-option="false"
+                :filter-option="false"
+                :not-found-content="null"
+                :defaultValue="scope.row[item.field]"
+                v-model="scope.row[item.field]"
+                @change="$refs.xTable.updateStatus(scope)"
+                @search="value => cellSearch(value, scope.row, item.field)"
+              >
+                <a-select-option :key="option.value" :value="option.value" v-for="option in item.editRender.options">
+                  {{option.label}}
+                </a-select-option>
+              </a-select>
+            </template>
+
             <template #empty>
               <span>
                 <p class="no-data">暂无数据</p>
@@ -74,7 +94,7 @@
               <a-button type="primary" style="margin-right: auto" @click="addRow">新增</a-button>
               <span v-show="!isOk" class="tips">请完善表格信息</span>
               <span v-show="isOk && isRepeat" class="tips">表格信息不能重复</span>
-              <a-button style="margin-right: 10px" @click="isOpen = false">取消</a-button>
+              <a-button style="margin-right: 10px" @click="cancel">取消</a-button>
               <a-button type="primary" @click="saveRow">确定</a-button>
             </template>
           </div>
@@ -93,26 +113,7 @@ import Vue from 'vue';
 import { Select, Button, Icon, Spin, Pagination } from 'ant-design-vue';
 import Grid from '~/grid';
 import create from '@/core/create';
-
-// 防抖
-function debounce(fn, wait, immadiate) {
-  let timeout;
-  return function () {
-    const context = this;
-    const args = [...arguments];
-    timeout && clearTimeout(timeout);
-    if (immadiate) {
-      !timeout && fn.apply(context, args);
-      timeout = setTimeout(() => {
-        timeout = null;
-      }, wait);
-    } else {
-      timeout = setTimeout(() => {
-        fn.apply(context, args);
-      }, wait);
-    }
-  };
-}
+import vexutils from '@/utils/vexutils';
 
 export default create({
   name: 'table-select',
@@ -123,7 +124,7 @@ export default create({
     },
     columns: {
       type: Array,
-      default: () => []
+      require: true
     },
     data: {
       type: Array,
@@ -140,13 +141,20 @@ export default create({
     fetching: {
       type: Boolean,
       default: false
+    },
+    validRules: {
+      type: Object,
+      default: () => {}
     }
   },
   computed: {
     mode() {
       const obj = this.columns.find(v => v.type);
       return obj?.type === 'checkbox' || this.type === 'edit' ? 'multiple' : 'default';
-    }
+    },
+    colSelectList() {
+      return this.columns.filter(v => v.slots?.edit);
+    },
   },
   beforeCreate() {
     Vue.use(Select).use(Icon).use(Spin).use(Pagination).use(Button);
@@ -164,14 +172,14 @@ export default create({
     return {
       value: this.type === 'edit' ? [] : '',
       tableData: [],
-      debounceSearch: '',
       setDefaultValue: true,
       defaultSelecteRow: '',
       isOpen: false,
       isOk: true,
       isRepeat: false,
       page: 1, // 配置page是因为，使用时分页触发page没有同步
-      isSearch: true
+      isSearch: true,
+      rules: {}
     };
   },
   watch: {
@@ -179,13 +187,15 @@ export default create({
       handler(value) {
         if (value) {
           this.tableData = JSON.parse(JSON.stringify(this.data));
+          const { defaultValue = '' } = this.$attrs;
           // 默认值相关
-          if (this.tableData.length && this.type === 'noEdit' && this.setDefaultValue && this.$attrs.defaultValue) {
-            this.value = this.$attrs.defaultValue;
-            this.defaultSelecteRow = this.tableData.find(v => v[this.selectAttr] === this.$attrs.defaultValue).id;
+          if (this.tableData.length && this.type === 'noEdit' && this.setDefaultValue && defaultValue) {
+            this.value = defaultValue;
+            this.defaultSelecteRow = this.tableData.find(v => v[this.selectAttr] === defaultValue).id;
             this.setDefaultValue = false;
           }
-          if (this.type === 'edit' && this.setDefaultValue) {
+          
+          if (this.type === 'edit' && this.tableData.length) {
             this.setValues(this.tableData);
           }
         }
@@ -195,60 +205,73 @@ export default create({
     }
   },
   mounted() {
-    this.$nextTick(() => {
-      // document.onclick = e => {
-      //   console.log(e.path);
-      //   const focusCondition = e.path.some(v => v.innerHTML.includes('table-select') && v.innerHTML.includes('ant-select-selection__rendered'));
-      //   if (focusCondition) {
-      //     console.log('应该获取焦点');
-      //     this.$refs.selectBox.focus();
-      //   }
-      //   if (!e.path.some(v => v.className === 'ant-select-dropdown-content' || v.className === 'table-select')) {
-      //     this.isOpen = false;
-      //     this.$refs.selectBox.blur();
-      //   }
-      // };
+    this.$nextTick().then(() => {
+      document.addEventListener('mouseup', this.handlerMouseUp, true);
     });
   },
   created() {
     this.init();
   },
   methods: {
+    cellSearch(value, row, field) {
+      // 需要处理：保留不为空的上一个的value值
+      if (value) {
+        row[field] = value;
+      }
+    },
     mousedown(e) {
-      // console.log(e);
       this.isOpen = true;
+      this.type === 'edit' && (this.isOk = true);
       if (e.target?.className === 'ant-select-selection__rendered') {
-        this.isSearch = true;
-        this.onSearch('');
+        if (this.type === 'noEdit') {
+          this.isSearch = true;
+          // 展开就搜索会导致当前选中行显示错误
+          // this.onSearch('');
+        }
         e.preventDefault();
       }
     },
-    init() {
-      this.debounceSearch = debounce(this.onSearch, 500);
+    handlerMouseUp(e) {
+      const target = e.target;
+      const className = target?.className;
+      if (this.isOpen) {
+        if (!this.$el?.contains(target) && !className?.includes('vxe-select-option') && !className?.includes('ant-select-dropdown-menu-item')) {
+          if (this.type === 'noEdit') {
+            this.isOpen = false;
+          } else {
+            this.cancel();
+          }
+        }
+      }
     },
-    dropdownVisibleChange(open) {
-      // console.log('展开下拉菜单-》', open);
-      // if (open) {
-      //   // this.isOpen = true;
-      //   this.$refs.selectBox.focus();
-      // } else {
-      //   // this.isOpen = false;
-      //   this.$refs.selectBox.blur();
-      // }
+    init() {
+      this.debounceSearch = vexutils.debounce(this.debounceSearch, 800);
+
+      this.setValidRules();
     },
-    search(value) {
-      if (this.type === 'noEdit') {
-        // 防抖
-        this.debounceSearch(value);
+    setValidRules() {
+      if (this.type === 'edit') {
+        if (!Object.keys(this.validRules || {}).length) {
+          const rules = {};
+          this.columns.forEach(v => {
+            v.field && (rules[v.field] = [{ required: true, message: `请填入${v.title}` }]);
+          });
+          this.$set(this, 'rules', rules);
+        } else {
+          this.$set(this, 'rules', JSON.parse(JSON.stringify(this.validRules)));
+        }
       }
     },
-    onSearch(value) {
-      if (this.isSearch) { // 防止离开焦点时触发paginationchange
-        this.$emit('update:fetching', true);
-        this.page = 1;
-        this.$emit('paginationchange', { page: 1, selectAttrVal: value });
+    debounceSearch(value) {
+      if (this.type === 'noEdit') {
+        if (this.isSearch) {
+          // 防止离开焦点时触发paginationchange
+          this.$emit('update:fetching', true);
+          this.page = 1;
+          this.$emit('paginationchange', { page: 1, selectAttrVal: value });
+        }
+        if (!this.isSearch && !value) this.isSearch = true;
       }
-      if (!this.isSearch && !value) this.isSearch = true;
     },
     change(page, pageSize) {
       this.$emit('update:fetching', true);
@@ -278,56 +301,90 @@ export default create({
       const $table = this.$refs.xTable;
       const tableData = $table.getTableData().tableData;
       let record = {
-        id: tableData.length ? parseInt(tableData[tableData.length - 1].id) + 1 : '1'
+        id: tableData.length ? +(tableData[tableData.length - 1]?.id || 0) + 1 + '' : '1'
       };
-      // if (this.tableData.length) {
-      //   const row = this.tableData[0];
-      //   record = JSON.parse(JSON.stringify(row));
-      //   record.id = parseInt(tableData[tableData.length - 1].id) + 1;
-      // } else {
       this.columns.forEach(v => {
         if (v.field) {
           record[v.field] = '';
         }
+        if (v?.slots?.edit) {
+          record[v.field] = undefined;
+        }
       });
-      // }
       const { row: newRow } = await $table.insertAt(record, -1);
-      // await $table.setActiveCell(newRow, Object.keys(record)[0]);
     },
     async deleteRow(row) {
       const $table = this.$refs.xTable;
       const index = $table.getRowIndex(row);
       await $table.remove(row);
-      this.value.splice(index, 1);
+      !!~index && this.value.splice(index, 1);
     },
-    saveRow() {
+    async cancel() {
+      this.isOpen = false;
+      const index = this.value?.length || 0;
       const $table = this.$refs.xTable;
       const tableData = $table.getTableData().tableData;
-      // 校验全部值不能为空
-      const isOk = tableData.every(v => {
-        return Object.values(v).every(k => k !== '' || v.length);
+      const invalidTableData = tableData.slice(index);
+      index !== tableData.length && (await $table.remove(invalidTableData));
+    },
+    async saveRow() {
+      const $table = this.$refs.xTable;
+      const tableData = $table.getTableData().tableData;
+      // 校验已经填入数据的行全部值不能为空
+      // const effectiveTableData = tableData.filter(v => Object.keys(v).some(k => k !== 'id' && (v[k] !== '' || v[k].length)));
+      // const invalidTableData = tableData.filter(v => Object.keys(v).every(k => k !== 'id' && (!v[k]?.length))); // 失效的数据，即新增全部为空的
+      
+      const effectiveTableData = tableData.filter(v => {
+        return Object.keys(v).some(k => {
+          if (k == 'id') {
+            return false;
+          } else {
+            return v[k] || v[k]?.length;
+          }
+        })
       });
+      const invalidTableData = tableData.filter(v => {
+        return Object.keys(v).every(k => {
+          if (k == 'id') {
+            return true;
+          } else {
+            return !v[k]?.length;
+          }
+        })
+      });
+
+      let isOk = false;
+      if (Object.keys(this.rules).length && this.type === 'edit') {
+        const errMap = await $table.validate(effectiveTableData).catch(errMap => errMap);
+        isOk = !errMap ? true : false;
+      } else {
+        isOk = effectiveTableData.every(v => Object.values(v).every(k => k !== '' || v.length));
+      }
+
       if (isOk) {
         this.isOk = true;
-        if (this.selectAttr) {
-          this.value = tableData.map(v => v[this.selectAttr]);
-          this.isOpen = false;
-        } else {
-          this.setValues(tableData);
-          // 表格信息不能重复，否则会报警告
-          let newArr = this.value.reduce((pre, cur) => {
-            if (!pre.includes(cur)) {
-              return pre.concat(cur);
-            } else {
-              return pre;
-            }
-          }, []);
-          if (newArr.length !== this.value.length) {
-            this.isRepeat = true;
+        this.setValues(effectiveTableData);
+        $table.remove(invalidTableData);
+        // 去重 表格信息不能重复，否则会报警告
+        let newArr = effectiveTableData.reduce((pre, cur) => {
+          let newCur = { ...cur };
+          newCur.id && delete newCur.id;
+          const index = pre.findIndex(v => {
+            let newV = { ...v };
+            newV.id && delete newV.id;
+            return JSON.stringify(newV) === JSON.stringify(newCur);
+          });
+          if (!~index) {
+            return pre.concat(cur);
           } else {
-            this.isRepeat = false;
-            this.isOpen = false;
+            return pre;
           }
+        }, []);
+        if (newArr.length !== this.value.length) {
+          this.isRepeat = true;
+        } else {
+          this.isRepeat = false;
+          this.isOpen = false;
         }
       } else {
         this.isOk = false;
@@ -336,10 +393,18 @@ export default create({
     setValues(tableData) {
       this.value = tableData.map(v => {
         let newV = { ...v };
-        Object.keys(v).map(k => {
-          const cellObj = this.columns.find(j => j.field === k);
-          if (cellObj?.editRender?.name.includes('select')) {
-            newV[k] = cellObj.editRender.options.find(q => q.value == v[k]).label;
+        Object.keys(v).forEach(k => {
+          if (!this.selectAttr || this.selectAttr.includes(k)) {
+            const cellObj = this.columns.find(j => j.field === k);
+            if (cellObj?.editRender?.name.includes('$select')) {
+              newV[k] = cellObj.editRender.options.find(q => q.value == v[k])?.label || '';
+            }
+            if (cellObj?.editRender?.name.includes('ASelect')) {
+              newV[k] = cellObj.editRender.options.find(q => q.value == v[k])?.label || v[k];
+            }
+          }
+          if (this.selectAttr && !this.selectAttr.includes(k)) {
+            delete newV[k];
           }
         });
         if (newV.id) delete newV.id;
@@ -354,6 +419,9 @@ export default create({
       await $table.remove(tableData[index]);
       this.value = value;
     }
+  },
+  beforeDestroy() {
+    document.removeEventListener('mouseup', this.handlerMouseUp, true);
   }
 });
 </script>
@@ -404,6 +472,13 @@ export default create({
         font-size: 14px;
       }
     }
+
+    .ant-select-selection--single {
+      height: 28px;
+      .ant-select-selection__rendered {
+        line-height: 28px;
+      }
+    }
   }
   .vxe-cell .vxe-default-input,
   .vxe-cell .vxe-default-select,
@@ -415,17 +490,6 @@ export default create({
     height: 28px;
   }
 }
-// @{deep} .ant-pagination-prev,
-// @{deep} .ant-pagination-next,
-// @{deep} .ant-pagination-jump-prev,
-// @{deep} .ant-pagination-item,
-// @{deep} .ant-pagination-options-quick-jumper,
-// @{deep} .ant-select-selection--single,
-// @{deep} .ant-pagination-jump-next {
-//   min-width: 30px;
-//   height: 30px;
-//   line-height: 30px;
-// }
 @{deep} .table-select .ant-pagination-item-active a {
   color: #5585f5 !important;
 }

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

@@ -43,13 +43,11 @@
           </div>
           <!-- main tree -->
           <a-tree
-            v-on="$listeners"
             class="main-tree-container"
             v-show="search.status == 0"
             ref="antTree"
             v-model="checkedKeys.main"
             @expand="onExpand"
-            @check="onCheck"
             checkable
             :expandedKeys="expandedKeys"
             :autoExpandParent="autoExpandParent"
@@ -334,6 +332,7 @@ export default create({
         this.isAllCheck(val);
         this.isSearchAllCheck(val)
         // this.handleEmitValue();
+        this.$emit("check", val);
       }
     },
     data: {
@@ -835,13 +834,6 @@ export default create({
       this.searchFetch();
     },
 
-    // 选中事件
-    onCheck() {
-      // this.$emit('check', ...arg)
-      // console.log(arguments, "oncheck");
-      // console.log(this.checkedKeys.main, "checkedKeys.main");
-    },
-
     isAllCheck(checkedKeys = []) {
       if (!checkedKeys || checkedKeys.length == 0) {
         this.indeterminate = false;

package/packages/table-filter/src/base-search-com/BaseSearch.vue

@@ -30,7 +30,7 @@
             </a-dropdown>
           </div>
           <slot name="classification"></slot>
-          <li v-if="isShowSetting('hideQuickSearch') && isRelatedSearchFold" ref="quickSearchLi">
+          <li v-if="showQuickSearch" ref="quickSearchLi">
             <a-button class="search-default" type="default" @click="foldQuickSearch">
               <svg-icon icon-class="xitongtubiaoBIxitongshaixuan" style="color: #2d7aff; margin-right: 6px"></svg-icon>
               筛选 {{ qqConObjCount ? `(${qqConObjCount})` : '' }}
@@ -745,11 +745,18 @@ export default create({
           return item.formTitle || item.alias || item.title;
         })
         .filter(Boolean);
+      if(!strList?.length) return ''
       str = "输入" + strList.join("/");
       return str || "请输入关键字搜索";
     },
     showRelatedSearch() {
       return this.showRelatedTreeBtn && this.isShowSetting('hideSearch')
+    },
+    showQuickSearch() {
+      let showQuick = this.isShowSetting('hideQuickSearch')
+      // 平铺列表, 左侧不为tree, 而是table
+      if(this.editTableSource == 'relatedComponent' && this.relatedBaseInfo?.showType != "TREE") return showQuick
+      return showQuick && this.isRelatedSearchFold
     }
   },
   data() {

package/packages/table-filter/src/components/multi-select/multi-select.vue

@@ -63,7 +63,6 @@
 <script>
 import { Select, Spin, Icon,Button } from 'ant-design-vue';
 import utils from '@/utils/utils-map';
-// import selectPages from './select-pages';
 import selectPages from '@/component/select-pages';
 export default {
   name: 'multiSelect',