Merge branch 'dev' of github.com:dcloudio/uni-app into dev

build/rollup.config.js

@@ -14,6 +14,10 @@ const PLATFORMS = {
   'mp-baidu': {
     prefix: 'swan',
     title: '百度小程序'
+  },
+  'mp-toutiao': {
+    prefix: 'tt',
+    title: '头条小程序'
   }
 }
 

package.json

@@ -7,7 +7,8 @@
 		"build:h5": "npm run lint && cross-env NODE_ENV=production UNI_WATCH=false UNI_PLATFORM=h5 node build/build.js",
 		"build:mp-weixin": "npm run lint && cross-env UNI_PLATFORM=mp-weixin rollup -c build/rollup.config.js",
 		"build:mp-baidu": "npm run lint && cross-env UNI_PLATFORM=mp-baidu rollup -c build/rollup.config.js",
-		"build:mp-alipay": "npm run lint && cross-env UNI_PLATFORM=mp-alipay rollup -c build/rollup.config.js",
+		"build:mp-alipay": "npm run lint && cross-env UNI_PLATFORM=mp-alipay rollup -c build/rollup.config.js",
+        "build:mp-toutiao": "npm run lint && cross-env UNI_PLATFORM=mp-toutiao rollup -c build/rollup.config.js",
 		"test:unit": "cross-env NODE_ENV=test UNI_PLATFORM=h5 mocha-webpack --require tests/unit/setup.js --webpack-config build/webpack.config.test.js tests/unit/**/*.spec.js"
 	},
 	"dependencies": {},

packages/uni-mp-toutiao/LICENSE

+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
\ No newline at end of file

packages/uni-mp-toutiao/dist/index.js

+const _toString = Object.prototype.toString;
+const hasOwnProperty = Object.prototype.hasOwnProperty;
+
+function isFn (fn) {
+  return typeof fn === 'function'
+}
+
+function isStr (str) {
+  return typeof str === 'string'
+}
+
+function isPlainObject (obj) {
+  return _toString.call(obj) === '[object Object]'
+}
+
+function hasOwn (obj, key) {
+  return hasOwnProperty.call(obj, key)
+}
+
+const SYNC_API_RE = /hideKeyboard|upx2px|canIUse|^create|Sync$|Manager$/;
+
+const CONTEXT_API_RE = /^create|Manager$/;
+
+const CALLBACK_API_RE = /^on/;
+
+function isContextApi (name) {
+  return CONTEXT_API_RE.test(name)
+}
+function isSyncApi (name) {
+  return SYNC_API_RE.test(name)
+}
+
+function isCallbackApi (name) {
+  return CALLBACK_API_RE.test(name)
+}
+
+function handlePromise (promise) {
+  return promise.then(data => {
+    return [null, data]
+  })
+    .catch(err => [err])
+}
+
+function shouldPromise (name) {
+  if (isSyncApi(name)) {
+    return false
+  }
+  if (isCallbackApi(name)) {
+    return false
+  }
+  return true
+}
+
+function promisify (name, api) {
+  if (!shouldPromise(name)) {
+    return api
+  }
+  return function promiseApi (options = {}, ...params) {
+    if (isFn(options.success) || isFn(options.fail) || isFn(options.complete)) {
+      return api(options, ...params)
+    }
+    return handlePromise(new Promise((resolve, reject) => {
+      api(Object.assign({}, options, {
+        success: resolve,
+        fail: reject
+      }), ...params);
+      /* eslint-disable no-extend-native */
+      Promise.prototype.finally = function (callback) {
+        const promise = this.constructor;
+        return this.then(
+          value => promise.resolve(callback()).then(() => value),
+          reason => promise.resolve(callback()).then(() => {
+            throw reason
+          })
+        )
+      };
+    }))
+  }
+}
+
+const EPS = 1e-4;
+const BASE_DEVICE_WIDTH = 750;
+let isIOS = false;
+let deviceWidth = 0;
+let deviceDPR = 0;
+
+function checkDeviceWidth () {
+  const {
+    platform,
+    pixelRatio,
+    windowWidth
+  } = tt.getSystemInfoSync(); // uni=>tt runtime 编译目标是 uni 对象，内部不允许直接使用 uni
+
+  deviceWidth = windowWidth;
+  deviceDPR = pixelRatio;
+  isIOS = platform === 'ios';
+}
+
+function upx2px (number, newDeviceWidth) {
+  if (deviceWidth === 0) {
+    checkDeviceWidth();
+  }
+
+  number = Number(number);
+  if (number === 0) {
+    return 0
+  }
+  number = (number / BASE_DEVICE_WIDTH) * (newDeviceWidth || deviceWidth);
+  number = Math.floor(number + EPS);
+  if (number === 0) {
+    if (deviceDPR === 1 || !isIOS) {
+      return 1
+    } else {
+      return 0.5
+    }
+  }
+  return number
+}
+
+// 不支持的 API 列表
+const TODOS = [
+  'hideKeyboard'
+];
+
+// 需要做转换的 API 列表
+const protocols = {};
+
+TODOS.forEach(todoApi => {
+  protocols[todoApi] = false;
+});
+
+const CALLBACKS = ['success', 'fail', 'cancel', 'complete'];
+
+function processCallback (methodName, method, returnValue) {
+  return function (res) {
+    return method(processReturnValue(methodName, res, returnValue))
+  }
+}
+
+function processArgs (methodName, fromArgs, argsOption = {}, returnValue = {}, keepFromArgs = false) {
+  if (isPlainObject(fromArgs)) { // 一般 api 的参数解析
+    const toArgs = keepFromArgs === true ? fromArgs : {}; // returnValue 为 false 时，说明是格式化返回值，直接在返回值对象上修改赋值
+    if (isFn(argsOption)) {
+      argsOption = argsOption(fromArgs, toArgs) || {};
+    }
+    for (let key in fromArgs) {
+      if (hasOwn(argsOption, key)) {
+        let keyOption = argsOption[key];
+        if (isFn(keyOption)) {
+          keyOption = keyOption(fromArgs[key], fromArgs, toArgs);
+        }
+        if (!keyOption) { // 不支持的参数
+          console.warn(`头条小程序 ${methodName}暂不支持${key}`);
+        } else if (isStr(keyOption)) { // 重写参数 key
+          toArgs[keyOption] = fromArgs[key];
+        } else if (isPlainObject(keyOption)) { // {name:newName,value:value}可重新指定参数 key:value
+          toArgs[keyOption.name ? keyOption.name : key] = keyOption.value;
+        }
+      } else if (CALLBACKS.includes(key)) {
+        toArgs[key] = processCallback(methodName, fromArgs[key], returnValue);
+      } else {
+        if (!keepFromArgs) {
+          toArgs[key] = fromArgs[key];
+        }
+      }
+    }
+    return toArgs
+  } else if (isFn(fromArgs)) {
+    fromArgs = processCallback(methodName, fromArgs, returnValue);
+  }
+  return fromArgs
+}
+
+function processReturnValue (methodName, res, returnValue, keepReturnValue = false) {
+  if (isFn(protocols.returnValue)) { // 处理通用 returnValue
+    res = protocols.returnValue(methodName, res);
+  }
+  return processArgs(methodName, res, returnValue, {}, keepReturnValue)
+}
+
+function wrapper (methodName, method) {
+  if (hasOwn(protocols, methodName)) {
+    const protocol = protocols[methodName];
+    if (!protocol) { // 暂不支持的 api
+      return function () {
+        console.error(`头条小程序 暂不支持${methodName}`);
+      }
+    }
+    return function (arg1, arg2) { // 目前 api 最多两个参数
+      let options = protocol;
+      if (isFn(protocol)) {
+        options = protocol(arg1);
+      }
+
+      arg1 = processArgs(methodName, arg1, options.args, options.returnValue);
+
+      const returnValue = tt[options.name || methodName](arg1, arg2);
+      if (isSyncApi(methodName)) { // 同步 api
+        return processReturnValue(methodName, returnValue, options.returnValue, isContextApi(methodName))
+      }
+      return returnValue
+    }
+  }
+  return method
+}
+
+const todoApis = Object.create(null);
+
+const TODOS$1 = [
+  'subscribePush',
+  'unsubscribePush',
+  'onPush',
+  'offPush',
+  'share'
+];
+
+function createTodoApi (name) {
+  return function todoApi ({
+    fail,
+    complete
+  }) {
+    const res = {
+      errMsg: `${name}:fail:暂不支持 ${name} 方法`
+    };
+    isFn(fail) && fail(res);
+    isFn(complete) && complete(res);
+  }
+}
+
+TODOS$1.forEach(function (name) {
+  todoApis[name] = createTodoApi(name);
+});
+
+var providers = {
+  oauth: ['toutiao'],
+  share: ['toutiao'],
+  payment: ['toutiao'],
+  push: ['toutiao']
+};
+
+function getProvider ({
+  service,
+  success,
+  fail,
+  complete
+}) {
+  let res = false;
+  if (providers[service]) {
+    res = {
+      errMsg: 'getProvider:ok',
+      service,
+      provider: providers[service]
+    };
+    isFn(success) && success(res);
+  } else {
+    res = {
+      errMsg: 'getProvider:fail:服务[' + service + ']不存在'
+    };
+    isFn(fail) && fail(res);
+  }
+  isFn(complete) && complete(res);
+}
+
+var extraApi = /*#__PURE__*/Object.freeze({
+  getProvider: getProvider
+});
+
+
+
+var api = /*#__PURE__*/Object.freeze({
+
+});
+
+let uni = {};
+
+if (typeof Proxy !== 'undefined') {
+  uni = new Proxy({}, {
+    get (target, name) {
+      if (name === 'upx2px') {
+        return upx2px
+      }
+      if (api[name]) {
+        return promisify(name, api[name])
+      }
+      if (extraApi[name]) {
+        return promisify(name, extraApi[name])
+      }
+      if (todoApis[name]) {
+        return promisify(name, todoApis[name])
+      }
+      if (!hasOwn(tt, name) && !hasOwn(protocols, name)) {
+        return
+      }
+      return promisify(name, wrapper(name, tt[name]))
+    }
+  });
+} else {
+  uni.upx2px = upx2px;
+
+  Object.keys(todoApis).forEach(name => {
+    uni[name] = promisify(name, todoApis[name]);
+  });
+
+  Object.keys(extraApi).forEach(name => {
+    uni[name] = promisify(name, todoApis[name]);
+  });
+
+  Object.keys(api).forEach(name => {
+    uni[name] = promisify(name, api[name]);
+  });
+
+  Object.keys(tt).forEach(name => {
+    if (hasOwn(tt, name) || hasOwn(protocols, name)) {
+      uni[name] = promisify(name, wrapper(name, tt[name]));
+    }
+  });
+}
+
+var uni$1 = uni;
+
+export default uni$1;

packages/uni-mp-toutiao/package.json

+{
+	"name": "@dcloudio/uni-mp-toutiao",
+	"version": "0.0.1",
+	"description": "uni-app mp-toutiao",
+	"main": "dist/index.js",
+	"scripts": {
+		"test": "echo \"Error: no test specified\" && exit 1"
+	},
+	"author": "fxy060608",
+	"license": "Apache-2.0"
+}

src/core/view/components/input/index.vue

@@ -141,7 +141,7 @@ export default {
     })
   },
   mounted () {
-    this._initInputStyle()
+    // this._initInputStyle()
 
     if (this.confirmType === 'search') {
       var formElem = document.createElement('form')
@@ -388,6 +388,8 @@ export default {
 
 	.input-placeholder {
 		color: gray;
+		height: inherit;
+		line-height: inherit;
 	}
 
 	input[type="search"]::-webkit-search-cancel-button {

src/platforms/mp-toutiao/service/api/protocols.js

+// 不支持的 API 列表
+const TODOS = [
+  'hideKeyboard'
+]
+
+// 需要做转换的 API 列表
+const protocols = {}
+
+TODOS.forEach(todoApi => {
+  protocols[todoApi] = false
+})
+
+export default protocols

src/platforms/mp-toutiao/service/api/providers.js

+export default {
+  oauth: ['toutiao'],
+  share: ['toutiao'],
+  payment: ['toutiao'],
+  push: ['toutiao']
+}