vue2-client 1.2.6 → 1.2.9

package/CHANGELOG.md

@@ -0,0 +1,24 @@
+# Change Log
+> 所有关于本项目的变化都在该文档里。
+
+**##1.2.9 -2022-03-24 @江超**
+- 功能新增：
+- [查询配置生成]：下拉框表单选择业务逻辑作为数据源时，可以选择数据源加载方式
+- [XFormItem]：当数据源加载方式为懒加载搜索时，将渲染一个可以根据关键词实时查询的选择框
+- 问题修复：
+- [查询配置生成]：修复修改已有查询配置时，显示状态不一致的问题
+- [指令详情页]：修复操作记录查询报错的问题
+
+**##1.2.8 -2022-03-24 @江超**
+- 问题修复：
+- [登录页面]：修复登录后欢迎提示出现undefined的问题
+- [查询配置生成]：修复修改表单查询方式下拉框报错的问题
+
+**##1.2.7 -2022-03-24 @江超**
+- 功能新增：
+- [系统设置]：新增 [工单提交] 功能（submitTicket），用户在操作业务时如发现系统异常，可使用该功能反馈问题
+- [登录页面]：登陆人部门为 [用户工单登记] 时会直接跳转到[工单提交]页面（在基于新架构的营收全面使用时，会取消该限制，并将[工单提交]作为常驻功能）
+
+**##1.0.0 - 1.2.6 -2022-03-23 @陈栋扬**
+- 初始化：
+- 公共组件和配置抽取完成

package/package.json

@@ -1,89 +1,89 @@
-{
-  "name": "vue2-client",
-  "version": "1.2.6",
-  "private": false,
-  "scripts": {
-    "serve": "vue-cli-service serve",
-    "build": "vue-cli-service build",
-    "test:unit": "vue-cli-service test:unit",
-    "lint": "vue-cli-service lint"
-  },
-  "dependencies": {
-    "@antv/data-set": "^0.11.4",
-    "@antv/f2": "^3.6.4",
-    "@antv/g2plot": "^2.3.33",
-    "@logicflow/core": "^1.1.7",
-    "@logicflow/extension": "^1.1.7",
-    "@vue/babel-helper-vue-jsx-merge-props": "^1.2.1",
-    "@vue/babel-preset-jsx": "^1.2.4",
-    "animate.css": "^4.1.0",
-    "ant-design-vue": "1.7.8",
-    "axios": "^0.19.2",
-    "clipboard": "^2.0.6",
-    "core-js": "^3.6.5",
-    "date-fns": "^2.14.0",
-    "default-passive-events": "^2.0.0",
-    "enquire.js": "^2.1.6",
-    "file-saver": "^2.0.5",
-    "highlight.js": "^10.2.1",
-    "js-cookie": "^2.2.1",
-    "jsencrypt": "^3.0.0-rc.1",
-    "lodash.get": "^4.4.2",
-    "mockjs": "^1.1.0",
-    "nprogress": "^0.2.0",
-    "viser-vue": "^2.4.8",
-    "vue": "^2.6.11",
-    "vue-i18n": "^8.18.2",
-    "vue-json-viewer": "^2.2.15",
-    "vue-router": "^3.3.4",
-    "vuedraggable": "^2.23.2",
-    "vuex": "^3.4.0",
-    "xlsx": "0.17.5"
-  },
-  "devDependencies": {
-    "@ant-design/colors": "^4.0.1",
-    "@vue/cli-plugin-babel": "^4.4.0",
-    "@vue/cli-plugin-eslint": "^4.4.0",
-    "@vue/cli-plugin-router": "^4.4.0",
-    "@vue/cli-plugin-unit-jest": "~5.0.0",
-    "@vue/cli-plugin-vuex": "^4.4.0",
-    "@vue/cli-service": "^4.4.0",
-    "@vue/eslint-config-standard": "^4.0.0",
-    "@vue/test-utils": "^1.1.3",
-    "@vue/vue2-jest": "^27.0.0-alpha.2",
-    "@vuepress/plugin-back-to-top": "^1.5.2",
-    "babel-eslint": "^10.1.0",
-    "babel-jest": "^27.0.6",
-    "babel-plugin-transform-remove-console": "^6.9.4",
-    "babel-polyfill": "^6.26.0",
-    "compression-webpack-plugin": "^2.0.0",
-    "deepmerge": "^4.2.2",
-    "echarts": "^4.9.0",
-    "eslint": "^6.7.2",
-    "eslint-plugin-import": "^2.25.3",
-    "eslint-plugin-node": "^11.1.0",
-    "eslint-plugin-standard": "^5.0.0",
-    "eslint-plugin-vue": "^6.2.2",
-    "fast-deep-equal": "^3.1.3",
-    "gh-pages": "^3.1.0",
-    "jest": "^27.0.5",
-    "less-loader": "^6.1.1",
-    "react-bmap": "^1.0.121",
-    "script-loader": "^0.7.2",
-    "style-resources-loader": "^1.3.2",
-    "vue-amap": "^0.5.10",
-    "vue-baidu-map": "^0.21.22",
-    "vue-bmap-gl": "0.0.29",
-    "vue-cli-plugin-style-resources-loader": "^0.1.4",
-    "vue-mapvgl": "0.0.28",
-    "vue-template-compiler": "^2.6.11",
-    "vuepress": "^1.5.2",
-    "webpack-theme-color-replacer": "1.3.18",
-    "whatwg-fetch": "^3.0.0"
-  },
-  "browserslist": [
-    "> 1%",
-    "last 2 versions",
-    "not ie <= 10"
-  ]
-}
+{
+  "name": "vue2-client",
+  "version": "1.2.9",
+  "private": false,
+  "scripts": {
+    "serve": "vue-cli-service serve",
+    "build": "vue-cli-service build",
+    "test:unit": "vue-cli-service test:unit",
+    "lint": "vue-cli-service lint"
+  },
+  "dependencies": {
+    "@antv/data-set": "^0.11.4",
+    "@antv/f2": "^3.6.4",
+    "@antv/g2plot": "^2.3.33",
+    "@logicflow/core": "^1.1.7",
+    "@logicflow/extension": "^1.1.7",
+    "@vue/babel-helper-vue-jsx-merge-props": "^1.2.1",
+    "@vue/babel-preset-jsx": "^1.2.4",
+    "animate.css": "^4.1.0",
+    "ant-design-vue": "1.7.8",
+    "axios": "^0.19.2",
+    "clipboard": "^2.0.6",
+    "core-js": "^3.6.5",
+    "date-fns": "^2.14.0",
+    "default-passive-events": "^2.0.0",
+    "enquire.js": "^2.1.6",
+    "file-saver": "^2.0.5",
+    "highlight.js": "^10.2.1",
+    "js-cookie": "^2.2.1",
+    "jsencrypt": "^3.0.0-rc.1",
+    "lodash.get": "^4.4.2",
+    "mockjs": "^1.1.0",
+    "nprogress": "^0.2.0",
+    "viser-vue": "^2.4.8",
+    "vue": "^2.6.11",
+    "vue-i18n": "^8.18.2",
+    "vue-json-viewer": "^2.2.15",
+    "vue-router": "^3.3.4",
+    "vuedraggable": "^2.23.2",
+    "vuex": "^3.4.0",
+    "xlsx": "0.17.5"
+  },
+  "devDependencies": {
+    "@ant-design/colors": "^4.0.1",
+    "@vue/cli-plugin-babel": "^4.4.0",
+    "@vue/cli-plugin-eslint": "^4.4.0",
+    "@vue/cli-plugin-router": "^4.4.0",
+    "@vue/cli-plugin-unit-jest": "~5.0.0",
+    "@vue/cli-plugin-vuex": "^4.4.0",
+    "@vue/cli-service": "^4.4.0",
+    "@vue/eslint-config-standard": "^4.0.0",
+    "@vue/test-utils": "^1.1.3",
+    "@vue/vue2-jest": "^27.0.0-alpha.2",
+    "@vuepress/plugin-back-to-top": "^1.5.2",
+    "babel-eslint": "^10.1.0",
+    "babel-jest": "^27.0.6",
+    "babel-plugin-transform-remove-console": "^6.9.4",
+    "babel-polyfill": "^6.26.0",
+    "compression-webpack-plugin": "^2.0.0",
+    "deepmerge": "^4.2.2",
+    "echarts": "^4.9.0",
+    "eslint": "^6.7.2",
+    "eslint-plugin-import": "^2.25.3",
+    "eslint-plugin-node": "^11.1.0",
+    "eslint-plugin-standard": "^5.0.0",
+    "eslint-plugin-vue": "^6.2.2",
+    "fast-deep-equal": "^3.1.3",
+    "gh-pages": "^3.1.0",
+    "jest": "^27.0.5",
+    "less-loader": "^6.1.1",
+    "react-bmap": "^1.0.121",
+    "script-loader": "^0.7.2",
+    "style-resources-loader": "^1.3.2",
+    "vue-amap": "^0.5.10",
+    "vue-baidu-map": "^0.21.22",
+    "vue-bmap-gl": "0.0.29",
+    "vue-cli-plugin-style-resources-loader": "^0.1.4",
+    "vue-mapvgl": "0.0.28",
+    "vue-template-compiler": "^2.6.11",
+    "vuepress": "^1.5.2",
+    "webpack-theme-color-replacer": "1.3.18",
+    "whatwg-fetch": "^3.0.0"
+  },
+  "browserslist": [
+    "> 1%",
+    "last 2 versions",
+    "not ie <= 10"
+  ]
+}

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

@@ -314,7 +314,7 @@
                       <a-popover slot="suffix" title="关于组别内顺序" placement="bottom">
                         <template slot="content">
                           <p>多个下拉框为一组时,按照此顺序判断页面如何展示以及下拉框得父子顺序</p>
-                          <p>只有顺序为1得数据字段才可以选择数据源类型</p>
+                          <p>只有顺序为1的数据字段才可以选择数据源类型</p>
                         </template>
                         <a-icon type="info-circle" style="color: rgba(0,0,0,.45)" />
                       </a-popover>
@@ -397,6 +397,20 @@
                   </a-form-model-item>
                 </a-col>
               </a-row>
+              <a-form-model-item label="数据源加载方式" prop="selectLoadType" v-if="item.formType === 'select' && item.selectType === 'logic'">
+                <a-row :guttor="16">
+                  <a-col :span="8">
+                    <a-radio-group v-model="item.lazyLoad" default-value="false" button-style="solid">
+                      <a-radio-button value="true">
+                        懒加载搜索
+                      </a-radio-button>
+                      <a-radio-button value="false">
+                        一次性加载
+                      </a-radio-button>
+                    </a-radio-group>
+                  </a-col>
+                </a-row>
+              </a-form-model-item>
               <a-form-model-item label="表单校验类型" prop="rule">
                 <a-row :gutter="16">
                   <a-col :span="8" v-if="item.formType === 'input' || item.formType === 'textarea'">
@@ -420,7 +434,7 @@
                     </a-select>
                   </a-col>
                   <a-col :span="8">
-                    <a-radio-group v-model="item.rule.required" default-value="true" button-style="solid">
+                    <a-radio-group v-model="item.rule.required" default-value="false" button-style="solid">
                       <a-radio-button value="true">
                         必选项
                       </a-radio-button>
@@ -648,7 +662,9 @@ export default {
         key: '',
         title: '',
         slot: {},
-        rule: {},
+        rule: {
+          required: 'false'
+        },
         dataModeArray: []
       },
       itemMap: {},
@@ -804,11 +820,16 @@ export default {
           // 必选项兼容处理
           if (columnItem.rule && !isNaN(columnItem.rule.required)) {
             columnItem.rule.required = columnItem.rule.required.toString()
+          } else {
+            if (!columnItem.rule) {
+              columnItem.rule = {}
+            }
+            columnItem.rule.required = 'false'
           }
           // 下拉框数据源兼容处理
           if ((columnItem.formType === 'select' || columnItem.formType === 'cascader') && columnItem.selectKey) {
             // 数据源为logic
-            if (columnItem.selectKey instanceof String && columnItem.selectKey.startsWith('logic@')) {
+            if (columnItem.selectKey.toString().startsWith('logic@')) {
               columnItem.selectType = 'logic'
             } else if (columnItem.selectKey instanceof Array || this.isJSON(columnItem.selectKey)) {
               // 数据源为固定json集合
@@ -824,7 +845,9 @@ export default {
             key: '',
             title: '',
             slot: {},
-            rule: {},
+            rule: {
+              required: 'false'
+            },
             dataModeArray: []
           }, columnItem)
         }
@@ -836,6 +859,8 @@ export default {
               this.buttonStateData.push(buttonStateKey)
             }
           }
+        } else {
+          this.buttonStateData = ['add', 'edit', 'delete', 'export']
         }
       }
     }
@@ -968,14 +993,10 @@ export default {
           delete item.formType
         }
         // 校验类型
-        if (!item.rule.type) {
-          delete item.rule
+        if (item.rule.required) {
+          item.rule.required = item.rule.required.toString() === 'true'
         } else {
-          if (item.rule.required) {
-            item.rule.required = item.rule.required.toString() === 'true'
-          } else {
-            item.rule.required = true
-          }
+          item.rule.required = false
         }
         // 下拉框
         if ((item.formType === 'select' || (item.formType === 'selects' && item.groupIndex == '1') || item.formType === 'cascader') && item.selectKey) {
@@ -1056,7 +1077,9 @@ export default {
         key: '',
         title: '',
         slot: {},
-        rule: {},
+        rule: {
+          required: 'false'
+        },
         dataModeArray: []
       }
       this.$message.success('增加成功')
@@ -1130,7 +1153,9 @@ export default {
           key: '',
           title: '',
           slot: {},
-          rule: {},
+          rule: {
+            required: 'false'
+          },
           dataModeArray: []
         }
         this.dataModeArrayData = ['queryForm', 'table', 'addOrEditForm', 'sqlQueryItem', 'sqlQueryCondition']