n20-common-lib 2.2.32 → 2.2.34

package/package.json

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

package/src/components/ApprovalCard/index.vue

@@ -18,20 +18,24 @@
           </div>
           <div v-else class="flex-box">
             <div class="result-left-name" :class="item | typeF(status, 'color-')">{{ $lc(item.resultName) }}</div>
-            <div v-title="item.assignee" class="flex-box n20-worker m-r-s text-ellipsis" :show-overflow-tooltip="true">
+            <div
+              v-title="item.assignee"
+              class="flex-box flex-item n20-worker m-r-s text-ellipsis"
+              :show-overflow-tooltip="true"
+            >
               <div
                 v-title="item.memberName"
                 :show-overflow-tooltip="true"
-                class="n20-worker m-r-s text-ellipsis"
-                style="min-width: 250px"
+                class="flex-item n20-worker m-r-s text-ellipsis"
+                style="width: 250px"
               >
                 {{ item.memberName }}
               </div>
               <div
                 v-title="item.roleName"
-                class="n20-worker text-ellipsis"
+                class="flex-item n20-worker text-ellipsis"
                 :show-overflow-tooltip="true"
-                style="min-width: 250px"
+                style="width: 250px"
               >
                 {{ item.roleName }}
               </div>

package/src/components/DateSelect/index.vue

@@ -13,7 +13,9 @@
       value-format="yyyy-MM-dd"
       type="daterange"
       clearable
+      v-bind="$attrs"
       :placeholder="'选择日' | $lc"
+      v-on="$listeners"
       @change="dayChange"
     />
     <date-picker
@@ -22,9 +24,10 @@
       v-model="week"
       format="yyyy 第 WW 周"
       type="week"
-      :picker-options="{ firstDayOfWeek: 1 }"
+      :picker-options="attrs"
       :default-time="['00:00:00', '23:59:59']"
       :placeholder="'选择周' | $lc"
+      v-on="$listeners"
       @change="weekChange"
     />
 
@@ -32,23 +35,33 @@
       v-if="type === '月'"
       key="month"
       v-model="month"
+      v-bind="$attrs"
       type="month"
       format="yyyy-MM"
       value-format="yyyy-MM"
       :editable="false"
       :placeholder="'选择月' | $lc"
+      v-on="$listeners"
       @change="monthChange"
     />
-    <quarter-date-picker v-if="type === '季'" key="quarter" v-model="quarter" @change="handleChange" />
+    <quarter-date-picker
+      v-if="type === '季'"
+      key="quarter"
+      v-model="quarter"
+      :disabled-date="this.attrs.disabledDate"
+      @change="handleChange"
+    />
     <date-picker
       v-if="type === '年'"
       key="year"
       v-model="year"
+      v-bind="$attrs"
       type="year"
       format="yyyy"
       value-format="yyyy"
       :editable="false"
       :placeholder="'选择年' | $lc"
+      v-on="$listeners"
       @change="yearChange"
     />
   </div>
@@ -81,6 +94,7 @@ export default {
     }
   },
   data() {
+    this.attrs = Object.assign({ firstDayOfWeek: 1 }, this.$attrs['picker-options'])
     return {
       day: '',
       week: '',

package/src/components/DateSelect/quarterDatePicker.vue

@@ -27,16 +27,40 @@
 
       <div class="el-picker-panel__content">
         <div v-if="isQuarter" class="n20-quarter-date-picker__grid">
-          <el-button type="text" size="medium" class="n20-quarter-date-picker__btn" @click="selectSeason(0)"
+          <el-button
+            type="text"
+            :disabled="isDisabled(year, '1')"
+            size="medium"
+            :class="this.season == 1 ? 'isactive' : ''"
+            class="n20-quarter-date-picker__btn"
+            @click="selectSeason(0)"
             >{{ year }}年 第一季度</el-button
           >
-          <el-button type="text" size="medium" class="n20-quarter-date-picker__btn" @click="selectSeason(1)"
+          <el-button
+            type="text"
+            :disabled="isDisabled(year, '2')"
+            :class="this.season == 2 ? 'isactive' : ''"
+            size="medium"
+            class="n20-quarter-date-picker__btn"
+            @click="selectSeason(1)"
             >{{ year }}年 第二季度</el-button
           >
-          <el-button type="text" size="medium" class="n20-quarter-date-picker__btn" @click="selectSeason(2)"
+          <el-button
+            type="text"
+            :class="this.season == 3 ? 'isactive' : ''"
+            :disabled="isDisabled(year, '3')"
+            size="medium"
+            class="n20-quarter-date-picker__btn"
+            @click="selectSeason(2)"
             >{{ year }}年 第三季度</el-button
           >
-          <el-button type="text" size="medium" class="n20-quarter-date-picker__btn" @click="selectSeason(3)"
+          <el-button
+            type="text"
+            :class="this.season == 4 ? 'isactive' : ''"
+            :disabled="isDisabled(year, '4')"
+            size="medium"
+            class="n20-quarter-date-picker__btn"
+            @click="selectSeason(3)"
             >{{ year }}年 第四季度</el-button
           >
         </div>
@@ -81,6 +105,10 @@ export default {
         return {}
       }
     },
+    disabledDate: {
+      type: Function,
+      default: () => false
+    },
     valueArr: {
       default: () => {
         return ['01-01 - 03-31', '04-01 - 06-30', '07-01 - 09-30', '10-01 - 12-31']
@@ -163,6 +191,35 @@ export default {
       this.showValue = `${this.year} 年 ${this.season} 季度`
       that.$emit('input', { startDate: this.year + '-' + arr[0], endDate: this.year + '-' + arr[1] })
       that.$emit('change', { startDate: this.year + '-' + arr[0], endDate: this.year + '-' + arr[1] }) // 每次选择时间都将当前选择时间发送到父组件
+    },
+    isDisabled(year, type) {
+      let quarterDate
+      switch (type) {
+        case '1':
+          quarterDate = dayjs(year + '03')
+            .endOf('month')
+            .toDate()
+          break
+        case '2':
+          quarterDate = dayjs(year + '06')
+            .endOf('month')
+            .toDate()
+          break
+        case '3':
+          quarterDate = dayjs(year + '09')
+            .endOf('month')
+            .toDate()
+          break
+        case '4':
+          quarterDate = dayjs(year + '12')
+            .endOf('month')
+            .toDate()
+          break
+      }
+      if (this.disabledDate) {
+        return this.disabledDate(quarterDate)
+      }
+      return false
     }
   }
 }

package/src/components/Layout/SubContent/index.vue

@@ -16,7 +16,7 @@ export default {
   filters: {
     keyF({ path, query = {} }) {
       path = path.replace(/^\//, routerBase)
-      return path + '^' + JSON.stringify({ ...query, _fromNo: undefined }) + '^' + window._tab_route_key[path]
+      return path + '^' + JSON.stringify({ ...query, _fromNo: undefined }) + '^' + (window._tab_route_key[path] || 0)
     }
   },
   props: {

package/src/components/Layout/index.vue

@@ -51,7 +51,7 @@ export default {
   },
   filters: {
     keyF({ path, query = {} }) {
-      return path + '^' + JSON.stringify({ ...query, _fromNo: undefined }) + '^' + window._tab_route_key[path]
+      return path + '^' + JSON.stringify({ ...query, _fromNo: undefined }) + '^' + (window._tab_route_key[path] || 0)
     }
   },
   props: {

package/src/components/Layout/indexN.vue

@@ -51,7 +51,7 @@ export default {
   },
   filters: {
     keyF({ path, query = {} }) {
-      return path + '^' + JSON.stringify({ ...query, _fromNo: undefined }) + '^' + window._tab_route_key[path]
+      return path + '^' + JSON.stringify({ ...query, _fromNo: undefined }) + '^' + (window._tab_route_key[path] || 0)
     }
   },
   props: {

package/src/components/SelectDatePickerPro/index.vue

@@ -23,9 +23,11 @@
       v-model="week"
       format="yyyy 第 WW 周"
       type="week"
+      v-bind="$attrs"
       :picker-options="attrs"
       :default-time="['00:00:00', '23:59:59']"
       :placeholder="'选择周' | $lc"
+      v-on="$listeners"
     />
 
     <date-picker
@@ -38,6 +40,7 @@
       :editable="false"
       v-bind="$attrs"
       :placeholder="'选择月' | $lc"
+      v-on="$listeners"
     />
     <quarter-date-picker
       v-if="type === '季'"
@@ -55,6 +58,7 @@
       value-format="yyyy"
       :editable="false"
       :placeholder="'选择年' | $lc"
+      v-on="$listeners"
     />
   </div>
 </template>