From 9d92be5aecdc9fe0d9d75abc53028f2ea666b185 Mon Sep 17 00:00:00 2001 From: song Date: Mon, 30 Aug 2021 14:34:14 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=A3=80=E6=9F=A5=E4=BA=A4=E4=BB=98?= =?UTF-8?q?=E7=89=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 3 +- src/components/Plugin/Plugin.vue | 23 +- src/components/ld-select/ld-select.vue | 28 +- src/components/uni-popup/message.js | 22 ++ src/components/uni-popup/popup.js | 23 ++ src/components/uni-popup/uni-popup-dialog.vue | 246 +++++++++++++++ .../uni-popup/uni-popup-message.vue | 115 +++++++ src/components/uni-popup/uni-popup-share.vue | 171 +++++++++++ src/components/uni-popup/uni-popup.vue | 289 ++++++++++++++++++ .../uni-transition/uni-transition.vue | 276 +++++++++++++++++ .../p-deliver-check/p-deliver-check.vue | 40 ++- .../p-delivery-history/p-delivery-history.vue | 95 ++++-- .../p-upload-deliverable.vue | 18 +- src/store/role/getters.js | 8 +- 14 files changed, 1274 insertions(+), 83 deletions(-) create mode 100644 src/components/uni-popup/message.js create mode 100644 src/components/uni-popup/popup.js create mode 100644 src/components/uni-popup/uni-popup-dialog.vue create mode 100644 src/components/uni-popup/uni-popup-message.vue create mode 100644 src/components/uni-popup/uni-popup-share.vue create mode 100644 src/components/uni-popup/uni-popup.vue create mode 100644 src/components/uni-transition/uni-transition.vue diff --git a/CHANGELOG.md b/CHANGELOG.md index 32cdfa9..978db18 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -# 0.1.0 (2021-08-27) +# 0.1.0 (2021-08-30) ### 🌟 新功能 范围|描述|commitId @@ -44,6 +44,7 @@ - | 标题栏变化 | [c0fcd9d](https://dd.tall.wiki/gitea/wally/tall-mui-3-project/commits/c0fcd9d) - | 标题栏角色栏全局任务组件新建 | [0500cb4](https://dd.tall.wiki/gitea/wally/tall-mui-3-project/commits/0500cb4) - | 模拟接口测试 | [69e7931](https://dd.tall.wiki/gitea/wally/tall-mui-3-project/commits/69e7931) + - | 添加内置插件-交付物 | [6e0bc46](https://dd.tall.wiki/gitea/wally/tall-mui-3-project/commits/6e0bc46) - | 添加子任务插件 子项目插件 | [7bda7e2](https://dd.tall.wiki/gitea/wally/tall-mui-3-project/commits/7bda7e2) - | 添加时间轴上下滚动 | [2b81bbc](https://dd.tall.wiki/gitea/wally/tall-mui-3-project/commits/2b81bbc) - | 添加项目排序 | [a0b491b](https://dd.tall.wiki/gitea/wally/tall-mui-3-project/commits/a0b491b) diff --git a/src/components/Plugin/Plugin.vue b/src/components/Plugin/Plugin.vue index 0fcbb4c..b41d05c 100644 --- a/src/components/Plugin/Plugin.vue +++ b/src/components/Plugin/Plugin.vue @@ -2,19 +2,19 @@ @@ -26,9 +26,8 @@ - - - + + diff --git a/src/components/ld-select/ld-select.vue b/src/components/ld-select/ld-select.vue index f0fc991..c8c2b92 100644 --- a/src/components/ld-select/ld-select.vue +++ b/src/components/ld-select/ld-select.vue @@ -19,7 +19,7 @@ @click="select(item)" > {{ getLabelKeyValue(item) }} - + @@ -207,30 +207,8 @@ export default { font-family: 'selectIcon'; src: url('//at.alicdn.com/t/font_1833441_ycfzdhg2u3.eot?t=1590375117208'); /* IE9 */ src: url('//at.alicdn.com/t/font_1833441_ycfzdhg2u3.eot?t=1590375117208#iefix') format('embedded-opentype'), - /* IE6-IE8 */ - /* url('data:application/x-font-woff2;charset=utf-8;base64, - d09GMgABAAAAAAMEAAsAAAAABvQAAAK4AAEAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAHEIGVgCDBgqBRIFCATYCJAMMCwgABCAFhQUHNRsfBsg+QCa3uoO0oAJTMwhx - Vu965keqWBy1hkbwtfzWb2Z279/shRhJisKF6FApKLI7oyBbpAaHo3w24k+ca9 - EUJbDmjaeznUdZ/FOUlkWdJ33rizZY/Pw6J5Xw0qKYxHTMesePHVT6EFpaC4zV - 70sKi2bYgNPc1w0WHnDVC/e/UnNTgyP+4Jq6BBpIHoisgypLaIAFEtU0wgeaIG - 8Yu4nAIZwnUK1QgFfOT6nUUoBpgXjj2lqplTMpiuXtCW3N2iK+aPTS2/Qdnzny8 - d+5IEiaDMy99exklra//FrKnX48pChmgrq5QcYRQCEe17ruqgqLAKv8Wntwqwhp - Lms/nB5yW/iHRxJEC0QOgT3NnfgF01NBKvOuIzNoZdh5gJuAeGrsozE8vOJ7u5D - 832oz55039W5G+S52K0H+zNf1TJz07k26kqoQybRfwVFV4rjDS/K8EXUyuF1cX - nT3weKS9Rvdm/xe7h8oA1hLwOR18R+Y4n4zwpr4z5SU089Vc+cpfWL+mn5APmT3 - Z39jeOs/GbWjK+DnmsuL/u6ehMX4j4yedSVkAUUuPh3TY022MtKZUEOtPqCb8Bkv - nr5XT6imU0gGrEJW7aAL/gw0OhegVV2F6pC7uTOppirKIA4MFQhTrpCM+AbZlDu6 - 4L/QmAkQWlMhQXU75D07O9Gtl0PUYjTBLyAzOLNQYtypIEEjvsXtBLQTooV2nrQr - GEau2gKmZlR4L8gwnGtBJbUn1diCOOQUnEkTkRAOeci9KHOQxvFro+tx3ZcGAael - jstCSBNDJuArgIyBYyy6OdZxAhHIELu1IC9AtgShCVtLltEKrSff1XoHJo3RC33h - M63o3j6pSNkmqmIWEAtxFHB2OwoRBAfyeqE3r2ogHeF42dBhs7gvf7CukH5MmlU - GOCpHihxFfs6TehDyKCqVAA==') - format('woff2'), - url('//at.alicdn.com/t/font_1833441_ycfzdhg2u3.woff?t=1590375117208') format('woff'), - url('//at.alicdn.com/t/font_1833441_ycfzdhg2u3.ttf?t=1590375117208') format('truetype'), */ - /* chrome, firefox, opera, Safari, Android, iOS 4.2+ */ - url('//at.alicdn.com/t/font_1833441_ycfzdhg2u3.svg?t=1590375117208#selectIcon') format('svg'); /* iOS 4.1- */ + /* chrome, firefox, opera, Safari, Android, iOS 4.2+ */ url('//at.alicdn.com/t/font_1833441_ycfzdhg2u3.svg?t=1590375117208#selectIcon') + format('svg'); /* iOS 4.1- */ } .selectIcon { diff --git a/src/components/uni-popup/message.js b/src/components/uni-popup/message.js new file mode 100644 index 0000000..577dd33 --- /dev/null +++ b/src/components/uni-popup/message.js @@ -0,0 +1,22 @@ +export default { + created() { + if (this.type === 'message') { + // 不显示遮罩 + this.maskShow = false; + // 获取子组件对象 + this.childrenMsg = null; + } + }, + methods: { + customOpen() { + if (this.childrenMsg) { + this.childrenMsg.open(); + } + }, + customClose() { + if (this.childrenMsg) { + this.childrenMsg.close(); + } + }, + }, +}; diff --git a/src/components/uni-popup/popup.js b/src/components/uni-popup/popup.js new file mode 100644 index 0000000..b646013 --- /dev/null +++ b/src/components/uni-popup/popup.js @@ -0,0 +1,23 @@ +import message from './message.js'; +// 定义 type 类型:弹出类型:top/bottom/center +const config = { + // 顶部弹出 + top: 'top', + // 底部弹出 + bottom: 'bottom', + // 居中弹出 + center: 'center', + // 消息提示 + message: 'top', + // 对话框 + dialog: 'center', + // 分享 + share: 'bottom', +}; + +export default { + data() { + return { config: config }; + }, + mixins: [message], +}; diff --git a/src/components/uni-popup/uni-popup-dialog.vue b/src/components/uni-popup/uni-popup-dialog.vue new file mode 100644 index 0000000..9102286 --- /dev/null +++ b/src/components/uni-popup/uni-popup-dialog.vue @@ -0,0 +1,246 @@ + + + + + diff --git a/src/components/uni-popup/uni-popup-message.vue b/src/components/uni-popup/uni-popup-message.vue new file mode 100644 index 0000000..fe401a7 --- /dev/null +++ b/src/components/uni-popup/uni-popup-message.vue @@ -0,0 +1,115 @@ + + + + diff --git a/src/components/uni-popup/uni-popup-share.vue b/src/components/uni-popup/uni-popup-share.vue new file mode 100644 index 0000000..224a9b7 --- /dev/null +++ b/src/components/uni-popup/uni-popup-share.vue @@ -0,0 +1,171 @@ + + + + diff --git a/src/components/uni-popup/uni-popup.vue b/src/components/uni-popup/uni-popup.vue new file mode 100644 index 0000000..4d3b867 --- /dev/null +++ b/src/components/uni-popup/uni-popup.vue @@ -0,0 +1,289 @@ + + + + diff --git a/src/components/uni-transition/uni-transition.vue b/src/components/uni-transition/uni-transition.vue new file mode 100644 index 0000000..9458e3b --- /dev/null +++ b/src/components/uni-transition/uni-transition.vue @@ -0,0 +1,276 @@ + + + + + diff --git a/src/plugins/p-deliver-check/p-deliver-check.vue b/src/plugins/p-deliver-check/p-deliver-check.vue index 875135a..e923be5 100644 --- a/src/plugins/p-deliver-check/p-deliver-check.vue +++ b/src/plugins/p-deliver-check/p-deliver-check.vue @@ -1,11 +1,17 @@ @@ -15,28 +21,40 @@ export default { name: 'p-deliver-check', data() { return { - content: '', + remark: '', type: 'textarea', border: true, height: 100, autoHeight: true, wordNum: 0, + score: 0, + type1: 'number', }; }, watch: { - content(val) { + remark(val) { this.wordNum = val.length; }, + + score(val) { + this.score1 = val; + }, }, methods: { // 提交交付物 - async submit() { - try { - console.log('检查'); - } catch (error) { - console.error('p-deliver-check.vue submit error: ', error); + submit() { + this.$emit('submit', this.remark, this.score); + }, + + sliderChange(e) { + this.score = e.detail.value; + }, + + changeNumber(e) { + if (e > 100) { + this.score = 100; } }, }, diff --git a/src/plugins/p-delivery-history/p-delivery-history.vue b/src/plugins/p-delivery-history/p-delivery-history.vue index 456bce5..f5a0455 100644 --- a/src/plugins/p-delivery-history/p-delivery-history.vue +++ b/src/plugins/p-delivery-history/p-delivery-history.vue @@ -1,37 +1,61 @@