vue2-client 1.7.15 → 1.7.17

package/package.json

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

package/src/base-client/components/common/CreateQuery/CreateQueryItem.vue

@@ -62,7 +62,7 @@
             <a-form-model-item
               prop="dataMode"
               style="margin-top: 10px;">
-              <a-checkbox-group v-model="dataModeArrayData" :disabled="dataModeDisabled" :options="dataModeTypeV"/>
+              <a-checkbox-group v-model="dataModeArrayData" :disabled="dataModeDisabled" @change="dataModeArrayDataChange" :options="dataModeTypeV"/>
             </a-form-model-item>
           </a-card>
         </a-col>
@@ -309,6 +309,7 @@
         </a-col>
         <a-col :span="18" v-if="dataMode.group">
           <a-card :bodyStyle="bodyStyle" title="数据字段">
+            <a-button type="primary" slot="extra" @click="addColumnItem()">增加</a-button>
             <a-row :gutter="24">
               <a-col :span="8">
                 <span style="font-weight: bold">
@@ -495,6 +496,17 @@ export default {
       })
     },
     dataModeTypeV () {
+      if (this.dataModeArrayData.includes('group')) {
+        return [{
+          label: 'SQL生成查询项',
+          value: 'sqlQueryItem',
+          noMatch: ['file', 'personSetting']
+        }, {
+            label: '字段组存储',
+            value: 'group',
+            noMatch: []
+        }]
+      }
       if (this.item.formType) {
         return dataModeType.filter(item => {
           return item.noMatch.findIndex(type => type === this.item.formType) === -1
@@ -750,7 +762,13 @@ export default {
     },
     // 重置数据模式
     resetDataMode () {
-      this.dataModeArrayData = this.dataModeTypeV.map(item => item.value)
+      this.dataModeArrayData = this.dataModeTypeV.map(item => item.value).filter(h => h !== 'group')
+    },
+    // 数据模式改变
+    dataModeArrayDataChange (newVal) {
+      if (newVal.includes('group')) {
+        this.dataModeArrayData = ['sqlQueryItem', 'group']
+      }
     },
     itemHandle () {
       // 查询表单项或者新增/修改表单项
@@ -881,12 +899,17 @@ export default {
         okText: '确定',
         okType: 'danger',
         cancelText: '取消',
+        zIndex: 9999,
         onOk () {
           delete _this.itemMap[key]
           _this.item.column.splice(index, 1)
         }
       })
     },
+    addColumnItem () {
+      this.type = '新增'
+      this.$refs.queryItem.addColumnItemExecute()
+    },
     getColumnItem (callback) {
       callback(JSON.parse(JSON.stringify(this.item.column)))
     },

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

@@ -15,12 +15,12 @@
           :service-name="serviceName"
           :get-data-params="getDataParams"
         />
-        <div v-for="(groupItem, groupIndex) in groupJsonData" :key="groupIndex">
+        <div v-for="(groupItem, groupIndex) in groupJsonData" :key="'group-' + groupIndex">
           <x-form-item
             v-for="(item, index) in groupItem.groupItems"
             :key="index"
             :attr="item"
-            :form="form[groupItem.model]"
+            :form="form"
             :service-name="serviceName"
             :get-data-params="getDataParams"
           />
@@ -104,7 +104,7 @@ export default {
       }).map((item) => {
           item.groupItems = item.groupItems.filter(item => !item.isOnlyAddOrEdit).map((groupItem) => {
             // 只保留第一个下划线后面的内容
-            groupItem.model = groupItem.model.substring(groupItem.model.indexOf('_') + 1)
+            // groupItem.model = groupItem.model.substring(groupItem.model.indexOf('_') + 1)
             return groupItem
           })
           return item
@@ -128,10 +128,9 @@ export default {
       // 处理分组数据表单
       for (let i = 0; i < this.groupJsonData.length; i++) {
         const groupItem = this.groupJsonData[i]
-        formData[groupItem.model] = {}
         for (let j = 0; j < groupItem.groupItems.length; j++) {
           const item = groupItem.groupItems[j]
-          this.setFormProps(formData[groupItem.model], item)
+          this.setFormProps(formData, item)
         }
       }
       this.form = formData

package/src/config/CreateQueryConfig.js

@@ -29,7 +29,7 @@ module.exports = {
     {
       label: '字段组存储',
       value: 'group',
-      noMatch: ['file', 'image', 'textarea', 'personSetting']
+      noMatch: []
     }
   ],
   // 表单类型