vue2-client 1.6.55-single → 1.6.56-single

package/CHANGELOG.md

@@ -1,6 +1,9 @@
 # Change Log
 > 所有关于本项目的变化都在该文档里。
 
+**1.6.56 -2023-08-07 @江超**
+- 优化XNativeForm
+
 **1.6.55 -2023-08-07 @江超**
 - 修复查询表单中日期范围框新增时的错误
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.6.55-single",
+  "version": "1.6.56-single",
   "private": false,
   "scripts": {
     "serve": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve",

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

@@ -56,6 +56,8 @@ export default {
       return {
         // 预览模式
         viewMode: false,
+        // 是否处理表单Key值
+        isHandleFormKey: true,
         // 是否展示
         isShow: false,
         // 内容加载是否完成
@@ -109,11 +111,12 @@ export default {
     },
     methods: {
       init (params) {
-        const { isShow = true, formItems, viewMode, isTableTemp, serviceName = 'af-system' } = params
+        const { isShow = true, formItems, viewMode, isHandleFormKey = true, isTableTemp, serviceName = 'af-system' } = params
         if (isShow) {
           this.isShow = true
           this.formItems = JSON.parse(JSON.stringify(formItems))
           this.viewMode = viewMode
+          this.isHandleFormKey = isHandleFormKey
           this.isTableTemp = isTableTemp
           this.serviceName = serviceName
         }
@@ -284,7 +287,11 @@ export default {
       },
       // 获取表单字段实际值
       getRealKey (key) {
-        return key.substring(key.indexOf('_') + 1)
+        if (this.isHandleFormKey) {
+          return key.substring(key.indexOf('_') + 1)
+        } else {
+          return key
+        }
       },
       /**
        * 获取被修改记录数据

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

@@ -1,279 +1,290 @@
-<template>
-  <div class="table-page-search-wrapper">
-    <a-form-model
-      v-if="loaded"
-      ref="selectForm"
-      :zIndex="1001"
-      :model="form"
-      :rules="rules">
-      <a-row :gutter="16">
-        <x-form-item
-          v-for="(item, index) in realJsonData"
-          :key="index"
-          :attr="item"
-          :disabled="itemDisabled(item)"
-          :files="files"
-          :form="form"
-          :images="images"
-          :service-name="serviceName"
-          mode="新增/修改"
-        />
-      </a-row>
-    </a-form-model>
-  </div>
-</template>
-<script>
-import XFormItem from '@vue2-client/base-client/components/common/XForm/XFormItem'
-import { formatDate } from '@vue2-client/utils/util'
-import { mapState } from 'vuex'
-import { post } from '@vue2-client/services/api'
-
-export default {
-    name: 'XAddNativeForm',
-    components: {
-      XFormItem
-    },
-    data () {
-      return {
-        // 内容加载是否完成
-        loaded: false,
-        // 表单Model
-        form: {},
-        // 修改有文件得表单时使用
-        files: [],
-        images: [],
-        // 校验
-        rules: {}
-      }
-    },
-    computed: {
-      // 过滤出用于新增/修改场景的表单项
-      realJsonData: function () {
-        return this.jsonData.filter(function (item) {
-          return item.addOrEdit && item.addOrEdit !== 'no' && item.addOrEdit !== 'silenceAdd' && item.addOrEdit !== 'version'
-        })
-      },
-      // 过滤出用于静默新增场景的表单项
-      silenceAddJsonData: function () {
-        return this.jsonData.filter(function (item) {
-          return item.addOrEdit === 'silenceAdd'
-        })
-      },
-      // 过滤出版本号表单项
-      versionJsonData: function () {
-        return this.jsonData.filter(function (item) {
-          return item.addOrEdit === 'version'
-        })
-      },
-      ...mapState('account', { currUser: 'user' })
-    },
-    props: {
-      jsonData: {
-        type: Array,
-        default: () => {
-          return []
-        }
-      },
-      serviceName: {
-        type: String,
-        default: 'af-system'
-      },
-      // 业务类型
-      businessType: {
-        type: String,
-        default: ''
-      },
-      // 修改操作前查询出的业务数据
-      modifyModelData: {
-        type: Object,
-        default: () => {
-          return {}
-        }
-      },
-      // 新增或修改业务是否执行中
-      loading: {
-        type: Boolean,
-        default: () => {
-          return false
-        }
-      },
-      // 固定新增表单
-      fixedAddForm: {
-        type: Object,
-        default: () => {
-          return {}
-        }
-      }
-    },
-    watch: {
-      visible (rel) {
-        if (rel) {
-          this.formItemLoad()
-        }
-      }
-    },
-    mounted () {
-      this.formItemLoad()
-    },
-    methods: {
-      formItemLoad () {
-        const formData = Object.assign({}, this.fixedAddForm)
-        for (let i = 0; i < this.realJsonData.length; i++) {
-          const item = this.realJsonData[i]
-          formData[item.model] = undefined
-          // 处理表单校验情况
-          if (item.rule) {
-            this.rules[item.model] = []
-            const required = item.rule.required ? item.rule.required === true || item.rule.required === 'true' : false
-            let trigger
-            let message
-            if (required) {
-              switch (item.type) {
-                case 'select':
-                case 'radio':
-                case 'treeSelect':
-                  message = '请选择' + item.name
-                  trigger = 'change'
-                  break
-                default:
-                  message = '请输入' + item.name
-                  trigger = 'blur'
-              }
-              this.rules[item.model].push({
-                required: true,
-                message: message,
-                trigger: trigger
-              })
-            }
-
-            switch (item.rule.type) {
-              case 'number':
-              case 'integer':
-              case 'float':
-                let defaultValue
-                let message
-                switch (item.rule.type) {
-                  case 'number':
-                    message = '数字'
-                    defaultValue = 0
-                    break
-                  case 'integer':
-                    message = '整数'
-                    defaultValue = 0
-                    break
-                  case 'float':
-                    message = '小数'
-                    defaultValue = 0.0
-                    break
-                }
-                this.rules[item.model].push({
-                  type: item.rule.type,
-                  message: item.name + '必须为' + message,
-                  transform: (value) => {
-                    if (value && value.length !== 0) {
-                      return Number(value)
-                    } else {
-                      return defaultValue
-                    }
-                  },
-                  trigger: 'blur'
-                })
-                break
-            }
-          }
-        }
-        this.form = formData
-        if (this.modifyModelData.data) {
-          this.files = this.modifyModelData.files
-          this.images = this.modifyModelData.images
-          if (Object.keys(this.modifyModelData.data).length > 0) {
-            this.getModifyModelData()
-          }
-        }
-        this.loaded = true
-      },
-      itemDisabled (value) {
-        return (this.businessType === '新增' && value.addOrEdit === 'edit') ||
-          (this.businessType === '修改' && value.addOrEdit === 'add')
-      },
-      async onSubmit () {
-        this.$refs.selectForm.validate(async valid => {
-          for (const key of Object.keys(this.form)) {
-            if (this.form[key] === null || this.form[key] === '') {
-              this.form[key] = undefined
-            }
-          }
-          const requestForm = Object.assign({}, this.form)
-          // 追加静默新增字段
-          if (this.businessType === '新增') {
-            for (const item of this.silenceAddJsonData) {
-              switch (item.silencePurpose) {
-                case 'createTime':
-                  requestForm[item.model] = formatDate('now')
-                  break
-                case 'operator':
-                  requestForm[item.model] = this.currUser.name
-                  break
-                case 'orgId':
-                  requestForm[item.model] = this.currUser.orgid
-                  break
-              }
-            }
-            // 通过请求追加静默新增：自定义字段
-            for (const item of this.silenceAddJsonData.filter((item) => item.silencePurpose === 'customize')) {
-              requestForm[item.model] = await this.getSilenceSource(item.silenceSource, requestForm)
-            }
-          }
-          const data = {
-            valid: valid,
-            form: requestForm
-          }
-          this.$emit('onSubmit', data)
-        })
-      },
-      /**
-       * 获取通过logic静默新增的字段
-       * @param logicName logic名称
-       * @param requestParameters 请求参数
-       */
-      async getSilenceSource (logicName, requestParameters) {
-        const result = await post('/api/' + this.serviceName + '/logic/' + logicName, requestParameters)
-        return result
-      },
-      /**
-       * 获取被修改记录数据
-       * @param modifyModelData 被修改记录的数据
-       */
-      getModifyModelData () {
-        for (let i = 0; i < this.realJsonData.length; i++) {
-          if (['FilesId', 'Images'].includes(this.realJsonData[i])) {
-            // 附件需要跳过 因为会通过 modifyModelData中的files,images属性给upload赋值
-            // 新增修改表单每次提交时只会提交最新添加的文件
-            continue
-          }
-          const item = this.realJsonData[i]
-          if (this.modifyModelData.data[item.model] || this.modifyModelData.data[item.model] === 0) {
-            if (this.modifyModelData.data[item.model] instanceof Array) {
-              this.form[item.model] = this.modifyModelData.data[item.model]
-            } else {
-              this.form[item.model] = this.modifyModelData.data[item.model] + ''
-            }
-          } else {
-            this.form[item.model] = undefined
-          }
-        }
-        // 追加版本号信息
-        for (const item of this.versionJsonData) {
-          if (!this.modifyModelData.data[item.model]) {
-            this.form[item.model] = 0
-          } else {
-            this.form[item.model] = this.modifyModelData.data[item.model] + ''
-          }
-        }
-      },
-      onClose () {
-        this.$emit('update:visible', false)
-      }
-    }
-  }
-</script>
+<template>
+  <a-form-model
+    v-if="loaded"
+    ref="selectForm"
+    :zIndex="1001"
+    :model="form"
+    :rules="rules">
+    <a-row :gutter="16">
+      <x-form-item
+        v-for="(item, index) in realJsonData"
+        :key="index"
+        :attr="item"
+        :disabled="itemDisabled(item)"
+        :files="files"
+        :form="form"
+        :images="images"
+        :service-name="serviceName"
+        mode="新增/修改"
+        :get-data-params="getDataParams"
+      />
+    </a-row>
+  </a-form-model>
+</template>
+<script>
+import XFormItem from '@vue2-client/base-client/components/common/XForm/XFormItem'
+import { formatDate } from '@vue2-client/utils/util'
+import { mapState } from 'vuex'
+import { post } from '@vue2-client/services/api'
+
+export default {
+    name: 'XAddNativeForm',
+    components: {
+      XFormItem
+    },
+    props: {
+      // 调用logic获取数据源的追加参数
+      getDataParams: {
+        type: Object,
+        default: undefined
+      }
+    },
+    data () {
+      return {
+        // 预览模式
+        viewMode: false,
+        // 是否处理表单Key值
+        isHandleFormKey: true,
+        // 内容加载是否完成
+        loaded: false,
+        // 业务类型
+        businessType: '',
+        // 业务标题
+        title: '',
+        // 新增或修改业务是否执行中
+        loading: false,
+        // 表单Model
+        form: {},
+        // 表单项集合
+        formItems: [],
+        // 服务名称
+        serviceName: 'af-system',
+        // 修改有文件的表单时使用
+        files: [],
+        images: [],
+        // 校验
+        rules: {}
+      }
+    },
+    computed: {
+      businessTitle () {
+        return this.businessType + this.title
+      },
+      // 过滤出用于新增/修改场景的表单项
+      realJsonData: function () {
+        return this.formItems.filter((item) => {
+          return item.addOrEdit && item.addOrEdit !== 'no' && item.addOrEdit !== 'silenceAdd' && item.addOrEdit !== 'version' && !this.itemDisabled(item)
+        })
+      },
+      // 过滤出用于静默新增场景的表单项
+      silenceAddJsonData: function () {
+        return this.formItems.filter(function (item) {
+          return item.addOrEdit === 'silenceAdd'
+        })
+      },
+      // 过滤出版本号表单项
+      versionJsonData: function () {
+        return this.formItems.filter(function (item) {
+          return item.addOrEdit === 'version'
+        })
+      },
+      ...mapState('account', { currUser: 'user' })
+    },
+    methods: {
+      init (params) {
+        const {
+          formItems, viewMode, isHandleFormKey = true, serviceName = 'af-system', modifyModelData = {}, businessType, title, fixedAddForm = {}
+        } = params
+        this.loaded = false
+        this.formItems = JSON.parse(JSON.stringify(formItems))
+        this.viewMode = viewMode
+        this.isHandleFormKey = isHandleFormKey
+        this.serviceName = serviceName
+        this.businessType = businessType
+        this.title = title
+        // 设置表单相关参数
+        const formData = Object.assign({}, fixedAddForm)
+        for (let i = 0; i < this.realJsonData.length; i++) {
+          const item = this.realJsonData[i]
+          formData[item.model] = undefined
+          // 处理表单校验情况
+          if (item.rule) {
+            this.rules[item.model] = []
+            const required = item.rule.required ? item.rule.required === true || item.rule.required === 'true' : false
+            let trigger
+            let message
+            if (required) {
+              switch (item.type) {
+                case 'select':
+                case 'radio':
+                case 'treeSelect':
+                  message = '请选择' + item.name
+                  trigger = 'change'
+                  break
+                default:
+                  message = '请输入' + item.name
+                  trigger = 'blur'
+              }
+              this.rules[item.model].push({
+                required: true,
+                message: message,
+                trigger: trigger
+              })
+            }
+
+            switch (item.rule.type) {
+              case 'number':
+              case 'integer':
+              case 'float':
+                let defaultValue
+                let message
+                switch (item.rule.type) {
+                  case 'number':
+                    message = '数字'
+                    defaultValue = 0
+                    break
+                  case 'integer':
+                    message = '整数'
+                    defaultValue = 0
+                    break
+                  case 'float':
+                    message = '小数'
+                    defaultValue = 0.0
+                    break
+                }
+                this.rules[item.model].push({
+                  type: item.rule.type,
+                  message: item.name + '必须为' + message,
+                  transform: (value) => {
+                    if (value && value.length !== 0) {
+                      return Number(value)
+                    } else {
+                      return defaultValue
+                    }
+                  },
+                  trigger: 'blur'
+                })
+                break
+            }
+          }
+        }
+        this.form = formData
+        if (modifyModelData && modifyModelData.data) {
+          this.files = modifyModelData.files
+          this.images = modifyModelData.images
+          if (Object.keys(modifyModelData.data).length > 0) {
+            this.getModifyModelData(modifyModelData)
+          }
+        }
+        this.loaded = true
+      },
+      itemDisabled (value) {
+        return (this.businessType === '新增' && value.addOrEdit === 'edit') ||
+          (this.businessType === '修改' && value.addOrEdit === 'add')
+      },
+      async onSubmit () {
+        this.$refs.selectForm.validate(async valid => {
+          // 验证未通过直接返回
+          if (!valid) {
+            return false
+          }
+          if (this.viewMode) {
+            this.$message.info('预览模式禁止新增和修改')
+            return false
+          }
+          this.loading = true
+          for (const key of Object.keys(this.form)) {
+            if (this.form[key] === null || this.form[key] === '') {
+              this.form[key] = undefined
+            }
+          }
+          const requestForm = Object.assign({}, this.form)
+          // 追加静默新增字段
+          if (this.businessType === '新增') {
+            for (const item of this.silenceAddJsonData) {
+              switch (item.silencePurpose) {
+                case 'createTime':
+                  requestForm[item.model] = formatDate('now')
+                  break
+                case 'operator':
+                  requestForm[item.model] = this.currUser.name
+                  break
+                case 'orgId':
+                  requestForm[item.model] = this.currUser.orgid
+                  break
+              }
+            }
+            // 通过请求追加静默新增：自定义字段
+            for (const item of this.silenceAddJsonData.filter((item) => item.silencePurpose === 'customize')) {
+              requestForm[item.model] = await this.getSilenceSource(item.silenceSource, requestForm)
+            }
+          }
+          // 处理表单键问题
+          const realForm = {}
+          for (const key of Object.keys(requestForm)) {
+            const realKey = this.getRealKey(key)
+            realForm[realKey] = requestForm[key]
+          }
+          // 交由父级处理
+          this.$emit('onSubmit', {
+            businessType: this.businessType,
+            serviceName: this.serviceName,
+            realForm: realForm,
+            currUserName: this.currUser.name
+          }, () => {})
+        })
+      },
+      /**
+       * 获取通过logic静默新增的字段
+       * @param logicName logic名称
+       * @param requestParameters 请求参数
+       */
+      async getSilenceSource (logicName, requestParameters) {
+        const result = await post('/api/' + this.serviceName + '/logic/' + logicName, requestParameters)
+        return result
+      },
+      // 获取表单字段实际值
+      getRealKey (key) {
+        if (this.isHandleFormKey) {
+          return key.substring(key.indexOf('_') + 1)
+        } else {
+          return key
+        }
+      },
+      /**
+       * 获取被修改记录数据
+       * @param modifyModelData 被修改记录的数据
+       */
+      getModifyModelData (modifyModelData) {
+        if (modifyModelData.primaryKeyData) {
+          this.form = Object.assign(this.form, modifyModelData.primaryKeyData)
+        }
+        for (let i = 0; i < this.realJsonData.length; i++) {
+          if (['FilesId', 'Images'].includes(this.realJsonData[i])) {
+            // 附件需要跳过 因为会通过 modifyModelData中的files,images属性给upload赋值
+            // 新增修改表单每次提交时只会提交最新添加的文件
+            continue
+          }
+          const item = this.realJsonData[i]
+          if (modifyModelData.data[item.model] || modifyModelData.data[item.model] === 0) {
+            if (modifyModelData.data[item.model] instanceof Array) {
+              this.form[item.model] = modifyModelData.data[item.model]
+            } else {
+              this.form[item.model] = modifyModelData.data[item.model] + ''
+            }
+          } else {
+            this.form[item.model] = undefined
+          }
+        }
+        // 追加版本号信息
+        for (const item of this.versionJsonData) {
+          if (!modifyModelData.data[item.model]) {
+            this.form[item.model] = 0
+          } else {
+            this.form[item.model] = modifyModelData.data[item.model] + ''
+          }
+        }
+      }
+    }
+  }
+</script>