vue2-client 1.5.15 → 1.5.17

package/CHANGELOG.md

@@ -1,7 +1,7 @@
 # Change Log
 > 所有关于本项目的变化都在该文档里。
 
-**1.5.14 - 1.5.15 -2022-12-08 @苗艳强**
+**1.5.14 - 1.5.17 -2022-12-08 @苗艳强**
 - 修复徽标显示问题
 - 修复fixedQueryForm问题
 - 修复修改时树形选择框不能回填问题
@@ -9,6 +9,9 @@
 - 修复翻页后修改删除按钮仍然可用的问题
 - 修复表单不显示问题
 - afterQuery事件增加查询条件参数
+- 修复跳转登录页面问题
+- 修改查询配置
+- 修复清空查询缓存回调问题
 
 **1.5.11 - 1.5.13 -2022-12-05 @江超**
 - 优化了查询配置生成界面的样式

package/package.json

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

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

@@ -54,25 +54,25 @@
           </a-card>
         </a-col>
         <a-col :span="9">
-          <a-card v-if="dataMode.queryForm || dataMode.addOrEditForm || dataMode.table" :bodyStyle="bodyStyle" title="核心配置">
-            <template v-if="dataMode.queryForm || dataMode.addOrEditForm">
+          <a-card v-if="dataMode.queryForm || dataMode.addOrEditForm || dataMode.table || dataMode.sqlQueryCondition" :bodyStyle="bodyStyle" title="核心配置">
+            <template v-if="dataMode.queryForm || dataMode.addOrEditForm || dataMode.sqlQueryCondition">
               <a-divider style="font-size: 14px;margin-top: 0">表单配置</a-divider>
               <a-form-model-item label="表单类型" prop="formType">
                 <a-select v-model="item.formType" placeholder="请选择表单类型" @change="changeFormType(item)">
                   <a-select-option v-for="formTypeItem in formType" :key="formTypeItem.key">{{ formTypeItem.label }}</a-select-option>
                 </a-select>
               </a-form-model-item>
+              <a-form-model-item v-if="dataMode.sqlQueryCondition && item.formType !=='file' && item.formType !=='image' " label="表单查询方式" prop="queryType">
+                <a-select
+                  v-model="item.queryType"
+                  :disabled="formQueryTypeDisabled"
+                  :getPopupContainer=" triggerNode => { return triggerNode.parentNode } "
+                  placeholder="表单查询方式">
+                  <a-select-option v-for="queryTypeItem in queryTypeV" :key="queryTypeItem.key">{{ queryTypeItem.label }}</a-select-option>
+                </a-select>
+              </a-form-model-item>
               <template v-if="item.formType">
-                <a-form-model-item v-if="dataMode.sqlQueryCondition && item.formType !=='file' && item.formType !=='image' " label="表单查询方式" prop="queryType">
-                  <a-select
-                    v-model="item.queryType"
-                    :disabled="formQueryTypeDisabled"
-                    :getPopupContainer=" triggerNode => { return triggerNode.parentNode } "
-                    placeholder="表单查询方式">
-                    <a-select-option v-for="queryTypeItem in queryTypeV" :key="queryTypeItem.key">{{ queryTypeItem.label }}</a-select-option>
-                  </a-select>
-                </a-form-model-item>
-                <a-form-model-item v-if="dataMode.addOrEditForm" label="表单校验" prop="rule">
+                <a-form-model-item v-if="dataMode.addOrEditForm || dataMode.queryForm" label="表单校验" prop="rule">
                   <a-row :gutter="16">
                     <a-col v-if="(item.formType === 'input' || item.formType === 'textarea' ) && item.formType !=='file' && item.formType !=='image' " :span="12" >
                       <a-select v-model="item.rule.type" :getPopupContainer=" triggerNode => { return triggerNode.parentNode } " placeholder="校验类型">
@@ -628,7 +628,7 @@ export default {
     },
     itemHandle () {
       // 查询表单项或者新增/修改表单项
-      if (this.dataMode.queryForm || this.dataMode.addOrEditForm) {
+      if (this.dataMode.queryForm || this.dataMode.addOrEditForm || this.dataMode.sqlQueryCondition) {
         if (!this.dataMode.sqlQueryItem || !this.dataMode.addOrEditForm) {
           this.delKey(this.item, 'addOrEdit', 'silencePurpose', 'silenceSource')
         }

package/src/config/CreateQueryConfig.js

@@ -4,12 +4,12 @@ module.exports = {
     {
       label: '渲染查询表单项',
       value: 'queryForm',
-      noMatch: ['file', 'image', 'textarea', 'personSetting', 'checkbox']
+      noMatch: ['file', 'image', 'textarea', 'personSetting']
     },
     {
       label: '渲染表格列',
       value: 'table',
-      noMatch: ['file', 'image', 'personSetting', 'checkbox']
+      noMatch: ['file', 'image', 'personSetting']
     },
     {
       label: '渲染新增/修改表单项',
@@ -19,12 +19,12 @@ module.exports = {
     {
       label: 'SQL生成查询项',
       value: 'sqlQueryItem',
-      noMatch: ['file', 'personSetting', 'checkbox']
+      noMatch: ['file', 'personSetting']
     },
     {
       label: 'SQL生成查询表达式',
       value: 'sqlQueryCondition',
-      noMatch: ['file', 'image', 'textarea', 'personSetting', 'checkbox']
+      noMatch: ['file', 'image', 'textarea', 'personSetting']
     }
   ],
   // 表单类型
@@ -231,7 +231,7 @@ module.exports = {
     {
       label: '不包含[not in]',
       key: 'NOT_IN',
-      match: ['checkbox']
+      match: []
     },
     {
       label: '之间[between]',

package/src/router/guards.js

@@ -34,7 +34,7 @@ const loginGuard = (to, from, next, options) => {
     next({ path: '/login' })
   } else {
     const roles = store.getters['account/roles']
-    if (roles.length === 0 && to.path !== '/login') {
+    if (roles.length === 0 && !loginIgnore.includes(to)) {
       message.warning('登录已失效，请重新登录')
       logout().finally(res => {
         next({ path: '/login' })

package/src/utils/indexedDB.js

@@ -139,6 +139,9 @@ export const indexedDB = {
       }
       request.onsuccess = function (event) {
         console.log('已删除存储空间' + 'metaCache' + '中所有记录')
+        if (typeof callback === 'function') {
+          callback()
+        }
       }
     })
   }