@mpxjs/core 2.10.17-beta.2 → 2.10.17-beta.4
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/package.json
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { isObject, isArray, dash2hump, cached, isEmptyObject, hasOwn, getFocusedNavigation
|
|
1
|
+
import { isObject, isArray, dash2hump, cached, isEmptyObject, hasOwn, getFocusedNavigation } from '@mpxjs/utils'
|
|
2
2
|
import { StyleSheet, Dimensions } from 'react-native'
|
|
3
3
|
import { reactive } from '../../observer/reactive'
|
|
4
4
|
import Mpx from '../../index'
|
|
@@ -12,7 +12,7 @@ global.__mpxPageSizeCountMap = reactive({})
|
|
|
12
12
|
|
|
13
13
|
global.__GCC = function (className, classMap, classMapValueCache) {
|
|
14
14
|
if (!classMapValueCache.has(className)) {
|
|
15
|
-
const styleObj = classMap[className]?.()
|
|
15
|
+
const styleObj = classMap[className]?.(global.__formatValue)
|
|
16
16
|
styleObj && classMapValueCache.set(className, styleObj)
|
|
17
17
|
}
|
|
18
18
|
return classMapValueCache.get(className)
|
|
@@ -271,13 +271,13 @@ export default function styleHelperMixin () {
|
|
|
271
271
|
if (localStyle._media?.length) {
|
|
272
272
|
mergeResult(localStyle._default, getMediaStyle(localStyle._media))
|
|
273
273
|
} else {
|
|
274
|
-
mergeResult(localStyle
|
|
274
|
+
mergeResult(localStyle)
|
|
275
275
|
}
|
|
276
|
-
} else if (appStyle =
|
|
276
|
+
} else if (appStyle = global.__getAppClassStyle?.(className)) {
|
|
277
277
|
if (appStyle._media?.length) {
|
|
278
278
|
mergeResult(appStyle._default, getMediaStyle(appStyle._media))
|
|
279
279
|
} else {
|
|
280
|
-
mergeResult(appStyle
|
|
280
|
+
mergeResult(appStyle)
|
|
281
281
|
}
|
|
282
282
|
} else if (isObject(this.__props[className])) {
|
|
283
283
|
// externalClasses必定以对象形式传递下来
|