fix: font-weight

CPPAlien · CPPAlien · commit fc47556fea24 · 2021-01-07T16:54:47.000+08:00
diff --git a/README.md b/README.md
@@ -294,7 +294,7 @@ export default class ImageExample {
 | color          | 字体颜色                                                                 | black               |
 | maxLines       | 最大行数                                                                 | 不限，根据 width 来 |
 | lineHeight     | 行高（上下两行文字 baseline 的距离）                                     | fontSize 大小       |
-| fontWeight     | 字体粗细。仅支持 normal, bold                                            | normal              |
+| fontWeight     | 字体粗细。                                            | normal              |
 | textDecoration | 文本修饰，支持 underline、 overline、 line-through，也可组合使用         | 无效果              |
 | textStyle      | fill： 填充样式，stroke：镂空样式                                        | fill                |
 | background     | 文字背景颜色                                                             | 无                  |
diff --git a/components/painter/lib/pen.js b/components/painter/lib/pen.js
@@ -211,8 +211,8 @@ export default class Painter {
             textArray[i] = ' ';
           }
         }
-        const fontWeight = view.css.fontWeight === 'bold' ? 'bold' : 'normal';
-        const textStyle = view.css.textStyle === 'italic' ? 'italic' : 'normal';
+        const fontWeight = view.css.fontWeight || '400';
+        const textStyle = view.css.textStyle || 'normal';
         if (!view.css.fontSize) {
           view.css.fontSize = '20rpx';
         }
diff --git a/pages/example/example.wxml b/pages/example/example.wxml
@@ -5,16 +5,12 @@
     <button bind:tap='saveImage'>保存</button>
   </view>
   <painter 
-    customStyle='margin-left: 40rpx; height: 1000rpx;'
     customActionStyle="{{customActionStyle}}"
-    dancePalette="{{template}}"
     palette="{{paintPallette}}"
     bind:imgOK="onImgOK" 
     bind:touchEnd="touchEnd" 
     action="{{action}}"
-    use2D="{{true}}"
     widthPixels="1000"
-    />
-  <!-- <image src="{{image}}" style="width: 654rpx; height: 1000rpx; margin-left:40rpx;"/> -->
-  
+  />
+  <image src="{{image}}" style="width: 654rpx; height: 1000rpx; margin-left:40rpx;"/>
 </view>

Original file line number	Diff line number	Diff line change
`@@ -211,8 +211,8 @@ export default class Painter {`
`211`	`211`	`textArray[i] = ' ';`
`212`	`212`	`}`
`213`	`213`	`}`
`214`		`- const fontWeight = view.css.fontWeight === 'bold' ? 'bold' : 'normal';`
`215`		`- const textStyle = view.css.textStyle === 'italic' ? 'italic' : 'normal';`
	`214`	`+ const fontWeight = view.css.fontWeight \|\| '400';`
	`215`	`+ const textStyle = view.css.textStyle \|\| 'normal';`
`216`	`216`	`if (!view.css.fontSize) {`
`217`	`217`	`view.css.fontSize = '20rpx';`
`218`	`218`	`}`