@mpxjs/webpack-plugin 2.8.25-alpha.2 → 2.8.25-alpha.20

package/lib/dependencies/ResolveDependency.js

@@ -76,7 +76,8 @@ ResolveDependency.Template = class ResolveDependencyTemplate {
     const { resolved = '' } = dep
     // for tenon
     if (dep.compilation.__mpx__.mode === 'tenon') {
-      return `getRelativePath(currentURL, ${JSON.stringify(resolved)}) + '.js'`
+      // 只支持所有产物在一个目录下的场景 进行相对路径跳转
+      return `'./${resolved}.js'`
     }
     // ?resolve 必定返回绝对路径
     return JSON.stringify('/' + resolved)

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

@@ -263,6 +263,12 @@ module.exports = function getSpec ({ warn, error }) {
             name: 'ref',
             value: `__mpx_ref_${value}__`
           }
+        },
+        tenon ({ value }) {
+          return {
+            name: 'ref',
+            value: `${value}`
+          }
         }
       },
       {

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

@@ -61,9 +61,9 @@ function createTouch (context, hasLongTap, __mpxTapInfo) {
   })
 }
 
-function processOriginEvent (listeners) {
+function processOriginEvent (listeners, context, _input) {
   // 给event添加_originEvent属性
-  const ignoreEvents = ['onTap', 'onFocus', 'onChange', 'onBlur', 'onConfirm']
+  const ignoreEvents = ['onTap', 'onFocus', 'onChange', 'onBlur', 'onConfirm', 'onInput']
   Object.keys(listeners).forEach((key) => {
     if (!ignoreEvents.includes(key)) {
       const listener = listeners[key]
@@ -75,14 +75,32 @@ function processOriginEvent (listeners) {
       }
     }
   })
+
+  // 处理input输入框事件
+  if (listeners.onInput && _input) {
+    delete listeners.onInput
+    listeners.onInput = function (e) {
+      let _type
+      const { state } = e || {}
+      if (state === 1) {
+        _type = 'focus'
+      } else if (state === 2) {
+        _type = 'focus'
+      } else if (state === 3) {
+        _type = 'blur'
+      } else {
+        _type = 'confirm'
+      }
+      context.$emit(_type, { ...e, detail: e })
+    }
+  }
 }
 
-function processModel (listeners, context) {
+function processModel (listeners, context, _input = false) {
   // 该函数只有wx:model的情况下才调用，而且默认e.detail.value有值
   // 该函数必须在产生merge前执行
   // todo 此处对于$attrs的访问会导致父组件更新时子组件必然更新，暂时用短路效应避免影响，待优化
   // todo 访问$listeners也会导致上述现象，但是为了事件代理还必须访问$listeners，待后续思考处理
-
   const modelEvent = context.$attrs.mpxModelEvent
   const modelEventId = context.$attrs.mpxModelEventId
   if (modelEvent && modelEventId) {
@@ -278,11 +296,13 @@ export default function getInnerListeners (context, options = {}) {
     mergeBefore = {},
     mergeAfter = {},
     defaultListeners = [],
-    ignoredListeners = []
+    ignoredListeners = [],
+    _input = false
   } = options
   const __mpxTapInfo = {}
   // 从attrs里面拿到以on开头的所有绑定的事件
   const listeners = Object.assign({}, getListeners(context))
+
   defaultListeners.forEach((key) => {
     if (!listeners[key]) listeners[key] = noop
   })
@@ -302,8 +322,8 @@ export default function getInnerListeners (context, options = {}) {
     mergeAfterOptions.force = mergeAfter.force
     mergeAfter = mergeAfter.listeners
   }
-  processOriginEvent(listeners)
-  processModel(listeners, context)
+  processOriginEvent(listeners, context, _input)
+  processModel(listeners, context, _input)
   processTouchAndLtap(listeners, context, __mpxTapInfo)
   mergeListeners(listeners, mergeBefore, mergeBeforeOptions, context, __mpxTapInfo)
   mergeListeners(listeners, mergeAfter, mergeAfterOptions, context, __mpxTapInfo)

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

@@ -64,6 +64,9 @@ export default (function(){
       },
     },
     computed: {
+      originRef() {
+        return this.$refs["mpx-button"]
+      },
       className() {
         if (this.hoverClass && this.hoverClass !== "none" && this.hover) {
           return this.hoverClass;
@@ -109,6 +112,7 @@ export default (function(){
       };
       const data = {
         class: ["mpx-button", ...this.classNameList],
+        ref: "mpx-button",
         ...domProps,
         ...getInnerListeners(this, {
           mergeAfter,

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

@@ -38,11 +38,17 @@ export default {
     }
     return h("image", {
       class: "mpx-image",
+      ref: "mpx-image",
       src: this.src,
       resize,
       ...getInnerListeners(this)
     });
   },
+  computed: {
+    originRef() {
+      return this.$refs["mpx-image"]
+    }
+  },
   data() {
     return {};
   },
@@ -57,5 +63,4 @@ export default {
 .mpx-image
   width 300px
   height 225px
-  display inline-block
 </style>

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

@@ -37,15 +37,76 @@ export default {
       type: Number,
       default: -1,
     },
+    style: {
+      type: String,
+      default: '',
+    },
+    placeholderStyle: {
+      type: String,
+      default: '',
+    },
+    confirmType: {
+      type: String,
+      default: 'done',
+    }
   },
   computed: {
     originRef() {
       return this.$refs["mpx-input"]
-    }
+    },
+    computedStyle() {
+      let _inputWrapStyleObj = {
+        "font-size": "33hm",
+        height: "80hm",
+        "line-height": "80hm",
+        color: "#000000",
+        border: "1hm solid #999999",
+        "border-radius": "8hm",
+        "text-align": "left",
+        "background-color": "#ffffff"
+      };
+
+      if (typeof this.style !== 'string') {
+        console.warn('Runtime warning: PROPS style must be string')
+      }
+
+      let _styleObj = {};
+
+      if (typeof this.style === 'string') {
+        let _style = this.style;
+
+        if (_style[_style.length - 1] !== ";") {
+          _style += ";";
+        }
+
+        _style.split(";").map(item => {
+          if (item) {
+            let itemArray = item.split(":");
+            _styleObj[itemArray[0]] = itemArray[1];
+          }
+        });
+      }
+      
+      //HACK: tenon会存在读到this.style为封装标签的样式 @曹恩泽
+      if (typeof this.style === 'object') {
+        _styleObj = Object.assign({}, _styleObj, this.style)
+      }
+
+      let styleObj = Object.assign({}, _inputWrapStyleObj, _styleObj);
+      let style = Object.keys(styleObj)
+        .map(k => `${k}:${styleObj[k]}`)
+        .join(";");
+
+      //Tenon变更placeholderColor
+      const regex = /color/i
+      style += this.placeholderStyle.replace(regex, 'placeholderColor');
+      return style;
+    },
   },
   watch: {
-    value: function(newVal, oldVal) {
-      if(this.originRef && newVal !== this.originRef.value){
+    value: function (newVal, oldVal) {
+      console.log(newVal)
+      if (this.originRef && newVal !== this.originRef.value) {
         this.originRef.value = newVal;
       }
     }
@@ -62,6 +123,9 @@ export default {
         case "number":
           inputType = "number";
           break;
+        case "tel":
+          inputType = "tel";
+          break;
         default:
           inputType = "text";
       }
@@ -69,13 +133,16 @@ export default {
 
     const data = {
       class: "mpx-input",
-      focus: this.focus,
+      focused: this.focus,
       ref: "mpx-input",
       placeholder: this.placeholder,
-      maxLength: this.maxLength,
+      maxLength: this.maxlength,
       type: inputType,
       disabled: this.disabled,
-      ...getInnerListeners(this),
+      style: this.computedStyle,
+      returnKeyType: this.confirmType,
+      value: this.value,
+      ...getInnerListeners(this, { _input: true }),
     };
     return h("input", data, []);
   },

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

@@ -9,10 +9,15 @@ export default {
       value: {}
     }
   },
+  computed: {
+    originRef() {
+      return this.$refs["mpx-richtext"]
+    }
+  },
   render () {
-
     const data = {
       richText: this.richText,
+      ref: "mpx-richtext",
       ...getInnerListeners(this)
     }
     return h('text', data)

package/lib/runtime/components/tenon/tenon-scroll-view.vue

@@ -72,6 +72,9 @@ export default {
     return {};
   },
   computed: {
+    originRef() {
+      return this.$refs["scroll"]
+    },
     _scrollTop() {
       // return 1
       return processSize(this.scrollTop);

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

@@ -22,6 +22,11 @@ export default {
       default: "#04BE02",
     },
   },
+  computed: {
+    originRef() {
+      return this.$refs["switch"]
+    }
+  },
   watch: {
     checked(newVal) {
       this.switchChecked = newVal;

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

@@ -39,11 +39,17 @@ export default {
       "text",
       {
         class: classNames,
+        ref: "mpx-text",
         ...getInnerListeners(this),
       },
       text
     );
   },
+  computed: {
+    originRef() {
+      return this.$refs["mpx-text"]
+    }
+  },
   data() {
     return {};
   },

package/lib/runtime/components/tenon/{tenon-text-area.vue → tenon-textarea.vue}

@@ -31,8 +31,15 @@ export default {
       type: Number,
       default: -1,
     },
+    placeholderStyle: {
+      type: String,
+      default: '',
+    },
+    confirmType: {
+      type: String,
+      default: 'return',
+    }
   },
-
   computed: {
     originRef() {
       return this.$refs["mpx-textarea"]
@@ -51,9 +58,11 @@ export default {
       class: "mpx-textarea",
       ref: "mpx-textarea",
       focus: this.focus,
+      value: this.value,
       placeholder: this.placeholder,
-      maxLength: this.maxLength,
+      maxLength: this.maxlength,
       disabled: this.disabled,
+      returnKeyType: this.confirmType,
       ...getInnerListeners(this),
     };
     return h("textarea", data);

package/lib/template-compiler/compiler.js

@@ -1918,7 +1918,7 @@ function postProcessTemplate (el) {
   }
 }
 
-const isValidMode = makeMap('wx,ali,swan,tt,qq,web,qa,jd,dd,noMode')
+const isValidMode = makeMap('wx,ali,swan,tt,qq,web,qa,jd,dd,tenon,noMode')
 
 const wrapRE = /^\((.*)\)$/
 

package/lib/tenon/processJSON.js

@@ -129,16 +129,12 @@ module.exports = function (json, options, rawCallback) {
                 defs,
                 env
               })
-              const json = parts.json || {}
-              if (json.content) {
-                content = json.content
-              } else if (json.src) {
-                return getJSONContent(json || {}, loaderContext, (err, content) => {
-                  callback(err, result, content)
-                })
-              }
+              getJSONContent(parts.json || {}, result, loaderContext, (err, content) => {
+                callback(err, result, content)
+              })
+            } else {
+              callback(null, result, content)
             }
-            callback(null, result, content)
           },
           (result, content, callback) => {
             try {

package/lib/tenon/processScript.js

@@ -254,7 +254,7 @@ module.exports = function (script, options, callback) {
   let dynamicPageStr = ''
   async.each(localPagesMap, (pageCfg, callback) => {
     if (typeof pageCfg !== 'string') pageCfg.src = addQuery(pageCfg.src, { tenon: true })
-    processPage(pageCfg, loaderContext.context, '', (err, entry, { key }) => {
+    processPage(pageCfg, loaderContext.context, '', (err, entry, { key } = {}) => {
       if (err) return callback()
       if (pageSet.has(key)) return callback()
       pageSet.add(key)

package/lib/utils/check-core-version-match.js

@@ -4,7 +4,8 @@ const coreVersion = require('@mpxjs/core/package.json').version
 const packageName = require('../../package.json').name
 const packageVersion = require('../../package.json').version
 
-if (packageVersion.slice(0, 3) !== coreVersion.slice(0, 3)) {
+// skip check prerelease version
+if (!/-\w+$/.test(packageVersion) && packageVersion.slice(0, 3) !== coreVersion.slice(0, 3)) {
   const corePath = require.resolve('@mpxjs/core')
   const packagePath = require.resolve('../../package.json')
   throw new Error(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/webpack-plugin",
-  "version": "2.8.25-alpha.2",
+  "version": "2.8.25-alpha.20",
   "description": "mpx compile core",
   "keywords": [
     "mpx"
@@ -28,7 +28,7 @@
     "@better-scroll/wheel": "^2.2.1",
     "@better-scroll/zoom": "^2.2.1",
     "@hummer/tenon-dev-server-webpack-plugin": "0.0.2",
-    "@hummer/tenon-loader": "^1.1.0",
+    "@hummer/tenon-loader": "^1.2.0",
     "@hummer/tenon-style-loader": "^0.2.0",
     "acorn-walk": "^7.2.0",
     "async": "^2.6.0",
@@ -85,5 +85,5 @@
   "engines": {
     "node": ">=14.14.0"
   },
-  "gitHead": "8f3578d8728e77c8666d431de97c45a2736482c1"
+  "gitHead": "349316191b4100a2abcf8286aba3ad94e6104618"
 }