vue2-client 1.7.14 → 1.7.16

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

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

@@ -20,18 +20,20 @@
       />
     </a-row>
     <a-row :gutter="16" v-for="(groupItem, groupIndex) in groupJsonData" :key="groupIndex">
-      <x-form-item
-        v-for="(item, index) in groupItem.groupItems"
-        :key="index"
-        :attr="item"
-        :disabled="itemDisabled(item)"
-        :files="files"
-        :form="form[groupItem.model]"
-        :images="images"
-        :service-name="serviceName"
-        mode="新增/修改"
-        :get-data-params="getDataParams"
-      />
+      <a-card :title="groupItem.name" :bordered="false" size="small">
+        <x-form-item
+          v-for="(item, index) in groupItem.groupItems"
+          :key="index"
+          :attr="item"
+          :disabled="itemDisabled(item)"
+          :files="files"
+          :form="form[groupItem.model]"
+          :images="images"
+          :service-name="serviceName"
+          mode="新增/修改"
+          :get-data-params="getDataParams"
+        />
+      </a-card>
     </a-row>
     <a-row :gutter="16" v-for="(item, key) in simpleFormJsonData" :key="'row' + key">
       <a-card :title="item.name" :bordered="false" size="small">

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

@@ -20,7 +20,7 @@
             v-for="(item, index) in groupItem.groupItems"
             :key="index"
             :attr="item"
-            :form="form"
+            :form="form[groupItem.model]"
             :service-name="serviceName"
             :get-data-params="getDataParams"
           />
@@ -123,50 +123,61 @@ export default {
       const formData = {}
       for (let i = 0; i < this.realJsonData.length; i++) {
         const item = this.realJsonData[i]
-        formData[item.model] = undefined
-        // 处理表单校验情况
-        if (item.rule) {
-          this.rules[item.model] = []
-          switch (item.rule.type) {
-            case 'number':
-            case 'integer':
-            case 'float':
-              let defaultValue
-              let message
-              switch (item.rule.type) {
-                case 'number':
-                  message = '数字'
-                  defaultValue = 0
-                  break
-                case 'integer':
-                  message = '整数'
-                  defaultValue = 0
-                  break
-                case 'float':
-                  message = '小数'
-                  defaultValue = 0.0
-                  break
-              }
-              this.rules[item.model].push({
-                type: item.rule.type,
-                message: item.name + '必须为' + message,
-                transform: (value) => {
-                  if (value && value.length !== 0) {
-                    return Number(value)
-                  } else {
-                    return defaultValue
-                  }
-                },
-                trigger: 'blur'
-              })
-              break
-          }
+        this.setFormProps(formData, item)
+      }
+      // 处理分组数据表单
+      for (let i = 0; i < this.groupJsonData.length; i++) {
+        const groupItem = this.groupJsonData[i]
+        formData[groupItem.model] = {}
+        for (let j = 0; j < groupItem.groupItems.length; j++) {
+          const item = groupItem.groupItems[j]
+          this.setFormProps(formData[groupItem.model], item)
         }
       }
       this.form = formData
       this.getDataParams = getDataParams
       this.loaded = true
     },
+    setFormProps (formData, item) {
+      formData[item.model] = undefined
+      if (item.rule) {
+        this.rules[item.model] = []
+        switch (item.rule.type) {
+          case 'number':
+          case 'integer':
+          case 'float':
+            let defaultValue
+            let message
+            switch (item.rule.type) {
+              case 'number':
+                message = '数字'
+                defaultValue = 0
+                break
+              case 'integer':
+                message = '整数'
+                defaultValue = 0
+                break
+              case 'float':
+                message = '小数'
+                defaultValue = 0.0
+                break
+            }
+            this.rules[item.model].push({
+              type: item.rule.type,
+              message: item.name + '必须为' + message,
+              transform: (value) => {
+                if (value && value.length !== 0) {
+                  return Number(value)
+                } else {
+                  return defaultValue
+                }
+              },
+              trigger: 'blur'
+            })
+            break
+        }
+      }
+    },
     toggleAdvanced () {
       this.advanced = !this.advanced
     },

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

@@ -1,41 +1,41 @@
-import XForm from './common/XForm'
-import XAddForm from './common/XAddForm'
-import XAddNativeForm from './common/XAddNativeForm'
-import XFormCol from './common/XFormCol'
-import XTable from './common/XTable'
-import XTreeOne from './common/XTreeOne'
-import XImportExcel from './common/XImportExcel'
-import XDataDrawer from './common/XDataDrawer'
-import XCard from './common/XCard'
-import XBadge from './common/XBadge'
-import Upload from './common/Upload'
-import JSONToTree from './common/JSONToTree'
-import FormGroupEdit from './common/FormGroupEdit'
-import FormGroupQuery from './common/FormGroupQuery'
-import AddressSearchCombobox from './common/AddressSearchCombobox'
-import AmapMarker from './common/AmapMarker'
-import CreateQuery from './common/CreateQuery'
-import CreateSimpleFormQuery from './common/CreateSimpleFormQuery'
-import PersonSetting from './common/PersonSetting'
-
-export default {
-  XForm,
-  XAddForm,
-  XAddNativeForm,
-  XFormCol,
-  XTable,
-  XTreeOne,
-  XImportExcel,
-  XDataDrawer,
-  XCard,
-  XBadge,
-  Upload,
-  JSONToTree,
-  FormGroupEdit,
-  FormGroupQuery,
-  AddressSearchCombobox,
-  AmapMarker,
-  CreateQuery,
-  CreateSimpleFormQuery,
-  PersonSetting
-}
+import XForm from './common/XForm'
+import XAddForm from './common/XAddForm'
+import XAddNativeForm from './common/XAddNativeForm'
+import XFormCol from './common/XFormCol'
+import XTable from './common/XTable'
+import XTreeOne from './common/XTreeOne'
+import XImportExcel from './common/XImportExcel'
+import XDataDrawer from './common/XDataDrawer'
+import XCard from './common/XCard'
+import XBadge from './common/XBadge'
+import Upload from './common/Upload'
+import JSONToTree from './common/JSONToTree'
+import FormGroupEdit from './common/FormGroupEdit'
+import FormGroupQuery from './common/FormGroupQuery'
+import AddressSearchCombobox from './common/AddressSearchCombobox'
+import AmapMarker from './common/AmapMarker'
+import CreateQuery from './common/CreateQuery'
+import CreateSimpleFormQuery from './common/CreateSimpleFormQuery'
+import PersonSetting from './common/PersonSetting'
+
+export default {
+  XForm,
+  XAddForm,
+  XAddNativeForm,
+  XFormCol,
+  XTable,
+  XTreeOne,
+  XImportExcel,
+  XDataDrawer,
+  XCard,
+  XBadge,
+  Upload,
+  JSONToTree,
+  FormGroupEdit,
+  FormGroupQuery,
+  AddressSearchCombobox,
+  AmapMarker,
+  CreateQuery,
+  CreateSimpleFormQuery,
+  PersonSetting
+}

package/src/config/CreateQueryConfig.js

@@ -29,7 +29,7 @@ module.exports = {
     {
       label: '字段组存储',
       value: 'group',
-      noMatch: ['file', 'image', 'textarea', 'personSetting']
+      noMatch: []
     }
   ],
   // 表单类型