@dolphinweex/weex-vue-render 0.2.64 → 0.2.65

package/dist/index.common.js

@@ -2918,22 +2918,54 @@ function dispatchNativeEvent (elm, type, data) {
 function mapFormEvents (context) {
   var eventMap = {};['input', 'change', 'focus', 'blur', 'return'].forEach(function (type) {
     eventMap[type] = function (event) {
-      if (context.$el) {
-        if(context.type === 'number' && (context.$el.value || context.$el.lastValue)){
-          if(context.$el.validationMessage){//如果有报错语句 拦截使用上次数据
-            context.$el.value = context.$el.lastValue
+      if (!context.$el) { return }
+      var isNumberType = context.type === 'number';
+      // 在 number 模式下，聚焦时改为 text，允许输入临时态（比如以 . 结尾）
+      if (isNumberType && type === 'focus') {
+        context._editingNumberAsText = true;
+        try { context.$el.setAttribute('type', 'text'); } catch (e) {}
+      }
+      if (type === 'input') {
+        var currentValue = context.$el.value == null ? '' : String(context.$el.value);
+        if (isNumberType && context._editingNumberAsText) {
+          var filtered = currentValue.replace(/[^\d.\-]/g, '');
+          // 只保留第一个小数点
+          var dotParts = filtered.split('.');
+          if (dotParts.length > 2) {
+            filtered = dotParts.shift() + '.' + dotParts.join('');
           }
-          context.$el.value = context.$el.value.replace(/[^0-9eE\.\-\+]/g, '');//数字规则
+          if (context.maxlength && String(filtered).length > context.maxlength) {
+            filtered = String(filtered).slice(0, context.maxlength);
+          }
+          context.$el.value = filtered;
+          context._editingDisplayValue = filtered;
+          event.value = filtered;
+        } else {
+          var result = currentValue;
+          if (context.maxlength && String(result).length > context.maxlength) {
+            result = String(result).slice(0, context.maxlength);
+          }
+          context.$el.value = result;
+          event.value = result;
         }
-        if(context.maxlength && context.$el.value){
-          context.$el.value = context.$el.value.slice(0,context.maxlength)
+        context.$emit('input', event);
+        return;
+      }
+
+      // blur/change/return 时，若类型为 number，则清理尾部点并切回 number 类型
+      if (isNumberType && (type === 'blur' || type === 'change' || type === 'return')) {
+        var val = context.$el.value == null ? '' : String(context.$el.value);
+        if (val && val[val.length - 1] === '.') {
+          val = val.slice(0, -1);
         }
-        context.$el.lastValue = context.$el.value;
-        event.value = context.$el.value;
-        // for the sake of v-model, a input event must be emitted.
-        if (type === 'input') {
-          context.$emit(type, event);
+        if (context.maxlength && String(val).length > context.maxlength) {
+          val = String(val).slice(0, context.maxlength);
         }
+        try { context.$el.setAttribute('type', 'number'); } catch (e) {}
+        context._editingNumberAsText = false;
+        context._editingDisplayValue = undefined;
+        context.$el.value = val;
+        event.value = val;
       }
     };
   });
@@ -5506,25 +5538,16 @@ function setPlaceholderColor (inputVm, placeholderColor) {
   if (!placeholderColor) {
     return
   }
-  var vendors = [
-    '::-webkit-input-placeholder',
-    ':-moz-placeholder',
-    '::-moz-placeholder',
-    ':-ms-input-placeholder',
-    ':placeholder-shown'
-  ];
   var id = inputVm._id;
   appendCss$1(
-    vendors.map(function (vendor, idx) {
-      return ("#" + ID_PREFIX_INPUT + id + (vendors[idx]) + "{color:" + placeholderColor + ";}")
-    }).join(''),
+    ("#" + ID_PREFIX_INPUT + id + "::placeholder{color:" + placeholderColor + ";opacity:1;}"),
     ("" + ID_PREFIX_PLACEHOLDER_COLOR + id),
     true);
 }
 
 function processStyle (vm) {
   var styles = getComponentInlineStyle(vm);
-  var phColor = styles.placeholderColor || styles['placeholder-color'];
+  var phColor = styles.placeholderColor || styles['placeholder-color'] || vm.placeholderColor;
   if (phColor) {
     setPlaceholderColor(vm, phColor);
   }
@@ -5559,7 +5582,8 @@ function getInput (weex) {
         default: false
       },
       maxlength: [String, Number],
-      returnKeyType: String
+      returnKeyType: String,
+      placeholderColor: String
     },
 
     mounted: function mounted () {
@@ -5574,6 +5598,9 @@ function getInput (weex) {
           this.focus(val)
         }
       },
+      placeholderColor: function placeholderColor(val) {
+        setPlaceholderColor(this, val)
+      }
     },
 
     render: function render (createElement) {
@@ -5581,12 +5608,18 @@ function getInput (weex) {
         this._id = idCount++;
       }
       var events = extend(mapFormEvents(this));
+      var isNumberType = this.type === 'number';
+      var isEditingAsText = !!this._editingNumberAsText;
+      var inputTypeAttr = isNumberType && isEditingAsText ? 'text' : this.type;
+      var displayValue = isNumberType && isEditingAsText && this._editingDisplayValue !== undefined
+        ? this._editingDisplayValue
+        : this.value;
       return createElement('html:input', {
         attrs: {
           'weex-type': 'input',
           id: ("" + ID_PREFIX_INPUT + (this._id)),
-          type: this.type,
-          value: this.value,
+          type: inputTypeAttr,
+          value: displayValue,
           disabled: (this.disabled !== 'false' && this.disabled !== false),
           autofocus: (this.autofocus !== 'false' && this.autofocus !== false),
           placeholder: this.placeholder,
@@ -5594,7 +5627,7 @@ function getInput (weex) {
           'returnKeyType': this.returnKeyType
         },
         domProps: {
-          value: this.value
+          value: displayValue
         },
         on: this.createKeyboardEvent(events),
         staticClass: 'weex-input weex-el',
@@ -6642,6 +6675,14 @@ function getScroller (weex) {
             staticClass: 'weex-scroller-inner weex-ct'
           }, cellsWithScopeIds)
         ]
+      },
+      _handleScrollWrapper: function _handleScrollWrapper (event) {
+        weex.isWebScrolling = true
+        if (this._restorePointerEventsTimer) { clearTimeout(this._restorePointerEventsTimer); }
+        this._restorePointerEventsTimer = setTimeout(function () {
+          weex.isWebScrolling = false
+        }, 120);
+        return this.handleScroll(event)
       }
     },
 
@@ -6664,7 +6705,7 @@ function getScroller (weex) {
         ref: 'wrapper',
         attrs: { 'weex-type': 'scroller' },
         on: {
-          scroll: this.handleScroll,
+          scroll: this._handleScrollWrapper,
           touchstart: this.handleTouchStart,
           touchmove: this.handleTouchMove.bind(this),
           touchend: this.handleTouchEnd
@@ -7926,6 +7967,7 @@ var slideMixin = {
         var rect = wrapper.getBoundingClientRect();
         this._wrapperWidth = rect.width;
         this._wrapperHeight = rect.height;
+        this.maxHeight = react.height;
       }
     },
 

package/package.json

@@ -49,5 +49,5 @@
     "type": "git",
     "url": "git+ssh://git@github.com/weexteam/weex-vue-render.git"
   },
-  "version": "0.2.64"
+  "version": "0.2.65"
 }