vue2-client 1.7.10 → 1.7.11

package/src/base-client/components/common/Upload/index.js

@@ -1,3 +1,3 @@
-import Upload from './Upload'
-
-export default Upload
+import Upload from './Upload'
+
+export default Upload

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

@@ -19,6 +19,20 @@
         :get-data-params="getDataParams"
       />
     </a-row>
+    <a-row :gutter="16" v-for="(groupItem, groupIndex) in groupJsonData" :key="groupIndex">
+      <x-form-item
+        v-for="(item, index) in groupItem.groupItems"
+        :key="index"
+        :attr="item"
+        :disabled="itemDisabled(item)"
+        :files="files"
+        :form="form[groupItem.model]"
+        :images="images"
+        :service-name="serviceName"
+        mode="新增/修改"
+        :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
@@ -93,6 +107,22 @@ export default {
         return item.addOrEdit && item.addOrEdit !== 'no' && item.addOrEdit !== 'silenceAdd' && item.addOrEdit !== 'version' && !this.itemDisabled(item)
       })
     },
+    // 过滤出用于新增/修改场景的表单项
+    groupJsonData: function () {
+      return this.formItems.filter((item) => {
+        return item.type === 'group'
+      }).map((item) => {
+          item.groupItems = item.groupItems.filter((item) => {
+            return item.addOrEdit && item.addOrEdit !== 'no' && item.addOrEdit !== 'silenceAdd' && item.addOrEdit !== 'version' && !this.itemDisabled(item)
+          }).map((groupItem) => {
+            // 只保留第一个下划线后面的内容
+            groupItem.model = groupItem.model.substring(groupItem.model.indexOf('_') + 1)
+            return groupItem
+          })
+          return item
+        }
+      )
+    },
     // 过滤出用于静默新增场景的表单项
     silenceAddJsonData: function () {
       return this.formItems.filter(function (item) {
@@ -132,6 +162,15 @@ export default {
         const item = this.realJsonData[i]
         this.setFormProps(formData, item)
       }
+      // 设置表单分组项目相关参数
+      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)
+        }
+      }
       // 设置动态简易表单项的相关参数
       for (const key in this.simpleFormJsonData) {
         for (const item of this.simpleFormJsonData[key].value) {
@@ -234,10 +273,6 @@ export default {
         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] === '') {
@@ -293,6 +328,16 @@ export default {
             realForm[realKey] = value
           }
         }
+        if (this.viewMode) {
+          this.$message.info('预览模式禁止新增和修改')
+          console.log({
+            businessType: this.businessType,
+            serviceName: this.serviceName,
+            realForm: realForm,
+            currUserName: this.currUser.name
+          })
+          return false
+        }
         // 交由父级处理
         this.$emit('onSubmit', {
           businessType: this.businessType,
@@ -347,6 +392,16 @@ export default {
           this.form[item.model] = undefined
         }
       }
+      // 对分组表单进行处理
+      for (let i = 0; i < this.groupJsonData.length; i++) {
+        const item = this.groupJsonData[i]
+        try {
+          if (modifyModelData.data[item.model]) {
+            this.form[item.model] = JSON.parse(modifyModelData.data[item.model])
+          }
+        } catch (e) {
+        }
+      }
       // 追加版本号信息
       for (const item of this.versionJsonData) {
         if (!modifyModelData.data[item.model]) {

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

@@ -15,6 +15,16 @@
           :service-name="serviceName"
           :get-data-params="getDataParams"
         />
+        <div v-for="(groupItem, groupIndex) in groupJsonData" :key="groupIndex">
+          <x-form-item
+            v-for="(item, index) in groupItem.groupItems"
+            :key="index"
+            :attr="item"
+            :form="form"
+            :service-name="serviceName"
+            :get-data-params="getDataParams"
+          />
+        </div>
         <div v-show="advanced">
           <x-form-item
             v-for="(item, index) in realJsonData.slice(6)"
@@ -87,6 +97,20 @@ export default {
     realJsonData: function () {
       return this.formItems.filter(item => !item.isOnlyAddOrEdit)
     },
+    // 过滤出用于新增/修改场景的表单项
+    groupJsonData: function () {
+      return this.formItems.filter((item) => {
+        return item.type === 'group'
+      }).map((item) => {
+          item.groupItems = item.groupItems.filter(item => !item.isOnlyAddOrEdit).map((groupItem) => {
+            // 只保留第一个下划线后面的内容
+            groupItem.model = groupItem.model.substring(groupItem.model.indexOf('_') + 1)
+            return groupItem
+          })
+          return item
+        }
+      )
+    },
   },
   methods: {
     init (params) {

package/src/base-client/components/index.js

@@ -1,41 +1,41 @@
-import XForm from './common/XForm'
-import XAddForm from './common/XAddForm'
-import XAddNativeForm from './common/XAddNativeForm'
-import XFormCol from './common/XFormCol'
-import XTable from './common/XTable'
-import XTreeOne from './common/XTreeOne'
-import XImportExcel from './common/XImportExcel'
-import XDataDrawer from './common/XDataDrawer'
-import XCard from './common/XCard'
-import XBadge from './common/XBadge'
-import Upload from './common/Upload'
-import JSONToTree from './common/JSONToTree'
-import FormGroupEdit from './common/FormGroupEdit'
-import FormGroupQuery from './common/FormGroupQuery'
-import AddressSearchCombobox from './common/AddressSearchCombobox'
-import AmapMarker from './common/AmapMarker'
-import CreateQuery from './common/CreateQuery'
-import CreateSimpleFormQuery from './common/CreateSimpleFormQuery'
-import PersonSetting from './common/PersonSetting'
-
-export default {
-  XForm,
-  XAddForm,
-  XAddNativeForm,
-  XFormCol,
-  XTable,
-  XTreeOne,
-  XImportExcel,
-  XDataDrawer,
-  XCard,
-  XBadge,
-  Upload,
-  JSONToTree,
-  FormGroupEdit,
-  FormGroupQuery,
-  AddressSearchCombobox,
-  AmapMarker,
-  CreateQuery,
-  CreateSimpleFormQuery,
-  PersonSetting
-}
+import XForm from './common/XForm'
+import XAddForm from './common/XAddForm'
+import XAddNativeForm from './common/XAddNativeForm'
+import XFormCol from './common/XFormCol'
+import XTable from './common/XTable'
+import XTreeOne from './common/XTreeOne'
+import XImportExcel from './common/XImportExcel'
+import XDataDrawer from './common/XDataDrawer'
+import XCard from './common/XCard'
+import XBadge from './common/XBadge'
+import Upload from './common/Upload'
+import JSONToTree from './common/JSONToTree'
+import FormGroupEdit from './common/FormGroupEdit'
+import FormGroupQuery from './common/FormGroupQuery'
+import AddressSearchCombobox from './common/AddressSearchCombobox'
+import AmapMarker from './common/AmapMarker'
+import CreateQuery from './common/CreateQuery'
+import CreateSimpleFormQuery from './common/CreateSimpleFormQuery'
+import PersonSetting from './common/PersonSetting'
+
+export default {
+  XForm,
+  XAddForm,
+  XAddNativeForm,
+  XFormCol,
+  XTable,
+  XTreeOne,
+  XImportExcel,
+  XDataDrawer,
+  XCard,
+  XBadge,
+  Upload,
+  JSONToTree,
+  FormGroupEdit,
+  FormGroupQuery,
+  AddressSearchCombobox,
+  AmapMarker,
+  CreateQuery,
+  CreateSimpleFormQuery,
+  PersonSetting
+}

package/src/config/CreateQueryConfig.js

@@ -25,6 +25,11 @@ module.exports = {
       label: 'SQL生成查询表达式',
       value: 'sqlQueryCondition',
       noMatch: ['file', 'image', 'textarea', 'personSetting']
+    },
+    {
+      label: '字段组存储',
+      value: 'group',
+      noMatch: ['file', 'image', 'textarea', 'personSetting']
     }
   ],
   // 表单类型

package/src/router/async/config.async.js

@@ -6,6 +6,7 @@ const routesConfig = [
   'login',
   'submitTicket',
   'settings',
+  'createQuery',
   'root',
   {
     router: 'exp404',

package/src/services/api/restTools.js

@@ -1,24 +1,24 @@
-import { METHOD, request } from '@vue2-client/utils/request'
-
-/**
- * GET请求
- * @param url 请求地址
- * @param parameter 路径参数
- * @returns {Promise<AxiosResponse<T>>}
- */
-function get (url, parameter) {
-  return request(url, METHOD.GET, parameter)
-}
-
-/**
- * POST请求
- * @param url 请求地址
- * @param parameter 请求参数
- * @param config
- * @returns {Promise<AxiosResponse<T>>}
- */
-function post (url, parameter, config = {}) {
-  return request(url, METHOD.POST, parameter, config)
-}
-
-export { get, post }
+import { METHOD, request } from '@vue2-client/utils/request'
+
+/**
+ * GET请求
+ * @param url 请求地址
+ * @param parameter 路径参数
+ * @returns {Promise<AxiosResponse<T>>}
+ */
+function get (url, parameter) {
+  return request(url, METHOD.GET, parameter)
+}
+
+/**
+ * POST请求
+ * @param url 请求地址
+ * @param parameter 请求参数
+ * @param config
+ * @returns {Promise<AxiosResponse<T>>}
+ */
+function post (url, parameter, config = {}) {
+  return request(url, METHOD.POST, parameter, config)
+}
+
+export { get, post }