cnhis-design-vue 2.1.21 → 2.1.24
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/CHANGELOG.md +17 -0
- package/es/age/index.js +2 -2
- package/es/big-table/index.js +64 -54
- package/es/big-table/style.css +1 -1
- package/es/button/index.js +32 -25
- package/es/button/style.css +1 -1
- package/es/captcha/index.js +3 -3
- package/es/checkbox/index.js +1 -1
- package/es/color-picker/index.js +1 -1
- package/es/drag-layout/index.js +3 -3
- package/es/editor/index.js +1 -1
- package/es/fabric-chart/index.js +115 -77
- package/es/form-table/index.js +17 -17
- package/es/index/index.js +439 -353
- package/es/index/style.css +1 -1
- package/es/input/index.js +1 -1
- package/es/map/index.js +1 -1
- package/es/multi-chat/index.js +24 -24
- package/es/multi-chat-client/index.js +18 -18
- package/es/multi-chat-history/index.js +4 -4
- package/es/multi-chat-record/index.js +4 -4
- package/es/multi-chat-setting/index.js +20 -20
- package/es/multi-chat-sip/index.js +1 -1
- package/es/radio/index.js +1 -1
- package/es/scale-view/index.js +24 -24
- package/es/select/index.js +3 -3
- package/es/select-label/index.js +3 -3
- package/es/select-person/index.js +63 -40
- package/es/select-person/style.css +1 -1
- package/es/table-filter/index.js +95 -80
- package/es/table-filter/style.css +1 -1
- package/es/tag/index.js +1 -1
- package/es/verification-code/index.js +2 -2
- package/lib/cui.common.js +533 -447
- package/lib/cui.umd.js +533 -447
- package/lib/cui.umd.min.js +23 -23
- package/package.json +1 -1
- package/packages/big-table/src/BigTable.vue +6 -1
- package/packages/button/src/ButtonPrint/index.vue +42 -31
- package/packages/fabric-chart/src/fabric-chart/FabricPolylines.vue +50 -39
- package/packages/select-person/select-person.vue +29 -7
- package/packages/table-filter/src/base-search-com/BaseSearch.vue +84 -78
|
@@ -5,10 +5,23 @@
|
|
|
5
5
|
<!-- 行内编辑对应生成的(保存、取消)按钮 -->
|
|
6
6
|
<template v-if="visibleInlineOperateBtn">
|
|
7
7
|
<div class="btn-custom-wrap">
|
|
8
|
-
<a-button
|
|
8
|
+
<a-button
|
|
9
|
+
v-preventReClick="preventReTime"
|
|
10
|
+
:style="{ display: isInlineOperating ? 'inline-block' : 'none' }"
|
|
11
|
+
@click="inlineEditClick"
|
|
12
|
+
class="btn-custom-class"
|
|
13
|
+
style="margin: 8px 8px 8px 0"
|
|
14
|
+
type="primary"
|
|
15
|
+
>
|
|
9
16
|
保存
|
|
10
17
|
</a-button>
|
|
11
|
-
<a-button
|
|
18
|
+
<a-button
|
|
19
|
+
v-preventReClick="preventReTime"
|
|
20
|
+
:style="{ display: isInlineOperating ? 'inline-block' : 'none' }"
|
|
21
|
+
@click="inlineEditCancel"
|
|
22
|
+
class="btn-custom-class"
|
|
23
|
+
style="margin: 8px 8px 8px 0"
|
|
24
|
+
>
|
|
12
25
|
取消
|
|
13
26
|
</a-button>
|
|
14
27
|
</div>
|
|
@@ -63,14 +76,11 @@
|
|
|
63
76
|
@pressEnter="outFilterChange"
|
|
64
77
|
class="input-search-com"
|
|
65
78
|
>
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
>
|
|
71
|
-
<a-icon type="info-circle" class="search-placeholder-icon" />
|
|
72
|
-
</a-tooltip>
|
|
73
|
-
</template>
|
|
79
|
+
<template slot="prefix" v-if="showPlaceholderPrefix">
|
|
80
|
+
<a-tooltip :title="searchPlaceHolder" overlayClassName="basesearch-placeholder-tooltip">
|
|
81
|
+
<a-icon type="info-circle" class="search-placeholder-icon" />
|
|
82
|
+
</a-tooltip>
|
|
83
|
+
</template>
|
|
74
84
|
</a-input>
|
|
75
85
|
</template>
|
|
76
86
|
<a-input-search
|
|
@@ -83,11 +93,8 @@
|
|
|
83
93
|
:value="currentValue"
|
|
84
94
|
@input="$emit('input', $event.target.value)"
|
|
85
95
|
>
|
|
86
|
-
|
|
87
|
-
<a-tooltip
|
|
88
|
-
:title="searchPlaceHolder"
|
|
89
|
-
overlayClassName="basesearch-placeholder-tooltip"
|
|
90
|
-
>
|
|
96
|
+
<template slot="prefix" v-if="showPlaceholderPrefix">
|
|
97
|
+
<a-tooltip :title="searchPlaceHolder" overlayClassName="basesearch-placeholder-tooltip">
|
|
91
98
|
<a-icon type="info-circle" class="search-placeholder-icon" />
|
|
92
99
|
</a-tooltip>
|
|
93
100
|
</template>
|
|
@@ -201,7 +208,7 @@
|
|
|
201
208
|
<li ref="rowTileBtnItem" class="rowTileBtn-item 123" :key="item.sid" v-if="showLi(item)" :data-key="item.sid" data-source="rowTile">
|
|
202
209
|
<template v-if="item.type == 'ADD' || item.type == 'BATCH'">
|
|
203
210
|
<a-button
|
|
204
|
-
|
|
211
|
+
v-preventReClick="preventReTime"
|
|
205
212
|
v-show="visibleBtn(item) && !item.isHide"
|
|
206
213
|
@click.prevent.stop="showDrawer(item, j)"
|
|
207
214
|
class="btn-custom-class"
|
|
@@ -233,7 +240,7 @@
|
|
|
233
240
|
</template>
|
|
234
241
|
<template v-else-if="isShowRowTileBtnItem(item)">
|
|
235
242
|
<a-button
|
|
236
|
-
|
|
243
|
+
v-preventReClick="preventReTime"
|
|
237
244
|
v-show="visibleBtn(item) && !item.isHide"
|
|
238
245
|
@click.prevent.stop="clickBtn(clickRowData, item, clickRowData.my_index, undefined, j)"
|
|
239
246
|
class="btn-custom-class"
|
|
@@ -255,6 +262,7 @@
|
|
|
255
262
|
<li ref="rowTileBtnItem" class="rowTileBtn-item rowPrintBtn-btn" :key="item.sid" v-if="showLi(item)" :data-key="item.sid" data-source="rowTile">
|
|
256
263
|
<template v-if="item.isVisible && !item.isHide">
|
|
257
264
|
<PrintBtn
|
|
265
|
+
v-bind="$attrs"
|
|
258
266
|
:printConfig="printConfig"
|
|
259
267
|
:baseUrl="printConfig.printBaseUrl"
|
|
260
268
|
:strategy="item.strategy"
|
|
@@ -418,14 +426,15 @@ const BTNOBJ = {
|
|
|
418
426
|
export default create({
|
|
419
427
|
name: 'base-search',
|
|
420
428
|
mixins: [durationMixin, $utils, filterApiFn, tableSearchCon, outQuickSearchFn],
|
|
421
|
-
directives: { resize,preventReClick },
|
|
429
|
+
directives: { resize, preventReClick },
|
|
422
430
|
props: {
|
|
423
431
|
width: {
|
|
424
432
|
default: '400px'
|
|
425
433
|
},
|
|
426
|
-
searchInputWidth:{
|
|
434
|
+
searchInputWidth: {
|
|
435
|
+
// 设置检索框的宽度
|
|
427
436
|
type: Number,
|
|
428
|
-
default:0
|
|
437
|
+
default: 0
|
|
429
438
|
},
|
|
430
439
|
onSearch: Function,
|
|
431
440
|
rowBtnList: {
|
|
@@ -568,7 +577,7 @@ export default create({
|
|
|
568
577
|
useFieldList: Array,
|
|
569
578
|
editTableUid: [String, Number],
|
|
570
579
|
|
|
571
|
-
preventReTime:{
|
|
580
|
+
preventReTime: {
|
|
572
581
|
type: Number,
|
|
573
582
|
default: 1000
|
|
574
583
|
}
|
|
@@ -742,41 +751,41 @@ export default create({
|
|
|
742
751
|
showOutSearch() {
|
|
743
752
|
return this.outSearchFieldList?.length || this.outRelationQuickSearch?.length;
|
|
744
753
|
},
|
|
745
|
-
showViewList(){
|
|
746
|
-
if (this.editTableSource ===
|
|
747
|
-
return this.relatedBaseInfo.showType !=
|
|
754
|
+
showViewList() {
|
|
755
|
+
if (this.editTableSource === 'relatedComponent') {
|
|
756
|
+
return this.relatedBaseInfo.showType != 'TREE';
|
|
748
757
|
}
|
|
749
758
|
return !this.optionsValue('hideViewList');
|
|
750
759
|
},
|
|
751
760
|
optionsValue() {
|
|
752
761
|
return function(key) {
|
|
753
762
|
return this.$attrs.tableOptions?.[key];
|
|
754
|
-
}
|
|
763
|
+
};
|
|
755
764
|
},
|
|
756
765
|
searchPlaceHolder() {
|
|
757
|
-
if (!this.useFieldList?.length || this.showRelatedTreeBtn) return
|
|
758
|
-
let str =
|
|
766
|
+
if (!this.useFieldList?.length || this.showRelatedTreeBtn) return '请输入关键字搜索';
|
|
767
|
+
let str = '';
|
|
759
768
|
let strList = this.useFieldList
|
|
760
769
|
?.map(item => {
|
|
761
|
-
if (item.isSearch != 1) return
|
|
770
|
+
if (item.isSearch != 1) return '';
|
|
762
771
|
return item.formTitle || item.alias || item.title;
|
|
763
772
|
})
|
|
764
773
|
.filter(Boolean);
|
|
765
|
-
if(!strList?.length) return ''
|
|
766
|
-
str =
|
|
767
|
-
return str ||
|
|
774
|
+
if (!strList?.length) return '';
|
|
775
|
+
str = '输入' + strList.join('/');
|
|
776
|
+
return str || '请输入关键字搜索';
|
|
768
777
|
},
|
|
769
778
|
showRelatedSearch() {
|
|
770
|
-
return this.showRelatedTreeBtn && this.isShowSetting('hideSearch')
|
|
779
|
+
return this.showRelatedTreeBtn && this.isShowSetting('hideSearch');
|
|
771
780
|
},
|
|
772
781
|
showQuickSearch() {
|
|
773
|
-
let showQuick = this.isShowSetting('hideQuickSearch')
|
|
782
|
+
let showQuick = this.isShowSetting('hideQuickSearch');
|
|
774
783
|
// 平铺列表, 左侧不为tree, 而是table
|
|
775
|
-
if(this.editTableSource == 'relatedComponent' && this.relatedBaseInfo?.showType !=
|
|
776
|
-
return showQuick && this.isRelatedSearchFold
|
|
784
|
+
if (this.editTableSource == 'relatedComponent' && this.relatedBaseInfo?.showType != 'TREE') return showQuick;
|
|
785
|
+
return showQuick && this.isRelatedSearchFold;
|
|
777
786
|
},
|
|
778
787
|
showBaseTabs() {
|
|
779
|
-
return
|
|
788
|
+
return this.conditionType === 'keyword' && this.tabConditionList?.length && !this.visibleInlineOperateBtn && !this.isRowEditing;
|
|
780
789
|
}
|
|
781
790
|
},
|
|
782
791
|
data() {
|
|
@@ -1061,17 +1070,17 @@ export default create({
|
|
|
1061
1070
|
'div',
|
|
1062
1071
|
{
|
|
1063
1072
|
directives: [
|
|
1064
|
-
|
|
1065
|
-
|
|
1066
|
-
|
|
1067
|
-
|
|
1068
|
-
}
|
|
1073
|
+
{
|
|
1074
|
+
name: 'drag-move',
|
|
1075
|
+
value: {
|
|
1076
|
+
target: 'ant-modal-confirm-body'
|
|
1069
1077
|
}
|
|
1070
|
-
|
|
1071
|
-
|
|
1072
|
-
|
|
1078
|
+
}
|
|
1079
|
+
],
|
|
1080
|
+
domProps: {
|
|
1081
|
+
innerHTML: settingObj.tipsMsg || `是否确认${btn.name}`
|
|
1082
|
+
}
|
|
1073
1083
|
}
|
|
1074
|
-
},
|
|
1075
1084
|
// settingObj.tipsMsg || `是否确认${btn.name}`
|
|
1076
1085
|
),
|
|
1077
1086
|
okText: '确定',
|
|
@@ -1155,7 +1164,7 @@ export default create({
|
|
|
1155
1164
|
let paramsData = utils.setParamsValue(params, this.paramsData);
|
|
1156
1165
|
Object.assign(btn, {
|
|
1157
1166
|
_index_: j
|
|
1158
|
-
})
|
|
1167
|
+
});
|
|
1159
1168
|
let btnData = {
|
|
1160
1169
|
btnData: Object.assign(setData, {
|
|
1161
1170
|
paramsData: paramsData,
|
|
@@ -1217,8 +1226,8 @@ export default create({
|
|
|
1217
1226
|
return;
|
|
1218
1227
|
}
|
|
1219
1228
|
Object.assign(item, {
|
|
1220
|
-
_index_: j
|
|
1221
|
-
})
|
|
1229
|
+
_index_: j
|
|
1230
|
+
});
|
|
1222
1231
|
this.$emit('clickBtn', data, item, index);
|
|
1223
1232
|
},
|
|
1224
1233
|
clickGroupBtn(btn, j) {
|
|
@@ -1584,7 +1593,7 @@ export default create({
|
|
|
1584
1593
|
this.$emit('pubResetCheckStatus');
|
|
1585
1594
|
},
|
|
1586
1595
|
handleReset() {
|
|
1587
|
-
this.$emit('handleReset',{targetType:
|
|
1596
|
+
this.$emit('handleReset', { targetType: 'outQuickSearchReset' });
|
|
1588
1597
|
},
|
|
1589
1598
|
handleUploadChange(info) {
|
|
1590
1599
|
const { file, fileList } = info;
|
|
@@ -1672,7 +1681,7 @@ export default create({
|
|
|
1672
1681
|
initOutSearchFieldList(config = {}) {
|
|
1673
1682
|
this.outSearchFieldList = [];
|
|
1674
1683
|
this.outRelationQuickSearch = [];
|
|
1675
|
-
let mySearchFieldList = JSON.parse(JSON.stringify(this.searchFieldList)).filter(i => (i.random_key = this.getFiledRandom_key(i), i.isShowSearch == 1 && i.filterExplicit == 1));
|
|
1684
|
+
let mySearchFieldList = JSON.parse(JSON.stringify(this.searchFieldList)).filter(i => ((i.random_key = this.getFiledRandom_key(i)), i.isShowSearch == 1 && i.filterExplicit == 1));
|
|
1676
1685
|
this.outSearchFieldList = mySearchFieldList;
|
|
1677
1686
|
// 跨表
|
|
1678
1687
|
let outRelationQuickSearch = this.relationTableList.map(item => {
|
|
@@ -1704,10 +1713,10 @@ export default create({
|
|
|
1704
1713
|
}
|
|
1705
1714
|
|
|
1706
1715
|
// 如有配置默认值
|
|
1707
|
-
if(this.outSearchFieldList.some(v => !!v.explicitDefaultVal)){
|
|
1716
|
+
if (this.outSearchFieldList.some(v => !!v.explicitDefaultVal)) {
|
|
1708
1717
|
this.$emit('outSearchInit');
|
|
1709
|
-
if('reset' != config?.type){
|
|
1710
|
-
this.outFilterChange({type:'outSearchInit'});
|
|
1718
|
+
if ('reset' != config?.type) {
|
|
1719
|
+
this.outFilterChange({ type: 'outSearchInit' });
|
|
1711
1720
|
}
|
|
1712
1721
|
}
|
|
1713
1722
|
},
|
|
@@ -1745,7 +1754,7 @@ export default create({
|
|
|
1745
1754
|
this.rowFoldHideBtnList = hideBtn;
|
|
1746
1755
|
}
|
|
1747
1756
|
},
|
|
1748
|
-
outFilterChange(config= {}) {
|
|
1757
|
+
outFilterChange(config = {}) {
|
|
1749
1758
|
let conObj = this.getConObjParams() || [];
|
|
1750
1759
|
this.onSave(conObj, true, config);
|
|
1751
1760
|
},
|
|
@@ -1856,7 +1865,7 @@ export default create({
|
|
|
1856
1865
|
};
|
|
1857
1866
|
});
|
|
1858
1867
|
let len = list?.length || 0;
|
|
1859
|
-
if(len > 0){
|
|
1868
|
+
if (len > 0) {
|
|
1860
1869
|
this.setPrintNumberCache({
|
|
1861
1870
|
ids,
|
|
1862
1871
|
list
|
|
@@ -1957,35 +1966,32 @@ export default create({
|
|
|
1957
1966
|
onOk: () => {
|
|
1958
1967
|
_this.setBatchSaveRowStatus(true);
|
|
1959
1968
|
},
|
|
1960
|
-
onCancel() {
|
|
1961
|
-
}
|
|
1969
|
+
onCancel() {}
|
|
1962
1970
|
});
|
|
1963
1971
|
},
|
|
1964
1972
|
|
|
1965
1973
|
/**
|
|
1966
1974
|
* 获取外显检索的默认值设置
|
|
1967
1975
|
*/
|
|
1968
|
-
handleGetOutSearchInitValue(){
|
|
1969
|
-
|
|
1970
|
-
if(this.outSearchFieldList.some(v => !!v.explicitDefaultVal)){
|
|
1976
|
+
handleGetOutSearchInitValue() {
|
|
1977
|
+
if (this.outSearchFieldList.some(v => !!v.explicitDefaultVal)) {
|
|
1971
1978
|
let conObj = this.getConObjParams() || [];
|
|
1972
|
-
return conObj
|
|
1973
|
-
|
|
1979
|
+
return conObj;
|
|
1980
|
+
}
|
|
1974
1981
|
|
|
1975
|
-
return []
|
|
1982
|
+
return [];
|
|
1976
1983
|
},
|
|
1977
1984
|
|
|
1978
|
-
getFiledRandom_key(el){
|
|
1985
|
+
getFiledRandom_key(el) {
|
|
1979
1986
|
// 初始化
|
|
1980
|
-
|
|
1981
|
-
|
|
1982
|
-
|
|
1983
|
-
|
|
1984
|
-
|
|
1985
|
-
|
|
1987
|
+
const showSetting = el?.settingObj?.showSetting || [];
|
|
1988
|
+
let f = !this.$utils.isEmpty(el?.settingObj?.wordbook);
|
|
1989
|
+
if (!showSetting?.length && f) {
|
|
1990
|
+
return Math.random().toString();
|
|
1991
|
+
}
|
|
1992
|
+
return '11';
|
|
1986
1993
|
},
|
|
1987
1994
|
|
|
1988
|
-
|
|
1989
1995
|
inlineEditCancel() {
|
|
1990
1996
|
this.setBatchCancelRowStatus(true);
|
|
1991
1997
|
},
|
|
@@ -2039,10 +2045,10 @@ export default create({
|
|
|
2039
2045
|
this.currentTempId = curItem || '0';
|
|
2040
2046
|
|
|
2041
2047
|
// 按钮打卡视图列表
|
|
2042
|
-
let tableViewId= this.optionsValue('tableViewId')
|
|
2043
|
-
let onlyOpenView = this.optionsValue('hideViewList') && tableViewId
|
|
2044
|
-
if(onlyOpenView) {
|
|
2045
|
-
this.currentTempId = tableViewId
|
|
2048
|
+
let tableViewId = this.optionsValue('tableViewId');
|
|
2049
|
+
let onlyOpenView = this.optionsValue('hideViewList') && tableViewId;
|
|
2050
|
+
if (onlyOpenView) {
|
|
2051
|
+
this.currentTempId = tableViewId;
|
|
2046
2052
|
}
|
|
2047
2053
|
// this.handlerSelectTemp(this.currentTempId);
|
|
2048
2054
|
this.$emit('handlerChangeView', this.currentTempId);
|
|
@@ -2117,12 +2123,12 @@ export default create({
|
|
|
2117
2123
|
this.$nextTick(() => {
|
|
2118
2124
|
this.showPlaceholderPrefix = false;
|
|
2119
2125
|
let dom = this.$refs.baseSearchPlaceholderSpan;
|
|
2120
|
-
if(!dom) return;
|
|
2126
|
+
if (!dom) return;
|
|
2121
2127
|
// input 框有padding 32px ...显示需要多预留一些宽度12px
|
|
2122
2128
|
let w = dom.offsetWidth + 45;
|
|
2123
2129
|
// 非筛选外显input 有enterButton 预留宽度
|
|
2124
|
-
if(!this.showOutSearch) {
|
|
2125
|
-
w += 45
|
|
2130
|
+
if (!this.showOutSearch) {
|
|
2131
|
+
w += 45;
|
|
2126
2132
|
}
|
|
2127
2133
|
let maxW = 300;
|
|
2128
2134
|
this.inputSearchW = w > maxW ? maxW : w < 200 ? 200 : w;
|