resolver-egretimp-plus 0.0.207 → 0.0.209
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/h5/index.js +1 -1
- package/dist/web/index.js +1 -1
- package/package.json +1 -1
- package/src/components/helper/resolver.js +2 -2
- package/src/index.jsx +2 -1
- package/src/utils/render.jsx +13 -3
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { resultToast } from "../../utils/respone"
|
|
2
2
|
|
|
3
|
-
export async function executeLoadServices(services = [], { requestTraceId, businessIdentityReqData = {}, axiosInstance, messageInstance, reqData, respCb, notLoadCb }) {
|
|
4
|
-
if (reqData?.notLoad) {
|
|
3
|
+
export async function executeLoadServices(services = [], { alongLoad, requestTraceId, businessIdentityReqData = {}, axiosInstance, messageInstance, reqData, respCb, notLoadCb }) {
|
|
4
|
+
if (!alongLoad && reqData?.notLoad) {
|
|
5
5
|
notLoadCb && notLoadCb()
|
|
6
6
|
return
|
|
7
7
|
}
|
package/src/index.jsx
CHANGED
|
@@ -169,12 +169,13 @@ export default {
|
|
|
169
169
|
return props.dataLoad || nativeDataLoad.value
|
|
170
170
|
})
|
|
171
171
|
const { initPageConfig, pageConfigRef, mapCompRef, hireRelatMapRulesRef } = usePageConfig()
|
|
172
|
-
function toExecuteLoadServices(clearFlag) {
|
|
172
|
+
function toExecuteLoadServices(clearFlag, alongLoad) {
|
|
173
173
|
// 触发加载事件执行
|
|
174
174
|
nativeDataLoad.value = false
|
|
175
175
|
executeLoadServices(
|
|
176
176
|
props.config?.pmPageServiceMapVOList || props.config?.lcpPageServiceMapVOList || [],
|
|
177
177
|
{
|
|
178
|
+
alongLoad,
|
|
178
179
|
requestTraceId: props.requestTraceId,
|
|
179
180
|
messageInstance: toRef(props, 'messageInstance'),
|
|
180
181
|
businessIdentityReqData: props.businessIdentityReqData,
|
package/src/utils/render.jsx
CHANGED
|
@@ -765,7 +765,7 @@ function getFormItemRule(config, lang, params) {
|
|
|
765
765
|
callback()
|
|
766
766
|
return
|
|
767
767
|
}
|
|
768
|
-
if (
|
|
768
|
+
if (isChainHidden({ config })) {
|
|
769
769
|
callback()
|
|
770
770
|
return
|
|
771
771
|
}
|
|
@@ -815,7 +815,7 @@ function getFormItemRule(config, lang, params) {
|
|
|
815
815
|
callback()
|
|
816
816
|
return
|
|
817
817
|
}
|
|
818
|
-
if (
|
|
818
|
+
if (isChainHidden({ config })) {
|
|
819
819
|
callback()
|
|
820
820
|
return
|
|
821
821
|
}
|
|
@@ -852,7 +852,7 @@ function getFormItemRule(config, lang, params) {
|
|
|
852
852
|
callback()
|
|
853
853
|
return
|
|
854
854
|
}
|
|
855
|
-
if (
|
|
855
|
+
if (isChainHidden({ config })) {
|
|
856
856
|
callback()
|
|
857
857
|
return
|
|
858
858
|
}
|
|
@@ -973,6 +973,16 @@ function isTransCellMobile(config, disabled) {
|
|
|
973
973
|
function isHidden({config}) {
|
|
974
974
|
return (typeof config.hidden === 'boolean' && config.hidden) || config.hidden === '1'
|
|
975
975
|
}
|
|
976
|
+
// 如果父级有一个是hidden了,那就表示hidden了
|
|
977
|
+
function isChainHidden({config}) {
|
|
978
|
+
if (isHidden({config})) {
|
|
979
|
+
return true
|
|
980
|
+
}
|
|
981
|
+
if (config?.parent) {
|
|
982
|
+
return isChainHidden({config: config.parent})
|
|
983
|
+
}
|
|
984
|
+
return false
|
|
985
|
+
}
|
|
976
986
|
|
|
977
987
|
function generateVuePath(path) {
|
|
978
988
|
class LoadModulePath extends String {
|