修复自定义数值原子类与色值原子类生成问题

Author: wujr5

loader.js

@@ -112,36 +112,24 @@ module.exports = function(sSource) {
 
   // 开始生成原子类
   aClassName.forEach(item => {
-    let sKey;
-
-    let bColorFlag = oClassNameMap[item.split('-')[0]] && oClassNameMap[item.split('-')[0]].indexOf('#') != -1;
+    let bColorFlag = oClassNameMap[item.split('-')[0]] && oClassNameMap[item.split('-')[0]].indexOf('$') == -1 && oClassNameMap[item.split('-')[0]].indexOf('#') != -1;
 
     // 色值类
     if (bColorFlag) {
-      sKey = item.match(/\.\w+/)[0];
+      let sKey = item.match(/\.\w+/)[0];
+      let nValue = '#' + item.split('-')[1];
+      aStyleStr.push(`${item}{${oClassNameMap[sKey].replace(/\#/g, nValue)}}`);
     }
     // 数值类
     else if (/\d+/.test(item)) {
-      sKey = item.match(/\.\w+/)[0];
+      let sKey = item.match(/\.\w+/)[0];
+      let nValue = +item.match(/\d+/)[0];
+      aStyleStr.push(`${item}{${oClassNameMap[sKey].replace(/\$/g, nValue)}}`);
     // 通用类
     } else {
-      sKey = item;
-    }
-
-    let nValue;
-
-    // 百分比数值，字重，无需使用单位
-    if (['.wp', '.hp', '.fw'].includes(sKey)) {
-      nValue = item.match(/\d+/)[0];
-    } else {
-      if (bColorFlag) {
-        nValue = '#' + item.split('-')[1]
-      } else {
-        /\d+/.test(item) && (nValue = +item.match(/\d+/)[0]);
-      }
+      let sKey = item;
+      aStyleStr.push(`${item}{${oClassNameMap[sKey]}}`);
     }
-
-    aStyleStr.push(`${item}{${oClassNameMap[sKey].replace(/\$|\#/g, nValue)}}`);
   });
 
   return `'' + '${aStyleStr.join('')}'`;

package.json

@@ -1,6 +1,6 @@
 {
   "name": "miniprogram-atomcss-plugin",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "homepage": "https://github.com/wujr5/miniprogram-atomcss-plugin",
   "repository": {
     "type": "git",

test/atomcss.wxss

@@ -1 +1 @@
-.h-90{height:90rpx}.lh-90{line-height:90rpx}.h-30{height:30rpx}.lh-30{line-height:30rpx}.w-30{width:30rpx}.bgc-00ff00{background-color: #00ff00}.backcolor-00ff00{background-color: #00ff00}.c-ff00ff{color: #ff00ff}.c-123a6d{color: #123a6d}
+.h-90{height:90rpx}.lh-90{line-height:90rpx}.bgc-00ff00{background-color: #00ff00}.backcolor-00ff00{background-color: #00ff00}.c-ff00ff{color: #ff00ff}.c-123a6d{color: #123a6d}.bgred{background: red}

test/pages/test/test.wxml

@@ -1 +1 @@
-<view class="h-90 lh-90 bgc-00ff00 backcolor-00ff00 c-ff00ff c-123a6d c-ssdfsdf">测试原子类</view>
+<view class="h-90 lh-90 bgc-00ff00 backcolor-00ff00 c-ff00ff c-123a6d bgred">测试原子类</view>