vue2-client 1.4.36 → 1.4.37

package/src/pages/report/ReportTable.js

@@ -1,124 +1,124 @@
-export default {
-  name: 'ReportTable',
-  functional: true,
-  render (h, content) {
-    if (!content.props.tableData) {
-      console.log('没有报表数据')
-      return
-    }
-    console.log('content=>', content)
-    const html = reportCompute(h, content.props.tableData)
-    console.log('html=>', html)
-    // 报表整体高度和宽度
-    const reportClass = `h-${html.h} w-${html.w}`
-    return (
-      <div id='ReportTableHome'>
-        <div id='reportTable' class={reportClass}>
-          {html.el}
-        </div>
-      </div>
-    )
-  }
-}
-/**
- * class类生成
- * @param w 宽
- * @param h 高
- * @param l left
- * @param t top
- * @returns {string}
- */
-function generClass ({ w = 1, h = 1, l, t }) {
-  return `w-${w} h-${h} l-${l} t-${t}`
-}
-/**
- *  判断是否是个Number数据
- * @param value
- * @returns {boolean}
- */
-function typeNumber (value) {
-  return Object.prototype.toString.call(value) === '[object Number]'
-}
-/**
- * 判断是否是个object数据
- * @param value
- * @returns {boolean}
- */
-function typeObject (value) {
-  return Object.prototype.toString.call(value) === '[object Object]'
-}
-/**
- * 判断是否是个Array数据
- * @param value
- * @returns {boolean}
- */
-function typeArray (value) {
-  return Object.prototype.toString.call(value) === '[object Array]'
-}
-/**
- * 一行数据转换html函数
- * @param h vue的h
- * @param row 一行json数据
- * @param left 起始left距离
- * @param top 起始top距离
- * @returns {{el: Array, h: number}}
- */
-function rowCompute (h, row, left, top) {
-  if (typeObject(row)) {
-    const el = []
-    const keys = Object.keys(row).filter((res) => res !== 'span')
-    let heigth = 0
-    for (const key of keys.values()) {
-      const value = row[key]['value'] ? row[key]['value'] : row[key]
-      const style = { l: left, t: top + heigth }
-      style.w = row[key]['span'] ? row[key]['span'] : 1
-      const nextL = left + style.w
-      const nextT = top + heigth
-      const divObject = rowCompute(h, value, nextL, nextT)
-      el.push(divObject.el)
-      style.h = divObject.h ? divObject.h : 1
-      heigth += style.h
-      const attrs = { class: generClass(style) + ' title' }
-      const div = <div {...attrs}>{key === 'value' ? value : key}</div>
-      el.push(div)
-    }
-    return { h: heigth, el: el }
-  } else if (typeArray(row)) {
-    const el = []
-    for (const [i, value] of row.entries()) {
-      const style = { l: (left + i), t: top, w: 1, h: 1 }
-      const extraClass = typeNumber(value) ? 'bold' : 'title'
-      const attrs = { class: generClass(style) + ` ${extraClass}` }
-      const div = <div {...attrs}>{value}</div>
-      el.push(div)
-    }
-    return { h: 1, el: el }
-  }
-}
-/**
- * 完整报表数据转换html函数
- * @param h vue的h
- * @param jsonArr json数组
- * @returns {{el: Array, h: number}}
- */
-function reportCompute (h, jsonArr) {
-  const html = []
-  let heigth = 0
-  let width = 0
-  for (const [index, row] of jsonArr.entries()) {
-    const rowHtml = rowCompute(h, row, 0, index)
-    // 取第一行的宽度作为整个报表的宽度
-    if (index === 0) {
-      const reg = /w-\d\s/
-      for (const vNode of rowHtml.el) {
-        if (!vNode.data || !vNode.data.class) continue
-        const c = vNode.data.class
-        const w = c.match(reg)[0].split('-')[1]
-        width += (w - 0)
-      }
-    }
-    heigth += rowHtml.h
-    html.push(rowHtml.el)
-  }
-  return { el: html, h: heigth, w: width }
-}
+export default {
+  name: 'ReportTable',
+  functional: true,
+  render (h, content) {
+    if (!content.props.tableData) {
+      console.log('没有报表数据')
+      return
+    }
+    console.log('content=>', content)
+    const html = reportCompute(h, content.props.tableData)
+    console.log('html=>', html)
+    // 报表整体高度和宽度
+    const reportClass = `h-${html.h} w-${html.w}`
+    return (
+      <div id='ReportTableHome'>
+        <div id='reportTable' class={reportClass}>
+          {html.el}
+        </div>
+      </div>
+    )
+  }
+}
+/**
+ * class类生成
+ * @param w 宽
+ * @param h 高
+ * @param l left
+ * @param t top
+ * @returns {string}
+ */
+function generClass ({ w = 1, h = 1, l, t }) {
+  return `w-${w} h-${h} l-${l} t-${t}`
+}
+/**
+ *  判断是否是个Number数据
+ * @param value
+ * @returns {boolean}
+ */
+function typeNumber (value) {
+  return Object.prototype.toString.call(value) === '[object Number]'
+}
+/**
+ * 判断是否是个object数据
+ * @param value
+ * @returns {boolean}
+ */
+function typeObject (value) {
+  return Object.prototype.toString.call(value) === '[object Object]'
+}
+/**
+ * 判断是否是个Array数据
+ * @param value
+ * @returns {boolean}
+ */
+function typeArray (value) {
+  return Object.prototype.toString.call(value) === '[object Array]'
+}
+/**
+ * 一行数据转换html函数
+ * @param h vue的h
+ * @param row 一行json数据
+ * @param left 起始left距离
+ * @param top 起始top距离
+ * @returns {{el: Array, h: number}}
+ */
+function rowCompute (h, row, left, top) {
+  if (typeObject(row)) {
+    const el = []
+    const keys = Object.keys(row).filter((res) => res !== 'span')
+    let heigth = 0
+    for (const key of keys.values()) {
+      const value = row[key]['value'] ? row[key]['value'] : row[key]
+      const style = { l: left, t: top + heigth }
+      style.w = row[key]['span'] ? row[key]['span'] : 1
+      const nextL = left + style.w
+      const nextT = top + heigth
+      const divObject = rowCompute(h, value, nextL, nextT)
+      el.push(divObject.el)
+      style.h = divObject.h ? divObject.h : 1
+      heigth += style.h
+      const attrs = { class: generClass(style) + ' title' }
+      const div = <div {...attrs}>{key === 'value' ? value : key}</div>
+      el.push(div)
+    }
+    return { h: heigth, el: el }
+  } else if (typeArray(row)) {
+    const el = []
+    for (const [i, value] of row.entries()) {
+      const style = { l: (left + i), t: top, w: 1, h: 1 }
+      const extraClass = typeNumber(value) ? 'bold' : 'title'
+      const attrs = { class: generClass(style) + ` ${extraClass}` }
+      const div = <div {...attrs}>{value}</div>
+      el.push(div)
+    }
+    return { h: 1, el: el }
+  }
+}
+/**
+ * 完整报表数据转换html函数
+ * @param h vue的h
+ * @param jsonArr json数组
+ * @returns {{el: Array, h: number}}
+ */
+function reportCompute (h, jsonArr) {
+  const html = []
+  let heigth = 0
+  let width = 0
+  for (const [index, row] of jsonArr.entries()) {
+    const rowHtml = rowCompute(h, row, 0, index)
+    // 取第一行的宽度作为整个报表的宽度
+    if (index === 0) {
+      const reg = /w-\d\s/
+      for (const vNode of rowHtml.el) {
+        if (!vNode.data || !vNode.data.class) continue
+        const c = vNode.data.class
+        const w = c.match(reg)[0].split('-')[1]
+        width += (w - 0)
+      }
+    }
+    heigth += rowHtml.h
+    html.push(rowHtml.el)
+  }
+  return { el: html, h: heigth, w: width }
+}

package/src/pages/report/ReportTableHome.vue

@@ -1,28 +1,28 @@
-<template>
-  <report-table :tableData="tableData"></report-table>
-</template>
-
-<script>
-  import { post } from '@vue2-client/services/api'
-  import ReportTable from '@vue2-client/pages/report/ReportTable'
-  export default {
-    name: 'ReportTableHome',
-    components: { ReportTable },
-    data () {
-      return {
-        tableData: null
-      }
-    },
-    created () {
-    },
-    mounted () {
-      this.getData()
-    },
-    methods: {
-      async getData () {
-        this.tableData = await post('/api/af-system/logic/reportTest', {})
-        console.log('数据=>', JSON.stringify(this.tableData))
-      }
-    }
-  }
-</script>
+<template>
+  <report-table :tableData="tableData"></report-table>
+</template>
+
+<script>
+  import { post } from '@vue2-client/services/api'
+  import ReportTable from '@vue2-client/pages/report/ReportTable'
+  export default {
+    name: 'ReportTableHome',
+    components: { ReportTable },
+    data () {
+      return {
+        tableData: null
+      }
+    },
+    created () {
+    },
+    mounted () {
+      this.getData()
+    },
+    methods: {
+      async getData () {
+        this.tableData = await post('/api/af-system/logic/reportTest', {})
+        console.log('数据=>', JSON.stringify(this.tableData))
+      }
+    }
+  }
+</script>

package/src/pages/resourceManage/orgListManage.vue

@@ -1,98 +1,98 @@
-<template>
-  <div id="orgListManage">
-    <a-card :bordered="false">
-      <!--<a-row :gutter="48">-->
-      <!--<a-col>-->
-      <!--<a-space>-->
-      <!--<a-button type="primary" @click="addItem" v-if="!buttonState || buttonState.add">-->
-      <!--<a-icon :style="iconStyle" type="plus"/>新增-->
-      <!--</a-button>-->
-      <!--<a-button-->
-      <!--v-if="!buttonState || buttonState.edit"-->
-      <!--:loading="editDataLoading"-->
-      <!--:disabled="!isModify"-->
-      <!--class="btn-success"-->
-      <!--type="dashed"-->
-      <!--@click="editItem">-->
-      <!--<a-icon :style="iconStyle" type="edit"/>修改-->
-      <!--</a-button>-->
-      <!--<a-button :disabled="!isDelete" type="danger" @click="deleteItem" v-if="!buttonState || buttonState.delete">-->
-      <!--<a-icon :style="iconStyle" type="delete"/>删除-->
-      <!--</a-button>-->
-      <!--</a-space>-->
-      <!--<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 @click="exports">-->
-      <!--<a-icon :style="iconStyle" type="cloud-download"/>-->
-      <!--</a-button>-->
-      <!--</a-button-group>-->
-      <!--</span>-->
-      <!--</a-col>-->
-      <!--</a-row>-->
-      <a-table
-        :columns="columns"
-        :data-source="funTree"
-        :pagination="false"
-        bordered
-        rowKey="id"
-        size="middle">
-      </a-table>
-    </a-card>
-  </div>
-</template>
-
-<script>
-  import { getOrganization, searchFun } from '@vue2-client/base-client/plugins/GetLoginInfoService'
-  import { getColumnsJson } from '@vue2-client/services/api'
-  export default {
-    // 组织管理
-    name: 'orgListManage',
-    data () {
-      return {
-        columnsJson: [],
-        funTree: [],
-        columns: [
-          {
-            title: '组织名称',
-            dataIndex: 'name'
-          },
-          {
-            title: '排序',
-            dataIndex: 'position'
-          },
-          {
-            title: '组件目录',
-            dataIndex: 'f_dir'
-          },
-          {
-            title: '描述',
-            dataIndex: 'f_description'
-          }
-        ]
-      }
-    },
-    created () {
-    },
-    async mounted () {
-      getColumnsJson('orgListManage', (res) => {
-        this.columnsJson = res
-      })
-      const fun = await getOrganization()
-      this.funTree = searchFun(fun, '组织机构')
-    },
-    methods: {
-    }
-  }
-</script>
-
-<style lang="less">
-</style>
+<template>
+  <div id="orgListManage">
+    <a-card :bordered="false">
+      <!--<a-row :gutter="48">-->
+      <!--<a-col>-->
+      <!--<a-space>-->
+      <!--<a-button type="primary" @click="addItem" v-if="!buttonState || buttonState.add">-->
+      <!--<a-icon :style="iconStyle" type="plus"/>新增-->
+      <!--</a-button>-->
+      <!--<a-button-->
+      <!--v-if="!buttonState || buttonState.edit"-->
+      <!--:loading="editDataLoading"-->
+      <!--:disabled="!isModify"-->
+      <!--class="btn-success"-->
+      <!--type="dashed"-->
+      <!--@click="editItem">-->
+      <!--<a-icon :style="iconStyle" type="edit"/>修改-->
+      <!--</a-button>-->
+      <!--<a-button :disabled="!isDelete" type="danger" @click="deleteItem" v-if="!buttonState || buttonState.delete">-->
+      <!--<a-icon :style="iconStyle" type="delete"/>删除-->
+      <!--</a-button>-->
+      <!--</a-space>-->
+      <!--<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 @click="exports">-->
+      <!--<a-icon :style="iconStyle" type="cloud-download"/>-->
+      <!--</a-button>-->
+      <!--</a-button-group>-->
+      <!--</span>-->
+      <!--</a-col>-->
+      <!--</a-row>-->
+      <a-table
+        :columns="columns"
+        :data-source="funTree"
+        :pagination="false"
+        bordered
+        rowKey="id"
+        size="middle">
+      </a-table>
+    </a-card>
+  </div>
+</template>
+
+<script>
+  import { getOrganization, searchFun } from '@vue2-client/base-client/plugins/GetLoginInfoService'
+  import { getColumnsJson } from '@vue2-client/services/api'
+  export default {
+    // 组织管理
+    name: 'orgListManage',
+    data () {
+      return {
+        columnsJson: [],
+        funTree: [],
+        columns: [
+          {
+            title: '组织名称',
+            dataIndex: 'name'
+          },
+          {
+            title: '排序',
+            dataIndex: 'position'
+          },
+          {
+            title: '组件目录',
+            dataIndex: 'f_dir'
+          },
+          {
+            title: '描述',
+            dataIndex: 'f_description'
+          }
+        ]
+      }
+    },
+    created () {
+    },
+    async mounted () {
+      getColumnsJson('orgListManage', (res) => {
+        this.columnsJson = res
+      })
+      const fun = await getOrganization()
+      this.funTree = searchFun(fun, '组织机构')
+    },
+    methods: {
+    }
+  }
+</script>
+
+<style lang="less">
+</style>

package/src/pages/system/dictionary/index.vue

@@ -1,43 +1,43 @@
-<template>
-  <a-card :bordered="false">
-    <dictionary-details-view
-      v-if="selectId"
-      :id="selectId"
-      :visible.sync="detailVisible"
-    />
-    <x-form-table
-      :queryParamsName="queryParamsName"
-      title="字典"
-      @action="toDetail">
-    </x-form-table>
-  </a-card>
-</template>
-
-<script>
-  import XFormTable from '@vue2-client/base-client/components/common/XFormTable/XFormTable'
-  import DictionaryDetailsView from '@vue2-client/base-client/components/system/DictionaryDetailsView'
-
-  export default {
-    name: 'Dictionary',
-    components: {
-      XFormTable,
-      DictionaryDetailsView
-    },
-    data () {
-      return {
-        // 选中的编号
-        selectId: undefined,
-        // 查询配置文件名
-        queryParamsName: 'dictionaryQueryParams',
-        // 是否显示详情抽屉
-        detailVisible: false
-      }
-    },
-    methods: {
-      toDetail (record, id) {
-        this.selectId = id + ''
-        this.detailVisible = true
-      }
-    }
-  }
-</script>
+<template>
+  <a-card :bordered="false">
+    <dictionary-details-view
+      v-if="selectId"
+      :id="selectId"
+      :visible.sync="detailVisible"
+    />
+    <x-form-table
+      :queryParamsName="queryParamsName"
+      title="字典"
+      @action="toDetail">
+    </x-form-table>
+  </a-card>
+</template>
+
+<script>
+  import XFormTable from '@vue2-client/base-client/components/common/XFormTable/XFormTable'
+  import DictionaryDetailsView from '@vue2-client/base-client/components/system/DictionaryDetailsView'
+
+  export default {
+    name: 'Dictionary',
+    components: {
+      XFormTable,
+      DictionaryDetailsView
+    },
+    data () {
+      return {
+        // 选中的编号
+        selectId: undefined,
+        // 查询配置文件名
+        queryParamsName: 'dictionaryQueryParams',
+        // 是否显示详情抽屉
+        detailVisible: false
+      }
+    },
+    methods: {
+      toDetail (record, id) {
+        this.selectId = id + ''
+        this.detailVisible = true
+      }
+    }
+  }
+</script>