vue2-client 1.4.1 → 1.4.3

package/src/mock/goods/index.js

@@ -1,108 +1,108 @@
-import Mock from 'mockjs'
-import '@vue2-client/mock/extend'
-import { parseUrlParams } from '@vue2-client/utils/request'
-
-const current = new Date().getTime()
-
-const goodsList = Mock.mock({
-  'list|100': [{
-    'id|+1': 0,
-    'name': '@GOODS',
-    'orderId': `${current}-@integer(1,100)`,
-    'status|1-4': 1,
-    'send': '@BOOLEAN',
-    'sendTime': '@DATETIME',
-    'orderDate': '@DATE',
-    'auditTime': '@TIME'
-  }]
-})
-
-Mock.mock(RegExp(`${process.env.VUE_APP_API_BASE_URL}/goods` + '.*'), 'get', ({ url }) => {
-  const params = parseUrlParams(decodeURI(url))
-  let { page, pageSize } = params
-  // eslint-disable-next-line no-eval
-  page = eval(page) - 1 || 0
-  // eslint-disable-next-line no-eval
-  pageSize = eval(pageSize) || 10
-  delete params.page
-  delete params.pageSize
-  let result = goodsList.list.filter(item => {
-    for (const [key, value] of Object.entries(params)) {
-      if (item[key] !== value) {
-        return false
-      }
-    }
-    return true
-  })
-  const total = result.length
-  if ((page) * pageSize > total) {
-    result = []
-  } else {
-    result = result.slice(page * pageSize, (page + 1) * pageSize)
-  }
-  return {
-    code: 0,
-    message: 'success',
-    data: {
-      page: page + 1,
-      pageSize,
-      total,
-      list: result
-    }
-  }
-})
-
-const columnsConfig = [
-  {
-    title: '商品名称',
-    dataIndex: 'name',
-    searchAble: true
-  },
-  {
-    title: '订单号',
-    dataIndex: 'orderId'
-  },
-  {
-    searchAble: true,
-    dataIndex: 'status',
-    dataType: 'select',
-    slots: { title: 'statusTitle' },
-    scopedSlots: { customRender: 'status' },
-    search: {
-      selectOptions: [
-        { title: '已下单', value: 1 },
-        { title: '已付款', value: 2 },
-        { title: '已审核', value: 3 }
-        // {title: '已发货', value: 4}
-      ]
-    }
-  },
-  {
-    title: '发货',
-    searchAble: true,
-    dataIndex: 'send',
-    dataType: 'boolean',
-    scopedSlots: { customRender: 'send' }
-  },
-  {
-    title: '发货时间',
-    dataIndex: 'sendTime',
-    dataType: 'datetime'
-  },
-  {
-    title: '下单日期',
-    searchAble: true,
-    dataIndex: 'orderDate',
-    dataType: 'date',
-    visible: false
-  },
-  {
-    title: '审核时间',
-    dataIndex: 'auditTime',
-    dataType: 'time'
-  }
-]
-
-Mock.mock(`${process.env.VUE_APP_API_BASE_URL}/columns`, 'get', () => {
-  return columnsConfig
-})
+import Mock from 'mockjs'
+import '@vue2-client/mock/extend'
+import { parseUrlParams } from '@vue2-client/utils/request'
+
+const current = new Date().getTime()
+
+const goodsList = Mock.mock({
+  'list|100': [{
+    'id|+1': 0,
+    'name': '@GOODS',
+    'orderId': `${current}-@integer(1,100)`,
+    'status|1-4': 1,
+    'send': '@BOOLEAN',
+    'sendTime': '@DATETIME',
+    'orderDate': '@DATE',
+    'auditTime': '@TIME'
+  }]
+})
+
+Mock.mock(RegExp(`${process.env.VUE_APP_API_BASE_URL}/goods` + '.*'), 'get', ({ url }) => {
+  const params = parseUrlParams(decodeURI(url))
+  let { page, pageSize } = params
+  // eslint-disable-next-line no-eval
+  page = eval(page) - 1 || 0
+  // eslint-disable-next-line no-eval
+  pageSize = eval(pageSize) || 10
+  delete params.page
+  delete params.pageSize
+  let result = goodsList.list.filter(item => {
+    for (const [key, value] of Object.entries(params)) {
+      if (item[key] !== value) {
+        return false
+      }
+    }
+    return true
+  })
+  const total = result.length
+  if ((page) * pageSize > total) {
+    result = []
+  } else {
+    result = result.slice(page * pageSize, (page + 1) * pageSize)
+  }
+  return {
+    code: 0,
+    message: 'success',
+    data: {
+      page: page + 1,
+      pageSize,
+      total,
+      list: result
+    }
+  }
+})
+
+const columnsConfig = [
+  {
+    title: '商品名称',
+    dataIndex: 'name',
+    searchAble: true
+  },
+  {
+    title: '订单号',
+    dataIndex: 'orderId'
+  },
+  {
+    searchAble: true,
+    dataIndex: 'status',
+    dataType: 'select',
+    slots: { title: 'statusTitle' },
+    scopedSlots: { customRender: 'status' },
+    search: {
+      selectOptions: [
+        { title: '已下单', value: 1 },
+        { title: '已付款', value: 2 },
+        { title: '已审核', value: 3 }
+        // {title: '已发货', value: 4}
+      ]
+    }
+  },
+  {
+    title: '发货',
+    searchAble: true,
+    dataIndex: 'send',
+    dataType: 'boolean',
+    scopedSlots: { customRender: 'send' }
+  },
+  {
+    title: '发货时间',
+    dataIndex: 'sendTime',
+    dataType: 'datetime'
+  },
+  {
+    title: '下单日期',
+    searchAble: true,
+    dataIndex: 'orderDate',
+    dataType: 'date',
+    visible: false
+  },
+  {
+    title: '审核时间',
+    dataIndex: 'auditTime',
+    dataType: 'time'
+  }
+]
+
+Mock.mock(`${process.env.VUE_APP_API_BASE_URL}/columns`, 'get', () => {
+  return columnsConfig
+})

package/src/pages/CreateQueryPage.vue

@@ -1,65 +1,65 @@
-<template>
-  <div>
-    <create-query
-      :visible.sync="visible"
-      @saveQueryParams="saveQueryParams"
-    />
-    <create-simple-form-query
-      :visible.sync="createSimpleFormVisible"
-      @saveSimpleFormQueryParams="saveSimpleFormQueryParams"
-    />
-    <a-button style="margin-top: 10px;margin-left: 10px;" type="primary" @click="showDrawer">打开完整查询配置生成工具</a-button>
-    <a-button style="margin-top: 10px;margin-left: 10px;" type="primary" @click="showSimpleFormQueryParamsDrawer">打开基础表单配置生成工具</a-button>
-    <!--    <webmeter-analysis-view/>-->
-  </div>
-</template>
-
-<script>
-import { post } from '@vue2-client/services/api/restTools'
-import CreateQuery from '@vue2-client/base-client/components/common/CreateQuery'
-import CreateSimpleFormQuery from '@vue2-client/base-client/components/common/CreateSimpleFormQuery'
-
-export default {
-  name: 'CreateQueryPage',
-  components: {
-    CreateQuery,
-    CreateSimpleFormQuery
-  },
-  data () {
-    return {
-      visible: false,
-      createSimpleFormVisible: false
-    }
-  },
-  methods: {
-    showDrawer () {
-      this.visible = true
-    },
-    showSimpleFormQueryParamsDrawer () {
-      this.createSimpleFormVisible = true
-    },
-    // 存储查询配置信息
-    saveQueryParams (source) {
-      return post('/api/af-system/logic/addOrEditQueryParams', {
-        source: source
-      }).then(res => {
-        this.$message.success('保存查询配置成功')
-      }, err => {
-        console.error(err)
-      })
-    },
-    // 存储基础表单配置信息
-    saveSimpleFormQueryParams (source) {
-      return post('/api/af-system/logic/addOrEditSimpleFormQueryParams', {
-        source: source
-      }).then(res => {
-        this.$message.success('保存基础表单配置成功')
-      }, err => {
-        console.error(err)
-      })
-    }
-  }
-}
-</script>
-<style lang="less" scoped>
-</style>
+<template>
+  <div>
+    <create-query
+      :visible.sync="visible"
+      @saveQueryParams="saveQueryParams"
+    />
+    <create-simple-form-query
+      :visible.sync="createSimpleFormVisible"
+      @saveSimpleFormQueryParams="saveSimpleFormQueryParams"
+    />
+    <a-button style="margin-top: 10px;margin-left: 10px;" type="primary" @click="showDrawer">打开完整查询配置生成工具</a-button>
+    <a-button style="margin-top: 10px;margin-left: 10px;" type="primary" @click="showSimpleFormQueryParamsDrawer">打开基础表单配置生成工具</a-button>
+    <!--    <webmeter-analysis-view/>-->
+  </div>
+</template>
+
+<script>
+import { post } from '@vue2-client/services/api/restTools'
+import CreateQuery from '@vue2-client/base-client/components/common/CreateQuery'
+import CreateSimpleFormQuery from '@vue2-client/base-client/components/common/CreateSimpleFormQuery'
+
+export default {
+  name: 'CreateQueryPage',
+  components: {
+    CreateQuery,
+    CreateSimpleFormQuery
+  },
+  data () {
+    return {
+      visible: false,
+      createSimpleFormVisible: false
+    }
+  },
+  methods: {
+    showDrawer () {
+      this.visible = true
+    },
+    showSimpleFormQueryParamsDrawer () {
+      this.createSimpleFormVisible = true
+    },
+    // 存储查询配置信息
+    saveQueryParams (source) {
+      return post('/api/af-system/logic/addOrEditQueryParams', {
+        source: source
+      }).then(res => {
+        this.$message.success('保存查询配置成功')
+      }, err => {
+        console.error(err)
+      })
+    },
+    // 存储基础表单配置信息
+    saveSimpleFormQueryParams (source) {
+      return post('/api/af-system/logic/addOrEditSimpleFormQueryParams', {
+        source: source
+      }).then(res => {
+        this.$message.success('保存基础表单配置成功')
+      }, err => {
+        console.error(err)
+      })
+    }
+  }
+}
+</script>
+<style lang="less" scoped>
+</style>

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>