vue2-client 1.2.1 → 1.2.4

package/docs/notice.md

@@ -2,9 +2,7 @@
 ## 引入各种文件时,必须写绝对路径, 不允许写相对路径
 ```js
 // 引自己项目时文件时,  @ 表示自己项目的src目录
-import('@/pages/safeguard/list/search/UserFiles')
-// 引入vue2-client项目文件时, @vue2-client: 表示@vue2-client下的src目录
-import { post } from '@vue2-client/services/api/restTools'
+import('@vue2-client/pages/system/queryParams')
 ```
 ## 编写vue文件的样式时, 必须使用less, 样式必须在最外层添加当前页面html的id, id与vue文件名相同
 ```vue

package/package.json

@@ -1,89 +1,89 @@
-{
-  "name": "vue2-client",
-  "version": "1.2.1",
-  "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.4",
+  "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

@@ -229,18 +229,9 @@
                 <a-col :span="8">
                   <a-form-model-item label="表单查询方式" prop="queryType" v-if="dataMode.queryForm && dataMode.sqlQueryCondition">
                     <a-select v-model="item.queryType" placeholder="表单查询方式，可选">
-                      <a-select-option key="=">相等(=)</a-select-option>
-                      <a-select-option key="!=">不相等(!=)</a-select-option>
-                      <a-select-option key="LIKE">全模糊(like)</a-select-option>
-                      <a-select-option key="LEFT_LIKE">左模糊(left like)</a-select-option>
-                      <a-select-option key="RIGHT_LIKE">右模糊(right like)</a-select-option>
-                      <a-select-option key=">">大于(>)</a-select-option>
-                      <a-select-option key=">=">大于等于(>=)</a-select-option>
-                      <a-select-option key="<">小于(<)</a-select-option>
-                      <a-select-option key="<=">小于等于(<=)</a-select-option>
-                      <a-select-option key="IN">包含(in)</a-select-option>
-                      <a-select-option key="NOT_IN">不包含(not in)</a-select-option>
-                      <a-select-option key="BETWEEN">之间(between)</a-select-option>
+                      <template v-for="queryTypeItem in queryTypeV">
+                        <a-select-option :key="queryTypeItem.key">{{ queryTypeItem.label }}</a-select-option>
+                      </template>
                     </a-select>
                   </a-form-model-item>
                 </a-col>
@@ -601,6 +592,7 @@ import XFormItem from '@vue2-client/base-client/components/common/XForm/XFormIte
 import XFormTable from '@vue2-client/base-client/components/common/XFormTable/XFormTable'
 import JsonViewer from 'vue-json-viewer'
 import FileSaver from 'file-saver'
+import { queryType } from '@/config/CreateQueryConfig'
 import { mapState } from 'vuex'
 import { post } from '@vue2-client/services/api/restTools'
 import { commonApi } from '@vue2-client/services/api/common'
@@ -690,6 +682,12 @@ export default {
   },
   computed: {
     ...mapState('setting', ['isMobile']),
+    queryTypeV () {
+      if (this.item.formType) {
+        return queryType.filter(item => item.match.includes(this.item.formType))
+      }
+      return queryType
+    },
     conditionJoinArray: function () {
       const result = []
       for (const item in this.form.joinArray) {

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

@@ -283,7 +283,9 @@ export default {
     },
     // 刷新加载表格数据
     loadData (requestParameters, callback) {
-      callback(query(requestParameters))
+      const result = query(requestParameters)
+      this.$emit('afterQuery', result)
+      callback(result)
     },
     // 详情按钮事件
     action (record, id) {

package/src/base-client/components/common/XFormTable/index.md

@@ -47,7 +47,7 @@ export default {
 | @action            | 表格详情列的单击事件              | event   | -     |
 | @afterSubmit       | 增删改提交后的回调方法             | event   | -     |
 | @afterSearchSubmit | 查询提交后的回调方法              | event   | -     |
-
+ | @afterQuery        | 表格查询后的回调方法              | event   | -     |
 ## 例子1
 ----
 （基础使用）