cloud-web-corejs 1.0.54-dev.193 → 1.0.54-dev.195
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/package.json +1 -1
- package/src/components/wf/content.vue +2 -0
- package/src/components/wf/setCandidateDialog.vue +1 -0
- package/src/components/xform/form-designer/form-widget/field-widget/fieldMixin.js +33 -38
- package/src/components/xform/form-designer/form-widget/field-widget/mixins/vabsearch-mixin.js +176 -0
- package/src/components/xform/form-designer/form-widget/field-widget/multiSearch-widget.vue +53 -0
- package/src/components/xform/form-designer/form-widget/field-widget/project-tag-widget.vue +5 -2
- package/src/components/xform/form-designer/form-widget/field-widget/select-widget.vue +1 -0
- package/src/components/xform/form-designer/form-widget/field-widget/singerSearch-widget.vue +53 -0
- package/src/components/xform/form-designer/form-widget/field-widget/vabSearch-widget.vue +2 -173
- package/src/components/xform/form-designer/indexMixin.js +5 -1
- package/src/components/xform/form-designer/setting-panel/property-editor/container-data-table/data-table-editor.vue +0 -8
- package/src/components/xform/form-designer/setting-panel/property-editor/container-data-table/table-column-dialog.vue +0 -8
- package/src/components/xform/form-designer/setting-panel/property-editor/container-list-h5/list-h5-editor.vue +0 -8
- package/src/components/xform/form-designer/setting-panel/property-editor/field-button/search-dialog-event-editor.vue +13 -11
- package/src/components/xform/form-designer/setting-panel/property-editor/field-vabSearch/vabSearchName-editor.vue +13 -1
- package/src/components/xform/form-designer/setting-panel/property-editor/multiple-editor.vue +11 -11
- package/src/components/xform/form-designer/setting-panel/property-editor/project-tag-editor.vue +18 -17
- package/src/components/xform/form-designer/toolbar-panel/index.vue +8 -4
- package/src/components/xform/form-designer/widget-panel/index.vue +19 -15
- package/src/components/xform/form-designer/widget-panel/indexMixin.js +3 -0
- package/src/components/xform/form-designer/widget-panel/widgetsConfig.js +200 -80
- package/src/components/xform/form-render/container-item/data-table-mixin.js +6 -10
- package/src/components/xform/form-render/container-item/list-h5-item.vue +1 -9
- package/src/components/xform/form-render/container-item/list-h5-item2.vue +1 -8
- package/src/components/xform/form-render/indexMixin.js +127 -8
- package/src/components/xform/lang/zh-CN.js +5 -2
- package/src/components/xform/mixins/defaultHandle.js +120 -1
@@ -1205,14 +1205,6 @@ export default {
|
|
1205
1205
|
let columnEditFields = null;
|
1206
1206
|
|
1207
1207
|
let type = this.columnFormatMap[formatS];
|
1208
|
-
/*if (type == 'date') {
|
1209
|
-
columnEditFields = ['type', 'format', 'valueFormat']
|
1210
|
-
} else if (type == 'select') {
|
1211
|
-
|
1212
|
-
}
|
1213
|
-
if (type == 'vabsearch') {
|
1214
|
-
columnEditFields = ['vabSearchField', 'formCode', 'formVersion', 'required', 'showFormField', 'onSearchConfirm', 'onSearchClear']
|
1215
|
-
}*/
|
1216
1208
|
|
1217
1209
|
if (type) {
|
1218
1210
|
// columnSelectedWidget = this.$baseLodash.cloneDeep(this.designer.getFieldWidgetByType(type));
|
@@ -694,14 +694,6 @@ export default {
|
|
694
694
|
let columnEditFields = null;
|
695
695
|
|
696
696
|
let type = this.columnFormatMap[row.formatS];
|
697
|
-
/*if (type == 'date') {
|
698
|
-
columnEditFields = ['type', 'format', 'valueFormat']
|
699
|
-
} else if (type == 'select') {
|
700
|
-
|
701
|
-
}
|
702
|
-
if (type == 'vabsearch') {
|
703
|
-
columnEditFields = ['vabSearchField', 'formCode', 'formVersion', 'required', 'showFormField', 'onSearchConfirm', 'onSearchClear']
|
704
|
-
}*/
|
705
697
|
|
706
698
|
if (type) {
|
707
699
|
columnSelectedWidget = this.$baseLodash.cloneDeep(this.designer.getFieldWidgetByType(type));
|
@@ -4,7 +4,9 @@
|
|
4
4
|
<el-divider class="custom-divider">选择弹框配置</el-divider>
|
5
5
|
</el-form-item>
|
6
6
|
<el-form-item label="是否多选">
|
7
|
-
<el-switch v-model="eventConfig.multipleChoices"
|
7
|
+
<el-switch v-model="eventConfig.multipleChoices"
|
8
|
+
v-if="selectedWidget.type !== 'singerSearch' && selectedWidget.type !== 'multiSearch'"></el-switch>
|
9
|
+
<span v-else>{{eventConfig.multipleChoices?'是':'否'}}</span>
|
8
10
|
</el-form-item>
|
9
11
|
<el-form-item label="弹框表单编码">
|
10
12
|
<el-input type="text" v-model="eventConfig.formCode"></el-input>
|
@@ -16,7 +18,7 @@
|
|
16
18
|
<i class="el-icon-edit"></i>
|
17
19
|
</a>
|
18
20
|
</el-form-item>
|
19
|
-
<template v-if="
|
21
|
+
<template v-if="hasConfig('vabsearchFlag')">
|
20
22
|
<el-form-item label="关联来源字段">
|
21
23
|
<el-input type="text" v-model="eventConfig.valueSourceField"></el-input>
|
22
24
|
</el-form-item>
|
@@ -28,7 +30,7 @@
|
|
28
30
|
<!-- <el-form-item label="多选">
|
29
31
|
<el-switch v-model="optionModel.multiple"></el-switch>
|
30
32
|
</el-form-item>-->
|
31
|
-
<template v-if="
|
33
|
+
<template v-if="!hasConfig('vabsearchFlag')">
|
32
34
|
<el-form-item label="关联表格">
|
33
35
|
<el-switch v-model="eventConfig.tableEnabled"></el-switch>
|
34
36
|
</el-form-item>
|
@@ -142,10 +144,10 @@
|
|
142
144
|
import i18n from "../../../../../../components/xform/utils/i18n"
|
143
145
|
import eventMixin
|
144
146
|
from "../../../../../../components/xform/form-designer/setting-panel/property-editor/event-handler/eventMixin"
|
145
|
-
|
147
|
+
import propertyMixin from "../../../../../../components/xform/form-designer/setting-panel/property-editor/propertyMixin"
|
146
148
|
|
147
149
|
export default {
|
148
|
-
mixins: [i18n, eventMixin],
|
150
|
+
mixins: [i18n, eventMixin, propertyMixin],
|
149
151
|
props: {
|
150
152
|
designer: Object,
|
151
153
|
selectedWidget: Object,
|
@@ -156,20 +158,20 @@ export default {
|
|
156
158
|
return {
|
157
159
|
showDialog: false,
|
158
160
|
tableData: [],
|
159
|
-
option1:{
|
160
|
-
customCode:()=>{
|
161
|
+
option1: {
|
162
|
+
customCode: () => {
|
161
163
|
return this.eventConfig.confirmCallback;
|
162
164
|
},
|
163
|
-
callback:(code)=>{
|
165
|
+
callback: (code) => {
|
164
166
|
this.eventConfig.confirmCallback = code;
|
165
167
|
this.$forceUpdate()
|
166
168
|
}
|
167
169
|
},
|
168
|
-
option2:{
|
169
|
-
customCode:()=>{
|
170
|
+
option2: {
|
171
|
+
customCode: () => {
|
170
172
|
return this.eventConfig.dialogQueryParam;
|
171
173
|
},
|
172
|
-
callback:(code)=>{
|
174
|
+
callback: (code) => {
|
173
175
|
this.eventConfig.dialogQueryParam = code;
|
174
176
|
this.$forceUpdate()
|
175
177
|
}
|
@@ -1,7 +1,9 @@
|
|
1
1
|
<template>
|
2
2
|
<div>
|
3
3
|
<el-form-item label="是否多选">
|
4
|
-
<el-switch v-model="optionModel.multipleChoices"
|
4
|
+
<el-switch v-model="optionModel.multipleChoices"
|
5
|
+
v-if="selectedWidget.type !== 'singerSearch' && selectedWidget.type !== 'multiSearch'"></el-switch>
|
6
|
+
<span v-else>{{ optionModel.multipleChoices ? '是' : '否' }}</span>
|
5
7
|
</el-form-item>
|
6
8
|
<el-form-item label="关联字段" v-if="optionModel.multipleChoices">
|
7
9
|
<el-input type="text" v-model="optionModel.valueField"></el-input>
|
@@ -9,6 +11,16 @@
|
|
9
11
|
<el-form-item label="展示字段">
|
10
12
|
<el-input type="text" v-model="optionModel.vabSearchName"></el-input>
|
11
13
|
</el-form-item>
|
14
|
+
<template v-if="!optionModel.multipleChoices">
|
15
|
+
<el-form-item label="默认当前用户">
|
16
|
+
<el-switch v-model="optionModel.userDefaultVabSearch"
|
17
|
+
@change="optionModel.saleOrgDefaultVabSearch=false"></el-switch>
|
18
|
+
</el-form-item>
|
19
|
+
<el-form-item label="默认当前机构">
|
20
|
+
<el-switch v-model="optionModel.saleOrgDefaultVabSearch"
|
21
|
+
@change="optionModel.userDefaultVabSearch=false"></el-switch>
|
22
|
+
</el-form-item>
|
23
|
+
</template>
|
12
24
|
</div>
|
13
25
|
</template>
|
14
26
|
|
package/src/components/xform/form-designer/setting-panel/property-editor/multiple-editor.vue
CHANGED
@@ -5,18 +5,18 @@
|
|
5
5
|
</template>
|
6
6
|
|
7
7
|
<script>
|
8
|
-
|
9
|
-
|
8
|
+
import i18n from "../../../../../components/xform/utils/i18n"
|
9
|
+
import propertyMixin from "../../../../../components/xform/form-designer/setting-panel/property-editor/propertyMixin"
|
10
10
|
|
11
|
-
|
12
|
-
|
13
|
-
|
14
|
-
|
15
|
-
|
16
|
-
|
17
|
-
|
18
|
-
|
19
|
-
|
11
|
+
export default {
|
12
|
+
name: "multiple-editor",
|
13
|
+
mixins: [i18n, propertyMixin],
|
14
|
+
props: {
|
15
|
+
designer: Object,
|
16
|
+
selectedWidget: Object,
|
17
|
+
optionModel: Object,
|
18
|
+
},
|
19
|
+
}
|
20
20
|
</script>
|
21
21
|
|
22
22
|
<style scoped>
|
package/src/components/xform/form-designer/setting-panel/property-editor/project-tag-editor.vue
CHANGED
@@ -3,9 +3,16 @@
|
|
3
3
|
<el-form-item label-width="0">
|
4
4
|
<el-divider class="custom-divider-margin-top">项目标签设置</el-divider>
|
5
5
|
</el-form-item>
|
6
|
-
<el-form-item label="
|
6
|
+
<el-form-item label="弹框表单编码">
|
7
7
|
<el-input v-model="optionModel.tagFormCode" clearable></el-input>
|
8
8
|
</el-form-item>
|
9
|
+
<el-form-item label="弹框查询参数">
|
10
|
+
<a href="javascript:void(0);" class="a-link link-oneLind"
|
11
|
+
@click="editEventHandler('tagFormParam', ['dataId', 'formCode'])">
|
12
|
+
<span>{{ optionModel.tagFormParam }}</span>
|
13
|
+
<i class="el-icon-edit"></i>
|
14
|
+
</a>
|
15
|
+
</el-form-item>
|
9
16
|
<el-form-item label="展示字段">
|
10
17
|
<el-input v-model="optionModel.tagLabelField" clearable></el-input>
|
11
18
|
</el-form-item>
|
@@ -18,13 +25,7 @@
|
|
18
25
|
<el-form-item label="来源唯一关键字段">
|
19
26
|
<el-input v-model="optionModel.tagFormUniqueField" clearable></el-input>
|
20
27
|
</el-form-item>
|
21
|
-
|
22
|
-
<a href="javascript:void(0);" class="a-link link-oneLind"
|
23
|
-
@click="editEventHandler('tagFormParam', ['dataId', 'formCode'])">
|
24
|
-
<span>{{ optionModel.cf_vendor_item }}</span>
|
25
|
-
<i class="el-icon-edit"></i>
|
26
|
-
</a>
|
27
|
-
</el-form-item>
|
28
|
+
|
28
29
|
<el-form-item label="明细字段回填">
|
29
30
|
<a href="javascript:void(0);" class="a-link link-oneLind"
|
30
31
|
@click="openDialog">
|
@@ -33,7 +34,7 @@
|
|
33
34
|
</a>
|
34
35
|
</el-form-item>
|
35
36
|
<el-form-item label="确认回调">
|
36
|
-
<!-- <el-input v-model="optionModel.tagConfirmCallback" clearable></el-input>-->
|
37
|
+
<!-- <el-input v-model="optionModel.tagConfirmCallback" clearable></el-input>-->
|
37
38
|
<a href="javascript:void(0);" class="a-link link-oneLind"
|
38
39
|
@click="editEventHandler('tagConfirmCallback', ['dataId', 'formCode','rows'])">
|
39
40
|
<span>{{ optionModel.tagConfirmCallback }}</span>
|
@@ -41,7 +42,7 @@
|
|
41
42
|
</a>
|
42
43
|
</el-form-item>
|
43
44
|
<el-form-item label="删除回调">
|
44
|
-
<!-- <el-input v-model="optionModel.tagDeleteCallback" clearable></el-input>-->
|
45
|
+
<!-- <el-input v-model="optionModel.tagDeleteCallback" clearable></el-input>-->
|
45
46
|
<a href="javascript:void(0);" class="a-link link-oneLind"
|
46
47
|
@click="editEventHandler('tagDeleteCallback', ['dataId', 'formCode'])">
|
47
48
|
<span>{{ optionModel.tagDeleteCallback }}</span>
|
@@ -52,13 +53,13 @@
|
|
52
53
|
<el-switch v-model="optionModel.tabDeleteEnabled" clearable></el-switch>
|
53
54
|
</el-form-item>
|
54
55
|
|
55
|
-
<!-- <el-form-item label="查询参数">
|
56
|
-
|
57
|
-
|
58
|
-
|
59
|
-
|
60
|
-
|
61
|
-
|
56
|
+
<!-- <el-form-item label="查询参数">
|
57
|
+
<a href="javascript:void(0);" class="a-link link-oneLind"
|
58
|
+
@click="editEventHandler('formScriptParam', ['dataId', 'formCode'])">
|
59
|
+
<span>{{ optionModel.formScriptParam }}</span>
|
60
|
+
<i class="el-icon-edit"></i>
|
61
|
+
</a>
|
62
|
+
</el-form-item>-->
|
62
63
|
<el-dialog
|
63
64
|
custom-class="dialog-style list-dialog"
|
64
65
|
title="数据回填"
|
@@ -1,12 +1,16 @@
|
|
1
1
|
<template>
|
2
2
|
<div class="toolbar-container">
|
3
3
|
<div class="left-toolbar">
|
4
|
-
|
5
|
-
|
4
|
+
<el-button type="text" :disabled="undoDisabled" :title="i18nt('designer.toolbar.undoHint')" @click="undoHistory">
|
5
|
+
<svg-icon icon-class="undo"/>
|
6
|
+
</el-button>
|
7
|
+
<el-button type="text" :disabled="redoDisabled" :title="i18nt('designer.toolbar.redoHint')" @click="redoHistory">
|
8
|
+
<svg-icon icon-class="redo"/>
|
9
|
+
</el-button>
|
6
10
|
<el-button-group>
|
7
|
-
<el-button :type="layoutType === 'PC' ? 'info' : ''" @click="changeLayoutType('PC')" size="mini">
|
11
|
+
<!-- <el-button :type="layoutType === 'PC' ? 'info' : ''" @click="changeLayoutType('PC')" size="mini">
|
8
12
|
{{ i18nt('designer.toolbar.pcLayout') }}
|
9
|
-
</el-button
|
13
|
+
</el-button>-->
|
10
14
|
<!-- <el-button :type="layoutType === 'Pad' ? 'info' : ''" @click="changeLayoutType('Pad')">{{ i18nt('designer.toolbar.padLayout') }}</el-button>-->
|
11
15
|
<!-- <el-button :type="layoutType === 'H5' ? 'info' : ''" @click="changeLayoutType('H5')" size="mini">
|
12
16
|
{{ i18nt('designer.toolbar.mobileLayout') }}
|
@@ -66,7 +66,6 @@
|
|
66
66
|
<!-- -->
|
67
67
|
|
68
68
|
|
69
|
-
|
70
69
|
</el-collapse>
|
71
70
|
|
72
71
|
</el-tab-pane>
|
@@ -114,19 +113,7 @@
|
|
114
113
|
</draggable>
|
115
114
|
</el-collapse-item>
|
116
115
|
|
117
|
-
|
118
|
-
<draggable tag="ul" :list="businessFields" :group="{name: 'dragGroup', pull: 'clone', put: false}"
|
119
|
-
:move="checkFieldMove"
|
120
|
-
:clone="handleFieldWidgetClone" ghost-class="ghost" :sort="false">
|
121
|
-
<li v-for="(fld, index) in businessFields" :key="index" class="field-widget-item"
|
122
|
-
:title="fld.displayName"
|
123
|
-
@dblclick="addFieldByDbClick(fld)">
|
124
|
-
<span><svg-icon :icon-class="fld.icon" class-name="color-svg-icon"/>
|
125
|
-
<span>{{ i18n2t(`designer.widgetLabel.${fld.type}`, `extension.widgetLabel.${fld.type}`) }}</span>
|
126
|
-
</span>
|
127
|
-
</li>
|
128
|
-
</draggable>
|
129
|
-
</el-collapse-item>
|
116
|
+
|
130
117
|
|
131
118
|
<el-collapse-item v-if="!!metaFields.main.entityName" name="1" :title="metaFields.main.entityLabel">
|
132
119
|
<draggable tag="ul" :list="metaFields.main.fieldList"
|
@@ -160,7 +147,24 @@
|
|
160
147
|
</template>
|
161
148
|
</el-collapse>
|
162
149
|
</el-tab-pane>
|
163
|
-
|
150
|
+
<el-tab-pane name="businessLib">
|
151
|
+
<span slot="label"><i class="el-icon-set-up"></i> {{ i18nt('业务组件') }}</span>
|
152
|
+
<el-collapse v-model="businessActiveNames" class="widget-collapse">
|
153
|
+
<el-collapse-item name="0" :title="i18nt('业务组件')">
|
154
|
+
<draggable tag="ul" :list="businessFields" :group="{name: 'dragGroup', pull: 'clone', put: false}"
|
155
|
+
:move="checkFieldMove"
|
156
|
+
:clone="handleFieldWidgetClone" ghost-class="ghost" :sort="false">
|
157
|
+
<li v-for="(fld, index) in businessFields" :key="index" class="field-widget-item"
|
158
|
+
:title="fld.displayName"
|
159
|
+
@dblclick="addFieldByDbClick(fld)">
|
160
|
+
<span><svg-icon :icon-class="fld.icon" class-name="color-svg-icon"/>
|
161
|
+
<span>{{ i18n2t(`designer.widgetLabel.${fld.type}`, `extension.widgetLabel.${fld.type}`) }}</span>
|
162
|
+
</span>
|
163
|
+
</li>
|
164
|
+
</draggable>
|
165
|
+
</el-collapse-item>
|
166
|
+
</el-collapse>
|
167
|
+
</el-tab-pane>
|
164
168
|
<!-- <el-tab-pane v-if="showFormTemplates" name="formLib" style="padding: 8px">
|
165
169
|
<span slot="label"><i class="el-icon-c-scale-to-original"></i> {{i18nt('designer.formLib')}}</span>
|
166
170
|
|
@@ -39,6 +39,9 @@ modules = {
|
|
39
39
|
scrollerHeight: 0,
|
40
40
|
activeNames: ['1', '2', '3', '4'],
|
41
41
|
metadataActiveNames: ["0", "1", "2", "3", "4"],
|
42
|
+
|
43
|
+
businessActiveNames:["0"],
|
44
|
+
|
42
45
|
containers: baseRefUtil.containers,
|
43
46
|
commonContainers: [],
|
44
47
|
basicFields: baseRefUtil.basicFields,
|
@@ -801,6 +801,94 @@ export const defaultWidgetShowRuleConfig = {
|
|
801
801
|
widgetShowRuleConfig: [],
|
802
802
|
}
|
803
803
|
|
804
|
+
const vabsearchConfig = {
|
805
|
+
name: "",
|
806
|
+
keyNameEnabled: !1,
|
807
|
+
keyName: "",
|
808
|
+
vabSearchName: "",
|
809
|
+
userDefaultVabSearch: false,
|
810
|
+
saleOrgDefaultVabSearch: false,
|
811
|
+
label: "",
|
812
|
+
submitFlag: true,
|
813
|
+
disabled: !1,
|
814
|
+
hidden: !1,
|
815
|
+
required: !1,
|
816
|
+
labelWidth: null,
|
817
|
+
labelHidden: !1,
|
818
|
+
readonly: true,
|
819
|
+
/*formCode: null,
|
820
|
+
formName: null,
|
821
|
+
formVersion: null,
|
822
|
+
showFormField: null,*/
|
823
|
+
/* gridConfig: {
|
824
|
+
tableColumns: [],
|
825
|
+
searchFields: [],
|
826
|
+
searchParams: ""
|
827
|
+
},*/
|
828
|
+
// vabSearchField: null,
|
829
|
+
vabsearchFlag: 1,
|
830
|
+
onSearchClear: "",
|
831
|
+
dialogModel: '1',
|
832
|
+
systemDialogUrl: null,
|
833
|
+
accessType: "1",
|
834
|
+
onCreated: "",
|
835
|
+
onMounted: "",
|
836
|
+
onChange: "",
|
837
|
+
onAppendButtonClick: "",
|
838
|
+
clickBindEvent: '1',
|
839
|
+
searchDialogConfig: {
|
840
|
+
...defaultSearchDialogConfig,
|
841
|
+
multipleChoices: false
|
842
|
+
},
|
843
|
+
...defaultWfConfig,
|
844
|
+
valueField: null,
|
845
|
+
multipleChoices: false,
|
846
|
+
|
847
|
+
showRuleFlag: 1,
|
848
|
+
showRuleEnabled: 1,
|
849
|
+
showRules: []
|
850
|
+
}
|
851
|
+
|
852
|
+
const projectTagConfig = {
|
853
|
+
name: "",
|
854
|
+
keyNameEnabled: !1,
|
855
|
+
keyName: "",
|
856
|
+
// keyNameSuffix: "",
|
857
|
+
label: "",
|
858
|
+
submitFlag: true,
|
859
|
+
disabled: !1,
|
860
|
+
readonly: false,
|
861
|
+
hidden: !1,
|
862
|
+
required: !1,
|
863
|
+
labelWidth: null,
|
864
|
+
labelHidden: !1,
|
865
|
+
onCreated: "if(this.dataId)this.loadDataDefaultHandle();",
|
866
|
+
onMounted: "",
|
867
|
+
onClick: "",
|
868
|
+
// vabUpload: 1,
|
869
|
+
formScriptEnabled: true,
|
870
|
+
formScriptCode: "getList",
|
871
|
+
formScriptParam: null,
|
872
|
+
formScriptSuccess: null,
|
873
|
+
...defaultWfConfig,
|
874
|
+
|
875
|
+
showRuleFlag: 1,
|
876
|
+
showRuleEnabled: 1,
|
877
|
+
showRules: [],
|
878
|
+
|
879
|
+
tagFormCode: null,
|
880
|
+
tagFormParam: null,
|
881
|
+
tagLabelField: null,
|
882
|
+
tagUniqueField: null,
|
883
|
+
tagFormLabelField: null,
|
884
|
+
tagFormUniqueField: null,
|
885
|
+
tagFillConfig: [],
|
886
|
+
tagConfirmCallback: null,
|
887
|
+
tagDeleteCallback: null,
|
888
|
+
tabDeleteEnabled: true,
|
889
|
+
|
890
|
+
}
|
891
|
+
|
804
892
|
export const basicFields = [
|
805
893
|
{
|
806
894
|
type: "input",
|
@@ -2575,49 +2663,29 @@ export const advancedFields = [
|
|
2575
2663
|
formItemFlag: !0,
|
2576
2664
|
tableField: null,
|
2577
2665
|
options: {
|
2578
|
-
|
2579
|
-
|
2580
|
-
|
2581
|
-
|
2582
|
-
|
2583
|
-
|
2584
|
-
|
2585
|
-
|
2586
|
-
|
2587
|
-
|
2588
|
-
|
2589
|
-
|
2590
|
-
|
2591
|
-
|
2592
|
-
|
2593
|
-
|
2594
|
-
|
2595
|
-
|
2596
|
-
|
2597
|
-
|
2598
|
-
|
2599
|
-
|
2600
|
-
|
2601
|
-
dialogModel: '1',
|
2602
|
-
systemDialogUrl: null,
|
2603
|
-
accessType: "1",
|
2604
|
-
onCreated: "",
|
2605
|
-
onMounted: "",
|
2606
|
-
onChange: "",
|
2607
|
-
onAppendButtonClick: "",
|
2608
|
-
clickBindEvent: '1',
|
2609
|
-
searchDialogConfig: {
|
2610
|
-
...defaultSearchDialogConfig,
|
2611
|
-
multipleChoices: false
|
2612
|
-
},
|
2613
|
-
...defaultWfConfig,
|
2614
|
-
valueField: null,
|
2615
|
-
multipleChoices: false,
|
2616
|
-
|
2617
|
-
showRuleFlag: 1,
|
2618
|
-
showRuleEnabled: 1,
|
2619
|
-
showRules: []
|
2620
|
-
|
2666
|
+
...vabsearchConfig
|
2667
|
+
}
|
2668
|
+
},
|
2669
|
+
{
|
2670
|
+
type: "singerSearch",
|
2671
|
+
icon: "searchbox",
|
2672
|
+
// commonFlag: !0,
|
2673
|
+
// columnFlag: true,
|
2674
|
+
formItemFlag: !0,
|
2675
|
+
tableField: null,
|
2676
|
+
options: {
|
2677
|
+
...vabsearchConfig
|
2678
|
+
}
|
2679
|
+
},
|
2680
|
+
{
|
2681
|
+
type: "multiSearch",
|
2682
|
+
icon: "searchbox",
|
2683
|
+
// commonFlag: !0,
|
2684
|
+
// columnFlag: true,
|
2685
|
+
formItemFlag: !0,
|
2686
|
+
tableField: null,
|
2687
|
+
options: {
|
2688
|
+
...vabsearchConfig
|
2621
2689
|
}
|
2622
2690
|
},
|
2623
2691
|
{
|
@@ -3037,6 +3105,7 @@ export const advancedFields = [
|
|
3037
3105
|
showRules: []
|
3038
3106
|
}
|
3039
3107
|
},
|
3108
|
+
|
3040
3109
|
{
|
3041
3110
|
type: "project-tag",
|
3042
3111
|
icon: "uploadbox",
|
@@ -3045,43 +3114,7 @@ export const advancedFields = [
|
|
3045
3114
|
formItemFlag: !0,
|
3046
3115
|
tableField: null,
|
3047
3116
|
options: {
|
3048
|
-
|
3049
|
-
keyNameEnabled: !1,
|
3050
|
-
keyName: "",
|
3051
|
-
// keyNameSuffix: "",
|
3052
|
-
label: "",
|
3053
|
-
submitFlag: true,
|
3054
|
-
disabled: !1,
|
3055
|
-
readonly: false,
|
3056
|
-
hidden: !1,
|
3057
|
-
required: !1,
|
3058
|
-
labelWidth: null,
|
3059
|
-
labelHidden: !1,
|
3060
|
-
onCreated: "if(this.dataId)this.loadDataDefaultHandle();",
|
3061
|
-
onMounted: "",
|
3062
|
-
onClick: "",
|
3063
|
-
// vabUpload: 1,
|
3064
|
-
formScriptEnabled: true,
|
3065
|
-
formScriptCode: "getList",
|
3066
|
-
formScriptParam: null,
|
3067
|
-
formScriptSuccess: null,
|
3068
|
-
...defaultWfConfig,
|
3069
|
-
|
3070
|
-
showRuleFlag: 1,
|
3071
|
-
showRuleEnabled: 1,
|
3072
|
-
showRules: [],
|
3073
|
-
|
3074
|
-
tagFormCode: null,
|
3075
|
-
tagFormParam: null,
|
3076
|
-
tagLabelField: null,
|
3077
|
-
tagUniqueField: null,
|
3078
|
-
tagFormLabelField: null,
|
3079
|
-
tagFormUniqueField: null,
|
3080
|
-
tagFillConfig: [],
|
3081
|
-
tagConfirmCallback: null,
|
3082
|
-
tagDeleteCallback: null,
|
3083
|
-
tabDeleteEnabled: false,
|
3084
|
-
|
3117
|
+
...projectTagConfig
|
3085
3118
|
}
|
3086
3119
|
},
|
3087
3120
|
{
|
@@ -3313,6 +3346,93 @@ export const businessFields = [
|
|
3313
3346
|
...defaultTextFlagConfig
|
3314
3347
|
}
|
3315
3348
|
},
|
3349
|
+
|
3350
|
+
{
|
3351
|
+
type: "user-vabsearch",
|
3352
|
+
targetType: "singerSearch",
|
3353
|
+
icon: "searchbox",
|
3354
|
+
commonFlag: !0,
|
3355
|
+
columnFlag: true,
|
3356
|
+
formItemFlag: !0,
|
3357
|
+
tableField: null,
|
3358
|
+
options: {
|
3359
|
+
...vabsearchConfig,
|
3360
|
+
vabSearchName: "nick_name",
|
3361
|
+
userDefaultVabSearch: true,
|
3362
|
+
label: "用户",
|
3363
|
+
searchDialogConfig: {
|
3364
|
+
...defaultSearchDialogConfig,
|
3365
|
+
multipleChoices: false,
|
3366
|
+
formCode: "user_dialog",
|
3367
|
+
valueSourceField: "id",
|
3368
|
+
labelSourceField: "nick_name",
|
3369
|
+
},
|
3370
|
+
}
|
3371
|
+
},
|
3372
|
+
{
|
3373
|
+
type: "saleOrg-vabsearch",
|
3374
|
+
targetType: "singerSearch",
|
3375
|
+
icon: "searchbox",
|
3376
|
+
commonFlag: !0,
|
3377
|
+
columnFlag: true,
|
3378
|
+
formItemFlag: !0,
|
3379
|
+
tableField: null,
|
3380
|
+
options: {
|
3381
|
+
...vabsearchConfig,
|
3382
|
+
vabSearchName: "sale_org_name",
|
3383
|
+
saleOrgDefaultVabSearch: true,
|
3384
|
+
label: "机构",
|
3385
|
+
searchDialogConfig: {
|
3386
|
+
...defaultSearchDialogConfig,
|
3387
|
+
multipleChoices: false,
|
3388
|
+
formCode: "sale_org_dialog",
|
3389
|
+
valueSourceField: "id",
|
3390
|
+
labelSourceField: "name"
|
3391
|
+
},
|
3392
|
+
}
|
3393
|
+
},
|
3394
|
+
|
3395
|
+
{
|
3396
|
+
type: "user-project-tag",
|
3397
|
+
targetType: "project-tag",
|
3398
|
+
icon: "uploadbox",
|
3399
|
+
commonFlag: !0,
|
3400
|
+
columnFlag: true,
|
3401
|
+
formItemFlag: !0,
|
3402
|
+
tableField: null,
|
3403
|
+
options: {
|
3404
|
+
...projectTagConfig,
|
3405
|
+
label: "用户",
|
3406
|
+
tagFormCode: "user_dialog",
|
3407
|
+
tagLabelField: "nick_name",
|
3408
|
+
tagUniqueField: "id",
|
3409
|
+
tagFormLabelField: "nick_name",
|
3410
|
+
tagFormUniqueField: "id",
|
3411
|
+
tabDeleteEnabled: true,
|
3412
|
+
}
|
3413
|
+
},
|
3414
|
+
{
|
3415
|
+
type: "saleOrg-project-tag",
|
3416
|
+
targetType: "project-tag",
|
3417
|
+
icon: "uploadbox",
|
3418
|
+
commonFlag: !0,
|
3419
|
+
columnFlag: true,
|
3420
|
+
formItemFlag: !0,
|
3421
|
+
tableField: null,
|
3422
|
+
options: {
|
3423
|
+
...projectTagConfig,
|
3424
|
+
label: "机构",
|
3425
|
+
tagFormCode: "sale_org_dialog",
|
3426
|
+
tagLabelField: "name",
|
3427
|
+
tagUniqueField: "id",
|
3428
|
+
tagFormLabelField: "name",
|
3429
|
+
tagFormUniqueField: "id",
|
3430
|
+
tabDeleteEnabled: true,
|
3431
|
+
|
3432
|
+
}
|
3433
|
+
},
|
3434
|
+
|
3435
|
+
|
3316
3436
|
]
|
3317
3437
|
|
3318
3438
|
export const keyNamePrefixMap = {
|
@@ -881,7 +881,7 @@ modules = {
|
|
881
881
|
|
882
882
|
// let formRef = that.getFormRef();
|
883
883
|
// let dataTableConfig = formRef.$attrs.dataTableOption || {};
|
884
|
-
if(that.dataTableConfig.queryParam){
|
884
|
+
if (that.dataTableConfig.queryParam) {
|
885
885
|
Object.assign(queryParams, that.dataTableConfig.queryParam);
|
886
886
|
}
|
887
887
|
|
@@ -1394,14 +1394,6 @@ modules = {
|
|
1394
1394
|
let columnEditFields = null;
|
1395
1395
|
|
1396
1396
|
let type = this.columnFormatMap[formatS];
|
1397
|
-
/*if (type == 'date') {
|
1398
|
-
columnEditFields = ['type', 'format', 'valueFormat']
|
1399
|
-
} else if (type == 'select') {
|
1400
|
-
|
1401
|
-
}
|
1402
|
-
if (type == 'vabsearch') {
|
1403
|
-
columnEditFields = ['vabSearchField', 'formCode', 'formVersion', 'required', 'showFormField', 'onSearchConfirm', 'onSearchClear']
|
1404
|
-
}*/
|
1405
1397
|
|
1406
1398
|
if (type) {
|
1407
1399
|
columnSelectedWidget = this.$baseLodash.cloneDeep(
|
@@ -1512,7 +1504,7 @@ modules = {
|
|
1512
1504
|
if (!lineWidget) {
|
1513
1505
|
return "false";
|
1514
1506
|
}
|
1515
|
-
if (lineWidget
|
1507
|
+
if (this.isVabsearchFlagWidget(lineWidget)) {
|
1516
1508
|
let fieldName =
|
1517
1509
|
lineWidget.options.vabSearchName ||
|
1518
1510
|
this.getFieldKeyName(lineWidget);
|
@@ -1524,6 +1516,10 @@ modules = {
|
|
1524
1516
|
return "false";
|
1525
1517
|
}
|
1526
1518
|
},
|
1519
|
+
isVabsearchFlagWidget(widget) {
|
1520
|
+
let type = widget?.type;
|
1521
|
+
return type == "vabsearch" || type == "singerSearch" || type == "multiSearch";
|
1522
|
+
},
|
1527
1523
|
getColumnWidgetName(e) {
|
1528
1524
|
if (e && e.type) {
|
1529
1525
|
if (e.category == "container") {
|