dolphin-weex-ui 2.4.24 → 2.4.25

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dolphin-weex-ui",
-  "version": "2.4.24",
+  "version": "2.4.25",
   "description": "inteligense cross platform frame",
   "main": "index.js",
   "directories": {

package/packages/dof-bottom-bar/colmo.css

@@ -13,6 +13,5 @@
   }
   .tab-bar-item-icon-text {
     font-family: PingFangSC-Regular;
-    font-size: 32px;
   }
 }

package/packages/dof-button/colmo.css

@@ -1,6 +1,6 @@
 @media screen and (weex-theme: colmo) {
   .dof-btn-highlight-primary-default:active {
-    background-color: #ba644a;
+    background-color: #bb644a;
   }
   .dof-btn-highlight-primary-base:active {
     background-color: #636569;
@@ -9,7 +9,7 @@
     background-color: transparent;
   }
   .dof-text-highlight-primary:active {
-    color: #ba644a;
+    color: #bb644a;
   }
   .btn-text {
     font-family: PingFangSC-Regular;

package/packages/dof-button/index.vue

@@ -379,7 +379,7 @@ export default {
   background-color: #743d2a;
 }
 .dof-btn-highlight-colmo-base {
-  background-color: #313237;
+  background-color: #292c30;
 }
 .dof-btn-highlight-colmo-base:active {
   background-color: rgba(0, 0, 0, 0.3);

package/packages/dof-button/type.js

@@ -191,7 +191,7 @@ export const STYLE_MAP = {
       backgroundColor: '#B35336'
     },
     base: {
-      backgroundColor: '#313237'
+      backgroundColor: '#292c30'
     },
     plain: {
       backgroundColor: 'transparent',
@@ -199,7 +199,7 @@ export const STYLE_MAP = {
       borderColor: '#B35336'
     },
     text: {
-      backgroundColor: '#313237',
+      backgroundColor: '#1c1e21',
       borderWidth: 0
     }
   }
@@ -398,7 +398,7 @@ export const STYLE_MAP_DIABLO = {
       backgroundColor: '#B35336'
     },
     base: {
-      backgroundColor: '#313237'
+      backgroundColor: '#292c30'
     },
     plain: {
       backgroundColor: 'transparent',
@@ -799,21 +799,21 @@ export const COLMO_BUTTON_STYLE_MAP = {
   full: {
     width: '688px',
     height: '96px',
-    borderRadius: '16px',
+    borderRadius: '0px',
     paddingLeft: '46px',
     paddingRight: '46px'
   },
   big: {
     width: '688px',
     height: '96px',
-    borderRadius: '16px',
+    borderRadius: '0px',
     paddingLeft: '46px',
     paddingRight: '46px'
   },
   medium: {
     width: '688px',
     height: '80px',
-    borderRadius: '16px',
+    borderRadius: '0px',
     paddingLeft: '28px',
     paddingRight: '28px'
   },

package/packages/dof-card/index.vue

@@ -114,7 +114,7 @@ export default {
     _cardStyle() {
       let tmp = { borderRadius: this.themeStyle.borderRadius }
       let style = {
-        backgroundColor: this._isColmo ? '#303237' : (this._isDiablo ? '#171c1f' : '#fff'),
+        backgroundColor: this._isColmo ? '#1c1e21' : (this._isDiablo ? '#171c1f' : '#fff'),
         ...tmp,
         ...this.cardStyle
       }

package/packages/dof-card/style.js

@@ -6,6 +6,6 @@ export const STYLE_MAP = {
     borderRadius: '32px'
   },
   colmo: {
-    borderRadius: '16px'
+    borderRadius: '0px'
   }
 }

package/packages/dof-cell/colmo.css

@@ -7,7 +7,7 @@
     /* line-height: 32px; */
   }
   .dof-cell-highlight:active {
-    background-color: #44464b;
+    background-color: #343639;
   }
   .right {
     padding-right: 32px;

package/packages/dof-cell/index.vue

@@ -688,10 +688,10 @@ export default {
     },
     _backgroundColor() {
       if (this.backgroundColor) return this.backgroundColor
-      return this._isColmo ? '#303237' : this._isDiablo ? '#101315' : '#ffffff'
+      return this._isColmo ? '#1d1f22' : this._isDiablo ? '#101315' : '#ffffff'
     },
     _borderColor() {
-      return this._isColmo ? 'rgba(255,255,255,0.14)' : '#DDDDDD'
+      return this._isColmo ? '#343639' : '#DDDDDD'
     },
     useFakeBorder() {
       return JSON.stringify(this.fakeBorderStyle) !== '{}'
@@ -968,7 +968,7 @@ export default {
     // 底部border样式
     fakeBorderStyleRender() {
       return {
-        backgroundColor: this._isColmo ? 'rgba(255,255,255,0.14)' : '#DDDDDD',
+        backgroundColor: this._isColmo ? '#343639' : '#DDDDDD',
         ...this.fakeBorderStyle
       }
     }

package/packages/dof-checkbox/colmo.css

@@ -26,7 +26,7 @@
     align-items: center;
   }
   .active-cell:active {
-    background-color: #44464b;
+    background-color: #343639;
   }
   .fakeSubBorder {
     background-color: rgba(255, 255, 255, 0.1);

package/packages/dof-collapse-item/colmo.css

@@ -18,10 +18,10 @@
     
   }
   .dof-collapse-item-content {
-    background-color: #303237;
+    background-color: #1c1e21;
   }
   .dof-item-body {
-    background-color: #303237;
+    background-color: #1c1e21;
   }
   .bottom-line {
     border-bottom-color: rgba(255, 255, 255, 0.1);

package/packages/dof-collapse-item/index.vue

@@ -5,7 +5,7 @@
         class="title"
         @click="onCollapseHandler"
         :style="{
-          'backgroundColor:active': _isColmo ? 'rgba(255,255,255,0.14)' : _isDiablo ? '#1d1f21' : '#fff'
+          'backgroundColor:active': _isColmo ? '#343639' : _isDiablo ? '#1d1f21' : '#fff'
         }"
       >
         <div :class="['title-box', collapsed_ ? 'bottom-line' : '']">

package/packages/dof-input/index.vue

@@ -189,7 +189,7 @@ export default {
     },
     _inputStyle() {
       return {
-        backgroundColor: this.bgColor ? this.bgColor : this._isColmo ? '#303237' : '#fff',
+        backgroundColor: this.bgColor ? this.bgColor : this._isColmo ? '#1d1f22' : '#fff',
         height: this._height + 'px',
         lineHeight: this._height + 'px',
         ...this.inputStyle

package/packages/dof-numcard-col/colmo.css

@@ -2,19 +2,19 @@
   .borderRight {
     position: absolute;
     width: 1px;
-    background-color: #3E4144;
+    background-color: #353639;
     right: 0;
   }
   .borderBottom {
     position: absolute;
     height: 1px;
-    background-color: #3E4144;
+    background-color: #353639;
     bottom: 0;
   }
   .delta {
     width: 26px;
     height: 26px;
-    background-color: #3E4144;
+    background-color: #353639;
     position: absolute;
     right: -13px;
     bottom: -13px;

package/packages/dof-numcard-row/index.vue

@@ -29,7 +29,7 @@ export default {
     },
     isShowDelta: {
       type: Boolean,
-      default: false
+      default: true
     },
     bgColor: {
       type: String,
@@ -45,7 +45,7 @@ export default {
   computed: {
     _backgroundColor() {
       if (this.bgColor !== '') return this.bgColor
-      return this._isColmo ? '#303237' : '#fff'
+      return this._isColmo ? '#1d1f22' : '#fff'
     }
   }
 }
@@ -57,9 +57,4 @@ export default {
   flex-wrap: nowrap;
   overflow: hidden;
 }
-@media screen and (weex-theme: colmo) {
-  .dof-numcard-row {
-    border-radius: 0px;
-  }
-}
 </style>

package/packages/dof-radio-list/radio-item.vue

@@ -25,7 +25,7 @@
       class="fakeStyle"
       v-if="!isLast && isShowBorder"
       :style="{
-        backgroundColor: _isColmo ? 'rgba(255, 255, 255, 0.14)' : '#dddddd',
+        backgroundColor: _isColmo ? 'rgba(255, 255, 255, 0.1)' : '#dddddd',
         right: isFullBorder ? '0px' : '24px'
       }"
     ></div>
@@ -116,7 +116,7 @@ export default {
     backgroundColor() {
       const { _isColmo, _isDiablo } = this
       // 27282a
-      return _isColmo ? '#303237' : _isDiablo ? '#101315' : '#FFFFFF'
+      return _isColmo ? '#1c1e21' : _isDiablo ? '#101315' : '#FFFFFF'
     },
     cellStyle() {
       return { backgroundColor: this.backgroundColor }

package/packages/dof-searchbar/colmo.css

@@ -7,8 +7,7 @@
     height: 88px;
     flex-direction: row;
     align-items: center; */
-    /* background-color: #303237; */
-    background-color: transparent;
+    background-color: #1C1E21;
     height: 120px;
   }
   .search-bar-input {
@@ -26,7 +25,7 @@
     top: 24px;
     font-size: 32px;
     background-color: rgba(177,193,234,0.05);
-    border-radius: 16px;
+    border-radius: 0px;
     color: rgba(255,255,255,0.80);
     placeholder-color:  rgba(255,255,255,0.40);
   }

package/packages/dof-tab-page/colmo.css

@@ -8,7 +8,7 @@
     flex-direction: row;
     height: 64px;
     padding: 0 24px;
-    border-radius: 8px;
+    border-radius: 0px;
     /* background-color: #232323; */
     justify-content: center;
     align-items: center;

package/packages/dof-tab-page/index.vue

@@ -3,8 +3,8 @@
     :class="[
       'widget',
       hasMargin && 'tab-margin',
-      tabTitles.length === 2 && !isSlot && type != 'third-group' && !isFlexStart && 'tab-padding-160',
-      tabTitles.length === 3 && !isSlot && type != 'third-group' && !isFlexStart && 'tab-padding-40',
+      tabTitles.length === 2 && !isSlot && type != 'third-group' && 'tab-padding-160',
+      tabTitles.length === 3 && !isSlot && type != 'third-group' && 'tab-padding-40',
       isSlot && 'flex-expand-layout',
       type == 'third-group' && 'thirdTabPanel'
     ]"
@@ -94,13 +94,13 @@
     <!-- 一级和二级标签 else-->
     <!-- :style="{backgroundColor: '#00A4F2'}" -->
     <scroller
-      :class="['tab-title-list', tabTitles.length <= 5 && 'space-around-layout', isFlexStart && 'flex-start-layout']"
+      :class="['tab-title-list', tabTitles.length <= 5 && 'space-around-layout']"
       :show-scrollbar="false"
       scroll-direction="horizontal"
       v-if="type !== 'third' && type !== 'third-group'"
     >
       <div
-        :class="['title-item', tabTitles.length > 5 && 'padding-layout-32', type == 'primary' && 'title-item-primary', isFlexStart && tabTitles.length - 1 !== index && 'flex-start-item']"
+        :class="['title-item', tabTitles.length > 5 && 'padding-layout-32', type == 'primary' && 'title-item-primary']"
         v-for="(v, index) in tabTitles"
         :key="index"
         :ref="'dof-tab-title-' + index"
@@ -111,7 +111,7 @@
             <text
               :class="['tab-text', 'dot-tab-text']"
               :style="{
-                fontSize: isFlexStart && currentPage === index ? '36px' : isFlexStart && currentPage !== index ? '28px' : type === 'primary' ? '32px'  : '28px',
+                fontSize: type === 'primary' ? '32px' : '28px',
                 fontWeight: currentPage === index && mergeStyleOption.isActiveTitleBold ? 'normal' : 'normal',
                 color: currentPage === index ? mergeStyleOption.activeTitleColor : mergeStyleOption.titleColor
               }"
@@ -186,11 +186,7 @@ export default {
     bgColor: {
       type: String,
       default: ''
-    },
-    isFlexStart: {
-      type: Boolean,
-      default: false
-    },
+    }
   },
   data: () => ({
     currentPage: 0
@@ -464,13 +460,6 @@ export default {
 .space-around-layout {
   justify-content: space-around;
 }
-.flex-start-layout {
-  justify-content: flex-start;
-  flex: 1;
-}
-.flex-start-item {
-  margin-right: 32px;
-}
 
 .padding-layout-32 {
   padding: 0 32px;