dynamic-modal 1.0.8 → 1.0.9
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.
|
@@ -50,13 +50,14 @@ const useFieldRender = (props) => {
|
|
|
50
50
|
var _b;
|
|
51
51
|
const key = name !== null && name !== void 0 ? name : '';
|
|
52
52
|
const targetField = formData[key];
|
|
53
|
-
|
|
53
|
+
const fieldValidValue = targetField !== undefined && targetField !== null && targetField !== '';
|
|
54
|
+
if (renderCondition && renderConditionList.includes(key) && fieldValidValue) {
|
|
54
55
|
const renderStatus = props.element.renderIf[key].includes(targetField) || props.element.renderIf[key].includes('*');
|
|
55
56
|
if (render !== renderStatus)
|
|
56
57
|
setRender(renderStatus);
|
|
57
58
|
}
|
|
58
|
-
else if (enableCondition && enableConditionList.includes(key)) {
|
|
59
|
-
const enableStatus = props.element.enableIf[key].includes(targetField) || props.element.enableIf[key].includes('
|
|
59
|
+
else if (enableCondition && enableConditionList.includes(key) && fieldValidValue) {
|
|
60
|
+
const enableStatus = props.element.enableIf[key].includes(targetField) || props.element.enableIf[key].includes('');
|
|
60
61
|
if (enable !== enableStatus)
|
|
61
62
|
setEnable(enableStatus);
|
|
62
63
|
}
|
package/package.json
CHANGED
|
@@ -1,11 +1,12 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "dynamic-modal",
|
|
3
|
-
"version": "1.0.
|
|
3
|
+
"version": "1.0.9",
|
|
4
4
|
"description": "The dynamic-modal is a solution of creation differents modals into project using a json configuration file",
|
|
5
5
|
"main": "index.js",
|
|
6
6
|
"scripts": {
|
|
7
7
|
"build": "tsc",
|
|
8
8
|
"lint": "eslint .",
|
|
9
|
+
"publish": "npm publish --access public",
|
|
9
10
|
"test": "echo \"Error: no test specified\" && exit 1"
|
|
10
11
|
},
|
|
11
12
|
"repository": {
|
|
@@ -73,12 +73,13 @@ export const useFieldRender = (props: IFieldRenderProps): IFieldRender => {
|
|
|
73
73
|
async (formData: IFormData, { name }: IWatchEvent) => {
|
|
74
74
|
const key: string = name ?? ''
|
|
75
75
|
const targetField = formData[key] as string | number
|
|
76
|
+
const fieldValidValue: boolean = targetField !== undefined && targetField !== null && targetField !== ''
|
|
76
77
|
|
|
77
|
-
if (renderCondition && renderConditionList.includes(key)) {
|
|
78
|
+
if (renderCondition && renderConditionList.includes(key) && fieldValidValue) {
|
|
78
79
|
const renderStatus: boolean = (props.element.renderIf as IModalRenderCondition)[key].includes(targetField) || (props.element.renderIf as IModalRenderCondition)[key].includes('*')
|
|
79
80
|
if (render !== renderStatus) setRender(renderStatus)
|
|
80
|
-
} else if (enableCondition && enableConditionList.includes(key)) {
|
|
81
|
-
const enableStatus: boolean = (props.element.enableIf as IModalRenderCondition)[key].includes(targetField) || (props.element.enableIf as IModalRenderCondition)[key].includes('
|
|
81
|
+
} else if (enableCondition && enableConditionList.includes(key) && fieldValidValue) {
|
|
82
|
+
const enableStatus: boolean = (props.element.enableIf as IModalRenderCondition)[key].includes(targetField) || (props.element.enableIf as IModalRenderCondition)[key].includes('')
|
|
82
83
|
if (enable !== enableStatus) setEnable(enableStatus)
|
|
83
84
|
}
|
|
84
85
|
|