vue2-client 1.4.64 → 1.5.1

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

@@ -14,12 +14,10 @@
           :files="files"
           :form="form"
           :images="images"
-          :selects-array="SelectsArray"
           :service-name="serviceName"
           :xl="12"
           :xxl="8"
           mode="新增/修改"
-          @selectsItemCheck="selectsItemCheck"
         />
       </a-row>
     </a-form-model>
@@ -41,21 +39,12 @@ export default {
         // 内容加载是否完成
         loaded: false,
         // 表单Model
-        form: undefined,
+        form: {},
         // 修改有文件得表单时使用
         files: [],
         images: [],
-        // 多层下拉框组 数据储存
-        SelectsArray: {},
-        // 多层下拉框组 各组数量
-        SelectsNumber: {},
         // 校验
-        rules: {},
-        // 图标样式
-        iconStyle: {
-          position: 'relative',
-          top: '1px'
-        }
+        rules: {}
       }
     },
     computed: {
@@ -121,59 +110,13 @@ export default {
       visible (rel) {
         if (rel) {
           this.formItemLoad()
-          this.getSelectsArray()
         }
       }
     },
     mounted () {
       this.formItemLoad()
-      this.getSelectsArray()
     },
     methods: {
-      // 初始化级联框数据
-      getSelectsArray () {
-        const selectSate = this.jsonData.filter(item => !item.isOnlyAddOrEdit && item.group)
-        const groupName = [...new Set(selectSate.map(item => item.group))]
-        // 初始化数据组
-        groupName.forEach(groupName => {
-            this.SelectsArray[groupName] = []
-            const SelectsItem = selectSate.filter(item => {
-                if (item.groupIndex === 1) {
-                  if (item.keyName.substring(0, 6) === 'logic@') {
-                    // 请求logic
-                    post('/api/' + this.serviceName + '/logic/' + item.keyName.substring(6), {}).then(res => {
-                      this.SelectsArray[item.group][item.groupIndex] = res
-                      this.SelectsArray = JSON.parse(JSON.stringify(this.SelectsArray))
-                    })
-                  } else {
-                    this.SelectsArray[item.group][item.groupIndex] = JSON.parse(item.keyName)
-                    this.SelectsArray = JSON.parse(JSON.stringify(this.SelectsArray))
-                  }
-                }
-                return item.group === groupName
-              }
-            )
-            this.SelectsNumber[groupName] = SelectsItem.length ? SelectsItem.length : 0
-          }
-        )
-        this.loaded = true
-      },
-      selectsItemCheck (callback, groupName, index, value) {
-        const tem = { }
-        const group = this.realJsonData.filter(item => item.addOrEdit && item.group && item.group === groupName)
-        // 获取当前下拉框子下拉框的数据
-        this.SelectsArray[groupName][index + 1] = this.SelectsArray[groupName][index].filter(item => item.value === value)[0].children
-        // 清空子下拉框的子们的数据
-        for (let i = index; i < this.SelectsNumber[groupName]; i++) {
-          tem[group[i].model] = undefined
-        }
-        this.form = Object.assign({}, this.form, tem)
-        // 清空子下拉框的子们的数据源
-        for (let i = index + 2; i <= this.SelectsNumber[groupName]; i++) {
-          this.SelectsArray[groupName][i] = []
-        }
-        callback(this.SelectsArray)
-      },
       formItemLoad () {
         const formData = Object.assign({}, this.fixedAddForm)
         for (let i = 0; i < this.realJsonData.length; i++) {
@@ -251,12 +194,6 @@ export default {
         return (this.businessType === '新增' && value.addOrEdit === 'edit') ||
           (this.businessType === '修改' && value.addOrEdit === 'add')
       },
-      itemDisabledPlus (group, index) {
-        return (!this.SelectsArray[group][index]) || (this.SelectsArray[group][index] && this.SelectsArray[group][index].length === 0)
-      },
-      resetForm () {
-        this.$refs.selectForm.resetFields()
-      },
       async onSubmit () {
         this.$refs.selectForm.validate(async valid => {
           for (const key of Object.keys(this.form)) {
@@ -264,38 +201,47 @@ export default {
               this.form[key] = undefined
             }
           }
-          const requestParameters = Object.assign({}, this.form)
+          const requestForm = Object.assign({}, this.form)
           // 追加静默新增字段
           if (this.businessType === '新增') {
             for (const item of this.silenceAddJsonData) {
               switch (item.silencePurpose) {
                 case 'createTime':
-                  requestParameters[item.model] = formatDate('now')
+                  requestForm[item.model] = formatDate('now')
                   break
                 case 'operator':
-                  requestParameters[item.model] = this.currUser.name
+                  requestForm[item.model] = this.currUser.name
                   break
                 case 'orgId':
-                  requestParameters[item.model] = this.currUser.orgid
+                  requestForm[item.model] = this.currUser.orgid
                   break
               }
             }
             // 通过请求追加静默新增：自定义字段
             for (const item of this.silenceAddJsonData.filter((item) => item.silencePurpose === 'customize')) {
-              requestParameters[item.model] = await this.getSilenceSource(item.silenceSource, requestParameters)
+              requestForm[item.model] = await this.getSilenceSource(item.silenceSource, requestForm)
             }
           }
           const data = {
             valid: valid,
-            form: requestParameters
+            form: requestForm
           }
           this.$emit('onSubmit', data)
         })
       },
-      async getSilenceSource (silenceSource, requestParameters) {
-        const result = await post('/api/' + this.serviceName + '/logic/' + silenceSource, requestParameters)
+      /**
+       * 获取通过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])) {
@@ -305,7 +251,11 @@ export default {
           }
           const item = this.realJsonData[i]
           if (this.modifyModelData.data[item.model] || this.modifyModelData.data[item.model] === 0) {
-            this.form[item.model] = this.modifyModelData.data[item.model] + ''
+            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
           }

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

@@ -1,9 +1,9 @@
 <template>
-  <div v-show="isShow" class="table-page-search-wrapper">
+  <div v-show="visible" class="table-page-search-wrapper">
     <div v-show="advanced" ref="drawerContainer"></div>
     <a-form-model
       v-if="loaded"
-      ref="selectForm"
+      ref="form"
       :model="form"
       :rules="rules"
       layout="inline">
@@ -13,9 +13,7 @@
           :key="index"
           :attr="item"
           :form="form"
-          :selects-array="SelectsArray"
           :service-name="serviceName"
-          @selectsItemCheck="selectsItemCheck"
         />
         <a-drawer
           :get-container="() => {return $refs.drawerContainer}"
@@ -32,9 +30,7 @@
               :key="'advanced'+index"
               :attr="item"
               :form="form"
-              :selectsArray="SelectsArray"
               :service-name="serviceName"
-              @selectsItemCheck="selectsItemCheck"
             />
           </a-form-model>
         </a-drawer>
@@ -49,7 +45,7 @@
               <a-icon :style="iconStyle" type="redo" />重置
             </a-button>
             <slot></slot>
-            <a v-if="jsonData.length > 6" style="margin-left: 8px" @click="toggleAdvanced">
+            <a v-if="realJsonData.length > 6" style="margin-left: 8px" @click="toggleAdvanced">
               更多条件
               <a-icon type="down"/>
             </a>
@@ -62,7 +58,6 @@
 </template>
 <script>
 import XFormItem from '@vue2-client/base-client/components/common/XForm/XFormItem'
-import { post } from '@vue2-client/services/api'
 
 export default {
     name: 'XForm',
@@ -73,134 +68,46 @@ export default {
       return {
         // 内容加载是否完成
         loaded: false,
+        // 服务名称
+        serviceName: 'af-system',
         // 是否展开条件
         advanced: false,
         // 表单Model
         form: undefined,
-        // 多层下拉框组 数据储存
-        SelectsArray: {},
-        // 多层下拉框组 各组数量
-        SelectsNumber: {},
         // 校验
         rules: {},
         // 图标样式
         iconStyle: {
           position: 'relative',
           top: '1px'
-        }
+        },
+        // 表单项集合
+        formItems: [],
+        // 是否显示
+        visible: true
       }
     },
     computed: {
-      // 过滤掉仅用于新增/修改场景的表单项  以及多个下拉框得组
+      // 过滤掉仅用于新增/修改场景的表单项
       realJsonData: function () {
-        return this.jsonData.filter(item => !item.isOnlyAddOrEdit)
+        return this.formItems.filter(item => !item.isOnlyAddOrEdit)
       },
     },
-    props: {
-      jsonData: {
-        type: Array,
-        default: () => {
-          return []
-        }
-      },
-      isExports: {
-        type: Boolean,
-        default: () => {
-          return true
-        }
-      },
-      isShow: {
-        type: Boolean,
-        default: () => {
-          return true
-        }
-      },
-      serviceName: {
-        type: String,
-        default: 'af-system'
-      }
-    },
-    mounted () {
-      this.formItemLoad()
-      this.getSelectsArray()
-    },
     methods: {
-      // 初始化级联框数据
-      getSelectsArray () {
-        const selectSate = this.jsonData.filter(item => !item.isOnlyAddOrEdit && item.group)
-        const groupName = [...new Set(selectSate.map(item => item.group))]
-        // 初始化数据组
-        groupName.forEach(groupName => {
-            this.SelectsArray[groupName] = []
-            const SelectsItem = selectSate.filter(item => {
-                if (item.groupIndex === 1) {
-                  if (item.keyName.substring(0, 6) === 'logic@') {
-                    // 请求logic
-                    post('/api/' + this.serviceName + '/logic/' + item.keyName.substring(6), {}).then(res => {
-                      this.SelectsArray[item.group][item.groupIndex] = res
-                      this.SelectsArray = JSON.parse(JSON.stringify(this.SelectsArray))
-                    })
-                  } else {
-                    this.SelectsArray[item.group][item.groupIndex] = JSON.parse(item.keyName)
-                    this.SelectsArray = JSON.parse(JSON.stringify(this.SelectsArray))
-                  }
-                }
-                return item.group === groupName
-              }
-            )
-            this.SelectsNumber[groupName] = SelectsItem.length ? SelectsItem.length : 0
-          }
-        )
-        this.loaded = true
-      },
-      selectsItemCheck (callback, groupName, index, value) {
-        const tem = { }
-        const group = this.realJsonData.filter(item => !item.isOnlyAddOrEdit && item.group && item.group === groupName)
-        // 获取当前下拉框子下拉框的数据
-        this.SelectsArray[groupName][index + 1] = this.SelectsArray[groupName][index].filter(item => item.value === value)[0].children
-        // 清空子下拉框的子们的数据
-        for (let i = index; i < this.SelectsNumber[groupName]; i++) {
-          tem[group[i].model] = undefined
-        }
-        this.form = Object.assign({}, this.form, tem)
-        // 清空子下拉框的子们的数据源
-        for (let i = index + 2; i <= this.SelectsNumber[groupName]; i++) {
-          this.SelectsArray[groupName][i] = []
-        }
-        callback(this.SelectsArray)
-      },
-      formItemLoad () {
+      init (params) {
+        const {
+          formItems, serviceName = 'af-system'
+        } = params
+        this.loaded = false
+        this.formItems = JSON.parse(JSON.stringify(formItems))
+        this.serviceName = serviceName
         const formData = {}
         for (let i = 0; i < this.realJsonData.length; i++) {
           const item = this.realJsonData[i]
           formData[item.model] = undefined
-          if (item.keys && item.model === 'rowIdValue' && item.keys.length > 0) {
-            // 处理综合筛选下拉框默认值情况
-            formData.rowIdName = Object.keys(item.keys[0])[0]
-          }
           // 处理表单校验情况
           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':
-            //       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':
@@ -238,15 +145,19 @@ export default {
           }
         }
         this.form = formData
+        this.loaded = true
       },
       toggleAdvanced () {
         this.advanced = !this.advanced
       },
+      toggleVisible () {
+        this.visible = !this.visible
+      },
       resetForm () {
-        this.$refs.selectForm.resetFields()
+        this.$refs.form.resetFields()
       },
       onSubmit () {
-        this.$refs.selectForm.validate(valid => {
+        this.$refs.form.validate(valid => {
           for (const key of Object.keys(this.form)) {
             if (this.form[key] === null || this.form[key] === '') {
               this.form[key] = undefined