vue2-client 1.4.40 → 1.4.42

package/CHANGELOG.md

@@ -11,6 +11,8 @@
 - XFormTable可指定id进行修改操作
 - 查询表单日期改为区间
 - 日期选择器可设置时分秒
+- 修复表单校验错误不能提交的问题
+- 新增修改请求加入操作人信息
 
 **1.4.36 -2022-10-18 @江超**
 - 功能修改：

package/package.json

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

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 === '修改') {
         // 将更新需要的主键值加入到表单中