From de0134388b1b58ac8a972e55669d8517ab34089e Mon Sep 17 00:00:00 2001 From: wally <18603454788@163.com> Date: Thu, 24 Jun 2021 08:18:07 +0800 Subject: [PATCH] =?UTF-8?q?feat(pinch):=20alloy=20finger=E5=AE=9E=E7=8E=B0?= =?UTF-8?q?=E5=9B=BE=E7=89=87=E7=9A=84pinch=E6=94=BE=E5=A4=A7=E7=BC=A9?= =?UTF-8?q?=E5=B0=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .eslintcache | 2 +- CHANGELOG.md | 8 ++++++- package.json | 3 ++- public/index.html | 6 ++++- src/main.js | 3 +++ src/pages.json | 6 +++++ src/pages/index/index.vue | 1 + src/pages/pinch/pinch.vue | 49 +++++++++++++++++++++++++++++++++++++++ yarn.lock | 5 ++++ 9 files changed, 79 insertions(+), 4 deletions(-) create mode 100644 src/pages/pinch/pinch.vue diff --git a/.eslintcache b/.eslintcache index fdbc74b..feeb38e 100644 --- a/.eslintcache +++ b/.eslintcache @@ -1 +1 @@ -[{"/mnt/c/Users/Administrator/Documents/coding/ccsens/demo/tall-v3.0-demo/src/main.js":"1","/mnt/c/Users/Administrator/Documents/coding/ccsens/demo/tall-v3.0-demo/src/utils/request.js":"2"},{"size":335,"mtime":1624344979998,"results":"3","hashOfConfig":"4"},{"size":1742,"mtime":1624344980012,"results":"5","hashOfConfig":"4"},{"filePath":"6","messages":"7","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},"178d5hk",{"filePath":"8","messages":"9","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},"/mnt/c/Users/Administrator/Documents/coding/ccsens/demo/tall-v3.0-demo/src/main.js",[],"/mnt/c/Users/Administrator/Documents/coding/ccsens/demo/tall-v3.0-demo/src/utils/request.js",[]] \ No newline at end of file +[{"/mnt/c/Users/Administrator/Documents/coding/ccsens/demo/tall-v3.0-demo/src/mock/rich-text.js":"1","/mnt/c/Users/Administrator/Documents/coding/ccsens/demo/tall-v3.0-demo/src/utils/request.js":"2"},{"size":1166,"mtime":1624412295740,"results":"3","hashOfConfig":"4"},{"size":1734,"mtime":1624404795201,"results":"5","hashOfConfig":"4"},{"filePath":"6","messages":"7","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},"178d5hk",{"filePath":"8","messages":"9","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},"/mnt/c/Users/Administrator/Documents/coding/ccsens/demo/tall-v3.0-demo/src/mock/rich-text.js",[],"/mnt/c/Users/Administrator/Documents/coding/ccsens/demo/tall-v3.0-demo/src/utils/request.js",[]] \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index d35eb70..8c14417 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,10 @@ -# [0.1.0](https://gitee.com/mongos/uni-cli-template/compare/v1.0.1...v0.1.0) (2021-06-23) +# [0.1.0](https://gitee.com/mongos/uni-cli-template/compare/v1.0.1...v0.1.0) (2021-06-24) + +### 🌟 新功能 +范围|描述|commitId +--|--|-- + 富文本插件 | 富文本插件demo测试 | [ed3d644](https://gitee.com/mongos/uni-cli-template/commits/ed3d644) + ### chore 范围|描述|commitId diff --git a/package.json b/package.json index b3045c9..1a2adbc 100644 --- a/package.json +++ b/package.json @@ -62,6 +62,7 @@ "@dcloudio/uni-stat": "^2.0.0-31920210609001", "@tailwindcss/postcss7-compat": "^2.2.0", "@vue/shared": "^3.0.0", + "alloyfinger": "^0.1.16", "autoprefixer": "^9", "core-js": "^3.6.5", "dayjs": "^1.10.5", @@ -92,7 +93,6 @@ "@vue/cli-plugin-pwa": "~4.5.0", "@vue/cli-plugin-vuex": "~4.5.0", "@vue/cli-service": "~4.5.0", - "vue-cli-plugin-mock": "^1.0.3", "@vue/eslint-config-prettier": "^6.0.0", "babel-eslint": "^10.1.0", "babel-plugin-import": "^1.11.0", @@ -114,6 +114,7 @@ "sass": "^1.35.1", "sass-loader": "10", "vue-cli-plugin-commitlint": "~1.0.12", + "vue-cli-plugin-mock": "^1.0.3", "vue-template-compiler": "^2.6.11" }, "browserslist": [ diff --git a/public/index.html b/public/index.html index 755a4bc..269488e 100644 --- a/public/index.html +++ b/public/index.html @@ -23,7 +23,11 @@
- + + diff --git a/src/main.js b/src/main.js index 811e9a3..43dfc61 100644 --- a/src/main.js +++ b/src/main.js @@ -3,9 +3,12 @@ import App from './App'; import './registerServiceWorker'; import uView from 'uview-ui'; import './common/styles/index.css'; +import AlloyFinger from 'alloyfinger'; +import AlloyFingerPlugin from 'alloyfinger/vue/alloy_finger_vue'; Vue.config.productionTip = false; Vue.use(uView); +Vue.use(AlloyFingerPlugin, { AlloyFinger }); App.mpType = 'app'; diff --git a/src/pages.json b/src/pages.json index 2d28b19..4d26ee2 100644 --- a/src/pages.json +++ b/src/pages.json @@ -17,6 +17,12 @@ "style": { "navigationBarTitleText": "rich-text 测试" } + }, + { + "path": "pages/pinch/pinch", + "style": { + "navigationBarTitleText": "pinch 测试" + } } ], "globalStyle": { diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue index 5ebaf5a..8a9dc7c 100644 --- a/src/pages/index/index.vue +++ b/src/pages/index/index.vue @@ -3,6 +3,7 @@ iframe 验证 rich-text 验证 + pinch 事件验证 diff --git a/src/pages/pinch/pinch.vue b/src/pages/pinch/pinch.vue new file mode 100644 index 0000000..7e936cf --- /dev/null +++ b/src/pages/pinch/pinch.vue @@ -0,0 +1,49 @@ + + + diff --git a/yarn.lock b/yarn.lock index e5af31f..5c23ce7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2613,6 +2613,11 @@ ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.3, ajv@^6.12.4, ajv@^6.12.5: json-schema-traverse "^0.4.1" uri-js "^4.2.2" +alloyfinger@^0.1.16: + version "0.1.16" + resolved "https://registry.yarnpkg.com/alloyfinger/-/alloyfinger-0.1.16.tgz#8d5d46073cf1fedba5f446e666bc4b3925b8b8b5" + integrity sha512-AfsLALs929WQsjSk1pbysoiVU3bgm/4k1wdZDtMQ7uI7b8XweqCCnUiBYqqdp8uPZ1fBq/+LCJhgUlhd90FssQ== + alphanum-sort@^1.0.0: version "1.0.2" resolved "https://registry.npm.taobao.org/alphanum-sort/download/alphanum-sort-1.0.2.tgz#97a1119649b211ad33691d9f9f486a8ec9fbe0a3"