vue2-client 1.8.31 → 1.8.32

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

@@ -311,7 +311,7 @@
           <a-card :bodyStyle="bodyStyle" title="数据字段">
             <a-button type="primary" slot="extra" @click="addColumnItem()">增加</a-button>
             <a-row :gutter="24">
-              <a-col :span="7">
+              <a-col :span="8">
                 <span style="font-weight: bold">
                   标签名
                 </span>
@@ -321,7 +321,7 @@
                   字段名
                 </span>
               </a-col>
-              <a-col :span="8">
+              <a-col :span="7">
                 <span style="font-weight: bold">
                   数据模式
                 </span>
@@ -388,13 +388,7 @@
                   </a-tooltip>
                   <a-tooltip>
                     <template slot="title">
-                      Excel导入项
-                    </template>
-                    <a-tag :color="columnItem.dataModeArray && columnItem.dataModeArray.includes('excelImportItem') ? '#107C41' : 'rgba(0, 0, 0, 0.25)'"><a-icon type="file-excel" /></a-tag>
-                  </a-tooltip>
-                  <a-tooltip>
-                    <template slot="title">
-                      数据组
+                      字段JSON存储
                     </template>
                     <a-tag :color="columnItem.dataModeArray && columnItem.dataModeArray.includes('group') ? '#82A0D8' : 'rgba(0, 0, 0, 0.25)'"><a-icon type="crown" /></a-tag>
                   </a-tooltip>
@@ -434,12 +428,6 @@
         show-icon
         style="margin-top: 5px"
         type="info"/>
-      <a-alert
-        v-if="item.title.length > 8"
-        message="提示：标签名称过长可能会影响表格列展示效果，建议不超过8个字符"
-        show-icon
-        style="margin-top: 5px"
-        type="warning"/>
     </a-form-model>
     <create-query-item ref="queryItem" @getColumn="getColumnItem" @itemHandle="itemHandleItem"/>
   </a-modal>
@@ -483,7 +471,7 @@ export default {
     },
     // 字段名称是否禁用
     keyDisabled () {
-      return this.item.formType === 'file' || this.item.formType === 'image' || this.dataMode.mixinTableName
+      return this.item.formType === 'file' || this.item.formType === 'image'
     },
     // 数据模式是否禁用
     dataModeDisabled () {
@@ -495,10 +483,7 @@ export default {
         table: false,
         addOrEditForm: false,
         sqlQueryItem: false,
-        sqlQueryCondition: false,
-        excelImportItem: false,
-        group: false,
-        mixinTableName: false
+        sqlQueryCondition: false
       }
       for (const item of this.dataModeArrayData) {
         result[item] = true
@@ -517,24 +502,10 @@ export default {
           value: 'sqlQueryItem',
           noMatch: ['file', 'personSetting']
         }, {
-          label: '字段组存储',
-          value: 'group',
-          noMatch: []
-        }]
-      }
-      if (this.dataModeArrayData.includes('mixinTableName')) {
-        return [
-          {
-            label: '渲染查询表单项',
-            value: 'queryForm',
-            noMatch: ['file', 'image', 'textarea', 'personSetting']
-          },
-          {
-            label: '动态表名参数',
-            value: 'mixinTableName',
+            label: '字段组存储',
+            value: 'group',
             noMatch: []
-          }
-        ]
+        }]
       }
       if (this.item.formType) {
         return dataModeType.filter(item => {
@@ -610,40 +581,8 @@ export default {
       // 必填控制
       itemRules: {
         formType: [{ required: true, message: '请输入表单类型', trigger: 'change' }],
-        key: [{
-          required: true,
-          validator: (rule, value, callback) => {
-            // 判断必填
-            if (!value) {
-              callback(new Error('请输入字段名称'))
-            } else {
-              // 判断必须全部小写 并且不能包含空格
-              if (value !== value.toLowerCase() || value.indexOf(' ') !== -1 && !value === '_mixinTableName_') {
-                callback(new Error('字段名称必须全部小写，且不能包含空格'))
-              } else {
-                callback()
-              }
-            }
-          },
-          trigger: 'blur'
-        }],
-        title: [{
-          required: true,
-          validator: (rule, value, callback) => {
-            // 判断必填
-            if (!value) {
-              callback(new Error('请输入标签名称'))
-            } else {
-              // // 大于8个字符给提示
-              // if (value.length > 8) {
-              //   callback(new Error('标签名称过长，建议不超过8个字符，可能会影响展示效果'))
-              // } else {
-              callback()
-              // }
-            }
-          },
-          trigger: 'blur'
-        }],
+        key: [{ required: true, message: '请输入字段名称', trigger: 'blur' }],
+        title: [{ required: true, message: '请输入标签名称', trigger: 'blur' }],
         selectType: [{ required: true, message: '请选择数据源类型', trigger: 'change' }],
         selectKey: [{ required: true, message: '请输入数据源内容', trigger: 'blur' }],
         'slot.value': [{ required: true, message: '请输入文本溢出上限长度', trigger: 'blur' }],
@@ -676,7 +615,6 @@ export default {
         rule: {
           required: 'false'
         },
-        column: [],
         selectKey: undefined,
         queryType: '=',
         formType: 'input',
@@ -704,7 +642,7 @@ export default {
     // 编辑数据字段前准备数据
     editColumnItemExecute (_item) {
       this.type = '修改'
-      const defaultValue = { formType: 'input', type: 'string', addOrEdit: 'all', slot: { type: 'default' }, rule: {}, selectKey: {}, column: [] }
+      const defaultValue = { formType: 'input', type: 'string', addOrEdit: 'all', slot: { type: 'default' }, rule: {}, selectKey: {} }
       if (!_item.queryType) {
         defaultValue.queryType = '='
       }
@@ -828,12 +766,6 @@ export default {
     },
     // 数据模式改变
     dataModeArrayDataChange (newVal) {
-      if (newVal.includes('mixinTableName')) {
-        this.item.key = '_mixinTableName_'
-        this.dataModeArrayData = ['queryForm', 'mixinTableName']
-      } else if (this.item.key === '_mixinTableName_') {
-        this.item.key = ''
-      }
       if (newVal.includes('group')) {
         this.dataModeArrayData = ['sqlQueryItem', 'group']
       }
@@ -983,7 +915,7 @@ export default {
     },
     itemHandleItem (item, type) {
       this.itemMap[item.key] = item
-      if (this.type === '新增') {
+      if (type === '新增') {
         this.item.column.push(item)
       } else {
         this.$set(this.item.column, this.selectIndex, item)

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

@@ -15,19 +15,14 @@
           :rules="rules"
           :wrapper-col="wrapperCol"
         >
-          <template v-if="asAParamsGroup">
-            <a-form-model-item label="参数组名称" prop="group">
-              <a-input v-model="form.group" placeholder="设置表单项的组名，如：设置上报参数" />
-            </a-form-model-item>
-            <a-form-model-item label="参数组描述" prop="describe">
-              <a-input v-model="form.describe" placeholder="简单描述参数组，如：用于配置物联网设备的上报参数" />
-            </a-form-model-item>
-          </template>
+          <a-form-model-item label="参数组名称" prop="group">
+            <a-input v-model="form.group" placeholder="设置表单项的组名，如：设置上报参数" />
+          </a-form-model-item>
+          <a-form-model-item label="参数组描述" prop="describe">
+            <a-input v-model="form.describe" placeholder="简单描述参数组，如：用于配置物联网设备的上报参数" />
+          </a-form-model-item>
           <a-form-model-item label="数据字段" prop="column">
-            <a-space>
-              <a-button type="primary" @click="addColumnItem()">增加</a-button>
-              <a-button icon="import" @click="$message.warn('从创意库中选择并引用高质量的通用表单项配置，敬请期待')">从创意库引入</a-button>
-            </a-space>
+            <a-button type="primary" @click="addColumnItem()">增加</a-button>
             <a-row :gutter="24">
               <a-col :span="11">
                 <span style="font-weight: bold">
@@ -49,6 +44,7 @@
             <div
               v-for="(columnItem, index) in form.column"
               :key="index"
+              class="column_item"
               draggable="true"
               @dragend="handleDragEnd($event, columnItem)"
               @dragenter="handleDragEnter($event, columnItem)"
@@ -57,7 +53,7 @@
               <a-row v-if="ending && dragging && columnItem.key === ending.key && dragging.key !== ending.key" class="dragTipsWarp">
                 <span class="dragTips">拖到此处放置</span>
               </a-row>
-              <a-row :gutter="24" class="column_item">
+              <a-row :gutter="24">
                 <a-col :span="11">
                   <span style="font-weight: bold">
                     {{ columnItem.title }}
@@ -77,9 +73,41 @@
               </a-row>
             </div>
           </a-form-model-item>
+          <!-- 暂时不需要 -->
+          <!-- <a-form-model-item label="接口插槽" prop="apiSlot">
+            <a-popover placement="right" title="说明">
+              <template slot="content">
+                <p>通过插槽，你可以轻松扩展查询配置的默认业务，配置的插槽会根据类型在默认业务的前后执行，类似于切面</p>
+                <p><span style="color: #FF0000">注意：插槽不应改变默认的业务行为</span></p>
+                <p>如果配置了业务执行前插槽,<br/>执行默认业务前会先执行设置的插槽logic，传给插槽的参数为data本身</p>
+                <p>如果配置了业务执行后插槽,<br/>执行默认业务后会执行设置的插槽logic，传给插槽的参数为默认业务的返回值</p>
+                <img src="@vue2-client/assets/img/querySlotDemo.svg" style="zoom:0.5">
+              </template>
+              <a-button type="primary" @click="addApiSlot()">增加</a-button>
+            </a-popover>
+            <div
+              v-for="(columnItem, index) in form.apiSlotView"
+              :key="index"
+            >
+              <a-input v-model="columnItem.slotName" placeholder="插槽logic名称">
+                <a-select slot="addonBefore" v-model="columnItem.slotType" style="width: 10rem" placeholder="选择插槽类型">
+                  <a-select-option
+                    v-for="item in apiSlotData"
+                    :key="item.value"
+                    :value="item.value">
+                    {{ item.label }}
+                  </a-select-option>
+                </a-select>
+                <a-icon slot="addonAfter" type="close" @click="removeApiSlotItem(index)"/>
+              </a-input>
+            </div>
+          </a-form-model-item> -->
         </a-form-model>
         <create-simple-form-query-item ref="queryItem" @getColumn="getColumn" @itemHandle="itemHandle"/>
-        <a-button type="primary" @click="view">操作</a-button>
+        <a-space>
+          <a-button type="default" @click="view">预览</a-button>
+          <a-button type="primary" @click="submit">保存</a-button>
+        </a-space>
       </a-col>
       <a-col :lg="12" :md="12" :sm="24" :xl="6" :xs="24">
         <a-card :bordered="false" size="small" style="overflow: auto" title="预览">
@@ -91,18 +119,18 @@
         </a-card>
       </a-col>
     </a-row>
-    <x-add-form ref="xAddForm" @onSubmit="submit"/>
+    <x-add-form ref="xAddForm"/>
   </a-drawer>
 </template>
 
 <script>
-import XAddForm from '@vue2-client/base-client/components/common/XAddForm'
+import CreateSimpleFormQueryItem from './CreateSimpleFormQueryItem'
+import XAddForm from '@vue2-client/base-client/components/common/XAddForm/XAddForm'
 import JsonViewer from 'vue-json-viewer'
 import FileSaver from 'file-saver'
 import { mapState } from 'vuex'
-import CreateSimpleFormQueryItem from './CreateSimpleFormQueryItem'
-import { parseConfigUrl } from '@vue2-client/services/api/common'
 import { post } from '@vue2-client/services/api'
+import { parseConfigUrl } from '@vue2-client/services/api/common'
 
 export default {
   name: 'CreateSimpleFormQuery',
@@ -120,8 +148,8 @@ export default {
       labelCol: { span: 3 },
       wrapperCol: { span: 18 },
       form: {
-        group: undefined,
-        describe: undefined,
+        group: '',
+        describe: '',
         column: [],
         apiSlotView: [],
         apiSlot: {},
@@ -131,6 +159,10 @@ export default {
       selectIndex: null,
       selectType: undefined,
       joinArray: [],
+      rules: {
+        group: [{ required: true, message: '请输入参数组名称', trigger: 'blur' }],
+        describe: [{ required: true, message: '请输入参数组描述', trigger: 'blur' }]
+      },
       ending: null,
       dragging: null,
       // 操作按钮状态集合
@@ -150,34 +182,20 @@ export default {
     this.initView()
   },
   computed: {
-    ...mapState('setting', ['isMobile']),
-    rules () {
-      return this.asAParamsGroup ? {
-        group: [{ required: true, message: '请输入参数组名称', trigger: 'blur' }],
-        describe: [{ required: true, message: '请输入参数组描述', trigger: 'blur' }]
-      } : {}
-    },
+    ...mapState('setting', ['isMobile'])
   },
   props: {
     visible: {
       type: Boolean,
       default: false
     },
-    asAParamsGroup: {
-      type: Boolean,
-      default: false
+    serviceName: {
+      type: String,
+      default: undefined
     },
     toEditJson: {
       type: Object,
       default: () => {}
-    },
-    saveExportJson: {
-      type: Boolean,
-      default: false
-    },
-    serviceName: {
-      type: String,
-      default: undefined
     }
   },
   watch: {
@@ -196,6 +214,8 @@ export default {
         // 处理具体表单项
         this.form = Object.assign(
           {
+            group: '',
+            describe: '',
             apiSlotView: [],
             apiSlot: {},
             column: []
@@ -270,7 +290,6 @@ export default {
       this.result = {}
     },
     onClose () {
-      this.$emit('close')
       this.$emit('update:visible', false)
     },
     addJoinItem () {
@@ -279,7 +298,7 @@ export default {
     },
     itemHandle (item, type) {
       this.itemMap[item.key] = item
-      if (this.type === '新增') {
+      if (type === '新增') {
         this.form.column.push(item)
       } else {
         this.$set(this.form.column, this.selectIndex, item)
@@ -295,7 +314,6 @@ export default {
       this.$refs.queryItem.addColumnItemExecute()
     },
     editColumnItem (key, index) {
-      this.type = '修改'
       if (this.itemMap[key]) {
         this.$refs.queryItem.editColumnItemExecute(this.itemMap[key])
         this.selectIndex = index
@@ -331,6 +349,8 @@ export default {
       this.form.column.splice(index, 1, itemA)
       this.form.column.splice(newIndex, 1, itemB)
     },
+    changeJoinArray () {
+    },
     exportJson () {
       const data = JSON.stringify(this.result, null, 2)
       const blob = new Blob([data], { type: 'application/json' })
@@ -371,25 +391,22 @@ export default {
                 businessType: '新增',
                 title: '效果预览',
                 formItems: res.formJson,
-                serviceName: this.serviceName
+                serviceName: this.serviceName,
+                viewMode: true
               })
             })
           })
         }
       })
     },
-    submit (params, callback) {
+    submit () {
       this.$refs.businessCreateForm.validate(valid => {
-        this.viewHandle(() => {
-          if (this.saveExportJson) {
+        if (valid) {
+          this.viewHandle(() => {
+            // saveQueryParams
             this.exportJson()
-          } else {
-            this.$emit('saveQueryParams', this.result)
-            if (callback) {
-              callback()
-            }
-          }
-        })
+          })
+        }
       })
     },
     // 判断是否为json字符串
@@ -438,7 +455,7 @@ export default {
 }
 </script>
 <style lang="less" scoped>
-.column_item:hover {
+.column_item :hover {
   background-color:rgba(64, 169, 255,0.25);
 }
 .dragTips{

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

@@ -11,7 +11,7 @@
       @onSubmit="onAddOrEditSubmit"/>
     <a-list
       :grid="{gutter: 24, lg: 4, md: 3, sm: 1, xs: 1}"
-      :dataSource="content.groups"
+      :dataSource="columnJson.groups"
     >
       <a-list-item slot="renderItem" slot-scope="item">
         <a-card :hoverable="true" @click="toEdit(item)">
@@ -40,6 +40,7 @@ export default {
     return {
       // 页面宽度
       screenWidth: document.documentElement.clientWidth,
+      columnJson: {},
       formObj: {
         groupName: '',
         formJson: []
@@ -66,10 +67,6 @@ export default {
       default: () => {
         return {}
       }
-    },
-    content: {
-      type: Object,
-      required: true
     }
   },
   watch: {
@@ -82,6 +79,9 @@ export default {
   methods: {
     // 初始化组件
     initView () {
+      this.$emit('getColumnJson', val => {
+        this.columnJson = val
+      })
     },
     toEdit (item) {
       parseConfig(item, 'SIMPLE_FORM', this.serviceName).then(res => {

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

@@ -8,12 +8,11 @@
   >
     <create-simple-form-query
       :to-edit-json="editItem()"
-      :as-a-params-group="true"
       :visible.sync="createQueryVisible"
-      @saveQueryParams="saveQueryParams"
+      @saveSimpleFormQueryParams="saveQueryParams"
     />
     <a-list
-      :dataSource="contentCopy()"
+      :dataSource="columnJsonCopy()"
       :grid="{gutter: 24, lg: 4, md: 3, sm: 1, xs: 1}"
     >
       <a-list-item slot="renderItem" slot-scope="item, index">
@@ -40,7 +39,7 @@
 
 <script>
 import { mapState } from 'vuex'
-import CreateSimpleFormQuery from '../CreateSimpleFormQuery'
+import CreateSimpleFormQuery from '@vue2-client/base-client/components/common/CreateSimpleFormQuery'
 
 export default {
   name: 'FormGroupQuery',
@@ -54,6 +53,7 @@ export default {
       // 是否显示生成查询配置抽屉
       createQueryVisible: false,
       targetIndex: 0,
+      columnJson: {},
       editIndex: -1
     }
   },
@@ -67,10 +67,6 @@ export default {
     visible: {
       type: Boolean,
       default: false
-    },
-    content: {
-      type: Object,
-      required: true
     }
   },
   watch: {
@@ -84,6 +80,9 @@ export default {
     // 初始化组件
     initView () {
       this.editIndex = -1
+      this.$emit('getColumnJson', val => {
+        this.columnJson = val
+      })
     },
     toCreateQuery () {
       this.editIndex = -1
@@ -102,8 +101,8 @@ export default {
         okType: 'danger',
         cancelText: '取消',
         onOk () {
-          _this.content.groups.splice(index, 1)
-          _this.$emit('saveQueryParams', _this.content)
+          _this.columnJson.groups.splice(index, 1)
+          _this.$emit('saveQueryParams', _this.columnJson)
         }
       })
     },
@@ -112,21 +111,21 @@ export default {
     },
     // 存储查询配置信息
     saveQueryParams (source) {
-      if (!this.content.groups) {
-        this.content.groups = []
+      if (!this.columnJson.groups) {
+        this.columnJson.groups = []
       }
       if (this.editIndex !== -1) {
-        this.content.groups[this.editIndex] = source
+        this.columnJson.groups[this.editIndex] = source
       } else {
-        this.content.groups.push(source)
+        this.columnJson.groups.push(source)
       }
-      this.$emit('saveQueryParams', this.content)
+      this.$emit('saveQueryParams', this.columnJson)
       this.createQueryVisible = false
     },
-    contentCopy () {
+    columnJsonCopy () {
       let groups
-      if (this.content.groups) {
-        groups = JSON.parse(JSON.stringify(this.content.groups))
+      if (this.columnJson.groups) {
+        groups = JSON.parse(JSON.stringify(this.columnJson.groups))
       } else {
         groups = []
       }
@@ -135,7 +134,7 @@ export default {
     },
     editItem () {
       if (this.editIndex !== -1) {
-        return JSON.parse(JSON.stringify(this.content.groups[this.editIndex]))
+        return JSON.parse(JSON.stringify(this.columnJson.groups[this.editIndex]))
       } else {
         return {}
       }

package/src/base-client/components/common/JSONToTree/jsontotree.vue

@@ -163,6 +163,8 @@ export default {
           break
         } else if (arr[s].children && arr[s].children.length > 0) { // 递归条件
           this.searchitem(option, arr[s].children)
+        } else {
+
         }
       }
     },
@@ -256,10 +258,12 @@ export default {
   float: left;
 }
 .ant-card-body {
-  .ant-tree {
-    line-height: 3;
-    li {
-      position: relative;
+  :global {
+    .ant-tree {
+      line-height: 3;
+      li {
+        position: relative;
+      }
     }
   }
 }

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

@@ -191,11 +191,13 @@ export default {
 }
 
 .ant-card-body {
-  .ant-tree {
-    line-height: 3;
+  :global {
+    .ant-tree {
+      line-height: 3;
 
-    li {
-      position: relative;
+      li {
+        position: relative;
+      }
     }
   }
 }

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

@@ -39,7 +39,7 @@ import { mapState } from 'vuex'
 import { fileDelete, upload } from '@vue2-client/services/api/common'
 
 export default {
-  name: 'Uploads',
+  name: 'uploads',
   data () {
     return {
       uploadedFileList: [],

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

@@ -9,11 +9,7 @@
     okText="提交"
     @cancel="close"
     @ok="$refs.nativeForm.onSubmit()">
-    <x-add-native-form
-      ref="nativeForm"
-      @afterSubmit="afterSubmit"
-      @onSubmit="onSubmit"
-      @tempTableModify="tempTableModify"/>
+    <x-add-native-form ref="nativeForm" @onSubmit="onSubmit" @tempTableModify="tempTableModify"/>
   </a-modal>
 </template>
 <script>
@@ -47,7 +43,6 @@ export default {
     },
     methods: {
       init (params) {
-        params.showSubmitBtn = false
         const {
           businessType, title
         } = params
@@ -55,7 +50,7 @@ export default {
         this.title = title
         this.visible = true
         const that = this
-        that.$nextTick(() => {
+        that.$nextTick(function () {
           that.$refs.nativeForm.init(params)
         })
       },
@@ -65,20 +60,9 @@ export default {
       },
       onSubmit (params) {
         this.loading = true
-        if (this.$listeners.onSubmit) {
-          // 交由父级处理
-          this.$emit('onSubmit', params, () => {
-            this.close()
-          })
-        } else {
-          // 触发默认提交事件
-          this.$refs.nativeForm.defaultSubmit(params.realForm, () => {
-            this.close()
-          })
-        }
-      },
-      afterSubmit (params) {
-        this.$emit('afterSubmit', params)
+        this.$emit('onSubmit', params, () => {
+          this.close()
+        })
       },
       tempTableModify (params) {
         this.$emit('tempTableModify', params)