n20-common-lib 2.5.45 → 2.5.48

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n20-common-lib",
-  "version": "2.5.45",
+  "version": "2.5.48",
   "private": false,
   "main": "src/index.js",
   "scripts": {

package/src/assets/css/el-table.scss

@@ -175,13 +175,6 @@ th.vxe-header--column {
   font-weight: $--font-weight-primary;
 }
 
-.vxe-table--render-default.size--mini .vxe-body--column.col--ellipsis,
-.vxe-table--render-default.size--mini .vxe-footer--column.col--ellipsis,
-.vxe-table--render-default.size--mini .vxe-header--column.col--ellipsis,
-.vxe-table--render-default.vxe-editable.size--mini .vxe-body--column {
-  height: 32px !important;
-}
-
 .vxe-table--tooltip-wrapper {
   z-index: 9999 !important;
 }
@@ -202,7 +195,6 @@ th.vxe-header--column {
   text-overflow: ellipsis;
   white-space: wrap !important;
 }
-
 .vxe-table--render-default.size--small .vxe-table-custom-wrap.vxe-body--column.col--ellipsis > .vxe-cell,
 .vxe-table--render-default.size--small .vxe-table-custom-wrap.vxe-footer--column.col--ellipsis > .vxe-cell,
 .vxe-table--render-default.size--small .vxe-table-custom-wrap.vxe-header--column.col--ellipsis > .vxe-cell {

package/src/components/SelectDatePickerPro/index.vue

@@ -14,7 +14,6 @@
       type="daterange"
       v-bind="$attrs"
       :placeholder="'选择日' | $lc"
-      @change="$listeners.change"
     />
     <date-picker
       v-if="type === '周' && selectList.includes(type)"
@@ -26,7 +25,6 @@
       :picker-options="attrs"
       :default-time="['00:00:00', '23:59:59']"
       :placeholder="'选择周' | $lc"
-      @change="$listeners.change"
     />
 
     <date-picker
@@ -39,7 +37,6 @@
       :editable="false"
       v-bind="$attrs"
       :placeholder="'选择月' | $lc"
-      @change="$listeners.change"
     />
     <quarter-date-picker v-if="type === '季'" key="quarter" v-model="quarter" :disabled-date="attrs.disabledDate" />
     <date-picker
@@ -52,7 +49,6 @@
       value-format="yyyy"
       :editable="false"
       :placeholder="'选择年' | $lc"
-      @change="$listeners.change"
     />
   </div>
 </template>
@@ -119,10 +115,10 @@ export default {
       },
       set(value) {
         if (value) {
-          // this.$emit('input', { startDate: value[0], endDate: value[1], typeDate: this.type })
+          this.$emit('input', { startDate: value[0], endDate: value[1], typeDate: this.type })
           this.$emit('change', { startDate: value[0], endDate: value[1], typeDate: this.type })
         } else {
-          // this.$emit('input', { startDate: '', endDate: '', typeDate: this.type })
+          this.$emit('input', { startDate: '', endDate: '', typeDate: this.type })
           this.$emit('change', { startDate: '', endDate: '', typeDate: this.type })
         }
       }
@@ -150,14 +146,14 @@ export default {
             typeDate: this.value.typeDate
           } // 选择的范围
 
-          // this.$emit('input', weekTime)
+          this.$emit('input', weekTime)
           this.$emit('change', weekTime)
         } else {
-          // this.$emit('input', {
-          //   startDate: '',
-          //   endDate: '',
-          //   typeDate: this.value.typeDate
-          // })
+          this.$emit('input', {
+            startDate: '',
+            endDate: '',
+            typeDate: this.value.typeDate
+          })
           this.$emit('change', {
             startDate: '',
             endDate: '',
@@ -181,7 +177,7 @@ export default {
             endDate: dayjs(value).endOf('month').format('YYYY-MM-DD'),
             typeDate: this.value.typeDate
           }
-          // this.$emit('input', IMonth)
+          this.$emit('input', IMonth)
           this.$emit('change', IMonth)
         } else {
           let IMonth = {
@@ -189,7 +185,7 @@ export default {
             endDate: '',
             typeDate: this.value.typeDate
           }
-          // this.$emit('input', IMonth)
+          this.$emit('input', IMonth)
           this.$emit('change', IMonth)
         }
       }
@@ -199,7 +195,7 @@ export default {
         return this.value
       },
       set(value) {
-        // this.$emit('input', Object.assign(value, { typeDate: this.type }))
+        this.$emit('input', Object.assign(value, { typeDate: this.type }))
         this.$emit('change', Object.assign(value, { typeDate: this.type }))
       }
     },
@@ -218,7 +214,7 @@ export default {
             endDate: dayjs(value).endOf('year').format('YYYY-MM-DD'),
             typeDate: this.value.typeDate
           }
-          // this.$emit('input', iYear)
+          this.$emit('input', iYear)
           this.$emit('change', iYear)
         } else {
           let iYear = {
@@ -226,7 +222,7 @@ export default {
             endDate: '',
             typeDate: this.value.typeDate
           }
-          // this.$emit('input', iYear)
+          this.$emit('input', iYear)
           this.$emit('change', iYear)
         }
       }

package/src/components/ShowColumn/index.vue

@@ -137,6 +137,19 @@
             <el-radio :label="false">{{ $lc('否') }}</el-radio>
           </el-radio-group>
         </el-form-item>
+        <el-form-item :label="'是否加粗' | $lc">
+          <el-radio-group v-model="configModel.bold">
+            <el-radio :label="true">{{ $lc('是') }}</el-radio>
+            <el-radio :label="false">{{ $lc('否') }}</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item :label="'对齐方式' | $lc">
+          <el-radio-group v-model="configModel.align">
+            <el-radio :label="'right'">{{ $lc('右对齐') }}</el-radio>
+            <el-radio :label="'left'">{{ $lc('左对齐') }}</el-radio>
+            <el-radio :label="'center'">{{ $lc('居中对齐') }}</el-radio>
+          </el-radio-group>
+        </el-form-item>
       </el-form>
       <div slot="footer">
         <el-button type="primary" @click="configSave">{{ '确定' | $lc }}</el-button>
@@ -222,7 +235,9 @@ export default {
       configVisible: false,
       enabled: false,
       configModel: {
-        wrap: false
+        wrap: false,
+        bold: false,
+        align: 'center'
       },
       configModelN: {
         label: '',
@@ -310,7 +325,7 @@ export default {
     },
     add() {
       this.configVisibleN = true
-      this.configModelN.prop = 'prop' + Date.now()
+      this.configModelN.prop = `prop${Date.now()}`
     },
     configSaveN() {
       if (!this.configModelN.label) {

package/src/components/TablePro/index.vue

@@ -8,8 +8,8 @@
       :height="height"
       :class="{ 'cell-default-set--': cellDefault }"
       :checkbox-config="{ checkField: 'checked', checkMethod: forbidSelect }"
-      show-overflow
       show-header-overflow
+      show-overflow
       :row-config="{ isHover: true, useKey: true, ...$attrs.rowConfig }"
       :column-config="{ resizable: true, useKey: true, ...$attrs.columnConfig }"
       :scroll-y="scrollY"
@@ -63,27 +63,25 @@
           <vxe-column
             v-for="(subItem, i) in item.children"
             :key="'vxe-table-' + i"
-            :class-name="subItem.wrap ? 'vxe-table-custom-wrap' : ''"
             :formatter="subItem.formatter ? subItem.formatter : 'formatName'"
             :filters="subItem.filters"
             :filter-render="subItem.filterRender"
             :title="subItem.label"
             :field="subItem.prop"
             v-bind="subItem"
-            :show-overflow="!subItem.wrap"
+            :class-name="{ 'vxe-table-custom-wrap': subItem.wrap, 'font-w600': subItem.bold }"
           />
         </vxe-colgroup>
         <vxe-column
           v-else
           :key="'vxe-table-' + i"
-          :class-name="item.wrap ? 'vxe-table-custom-wrap' : ''"
+          :class-name="{ 'vxe-table-custom-wrap': item.wrap, 'font-w600': item.bold }"
           :formatter="item.formatter ? item.formatter : 'formatName'"
           :filters="item.filters"
           :filter-render="item.filterRender"
           :title="item.label"
           :field="item.prop"
           v-bind="item"
-          :show-overflow="!item.wrap"
         />
       </template>
       <template #empty>