n20-common-lib 2.5.0-beta.7 → 2.5.0-beta.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n20-common-lib",
-  "version": "2.5.0-beta.7",
+  "version": "2.5.0-beta.9",
   "private": false,
   "main": "src/index.js",
   "scripts": {

package/src/components/DatePicker/por.vue

@@ -18,27 +18,27 @@
 
 <script>
 import { $lc } from '../../utils/i18n/index'
-// import dayjs from 'dayjs'
-// let startDate = ''
+import dayjs from 'dayjs'
+let startDate = ''
 
-// const onPick = ({ maxDate, minDate }) => {
-//   startDate = minDate.getMonth() + 1 + '-' + minDate.getDate()
-//   let startSh = shortcuts_2.find((s) => s.text.includes($lc('开始')))
-//   startSh.text = startDate + $lc('开始')
-//   startSh.onClick = (picker) => {
-//     const start = dayjs(minDate).format('YYYY-MM-DD HH:mm:ss')
-//     const end = dayjs(minDate).add(100, 'year').format('YYYY-MM-DD HH:mm:ss')
-//     picker.$emit('pick', [start, end])
-//   }
+const onPick = ({ maxDate, minDate }) => {
+  startDate = minDate.getMonth() + 1 + '-' + minDate.getDate()
+  let startSh = shortcuts_2.find((s) => s.text.includes($lc('开始')))
+  startSh.text = startDate + $lc('开始')
+  startSh.onClick = (picker) => {
+    const start = dayjs(minDate).format('YYYY-MM-DD HH:mm:ss')
+    const end = dayjs(minDate).add(100, 'year').format('YYYY-MM-DD HH:mm:ss')
+    picker.$emit('pick', [start, end])
+  }
 
-//   let endSh = shortcuts_2.find((s) => s.text.includes($lc('截止')))
-//   endSh.text = startDate + $lc('截止')
-//   endSh.onClick = (picker) => {
-//     const end = dayjs(minDate).format('YYYY-MM-DD HH:mm:ss')
-//     const start = dayjs(minDate).subtract(100, 'year').format('YYYY-MM-DD HH:mm:ss')
-//     picker.$emit('pick', [start, end])
-//   }
-// }
+  let endSh = shortcuts_2.find((s) => s.text.includes($lc('截止')))
+  endSh.text = startDate + $lc('截止')
+  endSh.onClick = (picker) => {
+    const end = dayjs(minDate).format('YYYY-MM-DD HH:mm:ss')
+    const start = dayjs(minDate).subtract(100, 'year').format('YYYY-MM-DD HH:mm:ss')
+    picker.$emit('pick', [start, end])
+  }
+}
 
 let disabledDate_1 = (t) => {
   let now = new Date()
@@ -95,23 +95,23 @@ let shortcuts_2 = [
       end.setHours(23, 59, 59)
       picker.$emit('pick', [start, end])
     }
+  },
+  {
+    text: $lc('今天开始'),
+    onClick(picker) {
+      const start = dayjs().format('YYYY-MM-DD HH:mm:ss')
+      const end = dayjs().add(99, 'year').format('YYYY-MM-DD HH:mm:ss')
+      picker.$emit('pick', [start, end])
+    }
+  },
+  {
+    text: $lc('今天截止'),
+    onClick(picker) {
+      const end = dayjs().format('YYYY-MM-DD HH:mm:ss')
+      const start = dayjs().subtract(100, 'year').format('YYYY-MM-DD HH:mm:ss')
+      picker.$emit('pick', [start, end])
+    }
   }
-  // {
-  //   text: $lc('今天开始'),
-  //   onClick(picker) {
-  //     const start = dayjs().format('YYYY-MM-DD HH:mm:ss')
-  //     const end = dayjs().add(99, 'year').format('YYYY-MM-DD HH:mm:ss')
-  //     picker.$emit('pick', [start, end])
-  //   }
-  // },
-  // {
-  //   text: $lc('今天截止'),
-  //   onClick(picker) {
-  //     const end = dayjs().format('YYYY-MM-DD HH:mm:ss')
-  //     const start = dayjs().subtract(100, 'year').format('YYYY-MM-DD HH:mm:ss')
-  //     picker.$emit('pick', [start, end])
-  //   }
-  // }
 ]
 
 export default {
@@ -165,13 +165,13 @@ export default {
     this.pickerOptionsAs = Object.assign(
       {
         disabledDate: this.minNow ? disabledDate_1 : this.maxNow ? disabledDate_2 : undefined,
-        shortcuts
-        // onPick
+        shortcuts,
+        onPick
       },
       this.pickerOptions
     )
 
-    this.listeners = Object.assign({}, this.$listeners, { input: () => {}, change: () => {} })
+    this.listeners = Object.assign({}, this.$listeners, { input: () => {}, change: () => {}, blur: this.HandleBlur })
     return {}
   },
   computed: {
@@ -226,22 +226,22 @@ export default {
     }
   },
   methods: {
-    // HandleBlur() {
-    //   let startSh = shortcuts_2.find((s) => s.text.includes($lc('开始')))
-    //   let endSh = shortcuts_2.find((s) => s.text.includes($lc('截止')))
-    //   startSh.text = $lc('今天开始')
-    //   startSh.onClick = (picker) => {
-    //     const start = dayjs().format('YYYY-MM-DD HH:mm:ss')
-    //     const end = dayjs().add(100, 'year').format('YYYY-MM-DD HH:mm:ss')
-    //     picker.$emit('pick', [start, end])
-    //   }
-    //   endSh.text = $lc('今天截止')
-    //   endSh.onClick = (picker) => {
-    //     const end = dayjs().format('YYYY-MM-DD HH:mm:ss')
-    //     const start = dayjs().subtract(100, 'year').format('YYYY-MM-DD HH:mm:ss')
-    //     picker.$emit('pick', [start, end])
-    //   }
-    // }
+    HandleBlur() {
+      let startSh = shortcuts_2.find((s) => s.text.includes($lc('开始')))
+      let endSh = shortcuts_2.find((s) => s.text.includes($lc('截止')))
+      startSh.text = $lc('今天开始')
+      startSh.onClick = (picker) => {
+        const start = dayjs().format('YYYY-MM-DD HH:mm:ss')
+        const end = dayjs().add(100, 'year').format('YYYY-MM-DD HH:mm:ss')
+        picker.$emit('pick', [start, end])
+      }
+      endSh.text = $lc('今天截止')
+      endSh.onClick = (picker) => {
+        const end = dayjs().format('YYYY-MM-DD HH:mm:ss')
+        const start = dayjs().subtract(100, 'year').format('YYYY-MM-DD HH:mm:ss')
+        picker.$emit('pick', [start, end])
+      }
+    }
   }
 }
 </script>

package/src/components/FileUploadTable/index.vue

@@ -554,9 +554,12 @@ export default {
     MultipleSUccessFn(response, file, fileList, row) {
       if (fileList.length > 1) {
         let deepRow = cloneDeep(row)
-        if (!this.tableData[0][this.keys.url]) {
-          this.tableData.shift()
-        }
+        this.$nextTick(() => {
+          if (this.tableData.length && !this.tableData[0][this.keys.url]) {
+            this.tableData.shift()
+          }
+        })
+
         setTimeout(() => {
           this.tableData.splice(0, 0, {
             _name: file.name,

package/src/directives/VErrorMessage/index.js

@@ -0,0 +1,22 @@
+const directive = {}
+
+directive.install = (Vue) => {
+  Vue.directive('toErrorMessage', {
+    bind: () => {
+      document.body.addEventListener('click', () => {
+        // 获取el-form元素
+        var form = document.querySelector('.el-form')
+        // 检查是否有必填项校验错误
+        var errorElement = form.querySelector('.is-error')
+        if (errorElement) {
+          // 获取第一个必填项所在的位置
+          var errorOffset = errorElement.offsetTop
+          // 滚动到必填项位置
+          window.scrollTo(0, errorOffset)
+        }
+      })
+    }
+  })
+}
+
+export default directive

package/src/index.js

@@ -97,6 +97,7 @@ import VMove from './directives/VMove/index.js'
 import VRuleKey from './directives/VRuleKey/index.js'
 import { HoverTooltip, TitleDirective } from './directives/VTitle/index.js'
 import VTableLoading from './directives/loading/index.js'
+import VErrorMessage from './directives/VErrorMessage/index.js'
 
 /** 注入方法 */
 import dayjs from 'dayjs'
@@ -227,6 +228,7 @@ const install = function (Vue, opts = { prefix: 'Cl', i18nConfig: {} }) {
   Vue.use(VClickOutside)
   Vue.use(VHas)
   Vue.use(VTableLoading)
+  Vue.use(VErrorMessage)
 
   Vue.use(i18n, opts.i18nConfig)
   Vue.prototype.$axios = axios