vue2-client 1.6.59-single → 1.6.61-single

package/CHANGELOG.md

@@ -1,6 +1,12 @@
 # Change Log
 > 所有关于本项目的变化都在该文档里。
 
+**1.6.61 -2023-08-09 @江超**
+- XAddNativeForm支持动态简易表单集合了
+
+**1.6.60 -2023-08-08 @江超**
+- XTable优化编辑数据的方法
+
 **1.6.59 -2023-08-08 @江超**
 - XTable增加按钮组左侧扩展操作slot
 

package/package.json

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

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

@@ -19,6 +19,22 @@
         :get-data-params="getDataParams"
       />
     </a-row>
+    <a-row :gutter="16" v-for="(item, key) in simpleFormJsonData" :key="'row' + key">
+      <a-card :title="item.name" :bordered="false" size="small">
+        <x-form-item
+          v-for="(formItem, formItemIndex) in item.value"
+          :key="key + formItemIndex"
+          :attr="formItem"
+          :disabled="itemDisabled(formItem)"
+          :files="files"
+          :form="form"
+          :images="images"
+          :service-name="serviceName"
+          mode="新增/修改"
+          :get-data-params="getDataParams"
+        />
+      </a-card>
+    </a-row>
   </a-form-model>
 </template>
 <script>
@@ -28,283 +44,322 @@ import { mapState } from 'vuex'
 import { post } from '@vue2-client/services/api'
 
 export default {
-    name: 'XAddNativeForm',
-    components: {
-      XFormItem
+  name: 'XAddNativeForm',
+  components: {
+    XFormItem
+  },
+  props: {
+  },
+  data () {
+    return {
+      // 预览模式
+      viewMode: false,
+      // 是否处理表单Key值
+      isHandleFormKey: true,
+      // 内容加载是否完成
+      loaded: false,
+      // 业务类型
+      businessType: '',
+      // 业务标题
+      title: '',
+      // 新增或修改业务是否执行中
+      loading: false,
+      // 表单Model
+      form: {},
+      // 表单项集合
+      formItems: [],
+      // 服务名称
+      serviceName: 'af-system',
+      // 修改有文件的表单时使用
+      files: [],
+      images: [],
+      // 校验
+      rules: {},
+      // 调用logic获取数据源的追加参数
+      getDataParams: {},
+      // 是否为临时表
+      isTableTemp: false,
+      // 动态简易表单集合
+      simpleFormJsonData: {}
+    }
+  },
+  computed: {
+    businessTitle () {
+      return this.businessType + this.title
     },
-    props: {
+    // 过滤出用于新增/修改场景的表单项
+    realJsonData: function () {
+      return this.formItems.filter((item) => {
+        return item.addOrEdit && item.addOrEdit !== 'no' && item.addOrEdit !== 'silenceAdd' && item.addOrEdit !== 'version' && !this.itemDisabled(item)
+      })
     },
-    data () {
-      return {
-        // 预览模式
-        viewMode: false,
-        // 是否处理表单Key值
-        isHandleFormKey: true,
-        // 内容加载是否完成
-        loaded: false,
-        // 业务类型
-        businessType: '',
-        // 业务标题
-        title: '',
-        // 新增或修改业务是否执行中
-        loading: false,
-        // 表单Model
-        form: {},
-        // 表单项集合
-        formItems: [],
-        // 服务名称
-        serviceName: 'af-system',
-        // 修改有文件的表单时使用
-        files: [],
-        images: [],
-        // 校验
-        rules: {},
-        // 调用logic获取数据源的追加参数
-        getDataParams: {},
-        // 是否为临时表
-        isTableTemp: false,
-      }
+    // 过滤出用于静默新增场景的表单项
+    silenceAddJsonData: function () {
+      return this.formItems.filter(function (item) {
+        return item.addOrEdit === 'silenceAdd'
+      })
     },
-    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' })
+    // 过滤出版本号表单项
+    versionJsonData: function () {
+      return this.formItems.filter(function (item) {
+        return item.addOrEdit === 'version'
+      })
     },
-    methods: {
-      init (params) {
-        const {
-          formItems, viewMode, isHandleFormKey = true, serviceName = 'af-system', isTableTemp = false, modifyModelData = {}, businessType, title, fixedAddForm = {}, getDataParams = {}
-        } = 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
-        this.getDataParams = getDataParams
-        this.isTableTemp = isTableTemp
-        // 设置表单相关参数
-        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 'checkbox':
-                case 'radio':
-                case 'treeSelect':
-                case 'rangePicker':
-                case 'monthPicker':
-                case 'yearPicker':
-                case 'datePicker':
-                case 'file':
-                case 'image':
-                case 'citySelect':
-                case 'addressSearch':
-                case 'personSetting':
-                  message = '请选择' + item.name
-                  trigger = 'change'
-                  break
-                default:
-                  message = '请输入' + item.name
-                  trigger = 'blur'
-              }
-              this.rules[item.model].push({
-                required: true,
-                message: message,
-                trigger: trigger
-              })
-            }
+    ...mapState('account', { currUser: 'user' })
+  },
+  methods: {
+    init (params) {
+      const {
+        formItems, viewMode, isHandleFormKey = true, serviceName = 'af-system', isTableTemp = false, modifyModelData = {}, businessType, title, fixedAddForm = {}, getDataParams = {}, simpleFormJsonData = {}
+      } = 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
+      this.getDataParams = getDataParams
+      this.simpleFormJsonData = simpleFormJsonData
+      this.isTableTemp = isTableTemp
+      // 设置普通表单项的相关参数
+      const formData = Object.assign({}, fixedAddForm)
+      for (let i = 0; i < this.realJsonData.length; i++) {
+        const item = this.realJsonData[i]
+        this.setFormProps(formData, item)
+      }
+      // 设置动态简易表单项的相关参数
+      for (const key in this.simpleFormJsonData) {
+        for (const item of this.simpleFormJsonData[key].value) {
+          item.model = key + '@' + item.model
+          this.setFormProps(formData, item)
+        }
+      }
 
+      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
+    },
+    setFormProps (formData, item) {
+      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 'checkbox':
+            case 'radio':
+            case 'treeSelect':
+            case 'rangePicker':
+            case 'monthPicker':
+            case 'yearPicker':
+            case 'datePicker':
+            case 'file':
+            case 'image':
+            case 'citySelect':
+            case 'addressSearch':
+            case 'personSetting':
+              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':
-                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'
-                })
+                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)
-          }
+      }
+    },
+    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
         }
-        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
-            }
+        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 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
             }
           }
-          // 如果是临时表
-          if (this.isTableTemp) {
-            this.$emit('tempTableModify', {
-              valid: valid,
-              form: requestForm,
-              businessType: this.businessType
-            })
-            return
+          // 通过请求追加静默新增：自定义字段
+          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)
+        // 如果是临时表
+        if (this.isTableTemp) {
+          this.$emit('tempTableModify', {
+            valid: valid,
+            form: requestForm,
+            businessType: this.businessType
+          })
+          return
         }
-        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] + ''
+        // 处理表单键问题
+        const realForm = {}
+        for (const key of Object.keys(requestForm)) {
+          const value = requestForm[key]
+          const extraFormKeyTagIndex = key.indexOf('@')
+          // 如果含有动态简易表单项，则将该项的值放入具体的动态表单配置字段中
+          if (extraFormKeyTagIndex !== -1) {
+            const extraFormKey = key.substring(0, extraFormKeyTagIndex)
+            const realKey = key.substring(extraFormKeyTagIndex + 1)
+            if (!realForm[extraFormKey]) {
+              realForm[extraFormKey] = {}
             }
+            realForm[extraFormKey][realKey] = value
           } else {
-            this.form[item.model] = undefined
+            const realKey = this.getRealKey(key)
+            realForm[realKey] = value
           }
         }
-        // 追加版本号信息
-        for (const item of this.versionJsonData) {
-          if (!modifyModelData.data[item.model]) {
-            this.form[item.model] = 0
+        // 交由父级处理
+        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 (const key in modifyModelData.data) {
+        const realKey = this.getRealKey(key)
+        if (this.simpleFormJsonData[realKey]) {
+          const extraForm = JSON.parse(modifyModelData.data[key])
+          for (const key in extraForm) {
+            const model = realKey + '@' + key
+            this.form[model] = extraForm[key]
+          }
+        }
+      }
+      // 对普通表单项处理
+      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>

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

@@ -284,9 +284,19 @@ export default {
       this.$emit('afterQuery', result, requestParameters.conditionParams)
       return result
     },
+    /**
+     * 操作列事件
+     * @param record 本条数据
+     * @param actionType 操作类型
+     */
     action (record, actionType) {
       this.$emit('action', record, record[this.getPrimaryKeyName()], actionType)
     },
+    /**
+     * 选择列事件
+     * @param selectedRowKeys 被选择的列Key集合
+     * @param selectedRows 被选择的列集合
+     */
     onSelectChange (selectedRowKeys, selectedRows) {
       this.selectedRowKeys = selectedRowKeys
       this.selectedRows = selectedRows
@@ -314,12 +324,14 @@ export default {
     refresh (bool) {
       this.$refs.table.refresh(bool)
     },
+    /**
+     * 格式化日期
+     * @param date 日期字符串
+     * @param format 格式化方式
+     */
     format (date, format) {
       return formatDate(date, format)
     },
-    showDrawer () {
-      this.visible = true
-    },
     /**
      * 获取主键列名称
      */
@@ -336,8 +348,7 @@ export default {
       } else {
         exportData = this.$refs.table.localDataSource
       }
-      const data = this.formatJson(filterVal, exportData)
-      exportJson(tHeader, data, this.title + `数据_${new Date().toLocaleString()}`)
+      exportJson(tHeader, exportData.map(v => filterVal.map(j => v[j])), this.title + `数据_${new Date().toLocaleString()}`)
     },
     // 导出符合条件的数据
     handleExportByQuery () {
@@ -365,7 +376,13 @@ export default {
     // 编辑业务
     edit (id) {
       this.editLoading = true
-      // 组织被编辑数据
+      this.getEditData(id).then(modifyModelData => {
+        this.$emit('edit', modifyModelData)
+        this.editLoading = false
+      })
+    },
+    // 获取被编辑的数据
+    getEditData (id) {
       const requestParameters = {
         queryParamsName: this.queryParamsName,
         queryParams: this.queryParams,
@@ -385,13 +402,11 @@ export default {
         this.$emit('tempTableEdit', requestParameters)
         return
       }
-      queryWithResource(requestParameters, this.serviceName).then(res => {
+      return queryWithResource(requestParameters, this.serviceName).then(res => {
         // 将更新需要的主键值加入到primaryKeyData中
         const primaryKeyData = {}
         primaryKeyData[primaryKeyName] = this.selectId
-        const modifyModelData = { data: res.data[0], primaryKeyData: primaryKeyData, images: res.images, files: res.files }
-        this.$emit('edit', modifyModelData)
-        this.editLoading = false
+        return { data: res.data[0], primaryKeyData: primaryKeyData, images: res.images, files: res.files }
       })
     },
     // 删除业务
@@ -429,9 +444,6 @@ export default {
     importData () {
       this.$refs.importExcel.importExcelHandleOpen()
     },
-    formatJson (filterVal, jsonData) {
-      return jsonData.map(v => filterVal.map(j => v[j]))
-    },
     // 初始化临时表
     async initTempTable (json) {
       await this.createTempTable(this.queryParamsJson)