vue2-client 1.8.16 → 1.8.18

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{

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

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

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

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/XFormTable/XFormTable.vue

@@ -46,7 +46,7 @@
       </template>
       <template v-else>
         <a-empty>
-          <span slot="description"> 页面配置不存在，请联系系统管理员 </span>
+          <span slot="description"> 页面配置不存在请联系系统管理员， </span>
         </a-empty>
       </template>
     </div>
@@ -239,6 +239,26 @@ export default {
         return false
       }
     },
+    active (props) {
+      let num = false
+      for (const key in props) {
+        // eslint-disable-next-line no-prototype-builtins
+        if (this.$props.hasOwnProperty(key)) {
+          console.log('key', this.$props[key] instanceof Object)
+          if (this.$props[key] instanceof Object) {
+            this.$props[key] = JSON.parse(props[key])
+          } else {
+            this.$props[key] = props[key]
+          }
+          num = true
+        }
+        console.log(key, props[key])
+      }
+      console.warn('activeProps', this.$props)
+      if (num) {
+        this.initConfig()
+      }
+    },
     /**
      * 提交新增/修改表单后事件
      */
@@ -338,6 +358,22 @@ export default {
      */
     refreshTable (toFirstPage = true) {
       this.$refs.xTable.refresh(toFirstPage)
+    },
+  },
+  action: {
+    /**
+     * 实现doAction方法
+     */
+    doAction (actionType, args, data) {
+      switch (actionType) {
+        case 'refreshTable':
+          for (const item in args) {
+            console.log('item', item)
+          }
+          break
+        default:
+          break
+      }
     }
   }
 }