n20-common-lib 1.3.113 → 1.3.115

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "n20-common-lib",
-  "version": "1.3.113",
+  "version": "1.3.115",
   "private": false,
   "main": "src/index.js",
   "scripts": {
     "serve": "vue-cli-service serve",
     "serve:theme": "vue-cli-service serve --testTheme",
     "test": "vue-cli-service serve --test",
-    "build": "node versionInfo.js && vue-cli-service build --testTheme",
+    "build": "node versionInfo.js && npm run build:css && vue-cli-service build --testTheme",
     "lint": "vue-cli-service lint",
     "info": "node versionInfo.js",
     "build:Jenkins_1": "vue-cli-service build --serverConfig ./server-config-jenkins.jsonc",

package/src/assets/css/cl-date-quarter.scss

@@ -29,6 +29,39 @@
     border-color: none;
   }
 }
+.n20-date-select-busi {
+  display: inline-block;
+  width: 305px;
+  border: 1px solid var(--border-color-base);
+  border-radius: var(--border-radius-base);
+
+  .el-select .el-input__inner {
+    border: none;
+    border-radius: 4px 0 0 4px;
+  }
+
+  .el-select .el-input__inner:active,
+  .el-select .el-input__inner:hover,
+  .el-select .el-input__inner:focus {
+    box-shadow: none;
+    border-color: none;
+  }
+  .el-date-editor .el-input__inner {
+    // border-left: none;
+    border-top: none;
+    border-right: none;
+    border-bottom: none;
+    border-radius: 0 4px 4px 0;
+  }
+  .el-date-editor .el-input__inner:active,
+  .el-date-editor .el-input__inner:hover,
+  .el-date-editor .el-input__inner:focus {
+    box-shadow: none;
+    border-color: none;
+  }
+}
+.n20-date-select-busi:hover,
+.n20-date-select-busi:focus,
 .n20-date-select:hover,
 .n20-date-select:focus {
   border-color: var(--color-primary);

package/src/components/DateSelect/busiDate.vue

@@ -0,0 +1,163 @@
+<template>
+  <div class="flex-box flex-v">
+    <div class="n20-date-select-busi">
+      <el-select v-model="type" placeholder="请选择" style="width: 85px">
+        <el-option label="期望日" :value="1" />
+        <el-option label="提交日" :value="2" />
+        <el-option label="发起日" :value="3" />
+      </el-select>
+      <el-date-picker
+        v-model="startDate"
+        format="yyyy-MM-dd"
+        value-format="yyyy-MM-dd"
+        type="date"
+        placeholder="选择日"
+        @change="changeDate"
+      />
+    </div>
+    <el-radio-group v-model="tl" class="m-l-ss" @change="handleRadio">
+      <el-radio :label="1">当前日</el-radio>
+      <el-radio :label="2">前溯</el-radio>
+      <el-radio :label="3">后延</el-radio>
+    </el-radio-group>
+    <el-input-number
+      v-model="num"
+      :disabled="tl === 1"
+      class="m-l-ss"
+      controls-position="right"
+      :min="0"
+      @change="handleChange"
+    />
+  </div>
+</template>
+
+<script>
+import dayjs from 'dayjs'
+export default {
+  name: 'BusiDatePicker',
+  props: {
+    mapKey: {
+      type: Object,
+      default: () => {
+        return {
+          type: 'type',
+          startDate: 'startDate',
+          tl: 'tl',
+          num: 'num',
+          endDate: 'endDate'
+        }
+      }
+    },
+    fromList: {
+      type: Object,
+      default: () => {
+        return {
+          type: 1,
+          startDate: '',
+          tl: 1,
+          num: 0,
+          endDate: ''
+        }
+      }
+    }
+  },
+  data() {
+    return {
+      type: 1,
+      startDate: '',
+      tl: 1,
+      num: 0
+    }
+  },
+  mounted() {
+    this.type = this.fromList[this.mapKey.type]
+    this.startDate = this.fromList[this.mapKey.startDate]
+    this.tl = this.fromList[this.mapKey.tl]
+    this.num = this.fromList[this.mapKey.num]
+  },
+  methods: {
+    handleRadio(val) {
+      if (val === 1 && this.startDate) {
+        this.num = 0
+        let param = {
+          [this.mapKey.type]: this.type,
+          [this.mapKey.startDate]: this.startDate,
+          [this.mapKey.tl]: this.tl,
+          [this.mapKey.num]: 0,
+          [this.mapKey.endDate]: this.startDate
+        }
+        this.startDate && this.$emit('change', param)
+      } else if (val === 2 && this.num && this.startDate) {
+        let param = {
+          [this.mapKey.type]: this.type,
+          [this.mapKey.startDate]: dayjs(this.startDate).subtract(this.num, 'day').format('YYYY-MM-DD'),
+          [this.mapKey.tl]: this.tl,
+          [this.mapKey.num]: this.num,
+          [this.mapKey.endDate]: this.startDate
+        }
+        this.startDate && this.$emit('change', param)
+      } else if (val === 3 && this.num && this.startDate) {
+        let param = {
+          [this.mapKey.type]: this.type,
+          [this.mapKey.startDate]: dayjs(this.startDate).add(this.num, 'day').format('YYYY-MM-DD'),
+          [this.mapKey.tl]: this.tl,
+          [this.mapKey.num]: this.num,
+          [this.mapKey.endDate]: this.startDate
+        }
+        this.$emit('change', param)
+      }
+    },
+    changeDate(val) {
+      if (this.tl === 1 && val && this.num ) {
+        let param = {
+          [this.mapKey.type]: this.type,
+          [this.mapKey.startDate]: val,
+          [this.mapKey.tl]: this.tl,
+          [this.mapKey.num]: this.num,
+          [this.mapKey.endDate]: val
+        }
+         this.$emit('change', param)
+      } else if (this.tl === 2 && this.num && val) {
+        let param = {
+          [this.mapKey.type]: this.type,
+          [this.mapKey.startDate]: dayjs(this.startDate).subtract(this.num, 'day').format('YYYY-MM-DD'),
+          [this.mapKey.tl]: this.tl,
+          [this.mapKey.num]: this.num,
+          [this.mapKey.endDate]: this.startDate
+        }
+        this.$emit('change', param)
+      } else if (this.tl === 3 && this.num && val) {
+        let param = {
+          [this.mapKey.type]: this.type,
+          [this.mapKey.startDate]: dayjs(this.startDate).add(this.num, 'day').format('YYYY-MM-DD'),
+          [this.mapKey.tl]: this.tl,
+          [this.mapKey.num]: this.num,
+          [this.mapKey.endDate]: this.startDate
+        }
+         this.$emit('change', param)
+      }
+    },
+    handleChange(val) {
+      if (this.tl === 2 &&val && this.startDate) {
+        let param = {
+          [this.mapKey.type]: this.type,
+          [this.mapKey.startDate]: dayjs(this.startDate).subtract(val, 'day').format('YYYY-MM-DD'),
+          [this.mapKey.tl]: this.tl,
+          [this.mapKey.num]: this.num,
+          [this.mapKey.endDate]: this.startDate
+        }
+        this.$emit('change', param)
+      } else if (this.tl === 3 &&val && this.startDate) {
+        let param = {
+          [this.mapKey.type]: this.type,
+          [this.mapKey.startDate]: this.startDate,
+          [this.mapKey.tl]: this.tl,
+          [this.mapKey.num]: this.num,
+          [this.mapKey.endDate]: dayjs(this.startDate).add(val, 'day').format('YYYY-MM-DD')
+        }
+        this.$emit('change', param)
+      }
+    }
+  }
+}
+</script>

package/src/components/DateSelect/index.vue

@@ -83,11 +83,30 @@ export default {
       set(v) {
         this.$emit('update:selectType', v)
       },
-      get(v) {
+      get() {
         return this.selectType
       }
     }
   },
+  mounted() {
+    switch (this.selectType) {
+      case 1:
+        this.day = this.value
+        break
+      case 2:
+        this.week = this.value
+        break
+      case 3:
+        this.month = this.value
+        break
+      case 4:
+        this.quarter = this.value
+        break
+      case 5:
+        this.year = this.value
+        break
+    }
+  },
   methods: {
     dateTypeSelectChange(val) {
       this.$emit('update:selectType', val)
@@ -95,6 +114,7 @@ export default {
       this.week = ''
       this.month = ''
       this.year = ''
+      this.quarter = ''
       this.$emit('selectChange', val)
     },
 
@@ -134,7 +154,7 @@ export default {
       this.$emit('input', val)
       this.$emit('change', val)
     },
-    handleChange(val) {
+    handleChange(val, val2) {
       this.$emit('input', val)
       this.$emit('change', val)
     }

package/src/components/DateSelect/quarterDatePicker.vue

@@ -69,12 +69,19 @@
 </template>
 
 <script>
+import quarter from 'dayjs/plugin/quarterOfYear'
+import dayjs from 'dayjs'
+dayjs.extend(quarter)
 export default {
   name: 'QuarterDatePicker',
   props: {
+    value: {
+      type: String,
+      default: ''
+    },
     valueArr: {
       default: () => {
-        return ['01-03', '04-06', '07-09', '10-12']
+        return ['01-01 - 03-31', '04-01 - 06-30', '07-01 - 09-30', '10-01 - 12-31']
       },
       type: Array
     },
@@ -97,11 +104,12 @@ export default {
       year: new Date().getFullYear(), // input显示时间，会随着用户操作改变
       defaultyear: new Date().getFullYear(), // 当前年份，不变
       month: new Date().getMonth() + 1, // 当前月份，不变
-      showValue: '',
+      // showValue: '',
       isQuarter: true, // 默认展示季度
       beforeyear: null // 默认显示上一季度所用时间，可能是去年
     }
   },
+
   computed: {
     getYear() {
       let nfOptionsArray = []
@@ -109,6 +117,19 @@ export default {
         nfOptionsArray.push(i)
       }
       return nfOptionsArray
+    },
+    showValue: {
+      set(v) {
+        this.$emit('input', v)
+      },
+      get() {
+        if (this.value) {
+          let list = this.value.split(' - ')
+          return `${dayjs(list[0]).year()} 年 ${dayjs(list[0]).quarter()} 季度`
+        } else {
+          return this.value
+        }
+      }
     }
   },
   mounted() {
@@ -136,37 +157,12 @@ export default {
     selectSeason(i) {
       let that = this
       that.season = i + 1
-      let arr = that.valueArr[i].split('-')
+      let arr = that.valueArr[i].split(' - ')
       that.showSeason = false
       this.showValue = `${this.year} 年 ${this.season} 季度`
       that.$emit('input', this.year + '-' + arr[0] + ' - ' + this.year + '-' + arr[1])
-      that.$emit('change', this.year + '-' + arr[0] + ' - ' + this.year + '-' + arr[1], this.year - this.season) // 每次选择时间都将当前选择时间发送到父组件
+      that.$emit('change', this.year + '-' + arr[0] + ' - ' + this.year + '-' + arr[1]) // 每次选择时间都将当前选择时间发送到父组件
     }
-    // getDefaultTime() {
-    //   // 获取默认的上一个季度
-    //   var year = this.defaultyear
-    //   var month = this.month
-    //   var season = null
-    //   if (month <= 3) {
-    //     this.season = 1
-    //     year -= 1
-    //     season = 4
-    //     this.beforeyear = year
-    //   } else if (month > 3 && month <= 6) {
-    //     this.season = 2
-    //     season = 1
-    //     this.beforeyear = year
-    //   } else if (month > 6 && month <= 9) {
-    //     this.season = 3
-    //     season = 2
-    //     this.beforeyear = year
-    //   } else if (month > 9 && month <= 12) {
-    //     this.season = 4
-    //     season = 3
-    //     this.beforeyear = year
-    //   }
-    //   this.showValue = `${year} 年 ${season} 季度`
-    // }
   }
 }
 </script>

package/src/components/LoginTemporary/utils.js

@@ -41,33 +41,44 @@ export function siteTree2menus(siteTree) {
   return list2tree(list_2, 'menuid', 'pmid', 'children', 'sortnum')
 }
 
-export function siteTree2RelaNos(siteTree) {
-  let relaNos = []
-  siteTree.forEach((m) => {
-    let oRelaObj = relaNos.find((item) => item.appNo === m.appNo)
-    if (oRelaObj) {
-      m.treeno && oRelaObj.relaNos.push(m.treeno)
-      if (Array.isArray(m.children)) {
-        forEachs(m.children, (item) => {
-          item.treeno && oRelaObj.relaNos.push(item.treeno)
-        })
-      }
+function addOno(map, item, appNo) {
+  if (map[appNo]) {
+    map[appNo].relaNos.push(item.treeno)
+  } else {
+    map[appNo] = {
+      appNo: appNo,
+      label: item.label,
+      pageurl: item.pageurl,
+      relaNos: [item.treeno]
+    }
+  }
+
+  if (appNo !== item.appNo) {
+    if (map[item.appNo]) {
+      map[item.appNo].relaNos.push(item.treeno)
     } else {
-      oRelaObj = {
-        appNo: m.appNo,
-        label: m.label,
-        pageurl: m.pageurl,
-        relaNos: []
+      map[item.appNo] = {
+        appNo: item.appNo,
+        label: item.label,
+        pageurl: item.pageurl,
+        relaNos: [item.treeno]
       }
+    }
+  }
+}
 
-      m.treeno && oRelaObj.relaNos.push(m.treeno)
-      if (Array.isArray(m.children)) {
-        forEachs(m.children, (item) => {
-          item.treeno && oRelaObj.relaNos.push(item.treeno)
-        })
-      }
-      relaNos.push(oRelaObj)
+export function siteTree2RelaNos(siteTree) {
+  let relaNosMap = {}
+  siteTree.forEach((m) => {
+    addOno(relaNosMap, m, m.appNo)
+    if (Array.isArray(m.children)) {
+      forEachs(m.children, (item) => {
+        if (item.treeno) {
+          addOno(relaNosMap, item, m.appNo)
+        }
+      })
     }
   })
+  let relaNos = Object.values(relaNosMap)
   return relaNos
 }

package/src/index.js

@@ -58,6 +58,7 @@ import Descriptions from './components/Descriptions/index.vue'
 import EventBubble from './components/EventBubble/index.vue'
 import SelectDatePicker from './components/DateSelect/index.vue'
 import QuarterDatePicker from './components/DateSelect/quarterDatePicker.vue'
+import BusiDatePicker from './components/DateSelect/busiDate.vue'
 
 // ECharts 不要打包进来
 import Stamp from './components/Stamp/index.vue'
@@ -161,6 +162,7 @@ const components = [
   Diff,
   SelectDatePicker,
   QuarterDatePicker,
+  BusiDatePicker,
   /* old */
   TableO,
   FiltersO,
@@ -282,6 +284,7 @@ export {
   Diff,
   SelectDatePicker,
   QuarterDatePicker,
+  BusiDatePicker,
   /* 中建科 */
   ApprovalCardZjk,
   ApproveCardZjk,