From c55de2645258eaed25ec5be56353be0706e473ff Mon Sep 17 00:00:00 2001
From: devin <caowendong@huawei.com>
Date: Thu, 7 Sep 2023 21:09:46 +0800
Subject: [PATCH 1/2] =?UTF-8?q?input=20=E5=8E=BB=E6=8E=89append=E3=80=81pr?=
 =?UTF-8?q?epend=E7=9A=84=E9=97=B4=E8=B7=9D=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/input/__demo__/InputBasic.vue         | 48 +++++++++----------
 .../src/input/__demo__/InputEvent.vue         |  4 +-
 .../src/input/__demo__/InputRound.vue         | 24 +++++-----
 .../src/input/__demo__/InputSlot.vue          |  6 +--
 .../opendesign/src/input/style/style.scss     |  3 +-
 packages/opendesign/src/input/style/var.scss  | 20 --------
 packages/portal-ak/src/ak/theme/input.scss    | 14 ------
 7 files changed, 42 insertions(+), 77 deletions(-)

diff --git a/packages/opendesign/src/input/__demo__/InputBasic.vue b/packages/opendesign/src/input/__demo__/InputBasic.vue
index 7f0a5c59..33a781e7 100644
--- a/packages/opendesign/src/input/__demo__/InputBasic.vue
+++ b/packages/opendesign/src/input/__demo__/InputBasic.vue
@@ -35,20 +35,20 @@ setTimeout(() => {
     </div>
     <div class="row">
       <OInput v-model="val1" color="normal" placeholder="outline + normal">
-        <template #prepend>+86</template>
-        <template #append>手机</template>
+        <template #prepend><span style="padding: 0 8px">+86</span></template>
+        <template #append><span style="padding: 0 8px">手机</span></template>
       </OInput>
       <OInput v-model="val1" color="success" placeholder="outline + success">
-        <template #prepend>+86</template>
-        <template #append>手机</template>
+        <template #prepend><span style="padding: 0 8px">+86</span></template>
+        <template #append><span style="padding: 0 8px">手机</span></template>
       </OInput>
       <OInput v-model="val1" color="warning" placeholder="outline + warning">
-        <template #prepend>+86</template>
-        <template #append>手机</template>
+        <template #prepend><span style="padding: 0 8px">+86</span></template>
+        <template #append><span style="padding: 0 8px">手机</span></template>
       </OInput>
       <OInput v-model="val1" color="danger" placeholder="outline + danger">
-        <template #prepend>+86</template>
-        <template #append>手机</template>
+        <template #prepend><span style="padding: 0 8px">+86</span></template>
+        <template #append><span style="padding: 0 8px">手机</span></template>
       </OInput>
     </div>
     <div class="row">
@@ -60,20 +60,20 @@ setTimeout(() => {
 
     <div class="row">
       <OInput v-model="val1" color="normal" variant="solid" placeholder="solid + normal">
-        <template #prepend>+86</template>
-        <template #append>手机</template>
+        <template #prepend><span style="padding: 0 8px">+86</span></template>
+        <template #append><span style="padding: 0 8px">手机</span></template>
       </OInput>
       <OInput v-model="val1" color="success" variant="solid" placeholder="solid + success">
-        <template #prepend>+86</template>
-        <template #append>手机</template>
+        <template #prepend><span style="padding: 0 8px">+86</span></template>
+        <template #append><span style="padding: 0 8px">手机</span></template>
       </OInput>
       <OInput v-model="val1" color="warning" variant="solid" placeholder="solid + warning">
-        <template #prepend>+86</template>
-        <template #append>手机</template>
+        <template #prepend><span style="padding: 0 8px">+86</span></template>
+        <template #append><span style="padding: 0 8px">手机</span></template>
       </OInput>
       <OInput v-model="val1" color="danger" variant="solid" placeholder="solid + danger">
-        <template #prepend>+86</template>
-        <template #append>手机</template>
+        <template #prepend><span style="padding: 0 8px">+86</span></template>
+        <template #append><span style="padding: 0 8px">手机</span></template>
       </OInput>
     </div>
   </section>
@@ -118,20 +118,20 @@ setTimeout(() => {
 
     <div class="row">
       <OInput v-model="val1" color="normal" variant="solid" placeholder="solid + normal" disabled>
-        <template #prepend>+86</template>
-        <template #append>手机</template>
+        <template #prepend><span style="padding: 0 8px">+86</span></template>
+        <template #append><span style="padding: 0 8px">手机</span></template>
       </OInput>
       <OInput v-model="val1" color="success" variant="solid" placeholder="solid + success" disabled>
-        <template #prepend>+86</template>
-        <template #append>手机</template>
+        <template #prepend><span style="padding: 0 8px">+86</span></template>
+        <template #append><span style="padding: 0 8px">手机</span></template>
       </OInput>
       <OInput v-model="val1" color="warning" variant="solid" placeholder="solid + warning" disabled>
-        <template #prepend>+86</template>
-        <template #append>手机</template>
+        <template #prepend><span style="padding: 0 8px">+86</span></template>
+        <template #append><span style="padding: 0 8px">手机</span></template>
       </OInput>
       <OInput v-model="val1" color="danger" variant="solid" placeholder="solid + danger" disabled>
-        <template #prepend>+86</template>
-        <template #append>手机</template>
+        <template #prepend><span style="padding: 0 8px">+86</span></template>
+        <template #append><span style="padding: 0 8px">手机</span></template>
       </OInput>
     </div>
   </section>
diff --git a/packages/opendesign/src/input/__demo__/InputEvent.vue b/packages/opendesign/src/input/__demo__/InputEvent.vue
index 88c1ac12..342f4053 100644
--- a/packages/opendesign/src/input/__demo__/InputEvent.vue
+++ b/packages/opendesign/src/input/__demo__/InputEvent.vue
@@ -21,8 +21,8 @@ const printEvent = (evt: string, val?: string | number) => {
       @focus="(v) => printEvent('focus', v)"
       @press-enter="(v) => printEvent('press-enter', v)"
     >
-      <template #prepend>+86</template>
-      <template #append>RMB</template>
+      <template #prepend><span style="padding: 0 8px">+86</span></template>
+      <template #append><span style="padding: 0 8px">手机</span></template>
     </OInput>
     value: {{ val2 }}; event:{{ event }};
   </section>
diff --git a/packages/opendesign/src/input/__demo__/InputRound.vue b/packages/opendesign/src/input/__demo__/InputRound.vue
index 441d6d09..af7f3422 100644
--- a/packages/opendesign/src/input/__demo__/InputRound.vue
+++ b/packages/opendesign/src/input/__demo__/InputRound.vue
@@ -23,16 +23,16 @@ const onClick = () => {
         <OInput v-model="val1" :placeholder="placeholder" round="pill" />
         <OInput v-model="val1" :placeholder="placeholder" round="pill" size="large" />
         <OInput v-model="val1" round="pill" size="small">
-          <template #prepend>+86</template>
-          <template #append>手机</template>
+          <template #prepend><span style="padding: 0 4px">+86</span></template>
+          <template #append><span style="padding: 0 4px">手机</span></template>
         </OInput>
         <OInput v-model="val1" round="pill" color="danger">
-          <template #prepend>+86</template>
-          <template #append>手机</template>
+          <template #prepend><span style="padding: 0 8px">+86</span></template>
+          <template #append><span style="padding: 0 8px">手机</span></template>
         </OInput>
         <OInput v-model="val1" round="pill" size="large">
-          <template #prepend>+86</template>
-          <template #append>手机</template>
+          <template #prepend><span style="padding: 0 12px">+86</span></template>
+          <template #append><span style="padding: 0 12px">手机</span></template>
         </OInput>
       </section>
     </div>
@@ -44,16 +44,16 @@ const onClick = () => {
         <OInput v-model="val1" :placeholder="placeholder" :round="r + 'px'" size="large" />
 
         <OInput v-model="val1" :round="r + 'px'" size="small">
-          <template #prepend>+86</template>
-          <template #append>手机</template>
+          <template #prepend><span style="padding: 0 4px">+86</span></template>
+          <template #append><span style="padding: 0 4px">手机</span></template>
         </OInput>
         <OInput v-model="val1" :round="r + 'px'">
-          <template #prepend>+86</template>
-          <template #append>手机</template>
+          <template #prepend><span style="padding: 0 8px">+86</span></template>
+          <template #append><span style="padding: 0 8px">手机</span></template>
         </OInput>
         <OInput v-model="val1" :round="r + 'px'" size="large">
-          <template #prepend>+86</template>
-          <template #append>手机</template>
+          <template #prepend><span style="padding: 0 12px">+86</span></template>
+          <template #append><span style="padding: 0 12px">手机</span></template>
         </OInput>
       </section>
     </div>
diff --git a/packages/opendesign/src/input/__demo__/InputSlot.vue b/packages/opendesign/src/input/__demo__/InputSlot.vue
index 0309fa98..bbfdc89d 100644
--- a/packages/opendesign/src/input/__demo__/InputSlot.vue
+++ b/packages/opendesign/src/input/__demo__/InputSlot.vue
@@ -22,17 +22,17 @@ const val2 = ref('this is input value');
       </template>
     </OInput>
     <OInput v-model="val2">
-      <template #suffix> 元 </template>
+      <template #suffix>元 </template>
     </OInput>
   </section>
 
   <h4>Prepend & Append</h4>
   <section>
     <OInput v-model="val2">
-      <template #prepend>+86</template>
+      <template #prepend><span style="padding: 0 8px 0 7px">+86</span></template>
     </OInput>
     <OInput v-model="val2">
-      <template #append>RMB</template>
+      <template #append><span style="padding: 0 7px 0 8px">RMB</span></template>
     </OInput>
   </section>
 </template>
diff --git a/packages/opendesign/src/input/style/style.scss b/packages/opendesign/src/input/style/style.scss
index 69b21c2d..03c24c40 100644
--- a/packages/opendesign/src/input/style/style.scss
+++ b/packages/opendesign/src/input/style/style.scss
@@ -157,17 +157,16 @@
 
 .o-input-append {
   flex-shrink: 0;
-  padding: var(--input-append-padding);
   border-top-right-radius: var(--input-radius);
   border-bottom-right-radius: var(--input-radius);
 }
 
 .o-input-prepend {
   flex-shrink: 0;
-  padding: var(--input-prepend-padding);
   border-top-left-radius: var(--input-radius);
   border-bottom-left-radius: var(--input-radius);
 }
+
 .o-input-solid {
   .o-input-prepend {
     border-width: 0 1px 0 0;
diff --git a/packages/opendesign/src/input/style/var.scss b/packages/opendesign/src/input/style/var.scss
index 6da6e546..cdea55e7 100644
--- a/packages/opendesign/src/input/style/var.scss
+++ b/packages/opendesign/src/input/style/var.scss
@@ -92,16 +92,9 @@
   --input-text-height: var(--o-line_height-tip1);
 
   --input-padding: 0 7px;
-  --input-append-padding: 0 3px 0 4px;
-  --input-prepend-padding: 0 4px 0 3px;
   --input-radius: var(--o-radius_control-xs);
   --o-input-icon-size: var(--o-icon_size_control-xs);
 
-  &.o-input-round-pill {
-    --input-append-padding: 0 5px 0 4px;
-    --input-prepend-padding: 0 4px 0 5px;
-  }
-
   .has-prepend {
     --input-padding: 0 7px 0 5px;
   }
@@ -113,15 +106,9 @@
   --input-text-height: var(--o-line_height-tip1);
 
   --input-padding: 0 15px;
-  --input-append-padding: 0 7px 0 8px;
-  --input-prepend-padding: 0 8px 0 7px;
   --input-radius: var(--o-radius_control-s);
   --o-input-icon-size: var(--o-icon_size_control-xs);
 
-  &.o-input-round-pill {
-    --input-append-padding: 0 15px 0 8px;
-    --input-prepend-padding: 0 8px 0 15px;
-  }
   .has-prepend {
     --input-padding: 0 15px 0 7px;
   }
@@ -133,16 +120,9 @@
   --input-text-height: var(--o-line_height-text1);
 
   --input-padding: 0 15px;
-  --input-append-padding: 0 11px 0 12px;
-  --input-prepend-padding: 0 12px 0 11px;
   --input-radius: var(--o-radius_control-s);
   --o-input-icon-size: var(--o-icon_size_control-m);
 
-  &.o-input-round-pill {
-    --input-append-padding: 0 15px 0 12px;
-    --input-prepend-padding: 0 12px 0 15px;
-  }
-
   .has-prepend {
     --input-padding: 0 15px 0 7px;
   }
diff --git a/packages/portal-ak/src/ak/theme/input.scss b/packages/portal-ak/src/ak/theme/input.scss
index 13c9ea81..6afbdfe5 100644
--- a/packages/portal-ak/src/ak/theme/input.scss
+++ b/packages/portal-ak/src/ak/theme/input.scss
@@ -14,20 +14,6 @@
   --input-bd-color-focus: var(--o-color-control3);
 }
 
-.o-input-medium {
-  &,
-  &.o-input-round-pill {
-    --input-prepend-padding: 0;
-  }
-}
-
-.o-input-large {
-  &,
-  &.o-input-round-pill {
-    --input-prepend-padding: 0;
-  }
-}
-
 .c-input-verify-code {
   color: var(--o-color-info4);
   font-size: var(--o-font_size-tip1);
-- 
Gitee


From a35cf2b14684e776e45e912b828ec9e3f656ebb6 Mon Sep 17 00:00:00 2001
From: devin <caowendong@huawei.com>
Date: Thu, 7 Sep 2023 21:10:37 +0800
Subject: [PATCH 2/2] v52

---
 packages/opendesign/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/opendesign/package.json b/packages/opendesign/package.json
index fc00808b..3be21e8a 100644
--- a/packages/opendesign/package.json
+++ b/packages/opendesign/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opensig/opendesign",
-  "version": "0.0.51",
+  "version": "0.0.52",
   "main": "lib/index.js",
   "module": "es/index.mjs",
   "types": "es/index.d.ts",
-- 
Gitee