n20-common-lib 2.4.5 → 2.4.7
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/README.md +1 -1
- package/nstc-g6/components/Calendar/index.js +5 -5
- package/nstc-g6/components/Calendar/src/basic/month-table.vue +12 -20
- package/nstc-g6/components/Calendar/src/basic/year-table.vue +18 -22
- package/nstc-g6/components/Calendar/src/main.vue +1 -5
- package/nstc-g6/components/DialogForm/index.js +5 -5
- package/nstc-g6/components/DialogForm/src/demo/index.vue +18 -27
- package/nstc-g6/components/DialogForm/src/main.vue +15 -21
- package/nstc-g6/components/Form/A_DEMO/component/originalForm.vue +35 -50
- package/nstc-g6/components/Form/A_DEMO/config/config_3.js +1115 -1110
- package/nstc-g6/components/Form/A_DEMO/index.vue +7 -29
- package/nstc-g6/components/Form/AutocompleteCustom/index.vue +3 -5
- package/nstc-g6/components/Form/BusinessSpecific/InputMultiple.vue +60 -62
- package/nstc-g6/components/Form/BusinessSpecific/InputWithUnit.vue +12 -35
- package/nstc-g6/components/Form/BusinessSpecific/SelectTreeDialog.vue +77 -77
- package/nstc-g6/components/Form/CascaderCustom/index.vue +4 -4
- package/nstc-g6/components/Form/CheckboxCustom/index.vue +5 -11
- package/nstc-g6/components/Form/Component.vue +56 -78
- package/nstc-g6/components/Form/ComponentSecond.vue +55 -77
- package/nstc-g6/components/Form/InputAndDialog/index.js +5 -5
- package/nstc-g6/components/Form/InputAndDialog/src/main.vue +130 -153
- package/nstc-g6/components/Form/InputCustom/demo/index.vue +4 -12
- package/nstc-g6/components/Form/InputCustom/index.vue +51 -54
- package/nstc-g6/components/Form/IntervalinputCustom/demo/index.vue +1 -3
- package/nstc-g6/components/Form/IntervalinputCustom/index.vue +19 -41
- package/nstc-g6/components/Form/Item.vue +15 -30
- package/nstc-g6/components/Form/ItemSecond.vue +7 -22
- package/nstc-g6/components/Form/List.vue +12 -28
- package/nstc-g6/components/Form/ListSecond.vue +11 -27
- package/nstc-g6/components/Form/RadioCustom/index.vue +5 -23
- package/nstc-g6/components/Form/SelectAccount/index.js +5 -5
- package/nstc-g6/components/Form/SelectAccount/src/demo/index.vue +34 -28
- package/nstc-g6/components/Form/SelectAccount/src/main.vue +112 -83
- package/nstc-g6/components/Form/SelectAndDialog/index.js +5 -5
- package/nstc-g6/components/Form/SelectAndDialog/src/main.vue +126 -149
- package/nstc-g6/components/Form/SelectCashFlow/index.js +5 -5
- package/nstc-g6/components/Form/SelectCashFlow/src/demo/index.vue +18 -19
- package/nstc-g6/components/Form/SelectCashFlow/src/main.vue +52 -41
- package/nstc-g6/components/Form/SelectCustom/demo/index.vue +14 -16
- package/nstc-g6/components/Form/SelectCustom/index.vue +129 -139
- package/nstc-g6/components/Form/SelectSubject/index.js +5 -5
- package/nstc-g6/components/Form/SelectSubject/src/demo/index.vue +42 -48
- package/nstc-g6/components/Form/SelectSubject/src/main.vue +83 -86
- package/nstc-g6/components/Form/SelectindialogCustom/demo/index.vue +34 -35
- package/nstc-g6/components/Form/SelectindialogCustom/index.vue +133 -148
- package/nstc-g6/components/Form/SelectindialogCustom/install.js +3 -3
- package/nstc-g6/components/Form/TableRadioCustom/demo/index.vue +1 -7
- package/nstc-g6/components/Form/TableRadioCustom/index.vue +17 -26
- package/nstc-g6/components/Form/TextCustom/index.vue +2 -2
- package/nstc-g6/components/Form/UploadCustom/demo/index.vue +1 -3
- package/nstc-g6/components/Form/UploadCustom/index.vue +143 -173
- package/nstc-g6/components/Form/configs.js +3 -14
- package/nstc-g6/components/Form/configsSecond.js +3 -16
- package/nstc-g6/components/Form/index.js +1 -1
- package/nstc-g6/components/Form/payeePersonSelect/index.js +5 -5
- package/nstc-g6/components/Form/payeePersonSelect/src/demo/index.vue +50 -44
- package/nstc-g6/components/Form/payeePersonSelect/src/main.vue +73 -82
- package/nstc-g6/components/FormGroup/index.js +5 -5
- package/nstc-g6/components/FormGroup/src/demo/config.js +18 -19
- package/nstc-g6/components/FormGroup/src/demo/index.vue +14 -22
- package/nstc-g6/components/FormGroup/src/main.vue +122 -141
- package/nstc-g6/components/FormGroup/src/validate.js +11 -13
- package/nstc-g6/components/InputTag/InputTag.vue +78 -111
- package/nstc-g6/components/NstcBackToTop/NstcBackToTop.vue +24 -24
- package/nstc-g6/components/NstcBranchLazyLoad/NstcBranchLazyLoad.vue +4 -13
- package/nstc-g6/components/NstcCharts/NstcCharts.vue +9 -18
- package/nstc-g6/components/NstcCharts/define.js +1 -6
- package/nstc-g6/components/NstcConfirm/NstcConfirm.vue +6 -21
- package/nstc-g6/components/NstcConfirm/index.js +21 -19
- package/nstc-g6/components/NstcDialog/NstcDialog.vue +34 -38
- package/nstc-g6/components/NstcDialogForm/NstcDialogForm.vue +17 -21
- package/nstc-g6/components/NstcDialogTable/NstcDialogTable.vue +4 -17
- package/nstc-g6/components/NstcDropdown/NstcDropdown.vue +2 -12
- package/nstc-g6/components/NstcDropdownTree/NstcDropdownTree.vue +3 -13
- package/nstc-g6/components/NstcElectronicFile/NstcElectronicFile.vue +18 -78
- package/nstc-g6/components/NstcExcelCustomImport/NstcExcelCustomImport.vue +121 -147
- package/nstc-g6/components/NstcExcelImport/NstcExcelImport.vue +9 -31
- package/nstc-g6/components/NstcExcelImportN/NstcExcelImportN.vue +10 -33
- package/nstc-g6/components/NstcExpandCollapse/NstcExpandCollapse.vue +12 -16
- package/nstc-g6/components/NstcFileUpload/NstcFileUpload.vue +19 -75
- package/nstc-g6/components/NstcForm/A_DEMO/component/originalForm.vue +35 -50
- package/nstc-g6/components/NstcForm/A_DEMO/config/config_3.js +1115 -1110
- package/nstc-g6/components/NstcForm/A_DEMO/index.vue +340 -354
- package/nstc-g6/components/NstcForm/AutocompleteCustom/index.vue +2 -2
- package/nstc-g6/components/NstcForm/BusinessSpecific/InputWithUnit.vue +11 -34
- package/nstc-g6/components/NstcForm/BusinessSpecific/SelectTreeDialog.vue +77 -77
- package/nstc-g6/components/NstcForm/CheckboxCustom/index.vue +5 -11
- package/nstc-g6/components/NstcForm/Component.vue +17 -62
- package/nstc-g6/components/NstcForm/ComponentSecond.vue +55 -77
- package/nstc-g6/components/NstcForm/InputAndDialog/NstcInputAndDialog.vue +6 -24
- package/nstc-g6/components/NstcForm/InputCustom/index.vue +2 -8
- package/nstc-g6/components/NstcForm/IntervalInputCustom/index.vue +4 -21
- package/nstc-g6/components/NstcForm/Item.vue +3 -15
- package/nstc-g6/components/NstcForm/ItemSecond.vue +7 -22
- package/nstc-g6/components/NstcForm/List.vue +12 -28
- package/nstc-g6/components/NstcForm/ListSecond.vue +11 -27
- package/nstc-g6/components/NstcForm/RadioCustom/index.vue +5 -23
- package/nstc-g6/components/NstcForm/SelectAccount/NstcSelectAccount.vue +4 -24
- package/nstc-g6/components/NstcForm/SelectAndDialog/NstcSelectAndDialog.vue +7 -30
- package/nstc-g6/components/NstcForm/SelectCashFlow/NstcSelectCashFlow.vue +50 -38
- package/nstc-g6/components/NstcForm/SelectCustom/index.vue +6 -16
- package/nstc-g6/components/NstcForm/SelectSubject/NstcSelectSubject.vue +72 -82
- package/nstc-g6/components/NstcForm/SelectindialogCustom/index.vue +6 -20
- package/nstc-g6/components/NstcForm/TableRadioCustom/index.vue +17 -26
- package/nstc-g6/components/NstcForm/TextCustom/index.vue +2 -2
- package/nstc-g6/components/NstcForm/UploadCustom/index.vue +13 -60
- package/nstc-g6/components/NstcForm/configs.js +3 -14
- package/nstc-g6/components/NstcForm/configsSecond.js +3 -16
- package/nstc-g6/components/NstcForm/index.js +1 -1
- package/nstc-g6/components/NstcForm/payeePersonSelect/NstcPayeePerson.vue +57 -73
- package/nstc-g6/components/NstcPagination/NstcPagination.vue +2 -12
- package/nstc-g6/components/NstcScreenFull/NstcScreenFull.vue +2 -3
- package/nstc-g6/components/NstcSelectTree/NstcSelectTree.vue +4 -15
- package/nstc-g6/components/NstcSelectTreeList/NstcSelectTreeList.vue +5 -20
- package/nstc-g6/components/NstcSticky/NstcSticky.vue +10 -4
- package/nstc-g6/components/NstcSvgIcon/NstcSvgIcon.vue +1 -7
- package/nstc-g6/components/NstcTab/NstcTab.vue +8 -20
- package/nstc-g6/components/NstcTabWithBadge/NstcTabWithBadge.vue +7 -7
- package/nstc-g6/components/NstcTable/ElTableColumnCustom/index.vue +88 -126
- package/nstc-g6/components/NstcTable/NstcTable.vue +4 -17
- package/nstc-g6/components/NstcTableSet/NstcTableSet.vue +27 -72
- package/nstc-g6/components/NstcThemePicker/NstcThemePicker.vue +13 -14
- package/nstc-g6/components/NstcUploadCustomExcel/NstcUploadCustomExcel.vue +3 -13
- package/nstc-g6/components/NstcUploadExcel/NstcUploadExcel.vue +21 -22
- package/nstc-g6/components/NstcWorkBench/NstcWorkBench.vue +4 -17
- package/nstc-g6/components/Search/NstcSearch.vue +12 -47
- package/nstc-g6/components/Search/src/demo/index copy.vue +28 -28
- package/nstc-g6/components/Search/src/demo/index.vue +36 -36
- package/nstc-g6/components/Search/src/main copy.vue +169 -204
- package/nstc-g6/components/approvelTwo/main.vue +2 -6
- package/nstc-g6/components/approvelTwo/progress.vue +7 -29
- package/nstc-g6/directives/VCopy/index.js +52 -54
- package/nstc-g6/directives/VNstcNumber/index.js +1 -1
- package/nstc-g6/directives/VNstcNumber/temp.js +357 -362
- package/nstc-g6/utils/mapper_aims.js +774 -775
- package/nstc-g6/utils/parseTime.js +38 -36
- package/nstc-g6/utils/validate/index.js +2 -2
- package/nstc-g6/utils/vendor/Export2Excel.js +110 -111
- package/nstc-g6/utils/vendor/Export2Zip.js +12 -7
- package/nstc-g6/utils/vue-bus.js +1 -1
- package/package.json +1 -1
- package/src/assets/iconFont/demo_index.html +1 -1
- package/src/assets/iconFont/iconfont.js +66 -1
- package/src/assets/iconFont2/demo_index.html +277 -286
- package/src/assets/iconFont2/iconfont.js +66 -1
- package/src/components/Button/button-group.vue +1 -1
- package/src/components/Layout/HeaderWrap/indexN.vue +1 -1
- package/src/components/Layout/indexN.vue +1 -2
- package/src/components/LoginTemporary/indexN.vue +12 -2
- package/src/components/TableOperateColumn/index.vue +1 -1
- package/src/plugins/Print/print-js/README.md +5 -5
- package/src/plugins/Print/print-js/package.json +2 -2
- package/src/plugins/Print/print-js/src/index.d.ts +36 -36
- package/src/plugins/Print/print-js/src/js/browser.js +3 -1
- package/src/plugins/Print/print-js/src/js/functions.js +16 -10
- package/src/plugins/Print/print-js/src/js/html.js +2 -2
- package/src/plugins/Print/print-js/src/js/image.js +1 -1
- package/src/plugins/Print/print-js/src/js/init.js +15 -7
- package/src/plugins/Print/print-js/src/js/json.js +14 -4
- package/src/plugins/Print/print-js/src/js/modal.js +16 -15
- package/src/plugins/Print/print-js/src/js/pdf.js +1 -1
- package/src/plugins/Print/print-js/src/js/print.js +6 -6
- package/src/plugins/Sign/NetSM3/InfosecNetSignCNGAgent.min.js +1825 -1592
- package/src/plugins/Sign/cfca/index.js +525 -520
- package/src/plugins/Sign/sign.js +128 -128
- package/style/index.css +1 -1
- package/style/index.css.map +1 -1
- package/theme/blue.css +1 -1
- package/theme/cctcRed.css +1 -1
- package/theme/green.css +1 -1
- package/theme/lightBlue.css +1 -1
- package/theme/orange.css +1 -1
- package/theme/purple.css +1 -1
- package/theme/red.css +1 -1
- package/theme/yellow.css +1 -1
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
<el-autocomplete
|
|
3
3
|
v-model="_value"
|
|
4
4
|
v-bind="$attrs"
|
|
5
|
-
:style="{width:parseFloat(width) + 'px'}"
|
|
5
|
+
:style="{ width: parseFloat(width) + 'px' }"
|
|
6
6
|
:placeholder="placeholder"
|
|
7
7
|
v-on="$listeners"
|
|
8
8
|
@select="handleSelect"
|
|
@@ -37,7 +37,7 @@ export default {
|
|
|
37
37
|
|
|
38
38
|
placeholder: {
|
|
39
39
|
type: String,
|
|
40
|
-
default: function (){
|
|
40
|
+
default: function () {
|
|
41
41
|
return '请输入'
|
|
42
42
|
}
|
|
43
43
|
},
|
|
@@ -1,38 +1,15 @@
|
|
|
1
1
|
<template>
|
|
2
2
|
<div>
|
|
3
3
|
<div v-if="isSingle" class="nstc-g6-common-input-with-unit">
|
|
4
|
-
<InputCustom
|
|
5
|
-
|
|
6
|
-
:width="_widthConfig[0]"
|
|
7
|
-
:maxlength="3"
|
|
8
|
-
/>
|
|
9
|
-
<SelectCustom
|
|
10
|
-
v-model="_value[1]"
|
|
11
|
-
filterable
|
|
12
|
-
:options="options"
|
|
13
|
-
:width="_widthConfig[1]"
|
|
14
|
-
/>
|
|
4
|
+
<InputCustom v-model="_value[0]" :width="_widthConfig[0]" :maxlength="3" />
|
|
5
|
+
<SelectCustom v-model="_value[1]" filterable :options="options" :width="_widthConfig[1]" />
|
|
15
6
|
</div>
|
|
16
7
|
<div v-else class="nstc-g6-common-input-with-unit">
|
|
17
|
-
<InputCustom
|
|
18
|
-
v-model="_value[0]"
|
|
19
|
-
:width="_widthConfig[0]"
|
|
20
|
-
:maxlength="3"
|
|
21
|
-
/>
|
|
8
|
+
<InputCustom v-model="_value[0]" :width="_widthConfig[0]" :maxlength="3" />
|
|
22
9
|
<span style="margin: 0 10px">到</span>
|
|
23
|
-
<InputCustom
|
|
24
|
-
|
|
25
|
-
:width="_widthConfig[1]"
|
|
26
|
-
:maxlength="3"
|
|
27
|
-
/>
|
|
28
|
-
<SelectCustom
|
|
29
|
-
v-model="_value[2]"
|
|
30
|
-
filterable
|
|
31
|
-
:options="options"
|
|
32
|
-
:width="_widthConfig[2]"
|
|
33
|
-
/>
|
|
10
|
+
<InputCustom v-model="_value[1]" :width="_widthConfig[1]" :maxlength="3" />
|
|
11
|
+
<SelectCustom v-model="_value[2]" filterable :options="options" :width="_widthConfig[2]" />
|
|
34
12
|
</div>
|
|
35
|
-
|
|
36
13
|
</div>
|
|
37
14
|
</template>
|
|
38
15
|
|
|
@@ -40,11 +17,11 @@
|
|
|
40
17
|
import InputCustom from '../InputCustom'
|
|
41
18
|
import SelectCustom from '../SelectCustom'
|
|
42
19
|
export default {
|
|
43
|
-
name:
|
|
20
|
+
name: 'NstcInputWithUnit',
|
|
44
21
|
props: {
|
|
45
22
|
isSingle: {
|
|
46
23
|
type: Boolean,
|
|
47
|
-
default: false
|
|
24
|
+
default: false
|
|
48
25
|
},
|
|
49
26
|
value: {
|
|
50
27
|
type: Array,
|
|
@@ -56,9 +33,9 @@ export default {
|
|
|
56
33
|
type: Array,
|
|
57
34
|
default: () => {
|
|
58
35
|
return [
|
|
59
|
-
{label: '年', value: 3},
|
|
60
|
-
{label: '月', value: 2},
|
|
61
|
-
{label: '日', value: 1}
|
|
36
|
+
{ label: '年', value: 3 },
|
|
37
|
+
{ label: '月', value: 2 },
|
|
38
|
+
{ label: '日', value: 1 }
|
|
62
39
|
]
|
|
63
40
|
}
|
|
64
41
|
},
|
|
@@ -80,7 +57,7 @@ export default {
|
|
|
80
57
|
SelectCustom
|
|
81
58
|
},
|
|
82
59
|
watch: {
|
|
83
|
-
isSingle:{
|
|
60
|
+
isSingle: {
|
|
84
61
|
immediate: true,
|
|
85
62
|
handler(val) {
|
|
86
63
|
if (!val) {
|
|
@@ -1,39 +1,36 @@
|
|
|
1
1
|
<template>
|
|
2
2
|
<SelectInDialogCustom
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
3
|
+
ref="SelectInDialogCustom"
|
|
4
|
+
v-model="model[0]"
|
|
5
|
+
:title="title"
|
|
6
|
+
:url="url"
|
|
7
|
+
clearable
|
|
8
|
+
remote
|
|
9
|
+
:value-key="valueKey"
|
|
10
|
+
:label-key="labelKey"
|
|
11
|
+
width="294"
|
|
12
|
+
:original-form="false"
|
|
13
|
+
:original-table="false"
|
|
14
|
+
:dialogVisibleTree="dialogVisibleTree"
|
|
15
15
|
>
|
|
16
16
|
<template v-slot:table>
|
|
17
|
-
<div style="display:flex
|
|
18
|
-
<el-input
|
|
19
|
-
class="select-dialog-custom-tree-inp"
|
|
20
|
-
placeholder="输入关键字进行过滤"
|
|
21
|
-
v-model="filterText">
|
|
17
|
+
<div style="display: flex">
|
|
18
|
+
<el-input class="select-dialog-custom-tree-inp" placeholder="输入关键字进行过滤" v-model="filterText">
|
|
22
19
|
</el-input>
|
|
23
20
|
<el-button
|
|
24
21
|
type="primary"
|
|
25
|
-
style="margin-left: 20px
|
|
22
|
+
style="margin-left: 20px"
|
|
26
23
|
class="nstc-g6-common-btn-1 nstc-g6-common-btn-size-b"
|
|
27
24
|
@click.stop="handleQuery"
|
|
28
25
|
>
|
|
29
26
|
查询
|
|
30
27
|
</el-button>
|
|
31
28
|
</div>
|
|
32
|
-
|
|
33
|
-
<div style="height:300px;overflow:scroll
|
|
29
|
+
|
|
30
|
+
<div style="height: 300px; overflow: scroll">
|
|
34
31
|
<el-tree
|
|
35
32
|
class="filter-tree"
|
|
36
|
-
style="margin:20px
|
|
33
|
+
style="margin: 20px"
|
|
37
34
|
:data="data"
|
|
38
35
|
:props="defaultProps"
|
|
39
36
|
:node-key="nodeKey"
|
|
@@ -47,24 +44,14 @@
|
|
|
47
44
|
>
|
|
48
45
|
</el-tree>
|
|
49
46
|
</div>
|
|
50
|
-
<div style=
|
|
51
|
-
<el-button
|
|
52
|
-
type="primary"
|
|
53
|
-
class="nstc-g6-common-btn-1 nstc-g6-common-btn-size-b"
|
|
54
|
-
@click.stop="handleclick"
|
|
55
|
-
>
|
|
47
|
+
<div style="text-align: center">
|
|
48
|
+
<el-button type="primary" class="nstc-g6-common-btn-1 nstc-g6-common-btn-size-b" @click.stop="handleclick">
|
|
56
49
|
确认
|
|
57
50
|
</el-button>
|
|
58
|
-
<el-button
|
|
59
|
-
|
|
60
|
-
@click.stop="handleClear"
|
|
61
|
-
>
|
|
62
|
-
取消
|
|
63
|
-
</el-button>
|
|
64
|
-
</div>
|
|
51
|
+
<el-button class="nstc-g6-common-btn-1 nstc-g6-common-btn-size-b" @click.stop="handleClear"> 取消 </el-button>
|
|
52
|
+
</div>
|
|
65
53
|
</template>
|
|
66
54
|
</SelectInDialogCustom>
|
|
67
|
-
|
|
68
55
|
</template>
|
|
69
56
|
|
|
70
57
|
<script>
|
|
@@ -73,9 +60,9 @@ export default {
|
|
|
73
60
|
name: 'SelectTreeDialog',
|
|
74
61
|
|
|
75
62
|
components: {
|
|
76
|
-
SelectInDialogCustom
|
|
63
|
+
SelectInDialogCustom
|
|
77
64
|
},
|
|
78
|
-
|
|
65
|
+
|
|
79
66
|
computed: {
|
|
80
67
|
_value: {
|
|
81
68
|
get() {
|
|
@@ -98,41 +85,56 @@ export default {
|
|
|
98
85
|
},
|
|
99
86
|
data: {
|
|
100
87
|
type: Array,
|
|
101
|
-
default: () => [
|
|
88
|
+
default: () => [
|
|
89
|
+
{
|
|
102
90
|
id: 1,
|
|
103
91
|
label: '一级 1',
|
|
104
|
-
children: [
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
92
|
+
children: [
|
|
93
|
+
{
|
|
94
|
+
id: 4,
|
|
95
|
+
label: '二级 1-1',
|
|
96
|
+
children: [
|
|
97
|
+
{
|
|
98
|
+
id: 9,
|
|
99
|
+
label: '三级 1-1-1'
|
|
100
|
+
},
|
|
101
|
+
{
|
|
102
|
+
id: 10,
|
|
103
|
+
label: '三级 1-1-2'
|
|
104
|
+
}
|
|
105
|
+
]
|
|
106
|
+
}
|
|
107
|
+
]
|
|
108
|
+
},
|
|
109
|
+
{
|
|
116
110
|
id: 2,
|
|
117
111
|
label: '一级 2',
|
|
118
|
-
children: [
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
112
|
+
children: [
|
|
113
|
+
{
|
|
114
|
+
id: 5,
|
|
115
|
+
label: '二级 2-1'
|
|
116
|
+
},
|
|
117
|
+
{
|
|
118
|
+
id: 6,
|
|
119
|
+
label: '二级 2-2'
|
|
120
|
+
}
|
|
121
|
+
]
|
|
122
|
+
},
|
|
123
|
+
{
|
|
126
124
|
id: 3,
|
|
127
125
|
label: '一级 3',
|
|
128
|
-
children: [
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
126
|
+
children: [
|
|
127
|
+
{
|
|
128
|
+
id: 7,
|
|
129
|
+
label: '二级 3-1'
|
|
130
|
+
},
|
|
131
|
+
{
|
|
132
|
+
id: 8,
|
|
133
|
+
label: '二级 3-2'
|
|
134
|
+
}
|
|
135
|
+
]
|
|
136
|
+
}
|
|
137
|
+
]
|
|
136
138
|
},
|
|
137
139
|
defaultProps: {
|
|
138
140
|
type: Object,
|
|
@@ -143,7 +145,7 @@ export default {
|
|
|
143
145
|
}
|
|
144
146
|
}
|
|
145
147
|
},
|
|
146
|
-
valueKey
|
|
148
|
+
valueKey: {
|
|
147
149
|
type: String,
|
|
148
150
|
default: 'prop1'
|
|
149
151
|
},
|
|
@@ -162,25 +164,24 @@ export default {
|
|
|
162
164
|
nodeKey: {
|
|
163
165
|
type: String,
|
|
164
166
|
default: 'id'
|
|
165
|
-
}
|
|
166
|
-
|
|
167
|
+
}
|
|
167
168
|
},
|
|
168
169
|
|
|
169
170
|
data() {
|
|
170
171
|
return {
|
|
171
172
|
filterText: '',
|
|
172
173
|
model: [{ prop1: '1', prop2: '' }],
|
|
173
|
-
dialogVisibleTree: false
|
|
174
|
+
dialogVisibleTree: false
|
|
174
175
|
}
|
|
175
176
|
},
|
|
176
177
|
|
|
177
178
|
methods: {
|
|
178
179
|
filterNode(value, data) {
|
|
179
|
-
if (!value) return true
|
|
180
|
-
return data.label.indexOf(value) !== -1
|
|
180
|
+
if (!value) return true
|
|
181
|
+
return data.label.indexOf(value) !== -1
|
|
181
182
|
},
|
|
182
183
|
handleQuery() {
|
|
183
|
-
this.$refs.tree.filter(this.filterText)
|
|
184
|
+
this.$refs.tree.filter(this.filterText)
|
|
184
185
|
},
|
|
185
186
|
/**
|
|
186
187
|
* 树节点点击事件
|
|
@@ -195,14 +196,14 @@ export default {
|
|
|
195
196
|
this.placeholder = this.filterText
|
|
196
197
|
|
|
197
198
|
this._value = data[this.nodeKey]
|
|
198
|
-
console.log(this._value,this.nodeKey)
|
|
199
|
+
console.log(this._value, this.nodeKey)
|
|
199
200
|
|
|
200
201
|
// 主动让input框失去交单
|
|
201
202
|
// this.$refs[this.inputRefName].blur()
|
|
202
203
|
this.showPopoverFlag = false
|
|
203
204
|
},
|
|
204
205
|
handleclick() {
|
|
205
|
-
this.$emit('handleclick', this.filterText)
|
|
206
|
+
this.$emit('handleclick', this.filterText)
|
|
206
207
|
this.model[0].prop2 = this.filterText
|
|
207
208
|
this.model[0].prop1 = this.nodeKey
|
|
208
209
|
this.$refs.SelectInDialogCustom.dialogVisible = false
|
|
@@ -219,10 +220,9 @@ export default {
|
|
|
219
220
|
margin-right: 20px;
|
|
220
221
|
}
|
|
221
222
|
.el-tree-node:focus {
|
|
222
|
-
background-color: #
|
|
223
|
+
background-color: #007aff;
|
|
223
224
|
}
|
|
224
225
|
}
|
|
225
|
-
|
|
226
226
|
</style>
|
|
227
227
|
|
|
228
228
|
<style scoped>
|
|
@@ -3,17 +3,12 @@
|
|
|
3
3
|
v-model="_value"
|
|
4
4
|
v-bind="$attrs"
|
|
5
5
|
class="checkbox-group"
|
|
6
|
-
:style="{width:parseFloat(width) + 'px'}"
|
|
6
|
+
:style="{ width: parseFloat(width) + 'px' }"
|
|
7
7
|
v-on="$listeners"
|
|
8
8
|
>
|
|
9
9
|
<template v-for="item in options">
|
|
10
|
-
<el-checkbox-button
|
|
11
|
-
|
|
12
|
-
:key="item.value"
|
|
13
|
-
:label="item.value"
|
|
14
|
-
:disabled="item.disabled"
|
|
15
|
-
>
|
|
16
|
-
{{ item.label}}
|
|
10
|
+
<el-checkbox-button v-if="type === 'button'" :key="item.value" :label="item.value" :disabled="item.disabled">
|
|
11
|
+
{{ item.label }}
|
|
17
12
|
</el-checkbox-button>
|
|
18
13
|
<el-checkbox
|
|
19
14
|
v-else
|
|
@@ -42,7 +37,7 @@ export default {
|
|
|
42
37
|
|
|
43
38
|
type: {
|
|
44
39
|
default: 'normal',
|
|
45
|
-
validator: function(val) {
|
|
40
|
+
validator: function (val) {
|
|
46
41
|
return ['normal', 'border', 'button'].includes(val)
|
|
47
42
|
}
|
|
48
43
|
},
|
|
@@ -61,7 +56,6 @@ export default {
|
|
|
61
56
|
type: Boolean,
|
|
62
57
|
default: false
|
|
63
58
|
}
|
|
64
|
-
|
|
65
59
|
},
|
|
66
60
|
|
|
67
61
|
computed: {
|
|
@@ -78,7 +72,7 @@ export default {
|
|
|
78
72
|
</script>
|
|
79
73
|
|
|
80
74
|
<style scoped>
|
|
81
|
-
.checkbox-group /deep/ .el-checkbox{
|
|
75
|
+
.checkbox-group /deep/ .el-checkbox {
|
|
82
76
|
margin-right: 40px;
|
|
83
77
|
}
|
|
84
78
|
</style>
|
|
@@ -28,21 +28,11 @@
|
|
|
28
28
|
@add-click="$emit('add-click')"
|
|
29
29
|
@other-click="$emit('other-click')"
|
|
30
30
|
@enter-click="handleExpectQuery"
|
|
31
|
-
@tree-node-click="
|
|
32
|
-
(prop, data, node) => $emit('tree-node-click', prop, data, node)
|
|
33
|
-
"
|
|
31
|
+
@tree-node-click="(prop, data, node) => $emit('tree-node-click', prop, data, node)"
|
|
34
32
|
/>
|
|
35
33
|
|
|
36
|
-
<div
|
|
37
|
-
v-
|
|
38
|
-
:class="[`form-item`, `form-item-button`]"
|
|
39
|
-
>
|
|
40
|
-
<el-button
|
|
41
|
-
v-bind="queryBtn"
|
|
42
|
-
:loading="queryLoading"
|
|
43
|
-
:disabled="disableds.querybutton"
|
|
44
|
-
@click="handleExpectQuery"
|
|
45
|
-
>
|
|
34
|
+
<div v-if="isVertical && queryBtn" :class="[`form-item`, `form-item-button`]">
|
|
35
|
+
<el-button v-bind="queryBtn" :loading="queryLoading" :disabled="disableds.querybutton" @click="handleExpectQuery">
|
|
46
36
|
{{ queryBtn.name || '查询' }}
|
|
47
37
|
</el-button>
|
|
48
38
|
</div>
|
|
@@ -210,9 +200,7 @@ export default {
|
|
|
210
200
|
},
|
|
211
201
|
|
|
212
202
|
computedPopperClass() {
|
|
213
|
-
return (
|
|
214
|
-
this.isVertical ? ['form-custom-popper input-w', this.popperClass] : []
|
|
215
|
-
).join(' ')
|
|
203
|
+
return (this.isVertical ? ['form-custom-popper input-w', this.popperClass] : []).join(' ')
|
|
216
204
|
},
|
|
217
205
|
|
|
218
206
|
innerLabelWidth() {
|
|
@@ -235,11 +223,7 @@ export default {
|
|
|
235
223
|
deep: true,
|
|
236
224
|
immediate: true,
|
|
237
225
|
handler: function (newVal) {
|
|
238
|
-
if (
|
|
239
|
-
!this.isEmptyObject(newVal) &&
|
|
240
|
-
!this.isRendering &&
|
|
241
|
-
this.innerMountAndQuery
|
|
242
|
-
) {
|
|
226
|
+
if (!this.isEmptyObject(newVal) && !this.isRendering && this.innerMountAndQuery) {
|
|
243
227
|
this.innerMountAndQuery = false
|
|
244
228
|
this.handleExpectQuery()
|
|
245
229
|
}
|
|
@@ -294,9 +278,7 @@ export default {
|
|
|
294
278
|
querybutton: this.disabled
|
|
295
279
|
}
|
|
296
280
|
|
|
297
|
-
const { querybutton, normalItems = [] } = this.separateAdvanceAndNormal(
|
|
298
|
-
this.config
|
|
299
|
-
)
|
|
281
|
+
const { querybutton, normalItems = [] } = this.separateAdvanceAndNormal(this.config)
|
|
300
282
|
this.normalConfig = normalItems
|
|
301
283
|
|
|
302
284
|
this.generateFormModel(normalItems)
|
|
@@ -321,9 +303,9 @@ export default {
|
|
|
321
303
|
} else {
|
|
322
304
|
if (!item.mold) {
|
|
323
305
|
throw Error(
|
|
324
|
-
`Each config's child must has a 'mold' prop, it could be ${SUPPORT_TYPE.concat(
|
|
325
|
-
'
|
|
326
|
-
)
|
|
306
|
+
`Each config's child must has a 'mold' prop, it could be ${SUPPORT_TYPE.concat('querybutton').join(
|
|
307
|
+
'|'
|
|
308
|
+
)}`
|
|
327
309
|
)
|
|
328
310
|
}
|
|
329
311
|
|
|
@@ -343,9 +325,7 @@ export default {
|
|
|
343
325
|
|
|
344
326
|
if (!config.mold) {
|
|
345
327
|
throw Error(
|
|
346
|
-
`Each config's child must has a 'mold' prop, it could be ${SUPPORT_TYPE.concat(
|
|
347
|
-
'querybutton'
|
|
348
|
-
).join('|')}`
|
|
328
|
+
`Each config's child must has a 'mold' prop, it could be ${SUPPORT_TYPE.concat('querybutton').join('|')}`
|
|
349
329
|
)
|
|
350
330
|
}
|
|
351
331
|
|
|
@@ -406,31 +386,15 @@ export default {
|
|
|
406
386
|
if (Array.isArray(link)) {
|
|
407
387
|
links = link
|
|
408
388
|
isOneToLinkAll = links.every((item) => item.mold)
|
|
409
|
-
isComplex = !!(
|
|
410
|
-
links.find((item) => item.mold) && links.find((item) => !item.mold)
|
|
411
|
-
)
|
|
389
|
+
isComplex = !!(links.find((item) => item.mold) && links.find((item) => !item.mold))
|
|
412
390
|
} else {
|
|
413
391
|
links = [link]
|
|
414
392
|
}
|
|
415
393
|
|
|
416
|
-
links.forEach((link) =>
|
|
417
|
-
this.setSingleLinkWatch(
|
|
418
|
-
link,
|
|
419
|
-
itemProp,
|
|
420
|
-
isOneToLinkAll,
|
|
421
|
-
isComplex,
|
|
422
|
-
link.mold
|
|
423
|
-
)
|
|
424
|
-
)
|
|
394
|
+
links.forEach((link) => this.setSingleLinkWatch(link, itemProp, isOneToLinkAll, isComplex, link.mold))
|
|
425
395
|
},
|
|
426
396
|
|
|
427
|
-
setSingleLinkWatch(
|
|
428
|
-
link,
|
|
429
|
-
itemProp,
|
|
430
|
-
isOneToLinkAll,
|
|
431
|
-
isComplex,
|
|
432
|
-
isModelEverGenerated
|
|
433
|
-
) {
|
|
397
|
+
setSingleLinkWatch(link, itemProp, isOneToLinkAll, isComplex, isModelEverGenerated) {
|
|
434
398
|
const { prop, handler, mold } = link
|
|
435
399
|
|
|
436
400
|
if (!this.isFunc(handler)) {
|
|
@@ -501,10 +465,7 @@ export default {
|
|
|
501
465
|
},
|
|
502
466
|
item
|
|
503
467
|
)
|
|
504
|
-
} else if (
|
|
505
|
-
Array.isArray(item.link) &&
|
|
506
|
-
!(item.prop === prop && item.mold)
|
|
507
|
-
) {
|
|
468
|
+
} else if (Array.isArray(item.link) && !(item.prop === prop && item.mold)) {
|
|
508
469
|
replaceOptionsHelper(
|
|
509
470
|
{
|
|
510
471
|
prop,
|
|
@@ -600,8 +561,7 @@ export default {
|
|
|
600
561
|
},
|
|
601
562
|
|
|
602
563
|
isEmptyObject(obj) {
|
|
603
|
-
const isObj =
|
|
604
|
-
Object.prototype.toString.call(obj).toLowerCase() !== '[object object]'
|
|
564
|
+
const isObj = Object.prototype.toString.call(obj).toLowerCase() !== '[object object]'
|
|
605
565
|
return !Object.keys(isObj ? {} : obj).length
|
|
606
566
|
},
|
|
607
567
|
|
|
@@ -628,9 +588,7 @@ export default {
|
|
|
628
588
|
|
|
629
589
|
await this.$listeners.query(model, config)
|
|
630
590
|
} else {
|
|
631
|
-
throw new Error(
|
|
632
|
-
'must specify @query event when there is a query button'
|
|
633
|
-
)
|
|
591
|
+
throw new Error('must specify @query event when there is a query button')
|
|
634
592
|
}
|
|
635
593
|
} catch (err) {
|
|
636
594
|
console.error('form custom error -> handleExpectQuery:', err)
|
|
@@ -642,10 +600,7 @@ export default {
|
|
|
642
600
|
convertModelToFormData(model) {
|
|
643
601
|
const fd = new FormData()
|
|
644
602
|
Object.entries(model).forEach(([key, value]) => {
|
|
645
|
-
fd.append(
|
|
646
|
-
key,
|
|
647
|
-
value instanceof window.FormData ? value.get(key) : value
|
|
648
|
-
)
|
|
603
|
+
fd.append(key, value instanceof window.FormData ? value.get(key) : value)
|
|
649
604
|
})
|
|
650
605
|
return fd
|
|
651
606
|
},
|