vue2-client 1.15.84 → 1.15.86

package/src/mock/user/current.js

@@ -1,13 +1,13 @@
-import Mock from 'mockjs'
-import '@vue2-client/mock/extend'
-
-const welcome = Mock.mock({
-  timeFix: '@TIMEFIX',
-  message: '@WELCOME'
-})
-
-Mock.mock('/user/welcome', 'get', () => {
-  return welcome
-})
-
-export { welcome }
+import Mock from 'mockjs'
+import '@vue2-client/mock/extend'
+
+const welcome = Mock.mock({
+  timeFix: '@TIMEFIX',
+  message: '@WELCOME'
+})
+
+Mock.mock('/user/welcome', 'get', () => {
+  return welcome
+})
+
+export { welcome }

package/src/mock/user/login.js

@@ -1,39 +1,39 @@
-// import Mock from 'mockjs'
-// import '@vue2-client/mock/extend'
-
-// const user = Mock.mock({
-//   name: '@ADMIN',
-//   avatar: '@AVATAR',
-//   address: '@CITY',
-//   position: '@POSITION'
-// })
-// Mock.mock(`${process.env.VUE_APP_API_BASE_URL}/login`, 'post', ({body}) => {
-//   let result = {data: {}}
-//   const {name, password} = JSON.parse(body)
-//
-//   let success = false
-//
-//   if (name === 'admin' && password === '888888') {
-//     success = true
-//     result.data.permissions = [{id: 'queryForm', operation: ['add', 'edit']}]
-//     result.data.roles = [{id: 'admin', operation: ['add', 'edit', 'delete']}]
-//   } else if (name === 'test' || password === '888888') {
-//     success = true
-//     result.data.permissions = [{id: 'queryForm', operation: ['add', 'edit']}]
-//     result.data.roles = [{id: 'test', operation: ['add', 'edit', 'delete']}]
-//   } else {
-//     success = false
-//   }
-//
-//   if (success) {
-//     result.code = 0
-//     result.message = Mock.mock('@TIMEFIX').CN + '，欢迎回来'
-//     result.data.user = user
-//     result.data.token = 'Authorization:' + Math.random()
-//     result.data.expireAt = new Date(new Date().getTime() + 30 * 60 * 1000)
-//   } else {
-//     result.code = -1
-//     result.message = '账户名或密码错误（admin/888888 or test/888888）'
-//   }
-//   return result
-// })
+// import Mock from 'mockjs'
+// import '@vue2-client/mock/extend'
+
+// const user = Mock.mock({
+//   name: '@ADMIN',
+//   avatar: '@AVATAR',
+//   address: '@CITY',
+//   position: '@POSITION'
+// })
+// Mock.mock(`${process.env.VUE_APP_API_BASE_URL}/login`, 'post', ({body}) => {
+//   let result = {data: {}}
+//   const {name, password} = JSON.parse(body)
+//
+//   let success = false
+//
+//   if (name === 'admin' && password === '888888') {
+//     success = true
+//     result.data.permissions = [{id: 'queryForm', operation: ['add', 'edit']}]
+//     result.data.roles = [{id: 'admin', operation: ['add', 'edit', 'delete']}]
+//   } else if (name === 'test' || password === '888888') {
+//     success = true
+//     result.data.permissions = [{id: 'queryForm', operation: ['add', 'edit']}]
+//     result.data.roles = [{id: 'test', operation: ['add', 'edit', 'delete']}]
+//   } else {
+//     success = false
+//   }
+//
+//   if (success) {
+//     result.code = 0
+//     result.message = Mock.mock('@TIMEFIX').CN + '，欢迎回来'
+//     result.data.user = user
+//     result.data.token = 'Authorization:' + Math.random()
+//     result.data.expireAt = new Date(new Date().getTime() + 30 * 60 * 1000)
+//   } else {
+//     result.code = -1
+//     result.message = '账户名或密码错误（admin/888888 or test/888888）'
+//   }
+//   return result
+// })

package/src/mock/user/routes.js

@@ -1,61 +1,61 @@
-import Mock from 'mockjs'
-
-const router = [{
-  router: 'root',
-  children: [
-    {
-      router: 'dashboard',
-      icon: 'dashboard',
-      name: '仪表盘',
-      children: [
-        {
-          router: 'workplace',
-          name: '工作台'
-        },
-        {
-          router: 'analysis',
-          name: '分析页'
-        }
-      ]
-    },
-    // {
-    //   router: 'webmeter',
-    //   children: ['userFilesManage', 'gasAnalysisManage', 'handAnalysisManage', 'exceptionManage']
-    // },
-    // {
-    //   router: 'iot',
-    //   children: ['iotDeviceType', 'iotDeviceBrand', 'iotDevice', 'iotSetDeviceParams', 'instructManage', 'reportedDataQuery', 'deviceException', 'deviceManage']
-    // },
-    // {
-    //   router: 'dataAnalyze',
-    //   children: ['DataAnalysisView']
-    // },
-    // {
-    //   router: 'system',
-    //   children: ['dictionaryManage', 'queryParamsManage', 'customerManage', 'safeguardSearchLog', 'runtime', 'createQuery']
-    // },
-    {
-      router: 'antdv',
-      path: 'antdv',
-      name: 'Ant Design Vue',
-      icon: 'ant-design',
-      link: 'https://www.antdv.com/docs/vue/introduce-cn/'
-    },
-    {
-      router: 'document',
-      path: 'document',
-      name: '使用文档',
-      icon: 'file-word',
-      link: 'https://iczer.gitee.io/vue-antd-admin-docs/'
-    }
-  ]
-}]
-
-Mock.mock(`${process.env.VUE_APP_API_BASE_URL}/routes`, 'get', () => {
-  const result = {}
-  result.code = 0
-  result.data = router
-  return result
-})
-
-export { router }
+import Mock from 'mockjs'
+
+const router = [{
+  router: 'root',
+  children: [
+    {
+      router: 'dashboard',
+      icon: 'dashboard',
+      name: '仪表盘',
+      children: [
+        {
+          router: 'workplace',
+          name: '工作台'
+        },
+        {
+          router: 'analysis',
+          name: '分析页'
+        }
+      ]
+    },
+    // {
+    //   router: 'webmeter',
+    //   children: ['userFilesManage', 'gasAnalysisManage', 'handAnalysisManage', 'exceptionManage']
+    // },
+    // {
+    //   router: 'iot',
+    //   children: ['iotDeviceType', 'iotDeviceBrand', 'iotDevice', 'iotSetDeviceParams', 'instructManage', 'reportedDataQuery', 'deviceException', 'deviceManage']
+    // },
+    // {
+    //   router: 'dataAnalyze',
+    //   children: ['DataAnalysisView']
+    // },
+    // {
+    //   router: 'system',
+    //   children: ['dictionaryManage', 'queryParamsManage', 'customerManage', 'safeguardSearchLog', 'runtime', 'createQuery']
+    // },
+    {
+      router: 'antdv',
+      path: 'antdv',
+      name: 'Ant Design Vue',
+      icon: 'ant-design',
+      link: 'https://www.antdv.com/docs/vue/introduce-cn/'
+    },
+    {
+      router: 'document',
+      path: 'document',
+      name: '使用文档',
+      icon: 'file-word',
+      link: 'https://iczer.gitee.io/vue-antd-admin-docs/'
+    }
+  ]
+}]
+
+Mock.mock(`${process.env.VUE_APP_API_BASE_URL}/routes`, 'get', () => {
+  const result = {}
+  result.code = 0
+  result.data = router
+  return result
+})
+
+export { router }

package/src/mock/workplace/index.js

@@ -1,15 +1,15 @@
-import Mock from 'mockjs'
-import { activities, templates } from '../common/activityData'
-import { teams } from '@vue2-client/mock/common'
-
-activities.forEach(item => {
-  item.template = templates[item.activity.type](item.user, item.activity)
-})
-
-Mock.mock('/work/activity', 'get', () => {
-  return activities
-})
-
-Mock.mock('/work/team', 'get', () => {
-  return teams
-})
+import Mock from 'mockjs'
+import { activities, templates } from '../common/activityData'
+import { teams } from '@vue2-client/mock/common'
+
+activities.forEach(item => {
+  item.template = templates[item.activity.type](item.user, item.activity)
+})
+
+Mock.mock('/work/activity', 'get', () => {
+  return activities
+})
+
+Mock.mock('/work/team', 'get', () => {
+  return teams
+})

package/src/pages/LogicCallExample/index.vue

@@ -1,46 +1,46 @@
-<script setup>
-
-import LogicRunner from '@vue2-client/logic/LogicRunner'
-import { getCurrentInstance, ref } from 'vue'
-import XFormTable from '@vue2-client/base-client/components/common/XFormTable/XFormTable.vue'
-
-const { proxy } = getCurrentInstance()
-
-const metaData = ref({
-  test: {},
-  test2: [],
-  inputValue: '',
-  displayValue: 'default'
-})
-
-async function testLogic () {
-  const result = await LogicRunner.run('testVueLogic', {
-    metaData: metaData,
-    proxy: proxy
-  })
-  console.warn(metaData)
-  console.info('pageTest:' + result)
-}
-</script>
-
-<template>
-  <div>
-    录入值：<a-input v-model="metaData.inputValue" />
-    显示值：<span ref="displaySpan">{{ metaData.displayValue }}</span>
-    <br/>
-    <a-button @click="testLogic">修改</a-button>
-    <br/>
-    <p>调用组件方法</p>
-    <br/>
-    <x-form-table
-      ref="testFormTable"
-      serviceName="af-system"
-      :queryParamsName="'crud_dictionary_manage'"
-      title="字典">
-    </x-form-table>
-  </div>
-</template>
-
-<style scoped lang="less">
-
-</style>
+<script setup>
+
+import LogicRunner from '@vue2-client/logic/LogicRunner'
+import { getCurrentInstance, ref } from 'vue'
+import XFormTable from '@vue2-client/base-client/components/common/XFormTable/XFormTable.vue'
+
+const { proxy } = getCurrentInstance()
+
+const metaData = ref({
+  test: {},
+  test2: [],
+  inputValue: '',
+  displayValue: 'default'
+})
+
+async function testLogic () {
+  const result = await LogicRunner.run('testVueLogic', {
+    metaData: metaData,
+    proxy: proxy
+  })
+  console.warn(metaData)
+  console.info('pageTest:' + result)
+}
+</script>
+
+<template>
+  <div>
+    录入值：<a-input v-model="metaData.inputValue" />
+    显示值：<span ref="displaySpan">{{ metaData.displayValue }}</span>
+    <br/>
+    <a-button @click="testLogic">修改</a-button>
+    <br/>
+    <p>调用组件方法</p>
+    <br/>
+    <x-form-table
+      ref="testFormTable"
+      serviceName="af-system"
+      :queryParamsName="'crud_dictionary_manage'"
+      title="字典">
+    </x-form-table>
+  </div>
+</template>
+
+<style scoped lang="less">
+
+</style>

package/src/pages/ReportGrid/index.vue

@@ -1,76 +1,76 @@
-<template>
-  <div id="test" v-if="showReport">
-    <XReport
-      @updateImg="updateImg"
-      ref="main"
-      :use-oss-for-img="false"
-      config-name="outpatientWait"
-      server-name="af-his"
-      :show-img-in-cell="true"
-      :display-only="displayOnly"
-      :edit-mode="false"
-      :show-save-button="false"
-      :dont-format="true"/>
-  </div>
-</template>
-
-<script>
-import XReport from '@vue2-client/base-client/components/common/XReportGrid/XReport'
-// eslint-disable-next-line no-unused-vars
-import { exportHTMLNodeToPDF } from '@vue2-client/utils/htmlToPDFApi'
-
-export default {
-  name: 'Example',
-  components: {
-    XReport
-  },
-  mounted () {
-    console.log(this.$route)
-  },
-  data () {
-    return {
-      test: {
-        title: {
-          type: 'titleKey',
-          value: 'f_type'
-        },
-        designMode: 'json',
-      },
-      total: 1,
-      registerMap: [],
-      displayOnly: true,
-      showReport: true
-    }
-  },
-  methods: {
-    updateImg (data) {
-      console.warn('demo', data)
-    },
-    testExport () {
-      this.showReport = false
-      this.displayOnly = true
-      this.$nextTick(() => {
-        this.showReport = true
-        setTimeout(() => {
-          exportHTMLNodeToPDF('123', '#test')
-          this.showReport = false
-          this.displayOnly = false
-          this.$nextTick(() => {
-            this.showReport = true
-          })
-        }, 500)
-      })
-    },
-    testSave () {
-      const result = []
-      this.registerMap.forEach(item => {
-        result.push(item.exportData())
-      })
-      console.warn('save', result)
-    }
-  }
-}
-</script>
-<style scoped>
-
-</style>
+<template>
+  <div id="test" v-if="showReport">
+    <XReport
+      @updateImg="updateImg"
+      ref="main"
+      :use-oss-for-img="false"
+      config-name="outpatientWait"
+      server-name="af-his"
+      :show-img-in-cell="true"
+      :display-only="displayOnly"
+      :edit-mode="false"
+      :show-save-button="false"
+      :dont-format="true"/>
+  </div>
+</template>
+
+<script>
+import XReport from '@vue2-client/base-client/components/common/XReportGrid/XReport'
+// eslint-disable-next-line no-unused-vars
+import { exportHTMLNodeToPDF } from '@vue2-client/utils/htmlToPDFApi'
+
+export default {
+  name: 'Example',
+  components: {
+    XReport
+  },
+  mounted () {
+    console.log(this.$route)
+  },
+  data () {
+    return {
+      test: {
+        title: {
+          type: 'titleKey',
+          value: 'f_type'
+        },
+        designMode: 'json',
+      },
+      total: 1,
+      registerMap: [],
+      displayOnly: true,
+      showReport: true
+    }
+  },
+  methods: {
+    updateImg (data) {
+      console.warn('demo', data)
+    },
+    testExport () {
+      this.showReport = false
+      this.displayOnly = true
+      this.$nextTick(() => {
+        this.showReport = true
+        setTimeout(() => {
+          exportHTMLNodeToPDF('123', '#test')
+          this.showReport = false
+          this.displayOnly = false
+          this.$nextTick(() => {
+            this.showReport = true
+          })
+        }, 500)
+      })
+    },
+    testSave () {
+      const result = []
+      this.registerMap.forEach(item => {
+        result.push(item.exportData())
+      })
+      console.warn('save', result)
+    }
+  }
+}
+</script>
+<style scoped>
+
+</style>

package/src/pages/ReportView.vue

@@ -1,50 +1,50 @@
-<template>
-  <div>
-    <div id="reportContent">
-      <table style="margin: 0px auto" v-html="model"> </table>
-    </div>
-  </div>
-</template>
-
-<script>
-import { post } from '@vue2-client/services/api/restTools'
-
-export default {
-  name: 'ReportView',
-  data () {
-    return {
-      model: ''
-    }
-  },
-  props: ['data'],
-  methods: {
-    // 查询report
-    searchReport (source) {
-      return post('/rs/report/saleMonthReport', {
-        // data: this.data.data
-        data: this.data.data
-      }).then(res => {
-        this.model = res
-      }).catch(err => {
-        console.error(err)
-      })
-    }
-  }
-}
-</script>
-<style lang="less" scoped>
-#reportContent {
-  margin-top: 5px;
-}
-</style>
-<style>
-#reportContent .report-primary{
-  background-color: #dfedfb;
-  border: 1px solid #d8d7d7;
-  border-collapse: collapse;
-}
-#reportContent .report-success{
-  border: 1px solid #d8d7d7;
-  border-collapse: collapse;
-}
-</style>
+<template>
+  <div>
+    <div id="reportContent">
+      <table style="margin: 0px auto" v-html="model"> </table>
+    </div>
+  </div>
+</template>
+
+<script>
+import { post } from '@vue2-client/services/api/restTools'
+
+export default {
+  name: 'ReportView',
+  data () {
+    return {
+      model: ''
+    }
+  },
+  props: ['data'],
+  methods: {
+    // 查询report
+    searchReport (source) {
+      return post('/rs/report/saleMonthReport', {
+        // data: this.data.data
+        data: this.data.data
+      }).then(res => {
+        this.model = res
+      }).catch(err => {
+        console.error(err)
+      })
+    }
+  }
+}
+</script>
+<style lang="less" scoped>
+#reportContent {
+  margin-top: 5px;
+}
+</style>
+<style>
+#reportContent .report-primary{
+  background-color: #dfedfb;
+  border: 1px solid #d8d7d7;
+  border-collapse: collapse;
+}
+#reportContent .report-success{
+  border: 1px solid #d8d7d7;
+  border-collapse: collapse;
+}
+</style>