@mpxjs/webpack-plugin 2.6.114-alpha.2 → 2.6.114-alpha.5

package/lib/platform/template/wx/index.js

@@ -237,6 +237,10 @@ module.exports = function getSpec ({ warn, error }) {
                 name: 'mpxModelEvent',
                 value: modelEvent
               },
+              {
+                name: 'mpxModelEventId',
+                value: Math.random().toString(36).substr(3, 8)
+              },
               {
                 name: '@mpxModel',
                 value: `__model(${stringifyWithResolveComputed(modelValue)}, $event, ${stringify(modelValuePathArr)}, ${stringify(modelFilter)})`

package/lib/runtime/components/tenon/getInnerListeners.js

@@ -87,11 +87,20 @@ function processModel (listeners, context) {
   // todo 访问$listeners也会导致上述现象，但是为了事件代理还必须访问$listeners，待后续思考处理
 
   const modelEvent = context.$attrs.mpxModelEvent
-  if (modelEvent) {
+  const modelEventId = context.$attrs.mpxModelEventId
+  if (modelEvent && modelEventId) {
     // 对于modelEvent，内部获得时间后向外部转发，触发外部listener的同时转发为mpxModel事件
-    listeners[modelEvent] = function (e) {
-      context.$emit(modelEvent, e)
-      context.$emit('mpxModel', e)
+
+    const listener = listeners['onInput']
+
+    listeners['onInput'] = function (e) {
+      Hummer.notifyCenter.triggerEvent(modelEventId, {
+        detail: e
+      })
+      context.$emit('mpxModel', {
+        detail: e
+      })
+      listener && listener.call(this, e)
     }
     // 内部listener不需要mpxModel
     delete listeners.mpxModel

package/lib/runtime/components/tenon/tenon-button.vue

@@ -150,7 +150,7 @@ export default (function(){
 
 
 
-<style lang="stylus">
+<style lang="stylus" scoped>
 .mpx-button-versionv2
     width: 184px
     line-height 1.41176471

package/lib/runtime/components/tenon/tenon-image.vue

@@ -53,7 +53,7 @@ export default {
   },
 };
 </script>
-<style lang="stylus">
+<style lang="stylus" scoped>
 .mpx-image
   width 300px
   height 225px

package/lib/runtime/components/tenon/tenon-input.vue

@@ -83,7 +83,7 @@ export default {
   methods: {},
 };
 </script>
-<style lang="stylus">
+<style lang="stylus" scoped>
   .mpx-input
     cursor auto
     width 100%

package/lib/runtime/components/tenon/tenon-switch.vue

@@ -80,7 +80,7 @@ export default {
 };
 </script>
 
-<style lang="stylus">
+<style lang="stylus" scoped>
 .mpx-switch-wrap
   .mpx-switch-label
     border-radius 16hm

package/lib/runtime/components/tenon/tenon-text-area.vue

@@ -51,7 +51,7 @@ export default {
   methods: {},
 };
 </script>
-<style lang="stylus">
+<style lang="stylus" scoped>
 .mpx-textarea
   font inherit
   cursor auto

package/lib/runtime/components/tenon/tenon-text.vue

@@ -55,7 +55,7 @@ export default {
   },
 };
 </script>
-<style lang="stylus">
+<style lang="stylus" scoped>
 .mpx-text
   user-select none
   &.selectable

package/lib/style-compiler/index.js

@@ -29,7 +29,7 @@ module.exports = function (css, map) {
 
   const transRpxRules = transRpxRulesRaw ? (Array.isArray(transRpxRulesRaw) ? transRpxRulesRaw : [transRpxRulesRaw]) : []
 
-  const transRpxFn = mpx.webConfig.transRpxFn
+  const transRpxFn = mpx.webConfig && mpx.webConfig.transRpxFn
   const testResolveRange = (include = () => true, exclude) => {
     return matchCondition(this.resourcePath, { include, exclude })
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/webpack-plugin",
-  "version": "2.6.114-alpha.2",
+  "version": "2.6.114-alpha.5",
   "description": "mpx compile core",
   "keywords": [
     "mpx"
@@ -85,5 +85,5 @@
     "@types/babel-types": "^7.0.4",
     "webpack": "^4.46.0"
   },
-  "gitHead": "9cda3088af3571ce1101bd3dc318b7ed8853ee26"
+  "gitHead": "19cd16b7d2fd80e292b74689fcb5b2529f0504e6"
 }