@leevan/jtui 2.0.7 → 2.0.10
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/examples/App.vue +20 -12
- package/examples/echarts/moreCharts.vue +159 -0
- package/examples/form/form.vue +61 -0
- package/examples/tableTest/table-tree.vue +22 -8
- package/examples/tableTest/tree-table.vue +9 -2
- package/lib/jtui.common.js +261 -101
- package/lib/jtui.css +1 -1
- package/lib/jtui.umd.js +261 -101
- package/lib/jtui.umd.min.js +4 -4
- package/package.json +1 -1
- package/packages/jt-echarts-pc/JtEchartsPc.vue +1454 -1135
- package/packages/jt-form-pc/JtFormPc.vue +2 -0
- package/packages/jt-table/components/tableColumn.vue +2 -0
- package/packages/jt-table/index.vue +9 -3
- package/packages/jt-table-pc/components/tableColumn.vue +2 -0
- package/packages/jt-table-pc/data2.js +29 -29
|
@@ -67,6 +67,8 @@
|
|
|
67
67
|
:style="{width:item.width ? item.width === 'auto' ? item.width : item.width + 'px' : '200px'}"
|
|
68
68
|
v-model="model[item.modelKey]"
|
|
69
69
|
:disabled="item.disabled ? item.disabled : false"
|
|
70
|
+
:filterable="item.isCreate ? true : false"
|
|
71
|
+
:allow-create="item.isCreate ? true : false"
|
|
70
72
|
:multiple="item.multiple === undefined ? false : true"
|
|
71
73
|
:collapse-tags="item.collapse ===undefined ? false : true"
|
|
72
74
|
:placeholder="item.placeholder ? item.placeholder : ''">
|
|
@@ -5,12 +5,14 @@
|
|
|
5
5
|
v-if="item.children && item.children.length"
|
|
6
6
|
:title="item.label"
|
|
7
7
|
:key="index"
|
|
8
|
+
:type="item.html ? 'html' : ''"
|
|
8
9
|
>
|
|
9
10
|
<template v-for="(subItem, subIndex) in item.children">
|
|
10
11
|
<vxe-colgroup
|
|
11
12
|
v-if="subItem.children && subItem.children.length"
|
|
12
13
|
:title="subItem.label"
|
|
13
14
|
:key="subIndex"
|
|
15
|
+
:type="subItem.html ? 'html' : ''"
|
|
14
16
|
>
|
|
15
17
|
<vxe-table-column
|
|
16
18
|
v-for="(subSubItem, subSubIndex) in subItem.children"
|
|
@@ -1101,9 +1101,15 @@ export default {
|
|
|
1101
1101
|
});
|
|
1102
1102
|
let list = [];
|
|
1103
1103
|
if (order === "asc" || order === "desc") {
|
|
1104
|
-
|
|
1105
|
-
|
|
1106
|
-
|
|
1104
|
+
if(/.*[\u4e00-\u9fa5]+.*$/.test(data1[0][property])){
|
|
1105
|
+
list = data1.sort((a, b) => {
|
|
1106
|
+
return a[property].localeCompare(b[property]);
|
|
1107
|
+
});
|
|
1108
|
+
}else{
|
|
1109
|
+
list = data1.sort((a, b) => {
|
|
1110
|
+
return a[property] - b[property];
|
|
1111
|
+
});
|
|
1112
|
+
}
|
|
1107
1113
|
}
|
|
1108
1114
|
if (order === "desc") {
|
|
1109
1115
|
list.reverse();
|
|
@@ -5,12 +5,14 @@
|
|
|
5
5
|
v-if="item.children && item.children.length"
|
|
6
6
|
:title="item.label"
|
|
7
7
|
:key="index"
|
|
8
|
+
:type="item.html ? 'html' : ''"
|
|
8
9
|
>
|
|
9
10
|
<template v-for="(subItem, subIndex) in item.children">
|
|
10
11
|
<vxe-colgroup
|
|
11
12
|
v-if="subItem.children && subItem.children.length"
|
|
12
13
|
:title="subItem.label"
|
|
13
14
|
:key="subIndex"
|
|
15
|
+
:type="subItem.html ? 'html' : ''"
|
|
14
16
|
>
|
|
15
17
|
<vxe-table-column
|
|
16
18
|
v-for="(subSubItem, subSubIndex) in subItem.children"
|
|
@@ -283,13 +283,13 @@ export function data23() {
|
|
|
283
283
|
"isSort": false,
|
|
284
284
|
"prop": "wxq1",
|
|
285
285
|
"width": 150,
|
|
286
|
-
"label": "
|
|
287
|
-
"
|
|
286
|
+
"label": "<div style='color: red'> 危险区名称-合并</div>",
|
|
287
|
+
"html": true,
|
|
288
288
|
"align": "left",
|
|
289
289
|
"enum": [],
|
|
290
290
|
"children": [
|
|
291
291
|
{
|
|
292
|
-
"isSort":
|
|
292
|
+
"isSort": true,
|
|
293
293
|
"prop": "wxq",
|
|
294
294
|
"width": 150,
|
|
295
295
|
"label": "危险区名称",
|
|
@@ -307,10 +307,10 @@ export function data23() {
|
|
|
307
307
|
"enum": [],
|
|
308
308
|
"children": [
|
|
309
309
|
{
|
|
310
|
-
"isSort":
|
|
310
|
+
"isSort": false,
|
|
311
311
|
"prop": "shg",
|
|
312
312
|
"width": 50,
|
|
313
|
-
"label": "
|
|
313
|
+
"label": "标签与筛选",
|
|
314
314
|
"type": "String",
|
|
315
315
|
"align": "left",
|
|
316
316
|
"enum": [],
|
|
@@ -441,30 +441,30 @@ export function data23() {
|
|
|
441
441
|
},
|
|
442
442
|
Result: 89,
|
|
443
443
|
DataArray: [
|
|
444
|
-
{
|
|
445
|
-
|
|
446
|
-
|
|
447
|
-
|
|
448
|
-
|
|
449
|
-
|
|
450
|
-
|
|
451
|
-
|
|
452
|
-
|
|
453
|
-
|
|
454
|
-
|
|
455
|
-
|
|
456
|
-
|
|
457
|
-
|
|
458
|
-
|
|
459
|
-
|
|
460
|
-
|
|
461
|
-
|
|
462
|
-
|
|
463
|
-
|
|
464
|
-
|
|
465
|
-
|
|
466
|
-
|
|
467
|
-
},
|
|
444
|
+
// {
|
|
445
|
+
// "xzrdh": "13882885223",
|
|
446
|
+
// "country": "罗江镇",
|
|
447
|
+
// "isExpand": '1',
|
|
448
|
+
// "yjrzw": "社区书记",
|
|
449
|
+
// "count": "273",
|
|
450
|
+
// "jcrxm": "杨海燕",
|
|
451
|
+
// "yjrxm": "何东",
|
|
452
|
+
// "wxq": "高石社区三组",
|
|
453
|
+
// "xzrxm": "张朝阳",
|
|
454
|
+
// "shg": {
|
|
455
|
+
// enum: [{ label: '测试1', value: 1 }, { label: '测试2', value: 2 }],
|
|
456
|
+
// selected: 1
|
|
457
|
+
// },
|
|
458
|
+
// "xzrzw": "镇长",
|
|
459
|
+
// "jcrdh": "13408181100",
|
|
460
|
+
// "id": "2",
|
|
461
|
+
// "village": {
|
|
462
|
+
// enum: [{ label: '多选1', value: 1 }, { label: '多选2', value: 2 }, { label: '多选3', value: 3 }],
|
|
463
|
+
// selected: [1, 2]
|
|
464
|
+
// },
|
|
465
|
+
// "yjrdh": "15984498223",
|
|
466
|
+
// "_XID": "row_4"
|
|
467
|
+
// },
|
|
468
468
|
{
|
|
469
469
|
"xzrdh": "13882885223",
|
|
470
470
|
"country": "罗江镇",
|