br-dionysus 1.17.6 → 1.18.0

package/packages/MDialog/src/MDialog.vue

@@ -38,7 +38,7 @@
 
 <script setup lang="ts">
 import { ref, useSlots, watch, computed } from 'vue'
-import { ElDialog } from 'element-plus'
+// import { ElDialog } from 'element-plus'
 import createHash from '../../Tool/createHash/createHash'
 
 const slots = useSlots()
@@ -213,15 +213,15 @@ watch(
   }
 )
 
-const dialogRef = ref<InstanceType<typeof ElDialog> | null>(null)
+const dialogRef = ref<any | null>(null)
 
 defineExpose({
-  open: () => dialogRef?.value.open,
-  opened: () => dialogRef?.value.opened,
-  close: () => dialogRef?.value.close,
-  closed: () => dialogRef?.value.closed,
-  openAutoFocus: () => dialogRef?.value.openAutoFocus,
-  closeAutoFocus: () => dialogRef?.value.closeAutoFocus
+  open: () => dialogRef?.value?.open,
+  opened: () => dialogRef?.value?.opened,
+  close: () => dialogRef?.value?.close,
+  closed: () => dialogRef?.value?.closed,
+  openAutoFocus: () => dialogRef?.value?.openAutoFocus,
+  closeAutoFocus: () => dialogRef?.value?.closeAutoFocus
 })
 </script>
 

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(() => {

package/packages/MSelectTable/docs/DemoTest5.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,54 +25,46 @@
 <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>>([1, '2444'])
+const code = ref<string | number | Array<string | number>>(['sn2310240001', 'sn2310250002'])
 
-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(() => {
-  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>) => {
@@ -80,25 +72,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(() => {