br-dionysus 1.17.6 → 1.17.7

package/mock/ajax/index.ts

@@ -0,0 +1,48 @@
+import Axios from 'axios'
+import { RequestFunc, ResultData } from '../interface/type'
+import { Method } from '../interface/enum'
+
+// 是否存在未关闭的弹窗
+let isExistModal: boolean = false
+const ajax: RequestFunc = (
+  { url, method, baseUrl } = { url: '', method: Method.GET, baseUrl: '' },
+  data = { query: {}, body: {}, headers: {} }
+) => {
+  return new Promise((resolve, reject) => {
+    Axios({
+      baseURL: baseUrl,
+      url,
+      method,
+      params: data.query || (method === Method.GET ? data : {}),
+      data: data.body || (method === Method.POST ? data : {}),
+      timeout: 1000 * 60 * 3,
+      headers: {
+        ...(data.headers || {})
+      }
+    })
+      .then((res: ResultData) => {
+        res.data.code = Number(res.data.code)
+        const code = res.data.code
+        if (code === 401 || code === 1001) {
+          if (isExistModal) return
+          isExistModal = true
+          return false
+        }
+
+        if (code !== 200) {
+          // 业务异常
+          reject(res.data)
+          return false
+        }
+        resolve(res.data)
+      })
+      .catch((err: any) => {
+        // http异常
+        // 请在此处处理http异常
+        console.log(err)
+        reject(err.response?.data ?? err)
+      })
+  })
+}
+
+export default ajax

package/mock/index.ts

@@ -0,0 +1,51 @@
+import Axios from 'axios'
+import MockAdapter from 'axios-mock-adapter'
+import ajax from './ajax'
+import { Method } from './interface/enum'
+import { BookList, bookList } from './mockData/book'
+import { Parameter, ResultData } from './interface/type'
+
+/** 列表返回 */
+interface ListData<T> {
+  rows: T;
+  total: number;
+}
+
+const mock = new MockAdapter(Axios, { delayResponse: 500 })
+
+const listHandler = (config: any): [number, any] => {
+  const params = (config && (config as any).params) || {}
+  const keyword = params.keyword || ''
+  const page = Number(params.page || 1)
+  const pageSize = Number(params.pageSize || 20)
+
+  const toLower = (v: any) => String(v || '').toLowerCase()
+  const like = (a: any, b: any) => toLower(a).includes(toLower(b))
+
+  let rows = bookList.filter(b =>
+    !keyword || like(b.name, keyword) || like(b.sn, keyword) || like(b.author, keyword)
+  )
+
+  const total = rows.length
+  const start = Math.max(0, (page - 1) * pageSize)
+  rows = rows.slice(start, start + pageSize)
+
+  return [200, { code: 200, data: { rows, total }, msg: '' }]
+}
+
+mock.onGet('/api/v1/book/list').reply(listHandler)
+mock.onAny().passThrough()
+
+export const getBookList = (data: Parameter = {}): Promise<ResultData<ListData<BookList>>> => {
+  return ajax(
+    {
+      url: '/api/v1/book/list',
+      method: Method.GET
+    },
+    data
+  )
+}
+
+export default {
+  getBookList
+}

package/mock/interface/enum.ts

@@ -0,0 +1,4 @@
+export enum Method {
+  GET = 'get',
+  POST = 'post',
+}

package/mock/interface/type.ts

@@ -0,0 +1,32 @@
+import type { Method } from './enum'
+
+export interface Result {
+  code?: string | number | null;
+  msg?: string;
+}
+
+export interface ResultData<T = any> extends Result {
+  data?: T;
+  code?: string | number | null;
+  msg?: any;
+}
+
+export interface Parameter {
+  query?: Record<any, any>;
+  body?: Record<any, any>;
+  headers?: Record<string, any>;
+  [propName: string]: any;
+}
+
+export interface RequestFunc {
+  (
+    api: {
+      url: string;
+      method: Method;
+      baseUrl?: string;
+      responseType?: string;
+    },
+    data: Parameter,
+    showErrMsg?: boolean
+  ): Promise<any>;
+}

package/mock/mockData/book.ts

@@ -0,0 +1,48 @@
+export interface Book {
+  id: number;
+  /** 书名 */
+  name: string;
+  /** 入库时间 */
+  date: string;
+  /** 作者 */
+  author: string;
+  /** 发行地 */
+  address: string;
+  /** 编码 */
+  sn: string;
+}
+export type BookList = Book[]
+
+export const bookList: BookList = [
+  { id: 1, name: '哈利波特', date: '2023-10-24 22:55:33', author: '绫波丽', address: '中国 上海', sn: 'sn2310240001' },
+  { id: 2, name: '三体', date: '2023-10-25 10:15:20', author: '刘慈欣', address: '中国 北京', sn: 'sn2310250002' },
+  { id: 3, name: '红楼梦', date: '2023-10-26 09:05:11', author: '曹雪芹', address: '中国 北京', sn: 'sn2310260003' },
+  { id: 4, name: '西游记', date: '2023-10-27 14:22:45', author: '吴承恩', address: '中国 江苏', sn: 'sn2310270004' },
+  { id: 5, name: '水浒传', date: '2023-10-28 18:33:02', author: '施耐庵', address: '中国 山东', sn: 'sn2310280005' },
+  { id: 6, name: '斗罗大陆', date: '2023-10-29 12:40:59', author: '唐家三少', address: '中国 上海', sn: 'sn2310290006' },
+  { id: 7, name: '全职高手', date: '2023-10-30 08:12:37', author: '蝴蝶蓝', address: '中国 上海', sn: 'sn2310300007' },
+  { id: 8, name: '庆余年', date: '2023-10-31 20:51:13', author: '猫腻', address: '中国 北京', sn: 'sn2310310008' },
+  { id: 9, name: '雪中悍刀行', date: '2023-11-01 07:44:26', author: '烽火戏诸侯', address: '中国 浙江', sn: 'sn2311010009' },
+  { id: 10, name: '平凡的世界', date: '2023-11-02 16:17:58', author: '路遥', address: '中国 陕西', sn: 'sn2311020010' },
+  { id: 11, name: '围城', date: '2023-11-03 11:08:21', author: '钱钟书', address: '中国 上海', sn: 'sn2311030011' },
+  { id: 12, name: '小王子', date: '2023-11-04 13:33:47', author: '圣埃克苏佩里', address: '法国 巴黎', sn: 'sn2311040012' },
+  { id: 13, name: '百年孤独', date: '2023-11-05 19:25:10', author: '加西亚·马尔克斯', address: '哥伦比亚 波哥大', sn: 'sn2311050013' },
+  { id: 14, name: '悲惨世界', date: '2023-11-06 21:41:33', author: '维克多·雨果', address: '法国 巴黎', sn: 'sn2311060014' },
+  { id: 15, name: '格林童话', date: '2023-11-07 09:59:05', author: '格林兄弟', address: '德国 柏林', sn: 'sn2311070015' },
+  { id: 16, name: '老人与海', date: '2023-11-08 22:12:40', author: '海明威', address: '美国 纽约', sn: 'sn2311080016' },
+  { id: 17, name: '呼啸山庄', date: '2023-11-09 15:36:18', author: '艾米莉·勃朗特', address: '英国 伦敦', sn: 'sn2311090017' },
+  { id: 18, name: '傲慢与偏见', date: '2023-11-10 08:48:52', author: '简·奥斯汀', address: '英国 牛津', sn: 'sn2311100018' },
+  { id: 19, name: '追风筝的人', date: '2023-11-11 17:02:33', author: '卡勒德·胡赛尼', address: '美国 旧金山', sn: 'sn2311110019' },
+  { id: 20, name: '解忧杂货店', date: '2023-11-12 10:27:44', author: '东野圭吾', address: '日本 东京', sn: 'sn2311120020' },
+  { id: 21, name: '嫌疑人X的献身', date: '2023-11-13 11:39:28', author: '东野圭吾', address: '日本 大阪', sn: 'sn2311130021' },
+  { id: 22, name: '霍乱时期的爱情', date: '2023-11-14 20:03:07', author: '加西亚·马尔克斯', address: '哥伦比亚 卡塔赫纳', sn: 'sn2311140022' },
+  { id: 23, name: '人类简史', date: '2023-11-15 09:14:59', author: '尤瓦尔·赫拉利', address: '以色列 耶路撒冷', sn: 'sn2311150023' },
+  { id: 24, name: '未来简史', date: '2023-11-16 12:01:01', author: '尤瓦尔·赫拉利', address: '以色列 特拉维夫', sn: 'sn2311160024' },
+  { id: 25, name: '刀锋', date: '2023-11-17 07:20:40', author: '毛姆', address: '英国 伦敦', sn: 'sn2311170025' },
+  { id: 26, name: '局外人', date: '2023-11-18 18:44:12', author: '加缪', address: '法国 里昂', sn: 'sn2311180026' },
+  { id: 27, name: '挪威的森林', date: '2023-11-19 22:58:06', author: '村上春树', address: '日本 神户', sn: 'sn2311190027' },
+  { id: 28, name: '小岛经济学', date: '2023-11-20 08:09:33', author: '彼得·希夫', address: '美国 波士顿', sn: 'sn2311200028' },
+  { id: 29, name: '围棋人生', date: '2023-11-21 16:46:27', author: '阿城', address: '中国 北京', sn: 'sn2311210029' },
+  { id: 30, name: '白夜行', date: '2023-11-22 13:31:19', author: '东野圭吾', address: '日本 东京', sn: 'sn2311220030' },
+  { id: 31, name: '解密', date: '2023-11-23 10:05:55', author: '麦家', address: '中国 杭州', sn: 'sn2311230031' }
+]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "br-dionysus",
-  "version": "1.17.6",
+  "version": "1.17.7",
   "scripts": {
     "dev": "vite --config vite.config.ts",
     "build:doc": "vue-tsc --noEmit && vite build --config ./build/doc.config.ts && node script/copyDir.js",
@@ -17,6 +17,7 @@
   },
   "dependencies": {
     "@element-plus/icons-vue": "2.3.1",
+    "@types/big.js": "^6.2.2",
     "@vue/compiler-sfc": "~3.4.27",
     "big.js": "~6.2.1",
     "dayjs": "~1.11.10",
@@ -37,6 +38,7 @@
     "@vue/test-utils": "~2.4.6",
     "archiver": "~7.0.1",
     "axios": "~1.7.0",
+    "axios-mock-adapter": "^2.1.0",
     "connect-history-api-fallback": "~2.0.0",
     "cypress": "~13.13.2",
     "eslint": "~8.49.0",

package/packages/MSelectTable/docs/DemoTest1.vue

@@ -7,7 +7,7 @@
       v-model="code"
       :tableTitle="commodityOptionsTitle"
       :options="options"
-      :keywords="{ label: 'ApprovedQtyPU', value: 'DocNo' }"
+      :keywords="{ label: 'name', value: 'sn' }"
       :total="total"
       scrollbarAlwaysOn
       filterable
@@ -23,65 +23,47 @@
 <script setup lang="ts">
 import { ref } from 'vue'
 import { Page } from './../../typings/class'
+import { getBookList } from '../../../mock'
+import { Book, BookList } from '../../../mock/mockData/book'
 
-const commodityOptionsTitle: TableTitle[] = [{
-  prop: 'PRDocType',
-  label: '单据类型'
+const commodityOptionsTitle: TableTitle<Book>[] = [{
+  prop: 'sn',
+  label: '编码'
 }, {
-  prop: 'DocNo',
-  label: '请购单号'
+  prop: 'name',
+  label: '书名'
 }, {
-  prop: 'ApprovedQtyPU',
-  label: '名称'
+  prop: 'author',
+  label: '作者'
 }, {
-  prop: 'ACCode',
-  label: '货币'
+//   prop: 'address',
+//   label: '发行地'
+// }, {
+  prop: 'date',
+  label: '入库时间'
 }]
 
 const code = ref<string>('')
 
-const total = ref(0)
-const options = ref<RowDataType[]>([])
-interface RowDataType {
-  /** 单据类型 */
-  PRDocType: string;
-  /** 请购单号 */
-  DocNo: number;
-  /** 名称 */
-  ApprovedQtyPU: string;
-  /** 货币 */
-  ACCode: string;
-}
-const mockData: RowDataType[] = []
-for (let i = 0; i < 1000; i++) {
-  mockData.push({
-    PRDocType: '测试数据' + (i + 1),
-    DocNo: i + 1,
-    ApprovedQtyPU: 'ApprovedQtyPU' + (i + 1),
-    ACCode: 'ACCode'
-  })
-}
-const getData = async (query: string, page: Page) => {
-  return new Promise<void>((resolve) => {
-    setTimeout(() => {
-      const start = (page.currentPage - 1) * page.pageSize
-      options.value = mockData.filter(item => item.ApprovedQtyPU.includes(query) || item.PRDocType.includes(query)).slice(start, start + page.pageSize)
-      total.value = mockData.length
-      resolve()
-    }, 500)
-  })
-}
+const total = ref<number>(0)
+const options = ref<BookList>([])
 
 const selected = (value: string) => {
   console.log(value)
 }
 
 const toPage = (page: Page, str: any) => {
-  getData(str, page)
+  remoteMethod(str, page)
 }
 
 const remoteMethod = async (query: string, page: Page = new Page()) => {
-  await getData(query, page)
+  const res = await getBookList({
+    keyword: query,
+    page: page.currentPage,
+    pageSize: page.pageSize
+  })
+  options.value = res.data?.rows ?? []
+  total.value = res.data?.total ?? 0
 }
 </script>
 

package/packages/MSelectTable/docs/DemoTest2.vue

@@ -9,7 +9,7 @@
       :name="name"
       :tableTitle="commodityOptionsTitle"
       :options="options"
-      :keywords="{ label: 'ApprovedQtyPU', value: 'DocNo' }"
+      :keywords="{ label: 'name', value: 'sn' }"
       :total="total"
       scrollbarAlwaysOn
       filterable
@@ -25,66 +25,48 @@
 <script setup lang="ts">
 import { ref } from 'vue'
 import { Page } from './../../typings/class'
+import { getBookList } from '../../../mock'
+import { Book, BookList } from '../../../mock/mockData/book'
 
-const commodityOptionsTitle: TableTitle[] = [{
-  prop: 'PRDocType',
-  label: '单据类型'
+const commodityOptionsTitle: TableTitle<Book>[] = [{
+  prop: 'sn',
+  label: '编码'
 }, {
-  prop: 'DocNo',
-  label: '请购单号'
+  prop: 'name',
+  label: '书名'
 }, {
-  prop: 'ApprovedQtyPU',
-  label: '名称'
+  prop: 'author',
+  label: '作者'
 }, {
-  prop: 'ACCode',
-  label: '货币'
+//   prop: 'address',
+//   label: '发行地'
+// }, {
+  prop: 'date',
+  label: '入库时间'
 }]
 
 const code = ref<string>('')
 const name = ref<string>('这是name')
 
-const total = ref(0)
-const options = ref<RowDataType[]>([])
-interface RowDataType {
-  /** 单据类型 */
-  PRDocType: string;
-  /** 请购单号 */
-  DocNo: number;
-  /** 名称 */
-  ApprovedQtyPU: string;
-  /** 货币 */
-  ACCode: string;
-}
-const mockData: RowDataType[] = []
-for (let i = 0; i < 1000; i++) {
-  mockData.push({
-    PRDocType: '测试数据' + (i + 1),
-    DocNo: i + 1,
-    ApprovedQtyPU: 'ApprovedQtyPU' + (i + 1),
-    ACCode: 'ACCode'
-  })
-}
-const getData = async (query: string, page: any) => {
-  return new Promise<void>((resolve) => {
-    setTimeout(() => {
-      const start = (page.currentPage - 1) * page.pageSize
-      options.value = mockData.filter(item => item.ApprovedQtyPU.includes(query) || item.PRDocType.includes(query)).slice(start, start + page.pageSize)
-      total.value = mockData.length
-      resolve()
-    }, 500)
-  })
-}
+const total = ref<number>(0)
+const options = ref<BookList>([])
 
 const selected = (value: string) => {
   console.log(value)
 }
 
 const toPage = (page: Page, str: any) => {
-  getData(str, page)
+  remoteMethod(str, page)
 }
 
 const remoteMethod = async (query: string, page: Page = new Page()) => {
-  await getData(query, page)
+  const res = await getBookList({
+    keyword: query,
+    page: page.currentPage,
+    pageSize: page.pageSize
+  })
+  options.value = res.data?.rows ?? []
+  total.value = res.data?.total ?? 0
 }
 </script>
 

package/packages/MSelectTable/docs/DemoTest3.vue

@@ -7,7 +7,7 @@
       v-model="code"
       :tableTitle="commodityOptionsTitle"
       :options="options"
-      :keywords="{ label: 'ApprovedQtyPU', value: 'DocNo' }"
+      :keywords="{ label: 'name', value: 'sn' }"
       :total="total"
       scrollbarAlwaysOn
       filterable
@@ -30,47 +30,36 @@
 <script setup lang="ts">
 import { ref } from 'vue'
 import { Page } from './../../typings/class'
+import { Book, BookList } from '../../../mock/mockData/book'
+import { getBookList } from '../../../mock'
 
-const commodityOptionsTitle: TableTitle[] = [{
-  prop: 'PRDocType',
-  label: '单据类型'
+const commodityOptionsTitle: TableTitle<Book>[] = [{
+  prop: 'sn',
+  label: '编码'
 }, {
-  prop: 'DocNo',
-  label: '请购单号'
+  prop: 'name',
+  label: '书名'
 }, {
-  prop: 'ApprovedQtyPU',
-  label: '名称'
+  prop: 'author',
+  label: '作者'
 }, {
-  prop: 'ACCode',
-  label: '货币'
+//   prop: 'address',
+//   label: '发行地'
+// }, {
+  prop: 'date',
+  label: '入库时间'
 }]
 
 const code = ref<string | number | Array<string | number>>([])
 
-const total = ref(0)
-const options = ref<any[]>([])
-const mockData: any[] = []
-for (let i = 0; i < 1000; i++) {
-  mockData.push({
-    PRDocType: '测试数据' + (i + 1),
-    DocNo: i + 1,
-    ApprovedQtyPU: 'ApprovedQtyPU' + (i + 1),
-    ACCode: 'ACCode'
-  })
-}
+const total = ref<number>(0)
+const options = ref<BookList>([])
 
 setTimeout(() => {
-  options.value = [{
-    PRDocType: 'xxxPRDocType1',
-    DocNo: 1,
-    ApprovedQtyPU: 'xxxApprovedQtyPU1',
-    ACCode: 'xxxACCode1'
-  }, {
-    PRDocType: 'xxxPRDocType2',
-    DocNo: 2,
-    ApprovedQtyPU: 'xxxApprovedQtyPU2',
-    ACCode: 'xxxACCode2'
-  }]
+  options.value = [
+    { id: 4, name: '西游记', date: '2023-10-27 14:22:45', author: '吴承恩', address: '中国 江苏', sn: 'sn2310270004' },
+    { id: 5, name: '水浒传', date: '2023-10-28 18:33:02', author: '施耐庵', address: '中国 山东', sn: 'sn2310280005' }
+  ]
 }, 100)
 
 const selected = (value: string | number | Array<number | string>) => {
@@ -78,30 +67,25 @@ const selected = (value: string | number | Array<number | string>) => {
 }
 
 const toPage = (page: Page, str: any) => {
-  console.log('str', str)
-  getData(str, page)
+  remoteMethod(str, page)
 }
 const selectMultiple = (value: string | number | Array<number | string>) => {
   code.value = value
 }
 
 const remoteMethod = async (query: string, page: Page = new Page()) => {
-  await getData(query, page)
+  const res = await getBookList({
+    keyword: query,
+    page: page.currentPage,
+    pageSize: page.pageSize
+  })
+  options.value = res.data?.rows ?? []
+  total.value = res.data?.total ?? 0
 }
 
 const selectChange = (value: string | number | Array<number | string>) => {
   console.log('选择变化事件触发，注意，绑定值没有发生变化', value)
 }
-const getData = async (query: string, page: any) => {
-  return new Promise<void>((resolve) => {
-    setTimeout(() => {
-      const start = (page.currentPage - 1) * page.pageSize
-      options.value = mockData.filter(item => item.PRDocType.includes(query)).slice(start, start + page.pageSize)
-      total.value = mockData.length
-      resolve()
-    }, 500)
-  })
-}
 </script>
 
 <style>

package/packages/MSelectTable/docs/DemoTest4.vue

@@ -7,7 +7,7 @@
       v-model="code"
       :tableTitle="commodityOptionsTitle"
       :options="options"
-      :keywords="{ label: 'ApprovedQtyPU', value: 'DocNo' }"
+      :keywords="{ label: 'name', value: 'sn' }"
       :total="total"
       scrollbarAlwaysOn
       filterable
@@ -25,44 +25,42 @@
 <script setup lang="ts">
 import { ref, onMounted } from 'vue'
 import { Page } from './../../typings/class'
+import { Book, BookList } from '../../../mock/mockData/book'
+import { getBookList } from '../../../mock'
 
-const commodityOptionsTitle: TableTitle[] = [{
-  prop: 'PRDocType',
-  label: '单据类型'
+const commodityOptionsTitle: TableTitle<Book>[] = [{
+  prop: 'sn',
+  label: '编码'
 }, {
-  prop: 'DocNo',
-  label: '请购单号'
+  prop: 'name',
+  label: '书名'
 }, {
-  prop: 'ApprovedQtyPU',
-  label: '名称'
-
+  prop: 'author',
+  label: '作者'
 }, {
-  prop: 'ACCode',
-  label: '货币'
+//   prop: 'address',
+//   label: '发行地'
+// }, {
+  prop: 'date',
+  label: '入库时间'
 }]
 
 const code = ref<string | number | Array<string | number>>([])
 
-const total = ref(0)
-const options = ref<any[]>([])
-const mockData: any[] = []
-for (let i = 0; i < 1000; i++) {
-  mockData.push({
-    PRDocType: '测试数据' + (i + 1),
-    DocNo: i + 1,
-    ApprovedQtyPU: 'ApprovedQtyPU' + (i + 1),
-    ACCode: 'ACCode'
-  })
-}
-const getDataList = (page: Page = new Page(), str: string = '') => {
-  setTimeout(() => {
-    options.value = mockData.filter(item => item.PRDocType.includes(str)).slice(0, page.pageSize)
-    total.value = mockData.length
+const total = ref<number>(0)
+const options = ref<BookList>([])
+const getDataList = async (page: Page = new Page(), str: string = '') => {
+  const res = await getBookList({
+    keyword: str,
+    page: page.currentPage,
+    pageSize: page.pageSize
   })
+  options.value = res.data?.rows ?? []
+  total.value = res.data?.total ?? 0
 }
 
 setTimeout(() => {
-  code.value = [1, 2]
+  code.value = ['sn2311080016', 'sn2311090017']
 }, 100)
 
 const selected = (value: string | number | Array<number | string>) => {
@@ -70,25 +68,20 @@ const selected = (value: string | number | Array<number | string>) => {
 }
 
 const toPage = (page: Page, str: any) => {
-  getDataList(page, str)
+  remoteMethod(str, page)
 }
 const selectMultiple = (value: string | number | Array<number | string>) => {
   code.value = value
 }
 
 const remoteMethod = async (query: string, page: Page = new Page()) => {
-  await getData(query, page)
-}
-
-const getData = async (query: string, page: any) => {
-  return new Promise<void>((resolve) => {
-    setTimeout(() => {
-      const start = (page.currentPage - 1) * page.pageSize
-      options.value = mockData.filter(item => item.PRDocType.includes(query)).slice(start, start + page.pageSize)
-      total.value = mockData.length
-      resolve()
-    }, 500)
+  const res = await getBookList({
+    keyword: query,
+    page: page.currentPage,
+    pageSize: page.pageSize
   })
+  options.value = res.data?.rows ?? []
+  total.value = res.data?.total ?? 0
 }
 
 onMounted(() => {