cnhis-design-vue 0.1.84-beta → 0.1.85-beta
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/es/big-table/index.js +28 -25
- package/es/big-table/style.css +1 -1
- package/es/index/index.js +56 -53
- package/es/index/style.css +1 -1
- package/es/table-filter/index.js +28 -28
- package/es/table-filter/style.css +1 -1
- package/lib/cui.common.js +107 -104
- package/lib/cui.umd.js +107 -104
- package/lib/cui.umd.min.js +13 -13
- package/package.json +1 -1
- package/packages/big-table/src/BigTable.vue +5 -2
- package/packages/table-filter/src/base-search-com/BaseSearch.vue +1 -1
package/package.json
CHANGED
|
@@ -285,6 +285,9 @@ export default create({
|
|
|
285
285
|
}
|
|
286
286
|
return this.primaryKey || 'theUniqueKey';
|
|
287
287
|
},
|
|
288
|
+
handlePrimaryKey() {
|
|
289
|
+
return this.isTree > 0 ? this.primaryKey || "theUniqueKey" : "theUniqueKey";
|
|
290
|
+
},
|
|
288
291
|
handleName() {
|
|
289
292
|
return function(item, key = 'name') {
|
|
290
293
|
return item.alias || item[key];
|
|
@@ -2626,7 +2629,7 @@ export default create({
|
|
|
2626
2629
|
this.$refs.xGrid.setCurrentRow(row);
|
|
2627
2630
|
this.$emit('setNestTableClick', this.isNestTable);
|
|
2628
2631
|
this.$emit('setCurRowIndex', index);
|
|
2629
|
-
this.$emit('linkDetail', row, col, row[this.
|
|
2632
|
+
this.$emit('linkDetail', row, col, row[this.handlePrimaryKey], null, false, index);
|
|
2630
2633
|
},
|
|
2631
2634
|
// 按钮事件
|
|
2632
2635
|
clickBtn(row, btn, index, e, j) {
|
|
@@ -2635,7 +2638,7 @@ export default create({
|
|
|
2635
2638
|
this.recordClickBtnInfo(row, index);
|
|
2636
2639
|
this.$emit('setNestTableClick', this.isNestTable);
|
|
2637
2640
|
this.$emit('setCurRowIndex', index);
|
|
2638
|
-
this.$emit('clickBtn', row, btn, row[this.
|
|
2641
|
+
this.$emit('clickBtn', row, btn, row[this.handlePrimaryKey], index);
|
|
2639
2642
|
// this.handleTopBtnTracher(btn, j);
|
|
2640
2643
|
},
|
|
2641
2644
|
recordClickBtnInfo(row, index) {
|
|
@@ -1773,7 +1773,7 @@ export default create({
|
|
|
1773
1773
|
try {
|
|
1774
1774
|
const print = { formatId, number };
|
|
1775
1775
|
// 执行打印后置条件
|
|
1776
|
-
const result = await this.postStepRule(printBtn.settingObj, {
|
|
1776
|
+
const result = await this.printConfig.postStepRule(printBtn.settingObj, {
|
|
1777
1777
|
result: res,
|
|
1778
1778
|
print: print
|
|
1779
1779
|
});
|