n20-common-lib 2.2.10 → 2.2.12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n20-common-lib",
-  "version": "2.2.10",
+  "version": "2.2.12",
   "private": false,
   "main": "src/index.js",
   "scripts": {
@@ -36,6 +36,7 @@
     "theme/fonts",
     "bpmn2svg",
     "g6.js",
+    "u-table.js",
     "nstc-g6/index.js",
     "nstc-g6/assets",
     "nstc-g6/components",

package/src/components/ApprovalButtons/setCarboncopyProp.vue

@@ -7,7 +7,11 @@
       </span>
       <span class="m-l m-r-ss">{{ '单位名称' | $lc }}</span>
       <span>
-        <el-input v-model="searchObj.cltName" size="mini" :placeholder="'请选择单位' | $lc" />
+        <el-input v-model="searchObj.cltName" size="mini" :placeholder="'请输入单位名称' | $lc" />
+      </span>
+      <span class="m-l m-r-ss">{{ '角色名称' | $lc }}</span>
+      <span>
+        <el-input v-model="searchObj.roleName" size="mini" :placeholder="'请输入角色名称' | $lc" />
       </span>
       <el-button class="m-l" plain size="mini" @click="resetFn">{{ '重置' | $lc }}</el-button>
       <el-button type="primary" size="mini" @click="searchFn">{{ '查询' | $lc }}</el-button>

package/src/components/DateSelect/index.vue

@@ -130,10 +130,14 @@ export default {
       this.$emit('selectChange', val)
     },
 
-    dayChange(val) {
-      console.log(val)
-      this.$emit('input', val)
-      this.$emit('change', { startDate: val[0], endDate: val[1] })
+    dayChange(value) {
+      if (value) {
+        this.$emit('input', value)
+        this.$emit('change', { startDate: value[0], endDate: value[1] })
+      } else {
+        this.$emit('input', '')
+        this.$emit('change', { startDate: '', endDate: '' })
+      }
     },
     timestampToTime(timestamp) {
       var date = new Date(timestamp) // 时间戳为10位需*1000，时间戳为13位的话不需乘1000
@@ -143,7 +147,6 @@ export default {
       return Y + M + D
     },
     weekChange(val) {
-      console.log(val)
       let todayDay = val ? new Date(val) : new Date()
       let todayOfWeek = todayDay.getDay()
       let spendDay = 1
@@ -164,21 +167,38 @@ export default {
       this.$emit('change', weekTime)
     },
     monthChange(val) {
-      console.log(val)
-      let IMonth = {
-        startDate: dayjs(val).startOf('month').format('YYYY-MM-DD'),
-        endDate: dayjs(val).endOf('month').format('YYYY-MM-DD')
+      if (val) {
+        let IMonth = {
+          startDate: dayjs(val).startOf('month').format('YYYY-MM-DD'),
+          endDate: dayjs(val).endOf('month').format('YYYY-MM-DD')
+        }
+        this.$emit('input', val)
+        this.$emit('change', IMonth)
+      } else {
+        let IMonth = {
+          startDate: '',
+          endDate: ''
+        }
+        this.$emit('input', val)
+        this.$emit('change', IMonth)
       }
-      this.$emit('input', val)
-      this.$emit('change', IMonth)
     },
     yearChange(val) {
-      let iYear = {
-        startDate: dayjs(val).startOf('year').format('YYYY-MM-DD'),
-        endDate: dayjs(val).endOf('year').format('YYYY-MM-DD')
+      if (val) {
+        let iYear = {
+          startDate: dayjs(val).startOf('year').format('YYYY-MM-DD'),
+          endDate: dayjs(val).endOf('year').format('YYYY-MM-DD')
+        }
+        this.$emit('input', val)
+        this.$emit('change', iYear)
+      } else {
+        let iYear = {
+          startDate: '',
+          endDate: ''
+        }
+        this.$emit('input', val)
+        this.$emit('change', iYear)
       }
-      this.$emit('input', val)
-      this.$emit('change', iYear)
     },
     handleChange(val) {
       this.$emit('input', val)

package/src/components/SelectDatePickerPro/index.vue

@@ -154,13 +154,23 @@ export default {
         }
       },
       set(value) {
-        let IMonth = {
-          startDate: dayjs(value).startOf('month').format('YYYY-MM-DD'),
-          endDate: dayjs(value).endOf('month').format('YYYY-MM-DD'),
-          typeDate: this.value.typeDate
+        if (value) {
+          let IMonth = {
+            startDate: dayjs(value).startOf('month').format('YYYY-MM-DD'),
+            endDate: dayjs(value).endOf('month').format('YYYY-MM-DD'),
+            typeDate: this.value.typeDate
+          }
+          this.$emit('input', IMonth)
+          this.$emit('change', IMonth)
+        } else {
+          let IMonth = {
+            startDate: '',
+            endDate: '',
+            typeDate: this.value.typeDate
+          }
+          this.$emit('input', IMonth)
+          this.$emit('change', IMonth)
         }
-        this.$emit('input', IMonth)
-        this.$emit('change', IMonth)
       }
     },
     quarter: {
@@ -168,6 +178,7 @@ export default {
         return this.value
       },
       set(value) {
+        console.log(value, 2)
         this.$emit('input', Object.assign(value, { typeDate: this.type }))
         this.$emit('change', Object.assign(value, { typeDate: this.type }))
       }
@@ -181,13 +192,23 @@ export default {
         }
       },
       set(value) {
-        let iYear = {
-          startDate: dayjs(value).startOf('year').format('YYYY-MM-DD'),
-          endDate: dayjs(value).endOf('year').format('YYYY-MM-DD'),
-          typeDate: this.value.typeDate
+        if (value) {
+          let iYear = {
+            startDate: dayjs(value).startOf('year').format('YYYY-MM-DD'),
+            endDate: dayjs(value).endOf('year').format('YYYY-MM-DD'),
+            typeDate: this.value.typeDate
+          }
+          this.$emit('input', iYear)
+          this.$emit('change', iYear)
+        } else {
+          let iYear = {
+            startDate: '',
+            endDate: '',
+            typeDate: this.value.typeDate
+          }
+          this.$emit('input', iYear)
+          this.$emit('change', iYear)
         }
-        this.$emit('input', iYear)
-        this.$emit('change', iYear)
       }
     }
   },

package/src/components/SelectDatePickerPro/quarterDatePicker.vue

@@ -121,7 +121,31 @@ export default {
       return nfOptionsArray
     },
     showValue: {
-      set() {},
+      set(value) {
+        if (value) {
+          const regex = /(\d{4}) 年 (\d) 季度/
+          const match = value.match(regex)
+          const [, year, quarter] = match
+          switch (quarter) {
+            case '1':
+              this.$emit('input', { startDate: year + '01-01', endDate: year + '03-31' })
+              break
+            case '2':
+              this.$emit('input', { startDate: year + '04-01', endDate: year + '06-30' })
+              break
+            case '3':
+              this.$emit('input', { startDate: year + '07-01', endDate: year + '09-30' })
+              break
+            case '4':
+              this.$emit('input', { startDate: year + '10-01', endDate: year + '12-31' })
+              break
+            default:
+              break
+          }
+        } else {
+          this.$emit('input', { startDate: '', endDate: '' })
+        }
+      },
       get() {
         if (this.value.startDate && this.value.endDate) {
           return `${dayjs(this.value.startDate).year()} 年 ${dayjs(this.value.endDate).quarter()} 季度`

package/src/components/TableOperateColumn/index.vue

@@ -15,7 +15,7 @@ export default {
   components: {
     OperateBtns
   },
-  inject: ['bigData'],
+  inject: { bigData: { default: false } },
   props: {
     btnList: {
       type: Array,
@@ -23,4 +23,4 @@ export default {
     }
   }
 }
-</script>
+</script>

package/u-table.js

@@ -0,0 +1,2 @@
+import UTable from './src/components/UTable/index.js'
+export default UTable