gxd-uni-library-editx 1.0.159 → 1.0.160

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gxd-uni-library-editx",
-  "version": "1.0.159",
+  "version": "1.0.160",
   "private": false,
   "description": "聚福宝基础插件专用库",
   "main": "index.js",

package/src/components/XdNumber/XdNumber.vue

@@ -9,11 +9,12 @@
 			<text class="uni-numbox--text" :class="{ 'uni-numbox--disabled': inputValue <= uiMin || disabled }">-</text>
 		</view>
 		<input
-      :disabled="disabled"
+      :disabled="disabled || circle"
       @focus="_onFocus"
       @blur="_onBlur"
       class="uni-numbox__value"
-      :class="{disabled: disabled}"
+      :class="{disabled: (disabled || circle), circle: circle}"
+
       type="number"
 			v-model="inputValue" />
 		<view @click="_calcValue('plus')" class="uni-numbox__plus uni-cursor-point" :class="{'numbox--disabled': inputValue >= uiMax || disabled }">
@@ -253,11 +254,14 @@ export default {
     width: 0;
     color: #333;
 
-
     &.disabled {
       color: #bbb;
     }
 
+    &.circle {
+      color: #333!important;
+    }
+
 	}
 
 	.uni-numbox__minus {
@@ -305,14 +309,14 @@ export default {
 	}
 
 	.uni-numbox--text {
-		font-size: 28rpx;
+		font-size: 32rpx;
 		color: $uni-text-color;
-    //#ifdef h5
-    margin-top: -2rpx;
-    //#endif
-    //#ifdef MP-WEIXIN
+    /* #ifdef H5 */
+    margin-top:-8rpx;
+    /* #endif */
+    /* #ifdef MP-WEIXIN */
     margin-top: -8rpx;
-    //#endif
+   /* #endif */
 	}
 
 	.uni-numbox--disabled {

package/src/utils/xd.base.js

@@ -673,9 +673,16 @@ export function getContainerPropsValue(
       //已设置值处理
       if(bsValue) {
         if(bsValue.type === 'Y') {
-          color = bsValue.value.color;
-          if(isBorder) style = bsValue.value.style;
-          width = bsValue.value.width;
+          if(bsValue.value === null) {
+            color = dDataValue.color;
+            if(isBorder) style = dDataValue.style;
+            width = dDataValue.width;
+          }else {
+            color = bsValue.value.color;
+            if(isBorder) style = bsValue.value.style;
+            width = bsValue.value.width;
+          }
+
         }
         else if(bsValue.type === 'N'){
           isNone = true;