@smt-ui/component - npm Package Compare versions

Comparing version 1.1.87 to 1.1.88

package.json

 {
   "name": "@smt-ui/component",
-  "version": "1.1.87",
+  "version": "1.1.88",
   "description": "extension base",
@@ -48,3 +48,3 @@ "author": "jialipeng <[e-mail]>",
   },
-  "gitHead": "9f6f256808b0f955aa72c2a628f6701799da97fe"
+  "gitHead": "f5269b4a5719eff3c1dda03fc833100418a0fc1c"
 }

src/chart/README.md

@@ -16,38 +16,33 @@ #### 组件名称
 <view class="chart-container">
-    <view class="tab">折线图</view>
-    <view>
-        <view class="container-chart">
-            <div class="btn-group">
-                <button type="primary" bindtap="showViewM2" data-type="single">单折线图</button>
-                <button type="defualt" bindtap="showViewM2" data-type="multi">复合折线图</button>
-            </div>
-            <view class="chart-single-content">
-                <smt-chart chart-options="{{m2Chartoptions}}" />
-            </view> 
-        </view>
-
-        <view class="setting">
-            <view class="item-title item-scroll block border-bottom">自定义样式</view>
-            <view class="item-scroll block border-bottom">
-                <text class="switch-text">显示图例(Lenged)</text>
-                <switch bindchange="changeLengendM2" checked></switch>
+    <view class="chart-inner-container">  
+        <view>
+            <view class="container-chart">
+                <view class="item-title tab border-bottom">折线图</view>
+                <view s-if="m2activeName == 'm2single'" class="btn-group">
+                    <button type="primary" bindtap="showViewM2" data-type="single">单折线图</button>
+                    <button type="defualt" bindtap="showViewM2" data-type="multi">复合折线图</button>
+                </view>
+                <view s-elif="m2activeName == 'm2multi'" class="btn-group">
+                    <button type="defualt" bindtap="showViewM2" data-type="single">单折线图</button>
+                    <button type="primary" bindtap="showViewM2" data-type="multi">复合折线图</button>
+                </view>
+                <view class="chart-single-content">
+                    <smt-chart chart-options="{{m2Chartoptions}}" />
+                </view>
             </view>
-            <view class="item-scroll block border-bottom">
-                <text class="switch-text">负值状态</text>
-                <switch bindchange="changeNegativeValueM2"></switch>
-            </view>
-            <view class="item-scroll block border-bottom">
-                <text class="switch-text">正负值状态</text>
-                <switch bindchange="changeCrossValueM2"></switch>
-            </view>
 
-    <view class="tab">柱状图</view>
-    <view>
-        <view class="container-chart">
-            <div class="btn-group">
-                <button type="primary" bindtap="showViewM1" data-active-name="m1" data-type="single">单柱图</button>
-                <button type="defualt" bindtap="showViewM1" data-active-name="m1" data-type="multi">复合柱图</button>
-            </div>
-            <view class="chart-single-content">
-                <smt-chart chart-options="{{m1Chartoptions}}" />
+            <view class="setting">
+                <view class="item-title item-scroll block border-bottom">自定义样式</view>
+                <view class="item-scroll block border-bottom">
+                    <text class="switch-text">显示图例(Lenged)</text>
+                    <switch bindchange="changeLengendM2" checked></switch>
+                </view>
+                <view class="item-scroll block border-bottom">
+                    <text class="switch-text">负值状态</text>
+                    <switch bindchange="changeNegativeValueM2"></switch>
+                </view>
+                <view class="item-scroll block border-bottom">
+                    <text class="switch-text">正负值状态</text>
+                    <switch bindchange="changeCrossValueM2"></switch>
+                </view>
             </view>
@@ -68,3 +63,3 @@ </view>
                 <view class="chart-single-content">
-                    <smt-clfe-chart chart-options="{{m1Chartoptions}}" />
+                    <smt-chart chart-options="{{m1Chartoptions}}" />
                 </view>
@@ -96,8 +91,14 @@ </view>
             <view class="container-chart">
-            <div class="btn-group">
-                <button type="primary" bindtap="showViewM3" data-type="single">饼状图</button>
-                <button type="defualt" bindtap="showViewM3" data-type="multi">环状图</button>
-            </div>
-            <view class="chart-single-content">
-                <smt-chart chart-options="{{m3Chartoptions}}" />
+                <view class="item-title tab border-bottom">饼状图</view>
+                <view s-if="m3activeName == 'm3single'" class="btn-group">
+                    <button type="primary" bindtap="showViewM3" data-type="single">饼状图</button>
+                    <button type="defualt" bindtap="showViewM3" data-type="multi">环状图</button>
+                </view>
+                <view s-elif="m3activeName == 'm3multi'" class="btn-group">
+                    <button type="defualt" bindtap="showViewM3" data-type="single">饼状图</button>
+                    <button type="primary" bindtap="showViewM3" data-type="multi">环状图</button>
+                </view>
+                <view class="chart-single-content">
+                    <smt-chart chart-options="{{m3Chartoptions}}" />
+                </view>
             </view>
@@ -507,3 +508,2 @@
 ```
-<!--外部样式类-->
 .chart-container {
@@ -510,0 +510,0 @@ font-size: .16rem;

src/single-option-group/src/index.js

@@ -8,3 +8,3 @@ /**
 import {isIos} from '../../common/utils/index';
-import {COLOR_TIPS} from '../../common/style/color';
+import {COLOR_TIPS, COLOR_GRAY_4, COLOR_WHITE} from '../../common/style/color';
 import {COLUMNS_MAP} from '../../common/utils/consts';
@@ -48,2 +48,24 @@
             value: COLOR_TIPS
+        },
+        // 选中时的文字颜色
+        normalTextColor: {
+            type: String,
+            value: '#1f1f1f'
+        },
+        // 选中时的背景颜色
+        activeBgColor: {
+            type: String,
+            value: COLOR_GRAY_4
+        },
+        normalBgColor: {
+            type: String,
+            value: COLOR_WHITE
+        },
+        activeBorderColor: {
+            type: String,
+            value: COLOR_TIPS
+        },
+        normalBorderColor: {
+            type: String,
+            value: '#1f1f1f'
         }
@@ -50,0 +72,0 @@ },

src/single-option/src/index.js

@@ -5,3 +5,3 @@ /**
  */
-import {COLOR_TIPS} from '../../common/style/color';
+import {COLOR_TIPS, COLOR_GRAY_4, COLOR_WHITE} from '../../common/style/color';
 import {COLUMNS_MAP} from '../../common/utils/consts';
@@ -47,6 +47,31 @@ /* global Component */
         },
+        // 选中时的文字颜色
+        normalTextColor: {
+            type: String,
+            value: '#1f1f1f'
+        },
         // 选中时的背景颜色
         activeBgColor: {
             type: String,
+            value: COLOR_GRAY_4
+        },
+        normalBgColor: {
+            type: String,
+            value: COLOR_WHITE
+        },
+        activeBorderColor: {
+            type: String,
+            value: COLOR_TIPS
+        },
+        normalBorderColor: {
+            type: String,
+            value: '#1f1f1f'
+        },
+        title: {
+            type: String,
             value: ''
+        },
+        desc: {
+            type: String,
+            value: ''
         }
@@ -53,0 +78,0 @@ },

src/steps/component/icon.js

@@ -7,3 +7,3 @@ /**
 
-/* global Page, swan, getApp , Component*/
+/* global Page, swan, getApp , Component */
 Component({
@@ -10,0 +10,0 @@ properties: {

swan-ide.config.json

@@ -1,1 +0,1 @@
-{"name":"component","label":"通用","type":"component","configPath":"./smart-design-config.json","version":"1.1.86"}
+{"name":"component","label":"通用","type":"component","configPath":"./smart-design-config.json","version":"1.1.87"}

No alert changes

Improved metrics

Total package byte prevSize

1703915

increased by0.11%

Lines of code

15611

increased by0.28%

No dependency changes