resolver-egretimp-plus 0.1.87 → 0.1.88

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.
Files changed (4) hide show
  1. package/dist/h5/index.js +1 -1
  2. package/dist/web/index.js +1 -1
  3. package/package.json +1 -1
  4. package/src/utils/defaultVal.js +13 -9
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "resolver-egretimp-plus",
3
- "version": "0.1.87",
3
+ "version": "0.1.88",
4
4
  "description": "交付体验渲染",
5
5
  "main": "./dist/web/index.js",
6
6
  "module": "./dist/web/index.js",
package/src/utils/defaultVal.js CHANGED
@@ -13,26 +13,30 @@ export default function defaultVal(config) {
13
13
  let defaultVal = null
14
14
  try {
15
15
  if (typeof configDefaultVal === 'string') {
16
+ const trimValue = configDefaultVal.trim()
16
17
  let routeMatchs = null
17
- if ( typeof configDefaultVal === 'string' && (routeMatchs = configDefaultVal.match(/^_route:(.*)$/))) {
18
+ if (routeMatchs = trimValue.match(/^_route:(.*)$/)) {
18
19
  const queryKey = routeMatchs[1]
19
20
  const routeQuery = config?.route?.query
20
21
  defaultVal = routeQuery?.[queryKey]
21
- } else if ( typeof configDefaultVal === 'string' && (/^_lang$/.test(configDefaultVal))) {
22
+ } else if (routeMatchs = trimValue.match(/^_native:(.*)$/)) {
23
+ const val = routeMatchs[1]
24
+ defaultVal = val
25
+ } else if (/^_lang$/.test(trimValue)) {
22
26
  defaultVal = config?._lang
23
- } else if (/^{[\w\W]*}$/.test(configDefaultVal) || /^\[[\w\W]*\]$/.test(configDefaultVal)) {
24
- defaultVal = JSON.parse(configDefaultVal)
27
+ } else if (/^{[\w\W]*}$/.test(trimValue) || /^\[[\w\W]*\]$/.test(trimValue)) {
28
+ defaultVal = JSON.parse(trimValue)
25
29
  } else {
26
- if (configDefaultVal === ARG_FLAGS.CURRENT_DATE || configDefaultVal === 'currentDate' || configDefaultVal === ARG_FLAGS.CURRENT_DATE_TIME) {
27
- if (configDefaultVal === ARG_FLAGS.CURRENT_DATE_TIME) {
30
+ if (trimValue === ARG_FLAGS.CURRENT_DATE || trimValue === 'currentDate' || trimValue === ARG_FLAGS.CURRENT_DATE_TIME) {
31
+ if (trimValue === ARG_FLAGS.CURRENT_DATE_TIME) {
28
32
  defaultVal = formatDate(new Date(), 'yyyy-MM-dd hh:mm:ss')
29
33
  } else {
30
34
  defaultVal = formatDate(new Date(), 'yyyy-MM-dd')
31
35
  }
32
- } else if (['true', 'false'].includes(configDefaultVal)) {
33
- defaultVal = configDefaultVal == 'true' ? true : false
36
+ } else if (['true', 'false'].includes(trimValue)) {
37
+ defaultVal = trimValue == 'true' ? true : false
34
38
  } else {
35
- defaultVal = configDefaultVal
39
+ defaultVal = trimValue
36
40
  }
37
41
  }
38
42
  } else {