@flyanra/vue-core 1.0.2 → 1.2.1
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/types/components/navigation/menu/fly-sidebar/FlySidebar.types.d.ts +14 -1
- package/dist/types/components/navigation/menu/fly-sidebar/FlySidebar.vue.d.ts +10 -4
- package/dist/types/composables/UseLocaleInjector.d.ts +7 -1
- package/dist/types/composables/index.d.ts +3 -1
- package/dist/types/composables/useSidebarActiveIndex.d.ts +66 -0
- package/package.json +3 -1
- package/src/components/basic/fly-button/FlyButton.types.ts +28 -28
- package/src/components/basic/fly-button/FlyButton.vue +178 -178
- package/src/components/basic/typography/FlyCollapseTitleRenderer.vue +46 -46
- package/src/components/feedback/tooltip/FlyInfoTooltip.vue +49 -49
- package/src/components/feedback/tooltip/FlyTooltip.element.scss +4 -4
- package/src/components/feedback/tooltip/FlyTooltip.vue +60 -60
- package/src/components/form/form.utils.ts +72 -72
- package/src/components/form/index.ts +6 -6
- package/src/components/form/input-renderers/boolean/FlyBoolean.vue +48 -48
- package/src/components/form/input-renderers/form-item-renderer/FlyFormItemRenderer.vue +48 -48
- package/src/components/form/input-renderers/form-item-renderer/index.ts +4 -4
- package/src/components/form/input-renderers/form-schema-renderer/FlyFormSchemaRenderer.types.ts +3 -3
- package/src/components/form/input-renderers/form-schema-renderer/FlyFormSchemaRenderer.utils.ts +221 -221
- package/src/components/form/input-renderers/form-schema-renderer/FlyFormSchemaRenderer.vue +75 -75
- package/src/components/form/input-renderers/form-schema-renderer/UseFormSchemaRenderer.ts +97 -97
- package/src/components/form/input-renderers/input-renderer/FlyInputRenderer.vue +49 -49
- package/src/components/form/input-renderers/input-renderer/index.ts +4 -4
- package/src/components/form/input-renderers/input-renderer.utils.ts +18 -18
- package/src/components/form/input-renderers/number/FlyNumber.vue +64 -64
- package/src/components/form/input-renderers/regional-tenant-form-renderer/FlyRegionalTenantFormRenderer.types.ts +15 -15
- package/src/components/form/input-renderers/regional-tenant-form-renderer/FlyRegionalTenantFormRenderer.vue +99 -99
- package/src/components/form/input-renderers/select/FlySelect.scss +1 -1
- package/src/components/form/input-renderers/select/FlySelect.utils.ts +37 -37
- package/src/components/form/input-renderers/text/FlyText.vue +70 -70
- package/src/components/form/input-renderers/value-unit/FlyValueUnit.vue +102 -102
- package/src/components/form/input-validators.ts +99 -99
- package/src/components/general/fly-icon-v2/FlyIconV2.types.ts +6 -6
- package/src/components/general/fly-icon-v2/FlyIconV2.vue +17 -17
- package/src/components/general/fly-icon-v2/index.ts +6 -6
- package/src/components/general/index.ts +5 -5
- package/src/components/index.ts +7 -7
- package/src/components/navigation/menu/fly-mini-sidebar/FlyMiniSidebar.types.ts +8 -8
- package/src/components/navigation/menu/fly-mini-sidebar/FlyMiniSidebarItem.vue +55 -55
- package/src/components/navigation/menu/fly-sidebar/FlySidebar.types.ts +49 -36
- package/src/components/navigation/menu/fly-sidebar/FlySidebar.vue +146 -151
- package/src/components/navigation/menu/fly-sidebar/FlySidebarNode.vue +47 -47
- package/src/composables/UseLocaleInjector.ts +37 -18
- package/src/composables/index.ts +4 -1
- package/src/composables/useSidebarActiveIndex.ts +103 -0
- package/src/styles/_scss-tokens.scss +71 -71
- package/src/styles/element/mixins/collapse.scss +61 -61
- package/src/styles/element/overrides/form.scss +121 -121
- package/src/styles/element/overrides/message-box.scss +2 -2
- package/src/styles/element/overrides/radio.scss +2 -2
- package/src/styles/element/overrides/select.scss +9 -9
- package/src/styles/index.scss +1 -1
- package/src/styles/tokens.scss +1 -0
- package/src/utils/index.ts +2 -2
- package/src/utils/pure-functions.ts +15 -15
- package/src/utils/validators.ts +81 -81
package/src/utils/validators.ts
CHANGED
|
@@ -1,81 +1,81 @@
|
|
|
1
|
-
import type { FormItemRule } from 'element-plus'
|
|
2
|
-
|
|
3
|
-
import { UseLocaleInjector } from '../composables/UseLocaleInjector'
|
|
4
|
-
|
|
5
|
-
import { checkRange } from './pure-functions'
|
|
6
|
-
|
|
7
|
-
export const isRequiredError = (languageKey: string) => {
|
|
8
|
-
const { t } = UseLocaleInjector()
|
|
9
|
-
|
|
10
|
-
return t('validation.fieldIsRequired', {
|
|
11
|
-
fieldName: t(languageKey)
|
|
12
|
-
})
|
|
13
|
-
}
|
|
14
|
-
|
|
15
|
-
type RangeObject = {
|
|
16
|
-
min?: number
|
|
17
|
-
max?: number
|
|
18
|
-
}
|
|
19
|
-
export const checkInputRange = (
|
|
20
|
-
languageKey: string = 'validation.value',
|
|
21
|
-
range: RangeObject,
|
|
22
|
-
valueTypeLanguageKey: string = 'validation.valueTypes.characters',
|
|
23
|
-
errorMessage?: string
|
|
24
|
-
): FormItemRule['validator'] => {
|
|
25
|
-
const { t } = UseLocaleInjector()
|
|
26
|
-
|
|
27
|
-
// used in element form validator
|
|
28
|
-
return (_rule: unknown, value: unknown, callback: (_?: string | Error | undefined) => void) => {
|
|
29
|
-
// used in element form validator
|
|
30
|
-
if (!checkRange(value, range.min, range.max)) {
|
|
31
|
-
let message = errorMessage
|
|
32
|
-
const l = t ? t(languageKey) : languageKey
|
|
33
|
-
|
|
34
|
-
if (!message) {
|
|
35
|
-
if (range.min === range.max) {
|
|
36
|
-
message = `${
|
|
37
|
-
t
|
|
38
|
-
? t('validation.valueMustBe', {
|
|
39
|
-
value: l,
|
|
40
|
-
validValue: `${range.max} ${t(valueTypeLanguageKey)}`
|
|
41
|
-
})
|
|
42
|
-
: 'validation.valueMustBe'
|
|
43
|
-
}`
|
|
44
|
-
} else if (range.min && !range.max) {
|
|
45
|
-
message = `${
|
|
46
|
-
t
|
|
47
|
-
? t('validation.mustBeGreaterEqual', {
|
|
48
|
-
value: l,
|
|
49
|
-
validRange: `${range.min} ${t(valueTypeLanguageKey)}`
|
|
50
|
-
})
|
|
51
|
-
: 'validation.mustBeGreaterEqual'
|
|
52
|
-
}`
|
|
53
|
-
} else if (!range.min && range.max) {
|
|
54
|
-
message = `${
|
|
55
|
-
t
|
|
56
|
-
? t('validation.cannotExceed', {
|
|
57
|
-
value: l,
|
|
58
|
-
validRange: `${range.max} ${t(valueTypeLanguageKey)}`
|
|
59
|
-
})
|
|
60
|
-
: 'validation.cannotExceed'
|
|
61
|
-
}`
|
|
62
|
-
} else if (range.min && range.max) {
|
|
63
|
-
message = `${
|
|
64
|
-
t
|
|
65
|
-
? t('validation.mustBetween', {
|
|
66
|
-
value: l,
|
|
67
|
-
minRange: `${range.min} ${t(valueTypeLanguageKey)}`,
|
|
68
|
-
maxRange: `${range.max} ${t(valueTypeLanguageKey)}`,
|
|
69
|
-
valueType: `${t(valueTypeLanguageKey)}`
|
|
70
|
-
})
|
|
71
|
-
: 'validation.mustBetween'
|
|
72
|
-
}`
|
|
73
|
-
}
|
|
74
|
-
}
|
|
75
|
-
|
|
76
|
-
return callback(new Error(message))
|
|
77
|
-
}
|
|
78
|
-
|
|
79
|
-
return callback()
|
|
80
|
-
}
|
|
81
|
-
}
|
|
1
|
+
import type { FormItemRule } from 'element-plus'
|
|
2
|
+
|
|
3
|
+
import { UseLocaleInjector } from '../composables/UseLocaleInjector'
|
|
4
|
+
|
|
5
|
+
import { checkRange } from './pure-functions'
|
|
6
|
+
|
|
7
|
+
export const isRequiredError = (languageKey: string) => {
|
|
8
|
+
const { t } = UseLocaleInjector()
|
|
9
|
+
|
|
10
|
+
return t('validation.fieldIsRequired', {
|
|
11
|
+
fieldName: t(languageKey)
|
|
12
|
+
})
|
|
13
|
+
}
|
|
14
|
+
|
|
15
|
+
type RangeObject = {
|
|
16
|
+
min?: number
|
|
17
|
+
max?: number
|
|
18
|
+
}
|
|
19
|
+
export const checkInputRange = (
|
|
20
|
+
languageKey: string = 'validation.value',
|
|
21
|
+
range: RangeObject,
|
|
22
|
+
valueTypeLanguageKey: string = 'validation.valueTypes.characters',
|
|
23
|
+
errorMessage?: string
|
|
24
|
+
): FormItemRule['validator'] => {
|
|
25
|
+
const { t } = UseLocaleInjector()
|
|
26
|
+
|
|
27
|
+
// used in element form validator
|
|
28
|
+
return (_rule: unknown, value: unknown, callback: (_?: string | Error | undefined) => void) => {
|
|
29
|
+
// used in element form validator
|
|
30
|
+
if (!checkRange(value, range.min, range.max)) {
|
|
31
|
+
let message = errorMessage
|
|
32
|
+
const l = t ? t(languageKey) : languageKey
|
|
33
|
+
|
|
34
|
+
if (!message) {
|
|
35
|
+
if (range.min === range.max) {
|
|
36
|
+
message = `${
|
|
37
|
+
t
|
|
38
|
+
? t('validation.valueMustBe', {
|
|
39
|
+
value: l,
|
|
40
|
+
validValue: `${range.max} ${t(valueTypeLanguageKey)}`
|
|
41
|
+
})
|
|
42
|
+
: 'validation.valueMustBe'
|
|
43
|
+
}`
|
|
44
|
+
} else if (range.min && !range.max) {
|
|
45
|
+
message = `${
|
|
46
|
+
t
|
|
47
|
+
? t('validation.mustBeGreaterEqual', {
|
|
48
|
+
value: l,
|
|
49
|
+
validRange: `${range.min} ${t(valueTypeLanguageKey)}`
|
|
50
|
+
})
|
|
51
|
+
: 'validation.mustBeGreaterEqual'
|
|
52
|
+
}`
|
|
53
|
+
} else if (!range.min && range.max) {
|
|
54
|
+
message = `${
|
|
55
|
+
t
|
|
56
|
+
? t('validation.cannotExceed', {
|
|
57
|
+
value: l,
|
|
58
|
+
validRange: `${range.max} ${t(valueTypeLanguageKey)}`
|
|
59
|
+
})
|
|
60
|
+
: 'validation.cannotExceed'
|
|
61
|
+
}`
|
|
62
|
+
} else if (range.min && range.max) {
|
|
63
|
+
message = `${
|
|
64
|
+
t
|
|
65
|
+
? t('validation.mustBetween', {
|
|
66
|
+
value: l,
|
|
67
|
+
minRange: `${range.min} ${t(valueTypeLanguageKey)}`,
|
|
68
|
+
maxRange: `${range.max} ${t(valueTypeLanguageKey)}`,
|
|
69
|
+
valueType: `${t(valueTypeLanguageKey)}`
|
|
70
|
+
})
|
|
71
|
+
: 'validation.mustBetween'
|
|
72
|
+
}`
|
|
73
|
+
}
|
|
74
|
+
}
|
|
75
|
+
|
|
76
|
+
return callback(new Error(message))
|
|
77
|
+
}
|
|
78
|
+
|
|
79
|
+
return callback()
|
|
80
|
+
}
|
|
81
|
+
}
|