From 2721db9464185013bd022ed047d9f7183f777fb0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E6=9C=9D=E4=BC=9F?= <2211960668@qq.com>
Date: Mon, 25 Apr 2022 14:45:38 +0800
Subject: [PATCH] add example fix styles

---
 .../wechatMp/pages/examples/g-btn/index.json  |  3 ++
 .../wechatMp/pages/examples/g-btn/index.less  | 11 +++++
 .../wechatMp/pages/examples/g-btn/index.ts    |  1 +
 .../wechatMp/pages/examples/g-btn/index.wxml  | 44 +++++++++++++++++++
 .../wechatMp/pages/examples/g-form/index.json |  3 ++
 .../wechatMp/pages/examples/g-form/index.less | 11 +++++
 .../wechatMp/pages/examples/g-form/index.ts   |  1 +
 .../wechatMp/pages/examples/g-form/index.wxml | 35 +++++++++++++++
 .../pages/examples/g-input/index.json         |  3 ++
 .../pages/examples/g-input/index.less         | 11 +++++
 .../wechatMp/pages/examples/g-input/index.ts  | 10 +++++
 .../pages/examples/g-input/index.wxml         | 42 ++++++++++++++++++
 .../wechatMp/pages/examples/index/index.json  |  3 ++
 .../wechatMp/pages/examples/index/index.less  | 11 +++++
 .../wechatMp/pages/examples/index/index.ts    |  7 +++
 .../wechatMp/pages/examples/index/index.wxml  | 15 +++++++
 .../styles/{cpn.less => cpn copy.less}        | 40 ++++++++++++++---
 17 files changed, 244 insertions(+), 7 deletions(-)
 create mode 100644 src/platforms/wechatMp/pages/examples/g-btn/index.json
 create mode 100644 src/platforms/wechatMp/pages/examples/g-btn/index.less
 create mode 100644 src/platforms/wechatMp/pages/examples/g-btn/index.ts
 create mode 100644 src/platforms/wechatMp/pages/examples/g-btn/index.wxml
 create mode 100644 src/platforms/wechatMp/pages/examples/g-form/index.json
 create mode 100644 src/platforms/wechatMp/pages/examples/g-form/index.less
 create mode 100644 src/platforms/wechatMp/pages/examples/g-form/index.ts
 create mode 100644 src/platforms/wechatMp/pages/examples/g-form/index.wxml
 create mode 100644 src/platforms/wechatMp/pages/examples/g-input/index.json
 create mode 100644 src/platforms/wechatMp/pages/examples/g-input/index.less
 create mode 100644 src/platforms/wechatMp/pages/examples/g-input/index.ts
 create mode 100644 src/platforms/wechatMp/pages/examples/g-input/index.wxml
 create mode 100644 src/platforms/wechatMp/pages/examples/index/index.json
 create mode 100644 src/platforms/wechatMp/pages/examples/index/index.less
 create mode 100644 src/platforms/wechatMp/pages/examples/index/index.ts
 create mode 100644 src/platforms/wechatMp/pages/examples/index/index.wxml
 rename src/platforms/wechatMp/styles/{cpn.less => cpn copy.less} (83%)

diff --git a/src/platforms/wechatMp/pages/examples/g-btn/index.json b/src/platforms/wechatMp/pages/examples/g-btn/index.json
new file mode 100644
index 000000000..6f3075ab5
--- /dev/null
+++ b/src/platforms/wechatMp/pages/examples/g-btn/index.json
@@ -0,0 +1,3 @@
+{
+    "navigationBarTitleText": "g-button"
+}
\ No newline at end of file
diff --git a/src/platforms/wechatMp/pages/examples/g-btn/index.less b/src/platforms/wechatMp/pages/examples/g-btn/index.less
new file mode 100644
index 000000000..debb9b256
--- /dev/null
+++ b/src/platforms/wechatMp/pages/examples/g-btn/index.less
@@ -0,0 +1,11 @@
+/**  index.wxss  **/
+@import "../../../styles/base.less";
+@import "../../../styles/cpn.less";
+
+.page-body {
+  height: 100vh;
+  display: flex;
+  flex: 1;
+  flex-direction: column;
+  background-color: @background-color-base;
+}
diff --git a/src/platforms/wechatMp/pages/examples/g-btn/index.ts b/src/platforms/wechatMp/pages/examples/g-btn/index.ts
new file mode 100644
index 000000000..f16cc1a82
--- /dev/null
+++ b/src/platforms/wechatMp/pages/examples/g-btn/index.ts
@@ -0,0 +1 @@
+Page({});
\ No newline at end of file
diff --git a/src/platforms/wechatMp/pages/examples/g-btn/index.wxml b/src/platforms/wechatMp/pages/examples/g-btn/index.wxml
new file mode 100644
index 000000000..ae726a837
--- /dev/null
+++ b/src/platforms/wechatMp/pages/examples/g-btn/index.wxml
@@ -0,0 +1,44 @@
+<!-- index.wxml -->
+<view class="page-body">
+    <view class="g-cell">
+        <button class="g-btn" size="default" inline>行内按钮1</button>
+        <button class="g-btn" size="default" inline>行内按钮2</button>
+        <button class="g-btn" size="default" inline>行内按钮3</button>
+    </view>
+    <view class="g-cell">
+        <button class="g-btn" size="default">基本按钮</button>
+    </view>
+    <view class="g-cell">
+        <button class="g-btn g-btn-large" size="default">大按钮</button>
+    </view>
+    <view class="g-cell">
+        <button class="g-btn g-btn-small" size="default">小按钮</button>
+    </view>
+    <view class="g-cell">
+        <button class="g-btn g-btn-fullWidth" size="default">全宽按钮</button>
+    </view>
+    <view class="g-cell">
+        <button class="g-btn g-btn-warning g-btn-small" size="default">warning</button>
+    </view>
+    <view class="g-cell">
+        <button class="g-btn g-btn-primary g-btn-small" size="default">warning</button>
+    </view>
+    <view class="g-cell">
+        <button class="g-btn g-btn-error g-btn-small" size="default">error</button>
+    </view>
+    <view class="g-cell">
+        <button class="g-btn g-btn-info g-btn-small" size="default">info</button>
+    </view>
+    <view class="g-cell">
+        <button class="g-btn g-btn-success g-btn-small" size="default">success</button>
+    </view>
+    <view class="g-cell">
+        <button class="g-btn g-btn-ghost g-btn-small" size="default">ghost</button>
+    </view>
+    <view class="g-cell">
+        <button class="g-btn g-btn-primary g-btn-small g-btn-loading" size="default">
+            <view class="g-btn-loading-inner" wx:if="{{true}}"></view>
+            loading
+        </button>
+    </view>
+</view>
\ No newline at end of file
diff --git a/src/platforms/wechatMp/pages/examples/g-form/index.json b/src/platforms/wechatMp/pages/examples/g-form/index.json
new file mode 100644
index 000000000..9393770d8
--- /dev/null
+++ b/src/platforms/wechatMp/pages/examples/g-form/index.json
@@ -0,0 +1,3 @@
+{
+    "navigationBarTitleText": "g-form"
+}
\ No newline at end of file
diff --git a/src/platforms/wechatMp/pages/examples/g-form/index.less b/src/platforms/wechatMp/pages/examples/g-form/index.less
new file mode 100644
index 000000000..debb9b256
--- /dev/null
+++ b/src/platforms/wechatMp/pages/examples/g-form/index.less
@@ -0,0 +1,11 @@
+/**  index.wxss  **/
+@import "../../../styles/base.less";
+@import "../../../styles/cpn.less";
+
+.page-body {
+  height: 100vh;
+  display: flex;
+  flex: 1;
+  flex-direction: column;
+  background-color: @background-color-base;
+}
diff --git a/src/platforms/wechatMp/pages/examples/g-form/index.ts b/src/platforms/wechatMp/pages/examples/g-form/index.ts
new file mode 100644
index 000000000..f16cc1a82
--- /dev/null
+++ b/src/platforms/wechatMp/pages/examples/g-form/index.ts
@@ -0,0 +1 @@
+Page({});
\ No newline at end of file
diff --git a/src/platforms/wechatMp/pages/examples/g-form/index.wxml b/src/platforms/wechatMp/pages/examples/g-form/index.wxml
new file mode 100644
index 000000000..ee1f67791
--- /dev/null
+++ b/src/platforms/wechatMp/pages/examples/g-form/index.wxml
@@ -0,0 +1,35 @@
+<!-- index.wxml -->
+<view class="page-body">
+    <view class="g-pannel">
+        <view class="g-pannel-title">表单 标签和内容左右布局</view>
+        <view class="g-form">
+            <view class="g-form-item">
+                <view class="g-form-item-label">收货人</view>
+                <view class="g-form-item-content">
+                    <input placeholder="姓名" value="{{name}}" type="string" confirm-type="done" />
+                </view>
+            </view>
+            <view class="g-form-item">
+                <view class="g-form-item-label">手机号</view>
+                <view class="g-form-item-content">
+                    <input placeholder="请输入" value="{{phone}}" type="string" confirm-type="done" />
+                </view>
+            </view>
+            <view class="g-form-item">
+                <view class="g-form-item-label">所在地区</view>
+                <view class="g-form-item-content">
+                    <view style="display: flex; flex: 1; align-items: cneter; justify-content:space-between">
+                        <text>{{areaText || '请选择'}}</text>
+                        <span class="material-icons" color="#495060">chevron_right</span>
+                    </view>
+                </view>
+            </view>
+            <view class="g-form-item">
+                <view class="g-form-item-label">详细地址</view>
+                <view class="g-form-item-content">
+                    <textarea class="g-input" placeholder="请输入" value="{{detail}}" auto-height maxlength="50" data-path="detail" confirm-type="done" />
+                </view>
+            </view>
+        </view>
+    </view>
+</view>
\ No newline at end of file
diff --git a/src/platforms/wechatMp/pages/examples/g-input/index.json b/src/platforms/wechatMp/pages/examples/g-input/index.json
new file mode 100644
index 000000000..f94b29e03
--- /dev/null
+++ b/src/platforms/wechatMp/pages/examples/g-input/index.json
@@ -0,0 +1,3 @@
+{
+    "navigationBarTitleText": "g-input"
+}
\ No newline at end of file
diff --git a/src/platforms/wechatMp/pages/examples/g-input/index.less b/src/platforms/wechatMp/pages/examples/g-input/index.less
new file mode 100644
index 000000000..debb9b256
--- /dev/null
+++ b/src/platforms/wechatMp/pages/examples/g-input/index.less
@@ -0,0 +1,11 @@
+/**  index.wxss  **/
+@import "../../../styles/base.less";
+@import "../../../styles/cpn.less";
+
+.page-body {
+  height: 100vh;
+  display: flex;
+  flex: 1;
+  flex-direction: column;
+  background-color: @background-color-base;
+}
diff --git a/src/platforms/wechatMp/pages/examples/g-input/index.ts b/src/platforms/wechatMp/pages/examples/g-input/index.ts
new file mode 100644
index 000000000..949105630
--- /dev/null
+++ b/src/platforms/wechatMp/pages/examples/g-input/index.ts
@@ -0,0 +1,10 @@
+Page({
+    data: {
+        error: true,
+    },
+    clearError() {
+        this.setData({
+            error: false,
+        })
+    }
+});
\ No newline at end of file
diff --git a/src/platforms/wechatMp/pages/examples/g-input/index.wxml b/src/platforms/wechatMp/pages/examples/g-input/index.wxml
new file mode 100644
index 000000000..721612566
--- /dev/null
+++ b/src/platforms/wechatMp/pages/examples/g-input/index.wxml
@@ -0,0 +1,42 @@
+<!-- index.wxml -->
+<view class="page-body">
+    <view class="g-pannel">
+        <view class="g-pannel-title">外标题输入框</view>
+        <view class="g-cell">
+            <input placeholder="请输入内容" class="g-input" />
+        </view>
+    </view>
+    <view class="g-pannel">
+        <view class="g-pannel-title">圆角输入框</view>
+        <view class="g-cell">
+            <view class="g-cell g-border-radius" style="flex: 1">
+                <view class="g-form-item-label">消费金额</view>
+                <view class="g-form-content">
+                    <input class="g-input g-input-border" placeholder="请输入" />
+                </view>
+            </view>
+        </view>
+    </view>
+    <view class="g-pannel">
+        <view class="g-pannel-title">圆角输入框</view>
+        <view class="g-cell">
+            <view class="g-cell g-border-radius {{error ? 'g-border-error' : ''}}" style="flex: 1">
+                <view class="g-form-item-label">消费金额</view>
+                <view class="g-form-content">
+                    <input class="g-input g-input-border {{error ? 'g-input-error' : ''}}" placeholder="自动聚焦错误的" bindfocus="clearError" />
+                </view>
+            </view>
+        </view>
+    </view>
+    <!-- <view class="g-pannel">
+        <view class="g-pannel-title">圆角输入框</view>
+        <view class="g-cell">
+            <view class="g-cell g-border-radius {{error ? 'g-border-error' : ''}}" style="flex: 1">
+                <view class="g-form-item-label">消费金额</view>
+                <view class="g-form-content">
+                    <input class="g-input g-input-border {{error ? 'g-input-error' : ''}}" focus="{{error}}" placeholder="自动聚焦错误的" />
+                </view>
+            </view>
+        </view>
+    </view> -->
+</view>
\ No newline at end of file
diff --git a/src/platforms/wechatMp/pages/examples/index/index.json b/src/platforms/wechatMp/pages/examples/index/index.json
new file mode 100644
index 000000000..ed577253f
--- /dev/null
+++ b/src/platforms/wechatMp/pages/examples/index/index.json
@@ -0,0 +1,3 @@
+{
+    "navigationBarTitleText": "组件"
+}
\ No newline at end of file
diff --git a/src/platforms/wechatMp/pages/examples/index/index.less b/src/platforms/wechatMp/pages/examples/index/index.less
new file mode 100644
index 000000000..debb9b256
--- /dev/null
+++ b/src/platforms/wechatMp/pages/examples/index/index.less
@@ -0,0 +1,11 @@
+/**  index.wxss  **/
+@import "../../../styles/base.less";
+@import "../../../styles/cpn.less";
+
+.page-body {
+  height: 100vh;
+  display: flex;
+  flex: 1;
+  flex-direction: column;
+  background-color: @background-color-base;
+}
diff --git a/src/platforms/wechatMp/pages/examples/index/index.ts b/src/platforms/wechatMp/pages/examples/index/index.ts
new file mode 100644
index 000000000..4c63dda74
--- /dev/null
+++ b/src/platforms/wechatMp/pages/examples/index/index.ts
@@ -0,0 +1,7 @@
+Page({
+    navigateToCpnPage(e:any) {
+        console.log(e);
+        const pagename = e.currentTarget.dataset.value;
+        wx.navigateTo({ url: `../g-${pagename}/index` });
+    }
+});
\ No newline at end of file
diff --git a/src/platforms/wechatMp/pages/examples/index/index.wxml b/src/platforms/wechatMp/pages/examples/index/index.wxml
new file mode 100644
index 000000000..47577be1a
--- /dev/null
+++ b/src/platforms/wechatMp/pages/examples/index/index.wxml
@@ -0,0 +1,15 @@
+<!-- index.wxml -->
+<view class="page-body">
+    <view class="g-cell" data-value="btn" bind:tap="navigateToCpnPage">
+        <text>按钮</text>
+        <span class="material-icons" color="#495060">chevron_right</span>
+    </view>
+    <view class="g-cell" data-value="form" bind:tap="navigateToCpnPage">
+        <text>表单</text>
+        <span class="material-icons" color="#495060">chevron_right</span>
+    </view>
+    <view class="g-cell" data-value="input" bind:tap="navigateToCpnPage">
+        <text>输入框</text>
+        <span class="material-icons" color="#495060">chevron_right</span>
+    </view>
+</view>
\ No newline at end of file
diff --git a/src/platforms/wechatMp/styles/cpn.less b/src/platforms/wechatMp/styles/cpn copy.less
similarity index 83%
rename from src/platforms/wechatMp/styles/cpn.less
rename to src/platforms/wechatMp/styles/cpn copy.less
index 822252cf0..af7102446 100644
--- a/src/platforms/wechatMp/styles/cpn.less
+++ b/src/platforms/wechatMp/styles/cpn copy.less	
@@ -120,6 +120,7 @@
 //form
 
 .g-form {
+  position: relative;
   display: flex;
   flex-direction: column;
   background-color: @background-color-base;
@@ -128,18 +129,17 @@
   border-bottom-width: 1px;
 
   &-item {
+    position: relative;
     display: flex;
     align-items: center;
     background-color: #fff;
-    padding: @size-spacing-base 0rpx;
-    padding-right: 24rpx;
-    margin-left: @size-spacing-base;
+    padding: @size-spacing-base;
 
     &-label {
       color: @title-color;
       line-height: 1;
       min-width: 150rpx;
-      padding-right: 30rpx;
+      padding-right: 20rpx;
     }
 
     &-content {
@@ -151,8 +151,12 @@
   }
 }
 
-.g-form > view:not(:last-child) {
-  margin-bottom: 1px;
+.g-form > view:not(:last-child)::after {
+  .hairline();
+
+  border-bottom-width: 1px;
+  left: 15px;
+  right: 0;
 }
 
 //input
@@ -166,13 +170,16 @@
   &-border {
     text-align: right;
   }
+
+  &-error {
+    color: @error-color;
+  }
 }
 
 //pannel
 .g-cell {
   padding: @size-spacing-base;
   display: flex;
-  flex: 1;
   align-items: center;
   justify-content: space-between;
   background-color: #fff;
@@ -193,3 +200,22 @@
   border: 1px solid @border-color-base;
   border-radius: @btn-border-radius;
 }
+
+.g-border-error {
+  border-color: @error-color;
+}
+
+//hairline
+.hairline() {
+  content: "";
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 200%;
+  height: 200%;
+  transform: scale(0.5);
+  transform-origin: 0 0;
+  pointer-events: none;
+  box-sizing: border-box;
+  border: 0 solid @border-color-split;
+}