cnhis-design-vue 2.1.50 → 2.1.51

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

@@ -76,7 +76,7 @@
                 @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}}
+                  {{ option.label }}
                 </a-select-option>
               </a-select>
             </template>
@@ -89,7 +89,17 @@
             </template>
           </c-grid>
           <div class="bottom-box">
-            <a-pagination v-if="type === 'noEdit'" :total="total" show-size-changer show-quick-jumper @change="change" :current="page" @showSizeChange="showSizeChange" size="small" />
+            <a-pagination
+              v-if="type === 'noEdit'"
+              :total="total"
+              show-size-changer
+              show-quick-jumper
+              @change="change"
+              :current="page"
+              @showSizeChange="showSizeChange"
+              :page-size.sync="pageSize"
+              size="small"
+            />
             <template v-else>
               <a-button type="primary" style="margin-right: auto" @click="addRow">新增</a-button>
               <span v-show="!isOk" class="tips">请完善表格信息</span>
@@ -154,10 +164,14 @@ export default create({
     },
     colSelectList() {
       return this.columns.filter(v => v.slots?.edit);
-    },
+    }
   },
   beforeCreate() {
-    Vue.use(Select).use(Icon).use(Spin).use(Pagination).use(Button);
+    Vue.use(Select)
+      .use(Icon)
+      .use(Spin)
+      .use(Pagination)
+      .use(Button);
   },
   components: {
     VNodes: {
@@ -179,7 +193,8 @@ export default create({
       isRepeat: false,
       page: 1, // 配置page是因为，使用时分页触发page没有同步
       isSearch: true,
-      rules: {}
+      rules: {},
+      pageSize: 10
     };
   },
   watch: {
@@ -194,7 +209,7 @@ export default create({
             this.defaultSelecteRow = this.tableData.find(v => v[this.selectAttr] === defaultValue).id;
             this.setDefaultValue = false;
           }
-          
+
           if (this.type === 'edit' && this.tableData.length) {
             this.setValues(this.tableData);
           }
@@ -274,12 +289,14 @@ export default create({
       }
     },
     change(page, pageSize) {
+      this.pageSize = pageSize;
       this.$emit('update:fetching', true);
       this.page = page;
       this.$emit('paginationchange', { page, pageSize });
       this.isSearch = true; // 防止mousedown和focus方法都没有触发isSearch为true
     },
     showSizeChange(current, size) {
+      this.pageSize = size;
       this.$emit('update:fetching', true);
       this.page = current;
       this.$emit('paginationchange', { page: current, pageSize: size });
@@ -333,7 +350,7 @@ export default create({
       // 校验已经填入数据的行全部值不能为空
       // 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') {
@@ -341,7 +358,7 @@ export default create({
           } else {
             return v[k] || v[k]?.length;
           }
-        })
+        });
       });
       const invalidTableData = tableData.filter(v => {
         return Object.keys(v).every(k => {
@@ -350,7 +367,7 @@ export default create({
           } else {
             return !v[k]?.length;
           }
-        })
+        });
       });
 
       let isOk = false;
@@ -426,7 +443,7 @@ export default create({
 });
 </script>
 <style lang="less" scoped>
-@deep:~ '>>>';
+@deep: ~'>>>';
 .nodata-box {
   display: flex;
   justify-content: center;

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

@@ -221,6 +221,10 @@ export default create({
       type: Boolean,
       default: false
     },
+    titleAddCode: {
+      type: Boolean,
+      default: true // 标题是否加上code
+    },
     queryMainTreeData: Function, // 主树请求
     queryLoadChildData: Function, // 懒加载请求
     queryTreeSearch: Function // 检索请求
@@ -417,6 +421,7 @@ export default create({
     data: {
       immediate: true,
       handler() {
+        this.handleData();
         this.staticDataInit();
         this.staticDeptAndRoleDataInit();
         const key = { person: 'main', dept: 'dept', role: 'role', multiple: 'main' }[this.selectType];
@@ -1490,6 +1495,13 @@ export default create({
         };
         return filterHandle(copyData);
       }
+    },
+    handleData() {
+      vexutils.searchTree(this.data, item => {
+        if (this.titleAddCode) {
+          item.title = `${item.title}(${item.code})`;
+        }
+      });
     }
   }
 });

package/packages/table-filter/src/components/out-quick-search/out-quick-search.vue

@@ -166,11 +166,7 @@ export default {
       return function(item) {
         if (!item.showTime) return false;
         return {
-          defaultValue: [{
-             format: 'HH:mm:ss'
-          }, {
-             format: 'HH:mm:ss'
-          }]
+          defaultValue: [moment('00:00:00', 'HH:mm:ss'), moment('23:59:59', 'HH:mm:ss')]
         };
       };
     }

package/packages/table-filter/src/components/search-condition/SearchCondition.vue

@@ -138,21 +138,27 @@
 
             <div class="date-item val-date-wrap" v-if="item.showDate">
               <a-date-picker
-                :disabledDate="disabledStartDate || item.isIllegalField"
-                format="YYYY-MM-DD"
+                :disabledDate="current => disabledDatePicker(current, item, 'start')"
+                format="YYYY-MM-DD HH:mm:ss"
                 v-model="item.start_val"
+                :show-time="{
+                  defaultValue: $moment('00:00:00', 'HH:mm:ss')
+                }"
                 :placeholder="'请选择'"
                 @openChange="handleStartOpenChange($event, item)"
-                style="width: 120px"
+                style="width: 120px; minWidth: 170px"
               />
               <a-date-picker
-                :disabledDate="disabledEndDate || item.isIllegalField"
-                format="YYYY-MM-DD"
+                :disabledDate="current => disabledDatePicker(current, item, 'end')"
+                format="YYYY-MM-DD HH:mm:ss"
                 :placeholder="'请选择'"
                 v-model="item.end_val"
                 :open="item.endOpen"
+                :show-time="{
+                  defaultValue: $moment('23:59:59', 'HH:mm:ss')
+                }"
                 @openChange="handleEndOpenChange($event, item)"
-                style="width: 120px"
+                style="width: 120px; minWidth: 170px"
               />
             </div>
             <!-- 生日 -->
@@ -409,6 +415,9 @@ export default create({
         return item.alias || item[useKey];
       };
     },
+    $moment() {
+      return moment;
+    },
 
     is_search_professional() {
       return this.source == 'search-professional';
@@ -621,8 +630,13 @@ export default create({
           // searchChildList
           // 大于（BIG），小于 LESS，大于等于BIGEQ，小于等于LESSEQ，等于（IN）
         } else {
-          start_val = item.start_val ? moment(item.start_val, 'YYYY-MM-DD') : '';
-          end_val = item.end_val ? moment(item.end_val, 'YYYY-MM-DD') : '';
+          let curEnd = item.end_val;
+          // 只有YYYY-MM-DD 手动添加HH:mm:ss
+          if (curEnd && typeof curEnd === "string" && curEnd.length < 11 && !curEnd.includes(":")) {
+            curEnd += " 23:59:59";
+          }
+          start_val = item.start_val ? moment(item.start_val, 'YYYY-MM-DD HH:mm:ss') : '';
+          end_val = item.end_val ? moment(curEnd, 'YYYY-MM-DD HH:mm:ss') : '';
           item.curlimit_date = '';
         }
 
@@ -795,8 +809,8 @@ export default create({
           end_val = item.end_val;
           value = item.value;
         } else {
-          start_val = item.start_val ? item.start_val.format('YYYY-MM-DD') : '';
-          end_val = item.end_val ? item.end_val.format('YYYY-MM-DD') : '';
+          start_val = item.start_val ? item.start_val.format('YYYY-MM-DD HH:mm:ss') : '';
+          end_val = item.end_val ? item.end_val.format('YYYY-MM-DD HH:mm:ss') : '';
         }
 
         let is_custom = this.showCompareField ? item.compare_field == '_custom__input_' : false;
@@ -1314,6 +1328,29 @@ export default create({
       // this.$set(item, 'value', '');
       reset && this.$set(item, 'value', '');
     },
+    disabledDatePicker(current, item, t){
+      if(item.isIllegalField) return true
+      let f = false;
+      if(t=== 'start'){
+         const end_val = item?.end_val;
+         f = end_val && current.valueOf() > end_val.valueOf();
+      } else if(t=== 'end') {
+        const start_val = item?.start_val;
+         f = start_val && current.valueOf() <= start_val.valueOf();
+      }
+      /**
+       * 2 过去时间
+       * 3 未来时间
+       */
+      let type = String(item?.advanceOptionSetting);
+      if(!['2','3'].includes(type)) return f;
+      if(type === '2'){
+         return current >= moment().endOf('day') || f;
+      } else if(type==='3'){
+         return current && current < moment().startOf('day') || f;
+      }
+      return f
+    },
     disabledStartDate(start_val) {
       const end_val = this.end_val;
       if (!start_val || !end_val) {

package/packages/table-filter/src/quick-search/QuickSearch.vue

@@ -240,7 +240,7 @@
                       format="YYYY-MM-DD HH:mm:ss"
                       v-model="item.DATE.start_val"
                       :show-time="{
-                       format: 'HH:mm:ss'
+                        defaultValue: $moment('00:00:00', 'HH:mm:ss')
                       }"
                       :placeholder="getI18nText('1.1.4.53', '开始时间')"
                       style="width: 120px"
@@ -251,7 +251,7 @@
                     <a-date-picker
                       format="YYYY-MM-DD HH:mm:ss"
                       :show-time="{
-                       format: 'HH:mm:ss'
+                        defaultValue: $moment('23:59:59', 'HH:mm:ss')
                       }"
                       :placeholder="getI18nText('1.9.147', '结束时间')"
                       v-model="item.DATE.end_val"