resolver-egretimp-plus 0.0.302 → 0.0.303
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/dist/const/index.js +1 -1
- package/dist/h5/index.js +2 -2
- package/dist/web/index.js +2 -2
- package/package.json +1 -1
- package/src/components/cmiFormItem/src/index.vue +1 -1
- package/src/components/helper/eventOrchestration.js +2 -2
- package/src/components/helper/resolver.js +1 -1
- package/src/components/packages-H5/CmiCheckbox.vue +1 -1
- package/src/components/packages-H5/CmiPicker.vue +3 -3
- package/src/components/packages-H5/CmiSelect.vue +2 -2
- package/src/components/packages-web/CustomComponentCollapse.vue +3 -3
- package/src/components/packages-web/CustomComponentRow.vue +1 -1
- package/src/components/packages-web/CustomComponentSelectEmployees.vue +1 -1
- package/src/components/packages-web/CustomComponentTable.jsx +2 -2
- package/src/components/packages-web/CustomComponentTabs.vue +1 -1
- package/src/components/packages-web/ElPagination.vue +3 -3
- package/src/utils/const.js +5 -5
- package/src/utils/render.jsx +3 -3
package/package.json
CHANGED
|
@@ -18,7 +18,7 @@ const props = defineProps({
|
|
|
18
18
|
})
|
|
19
19
|
const attrs = useAttrs()
|
|
20
20
|
const label = computed(() => {
|
|
21
|
-
if (props.config.labelHidden == '1' || props.config.labelWidth
|
|
21
|
+
if (props.config.labelHidden == '1' || props.config.labelWidth == 0 || props.config.labelWidth == '0') {
|
|
22
22
|
return ''
|
|
23
23
|
}
|
|
24
24
|
return (props.lang.indexOf('zh') > -1 ? props.config.metaNameZh : props.config.metaNameEn) || ''
|
|
@@ -37,7 +37,7 @@ function assignmentPathVal(obj = {}, path, val) {
|
|
|
37
37
|
|
|
38
38
|
export async function dispatchClickEvents ({serviceList = [], requestTraceId, axiosInstance, dialogReq, dynamicMapComp, rootValue, dynamicHireRelat, messageCb, compConfig, messageInstance, lang, beforeRequestService, afterRequestService}) {
|
|
39
39
|
const dynamicMapCompKeys = Object.keys(dynamicMapComp)
|
|
40
|
-
const mixinServiceConfig = serviceList.find(service => service.serviceType
|
|
40
|
+
const mixinServiceConfig = serviceList.find(service => service.serviceType == '1')
|
|
41
41
|
for (let i = 0; i < serviceList.length; i++) {
|
|
42
42
|
const service = serviceList[i]
|
|
43
43
|
dispatchClickEvent(service, {dynamicMapComp, requestTraceId, dialogReq, mixinServiceConfig, rootValue, dynamicMapCompKeys, dynamicHireRelat, axiosInstance, messageCb, compConfig, messageInstance, lang, beforeRequestService, afterRequestService})
|
|
@@ -668,7 +668,7 @@ export async function executeEventOrchestration({
|
|
|
668
668
|
appContext
|
|
669
669
|
} = {}) {
|
|
670
670
|
const PageServiceMapVOList = props.config.lcpPageServiceMapVOList || []
|
|
671
|
-
const mixinServiceConfig = PageServiceMapVOList.find(service => service.serviceType
|
|
671
|
+
const mixinServiceConfig = PageServiceMapVOList.find(service => service.serviceType == '1')
|
|
672
672
|
const lcpPageRuleVOLis = props.config?.lcpPageRuleVOList || []
|
|
673
673
|
if (lcpPageRuleVOLis?.length) {
|
|
674
674
|
// 数据校验服务
|
|
@@ -23,7 +23,7 @@ export async function executeLoadServices(services = [], {
|
|
|
23
23
|
}
|
|
24
24
|
delete noramlReqData.notLoad
|
|
25
25
|
const loadServices = services.filter(ser => ser.eventType == '1')
|
|
26
|
-
const mixinServiceConfig = services.find(service => service.serviceType
|
|
26
|
+
const mixinServiceConfig = services.find(service => service.serviceType == '1')
|
|
27
27
|
if (!loadServices || !loadServices.length) {
|
|
28
28
|
notLoadCb && notLoadCb()
|
|
29
29
|
return
|
|
@@ -71,7 +71,7 @@ const onSigleChange = ({ detail }) => {
|
|
|
71
71
|
{{lang.indexOf('zh') > -1 ? option.columnDesc_zh : option.columnDesc}}
|
|
72
72
|
</cmi-checkbox>
|
|
73
73
|
</cmi-checkbox-group>
|
|
74
|
-
<cmi-checkbox v-else v-bind="{...attrs, ...checkboxProps}" :checked="proxyValue
|
|
74
|
+
<cmi-checkbox v-else v-bind="{...attrs, ...checkboxProps}" :checked="proxyValue == '1'" :value="proxyValue" @change="onSigleChange">
|
|
75
75
|
{{ label }}
|
|
76
76
|
</cmi-checkbox>
|
|
77
77
|
</template>
|
|
@@ -41,9 +41,9 @@ const calcProps = computed(() => {
|
|
|
41
41
|
title: lang.value?.indexOf('zh') > -1 ? props.config?.metaNameZh : props.config?.metaNameEn,
|
|
42
42
|
canceltext: props?.config?.canceltext,
|
|
43
43
|
confirmtext: props?.config?.confirmtext,
|
|
44
|
-
bottomhidden: props?.config?.bottomhidden
|
|
45
|
-
forbidmaskclick: props?.config?.forbidmaskclick
|
|
46
|
-
fastpick: props?.config?.fastpick
|
|
44
|
+
bottomhidden: props?.config?.bottomhidden == '1',
|
|
45
|
+
forbidmaskclick: props?.config?.forbidmaskclick == '1',
|
|
46
|
+
fastpick: props?.config?.fastpick == '1',
|
|
47
47
|
}
|
|
48
48
|
return ret
|
|
49
49
|
})
|
|
@@ -12,10 +12,10 @@ const lang = inject('lang')
|
|
|
12
12
|
|
|
13
13
|
// 是否为多选
|
|
14
14
|
const isMutiple = computed(() => {
|
|
15
|
-
return props.multiple
|
|
15
|
+
return props.multiple == '1' || (typeof props.multiple === 'boolean' && props.multiple)
|
|
16
16
|
})
|
|
17
17
|
const showAll = computed(() => {
|
|
18
|
-
return props.showAll
|
|
18
|
+
return props.showAll == '1'
|
|
19
19
|
})
|
|
20
20
|
const value = computed({
|
|
21
21
|
get() {
|
|
@@ -99,16 +99,16 @@ const stopPropagation = (e) => {
|
|
|
99
99
|
}
|
|
100
100
|
|
|
101
101
|
const component = computed(() => {
|
|
102
|
-
return (props.config.needWrap === true || props.config.needWrap
|
|
102
|
+
return (props.config.needWrap === true || props.config.needWrap == '1') ? ElCard : 'div'
|
|
103
103
|
})
|
|
104
104
|
const componentProps = computed(() => {
|
|
105
|
-
return (props.config.needWrap === true || props.config.needWrap
|
|
105
|
+
return (props.config.needWrap === true || props.config.needWrap == '1') ? {
|
|
106
106
|
shadow: 'never'
|
|
107
107
|
} : {}
|
|
108
108
|
})
|
|
109
109
|
const activeNames = computed({
|
|
110
110
|
get() {
|
|
111
|
-
return props.config.defaultOpenFlag
|
|
111
|
+
return props.config.defaultOpenFlag == '1' ? [props.config.metaCode] : []
|
|
112
112
|
},
|
|
113
113
|
set(val) {
|
|
114
114
|
props.config.defaultOpenFlag = val.length > 0 ? '1' : '0'
|
|
@@ -35,7 +35,7 @@ const pmPageMetaList = computed(() => {
|
|
|
35
35
|
})
|
|
36
36
|
|
|
37
37
|
const allHidden = computed(() => {
|
|
38
|
-
return !pmPageMetaList.value?.find(config => !((typeof config.hidden === 'boolean' && config.hidden) || config.hidden
|
|
38
|
+
return !pmPageMetaList.value?.find(config => !((typeof config.hidden === 'boolean' && config.hidden) || config.hidden == '1'))
|
|
39
39
|
})
|
|
40
40
|
// 保留内部formItem的margin-right
|
|
41
41
|
const reserveRightMargin = computed(() => {
|
|
@@ -83,7 +83,7 @@ const initSelEmployee = async () => {
|
|
|
83
83
|
// cascade: true
|
|
84
84
|
},
|
|
85
85
|
lang: lang.value,
|
|
86
|
-
multiple: typeof props.multiple === 'boolean' ? props.multiple : props.multiple
|
|
86
|
+
multiple: typeof props.multiple === 'boolean' ? props.multiple : props.multiple == '1',
|
|
87
87
|
placeholder: lang?.value?.indexOf('zh') > -1 ? props.placeholder : props.placeholderEn,
|
|
88
88
|
// disabled: props.disabled,
|
|
89
89
|
onSelectedChange: (data, arr) => {
|
|
@@ -383,7 +383,7 @@ export default {
|
|
|
383
383
|
|
|
384
384
|
// 是否配置分页功能 ====== start======
|
|
385
385
|
const pageable = computed(() => {
|
|
386
|
-
return props.config?.pageable
|
|
386
|
+
return props.config?.pageable == '1'
|
|
387
387
|
})
|
|
388
388
|
const pageAlign = computed(() => {
|
|
389
389
|
return props.config?.pageAlign
|
|
@@ -501,7 +501,7 @@ export default {
|
|
|
501
501
|
{{
|
|
502
502
|
header: () => (
|
|
503
503
|
<span className='head-span' title={lang.value.indexOf('zh') > -1 ? columnConfg.metaNameZh : columnConfg.metaNameEn}>
|
|
504
|
-
{ columnConfg.requiredFlag
|
|
504
|
+
{ columnConfg.requiredFlag == '1' ? <span style="color: rgb(245, 34, 45); margin-right: 3px;">*</span> : '' }
|
|
505
505
|
{ columnConfg.headerRender ? columnConfg.headerRender(h, { props, config: columnConfg, lang, rootValue, selects })
|
|
506
506
|
: (lang.value.indexOf('zh') > -1 ? columnConfg.metaNameZh : columnConfg.metaNameEn)
|
|
507
507
|
}
|
|
@@ -35,7 +35,7 @@ const tabpanes = computed(() => {
|
|
|
35
35
|
})
|
|
36
36
|
const activeNames = computed({
|
|
37
37
|
get() {
|
|
38
|
-
const currentTab = tabpanes.value.find(tab => tab.defaultShowFlag
|
|
38
|
+
const currentTab = tabpanes.value.find(tab => tab.defaultShowFlag == '1')
|
|
39
39
|
const currentCycleTab = tabpanes.value.find(tab => tab.currentCode)
|
|
40
40
|
return (currentTab && currentTab.metaCode)
|
|
41
41
|
|| (currentCycleTab && currentCycleTab.currentCode)
|
|
@@ -19,9 +19,9 @@ const calcProps = computed(() => {
|
|
|
19
19
|
if (!ret.layout || typeof ret.layout !== 'string') {
|
|
20
20
|
ret.layout = 'total'
|
|
21
21
|
}
|
|
22
|
-
if (props.config?.showSizer
|
|
22
|
+
if (props.config?.showSizer == '1' || props.config?.showJumper == '1') {
|
|
23
23
|
const layoutArr = ret.layout ? ret.layout.split(',') : []
|
|
24
|
-
if (props.config?.showSizer
|
|
24
|
+
if (props.config?.showSizer == '1') {
|
|
25
25
|
if (!layoutArr.some(item => item.trim() === 'sizes')) {
|
|
26
26
|
layoutArr.splice(1, 0, 'sizes')
|
|
27
27
|
}
|
|
@@ -35,7 +35,7 @@ const calcProps = computed(() => {
|
|
|
35
35
|
if (!layoutArr.some(item => item.trim() === 'next')) {
|
|
36
36
|
layoutArr.splice(4, 0, 'next')
|
|
37
37
|
}
|
|
38
|
-
if (props.config?.showJumper
|
|
38
|
+
if (props.config?.showJumper == '1') {
|
|
39
39
|
if (!layoutArr.some(item => item.trim() === 'jumper')) {
|
|
40
40
|
layoutArr.push('jumper')
|
|
41
41
|
}
|
package/src/utils/const.js
CHANGED
|
@@ -93,7 +93,7 @@ export const commonPropsType = {
|
|
|
93
93
|
type: Boolean,
|
|
94
94
|
default: false,
|
|
95
95
|
getValue(config, props, modelValue) {
|
|
96
|
-
return config.clearableFlag
|
|
96
|
+
return config.clearableFlag == '1'
|
|
97
97
|
}
|
|
98
98
|
},
|
|
99
99
|
// 组件是否必填
|
|
@@ -101,7 +101,7 @@ export const commonPropsType = {
|
|
|
101
101
|
type: Boolean,
|
|
102
102
|
default: false,
|
|
103
103
|
getValue(config, props, modelValue) {
|
|
104
|
-
return config.requiredFlag
|
|
104
|
+
return config.requiredFlag == '1'
|
|
105
105
|
}
|
|
106
106
|
},
|
|
107
107
|
// 组件是否展示必填标识
|
|
@@ -175,15 +175,15 @@ export function calcDisable(config, mode) {
|
|
|
175
175
|
mode === MODE.LOG ?
|
|
176
176
|
(
|
|
177
177
|
config.logAlong || isPatchComponent([FORM_META_TYPE, ...NOT_LOG_EFFECT_TYPE], config) ?
|
|
178
|
-
config.editFlag
|
|
178
|
+
config.editFlag == '0' :
|
|
179
179
|
true
|
|
180
180
|
) :
|
|
181
181
|
mode === MODE.DETAIL ?
|
|
182
182
|
(config.detailAlong || isPatchComponent([FORM_META_TYPE, ...NOT_LOG_EFFECT_TYPE], config) ?
|
|
183
|
-
config.editFlag
|
|
183
|
+
config.editFlag == '0' :
|
|
184
184
|
true
|
|
185
185
|
) :
|
|
186
|
-
config.editFlag
|
|
186
|
+
config.editFlag == '0'
|
|
187
187
|
return flag
|
|
188
188
|
}
|
|
189
189
|
|
package/src/utils/render.jsx
CHANGED
|
@@ -332,7 +332,7 @@ export function normalConfig({
|
|
|
332
332
|
|
|
333
333
|
// 从按钮的服务编排中,获取到按钮中配置的表格中的config,并且绑定表格的分页
|
|
334
334
|
function getTableServices(lcpPageServiceMapVOList = [], { dynamicMapComp, dynamicMapCompKeys, dynamicHireRelat }) {
|
|
335
|
-
const mixinServiceConfig = lcpPageServiceMapVOList.find(service => service.serviceType
|
|
335
|
+
const mixinServiceConfig = lcpPageServiceMapVOList.find(service => service.serviceType == '1')
|
|
336
336
|
const searchServices = lcpPageServiceMapVOList.filter(service => service.transactionType == '1')
|
|
337
337
|
if (searchServices.length) {
|
|
338
338
|
return searchServices.map(service => {
|
|
@@ -795,7 +795,7 @@ function getFormItemExtendProps(config, lang, params, compProps) {
|
|
|
795
795
|
}
|
|
796
796
|
|
|
797
797
|
function getFormItemRule(config, lang, params, compProps) {
|
|
798
|
-
const required = config.requiredFlag
|
|
798
|
+
const required = config.requiredFlag == '1'
|
|
799
799
|
const onlyRequiredFlag = config.onlyRequiredFlag
|
|
800
800
|
let trigger = ['blur', 'change']
|
|
801
801
|
// 如果是input框并且开启了金额显示
|
|
@@ -959,7 +959,7 @@ function normalLabelTipContent(content = '') {
|
|
|
959
959
|
function createFormLable(config, lang = 'zh') {
|
|
960
960
|
const ElTooltip = resolveComponent('el-tooltip')
|
|
961
961
|
const elIcon = resolveComponent('el-icon')
|
|
962
|
-
const required = config.requiredFlag
|
|
962
|
+
const required = config.requiredFlag == '1' && config.hiddenRequiredFlag != '1'
|
|
963
963
|
const slots = {}
|
|
964
964
|
slots.default = () => {
|
|
965
965
|
return <span class="label-tip"><elIcon size="17">
|