feat: unocss order

didi · Jan 3, 2025 · 668ff9c · 668ff9c
1 parent 3fc9efa
commit 668ff9c
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/packages/core/src/platform/builtInMixins/styleHelperMixin.ios.js b/packages/core/src/platform/builtInMixins/styleHelperMixin.ios.js
@@ -143,7 +143,11 @@ export default function styleHelperMixin () {
         const classMap = this.__getClassMap?.() || {}
         const unoClassMap = global.__getUnoClassMap?.() || {}
         const appClassMap = global.__getAppClassMap?.() || {}
-
+        const unocssKeyIndexMap = Object.getOwnPropertyNames(unoClassMap).reduce((map, key, index) => {
+          map[key] = index
+          return map
+        }, {})
+        const unoClassList = []
         if (staticClass || dynamicClass) {
           const classString = concat(staticClass, stringifyDynamicClass(dynamicClass))
           classString.split(/\s+/).forEach((className) => {
@@ -153,14 +157,19 @@ export default function styleHelperMixin () {
               // todo 全局样式在每个页面和组件中生效，以支持全局原子类，后续支持样式模块复用后可考虑移除
               Object.assign(result, appClassMap[className])
             } else if (unoClassMap[className]) {
-              Object.assign(result, unoClassMap[className])
+              unoClassList[unocssKeyIndexMap[className]] = unoClassMap[className]
+              // Object.assign(result, unoClassMap[className])
             } else if (isObject(this.__props[className])) {
               // externalClasses必定以对象形式传递下来
               Object.assign(result, this.__props[className])
             }
           })
         }
 
+        unoClassList.forEach(v => {
+          Object.assign(result, v)
+        })
+
         if (staticStyle || dynamicStyle) {
           const styleObj = Object.assign({}, parseStyleText(staticStyle), normalizeDynamicStyle(dynamicStyle))
           Object.assign(result, transformStyleObj(styleObj))