@tongfun/tf-widget 0.1.134 → 0.1.136
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/tf-widget.common.js +12 -4
- package/lib/tf-widget.umd.js +12 -4
- package/lib/tf-widget.umd.min.js +1 -1
- package/package.json +1 -1
package/lib/tf-widget.common.js
CHANGED
|
@@ -141344,7 +141344,7 @@ async function initTableConfigList(el, binding, vNode) {
|
|
|
141344
141344
|
field: item.property,
|
|
141345
141345
|
isShow: testField(current, 'isShow') ? current.isShow : true,
|
|
141346
141346
|
isFreeze: testField(current, 'isFreeze') ? current.isFreeze : false,
|
|
141347
|
-
fieldWidth: testField(current, 'fieldWidth') ? current.fieldWidth : item.width ? item.width.split('px')[0] : 150,
|
|
141347
|
+
fieldWidth: testField(current, 'fieldWidth') ? current.fieldWidth : item.width ? (item.width + '').split('px')[0] : 150,
|
|
141348
141348
|
fieldIndex: current.fieldIndex
|
|
141349
141349
|
};
|
|
141350
141350
|
});
|
|
@@ -141531,6 +141531,7 @@ function watchTableColumn(el, binding, vNode) {
|
|
|
141531
141531
|
columns.forEach((item, index) => {
|
|
141532
141532
|
vm.$set(columns[index], 'filterValue', null);
|
|
141533
141533
|
vm.$set(columns[index], 'orderBy', undefined);
|
|
141534
|
+
vm.$set(columns[index], 'resizable', true);
|
|
141534
141535
|
vm.$set(columns[index], 'sortable', true);
|
|
141535
141536
|
vm.$set(columns[index], 'sortMethod', customSort(item.property));
|
|
141536
141537
|
|
|
@@ -141573,7 +141574,6 @@ const addSettingColumn = (el, binding, vNode) => {
|
|
|
141573
141574
|
}] : [...columns, mixinObj];
|
|
141574
141575
|
newColumns.sort((a, b) => a.fieldIndex - b.fieldIndex);
|
|
141575
141576
|
tableInstance.loadColumn(newColumns);
|
|
141576
|
-
console.log(222, newColumns.map(item => (item.title || item.type) + item.fieldIndex));
|
|
141577
141577
|
};
|
|
141578
141578
|
/** 列排序方法 */
|
|
141579
141579
|
|
|
@@ -141596,7 +141596,15 @@ const customSort = field => {
|
|
|
141596
141596
|
|
|
141597
141597
|
const initSettingHeader = (el, binding, vNode) => {
|
|
141598
141598
|
const vm = vNode.context;
|
|
141599
|
-
return vm.$createElement('
|
|
141599
|
+
return vm.$createElement('el-tooltip', {
|
|
141600
|
+
class: 'umy-table-setting-tooltip',
|
|
141601
|
+
props: {
|
|
141602
|
+
effect: 'dark',
|
|
141603
|
+
content: '表格设置',
|
|
141604
|
+
placement: 'top'
|
|
141605
|
+
}
|
|
141606
|
+
}, [vm.$createElement('i', {
|
|
141607
|
+
// 样式在css中
|
|
141600
141608
|
class: 'el-icon-setting',
|
|
141601
141609
|
style: {
|
|
141602
141610
|
'display': 'flex',
|
|
@@ -141612,7 +141620,7 @@ const initSettingHeader = (el, binding, vNode) => {
|
|
|
141612
141620
|
}
|
|
141613
141621
|
|
|
141614
141622
|
}
|
|
141615
|
-
});
|
|
141623
|
+
})]);
|
|
141616
141624
|
};
|
|
141617
141625
|
/** 调整头部筛选以及排序 */
|
|
141618
141626
|
|
package/lib/tf-widget.umd.js
CHANGED
|
@@ -141354,7 +141354,7 @@ async function initTableConfigList(el, binding, vNode) {
|
|
|
141354
141354
|
field: item.property,
|
|
141355
141355
|
isShow: testField(current, 'isShow') ? current.isShow : true,
|
|
141356
141356
|
isFreeze: testField(current, 'isFreeze') ? current.isFreeze : false,
|
|
141357
|
-
fieldWidth: testField(current, 'fieldWidth') ? current.fieldWidth : item.width ? item.width.split('px')[0] : 150,
|
|
141357
|
+
fieldWidth: testField(current, 'fieldWidth') ? current.fieldWidth : item.width ? (item.width + '').split('px')[0] : 150,
|
|
141358
141358
|
fieldIndex: current.fieldIndex
|
|
141359
141359
|
};
|
|
141360
141360
|
});
|
|
@@ -141541,6 +141541,7 @@ function watchTableColumn(el, binding, vNode) {
|
|
|
141541
141541
|
columns.forEach((item, index) => {
|
|
141542
141542
|
vm.$set(columns[index], 'filterValue', null);
|
|
141543
141543
|
vm.$set(columns[index], 'orderBy', undefined);
|
|
141544
|
+
vm.$set(columns[index], 'resizable', true);
|
|
141544
141545
|
vm.$set(columns[index], 'sortable', true);
|
|
141545
141546
|
vm.$set(columns[index], 'sortMethod', customSort(item.property));
|
|
141546
141547
|
|
|
@@ -141583,7 +141584,6 @@ const addSettingColumn = (el, binding, vNode) => {
|
|
|
141583
141584
|
}] : [...columns, mixinObj];
|
|
141584
141585
|
newColumns.sort((a, b) => a.fieldIndex - b.fieldIndex);
|
|
141585
141586
|
tableInstance.loadColumn(newColumns);
|
|
141586
|
-
console.log(222, newColumns.map(item => (item.title || item.type) + item.fieldIndex));
|
|
141587
141587
|
};
|
|
141588
141588
|
/** 列排序方法 */
|
|
141589
141589
|
|
|
@@ -141606,7 +141606,15 @@ const customSort = field => {
|
|
|
141606
141606
|
|
|
141607
141607
|
const initSettingHeader = (el, binding, vNode) => {
|
|
141608
141608
|
const vm = vNode.context;
|
|
141609
|
-
return vm.$createElement('
|
|
141609
|
+
return vm.$createElement('el-tooltip', {
|
|
141610
|
+
class: 'umy-table-setting-tooltip',
|
|
141611
|
+
props: {
|
|
141612
|
+
effect: 'dark',
|
|
141613
|
+
content: '表格设置',
|
|
141614
|
+
placement: 'top'
|
|
141615
|
+
}
|
|
141616
|
+
}, [vm.$createElement('i', {
|
|
141617
|
+
// 样式在css中
|
|
141610
141618
|
class: 'el-icon-setting',
|
|
141611
141619
|
style: {
|
|
141612
141620
|
'display': 'flex',
|
|
@@ -141622,7 +141630,7 @@ const initSettingHeader = (el, binding, vNode) => {
|
|
|
141622
141630
|
}
|
|
141623
141631
|
|
|
141624
141632
|
}
|
|
141625
|
-
});
|
|
141633
|
+
})]);
|
|
141626
141634
|
};
|
|
141627
141635
|
/** 调整头部筛选以及排序 */
|
|
141628
141636
|
|