vue2-client 1.3.0 → 1.3.3

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

@@ -13,6 +13,7 @@
       <x-form
         :is-show="isFormShow"
         :json-data="formItems"
+        :service-name="serviceName"
         style="margin-bottom: 14px;"
         @onSubmit="onSubmit">
         <slot></slot>
@@ -64,7 +65,7 @@ import { indexedDB } from '@vue2-client/utils/indexedDB'
 import { mapState } from 'vuex'
 import { Modal } from 'ant-design-vue'
 import { post } from '@vue2-client/services/api/restTools'
-import { ApplyInstallApi } from '@vue2-client/services/api/applyInstallApi'
+import { CommonTempTable } from '@/services/api/commonTempTable'
 
 export default {
   name: 'XFormTable',
@@ -182,7 +183,7 @@ export default {
     },
     // 数据只有一页时是否展示分页，true：展示，auto：隐藏
     showPagination: {
-      type: String | Boolean,
+      type: Boolean,
       default: true
     }
   },
@@ -318,7 +319,7 @@ export default {
         }
       }
       if (!this.isTableTemp) {
-        result = query(requestParameters, null, this.serviceName)
+        result = query(requestParameters, undefined, this.serviceName)
       }
       this.$emit('afterQuery', result)
       callback(result)
@@ -380,7 +381,7 @@ export default {
             queryParamsName: this.queryParamsName,
             idList: this.selectedRowKeys
           }
-          remove(requestParameters, null, this.serviceName).then(res => {
+          remove(requestParameters, undefined, this.serviceName).then(res => {
             this.loading = false
             this.$message.success('删除成功！')
             this.$refs.xTable.clearRowKeys()
@@ -410,7 +411,7 @@ export default {
     createTempTable (defineJson) {
       const tableName = defineJson.tableName
       const define = defineJson.column
-      return post(ApplyInstallApi.createTempTable, {
+      return post(CommonTempTable.createTempTable, {
         define: define,
         tableName: tableName
       })
@@ -431,7 +432,7 @@ export default {
       params.applyId = defineJson.applyId
       params.stepName = defineJson.stepName
       params.tableName = tableName
-      return post(ApplyInstallApi.insertDataToTempTable, {
+      return post(CommonTempTable.insertDataToTempTable, {
         tempTableData: params
       })
         .then(
@@ -445,7 +446,7 @@ export default {
       await this.createTempTable(this.queryParamsJson)
       await this.insertTempTableData(this.queryParamsJson)
       let result = {}
-      await post(ApplyInstallApi.initApplySubTable, {
+      await post(CommonTempTable.initApplySubTable, {
         define: json
       })
         .then(

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

@@ -1,274 +1,278 @@
-<template>
-  <div>
-    <custom-columns-drawer
-      :columns-meta="jsonData"
-      :columns.sync="tableColumns"
-      :visible.sync="visible"/>
-    <a-row :gutter="48">
-      <a-col>
-        <span :style="{ float: 'left', overflow: 'hidden', marginBottom: '8px' }">
-          <slot name="expand"></slot>
-        </span>
-      </a-col>
-      <a-col>
-        <span :style="{ float: 'right', overflow: 'hidden', marginBottom: '8px' }">
-          <a-button-group>
-            <a-button @click="toggleIsFormShow">
-              <a-icon :style="iconStyle" type="vertical-align-top"/>
-            </a-button>
-            <a-button @click="refresh(true)">
-              <a-icon :style="iconStyle" type="reload" />
-            </a-button>
-            <a-button @click="showDrawer">
-              <a-icon :style="iconStyle" type="table" />
-            </a-button>
-            <a-button v-if="!buttonState || buttonState.export" @click="exports">
-              <a-icon :style="iconStyle" type="cloud-download"/>
-            </a-button>
-          </a-button-group>
-        </span>
-      </a-col>
-    </a-row>
-    <s-table
-      ref="table"
-      :alert="true"
-      :columns="tableColumns"
-      :data="loadData"
-      :rowKey="rowKey"
-      :rowSelection="rowSelection"
-      :scroll="{ x: scrollXWidth, y: scrollYWidth }"
-      :showPagination="showPagination"
-      size="default"
-    >
-      <template
-        v-for="(item, index) in tableColumns"
-        :slot="item.dataIndex"
-        slot-scope="text, record">
-        <!-- 文本溢出省略(ellipsis) -->
-        <span v-if="item.slotType === 'ellipsis'" :key="index">
-          <ellipsis :length="item.slotValue" tooltip>{{ text === '' ? '--' : text }}</ellipsis>
-        </span>
-        <!-- 徽标(badge) -->
-        <span v-else-if="item.slotType === 'badge'" :key="index">
-          <x-badge :badge-key="item.slotKeyMap" :value="text" />
-        </span>
-        <!-- 日期(date) -->
-        <span v-else-if="item.slotType === 'date'" :key="index">
-          {{ format(text,'yyyy-MM-dd') }}
-        </span>
-        <!-- 日期时间(datetime) -->
-        <span v-else-if="item.slotType === 'dateTime'" :key="index">
-          {{ format(text,'yyyy-MM-dd hh:mm:ss') }}
-        </span>
-        <!-- 操作列(action) -->
-        <span v-else-if="item.slotType === 'action'" :key="index">
-          <a @click="action(record)">{{ item.slotValue }}</a>
-        </span>
-      </template>
-    </s-table>
-  </div>
-</template>
-<script>
-import { Ellipsis, STable } from '@vue2-client/components'
-import { formatDate } from '@vue2-client/utils/util'
-import { exportJson } from '@vue2-client/utils/excel/Export2Excel'
-
-export default {
-  name: 'XTable',
-  components: {
-    STable,
-    Ellipsis
-  },
-  data () {
-    return {
-      // 加载数据方法 必须为 Promise 对象
-      loadData: parameter => {
-        // 取到表格携带的表单参数
-        const requestParameters = Object.assign({}, parameter)
-        // 取到父组件传入的表单参数
-        const conditionParams = Object.assign(this.fixedQueryForm, this.form)
-        // 如果适用了综合筛选表单，则进行数据处理
-        if (conditionParams.rowIdName) {
-          const rowIdName = conditionParams.rowIdName
-          const rowIdValue = conditionParams.rowIdValue
-          delete conditionParams.rowIdName
-          delete conditionParams.rowIdValue
-          if (rowIdValue) {
-            conditionParams[rowIdName] = rowIdValue
-          }
-        }
-        // 如果传了燃气公司字段，则进行数据处理
-        if (conditionParams.orgName) {
-          requestParameters.orgName = conditionParams.orgName
-          delete conditionParams.orgName
-        }
-        requestParameters.conditionParams = conditionParams
-        requestParameters.queryParamsName = this.queryParamsName
-        requestParameters.queryParams = this.queryParams
-        // 加载数据
-        return this.loadTableData(requestParameters)
-      },
-      rowKey: undefined,
-      scrollXWidth: 1600,
-      scrollYWidth: 437,
-      selectedRowKeys: [],
-      selectedRows: [],
-      // 数据列
-      tableColumns: this.jsonData,
-      // 是否显示展示列抽屉
-      visible: false,
-      dataSource: [],
-      // 图标样式
-      iconStyle: {
-        position: 'relative',
-        top: '1px'
-      }
-    }
-  },
-  watch: {
-    form (rel) {
-      this.form = rel
-      this.refresh(true)
-    },
-    jsonData () {
-      this.initTableParams()
-    }
-  },
-  props: {
-    jsonData: {
-      type: Array,
-      default: () => {
-        return []
-      }
-    },
-    queryParamsName: {
-      type: String,
-      default: () => {
-        return ''
-      }
-    },
-    // 查询参数对象, 用于没有对应查询配置文件名时
-    queryParams: {
-      type: Object,
-      default: null
-    },
-    form: {
-      type: Object,
-      default: () => {
-        return {}
-      }
-    },
-    // 固定查询表单
-    fixedQueryForm: {
-      type: Object,
-      default: () => {
-        return {}
-      }
-    },
-    // 按钮
-    buttonState: {
-      type: Object,
-      default: () => {
-        return undefined
-      }
-    },
-    // 数据只有一页时是否展示分页，true：展示，auto：隐藏
-    showPagination: {
-      type: String | Boolean,
-      default: true
-    }
-  },
-  computed: {
-    rowSelection () {
-      return {
-        selectedRowKeys: this.selectedRowKeys,
-        onChange: this.onSelectChange
-      }
-    }
-  },
-  mounted () {
-    this.initTableParams()
-  },
-  methods: {
-    exports () {
-      const tHeader = this.tableColumns.filter(res => res.slotType !== 'action').map(res => res.title)
-      const filterVal = this.tableColumns.map(res => res.dataIndex)
-      const list = this.dataSource
-      const data = this.formatJson(filterVal, list)
-      exportJson(tHeader, data, new Date())
-    },
-    formatJson (filterVal, jsonData) {
-      return jsonData.map(v => filterVal.map(j => v[j]))
-    },
-    badgeFilter (key, value) {
-      return this.$appdata.getParam(key, value)
-    },
-    initTableParams () {
-      let totalWidth = 0
-      this.rowKey = this.tableColumns[0].dataIndex
-      for (let i = 0; i < this.tableColumns.length; i++) {
-        const item = this.tableColumns[i]
-        if (item.dataIndex === 'action') {
-          item.fixed = 'right'
-          item.width = 70
-        }
-        if (item.width) {
-          totalWidth = totalWidth + item.width
-        } else {
-          totalWidth = totalWidth + 180
-        }
-      }
-      const width = document.documentElement.clientWidth
-      if (width >= 1600) {
-        this.scrollYWidth = 429
-      } else if (width >= 1200) {
-        this.scrollYWidth = 390
-      } else {
-        this.scrollYWidth = 343
-      }
-      // 横向滚动长度大于所有宽度，才能实现固定表头
-      this.scrollXWidth = totalWidth
-    },
-    loadTableData (requestParameters) {
-      let data = []
-      this.$emit('loadData', requestParameters, val => {
-        data = val
-      })
-      const _this = this
-      data.then(res => {
-        _this.dataSource = res.data
-      })
-      return data
-    },
-    action (record) {
-      this.$emit('action', record, record[this.jsonData[0].dataIndex])
-    },
-    onSelectChange (selectedRowKeys, selectedRows) {
-      this.selectedRowKeys = selectedRowKeys
-      this.selectedRows = selectedRows
-      this.$emit('selectRow', selectedRowKeys)
-    },
-    clearRowKeys () {
-      this.$refs.table.clearSelected()
-    },
-    /**
-     * 表格重新加载方法
-     * 如果参数为 true, 则强制刷新到第一页
-     */
-    refresh (bool) {
-      this.$refs.table.refresh(bool)
-    },
-    format (date, format) {
-      return formatDate(date, format)
-    },
-    showDrawer () {
-      this.visible = true
-    },
-    toggleIsFormShow () {
-      this.$emit('toggleIsFormShow')
-    }
-  }
-}
-</script>
-<style lang="less" scoped>
-</style>
+<template>
+  <div>
+    <custom-columns-drawer
+      :columns-meta="jsonData"
+      :columns.sync="tableColumns"
+      :visible.sync="visible"/>
+    <a-row :gutter="48">
+      <a-col>
+        <span :style="{ float: 'left', overflow: 'hidden', marginBottom: '8px' }">
+          <slot name="expand"></slot>
+        </span>
+      </a-col>
+      <a-col>
+        <span :style="{ float: 'right', overflow: 'hidden', marginBottom: '8px' }">
+          <a-button-group>
+            <a-button @click="toggleIsFormShow">
+              <a-icon :style="iconStyle" type="vertical-align-top"/>
+            </a-button>
+            <a-button @click="refresh(true)">
+              <a-icon :style="iconStyle" type="reload" />
+            </a-button>
+            <a-button @click="showDrawer">
+              <a-icon :style="iconStyle" type="table" />
+            </a-button>
+            <a-button v-if="!buttonState || buttonState.export" @click="exports">
+              <a-icon :style="iconStyle" type="cloud-download"/>
+            </a-button>
+          </a-button-group>
+        </span>
+      </a-col>
+    </a-row>
+    <s-table
+      ref="table"
+      :alert="true"
+      :columns="tableColumns"
+      :data="loadData"
+      :rowKey="rowKey"
+      :rowSelection="rowSelection"
+      :scroll="{ x: scrollXWidth, y: scrollYWidth }"
+      :showPagination="showPagination"
+      size="default"
+    >
+      <template
+        v-for="(item, index) in tableColumns"
+        :slot="item.dataIndex"
+        slot-scope="text, record">
+        <!-- 文本溢出省略(ellipsis) -->
+        <span v-if="item.slotType === 'ellipsis'" :key="index">
+          <ellipsis :length="item.slotValue" tooltip>{{ text === '' ? '--' : text }}</ellipsis>
+        </span>
+        <!-- 徽标(badge) -->
+        <span v-else-if="item.slotType === 'badge'" :key="index">
+          <x-badge :badge-key="item.slotKeyMap" :value="text" />
+        </span>
+        <!-- 日期(date) -->
+        <span v-else-if="item.slotType === 'date'" :key="index">
+          {{ format(text,'yyyy-MM-dd') }}
+        </span>
+        <!-- 日期时间(datetime) -->
+        <span v-else-if="item.slotType === 'dateTime'" :key="index">
+          {{ format(text,'yyyy-MM-dd hh:mm:ss') }}
+        </span>
+        <!-- 操作列(action) -->
+        <span v-else-if="item.slotType === 'action'" :key="index">
+          <a @click="action(record)">{{ item.slotValue }}</a>
+        </span>
+      </template>
+    </s-table>
+  </div>
+</template>
+<script>
+import { Ellipsis, STable } from '@vue2-client/components'
+import { formatDate } from '@vue2-client/utils/util'
+import { exportJson } from '@vue2-client/utils/excel/Export2Excel'
+import CustomColumnsDrawer from '@/base-client/components/common/CustomColumnsDrawer'
+import XBadge from '@/base-client/components/common/XBadge'
+
+export default {
+  name: 'XTable',
+  components: {
+    STable,
+    Ellipsis,
+    CustomColumnsDrawer,
+    XBadge
+  },
+  data () {
+    return {
+      // 加载数据方法 必须为 Promise 对象
+      loadData: parameter => {
+        // 取到表格携带的表单参数
+        const requestParameters = Object.assign({}, parameter)
+        // 取到父组件传入的表单参数
+        const conditionParams = Object.assign(this.fixedQueryForm, this.form)
+        // 如果适用了综合筛选表单，则进行数据处理
+        if (conditionParams.rowIdName) {
+          const rowIdName = conditionParams.rowIdName
+          const rowIdValue = conditionParams.rowIdValue
+          delete conditionParams.rowIdName
+          delete conditionParams.rowIdValue
+          if (rowIdValue) {
+            conditionParams[rowIdName] = rowIdValue
+          }
+        }
+        // 如果传了燃气公司字段，则进行数据处理
+        if (conditionParams.orgName) {
+          requestParameters.orgName = conditionParams.orgName
+          delete conditionParams.orgName
+        }
+        requestParameters.conditionParams = conditionParams
+        requestParameters.queryParamsName = this.queryParamsName
+        requestParameters.queryParams = this.queryParams
+        // 加载数据
+        return this.loadTableData(requestParameters)
+      },
+      rowKey: undefined,
+      scrollXWidth: 1600,
+      scrollYWidth: 437,
+      selectedRowKeys: [],
+      selectedRows: [],
+      // 数据列
+      tableColumns: this.jsonData,
+      // 是否显示展示列抽屉
+      visible: false,
+      dataSource: [],
+      // 图标样式
+      iconStyle: {
+        position: 'relative',
+        top: '1px'
+      }
+    }
+  },
+  watch: {
+    form (rel) {
+      this.form = rel
+      this.refresh(true)
+    },
+    jsonData () {
+      this.initTableParams()
+    }
+  },
+  props: {
+    jsonData: {
+      type: Array,
+      default: () => {
+        return []
+      }
+    },
+    queryParamsName: {
+      type: String,
+      default: () => {
+        return ''
+      }
+    },
+    // 查询参数对象, 用于没有对应查询配置文件名时
+    queryParams: {
+      type: Object,
+      default: null
+    },
+    form: {
+      type: Object,
+      default: () => {
+        return {}
+      }
+    },
+    // 固定查询表单
+    fixedQueryForm: {
+      type: Object,
+      default: () => {
+        return {}
+      }
+    },
+    // 按钮
+    buttonState: {
+      type: Object,
+      default: () => {
+        return undefined
+      }
+    },
+    // 数据只有一页时是否展示分页，true：展示，auto：隐藏
+    showPagination: {
+      type: Boolean,
+      default: true
+    }
+  },
+  computed: {
+    rowSelection () {
+      return {
+        selectedRowKeys: this.selectedRowKeys,
+        onChange: this.onSelectChange
+      }
+    }
+  },
+  mounted () {
+    this.initTableParams()
+  },
+  methods: {
+    exports () {
+      const tHeader = this.tableColumns.filter(res => res.slotType !== 'action').map(res => res.title)
+      const filterVal = this.tableColumns.map(res => res.dataIndex)
+      const list = this.dataSource
+      const data = this.formatJson(filterVal, list)
+      exportJson(tHeader, data, new Date())
+    },
+    formatJson (filterVal, jsonData) {
+      return jsonData.map(v => filterVal.map(j => v[j]))
+    },
+    badgeFilter (key, value) {
+      return this.$appdata.getParam(key, value)
+    },
+    initTableParams () {
+      let totalWidth = 0
+      this.rowKey = this.tableColumns[0].dataIndex
+      for (let i = 0; i < this.tableColumns.length; i++) {
+        const item = this.tableColumns[i]
+        if (item.dataIndex === 'action') {
+          item.fixed = 'right'
+          item.width = 70
+        }
+        if (item.width) {
+          totalWidth = totalWidth + item.width
+        } else {
+          totalWidth = totalWidth + 180
+        }
+      }
+      const width = document.documentElement.clientWidth
+      if (width >= 1600) {
+        this.scrollYWidth = 429
+      } else if (width >= 1200) {
+        this.scrollYWidth = 390
+      } else {
+        this.scrollYWidth = 343
+      }
+      // 横向滚动长度大于所有宽度，才能实现固定表头
+      this.scrollXWidth = totalWidth
+    },
+    loadTableData (requestParameters) {
+      let data = []
+      this.$emit('loadData', requestParameters, val => {
+        data = val
+      })
+      const _this = this
+      data.then(res => {
+        _this.dataSource = res.data
+      })
+      return data
+    },
+    action (record) {
+      this.$emit('action', record, record[this.jsonData[0].dataIndex])
+    },
+    onSelectChange (selectedRowKeys, selectedRows) {
+      this.selectedRowKeys = selectedRowKeys
+      this.selectedRows = selectedRows
+      this.$emit('selectRow', selectedRowKeys)
+    },
+    clearRowKeys () {
+      this.$refs.table.clearSelected()
+    },
+    /**
+     * 表格重新加载方法
+     * 如果参数为 true, 则强制刷新到第一页
+     */
+    refresh (bool) {
+      this.$refs.table.refresh(bool)
+    },
+    format (date, format) {
+      return formatDate(date, format)
+    },
+    showDrawer () {
+      this.visible = true
+    },
+    toggleIsFormShow () {
+      this.$emit('toggleIsFormShow')
+    }
+  }
+}
+</script>
+<style lang="less" scoped>
+</style>