br-dionysus 0.7.10 → 0.7.12

package/README.md

@@ -271,6 +271,7 @@ const test = ref<number>(0)
 
 <script setup lang="ts">
 import { ref } from 'vue'
+import { Page } from '../../../docs/packages/typings/class'
 
 const code = ref<string>('')
 const options = ref<Option[]>()
@@ -310,7 +311,8 @@ const mockData = [{
   createdTimeStr: '2024-05-06'
 }]
 
-const remoteMethod = async (query: string = '') => {
+const remoteMethod = async (query: string = '', page: Page) => {
+  console.log('page', page)
   options.value = mockData.map(item => ({
     label: item.fileName,
     value: item.sn,
@@ -486,7 +488,9 @@ sole 必须传递在表格数据内为唯一的值  如id key 等不会发生重
         :minWidth="item.minWidth"
         v-model:filtersValue="filtersValue"
         showOverflowTooltip
-      />
+        :children="item.children||[]"
+      >
+      </MTableColumn>
     </el-table>
   </div>
 </template>
@@ -542,8 +546,30 @@ const tableTitle = [
   },
   {
     label: '地址',
-    prop: 'address',
-    minWidth: '134px'
+    children: [
+      {
+        label: '123', children: [
+          {
+           label: '222222222222',
+          prop: 'address',
+            minWidth: '134px'
+
+          },
+          {
+           label: 'qqqqqq',
+            prop: 'address',
+            minWidth: '134px'
+
+          }
+        ]
+      },
+       {
+        label: '2222',
+        prop: 'address',
+        minWidth: '134px'
+      },
+    ]
+    
   },
   {
     label: '标签',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "br-dionysus",
-  "version": "0.7.10",
+  "version": "0.7.12",
   "scripts": {
     "dev": "vite --config ./build/base.config.ts",
     "build:doc": "vue-tsc --noEmit && vite build --config ./build/doc.config.ts && node script/copyDir.js",

package/packages/MSelectTable/docs/demo.vue

@@ -13,6 +13,7 @@
 
 <script setup lang="ts">
 import { ref } from 'vue'
+import { Page } from '../../../docs/packages/typings/class'
 
 const code = ref<string>('')
 const options = ref<Option[]>()
@@ -52,7 +53,8 @@ const mockData = [{
   createdTimeStr: '2024-05-06'
 }]
 
-const remoteMethod = async (query: string = '') => {
+const remoteMethod = async (query: string = '', page: Page) => {
+  console.log('page', page)
   options.value = mockData.map(item => ({
     label: item.fileName,
     value: item.sn,

package/packages/MSelectTable/src/index.vue

@@ -6,7 +6,7 @@
         :class="_this.inputClass"
         :size="props.size"
         :placeholder="props.placeholder"
-        @input="remoteMethod($event);_this.showPanel = true"
+        @input="props.remoteMethod($event, page);_this.showPanel = true"
         @focus="focus"
         @keyup.enter="addRowData"
         :disabled="props.disabled"
@@ -40,7 +40,7 @@
         :ref="mTableRef"
         class="m-table s-table"
         :data="optionsMap"
-        size="small"
+        :size="props.size"
         @currentChange="handleCurrentChange"
         :rowClassName="tableRowClassName"
         @selectionChange="handleSelectionChange"
@@ -76,7 +76,7 @@
           v-model:currentPage="page.currentPage"
           v-model:pageSize="page.pageSize"
           hideOnSinglePage
-          small
+          :small="props.size === 'small'"
           :pageSizes="page.pageSizesOptions"
           layout="total, prev, pager, next, sizes"
           :total="page.total"
@@ -176,7 +176,7 @@ const optionsMap = computed(() => {
 
 // 分页
 const page = reactive<Page>(new Page({
-  total: 0,
+  total: props.total,
   pageSize: 5,
   currentPage: 1,
   pageSizesOptions: [5, 10, 20]

package/packages/MTableColumn/docs/demo.vue

@@ -9,7 +9,9 @@
         :minWidth="item.minWidth"
         v-model:filtersValue="filtersValue"
         showOverflowTooltip
-      />
+        :children="item.children||[]"
+      >
+      </MTableColumn>
     </el-table>
   </div>
 </template>
@@ -65,8 +67,30 @@ const tableTitle = [
   },
   {
     label: '地址',
-    prop: 'address',
-    minWidth: '134px'
+    children: [
+      {
+        label: '123', children: [
+          {
+           label: '222222222222',
+          prop: 'address',
+            minWidth: '134px'
+
+          },
+          {
+           label: 'qqqqqq',
+            prop: 'address',
+            minWidth: '134px'
+
+          }
+        ]
+      },
+       {
+        label: '2222',
+        prop: 'address',
+        minWidth: '134px'
+      },
+    ]
+    
   },
   {
     label: '标签',

package/packages/MTableColumn/src/index.vue

@@ -11,6 +11,17 @@
         :index="scope.$index"
       ></slot>
     </template>
+    <template v-if="props.children && props.children.length">
+      <index
+        v-for="child in props.children"
+        :key="child.prop"
+        :prop="child.prop"
+        :label="child.label"
+        :minWidth="child.minWidth"
+        showOverflowTooltip
+        :children="child.children || []"
+      ></index>
+    </template>
     <template #header="scope">
       <span>
         <slot
@@ -95,14 +106,21 @@ interface FilterValue {
   [key: string]: Array<string | number>
 }
 
+interface PropChildren {
+  [prop: string]: any,
+  children?: PropChildren[]
+}
+
 const props = withDefaults(defineProps<{
   filtersValue?: FilterValue,
   filters?: Array<{ text: string | number, value: string | number }>,
-  filterMethod?: Function
+  filterMethod?: Function,
+  children?: Array<PropChildren>
 }>(), {
   filtersValue: () => ({}),
   filters: () => [],
-  filterMethod: () => {}
+  filterMethod: () => {},
+  children: () => []
 })
 
 const slots = useSlots()