vue2-client 1.2.90 → 1.2.93-test1

package/src/base-client/all.js

@@ -1,64 +1,66 @@
-import Vue from 'vue'
-
-import CustomColumnsDrawer from '@vue2-client/base-client/components/common/CustomColumnsDrawer'
-import InstructDetailsView from '@vue2-client/base-client/components/iot/InstructDetailsView'
-import MeterDetailsView from '@vue2-client/base-client/components/iot/MeterDetailsView'
-import CustomerDetailsView from '@vue2-client/base-client/components/iot/CustomerDetailsView'
-import LogDetailsView from '@vue2-client/base-client/components/iot/LogDetailsView'
-import WebmeterAnalysisView from '@vue2-client/base-client/components/iot/WebmeterAnalysisView'
-import XCard from '@vue2-client/base-client/components/common/XCard/XCard'
-import XFormCol from '@vue2-client/base-client/components/common/XFormCol'
-import XBadge from '@vue2-client/base-client/components/common/XBadge'
-import DataAnalysisView from '@vue2-client/base-client/components/iot/DataAnalysisView'
-import DataAnalysisUser from '@vue2-client/base-client/components/iot/DataAnalysisUser'
-import SrcollList from '@vue2-client/base-client/components/common/ScrollList'
-import AmapPointRendering from '@vue2-client/base-client/components/common/AmapMarker'
-import DeviceTypeDetailsView from '@vue2-client/base-client/components/iot/DeviceTypeDetailsView'
-import DeviceBrandDetailsView from '@vue2-client/base-client/components/iot/DeviceBrandDetailsView'
-import DictionaryDetailsView from '@vue2-client/base-client/components/system/DictionaryDetailsView'
-import QueryParamsDetailsView from '@vue2-client/base-client/components/system/QueryParamsDetailsView'
-import DeviceDetailsView from '@vue2-client/base-client/components/iot/DeviceDetailsView'
-import TicketDetailsView from '@vue2-client/base-client/components/ticket/TicketDetailsView'
-import EmployeeDetailsView from '@vue2-client/base-client/components/ticket/EmployeeDetailsView'
-import submitTicketSuccess from '@vue2-client/base-client/components/ticket/TicketSubmitSuccessView'
-import CreateQuery from '@vue2-client/base-client/components/common/CreateQuery'
-import CreateSimpleFormQuery from '@vue2-client/base-client/components/common/CreateSimpleFormQuery'
-import FormGroupQuery from '@vue2-client/base-client/components/common/FormGroupQuery'
-import FormGroupEdit from '@vue2-client/base-client/components/common/FormGroupEdit'
-import JSONToTree from '@vue2-client/base-client/components/common/JSONToTree'
-import Upload from '@vue2-client/base-client/components/common/Upload'
-import AddressSearchCombobox from '@vue2-client/base-client/components/common/AddressSearchCombobox'
-import CitySelect from '@vue2-client/base-client/components/common/CitySelect'
-// 插件
-import Plugins from '@vue2-client/base-client/plugins'
-Vue.use(Plugins)
-
-Vue.component('custom-columns-drawer', CustomColumnsDrawer)
-Vue.component('InstructDetailsView', InstructDetailsView)
-Vue.component('MeterDetailsView', MeterDetailsView)
-Vue.component('CustomerDetailsView', CustomerDetailsView)
-Vue.component('LogDetailsView', LogDetailsView)
-Vue.component('WebmeterAnalysisView', WebmeterAnalysisView)
-Vue.component('XCard', XCard)
-Vue.component('XBadge', XBadge)
-Vue.component('XFormCol', XFormCol)
-Vue.component('DataAnalysisView', DataAnalysisView)
-Vue.component('DataAnalysisUser', DataAnalysisUser)
-Vue.component('SrcollList', SrcollList)
-Vue.component('DeviceTypeDetailsView', DeviceTypeDetailsView)
-Vue.component('DeviceBrandDetailsView', DeviceBrandDetailsView)
-Vue.component('DeviceDetailsView', DeviceDetailsView)
-Vue.component('DictionaryDetailsView', DictionaryDetailsView)
-Vue.component('QueryParamsDetailsView', QueryParamsDetailsView)
-Vue.component('TicketDetailsView', TicketDetailsView)
-Vue.component('EmployeeDetailsView', EmployeeDetailsView)
-Vue.component('submitTicketSuccess', submitTicketSuccess)
-Vue.component('CreateQuery', CreateQuery)
-Vue.component('CreateSimpleFormQuery', CreateSimpleFormQuery)
-Vue.component('FormGroupQuery', FormGroupQuery)
-Vue.component('FormGroupEdit', FormGroupEdit)
-Vue.component('JSONToTree', JSONToTree)
-Vue.component('Upload', Upload)
-Vue.component('AmapPointRendering', AmapPointRendering)
-Vue.component('AddressSearchCombobox', AddressSearchCombobox)
-Vue.component('CitySelect', CitySelect)
+import Vue from 'vue'
+
+import CustomColumnsDrawer from '@vue2-client/base-client/components/common/CustomColumnsDrawer'
+import InstructDetailsView from '@vue2-client/base-client/components/iot/InstructDetailsView'
+import MeterDetailsView from '@vue2-client/base-client/components/iot/MeterDetailsView'
+import CustomerDetailsView from '@vue2-client/base-client/components/iot/CustomerDetailsView'
+import LogDetailsView from '@vue2-client/base-client/components/iot/LogDetailsView'
+import WebmeterAnalysisView from '@vue2-client/base-client/components/iot/WebmeterAnalysisView'
+import XCard from '@vue2-client/base-client/components/common/XCard/XCard'
+import XFormCol from '@vue2-client/base-client/components/common/XFormCol'
+import XBadge from '@vue2-client/base-client/components/common/XBadge'
+import DataAnalysisView from '@vue2-client/base-client/components/iot/DataAnalysisView'
+import DataAnalysisUser from '@vue2-client/base-client/components/iot/DataAnalysisUser'
+import SrcollList from '@vue2-client/base-client/components/common/ScrollList'
+import AmapPointRendering from '@vue2-client/base-client/components/common/AmapMarker'
+import DeviceTypeDetailsView from '@vue2-client/base-client/components/iot/DeviceTypeDetailsView'
+import DeviceBrandDetailsView from '@vue2-client/base-client/components/iot/DeviceBrandDetailsView'
+import DictionaryDetailsView from '@vue2-client/base-client/components/system/DictionaryDetailsView'
+import QueryParamsDetailsView from '@vue2-client/base-client/components/system/QueryParamsDetailsView'
+import DeviceDetailsView from '@vue2-client/base-client/components/iot/DeviceDetailsView'
+import TicketDetailsView from '@vue2-client/base-client/components/ticket/TicketDetailsView'
+import EmployeeDetailsView from '@vue2-client/base-client/components/ticket/EmployeeDetailsView'
+import submitTicketSuccess from '@vue2-client/base-client/components/ticket/TicketSubmitSuccessView'
+import CreateQuery from '@vue2-client/base-client/components/common/CreateQuery'
+import CreateSimpleFormQuery from '@vue2-client/base-client/components/common/CreateSimpleFormQuery'
+import FormGroupQuery from '@vue2-client/base-client/components/common/FormGroupQuery'
+import FormGroupEdit from '@vue2-client/base-client/components/common/FormGroupEdit'
+import JSONToTree from '@vue2-client/base-client/components/common/JSONToTree'
+import Upload from '@vue2-client/base-client/components/common/Upload'
+import AddressSearchCombobox from '@vue2-client/base-client/components/common/AddressSearchCombobox'
+import CitySelect from '@vue2-client/base-client/components/common/CitySelect'
+import PersonSetting from '@vue2-client/base-client/components/common/PersonSetting'
+// 插件
+import Plugins from '@vue2-client/base-client/plugins'
+Vue.use(Plugins)
+
+Vue.component('custom-columns-drawer', CustomColumnsDrawer)
+Vue.component('InstructDetailsView', InstructDetailsView)
+Vue.component('MeterDetailsView', MeterDetailsView)
+Vue.component('CustomerDetailsView', CustomerDetailsView)
+Vue.component('LogDetailsView', LogDetailsView)
+Vue.component('WebmeterAnalysisView', WebmeterAnalysisView)
+Vue.component('XCard', XCard)
+Vue.component('XBadge', XBadge)
+Vue.component('XFormCol', XFormCol)
+Vue.component('DataAnalysisView', DataAnalysisView)
+Vue.component('DataAnalysisUser', DataAnalysisUser)
+Vue.component('SrcollList', SrcollList)
+Vue.component('DeviceTypeDetailsView', DeviceTypeDetailsView)
+Vue.component('DeviceBrandDetailsView', DeviceBrandDetailsView)
+Vue.component('DeviceDetailsView', DeviceDetailsView)
+Vue.component('DictionaryDetailsView', DictionaryDetailsView)
+Vue.component('QueryParamsDetailsView', QueryParamsDetailsView)
+Vue.component('TicketDetailsView', TicketDetailsView)
+Vue.component('EmployeeDetailsView', EmployeeDetailsView)
+Vue.component('submitTicketSuccess', submitTicketSuccess)
+Vue.component('CreateQuery', CreateQuery)
+Vue.component('CreateSimpleFormQuery', CreateSimpleFormQuery)
+Vue.component('FormGroupQuery', FormGroupQuery)
+Vue.component('FormGroupEdit', FormGroupEdit)
+Vue.component('JSONToTree', JSONToTree)
+Vue.component('Upload', Upload)
+Vue.component('AmapPointRendering', AmapPointRendering)
+Vue.component('AddressSearchCombobox', AddressSearchCombobox)
+Vue.component('CitySelect', CitySelect)
+Vue.component('PersonSetting', PersonSetting)

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

@@ -99,6 +99,12 @@
           <a-form-model-item label="操作按钮配置" prop="buttonState">
             <a-checkbox-group v-model="buttonStateData" :options="buttonStateArray"/>
           </a-form-model-item>
+          <a-form-model-item label="自定义查询" prop="customQuery">
+            <a-input v-model="form.customQuery" placeholder="示例 / 默认值：webmeterapi/commonQueryWithResource"/>
+          </a-form-model-item>
+          <a-form-model-item label="自定义保存" prop="customAOM">
+            <a-input v-model="form.customAoM" placeholder="示例 / 默认值：webmeterapi/commonAddOrModify"/>
+          </a-form-model-item>
         </a-form-model>
         <create-query-item ref="queryItem" @itemHandle="itemHandle" @getColumn="getColumn"/>
         <a-button type="primary" @click="view">操作</a-button>
@@ -175,7 +181,9 @@ export default {
         joinArray: {},
         condition: {},
         orderBy: '',
-        column: []
+        column: [],
+        customQuery: undefined,
+        customAOM: undefined
       },
       result: {},
       itemMap: {},

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

@@ -0,0 +1,221 @@
+<template>
+  <div>
+    <a-input
+      @click="inputClick"
+      :value="valueView"
+      style="cursor:pointer"
+      readOnly/>
+    <a-modal
+      v-if="visible"
+      v-model="visible"
+      title="流程步骤负责人设置"
+      :z-index="1031"
+      :bodyStyle="{ maxHeight: '65vh', 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: () => []
+    },
+    // 默认选中key
+    defaultCheckedNames: {
+      type: Array,
+      default: () => []
+    },
+    defaultCheckedIds: {
+      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.defaultCheckedIds.length > 0) {
+        this.checkedKeys = this.getCheckedKeys(this.defaultCheckedIds)
+      } else if (this.defaultCheckedNames.length > 0) {
+        this.checkedKeys = this.getCheckedKeys(this.defaultCheckedNames)
+      }
+      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

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

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

@@ -1,16 +1,21 @@
 <template>
   <div>
-    <a-card :bordered="false" :body-style="{ margin: 0, padding: 0 }">
-      <a-skeleton active v-show="loadState === 'loading'" style="padding: 16px"/>
+    <a-card :body-style="{ margin: 0, padding: 0 }" :bordered="false">
+      <a-skeleton v-show="loadState === 'loading'" active style="padding: 16px"/>
+      <a-empty v-show="loadState === 'empty'">
+        <a-button type="dashed" @click="retry">
+          重新加载
+        </a-button>
+      </a-empty>
       <a-card
         v-show="loadState === 'error'"
         :body-style="{ margin: '0 auto' }"
         :bordered="false"
-        class="retryCard"
         :hoverable="true"
+        class="retryCard"
         @click="retry" >
-        <a-icon type="global" :style="{ fontSize: '28px' }"/>
-        <p style="margin-top: 20px" class="noSelect">网络好像开小差了，点击重新加载...</p>
+        <a-icon :style="{ fontSize: '28px' }" type="global"/>
+        <p class="noSelect" style="margin-top: 20px">网络好像开小差了，点击重新加载...</p>
       </a-card>
       <div v-show="loadState === 'success'">
         <slot></slot>