vue2-client 1.7.8 → 1.7.10-test

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

@@ -66,7 +66,7 @@
             </a-form-model-item>
           </a-card>
         </a-col>
-        <a-col :span="9">
+        <a-col v-show="!dataMode.group && (dataMode.queryForm || dataMode.addOrEditForm || dataMode.table || dataMode.sqlQueryCondition)" :span="9">
           <a-card v-if="dataMode.queryForm || dataMode.addOrEditForm || dataMode.table || dataMode.sqlQueryCondition" :bodyStyle="bodyStyle" title="核心配置">
             <template v-if="dataMode.queryForm || dataMode.addOrEditForm || dataMode.sqlQueryCondition">
               <a-divider style="font-size: 14px;margin-top: 0">表单配置</a-divider>
@@ -193,7 +193,7 @@
             </template>
           </a-card>
         </a-col>
-        <a-col v-if="item.formType" :span="9">
+        <a-col v-if="!dataMode.group && item.formType && (((dataMode.addOrEditForm || dataMode.queryForm ) && (item.formType === 'input' || item.formType === 'select')) || (dataMode.table && item.formType !== 'file' && item.formType !== 'image') || selectDataShow)" :span="9">
           <a-card :bodyStyle="bodyStyle" title="扩展属性">
             <template v-if="(dataMode.addOrEditForm || dataMode.queryForm ) && (item.formType === 'input' || item.formType === 'select')">
               <a-divider style="font-size: 14px;margin-top: 0">提示相关</a-divider>
@@ -307,6 +307,101 @@
             </template>
           </a-card>
         </a-col>
+        <a-col :span="18" v-if="dataMode.group">
+          <a-card :bodyStyle="bodyStyle" title="数据字段">
+            <a-row :gutter="24">
+              <a-col :span="8">
+                <span style="font-weight: bold">
+                  标签名
+                </span>
+              </a-col>
+              <a-col :span="7">
+                <span style="font-weight: bold">
+                  字段名
+                </span>
+              </a-col>
+              <a-col :span="7">
+                <span style="font-weight: bold">
+                  数据模式
+                </span>
+              </a-col>
+              <a-col :span="2">
+                <span style="font-weight: bold">
+                  操作
+                </span>
+              </a-col>
+            </a-row>
+            <a-divider style="margin: 6px 0" />
+            <div
+              v-for="(columnItem, index) in item.column"
+              :key="index"
+              draggable="true"
+              @dragend="handleDragEnd($event, columnItem)"
+              @dragenter="handleDragEnter($event, columnItem)"
+              @dragstart="handleDragStart($event, columnItem)"
+              @dragover.prevent="handleDragOver($event, columnItem)">
+              <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-col :span="7">
+                  <span style="font-weight: bold">
+                    {{ columnItem.title }}
+                  </span>
+                </a-col>
+                <a-col :span="7">
+                  <span style="font-weight: bold">
+                    {{ columnItem.key }}
+                  </span>
+                </a-col>
+                <a-col :span="8">
+                  <a-tooltip>
+                    <template slot="title">
+                      查询表单项
+                    </template>
+                    <a-tag :color="columnItem.dataModeArray && columnItem.dataModeArray.includes('queryForm') ? 'blue' : 'rgba(0, 0, 0, 0.25)'"><a-icon type="file-search" /></a-tag>
+                  </a-tooltip>
+                  <a-tooltip>
+                    <template slot="title">
+                      表格列
+                    </template>
+                    <a-tag :color="columnItem.dataModeArray && columnItem.dataModeArray.includes('table') ? 'orange' : 'rgba(0, 0, 0, 0.25)'"><a-icon type="table" /></a-tag>
+                  </a-tooltip>
+                  <a-tooltip>
+                    <template slot="title">
+                      新增/修改表单项
+                    </template>
+                    <a-tag :color="columnItem.dataModeArray && columnItem.dataModeArray.includes('addOrEditForm') ? 'green' : 'rgba(0, 0, 0, 0.25)'"><a-icon type="form" /></a-tag>
+                  </a-tooltip>
+                  <a-tooltip>
+                    <template slot="title">
+                      SQL查询项
+                    </template>
+                    <a-tag :color="columnItem.dataModeArray && columnItem.dataModeArray.includes('sqlQueryItem') ? 'cyan' : 'rgba(0, 0, 0, 0.25)'"><a-icon type="bars" /></a-tag>
+                  </a-tooltip>
+                  <a-tooltip>
+                    <template slot="title">
+                      SQL查询表达式
+                    </template>
+                    <a-tag :color="columnItem.dataModeArray && columnItem.dataModeArray.includes('sqlQueryCondition') ? 'purple' : 'rgba(0, 0, 0, 0.25)'"><a-icon type="search" /></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>
+                </a-col>
+                <a-col :span="1">
+                  <a-icon type="edit" @click="editColumnItem(columnItem.key,index)"/>
+                </a-col>
+                <a-col :span="1">
+                  <a-icon type="close" @click="removeColumnItem(columnItem.key,index)"/>
+                </a-col>
+              </a-row>
+            </div>
+          </a-card>
+        </a-col>
       </a-row>
       <a-alert
         v-if="dataModeArrayData.length === 0"
@@ -333,6 +428,7 @@
         style="margin-top: 5px"
         type="info"/>
     </a-form-model>
+    <create-query-item ref="queryItem" @getColumn="getColumnItem" @itemHandle="itemHandleItem"/>
   </a-modal>
 </template>
 
@@ -451,6 +547,7 @@ export default {
         rule: {
           required: 'false'
         },
+        column: [],
         queryType: '=',
         formType: 'input',
         accept: undefined,
@@ -484,7 +581,11 @@ export default {
         pathKey: [{ required: true, message: '请选择上传到的扩展目录', trigger: 'blur' }]
       },
       // 字典键集合
-      option: []
+      option: [],
+      selectIndex: null,
+      ending: null,
+      dragging: null,
+      itemMap: {}
     }
   },
   mounted () {
@@ -551,6 +652,18 @@ export default {
       this.item = _item
       this.dataModeArrayData = this.item.dataModeArray
       this.flashModal()
+
+      for (const columnItem of this.item.column) {
+        this.itemMap[columnItem.key] = Object.assign({
+          key: '',
+          title: '',
+          slot: {},
+          rule: {
+            required: 'false'
+          },
+          dataModeArray: []
+        }, columnItem)
+      }
     },
     // 增加数据字段前数据处理
     addColumnItemExecute () {
@@ -720,7 +833,73 @@ export default {
         _item.slot.actionText = _item.actionText
         delete _item.actionText
       }
-    }
+    },
+    // 拖拽事件
+    handleDragStart (e, item) {
+      this.dragging = item
+    },
+    handleDragEnd (e, item) {
+      if (this.ending.key === this.dragging.key) {
+        return
+      }
+      const newItems = [...this.item.column]
+      const src = newItems.indexOf(this.dragging)
+      const dst = newItems.indexOf(this.ending)
+      // newItems.splice(src, 1, ...newItems.splice(dst, 1, newItems[src]))  替换位置
+      // 挪移位置
+      newItems.splice(src, 1)
+      newItems.splice(dst, 0, this.dragging)
+      this.item.column = newItems
+      this.$nextTick(() => {
+        this.dragging = null
+        this.ending = null
+      })
+    },
+    handleDragOver (e) {
+      // 首先把div变成可以放置的元素，即重写dragenter/dragover
+      // e.dataTransfer.dropEffect="move";//在dragenter中针对放置目标来设置!
+      e.dataTransfer.dropEffect = 'move'
+    },
+    handleDragEnter (e, item) {
+      // 为需要移动的元素设置dragstart事件
+      e.dataTransfer.effectAllowed = 'move'
+      this.ending = item
+    },
+    editColumnItem (key, index) {
+      if (this.itemMap[key]) {
+        this.selectIndex = index
+        this.$refs.queryItem.editColumnItemExecute(this.itemMap[key])
+      } else {
+        this.$message.warn('编辑失败')
+      }
+    },
+    removeColumnItem (key, index) {
+      const _this = this
+      this.$confirm({
+        title: '您确定要删除该数据项？',
+        content: '删除的数据项无法恢复',
+        okText: '确定',
+        okType: 'danger',
+        cancelText: '取消',
+        onOk () {
+          delete _this.itemMap[key]
+          _this.item.column.splice(index, 1)
+        }
+      })
+    },
+    getColumnItem (callback) {
+      callback(JSON.parse(JSON.stringify(this.item.column)))
+    },
+    itemHandleItem (item, type) {
+      this.itemMap[item.key] = item
+      if (type === '新增') {
+        this.item.column.push(item)
+      } else {
+        this.$set(this.item.column, this.selectIndex, item)
+      }
+      this.$message.success(`${type}成功`)
+      this.$refs.queryItem.flashModal(false)
+    },
   }
 }
 </script>
@@ -730,4 +909,15 @@ export default {
    text-align: center;
    padding: 0 10px;
  }
+ .column_item:hover {
+   background-color:rgba(64, 169, 255,0.25);
+ }
+ .dragTips{
+   display:block;
+   text-align: center;
+   border:1px dashed rgba(64, 169, 255,0.55);
+ }
+ .dragTipsWarp{
+   padding: .5rem 2rem;
+ }
 </style>

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

@@ -1,210 +1,210 @@
-<template>
-  <div>
-    <a-input
-      @click="inputClick"
-      :value="valueView"
-      style="cursor:pointer"
-      readOnly/>
-    <a-modal
-      v-if="visible"
-      v-model="visible"
-      :title="placeholder"
-      :z-index="1031"
-      :bodyStyle="{ maxHeight: '68vh', overflowY: 'auto' }"
-      @ok="handleOk"
-      @close="visible=false"
-    >
-      <!-- 搜索框 -->
-      <a-input-search :value="searchValue" style="margin-bottom: 8px" placeholder="搜索" @change="handleSearch"/>
-      <!-- 树形图 -->
-      <a-tree
-        v-model="checkedKeys"
-        :expanded-keys="expandedKeys"
-        :selectable="false"
-        checkable
-        @expand="onExpand"
-      >
-        <!-- department -->
-        <a-tree-node
-          v-for="department in treeData"
-          v-show="!department.hidden"
-          :key="department.key"
-          :title="department.title">
-          <!-- person -->
-          <a-tree-node v-for="person in department.children" v-show="!person.hidden" :key="person.key">
-            <!-- 搜索关键词红色 -->
-            <template slot="title">
-              <span v-if="person.title.indexOf(searchValue) > -1">
-                {{ person.title.substr(0, person.title.indexOf(searchValue)) }}
-                <span style="color: #f50">{{ searchValue }}</span>
-                {{ person.title.substr(person.title.indexOf(searchValue) + searchValue.length) }}
-              </span>
-              <span v-else>{{ person.title }}</span>
-            </template>
-          </a-tree-node>
-        </a-tree-node>
-      </a-tree>
-    </a-modal>
-  </div>
-</template>
-
-<script>
-import { commonApi, post } from '@vue2-client/services/api'
-
-const departments = ['运维部', '项目部', '项目一部', '项目二部', '开发部', '售后部', '办公室', '管理员', '软件工程部', 'IC卡部', '销售部']
-
-export default {
-  name: 'PersonSetting',
-  data () {
-    return {
-      searchValue: '',
-      treeData: [],
-      checkedKeys: [],
-      expandedKeys: [],
-      sourceTreeData: [],
-      visible: false,
-      valueView: this.placeholder
-    }
-  },
-  props: {
-    buttonText: {
-      type: String,
-      default: '选择人员'
-    },
-    placeholder: {
-      type: String,
-      default: '请选择人员'
-    },
-    value: {
-      type: Array,
-      default: () => []
-    },
-    // // 返回数据类型 String,Array 发现返回类型只能有一个
-    // type: {
-    //   type: String,
-    //   default: 'Array'
-    // },
-    // 返回数据字段 name , id
-    field: {
-      type: String,
-      default: 'name'
-    },
-  },
-  model: {
-    prop: 'value',
-    event: 'onOk'
-  },
-  watch: {},
-  components: {},
-  created () {
-    post(commonApi.getEmpTree, {}).then(res => {
-      this.sourceTreeData = res
-    })
-  },
-  methods: {
-    inputClick () {
-      this.visible = true
-      this.searchValue = ''
-      this.treeData = this.sourceTreeData
-      if (this.value.length > 0) {
-        this.checkedKeys = this.getCheckedKeys(this.value)
-      }
-      this.expandedKeys = []
-    },
-    // 获取选择得key
-    getCheckedKeys (arr) {
-      const brr = []
-      this.treeData.forEach(item => {
-          adaptToChildrenList(item)
-      })
-      function adaptToChildrenList (o) {
-        if (arr.some(item => o.key.indexOf(item) > -1)) {
-          brr.push(o.key)
-        }
-        if (o.children) {
-          for (const c of o.children) {
-            adaptToChildrenList(c)
-          }
-        }
-      }
-      return brr
-    },
-    handleOk () {
-      this.$emit('onOk', this.allPerson())
-      this.visible = false
-    },
-    onExpand (expandedKeys) {
-      this.expandedKeys = expandedKeys
-    },
-    // 搜索处理
-    handleSearch (e) {
-      const value = e.target.value.trim()
-      if (!value) {
-        this.treeData = this.sourceTreeData
-        this.expandedKeys = []
-        this.searchValue = ''
-        return
-      }
-      const expandedKeys = []
-      const treeData = JSON.parse(JSON.stringify(this.sourceTreeData))
-      // 过滤结果
-      for (const department of treeData) {
-        if (department.key.includes(value)) {
-          continue
-        }
-        let hasChildren = false
-        if (department.children) {
-          for (const person of department.children) {
-            if (!person.key.includes(value)) {
-              person.hidden = true
-            } else {
-              hasChildren = true
-            }
-          }
-        }
-        if (!hasChildren) {
-          department.hidden = true
-        } else {
-          expandedKeys.push(department.key)
-        }
-      }
-      this.treeData = treeData
-      this.expandedKeys = expandedKeys
-      this.searchValue = value
-    },
-    allPerson () {
-      const index = this.type === 'id' ? 1 : 0
-      const _allPerson = this.checkedKeys.filter(value => !departments.includes(value)).map(item => item.split('_')[index])
-      this.valueView = this.checkedKeys.filter(value => !departments.includes(value)).map(item => item.split('_')[0]).join(',')
-      return _allPerson
-    }
-  },
-}
-</script>
-<style lang="less" scoped>
-.ant-tree-title {
-  width: 100%;
-}
-
-.title {
-  float: left;
-}
-
-.ant-card-body {
-  :global {
-    .ant-tree {
-      line-height: 3;
-
-      li {
-        position: relative;
-      }
-    }
-  }
-}
-
-.ant-card-body .but_type {
-  float: right;
-  position: absolute;
-  right: 40px;
-}
-</style>
+<template>
+  <div>
+    <a-input
+      @click="inputClick"
+      :value="valueView"
+      style="cursor:pointer"
+      readOnly/>
+    <a-modal
+      v-if="visible"
+      v-model="visible"
+      :title="placeholder"
+      :z-index="1031"
+      :bodyStyle="{ maxHeight: '68vh', overflowY: 'auto' }"
+      @ok="handleOk"
+      @close="visible=false"
+    >
+      <!-- 搜索框 -->
+      <a-input-search :value="searchValue" style="margin-bottom: 8px" placeholder="搜索" @change="handleSearch"/>
+      <!-- 树形图 -->
+      <a-tree
+        v-model="checkedKeys"
+        :expanded-keys="expandedKeys"
+        :selectable="false"
+        checkable
+        @expand="onExpand"
+      >
+        <!-- department -->
+        <a-tree-node
+          v-for="department in treeData"
+          v-show="!department.hidden"
+          :key="department.key"
+          :title="department.title">
+          <!-- person -->
+          <a-tree-node v-for="person in department.children" v-show="!person.hidden" :key="person.key">
+            <!-- 搜索关键词红色 -->
+            <template slot="title">
+              <span v-if="person.title.indexOf(searchValue) > -1">
+                {{ person.title.substr(0, person.title.indexOf(searchValue)) }}
+                <span style="color: #f50">{{ searchValue }}</span>
+                {{ person.title.substr(person.title.indexOf(searchValue) + searchValue.length) }}
+              </span>
+              <span v-else>{{ person.title }}</span>
+            </template>
+          </a-tree-node>
+        </a-tree-node>
+      </a-tree>
+    </a-modal>
+  </div>
+</template>
+
+<script>
+import { commonApi, post } from '@vue2-client/services/api'
+
+const departments = ['运维部', '项目部', '项目一部', '项目二部', '开发部', '售后部', '办公室', '管理员', '软件工程部', 'IC卡部', '销售部']
+
+export default {
+  name: 'PersonSetting',
+  data () {
+    return {
+      searchValue: '',
+      treeData: [],
+      checkedKeys: [],
+      expandedKeys: [],
+      sourceTreeData: [],
+      visible: false,
+      valueView: this.placeholder
+    }
+  },
+  props: {
+    buttonText: {
+      type: String,
+      default: '选择人员'
+    },
+    placeholder: {
+      type: String,
+      default: '请选择人员'
+    },
+    value: {
+      type: Array,
+      default: () => []
+    },
+    // // 返回数据类型 String,Array 发现返回类型只能有一个
+    // type: {
+    //   type: String,
+    //   default: 'Array'
+    // },
+    // 返回数据字段 name , id
+    field: {
+      type: String,
+      default: 'name'
+    },
+  },
+  model: {
+    prop: 'value',
+    event: 'onOk'
+  },
+  watch: {},
+  components: {},
+  created () {
+    post(commonApi.getEmpTree, {}).then(res => {
+      this.sourceTreeData = res
+    })
+  },
+  methods: {
+    inputClick () {
+      this.visible = true
+      this.searchValue = ''
+      this.treeData = this.sourceTreeData
+      if (this.value.length > 0) {
+        this.checkedKeys = this.getCheckedKeys(this.value)
+      }
+      this.expandedKeys = []
+    },
+    // 获取选择得key
+    getCheckedKeys (arr) {
+      const brr = []
+      this.treeData.forEach(item => {
+          adaptToChildrenList(item)
+      })
+      function adaptToChildrenList (o) {
+        if (arr.some(item => o.key.indexOf(item) > -1)) {
+          brr.push(o.key)
+        }
+        if (o.children) {
+          for (const c of o.children) {
+            adaptToChildrenList(c)
+          }
+        }
+      }
+      return brr
+    },
+    handleOk () {
+      this.$emit('onOk', this.allPerson())
+      this.visible = false
+    },
+    onExpand (expandedKeys) {
+      this.expandedKeys = expandedKeys
+    },
+    // 搜索处理
+    handleSearch (e) {
+      const value = e.target.value.trim()
+      if (!value) {
+        this.treeData = this.sourceTreeData
+        this.expandedKeys = []
+        this.searchValue = ''
+        return
+      }
+      const expandedKeys = []
+      const treeData = JSON.parse(JSON.stringify(this.sourceTreeData))
+      // 过滤结果
+      for (const department of treeData) {
+        if (department.key.includes(value)) {
+          continue
+        }
+        let hasChildren = false
+        if (department.children) {
+          for (const person of department.children) {
+            if (!person.key.includes(value)) {
+              person.hidden = true
+            } else {
+              hasChildren = true
+            }
+          }
+        }
+        if (!hasChildren) {
+          department.hidden = true
+        } else {
+          expandedKeys.push(department.key)
+        }
+      }
+      this.treeData = treeData
+      this.expandedKeys = expandedKeys
+      this.searchValue = value
+    },
+    allPerson () {
+      const index = this.type === 'id' ? 1 : 0
+      const _allPerson = this.checkedKeys.filter(value => !departments.includes(value)).map(item => item.split('_')[index])
+      this.valueView = this.checkedKeys.filter(value => !departments.includes(value)).map(item => item.split('_')[0]).join(',')
+      return _allPerson
+    }
+  },
+}
+</script>
+<style lang="less" scoped>
+.ant-tree-title {
+  width: 100%;
+}
+
+.title {
+  float: left;
+}
+
+.ant-card-body {
+  :global {
+    .ant-tree {
+      line-height: 3;
+
+      li {
+        position: relative;
+      }
+    }
+  }
+}
+
+.ant-card-body .but_type {
+  float: right;
+  position: absolute;
+  right: 40px;
+}
+</style>

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