vue2-client 1.7.11 → 1.7.13

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

@@ -2,46 +2,53 @@
   <div>
     <a-skeleton :loading="loading" :paragraph="{ rows: 4 }" />
     <div v-show="!loading">
-      <x-add-form
-        ref="xAddForm"
-        @onSubmit="onAddOrEditSubmit"
-      />
-      <x-form
-        ref="xForm"
-        style="margin-bottom: 14px;"
-        @onSubmit="onSearchSubmit">
-        <slot name="formBtnExpand"></slot>
-      </x-form>
-      <x-table
-        ref="xTable"
-        :fixedQueryForm="fixedQueryForm"
-        :queryParamsName="queryParamsName"
-        :query-params-json="queryParamsJson"
-        :show-pagination="showPagination"
-        @add="add"
-        @edit="edit"
-        @afterDelete="afterDelete"
-        @action="action"
-        @selectRow="selectRow"
-        @afterQuery="afterQuery"
-        @tempTableEdit="tempTableEdit">
-        <template slot="leftButton" slot-scope="{selectedRowKeys, selectedRows}">
-          <slot name="leftButton" :selectedRowKeys="selectedRowKeys" :selectedRows="selectedRows"></slot>
-        </template>
-        <template slot="button" slot-scope="{selectedRowKeys, selectedRows}">
-          <slot name="button" :selectedRowKeys="selectedRowKeys" :selectedRows="selectedRows"></slot>
-        </template>
-        <template slot="rightBtnExpand" slot-scope="{selectedRowKeys, selectedRows}">
-          <slot name="rightBtnExpand" :selectedRowKeys="selectedRowKeys" :selectedRows="selectedRows"></slot>
-          <a-button @click="toggleIsFormShow">
-            <a-icon :style="iconStyle" type="vertical-align-top"/>
-          </a-button>
-        </template>
-        <!-- 底部插槽 -->
-        <template slot="footer" slot-scope="{selectedRowKeys, selectedRows}">
-          <slot name="footer" :selectedRowKeys="selectedRowKeys" :selectedRows="selectedRows"></slot>
-        </template>
-      </x-table>
+      <template v-if="!loadError">
+        <x-add-form
+          ref="xAddForm"
+          @onSubmit="onAddOrEditSubmit"
+        />
+        <x-form
+          ref="xForm"
+          style="margin-bottom: 14px;"
+          @onSubmit="onSearchSubmit">
+          <slot name="formBtnExpand"></slot>
+        </x-form>
+        <x-table
+          ref="xTable"
+          :fixedQueryForm="fixedQueryForm"
+          :queryParamsName="queryParamsName"
+          :query-params-json="queryParamsJson"
+          :show-pagination="showPagination"
+          @add="add"
+          @edit="edit"
+          @afterDelete="afterDelete"
+          @action="action"
+          @selectRow="selectRow"
+          @afterQuery="afterQuery"
+          @tempTableEdit="tempTableEdit">
+          <template slot="leftButton" slot-scope="{selectedRowKeys, selectedRows}">
+            <slot name="leftButton" :selectedRowKeys="selectedRowKeys" :selectedRows="selectedRows"></slot>
+          </template>
+          <template slot="button" slot-scope="{selectedRowKeys, selectedRows}">
+            <slot name="button" :selectedRowKeys="selectedRowKeys" :selectedRows="selectedRows"></slot>
+          </template>
+          <template slot="rightBtnExpand" slot-scope="{selectedRowKeys, selectedRows}">
+            <slot name="rightBtnExpand" :selectedRowKeys="selectedRowKeys" :selectedRows="selectedRows"></slot>
+            <a-button @click="toggleIsFormShow">
+              <a-icon :style="iconStyle" type="vertical-align-top"/>
+            </a-button>
+          </template>
+          <!-- 底部插槽 -->
+          <template slot="footer" slot-scope="{selectedRowKeys, selectedRows}">
+            <slot name="footer" :selectedRowKeys="selectedRowKeys" :selectedRows="selectedRows"></slot>
+          </template>
+        </x-table>
+      </template>
+      <template v-else>
+        <a-empty>
+          <span slot="description"> 页面配置不存在，请联系系统管理员 </span>
+        </a-empty>
+      </template>
     </div>
   </div>
 </template>
@@ -70,6 +77,7 @@ export default {
         position: 'relative',
         top: '1px'
       },
+      loadError: false,
       // 实际查询配置内容
       realQueryConfig: {}
     }
@@ -143,44 +151,51 @@ export default {
   watch: {
     logicParam: {
       handler () {
-        this.getColumnJsonByLogic()
+        this.initConfig()
       },
       deep: true
     },
     queryParamsJson: {
       handler () {
-        this.getConfigBySource()
+        this.initConfig()
       },
       deep: true
     },
     queryParamsName: {
       handler () {
-        this.getConfig()
+        this.initConfig()
       }
     }
   },
   created () {
-    if (this.queryParamsName) {
-      this.getConfig()
-    } else if (this.queryParamsJson) {
-      this.getConfigBySource()
-    }
+    this.initConfig()
   },
   methods: {
-    getConfig () {
+    initConfig () {
       this.loading = true
+      this.loadError = false
+      if (this.queryParamsName) {
+        this.getConfig()
+      } else if (this.queryParamsJson) {
+        this.getConfigBySource()
+      } else if (this.logicName && this.logicParam) {
+        this.getColumnJsonByLogic()
+      } else {
+        this.loading = false
+        this.loadError = true
+      }
+    },
+    getConfig () {
       getConfig(this.queryParamsName, this.serviceName, (res) => {
         this.updateComponents(res)
       })
     },
     getConfigBySource () {
-      this.loading = true
       parseConfig(this.queryParamsJson, 'CRUD_FORM', this.serviceName).then(res => {
         this.updateComponents(res, true)
       })
     },
     getColumnJsonByLogic () {
-      this.loading = true
       getConfigByLogic(this.logicName, this.logicParam, this.serviceName, (res) => {
         this.updateComponents(res, true)
       })
@@ -334,15 +349,6 @@ export default {
      */
     refreshTable (toFirstPage = true) {
       this.$refs.xTable.refresh(toFirstPage)
-    },
-    /**
-     * 设置固定查询表单
-     */
-    setFixedQueryForm (form, isRefreshTable) {
-      this.fixedQueryForm = form
-      if (isRefreshTable) {
-        this.refreshTable(true)
-      }
     }
   }
 }

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

@@ -324,7 +324,9 @@ export default {
      * 如果参数为 true, 则强制刷新到第一页
      */
     refresh (bool) {
-      this.$refs.table.refresh(bool)
+      this.$nextTick(() => {
+        this.$refs.table.refresh(bool)
+      })
     },
     /**
      * 格式化日期