vue2-client 1.2.7 → 1.2.8

package/CHANGELOG.md

@@ -1,6 +1,11 @@
 # Change Log
 > 所有关于本项目的变化都在该文档里。
 
+**##1.2.8 -2022-03-24 @江超**
+- 问题修复：
+- [登录页面]：修复登录后欢迎提示出现undefined的问题
+- [查询配置生成]：修复修改表单查询方式下拉框报错的问题
+
 **##1.2.7 -2022-03-24 @江超**
 - 功能新增：
 - [系统设置]：新增 [工单提交] 功能（submitTicket），用户在操作业务时如发现系统异常，可使用该功能反馈问题

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.2.7",
+  "version": "1.2.8",
   "private": false,
   "scripts": {
     "serve": "vue-cli-service serve",

package/src/config/CreateQueryConfig.js

@@ -0,0 +1,40 @@
+module.exports = {
+  queryType: [
+    {
+      label: '相等(=)', key: '=', match: 'input;select;radio;monthPicker;datePicker;cascader;selects'
+    },
+    {
+      label: '不相等(!=)', key: '!=', match: 'input;select;radio;monthPicker;datePicker;cascader;selects'
+    },
+    {
+      label: '全模糊(like)', key: 'LIKE', match: 'input;select;radio;cascader;selects'
+    },
+    {
+      label: '左模糊(left like)', key: 'LEFT_LIKE', match: 'input;select;radio;cascader;selects'
+    },
+    {
+      label: '右模糊(right like)', key: 'RIGHT_LIKE', match: 'input;select;radio;cascader;selects'
+    },
+    {
+      label: '大于(>)', key: '>', match: 'input;select;radio;monthPicker;datePicker;cascader;selects'
+    },
+    {
+      label: '大于等于(>=)', key: '>=', match: 'input;select;radio;monthPicker;datePicker;cascader;selects'
+    },
+    {
+      label: '小于(<)', key: '<', match: 'input;select;radio;monthPicker;datePicker;cascader;selects'
+    },
+    {
+      label: '小于等于(<=)', key: '<=', match: 'input;select;radio;monthPicker;datePicker;cascader;selects'
+    },
+    {
+      label: '包含(in)', key: 'IN', match: 'checkbox;select;cascader;selects'
+    },
+    {
+      label: '不包含(not in)', key: 'NOT_IN', match: 'checkbox;select;cascader;selects'
+    },
+    {
+      label: '之间(between)', key: 'BETWEEN', match: 'rangePicker'
+    }
+  ]
+}

package/src/pages/login/Login.vue

@@ -61,8 +61,8 @@ import { mapMutations } from 'vuex'
 import JSEncrypt from 'jsencrypt'
 import { ACCESS_TOKEN } from '@vue2-client/store/mutation-types'
 import Vue from 'vue'
-import Mock from 'mockjs'
 import { positions } from '@vue2-client/mock/common'
+import { timeFix } from '@/utils/util'
 const { homePage, ticketPage } = require('@vue2-client/config')
 // import { router } from '@vue2-client/mock/user/routes'
 
@@ -128,7 +128,7 @@ export default {
             } else {
               this.$router.push(homePage).catch(() => {})
             }
-            this.$message.success(Mock.mock('@TIMEFIX').CN + '，欢迎回来', 3)
+            this.$message.success(timeFix().CN + '，欢迎回来', 3)
           })
         })
       } else {

package/src/utils/util.js

@@ -1,5 +1,29 @@
 import enquireJs from 'enquire.js'
 
+const timeList = [
+  {
+    CN: '早上好',
+    HK: '早晨啊',
+    US: 'Good morning'
+  }, {
+    CN: '上午好',
+    HK: '上午好',
+    US: 'Good morning'
+  }, {
+    CN: '中午好',
+    HK: '中午好',
+    US: 'Good afternoon'
+  }, {
+    CN: '下午好',
+    HK: '下午好',
+    US: 'Good afternoon'
+  }, {
+    CN: '晚上好',
+    HK: '晚上好',
+    US: 'Good evening'
+  }
+]
+
 export function isDef (v) {
   return v !== undefined && v !== null
 }
@@ -43,6 +67,13 @@ export function timeCompare (date1, date2) {
   return date11.time > date22.time ? 1 : -1
 }
 
+export function timeFix () {
+  const time = new Date()
+  const hour = time.getHours()
+  return hour < 9
+    ? timeList[0] : (hour <= 11 ? timeList[1] : (hour <= 13 ? timeList[2] : (hour <= 20 ? timeList[3] : timeList[4])))
+}
+
 /**
  * Remove an item from an array.
  */
@@ -81,16 +112,15 @@ export function showXml (str) {
 
   // 把注释编码
   text = text.replace(/\n/g, '\r').replace(/<!--(.+?)-->/g, function ($0, text) {
-    var ret = '<!--' + escape(text) + '-->'
-    return ret
+    return '<!--' + escape(text) + '-->'
   }).replace(/\r/g, '\n')
 
   // 调整格式
-  const rgx = /\n(<(([^?]).+?)(?:\s|\s*?>|\s*?(\/)>)(?:.*?(?:(?:(\/)>)|(?:<(\/)\2>)))?)/mg
+  const rgx = /\n(<(([^?]).+?)(?:\s|\s*?>|\s*?(\/)>)(?:.*?(?:(\/)>|<(\/)\2>))?)/mg
   const nodeStack = []
   const output = text.replace(rgx, function ($0, all, name, isBegin, isCloseFull1, isCloseFull2, isFull1, isFull2) {
     const isClosed = (isCloseFull1 === '/') || (isCloseFull2 === '/') || (isFull1 === '/') || (isFull2 === '/')
-    let prefix = ''
+    let prefix
     if (isBegin === '!') {
       prefix = getPrefix(nodeStack.length)
     } else {