htui-yllkbz 1.4.9 → 1.4.11
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/htui.common.js +2890 -2074
- package/lib/htui.common.js.gz +0 -0
- package/lib/htui.umd.js +2890 -2074
- package/lib/htui.umd.js.gz +0 -0
- package/lib/htui.umd.min.js +52 -52
- package/lib/htui.umd.min.js.gz +0 -0
- package/package.json +1 -1
- package/src/packages/HtTable/htTableColumn.vue +242 -0
- package/src/packages/HtTable/index.ts +3 -2
- package/src/packages/HtTable/index.vue +18 -2
- package/src/packages/HtTable/table-span-method.ts +135 -0
- package/src/packages/HtTable/table.vue +607 -0
- package/src/packages/type.ts +6 -4
- package/src/router/index.ts +3 -2
- package/src/views/About.vue +33 -28
package/src/views/About.vue
CHANGED
|
@@ -4,12 +4,12 @@
|
|
|
4
4
|
* @Author: hutao
|
|
5
5
|
* @Date: 2021-11-15 14:41:40
|
|
6
6
|
* @LastEditors: hutao
|
|
7
|
-
* @LastEditTime:
|
|
7
|
+
* @LastEditTime: 2023-04-09 15:46:52
|
|
8
8
|
-->
|
|
9
9
|
<template>
|
|
10
10
|
<div>
|
|
11
11
|
...................
|
|
12
|
-
<HtSelectOrg :multiple="false"></HtSelectOrg>
|
|
12
|
+
<!-- <HtSelectOrg :multiple="false"></HtSelectOrg> -->
|
|
13
13
|
<!-- <el-button type=""
|
|
14
14
|
@click="test">test</el-button> -->
|
|
15
15
|
<!-- <ht-count-down :stopwatch="true"
|
|
@@ -31,46 +31,36 @@
|
|
|
31
31
|
<div ref="ht-pdf">
|
|
32
32
|
<HtTable
|
|
33
33
|
:data="state.data"
|
|
34
|
-
:configShow="true"
|
|
35
34
|
:checked="true"
|
|
36
|
-
:isExpand="
|
|
37
|
-
:
|
|
38
|
-
|
|
39
|
-
|
|
35
|
+
:isExpand="false"
|
|
36
|
+
:spanMethodProps="{
|
|
37
|
+
colRows: ['name', 'age', 'test.title'],
|
|
38
|
+
sameColRows: [],
|
|
39
|
+
relateProps: { name: 'test.title' },
|
|
40
|
+
}"
|
|
41
|
+
:height="500"
|
|
40
42
|
:columns="state.columns"
|
|
41
43
|
>
|
|
42
|
-
<span slot="expand"></span>
|
|
43
44
|
</HtTable>
|
|
44
45
|
</div>
|
|
45
|
-
<!-- <el-dropdown>
|
|
46
|
-
<el-select placeholder="请选择">
|
|
47
|
-
</el-select>
|
|
48
|
-
|
|
49
|
-
<el-dropdown-menu slot="dropdown">
|
|
50
|
-
<el-dropdown-item>
|
|
51
|
-
<p style="width:300px">re</p>
|
|
52
|
-
</el-dropdown-item>
|
|
53
|
-
<el-dropdown-item>狮子头</el-dropdown-item>
|
|
54
|
-
<el-dropdown-item>螺蛳粉</el-dropdown-item>
|
|
55
|
-
<el-dropdown-item>双皮奶</el-dropdown-item>
|
|
56
|
-
<el-dropdown-item>蚵仔煎</el-dropdown-item>
|
|
57
|
-
</el-dropdown-menu>
|
|
58
|
-
</el-dropdown> -->
|
|
59
46
|
</div>
|
|
60
47
|
</template>
|
|
61
48
|
<script lang="ts">
|
|
62
49
|
import { Component, Vue } from 'vue-property-decorator';
|
|
63
|
-
import HtTable from '@/packages/HtTable/
|
|
50
|
+
import HtTable from '@/packages/HtTable/table.vue';
|
|
64
51
|
import HtCountDown from '@/packages/HtCountDown/index.vue';
|
|
65
52
|
import HtSelectUser from '@/packages/HtSelectUser/index.vue';
|
|
66
53
|
import HtSelectOrg from '@/packages/HtSelectOrg/index.vue';
|
|
54
|
+
import { Column } from '@/packages/type';
|
|
55
|
+
import { getSpanMethod } from '@/packages/HtTable/table-span-method';
|
|
67
56
|
|
|
68
57
|
interface State {
|
|
69
58
|
/** 数据状态 */
|
|
70
59
|
loading: boolean;
|
|
71
|
-
columns:
|
|
60
|
+
columns: Column[];
|
|
72
61
|
data: any;
|
|
73
62
|
content: string;
|
|
63
|
+
colData: any[];
|
|
74
64
|
start: boolean;
|
|
75
65
|
}
|
|
76
66
|
@Component({
|
|
@@ -87,6 +77,7 @@ export default class Index extends Vue {
|
|
|
87
77
|
loading: false,
|
|
88
78
|
start: false,
|
|
89
79
|
content: '',
|
|
80
|
+
colData: [],
|
|
90
81
|
data: [
|
|
91
82
|
{
|
|
92
83
|
name: '胡涛',
|
|
@@ -109,8 +100,8 @@ export default class Index extends Vue {
|
|
|
109
100
|
time: '2022-01-20T00:00:00+08:00',
|
|
110
101
|
},
|
|
111
102
|
{
|
|
112
|
-
name: '胡涛',
|
|
113
|
-
age:
|
|
103
|
+
name: '胡涛1',
|
|
104
|
+
age: 13,
|
|
114
105
|
sex: 'tt',
|
|
115
106
|
id: 3,
|
|
116
107
|
test: { title: '测试' },
|
|
@@ -118,7 +109,7 @@ export default class Index extends Vue {
|
|
|
118
109
|
},
|
|
119
110
|
{
|
|
120
111
|
name: '胡涛',
|
|
121
|
-
age:
|
|
112
|
+
age: 13,
|
|
122
113
|
file: [],
|
|
123
114
|
sex: 'tt',
|
|
124
115
|
id: 4,
|
|
@@ -145,7 +136,19 @@ export default class Index extends Vue {
|
|
|
145
136
|
},
|
|
146
137
|
{
|
|
147
138
|
title: '姓额外名',
|
|
148
|
-
key: '
|
|
139
|
+
key: 'namey',
|
|
140
|
+
children: [
|
|
141
|
+
{
|
|
142
|
+
title: '姓',
|
|
143
|
+
key: 'name',
|
|
144
|
+
},
|
|
145
|
+
{
|
|
146
|
+
title: '名',
|
|
147
|
+
key: 'time',
|
|
148
|
+
type: 'date',
|
|
149
|
+
align: 'center',
|
|
150
|
+
},
|
|
151
|
+
],
|
|
149
152
|
},
|
|
150
153
|
{
|
|
151
154
|
title: 'age',
|
|
@@ -189,6 +192,8 @@ export default class Index extends Vue {
|
|
|
189
192
|
// return "";
|
|
190
193
|
// };
|
|
191
194
|
// }
|
|
195
|
+
/** 处理合并 */
|
|
196
|
+
|
|
192
197
|
save(e: string, f: string) {
|
|
193
198
|
// console.log("e,f", e, f);
|
|
194
199
|
}
|