vue2-client 1.6.63-single → 1.7.1

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

@@ -1,138 +1,144 @@
-<template>
-  <a-drawer
-    title="选择参数组"
-    placement="right"
-    :width="isMobile ? screenWidth : screenWidth * 0.85"
-    :visible="visible"
-    @close="onClose"
-  >
-    <x-add-form
-      ref="xAddForm"
-      @onSubmit="onAddOrEditSubmit"/>
-    <a-list
-      :grid="{gutter: 24, lg: 4, md: 3, sm: 1, xs: 1}"
-      :dataSource="columnJson.groups"
-    >
-      <a-list-item slot="renderItem" slot-scope="item">
-        <a-card :hoverable="true" @click="toEdit(item)">
-          <a-card-meta >
-            <div style="margin-bottom: 3px" slot="title">{{ item.group }}</div>
-            <a-icon type="tags" slot="avatar" :style="{ fontSize:'2em' }"/>
-            <div class="meta-content" slot="description">{{ item.describe }}</div>
-          </a-card-meta>
-        </a-card>
-      </a-list-item>
-    </a-list>
-  </a-drawer>
-</template>
-
-<script>
-import { mapState } from 'vuex'
-import XAddForm from '@vue2-client/base-client/components/common/XAddForm/XAddForm'
-import { commonApi, post } from '@vue2-client/services/api'
-
-export default {
-  name: 'FormGroupEdit',
-  components: {
-    XAddForm
-  },
-  data () {
-    return {
-      // 页面宽度
-      screenWidth: document.documentElement.clientWidth,
-      columnJson: {},
-      formObj: {
-        groupName: '',
-        formJson: []
-      }
-    }
-  },
-  mounted () {
-    this.initView()
-  },
-  computed: {
-    ...mapState('setting', ['isMobile'])
-  },
-  props: {
-    visible: {
-      type: Boolean,
-      default: false
-    },
-    modifyModelData: {
-      type: Object,
-      default: () => {
-        return {}
-      }
-    }
-  },
-  watch: {
-    visible (rel) {
-      if (rel) {
-        this.initView()
-      }
-    }
-  },
-  methods: {
-    // 初始化组件
-    initView () {
-      this.$emit('getColumnJson', val => {
-        this.columnJson = val
-      })
-    },
-    toEdit (item) {
-      post(commonApi.getColumnsJson, { queryObject: item }).then(res => {
-        this.formObj = res
-        const modifyModelData = { data: this.modifyModelData[res.groupName] }
-        this.$refs.xAddForm.init({
-          businessType: '修改',
-          title: '参数项',
-          formItems: res.formJson,
-          serviceName: res.serviceName,
-          modifyModelData: modifyModelData
-        })
-      })
-    },
-    onClose () {
-      this.$emit('update:visible', false)
-    },
-    onAddOrEditSubmit (res, callback) {
-      const requestParameters = {
-        paramsJson: {}
-      }
-      requestParameters.paramsJson[this.formObj.groupName] = {}
-      for (const key of Object.keys(res.realForm)) {
-        requestParameters.paramsJson[this.formObj.groupName][key] = res.realForm[key]
-      }
-      this.$emit('onSubmit', requestParameters, result => {
-        if (result) {
-          this.$message.success('提交成功！')
-        } else {
-          this.$message.error('提交失败！')
-        }
-        callback()
-      })
-    }
-  }
-}
-</script>
-<style lang="less" scoped>
-  .card-avatar {
-    width: 48px;
-    height: 48px;
-    border-radius: 48px;
-  }
-  .new-btn{
-    border-radius: 2px;
-    width: 100%;
-    height: 187px;
-  }
-  .meta-content{
-    position: relative;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    display: -webkit-box;
-    height: 64px;
-    -webkit-line-clamp: 3;
-    -webkit-box-orient: vertical;
-  }
-</style>
+<template>
+  <a-drawer
+    title="选择参数组"
+    placement="right"
+    :width="isMobile ? screenWidth : screenWidth * 0.85"
+    :visible="visible"
+    @close="onClose"
+  >
+    <x-add-form
+      ref="xAddForm"
+      @onSubmit="onAddOrEditSubmit"/>
+    <a-list
+      :grid="{gutter: 24, lg: 4, md: 3, sm: 1, xs: 1}"
+      :dataSource="columnJson.groups"
+    >
+      <a-list-item slot="renderItem" slot-scope="item">
+        <a-card :hoverable="true" @click="toEdit(item)">
+          <a-card-meta >
+            <div style="margin-bottom: 3px" slot="title">{{ item.group }}</div>
+            <a-icon type="tags" slot="avatar" :style="{ fontSize:'2em' }"/>
+            <div class="meta-content" slot="description">{{ item.describe }}</div>
+          </a-card-meta>
+        </a-card>
+      </a-list-item>
+    </a-list>
+  </a-drawer>
+</template>
+
+<script>
+import { mapState } from 'vuex'
+import XAddForm from '@vue2-client/base-client/components/common/XAddForm/XAddForm'
+import { post } from '@vue2-client/services/api'
+import { getConfigUrl } from '@vue2-client/services/api/common'
+
+export default {
+  name: 'FormGroupEdit',
+  components: {
+    XAddForm
+  },
+  data () {
+    return {
+      // 页面宽度
+      screenWidth: document.documentElement.clientWidth,
+      columnJson: {},
+      formObj: {
+        groupName: '',
+        formJson: []
+      }
+    }
+  },
+  mounted () {
+    this.initView()
+  },
+  computed: {
+    ...mapState('setting', ['isMobile'])
+  },
+  props: {
+    visible: {
+      type: Boolean,
+      default: false
+    },
+    serviceName: {
+      type: String,
+      default: undefined
+    },
+    modifyModelData: {
+      type: Object,
+      default: () => {
+        return {}
+      }
+    }
+  },
+  watch: {
+    visible (rel) {
+      if (rel) {
+        this.initView()
+      }
+    }
+  },
+  methods: {
+    // 初始化组件
+    initView () {
+      this.$emit('getColumnJson', val => {
+        this.columnJson = val
+      })
+    },
+    toEdit (item) {
+      const url = getConfigUrl(this.serviceName)
+      post(url, { queryObject: item }).then(res => {
+        this.formObj = res
+        const modifyModelData = { data: this.modifyModelData[res.groupName] }
+        this.$refs.xAddForm.init({
+          businessType: '修改',
+          title: '参数项',
+          formItems: res.formJson,
+          serviceName: res.serviceName,
+          modifyModelData: modifyModelData
+        })
+      })
+    },
+    onClose () {
+      this.$emit('update:visible', false)
+    },
+    onAddOrEditSubmit (res, callback) {
+      const requestParameters = {
+        paramsJson: {}
+      }
+      requestParameters.paramsJson[this.formObj.groupName] = {}
+      for (const key of Object.keys(res.realForm)) {
+        requestParameters.paramsJson[this.formObj.groupName][key] = res.realForm[key]
+      }
+      this.$emit('onSubmit', requestParameters, result => {
+        if (result) {
+          this.$message.success('提交成功！')
+        } else {
+          this.$message.error('提交失败！')
+        }
+        callback()
+      })
+    }
+  }
+}
+</script>
+<style lang="less" scoped>
+  .card-avatar {
+    width: 48px;
+    height: 48px;
+    border-radius: 48px;
+  }
+  .new-btn{
+    border-radius: 2px;
+    width: 100%;
+    height: 187px;
+  }
+  .meta-content{
+    position: relative;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    display: -webkit-box;
+    height: 64px;
+    -webkit-line-clamp: 3;
+    -webkit-box-orient: vertical;
+  }
+</style>

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

@@ -1,165 +1,165 @@
-<template>
-  <a-drawer
-    :visible="visible"
-    :width="isMobile ? screenWidth : screenWidth * 0.85"
-    placement="right"
-    title="表单参数组配置"
-    @close="onClose"
-  >
-    <create-simple-form-query
-      :to-edit-json="editItem()"
-      :visible.sync="createQueryVisible"
-      @saveSimpleFormQueryParams="saveQueryParams"
-    />
-    <a-list
-      :dataSource="columnJsonCopy()"
-      :grid="{gutter: 24, lg: 4, md: 3, sm: 1, xs: 1}"
-    >
-      <a-list-item slot="renderItem" slot-scope="item, index">
-        <template v-if="item.type">
-          <a-button class="new-btn" type="dashed" @click="toCreateQuery">
-            <a-icon type="plus" />新增参数组
-          </a-button>
-        </template>
-        <template v-else>
-          <a-card :hoverable="true">
-            <a-card-meta >
-              <div slot="title" style="margin-bottom: 3px">{{ item.group }}</div>
-              <a-icon slot="avatar" :style="{ fontSize:'2em' }" type="tags"/>
-              <div slot="description" class="meta-content">{{ item.describe }}</div>
-            </a-card-meta>
-            <a slot="actions" @click="toEditQuery(index)">编辑</a>
-            <a slot="actions" @click="toDelete(index)">删除</a>
-          </a-card>
-        </template>
-      </a-list-item>
-    </a-list>
-  </a-drawer>
-</template>
-
-<script>
-import { mapState } from 'vuex'
-import CreateSimpleFormQuery from '@vue2-client/base-client/components/common/CreateSimpleFormQuery'
-
-export default {
-  name: 'FormGroupQuery',
-  components: {
-    CreateSimpleFormQuery
-  },
-  data () {
-    return {
-      // 页面宽度
-      screenWidth: document.documentElement.clientWidth,
-      // 是否显示生成查询配置抽屉
-      createQueryVisible: false,
-      targetIndex: 0,
-      columnJson: {},
-      editIndex: -1
-    }
-  },
-  mounted () {
-    this.initView()
-  },
-  computed: {
-    ...mapState('setting', ['isMobile'])
-  },
-  props: {
-    visible: {
-      type: Boolean,
-      default: false
-    }
-  },
-  watch: {
-    visible (rel) {
-      if (rel) {
-        this.initView()
-      }
-    }
-  },
-  methods: {
-    // 初始化组件
-    initView () {
-      this.editIndex = -1
-      this.$emit('getColumnJson', val => {
-        this.columnJson = val
-      })
-    },
-    toCreateQuery () {
-      this.editIndex = -1
-      this.createQueryVisible = true
-    },
-    toEditQuery (index) {
-      this.editIndex = index
-      this.createQueryVisible = true
-    },
-    toDelete (index) {
-      const _this = this
-      this.$confirm({
-        title: '您确定要删除该参数组？',
-        content: '删除的参数组无法恢复',
-        okText: '确定',
-        okType: 'danger',
-        cancelText: '取消',
-        onOk () {
-          _this.columnJson.groups.splice(index, 1)
-          _this.$emit('saveQueryParams', _this.columnJson)
-        }
-      })
-    },
-    onClose () {
-      this.$emit('update:visible', false)
-    },
-    // 存储查询配置信息
-    saveQueryParams (source) {
-      if (!this.columnJson.groups) {
-        this.columnJson.groups = []
-      }
-      if (this.editIndex !== -1) {
-        this.columnJson.groups[this.editIndex] = source
-      } else {
-        this.columnJson.groups.push(source)
-      }
-      this.$emit('saveQueryParams', this.columnJson)
-      this.createQueryVisible = false
-    },
-    columnJsonCopy () {
-      let groups
-      if (this.columnJson.groups) {
-        groups = JSON.parse(JSON.stringify(this.columnJson.groups))
-      } else {
-        groups = []
-      }
-      groups.push({ type: 'add' })
-      return groups
-    },
-    editItem () {
-      if (this.editIndex !== -1) {
-        return JSON.parse(JSON.stringify(this.columnJson.groups[this.editIndex]))
-      } else {
-        return {}
-      }
-    }
-  }
-}
-</script>
-<style lang="less" scoped>
-  .card-avatar {
-    width: 48px;
-    height: 48px;
-    border-radius: 48px;
-  }
-  .new-btn{
-    border-radius: 2px;
-    width: 100%;
-    height: 187px;
-  }
-  .meta-content{
-    position: relative;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    display: -webkit-box;
-    height: 64px;
-    -webkit-line-clamp: 3;
-    -webkit-box-orient: vertical;
-  }
-</style>
+<template>
+  <a-drawer
+    :visible="visible"
+    :width="isMobile ? screenWidth : screenWidth * 0.85"
+    placement="right"
+    title="表单参数组配置"
+    @close="onClose"
+  >
+    <create-simple-form-query
+      :to-edit-json="editItem()"
+      :visible.sync="createQueryVisible"
+      @saveSimpleFormQueryParams="saveQueryParams"
+    />
+    <a-list
+      :dataSource="columnJsonCopy()"
+      :grid="{gutter: 24, lg: 4, md: 3, sm: 1, xs: 1}"
+    >
+      <a-list-item slot="renderItem" slot-scope="item, index">
+        <template v-if="item.type">
+          <a-button class="new-btn" type="dashed" @click="toCreateQuery">
+            <a-icon type="plus" />新增参数组
+          </a-button>
+        </template>
+        <template v-else>
+          <a-card :hoverable="true">
+            <a-card-meta >
+              <div slot="title" style="margin-bottom: 3px">{{ item.group }}</div>
+              <a-icon slot="avatar" :style="{ fontSize:'2em' }" type="tags"/>
+              <div slot="description" class="meta-content">{{ item.describe }}</div>
+            </a-card-meta>
+            <a slot="actions" @click="toEditQuery(index)">编辑</a>
+            <a slot="actions" @click="toDelete(index)">删除</a>
+          </a-card>
+        </template>
+      </a-list-item>
+    </a-list>
+  </a-drawer>
+</template>
+
+<script>
+import { mapState } from 'vuex'
+import CreateSimpleFormQuery from '@vue2-client/base-client/components/common/CreateSimpleFormQuery'
+
+export default {
+  name: 'FormGroupQuery',
+  components: {
+    CreateSimpleFormQuery
+  },
+  data () {
+    return {
+      // 页面宽度
+      screenWidth: document.documentElement.clientWidth,
+      // 是否显示生成查询配置抽屉
+      createQueryVisible: false,
+      targetIndex: 0,
+      columnJson: {},
+      editIndex: -1
+    }
+  },
+  mounted () {
+    this.initView()
+  },
+  computed: {
+    ...mapState('setting', ['isMobile'])
+  },
+  props: {
+    visible: {
+      type: Boolean,
+      default: false
+    }
+  },
+  watch: {
+    visible (rel) {
+      if (rel) {
+        this.initView()
+      }
+    }
+  },
+  methods: {
+    // 初始化组件
+    initView () {
+      this.editIndex = -1
+      this.$emit('getColumnJson', val => {
+        this.columnJson = val
+      })
+    },
+    toCreateQuery () {
+      this.editIndex = -1
+      this.createQueryVisible = true
+    },
+    toEditQuery (index) {
+      this.editIndex = index
+      this.createQueryVisible = true
+    },
+    toDelete (index) {
+      const _this = this
+      this.$confirm({
+        title: '您确定要删除该参数组？',
+        content: '删除的参数组无法恢复',
+        okText: '确定',
+        okType: 'danger',
+        cancelText: '取消',
+        onOk () {
+          _this.columnJson.groups.splice(index, 1)
+          _this.$emit('saveQueryParams', _this.columnJson)
+        }
+      })
+    },
+    onClose () {
+      this.$emit('update:visible', false)
+    },
+    // 存储查询配置信息
+    saveQueryParams (source) {
+      if (!this.columnJson.groups) {
+        this.columnJson.groups = []
+      }
+      if (this.editIndex !== -1) {
+        this.columnJson.groups[this.editIndex] = source
+      } else {
+        this.columnJson.groups.push(source)
+      }
+      this.$emit('saveQueryParams', this.columnJson)
+      this.createQueryVisible = false
+    },
+    columnJsonCopy () {
+      let groups
+      if (this.columnJson.groups) {
+        groups = JSON.parse(JSON.stringify(this.columnJson.groups))
+      } else {
+        groups = []
+      }
+      groups.push({ type: 'add' })
+      return groups
+    },
+    editItem () {
+      if (this.editIndex !== -1) {
+        return JSON.parse(JSON.stringify(this.columnJson.groups[this.editIndex]))
+      } else {
+        return {}
+      }
+    }
+  }
+}
+</script>
+<style lang="less" scoped>
+  .card-avatar {
+    width: 48px;
+    height: 48px;
+    border-radius: 48px;
+  }
+  .new-btn{
+    border-radius: 2px;
+    width: 100%;
+    height: 187px;
+  }
+  .meta-content{
+    position: relative;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    display: -webkit-box;
+    height: 64px;
+    -webkit-line-clamp: 3;
+    -webkit-box-orient: vertical;
+  }
+</style>