vue2-client 1.2.9 → 1.2.12

package/CHANGELOG.md

@@ -1,7 +1,7 @@
 # Change Log
 > 所有关于本项目的变化都在该文档里。
 
-**##1.2.9 -2022-03-24 @江超**
+**##1.2.9 - 1.2.12 -2022-03-24 @江超**
 - 功能新增：
 - [查询配置生成]：下拉框表单选择业务逻辑作为数据源时，可以选择数据源加载方式
 - [XFormItem]：当数据源加载方式为懒加载搜索时，将渲染一个可以根据关键词实时查询的选择框

package/package.json

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

package/src/base-client/components/common/CreateQuery/CreateQuery.vue

@@ -1012,6 +1012,9 @@ export default {
               this.$message.warning('下拉框数据源不是JSON集合')
               return
             }
+            delete item.lazyLoad
+          } else {
+            delete item.lazyLoad
           }
           if (item.formType !== 'selects') {
             delete item.selectType
@@ -1024,6 +1027,7 @@ export default {
           delete item.selectType
           delete item.selectKey
           delete item.selectKeyName
+          delete item.lazyLoad
         }
       } else {
         delete item.queryType
@@ -1036,6 +1040,7 @@ export default {
         delete item.selectType
         delete item.selectKey
         delete item.selectKeyName
+        delete item.lazyLoad
       }
       // 表格列
       if (this.dataMode.table) {

package/src/base-client/components/common/CreateSimpleFormQuery/CreateSimpleFormQuery.vue

@@ -629,10 +629,14 @@ export default {
             this.$message.warning('下拉框数据源不是JSON集合')
             return
           }
+          delete item.lazyLoad
+        } else {
+          delete item.lazyLoad
         }
         if (item.formType !== 'selects') {
           delete item.selectType
         }
+        delete item.lazyLoad
       } else {
         if (item.formType !== 'selects') {
           delete item.group
@@ -641,6 +645,7 @@ export default {
         delete item.selectType
         delete item.selectKey
         delete item.selectKeyName
+        delete item.lazyLoad
       }
       if (this.type === '新增') {
         this.form.column.push(item)

package/src/base-client/components/common/XForm/XFormItem.vue

@@ -241,11 +241,13 @@ export default {
     },
     // 获取数据
     getData (value, callback) {
-      const logicName = this.attr.keyName
-      const logic = logicName.substring(6)
-      post('/webmeterapi/' + logic, value).then(res => {
-        callback(res)
-      })
+      if (value !== '') {
+        const logicName = this.attr.keyName
+        const logic = logicName.substring(6)
+        post('/webmeterapi/' + logic, value).then(res => {
+          callback(res)
+        })
+      }
     },
     filterOption (input, option) {
       if (option.componentOptions.children[0].text) {

package/src/pages/login/Login.vue

@@ -62,7 +62,7 @@ import JSEncrypt from 'jsencrypt'
 import { ACCESS_TOKEN } from '@vue2-client/store/mutation-types'
 import Vue from 'vue'
 import { positions } from '@vue2-client/mock/common'
-import { timeFix } from '@/utils/util'
+import { timeFix } from '@vue2-client/utils/util'
 const { homePage, ticketPage } = require('@vue2-client/config')
 // import { router } from '@vue2-client/mock/user/routes'
 

package/src/pages/system/ticket/index.vue

@@ -273,6 +273,9 @@
       }
     },
     mounted () {
+      if (!this.currUser) {
+        this.$router.push('/login')
+      }
       this.getCurrentUserPhone()
       this.fixedQueryForm['t_uploader'] = this.currUser.ename
     },