JSelectBizComponent columns 建议开放customRender等方法类配置 #3203

定时任务表达式，”星期“一栏错误 issues/I4IFWX

JSelectBizComponent columns 建议开放customRender等方法类配置 #3203
定时任务表达式，”星期“一栏错误 issues/I4IFWX
zhangdaiscott
1 parent 2e22880e
Showing 3 changed files with 61 additions and 12 deletions
ant-design-vue-jeecg/src/components/jeecg/JEasyCron/EasyCron.vue
ant-design-vue-jeecg/src/components/jeecg/JEasyCron/tabs/week.vue
ant-design-vue-jeecg/src/components/jeecgbiz/JSelectBizComponent/JSelectBizComponentModal.vue
@@ -144,8 +144,12 @@ export default {
       const v = this.cronValue_c
       if (this.hideYear || this.hideSecond) return v
       const vs = v.split(' ')
+      if (vs.length >= 6) {
+        // 转成 Quartz 的规则
+        vs[5] = this.convertWeekToQuartz(vs[5])
+      }
       return vs.slice(0, vs.length - 1).join(' ')
-    }
+    },
   },
   watch: {
     cronValue(newVal, oldVal) {
@@ -226,6 +230,37 @@ export default {
       if (values.length > i) this.year = values[i]
       this.assignInput()
     },
+    // Quartz 的规则：
+    // 1 = 周日，2 = 周一，3 = 周二，4 = 周三，5 = 周四，6 = 周五，7 = 周六
+    convertWeekToQuartz(week) {
+      let convert = (v) => {
+        if (v === '0') {
+          return '1'
+        }
+        if (v === '1') {
+          return '0'
+        }
+        return (Number.parseInt(v) - 1).toString()
+      }
+      // 匹配示例 1-7 or 1/7
+      let patten1 = /^([0-7])([-/])([0-7])$/
+      // 匹配示例 1,4,7
+      let patten2 = /^([0-7])(,[0-7])+$/
+      if (/^[0-7]$/.test(week)) {
+        return convert(week)
+      } else if (patten1.test(week)) {
+        return week.replace(patten1, ($0, before, separator, after) => {
+          if (separator === '/') {
+            return convert(before) + separator + after
+          } else {
+            return convert(before) + separator + convert(after)
+          }
+        })
+      } else if (patten2.test(week)) {
+        return week.split(',').map(v => convert(v)).join(',')
+      }
+      return week
+    },
     calTriggerList: simpleDebounce(function () {
       this.calTriggerListInner()
     }, 500),
@@ -51,14 +51,14 @@ import mixin from &#39;./mixin&#39;
 import { replaceWeekName, WEEK_MAP_EN } from './const.js'
  
 const WEEK_MAP = {
-  '周一': 1,
-  '周二': 2,
-  '周三': 3,
-  '周四': 4,
-  '周五': 5,
-  '周六': 6,
+  '周一': 2,
+  '周二': 3,
+  '周三': 4,
+  '周四': 5,
+  '周五': 6,
+  '周六': 7,
   // 按照国人习惯，将周日放到每周的最后一天
-  '周日': 7,
+  '周日': 1,
 }
  
 export default {
@@ -62,8 +62,9 @@
   import { getAction } from '@/api/manage'
   import Ellipsis from '@/components/Ellipsis'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-  import { cloneObject, pushIfNotExist } from '@/utils/util'
+  import { pushIfNotExist } from '@/utils/util'
   import JSelectBizQueryItem from './JSelectBizQueryItem'
+  import {cloneDeep} from 'lodash'
  
   export default {
     name: 'JSelectBizComponentModal',
@@ -177,11 +178,24 @@
     computed: {
       // 表头
       innerColumns() {
-        let columns = cloneObject(this.columns)
+        let columns = cloneDeep(this.columns)
         columns.forEach(column => {
           // 给所有的列加上过长裁剪
           if (this.ellipsisLength !== -1) {
-            column.customRender = (text) => this.renderEllipsis(text)
+            // JSelectBizComponent columns 建议开放customRender等方法类配置
+            // https://github.com/jeecgboot/jeecg-boot/issues/3203
+            let myCustomRender = column.customRender
+            column.customRender = (text, record, index) => {
+              let value = text
+              if (typeof myCustomRender === 'function') {
+                // noinspection JSVoidFunctionReturnValueUsed
+                value = myCustomRender(text, record, index)
+              }
+              if (typeof value === 'string') {
+                return this.renderEllipsis(value)
+              }
+              return value
+            }
           }
         })
         return columns
@@ -192,7 +206,7 @@
         deep: true,
         immediate: true,
         handler(val) {
-          this.innerValue = cloneObject(val)
+          this.innerValue = cloneDeep(val)
           this.selectedRowKeys = []
           this.valueWatchHandler(val)
           this.queryOptionsByValue(val)