From f93866ba56b1af1f8b5e1472dbcf74744c8c3b9e Mon Sep 17 00:00:00 2001
From: wangyaqi <wangyaqi988@163.com>
Date: Mon, 13 Apr 2020 11:07:27 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20button=E7=BB=84=E4=BB=B6openType?=
 =?UTF-8?q?=E5=A4=B1=E6=95=88=E7=9A=84Bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/core/view/components/button/index.vue | 650 ++++++++++++----------
 1 file changed, 354 insertions(+), 296 deletions(-)

diff --git a/src/core/view/components/button/index.vue b/src/core/view/components/button/index.vue
index 58354e14b..f6b9e4ab4 100644
--- a/src/core/view/components/button/index.vue
+++ b/src/core/view/components/button/index.vue
@@ -1,9 +1,5 @@
 <script>
-import {
-  hover,
-  emitter,
-  listeners
-} from 'uni-mixins'
+import { hover, emitter, listeners } from 'uni-mixins'
 export default {
   name: 'Button',
   mixins: [hover, emitter, listeners],
@@ -39,6 +35,10 @@ export default {
         // 只有这几个可取值，其它都是非法的。
         return ~['', 'submit', 'reset'].indexOf(value)
       }
+    },
+    openType: {
+      type: String,
+      default: ''
     }
   },
   data () {
@@ -56,9 +56,53 @@ export default {
       }
       // TODO 通知父表单执行相应的行为
       if (this.formType) {
-        this.$dispatch('Form', this.formType === 'submit' ? 'uni-form-submit' : 'uni-form-reset', {
-          type: this.formType
-        })
+        this.$dispatch(
+          'Form',
+          this.formType === 'submit' ? 'uni-form-submit' : 'uni-form-reset',
+          {
+            type: this.formType
+          }
+        )
+        return
+      }
+      if (this.openType === 'feedback') {
+        const feedback = plus.webview.create(
+          'https://service.dcloud.net.cn/uniapp/feedback.html',
+          'feedback',
+          {
+            titleNView: {
+              titleText: '问题反馈',
+              autoBackButton: true,
+              backgroundColor: '#F7F7F7',
+              titleColor: '#007aff'
+            }
+          }
+        )
+        feedback.show('slide-in-right')
+        feedback.getTitleNView &&
+          setTimeout(function () {
+            let title = feedback.getTitleNView()
+            if (title) {
+              title.drawText(
+                '发送',
+                {
+                  top: 0,
+                  left: window.innerWidth - 60,
+                  width: 60,
+                  height: 44
+                },
+                {
+                  color: '#007aff',
+                  weight: 'bold'
+                }
+              )
+              title.addEventListener('click', function (e) {
+                feedback.evalJS(
+                  'mui&&mui.trigger(document.getElementById("submit"),"tap")'
+                )
+              })
+            }
+          }, 100)
       }
     },
     _bindObjectListeners (data, value) {
@@ -83,28 +127,42 @@ export default {
       })
     }
     if (this.hoverClass && this.hoverClass !== 'none') {
-      return createElement('uni-button', this._bindObjectListeners({
-        class: [this.hovering ? this.hoverClass : ''],
-        attrs: {
-          'disabled': this.disabled
-        },
-        on: {
-          touchstart: this._hoverTouchStart,
-          touchend: this._hoverTouchEnd,
-          touchcancel: this._hoverTouchCancel,
-          click: this._onClick
-        }
-      }, $listeners), this.$slots.default)
+      return createElement(
+        'uni-button',
+        this._bindObjectListeners(
+          {
+            class: [this.hovering ? this.hoverClass : ''],
+            attrs: {
+              disabled: this.disabled
+            },
+            on: {
+              touchstart: this._hoverTouchStart,
+              touchend: this._hoverTouchEnd,
+              touchcancel: this._hoverTouchCancel,
+              click: this._onClick
+            }
+          },
+          $listeners
+        ),
+        this.$slots.default
+      )
     } else {
-      return createElement('uni-button', this._bindObjectListeners({
-        class: [this.hovering ? this.hoverClass : ''],
-        attrs: {
-          'disabled': this.disabled
-        },
-        on: {
-          click: this._onClick
-        }
-      }, $listeners), this.$slots.default)
+      return createElement(
+        'uni-button',
+        this._bindObjectListeners(
+          {
+            class: [this.hovering ? this.hoverClass : ''],
+            attrs: {
+              disabled: this.disabled
+            },
+            on: {
+              click: this._onClick
+            }
+          },
+          $listeners
+        ),
+        this.$slots.default
+      )
     }
   },
   listeners: {
@@ -114,271 +172,271 @@ export default {
 }
 </script>
 <style>
-	uni-button {
-		position: relative;
-		display: block;
-		margin-left: auto;
-		margin-right: auto;
-		padding-left: 14px;
-		padding-right: 14px;
-		box-sizing: border-box;
-		font-size: 18px;
-		text-align: center;
-		text-decoration: none;
-		line-height: 2.55555556;
-		border-radius: 5px;
-		-webkit-tap-highlight-color: transparent;
-		overflow: hidden;
-		color: #000000;
-		background-color: #F8F8F8;
-		cursor: pointer;
-	}
-
-	uni-button[hidden] {
-		display: none !important;
-	}
-
-	uni-button:after {
-		content: " ";
-		width: 200%;
-		height: 200%;
-		position: absolute;
-		top: 0;
-		left: 0;
-		border: 1px solid rgba(0, 0, 0, 0.2);
-		-webkit-transform: scale(0.5);
-		transform: scale(0.5);
-		-webkit-transform-origin: 0 0;
-		transform-origin: 0 0;
-		box-sizing: border-box;
-		border-radius: 10px;
-	}
-
-	uni-button[native] {
-		padding-left: 0;
-		padding-right: 0;
-	}
-
-	uni-button[native] .uni-button-cover-view-wrapper {
-		border: inherit;
-		border-color: inherit;
-		border-radius: inherit;
-		background-color: inherit;
-	}
-
-	uni-button[native] .uni-button-cover-view-inner {
-		padding-left: 14px;
-		padding-right: 14px;
-	}
-
-	uni-button uni-cover-view {
-		line-height: inherit;
-		white-space: inherit;
-	}
-
-	uni-button[type=default] {
-		color: #000000;
-		background-color: #F8F8F8;
-	}
-
-	uni-button[type=primary] {
-		color: #FFFFFF;
-		background-color: #007aff;
-	}
-
-	uni-button[type=warn] {
-		color: #FFFFFF;
-		background-color: #E64340;
-	}
-
-	uni-button[disabled] {
-		color: rgba(255, 255, 255, 0.6);
-		cursor: not-allowed;
-	}
-
-	uni-button[disabled][type=default],
-	uni-button[disabled]:not([type]) {
-		color: rgba(0, 0, 0, 0.3);
-		background-color: #F7F7F7;
-	}
-
-	uni-button[disabled][type=primary] {
-		background-color: rgba(0, 122, 255, 0.6);
-	}
-
-	uni-button[disabled][type=warn] {
-		background-color: #EC8B89;
-	}
-
-	uni-button[type=primary][plain] {
-		color: #007aff;
-		border: 1px solid #007aff;
-		background-color: transparent;
-	}
-
-	uni-button[type=primary][plain][disabled] {
-		color: rgba(0, 0, 0, 0.2);
-		border-color: rgba(0, 0, 0, 0.2);
-	}
-
-	uni-button[type=primary][plain]:after {
-		border-width: 0;
-	}
-
-	uni-button[type=default][plain] {
-		color: #353535;
-		border: 1px solid #353535;
-		background-color: transparent;
-	}
-
-	uni-button[type=default][plain][disabled] {
-		color: rgba(0, 0, 0, 0.2);
-		border-color: rgba(0, 0, 0, 0.2);
-	}
-
-	uni-button[type=default][plain]:after {
-		border-width: 0;
-	}
-
-	uni-button[plain] {
-		color: #353535;
-		border: 1px solid #353535;
-		background-color: transparent;
-	}
-
-	uni-button[plain][disabled] {
-		color: rgba(0, 0, 0, 0.2);
-		border-color: rgba(0, 0, 0, 0.2);
-	}
-
-	uni-button[plain]:after {
-		border-width: 0;
-	}
-
-	uni-button[plain][native] .uni-button-cover-view-inner {
-		padding: 0;
-	}
-
-	uni-button[type=warn][plain] {
-		color: #e64340;
-		border: 1px solid #e64340;
-		background-color: transparent;
-	}
-
-	uni-button[type=warn][plain][disabled] {
-		color: rgba(0, 0, 0, 0.2);
-		border-color: rgba(0, 0, 0, 0.2);
-	}
-
-	uni-button[type=warn][plain]:after {
-		border-width: 0;
-	}
-
-	uni-button[size=mini] {
-		display: inline-block;
-		line-height: 2.3;
-		font-size: 13px;
-		padding: 0 1.34em;
-	}
-
-	uni-button[size=mini][native] {
-		padding: 0;
-	}
-
-	uni-button[size=mini][native] .uni-button-cover-view-inner {
-		padding: 0 1.34em;
-	}
-
-	uni-button[loading]:not([disabled]){
-		cursor: progress;
-	}
-
-	uni-button[loading]:before {
-		content: " ";
-		display: inline-block;
-		width: 18px;
-		height: 18px;
-		vertical-align: middle;
-		-webkit-animation: uni-loading 1s steps(12, end) infinite;
-		animation: uni-loading 1s steps(12, end) infinite;
-		background-size: 100%;
-	}
-
-	uni-button[loading][type=primary] {
-		color: rgba(255, 255, 255, 0.6);
-		background-color: #0062cc;
-	}
-
-	uni-button[loading][type=primary][plain] {
-		color: #007aff;
-		background-color: transparent;
-	}
-
-	uni-button[loading][type=default] {
-		color: rgba(0, 0, 0, 0.6);
-		background-color: #DEDEDE;
-	}
-
-	uni-button[loading][type=default][plain] {
-		color: #353535;
-		background-color: transparent;
-	}
-
-	uni-button[loading][type=warn] {
-		color: rgba(255, 255, 255, 0.6);
-		background-color: #CE3C39;
-	}
-
-	uni-button[loading][type=warn][plain] {
-		color: #e64340;
-		background-color: transparent;
-	}
-
-	uni-button[loading][native]:before {
-		content: none;
-	}
-
-	.button-hover {
-		color: rgba(0, 0, 0, 0.6);
-		background-color: #DEDEDE;
-	}
-
-	.button-hover[plain] {
-		color: rgba(53, 53, 53, 0.6);
-		border-color: rgba(53, 53, 53, 0.6);
-		background-color: transparent;
-	}
-
-	.button-hover[type=primary] {
-		color: rgba(255, 255, 255, 0.6);
-		background-color: #0062cc;
-	}
-
-	.button-hover[type=primary][plain] {
-		color: rgba(26, 173, 25, 0.6);
-		border-color: rgba(26, 173, 25, 0.6);
-		background-color: transparent;
-	}
-
-	.button-hover[type=default] {
-		color: rgba(0, 0, 0, 0.6);
-		background-color: #DEDEDE;
-	}
-
-	.button-hover[type=default][plain] {
-		color: rgba(53, 53, 53, 0.6);
-		border-color: rgba(53, 53, 53, 0.6);
-		background-color: transparent;
-	}
-
-	.button-hover[type=warn] {
-		color: rgba(255, 255, 255, 0.6);
-		background-color: #CE3C39;
-	}
-
-	.button-hover[type=warn][plain] {
-		color: rgba(230, 67, 64, 0.6);
-		border-color: rgba(230, 67, 64, 0.6);
-		background-color: transparent;
-	}
+uni-button {
+  position: relative;
+  display: block;
+  margin-left: auto;
+  margin-right: auto;
+  padding-left: 14px;
+  padding-right: 14px;
+  box-sizing: border-box;
+  font-size: 18px;
+  text-align: center;
+  text-decoration: none;
+  line-height: 2.55555556;
+  border-radius: 5px;
+  -webkit-tap-highlight-color: transparent;
+  overflow: hidden;
+  color: #000000;
+  background-color: #f8f8f8;
+  cursor: pointer;
+}
+
+uni-button[hidden] {
+  display: none !important;
+}
+
+uni-button:after {
+  content: " ";
+  width: 200%;
+  height: 200%;
+  position: absolute;
+  top: 0;
+  left: 0;
+  border: 1px solid rgba(0, 0, 0, 0.2);
+  -webkit-transform: scale(0.5);
+  transform: scale(0.5);
+  -webkit-transform-origin: 0 0;
+  transform-origin: 0 0;
+  box-sizing: border-box;
+  border-radius: 10px;
+}
+
+uni-button[native] {
+  padding-left: 0;
+  padding-right: 0;
+}
+
+uni-button[native] .uni-button-cover-view-wrapper {
+  border: inherit;
+  border-color: inherit;
+  border-radius: inherit;
+  background-color: inherit;
+}
+
+uni-button[native] .uni-button-cover-view-inner {
+  padding-left: 14px;
+  padding-right: 14px;
+}
+
+uni-button uni-cover-view {
+  line-height: inherit;
+  white-space: inherit;
+}
+
+uni-button[type="default"] {
+  color: #000000;
+  background-color: #f8f8f8;
+}
+
+uni-button[type="primary"] {
+  color: #ffffff;
+  background-color: #007aff;
+}
+
+uni-button[type="warn"] {
+  color: #ffffff;
+  background-color: #e64340;
+}
+
+uni-button[disabled] {
+  color: rgba(255, 255, 255, 0.6);
+  cursor: not-allowed;
+}
+
+uni-button[disabled][type="default"],
+uni-button[disabled]:not([type]) {
+  color: rgba(0, 0, 0, 0.3);
+  background-color: #f7f7f7;
+}
+
+uni-button[disabled][type="primary"] {
+  background-color: rgba(0, 122, 255, 0.6);
+}
+
+uni-button[disabled][type="warn"] {
+  background-color: #ec8b89;
+}
+
+uni-button[type="primary"][plain] {
+  color: #007aff;
+  border: 1px solid #007aff;
+  background-color: transparent;
+}
+
+uni-button[type="primary"][plain][disabled] {
+  color: rgba(0, 0, 0, 0.2);
+  border-color: rgba(0, 0, 0, 0.2);
+}
+
+uni-button[type="primary"][plain]:after {
+  border-width: 0;
+}
+
+uni-button[type="default"][plain] {
+  color: #353535;
+  border: 1px solid #353535;
+  background-color: transparent;
+}
+
+uni-button[type="default"][plain][disabled] {
+  color: rgba(0, 0, 0, 0.2);
+  border-color: rgba(0, 0, 0, 0.2);
+}
+
+uni-button[type="default"][plain]:after {
+  border-width: 0;
+}
+
+uni-button[plain] {
+  color: #353535;
+  border: 1px solid #353535;
+  background-color: transparent;
+}
+
+uni-button[plain][disabled] {
+  color: rgba(0, 0, 0, 0.2);
+  border-color: rgba(0, 0, 0, 0.2);
+}
+
+uni-button[plain]:after {
+  border-width: 0;
+}
+
+uni-button[plain][native] .uni-button-cover-view-inner {
+  padding: 0;
+}
+
+uni-button[type="warn"][plain] {
+  color: #e64340;
+  border: 1px solid #e64340;
+  background-color: transparent;
+}
+
+uni-button[type="warn"][plain][disabled] {
+  color: rgba(0, 0, 0, 0.2);
+  border-color: rgba(0, 0, 0, 0.2);
+}
+
+uni-button[type="warn"][plain]:after {
+  border-width: 0;
+}
+
+uni-button[size="mini"] {
+  display: inline-block;
+  line-height: 2.3;
+  font-size: 13px;
+  padding: 0 1.34em;
+}
+
+uni-button[size="mini"][native] {
+  padding: 0;
+}
+
+uni-button[size="mini"][native] .uni-button-cover-view-inner {
+  padding: 0 1.34em;
+}
+
+uni-button[loading]:not([disabled]) {
+  cursor: progress;
+}
+
+uni-button[loading]:before {
+  content: " ";
+  display: inline-block;
+  width: 18px;
+  height: 18px;
+  vertical-align: middle;
+  -webkit-animation: uni-loading 1s steps(12, end) infinite;
+  animation: uni-loading 1s steps(12, end) infinite;
+  background-size: 100%;
+}
+
+uni-button[loading][type="primary"] {
+  color: rgba(255, 255, 255, 0.6);
+  background-color: #0062cc;
+}
+
+uni-button[loading][type="primary"][plain] {
+  color: #007aff;
+  background-color: transparent;
+}
+
+uni-button[loading][type="default"] {
+  color: rgba(0, 0, 0, 0.6);
+  background-color: #dedede;
+}
+
+uni-button[loading][type="default"][plain] {
+  color: #353535;
+  background-color: transparent;
+}
+
+uni-button[loading][type="warn"] {
+  color: rgba(255, 255, 255, 0.6);
+  background-color: #ce3c39;
+}
+
+uni-button[loading][type="warn"][plain] {
+  color: #e64340;
+  background-color: transparent;
+}
+
+uni-button[loading][native]:before {
+  content: none;
+}
+
+.button-hover {
+  color: rgba(0, 0, 0, 0.6);
+  background-color: #dedede;
+}
+
+.button-hover[plain] {
+  color: rgba(53, 53, 53, 0.6);
+  border-color: rgba(53, 53, 53, 0.6);
+  background-color: transparent;
+}
+
+.button-hover[type="primary"] {
+  color: rgba(255, 255, 255, 0.6);
+  background-color: #0062cc;
+}
+
+.button-hover[type="primary"][plain] {
+  color: rgba(26, 173, 25, 0.6);
+  border-color: rgba(26, 173, 25, 0.6);
+  background-color: transparent;
+}
+
+.button-hover[type="default"] {
+  color: rgba(0, 0, 0, 0.6);
+  background-color: #dedede;
+}
+
+.button-hover[type="default"][plain] {
+  color: rgba(53, 53, 53, 0.6);
+  border-color: rgba(53, 53, 53, 0.6);
+  background-color: transparent;
+}
+
+.button-hover[type="warn"] {
+  color: rgba(255, 255, 255, 0.6);
+  background-color: #ce3c39;
+}
+
+.button-hover[type="warn"][plain] {
+  color: rgba(230, 67, 64, 0.6);
+  border-color: rgba(230, 67, 64, 0.6);
+  background-color: transparent;
+}
 </style>
-- 
GitLab