From a33ba1e401b9fabf9f3be0e102f3d28ba8c022b0 Mon Sep 17 00:00:00 2001 From: lucky Date: Tue, 20 Jul 2021 21:39:55 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=97=B6=E9=97=B4=E5=9F=BA=E5=87=86?= =?UTF-8?q?=E7=BA=BF=EF=BC=8C=E9=BB=98=E8=AE=A4=E6=8F=92=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 27 ++--- src/components/TimeLine/TimeLine.vue | 27 ++++- src/components/TimeLine/component/TimeBox.vue | 92 ++++++++++++++-- src/plugins/TaskDesc/TaskDesc.vue | 23 ++++ .../TaskTimeDifference/TaskTimeDifference.vue | 23 ++++ src/plugins/TaskTitle/TaskTitle.vue | 23 ++++ yarn.lock | 102 +++--------------- 7 files changed, 201 insertions(+), 116 deletions(-) create mode 100644 src/plugins/TaskDesc/TaskDesc.vue create mode 100644 src/plugins/TaskTimeDifference/TaskTimeDifference.vue create mode 100644 src/plugins/TaskTitle/TaskTitle.vue diff --git a/CHANGELOG.md b/CHANGELOG.md index f23346b..0588973 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,11 +3,6 @@ ### 🌟 新功能 范围|描述|commitId --|--|-- - - | db store | [6414c4f](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/6414c4f) - - | indexedDB | [687394e](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/687394e) - - | 标题栏角色栏全局任务组件新建 | [0500cb4](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/0500cb4) - pinch | alloy finger实现图片的pinch放大缩小 | [de01343](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/de01343) - 富文本插件 | 富文本插件demo测试 | [ed3d644](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/ed3d644) - | 标题栏变化 | [c0fcd9d](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/c0fcd9d) - | 标题栏角色栏全局任务组件新建 | [0500cb4](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/0500cb4) - | 角色栏实现 | [94cd671](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/94cd671) @@ -24,7 +19,6 @@ ### 🎨 代码样式 范围|描述|commitId --|--|-- - - | 组件新建 | [89c0035](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/89c0035) - | 更新代码 | [8c27e68](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/8c27e68) - | 更新代码 | [1f40a76](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/1f40a76) - | 任务快捷方式图标增加 | [4aba872](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/4aba872) @@ -37,10 +31,10 @@ ### 🐛 Bug 修复 范围|描述|commitId --|--|-- - - | 修改main | [749ae9a](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/749ae9a) - | 角色栏修改 | [19228d6](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/19228d6) - | 上下滚动时间轴 | [d533a01](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/d533a01) - | 时间轴上下滑动 | [4d0ae46](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/4d0ae46) + - | 提示信息显示bug及日常任务收缩问题 | [f2f06c5](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/f2f06c5) - | 修改角色栏组件 | [a54c601](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/a54c601) - | 修改main | [749ae9a](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/749ae9a) @@ -48,21 +42,18 @@ ### 📝 文档 范围|描述|commitId --|--|-- - - | README.md | [ab0eb05](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/ab0eb05) + - | README.md | [ab0eb05](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/ab0eb05) ### 🔨 代码重构 范围|描述|commitId --|--|-- - template | eslint prettier sass uview tailwindcss | [9c966a1](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/9c966a1) + template | eslint prettier sass uview tailwindcss | [9c966a1](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/9c966a1) ### 🚀 性能优化 范围|描述|commitId --|--|-- - - | 组件文件夹新建 | [22bfe7b](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/22bfe7b) - - | 组件文件夹新建 | [17bb8c9](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/17bb8c9) - - | 组件文件夹新建 | [1421504](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/1421504) - | 角色栏文字颜色修改 | [215c6b3](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/215c6b3) - | 组件文件夹新建 | [22bfe7b](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/22bfe7b) - | 组件文件夹新建 | [17bb8c9](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/17bb8c9) @@ -72,12 +63,14 @@ ### chore 范围|描述|commitId --|--|-- - pwa 小程序 | 移除了pwa,alloyFinger添加平台判断 | [875fab4](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/875fab4) - - | uview-ui | [a9ea34b](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/a9ea34b) - 信息配置 | 配置eslint等配置 | [7421443](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/7421443) + - | mock | [51c24a5](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/51c24a5) + pwa 小程序 | 移除了pwa,alloyFinger添加平台判断 | [875fab4](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/875fab4) + - | uview-ui | [a9ea34b](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/a9ea34b) + 信息配置 | 配置eslint等配置 | [7421443](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/7421443) 范围|描述|commitId --|--|-- - - | !2 基础模板v1.1.0 | [f5e61dd](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/f5e61dd) - - | init | [c0f1deb](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/c0f1deb) + - | !2 基础模板v1.1.0 | [f5e61dd](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/f5e61dd) + - | init | [c0f1deb](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/c0f1deb) + diff --git a/src/components/TimeLine/TimeLine.vue b/src/components/TimeLine/TimeLine.vue index dafa767..0e062c0 100644 --- a/src/components/TimeLine/TimeLine.vue +++ b/src/components/TimeLine/TimeLine.vue @@ -15,6 +15,7 @@ @scroll="scroll" @scrolltolower="handleScrollBottom" @scrolltoupper="handleScrollTop" + id="scroll" > @@ -28,9 +29,33 @@ export default { name: 'TimeLine', components: { TimeBox }, data() { - return { top: 0 }; + return { + top: 0, + list1: [ + { + state: 0, + TaskPanel: { height: '100' }, + }, + { + state: 1, + TaskPanel: { height: '100' }, + }, + { + state: 2, + TaskPanel: { height: '100' }, + }, + ], + }; }, computed: mapState('home', ['scrollTop', 'showTips']), + mounted() { + let tasksHeight = 0; + const scrollHeight = document.getElementById('scroll').clientHeight; + for (let i = 0; i < this.list1.length; i++) { + tasksHeight += this.list1[i].TaskPanel.height - 0 + 42; + } + this.top = tasksHeight - scrollHeight / 2; + }, methods: { ...mapMutations('home', ['setScrollTop', 'setShrink']), // 滚动 diff --git a/src/components/TimeLine/component/TimeBox.vue b/src/components/TimeLine/component/TimeBox.vue index 4994319..2d5de43 100644 --- a/src/components/TimeLine/component/TimeBox.vue +++ b/src/components/TimeLine/component/TimeBox.vue @@ -9,7 +9,7 @@ - + 任务时间栏 @@ -23,10 +23,19 @@ - + - - 瓶身描绘的牡丹一如你初妆 + + + + 这是个基准线 + + + + + + + @@ -38,24 +47,87 @@ + + diff --git a/src/plugins/TaskTimeDifference/TaskTimeDifference.vue b/src/plugins/TaskTimeDifference/TaskTimeDifference.vue new file mode 100644 index 0000000..2bf5fac --- /dev/null +++ b/src/plugins/TaskTimeDifference/TaskTimeDifference.vue @@ -0,0 +1,23 @@ + + + + + diff --git a/src/plugins/TaskTitle/TaskTitle.vue b/src/plugins/TaskTitle/TaskTitle.vue new file mode 100644 index 0000000..a491a20 --- /dev/null +++ b/src/plugins/TaskTitle/TaskTitle.vue @@ -0,0 +1,23 @@ + + + + + diff --git a/yarn.lock b/yarn.lock index eaffaed..2945b93 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1151,11 +1151,6 @@ pako "^1.0.11" safe-area-insets "^1.4.1" -"@dcloudio/uni-helper-json@*": - version "1.0.13" - resolved "https://registry.npm.taobao.org/@dcloudio/uni-helper-json/download/@dcloudio/uni-helper-json-1.0.13.tgz#4e8aa062daaefb30d98973c035a7b0ab628329c7" - integrity sha1-ToqgYtqu+zDZiXPANaewq2KDKcc= - "@dcloudio/uni-i18n@^0.0.3": version "0.0.3" resolved "https://registry.nlark.com/@dcloudio/uni-i18n/download/@dcloudio/uni-i18n-0.0.3.tgz#c7ff6ea6a4ea5cd5ef8dc3d674afa2e64502c151" @@ -1306,13 +1301,6 @@ dependencies: purgecss "^3.1.3" -"@fullhuman/postcss-purgecss@^4.0.3": - version "4.0.3" - resolved "https://registry.yarnpkg.com/@fullhuman/postcss-purgecss/-/postcss-purgecss-4.0.3.tgz#55d71712ec1c7a88e0d1ba5f10ce7fb6aa05beb4" - integrity sha512-/EnQ9UDWGGqHkn1UKAwSgh+gJHPKmD+Z+5dQ4gWT4qq2NUyez3zqAfZNwFH3eSgmgO+wjTXfhlLchx2M9/K+7Q== - dependencies: - purgecss "^4.0.3" - "@hap-toolkit/aaptjs@^1.0.0": version "1.0.0" resolved "https://registry.npm.taobao.org/@hap-toolkit/aaptjs/download/@hap-toolkit/aaptjs-1.0.0.tgz#460d45a846c0b786a421c82ce25fcd9fff0928e6" @@ -1736,17 +1724,17 @@ resolved "https://registry.npm.taobao.org/@soda/get-current-script/download/@soda/get-current-script-1.0.2.tgz#a53515db25d8038374381b73af20bb4f2e508d87" integrity sha1-pTUV2yXYA4N0OBtzryC7Ty5QjYc= -"@tailwindcss/postcss7-compat@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@tailwindcss/postcss7-compat/-/postcss7-compat-2.2.0.tgz#adc5c301f5fd5ef0799f1d674999af12e8a5fd40" - integrity sha512-0OMFtc0+B+Gccg5DGfcv5aWjPFtGn6yyIpJvqEFdtk3O5t+H6Swe2R1VKN480Iwh6HE9kkvWA5ruFa+6gfJtWQ== +"@tailwindcss/postcss7-compat@^2.2.4", "tailwindcss@npm:@tailwindcss/postcss7-compat@^2.2.4": + version "2.2.4" + resolved "https://registry.nlark.com/@tailwindcss/postcss7-compat/download/@tailwindcss/postcss7-compat-2.2.4.tgz#0e5b446e94cfdf892e4f76cecb703c8d698050f3" + integrity sha1-DltEbpTP34kuT3bOy3A8jWmAUPM= dependencies: "@fullhuman/postcss-purgecss" "^3.1.3" arg "^5.0.0" autoprefixer "^9" bytes "^3.0.0" chalk "^4.1.1" - chokidar "^3.5.1" + chokidar "^3.5.2" color "^3.1.3" cosmiconfig "^7.0.0" detective "^5.2.0" @@ -1766,7 +1754,7 @@ postcss "^7" postcss-functions "^3" postcss-js "^2" - postcss-load-config "^3.0.1" + postcss-load-config "^3.1.0" postcss-nested "^4" postcss-selector-parser "^6.0.6" postcss-value-parser "^4.1.0" @@ -3635,7 +3623,7 @@ check-types@^8.0.3: resolved "https://registry.nlark.com/check-types/download/check-types-8.0.3.tgz#3356cca19c889544f2d7a95ed49ce508a0ecf552" integrity sha1-M1bMoZyIlUTy16le1JzlCKDs9VI= -"chokidar@>=3.0.0 <4.0.0", chokidar@^3.4.1, chokidar@^3.5.1, chokidar@^3.5.2: +"chokidar@>=3.0.0 <4.0.0", chokidar@^3.4.1, chokidar@^3.5.2: version "3.5.2" resolved "https://registry.nlark.com/chokidar/download/chokidar-3.5.2.tgz#dba3976fcadb016f66fd365021d91600d01c1e75" integrity sha1-26OXb8rbAW9m/TZQIdkWANAcHnU= @@ -4762,10 +4750,10 @@ dateformat@^3.0.0: resolved "https://registry.npm.taobao.org/dateformat/download/dateformat-3.0.3.tgz?cache=0&sync_timestamp=1612037821692&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdateformat%2Fdownload%2Fdateformat-3.0.3.tgz#a6e37499a4d9a9cf85ef5872044d62901c9889ae" integrity sha1-puN0maTZqc+F71hyBE1ikByYia4= -dayjs@^1.10.5: - version "1.10.5" - resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.10.5.tgz#5600df4548fc2453b3f163ebb2abbe965ccfb986" - integrity sha512-BUFis41ikLz+65iH6LHQCDm4YPMj5r1YFLdupPIyM4SGcXMmtiLQ7U37i+hGS8urIuqe7I/ou3IS1jVc4nbN4g== +dayjs@^1.10.6: + version "1.10.6" + resolved "https://registry.nlark.com/dayjs/download/dayjs-1.10.6.tgz#288b2aa82f2d8418a6c9d4df5898c0737ad02a63" + integrity sha1-KIsqqC8thBimydTfWJjAc3rQKmM= de-indent@^1.0.2: version "1.0.2" @@ -10028,14 +10016,6 @@ postcss-js@^2: camelcase-css "^2.0.1" postcss "^7.0.18" -postcss-js@^3.0.3: - version "3.0.3" - resolved "https://registry.yarnpkg.com/postcss-js/-/postcss-js-3.0.3.tgz#2f0bd370a2e8599d45439f6970403b5873abda33" - integrity sha512-gWnoWQXKFw65Hk/mi2+WTQTHdPD5UJdDXZmX073EY/B3BWnYjO4F4t0VneTCnCGQ5E5GsCdMkzPaTXwl3r5dJw== - dependencies: - camelcase-css "^2.0.1" - postcss "^8.1.6" - postcss-load-config@^2.0.0: version "2.1.2" resolved "https://registry.nlark.com/postcss-load-config/download/postcss-load-config-2.1.2.tgz#c5ea504f2c4aef33c7359a34de3573772ad7502a" @@ -10044,7 +10024,7 @@ postcss-load-config@^2.0.0: cosmiconfig "^5.0.0" import-cwd "^2.0.0" -postcss-load-config@^3.0.1, postcss-load-config@^3.1.0: +postcss-load-config@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/postcss-load-config/-/postcss-load-config-3.1.0.tgz#d39c47091c4aec37f50272373a6a648ef5e97829" integrity sha512-ipM8Ds01ZUophjDTQYSVP70slFSYg3T0/zyfII5vzhN6V57YSxMgG5syXuwi5VtS8wSf3iL30v0uBdoIVx4Q0g== @@ -10184,13 +10164,6 @@ postcss-modules-values@^3.0.0: icss-utils "^4.0.0" postcss "^7.0.6" -postcss-nested@5.0.5: - version "5.0.5" - resolved "https://registry.yarnpkg.com/postcss-nested/-/postcss-nested-5.0.5.tgz#f0a107d33a9fab11d7637205f5321e27223e3603" - integrity sha512-GSRXYz5bccobpTzLQZXOnSOfKl6TwVr5CyAQJUPub4nuRJSOECK5AqurxVgmtxP48p0Kc/ndY/YyS1yqldX0Ew== - dependencies: - postcss-selector-parser "^6.0.4" - postcss-nested@^4: version "4.2.3" resolved "https://registry.yarnpkg.com/postcss-nested/-/postcss-nested-4.2.3.tgz#c6f255b0a720549776d220d00c4b70cd244136f6" @@ -10327,7 +10300,7 @@ postcss-selector-parser@^5.0.0: indexes-of "^1.0.1" uniq "^1.0.1" -postcss-selector-parser@^6.0.0, postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4, postcss-selector-parser@^6.0.6: +postcss-selector-parser@^6.0.0, postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.6: version "6.0.6" resolved "https://registry.nlark.com/postcss-selector-parser/download/postcss-selector-parser-6.0.6.tgz?cache=0&sync_timestamp=1620752924836&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpostcss-selector-parser%2Fdownload%2Fpostcss-selector-parser-6.0.6.tgz#2c5bba8174ac2f6981ab631a42ab0ee54af332ea" integrity sha1-LFu6gXSsL2mBq2MaQqsO5UrzMuo= @@ -10388,7 +10361,7 @@ postcss@^7, postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.14, postcss@^7.0.18, po source-map "^0.6.1" supports-color "^6.1.0" -postcss@^8.1.6, postcss@^8.2.1, postcss@^8.3.5: +postcss@^8.2.1: version "8.3.5" resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.3.5.tgz#982216b113412bc20a86289e91eb994952a5b709" integrity sha512-NxTuJocUhYGsMiMFHDUkmjSKT3EdH4/WbGF6GCi1NDGk+vbcUTun4fpbOqaPtD8IIsztA2ilZm2DhYCuyN58gA== @@ -10560,16 +10533,6 @@ purgecss@^3.1.3: postcss "^8.2.1" postcss-selector-parser "^6.0.2" -purgecss@^4.0.3: - version "4.0.3" - resolved "https://registry.yarnpkg.com/purgecss/-/purgecss-4.0.3.tgz#8147b429f9c09db719e05d64908ea8b672913742" - integrity sha512-PYOIn5ibRIP34PBU9zohUcCI09c7drPJJtTDAc0Q6QlRz2/CHQ8ywGLdE7ZhxU2VTqB7p5wkvj5Qcm05Rz3Jmw== - dependencies: - commander "^6.0.0" - glob "^7.0.0" - postcss "^8.2.1" - postcss-selector-parser "^6.0.2" - q@^1.1.2, q@^1.5.1: version "1.5.1" resolved "https://registry.nlark.com/q/download/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7" @@ -12239,43 +12202,6 @@ table@^5.2.3: slice-ansi "^2.1.0" string-width "^3.0.0" -tailwindcss@^2.2.4: - version "2.2.4" - resolved "https://registry.yarnpkg.com/tailwindcss/-/tailwindcss-2.2.4.tgz#6a2e259b1e26125aeaa7cdc479963fd217c308b0" - integrity sha512-OdBCPgazNNsknSP+JfrPzkay9aqKjhKtFhbhgxHgvEFdHy/GuRPo2SCJ4w1SFTN8H6FPI4m6qD/Jj20NWY1GkA== - dependencies: - "@fullhuman/postcss-purgecss" "^4.0.3" - arg "^5.0.0" - bytes "^3.0.0" - chalk "^4.1.1" - chokidar "^3.5.2" - color "^3.1.3" - cosmiconfig "^7.0.0" - detective "^5.2.0" - didyoumean "^1.2.1" - dlv "^1.1.3" - fast-glob "^3.2.5" - fs-extra "^10.0.0" - glob-parent "^6.0.0" - html-tags "^3.1.0" - is-glob "^4.0.1" - lodash "^4.17.21" - lodash.topath "^4.5.2" - modern-normalize "^1.1.0" - node-emoji "^1.8.1" - normalize-path "^3.0.0" - object-hash "^2.2.0" - postcss-js "^3.0.3" - postcss-load-config "^3.1.0" - postcss-nested "5.0.5" - postcss-selector-parser "^6.0.6" - postcss-value-parser "^4.1.0" - pretty-hrtime "^1.0.3" - quick-lru "^5.1.1" - reduce-css-calc "^2.1.8" - resolve "^1.20.0" - tmp "^0.2.1" - tapable@^1.0.0, tapable@^1.1.3: version "1.1.3" resolved "https://registry.npm.taobao.org/tapable/download/tapable-1.1.3.tgz?cache=0&sync_timestamp=1607088891056&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ftapable%2Fdownload%2Ftapable-1.1.3.tgz#a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2"