vue2-client 1.8.32 → 1.8.33

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

@@ -25,7 +25,7 @@
                   <a-icon type="bank" /> {{ group.title }}
                 </span>
                 <a-select-option v-for="address in group.children" :key="address.label + ' <' + address.value + '>'">
-                  <p class="addressName"><a-icon type="environment" /> <span v-html="highLight(address.label, address.word)">{{ address.label }}</span></p>
+                  <p class="addressName"><a-icon type="environment" /><span v-html="highLight(address.label, address.word)"></span></p>
                   <p v-if="address.address !== '[]'" class="addressRemark">
                     {{ address.address }}
                   </p>
@@ -169,7 +169,7 @@ export default {
             const addressMap = {}
             result.tips.forEach((res) => {
               if (res.location) {
-                if (!addressMap.hasOwnProperty(res.district)) {
+                if (!Object.prototype.hasOwnProperty.call(addressMap, res.district)) {
                   addressMap[res.district] = []
                 }
                 addressMap[res.district].push({

package/src/base-client/components/common/AmapMarker/AmapPointRendering.vue

@@ -19,7 +19,7 @@ export default {
     describeList: {
       type: Array,
       // eslint-disable-next-line vue/require-valid-default-prop
-      default: () => { return [ ] } // lng:描述信息 lat:描述信息对应的值的字段名 { describe: '用户名称', field: 'name' }
+      default: () => { return [] } // lng:描述信息 lat:描述信息对应的值的字段名 { describe: '用户名称', field: 'name' }
     },
     // 需要渲染的点位数据
     markers: {
@@ -30,7 +30,7 @@ export default {
     imgurl: {
       type: String,
       default: () => {
-        return "https://a.amap.com/jsapi_demos/static/demo-center/icons/poi-marker-default.png"
+        return 'https://a.amap.com/jsapi_demos/static/demo-center/icons/poi-marker-default.png'
       }
     },
     mapStyle: {
@@ -105,7 +105,7 @@ export default {
           extData: this.markers
         })
         marker.on('click', (e) => {
-          if(e.target.getExtData() && e.target.getExtData().lng){
+          if (e.target.getExtData() && e.target.getExtData().lng) {
             this.infoWindow.setContent(document.getElementById('amap_point_rendering_template'))
             this.infoWindow.open(this.map, [e.target.getExtData().lng, e.target.getExtData().lat])
           }

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

@@ -15,9 +15,6 @@
           :rules="rules"
           :wrapper-col="wrapperCol"
         >
-          <a-form-model-item label="服务名称" prop="serviceName">
-            <a-input v-model="form.serviceName" placeholder="查询接口所在的服务名称，默认system"/>
-          </a-form-model-item>
           <a-form-model-item label="查询主表名" prop="tableName">
             <a-input v-model="form.tableName" placeholder="查询用的主表+别名，用空格隔开，如：t_userfiles u"/>
           </a-form-model-item>
@@ -71,17 +68,17 @@
               <a-button icon="import" @click="$message.warn('从创意库中选择并引用高质量的通用表单项配置，敬请期待')">从创意库引入</a-button>
             </a-space>
             <a-row :gutter="24">
-              <a-col :span="8">
+              <a-col :span="6">
                 <span style="font-weight: bold">
                   标签名
                 </span>
               </a-col>
-              <a-col :span="7">
+              <a-col :span="6">
                 <span style="font-weight: bold">
                   字段名
                 </span>
               </a-col>
-              <a-col :span="7">
+              <a-col :span="10">
                 <span style="font-weight: bold">
                   数据模式
                 </span>
@@ -105,17 +102,17 @@
                 <span class="dragTips">拖到此处放置</span>
               </a-row>
               <a-row :gutter="24" class="column_item">
-                <a-col :span="7">
+                <a-col :span="6">
                   <span style="font-weight: bold">
                     {{ columnItem.title }}
                   </span>
                 </a-col>
-                <a-col :span="7">
+                <a-col :span="6">
                   <span style="font-weight: bold">
                     {{ columnItem.key }}
                   </span>
                 </a-col>
-                <a-col :span="8">
+                <a-col :span="10">
                   <a-tooltip>
                     <template slot="title">
                       查询表单项
@@ -148,7 +145,13 @@
                   </a-tooltip>
                   <a-tooltip>
                     <template slot="title">
-                      字段组存储
+                      Excel导入项
+                    </template>
+                    <a-tag :color="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">
+                      数据组
                     </template>
                     <a-tag :color="columnItem.dataModeArray.includes('group') ? '#82A0D8' : 'rgba(0, 0, 0, 0.25)'"><a-icon type="crown" /></a-tag>
                   </a-tooltip>
@@ -225,14 +228,14 @@
       </template>
       <x-form-table
         :queryParamsJson="result"
-        :view-mode="true">
+        :view-mode="true"
+        :service-name="serviceName">
       </x-form-table>
     </a-modal>
   </a-drawer>
 </template>
 
 <script>
-import XFormItem from '@vue2-client/base-client/components/common/XForm/XFormItem'
 import XFormTable from '@vue2-client/base-client/components/common/XFormTable/XFormTable'
 import JsonViewer from 'vue-json-viewer'
 import FileSaver from 'file-saver'
@@ -244,8 +247,7 @@ export default {
   components: {
     CreateQueryItem,
     JsonViewer,
-    XFormTable,
-    XFormItem
+    XFormTable
   },
   data () {
     return {
@@ -266,7 +268,6 @@ export default {
       labelCol: { span: 3 },
       wrapperCol: { span: 18 },
       form: {
-        serviceName: '',
         tableName: '',
         joinArray: {},
         condition: {},
@@ -343,6 +344,14 @@ export default {
     toEditJson: {
       type: Object,
       default: () => {}
+    },
+    saveExportJson: {
+      type: Boolean,
+      default: false
+    },
+    serviceName: {
+      type: String,
+      default: undefined
     }
   },
   watch: {
@@ -380,27 +389,8 @@ export default {
           }, this.toEditJson
         )
         for (const columnItem of this.form.column) {
-          // 数据模式兼容性处理
           if (!(columnItem.dataMode || columnItem.dataModeArray)) {
             columnItem.dataModeArray = ['queryForm', 'table', 'addOrEditForm', 'sqlQueryItem', 'sqlQueryCondition']
-          } else if (columnItem.dataMode) {
-            if (columnItem.dataMode === 'all') {
-              columnItem.dataModeArray = ['queryForm', 'table', 'addOrEditForm', 'sqlQueryItem', 'sqlQueryCondition']
-            } else if (columnItem.dataMode === 'form') {
-              columnItem.dataModeArray = ['queryForm', 'addOrEditForm', 'sqlQueryCondition']
-            } else if (columnItem.dataMode === 'table') {
-              columnItem.dataModeArray = ['table', 'sqlQueryItem']
-            } else if (columnItem.dataMode === 'table_form') {
-              columnItem.dataModeArray = ['table', 'sqlQueryItem', 'sqlQueryCondition']
-            } else if (columnItem.dataMode === 'only_form') {
-              columnItem.dataModeArray = ['queryForm']
-            } else if (columnItem.dataMode === 'only_table') {
-              columnItem.dataModeArray = ['table']
-            } else if (columnItem.dataMode === 'clear') {
-              columnItem.dataModeArray = ['sqlQueryItem', 'sqlQueryCondition']
-            } else if (columnItem.dataMode === 'only_add_modify') {
-              columnItem.dataModeArray = ['addOrEditForm', 'sqlQueryItem']
-            }
           }
           delete columnItem.dataMode
           // 插槽兼容处理
@@ -484,6 +474,7 @@ export default {
       this.result = {}
     },
     onClose () {
+      this.$emit('close')
       this.$emit('update:visible', false)
     },
     onModelClose () {
@@ -502,7 +493,7 @@ export default {
     },
     itemHandle (item, type) {
       this.itemMap[item.key] = item
-      if (type === '新增') {
+      if (this.type === '新增') {
         this.form.column.push(item)
       } else {
         this.$set(this.form.column, this.selectIndex, item)
@@ -518,6 +509,7 @@ 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
@@ -608,8 +600,11 @@ export default {
       this.$refs.businessCreateForm.validate(valid => {
         if (valid) {
           this.viewHandle(() => {
-            // saveQueryParams
-            this.exportJson()
+            if (this.saveExportJson) {
+              this.exportJson()
+            } else {
+              this.$emit('saveQueryParams', this.result)
+            }
           })
         }
       })

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="8">
+              <a-col :span="7">
                 <span style="font-weight: bold">
                   标签名
                 </span>
@@ -321,7 +321,7 @@
                   字段名
                 </span>
               </a-col>
-              <a-col :span="7">
+              <a-col :span="8">
                 <span style="font-weight: bold">
                   数据模式
                 </span>
@@ -388,7 +388,13 @@
                   </a-tooltip>
                   <a-tooltip>
                     <template slot="title">
-                      字段JSON存储
+                      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">
+                      数据组
                     </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>
@@ -428,6 +434,12 @@
         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>
@@ -471,7 +483,7 @@ export default {
     },
     // 字段名称是否禁用
     keyDisabled () {
-      return this.item.formType === 'file' || this.item.formType === 'image'
+      return this.item.formType === 'file' || this.item.formType === 'image' || this.dataMode.mixinTableName
     },
     // 数据模式是否禁用
     dataModeDisabled () {
@@ -483,7 +495,10 @@ export default {
         table: false,
         addOrEditForm: false,
         sqlQueryItem: false,
-        sqlQueryCondition: false
+        sqlQueryCondition: false,
+        excelImportItem: false,
+        group: false,
+        mixinTableName: false
       }
       for (const item of this.dataModeArrayData) {
         result[item] = true
@@ -502,11 +517,25 @@ export default {
           value: 'sqlQueryItem',
           noMatch: ['file', 'personSetting']
         }, {
-            label: '字段组存储',
-            value: 'group',
-            noMatch: []
+          label: '字段组存储',
+          value: 'group',
+          noMatch: []
         }]
       }
+      if (this.dataModeArrayData.includes('mixinTableName')) {
+        return [
+          {
+            label: '渲染查询表单项',
+            value: 'queryForm',
+            noMatch: ['file', 'image', 'textarea', 'personSetting']
+          },
+          {
+            label: '动态表名参数',
+            value: 'mixinTableName',
+            noMatch: []
+          }
+        ]
+      }
       if (this.item.formType) {
         return dataModeType.filter(item => {
           return item.noMatch.findIndex(type => type === this.item.formType) === -1
@@ -581,8 +610,40 @@ export default {
       // 必填控制
       itemRules: {
         formType: [{ required: true, message: '请输入表单类型', trigger: 'change' }],
-        key: [{ required: true, message: '请输入字段名称', trigger: 'blur' }],
-        title: [{ required: true, message: '请输入标签名称', trigger: 'blur' }],
+        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'
+        }],
         selectType: [{ required: true, message: '请选择数据源类型', trigger: 'change' }],
         selectKey: [{ required: true, message: '请输入数据源内容', trigger: 'blur' }],
         'slot.value': [{ required: true, message: '请输入文本溢出上限长度', trigger: 'blur' }],
@@ -615,6 +676,7 @@ export default {
         rule: {
           required: 'false'
         },
+        column: [],
         selectKey: undefined,
         queryType: '=',
         formType: 'input',
@@ -642,7 +704,7 @@ export default {
     // 编辑数据字段前准备数据
     editColumnItemExecute (_item) {
       this.type = '修改'
-      const defaultValue = { formType: 'input', type: 'string', addOrEdit: 'all', slot: { type: 'default' }, rule: {}, selectKey: {} }
+      const defaultValue = { formType: 'input', type: 'string', addOrEdit: 'all', slot: { type: 'default' }, rule: {}, selectKey: {}, column: [] }
       if (!_item.queryType) {
         defaultValue.queryType = '='
       }
@@ -766,6 +828,12 @@ 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']
       }
@@ -915,7 +983,7 @@ export default {
     },
     itemHandleItem (item, type) {
       this.itemMap[item.key] = item
-      if (type === '新增') {
+      if (this.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,14 +15,19 @@
           :rules="rules"
           :wrapper-col="wrapperCol"
         >
-          <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 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="column">
-            <a-button type="primary" @click="addColumnItem()">增加</a-button>
+            <a-space>
+              <a-button type="primary" @click="addColumnItem()">增加</a-button>
+              <a-button icon="import" @click="$message.warn('从创意库中选择并引用高质量的通用表单项配置，敬请期待')">从创意库引入</a-button>
+            </a-space>
             <a-row :gutter="24">
               <a-col :span="11">
                 <span style="font-weight: bold">
@@ -44,7 +49,6 @@
             <div
               v-for="(columnItem, index) in form.column"
               :key="index"
-              class="column_item"
               draggable="true"
               @dragend="handleDragEnd($event, columnItem)"
               @dragenter="handleDragEnter($event, columnItem)"
@@ -53,7 +57,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">
+              <a-row :gutter="24" class="column_item">
                 <a-col :span="11">
                   <span style="font-weight: bold">
                     {{ columnItem.title }}
@@ -73,41 +77,9 @@
               </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-space>
-          <a-button type="default" @click="view">预览</a-button>
-          <a-button type="primary" @click="submit">保存</a-button>
-        </a-space>
+        <a-button type="primary" @click="view">操作</a-button>
       </a-col>
       <a-col :lg="12" :md="12" :sm="24" :xl="6" :xs="24">
         <a-card :bordered="false" size="small" style="overflow: auto" title="预览">
@@ -119,18 +91,18 @@
         </a-card>
       </a-col>
     </a-row>
-    <x-add-form ref="xAddForm"/>
+    <x-add-form ref="xAddForm" @onSubmit="submit"/>
   </a-drawer>
 </template>
 
 <script>
-import CreateSimpleFormQueryItem from './CreateSimpleFormQueryItem'
-import XAddForm from '@vue2-client/base-client/components/common/XAddForm/XAddForm'
+import XAddForm from '@vue2-client/base-client/components/common/XAddForm'
 import JsonViewer from 'vue-json-viewer'
 import FileSaver from 'file-saver'
 import { mapState } from 'vuex'
-import { post } from '@vue2-client/services/api'
+import CreateSimpleFormQueryItem from './CreateSimpleFormQueryItem'
 import { parseConfigUrl } from '@vue2-client/services/api/common'
+import { post } from '@vue2-client/services/api'
 
 export default {
   name: 'CreateSimpleFormQuery',
@@ -148,8 +120,8 @@ export default {
       labelCol: { span: 3 },
       wrapperCol: { span: 18 },
       form: {
-        group: '',
-        describe: '',
+        group: undefined,
+        describe: undefined,
         column: [],
         apiSlotView: [],
         apiSlot: {},
@@ -159,10 +131,6 @@ export default {
       selectIndex: null,
       selectType: undefined,
       joinArray: [],
-      rules: {
-        group: [{ required: true, message: '请输入参数组名称', trigger: 'blur' }],
-        describe: [{ required: true, message: '请输入参数组描述', trigger: 'blur' }]
-      },
       ending: null,
       dragging: null,
       // 操作按钮状态集合
@@ -182,20 +150,34 @@ export default {
     this.initView()
   },
   computed: {
-    ...mapState('setting', ['isMobile'])
+    ...mapState('setting', ['isMobile']),
+    rules () {
+      return this.asAParamsGroup ? {
+        group: [{ required: true, message: '请输入参数组名称', trigger: 'blur' }],
+        describe: [{ required: true, message: '请输入参数组描述', trigger: 'blur' }]
+      } : {}
+    },
   },
   props: {
     visible: {
       type: Boolean,
       default: false
     },
-    serviceName: {
-      type: String,
-      default: undefined
+    asAParamsGroup: {
+      type: Boolean,
+      default: false
     },
     toEditJson: {
       type: Object,
       default: () => {}
+    },
+    saveExportJson: {
+      type: Boolean,
+      default: false
+    },
+    serviceName: {
+      type: String,
+      default: undefined
     }
   },
   watch: {
@@ -214,8 +196,6 @@ export default {
         // 处理具体表单项
         this.form = Object.assign(
           {
-            group: '',
-            describe: '',
             apiSlotView: [],
             apiSlot: {},
             column: []
@@ -290,6 +270,7 @@ export default {
       this.result = {}
     },
     onClose () {
+      this.$emit('close')
       this.$emit('update:visible', false)
     },
     addJoinItem () {
@@ -298,7 +279,7 @@ export default {
     },
     itemHandle (item, type) {
       this.itemMap[item.key] = item
-      if (type === '新增') {
+      if (this.type === '新增') {
         this.form.column.push(item)
       } else {
         this.$set(this.form.column, this.selectIndex, item)
@@ -314,6 +295,7 @@ 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
@@ -349,8 +331,6 @@ 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' })
@@ -391,22 +371,25 @@ export default {
                 businessType: '新增',
                 title: '效果预览',
                 formItems: res.formJson,
-                serviceName: this.serviceName,
-                viewMode: true
+                serviceName: this.serviceName
               })
             })
           })
         }
       })
     },
-    submit () {
+    submit (params, callback) {
       this.$refs.businessCreateForm.validate(valid => {
-        if (valid) {
-          this.viewHandle(() => {
-            // saveQueryParams
+        this.viewHandle(() => {
+          if (this.saveExportJson) {
             this.exportJson()
-          })
-        }
+          } else {
+            this.$emit('saveQueryParams', this.result)
+            if (callback) {
+              callback()
+            }
+          }
+        })
       })
     },
     // 判断是否为json字符串
@@ -455,7 +438,7 @@ export default {
 }
 </script>
 <style lang="less" scoped>
-.column_item :hover {
+.column_item:hover {
   background-color:rgba(64, 169, 255,0.25);
 }
 .dragTips{