vue2-client 1.4.41 → 1.4.43

package/CHANGELOG.md

@@ -1,7 +1,7 @@
 # Change Log
 > 所有关于本项目的变化都在该文档里。
 
-**1.4.37 - 1.4.40 -2022-10-28 @苗艳强**
+**1.4.37 - 1.4.43 -2022-10-28 @苗艳强**
 - 功能修改：
 - 新增文件列表展示组件
 - 新增图片列表展示组件
@@ -11,6 +11,8 @@
 - XFormTable可指定id进行修改操作
 - 查询表单日期改为区间
 - 日期选择器可设置时分秒
+- 修复表单校验错误不能提交的问题
+- 新增修改请求加入操作人信息
 
 **1.4.36 -2022-10-18 @江超**
 - 功能修改：

package/package.json

@@ -1,78 +1,78 @@
-{
-  "name": "vue2-client",
-  "version": "1.4.41",
-  "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",
-    "build:preview": "vue-cli-service build --mode preview",
-    "lint:nofix": "vue-cli-service lint --no-fix"
-  },
-  "dependencies": {
-    "@amap/amap-jsapi-loader": "^1.0.1",
-    "@antv/g2plot": "^2.4.20",
-    "lodash.get": "^4.4.2",
-    "js-base64": "^3.7.2",
-    "jsencrypt": "^3.2.1",
-    "vue-json-viewer": "^2.2.22",
-    "xlsx": "0.18.5",
-    "file-saver": "^2.0.5",
-    "@vue/babel-preset-jsx": "^1.4.0",
-    "@antv/data-set": "^0.11.8",
-    "animate.css": "^4.1.1",
-    "ant-design-vue": "^1.7.8",
-    "axios": "^0.27.2",
-    "clipboard": "^2.0.11",
-    "core-js": "^3.23.5",
-    "date-fns": "^2.28.0",
-    "default-passive-events": "^2.0.0",
-    "enquire.js": "^2.1.6",
-    "highlight.js": "^10.7.3",
-    "js-cookie": "^2.2.1",
-    "mockjs": "^1.1.0",
-    "nprogress": "^0.2.0",
-    "viser-vue": "^2.4.8",
-    "vue": "2.6.14",
-    "vue-i18n": "^8.27.2",
-    "vue-router": "^3.5.4",
-    "vuedraggable": "^2.24.3",
-    "vuex": "^3.6.2"
-  },
-  "devDependencies": {
-    "script-loader": "^0.7.2",
-    "@ant-design/colors": "^6.0.0",
-    "@babel/core": "^7.18.10",
-    "@vue/cli-plugin-babel": "^4.5.19",
-    "@vue/cli-plugin-eslint": "^4.5.19",
-    "@vue/cli-service": "^4.5.19",
-    "@vue/eslint-config-standard": "^4.0.0",
-    "@vuepress/plugin-back-to-top": "^1.9.7",
-    "babel-eslint": "^10.1.0",
-    "babel-plugin-transform-remove-console": "^6.9.4",
-    "babel-polyfill": "^6.26.0",
-    "compression-webpack-plugin": "^4.0.1",
-    "deepmerge": "^4.2.2",
-    "eslint": "^6.8.0",
-    "eslint-plugin-import": "^2.26.0",
-    "eslint-plugin-node": "^11.1.0",
-    "eslint-plugin-vue": "^6.2.2",
-    "eslint-plugin-promise": "^4.3.1",
-    "eslint-plugin-standard": "^4.1.0",
-    "fast-deep-equal": "^3.1.3",
-    "less-loader": "^6.2.0",
-    "style-resources-loader": "^1.5.0",
-    "vue-cli-plugin-style-resources-loader": "^0.1.5",
-    "vue-template-compiler": "2.6.14",
-    "vuepress": "^1.9.7",
-    "webpack": "^4.46.0",
-    "webpack-theme-color-replacer": "1.4.1",
-    "whatwg-fetch": "^3.6.2"
-  },
-  "browserslist": [
-    "> 1%",
-    "last 2 versions",
-    "not ie <= 10"
-  ]
-}
+{
+  "name": "vue2-client",
+  "version": "1.4.43",
+  "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",
+    "build:preview": "vue-cli-service build --mode preview",
+    "lint:nofix": "vue-cli-service lint --no-fix"
+  },
+  "dependencies": {
+    "@amap/amap-jsapi-loader": "^1.0.1",
+    "@antv/g2plot": "^2.4.20",
+    "lodash.get": "^4.4.2",
+    "js-base64": "^3.7.2",
+    "jsencrypt": "^3.2.1",
+    "vue-json-viewer": "^2.2.22",
+    "xlsx": "0.18.5",
+    "file-saver": "^2.0.5",
+    "@vue/babel-preset-jsx": "^1.4.0",
+    "@antv/data-set": "^0.11.8",
+    "animate.css": "^4.1.1",
+    "ant-design-vue": "^1.7.8",
+    "axios": "^0.27.2",
+    "clipboard": "^2.0.11",
+    "core-js": "^3.23.5",
+    "date-fns": "^2.28.0",
+    "default-passive-events": "^2.0.0",
+    "enquire.js": "^2.1.6",
+    "highlight.js": "^10.7.3",
+    "js-cookie": "^2.2.1",
+    "mockjs": "^1.1.0",
+    "nprogress": "^0.2.0",
+    "viser-vue": "^2.4.8",
+    "vue": "2.6.14",
+    "vue-i18n": "^8.27.2",
+    "vue-router": "^3.5.4",
+    "vuedraggable": "^2.24.3",
+    "vuex": "^3.6.2"
+  },
+  "devDependencies": {
+    "script-loader": "^0.7.2",
+    "@ant-design/colors": "^6.0.0",
+    "@babel/core": "^7.18.10",
+    "@vue/cli-plugin-babel": "^4.5.19",
+    "@vue/cli-plugin-eslint": "^4.5.19",
+    "@vue/cli-service": "^4.5.19",
+    "@vue/eslint-config-standard": "^4.0.0",
+    "@vuepress/plugin-back-to-top": "^1.9.7",
+    "babel-eslint": "^10.1.0",
+    "babel-plugin-transform-remove-console": "^6.9.4",
+    "babel-polyfill": "^6.26.0",
+    "compression-webpack-plugin": "^4.0.1",
+    "deepmerge": "^4.2.2",
+    "eslint": "^6.8.0",
+    "eslint-plugin-import": "^2.26.0",
+    "eslint-plugin-node": "^11.1.0",
+    "eslint-plugin-vue": "^6.2.2",
+    "eslint-plugin-promise": "^4.3.1",
+    "eslint-plugin-standard": "^4.1.0",
+    "fast-deep-equal": "^3.1.3",
+    "less-loader": "^6.2.0",
+    "style-resources-loader": "^1.5.0",
+    "vue-cli-plugin-style-resources-loader": "^0.1.5",
+    "vue-template-compiler": "2.6.14",
+    "vuepress": "^1.9.7",
+    "webpack": "^4.46.0",
+    "webpack-theme-color-replacer": "1.4.1",
+    "whatwg-fetch": "^3.6.2"
+  },
+  "browserslist": [
+    "> 1%",
+    "last 2 versions",
+    "not ie <= 10"
+  ]
+}

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

@@ -72,8 +72,8 @@ export default {
     computed: {
       // 过滤出用于新增/修改场景的表单项
       realJsonData: function () {
-        return this.jsonData.filter(function (item) {
-          return item.addOrEdit && item.addOrEdit !== 'no' && item.addOrEdit !== 'silenceAdd' && item.addOrEdit !== 'version'
+        return this.jsonData.filter((item) => {
+          return item.addOrEdit && item.addOrEdit !== 'no' && item.addOrEdit !== 'silenceAdd' && item.addOrEdit !== 'version' && !this.itemDisabled(item)
         })
       },
       // 过滤出用于静默新增场景的表单项

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

@@ -149,6 +149,7 @@ export default {
     }
   },
   computed: {
+    ...mapState('account', { currUser: 'user' }),
     ...mapState('setting', ['isMobile']),
     businessTitle () {
       return this.businessType + this.title
@@ -302,7 +303,8 @@ export default {
       const requestParameters = {
         queryParamsName: this.queryParamsName,
         form: {},
-        businessType: this.businessType
+        businessType: this.businessType,
+        operator: this.currUser.name
       }
       if (this.businessType === '修改') {
         // 将更新需要的主键值加入到表单中