fix: check box and button loading style

xutaotao · xutaotao · commit 9b18a5fae07d · 2021-05-12T09:22:50.000+08:00
diff --git a/packages/n-button/index.scss b/packages/n-button/index.scss
@@ -15,9 +15,13 @@ button{
   font-size: 14px;
   line-height: 36px;
   cursor:pointer;
+  .nbutton-content{
+    display: flex;
+    justify-content: center;
+  }
   .nbutton-icon{
     display: inline-block;
-    margin-right: 0.2em;
+    margin-right: 8px;
   }
 }
 
@@ -99,4 +103,8 @@ button{
   height: 24px;
   font-size: 12px;
   padding: 2px 8px;
+}
+
+.nbutton-slot{
+  text-align: center;
 }
diff --git a/packages/n-button/index.tsx b/packages/n-button/index.tsx
@@ -44,8 +44,10 @@ const NButton = defineComponent({
 
     return () => (
         <button class={classString} disabled={disabled}>
-          {renderIcon()}
-          {slots.default && slots.default()}
+          <div class="nbutton-content">
+            {renderIcon()}
+            <span class="nbutton-slot">{slots.default && slots.default()}</span>
+          </div>
         </button>
     );
   }
diff --git a/packages/n-checkbox/index.tsx b/packages/n-checkbox/index.tsx
@@ -1,4 +1,4 @@
-import { defineComponent, App,PropType,HTMLAttributes, SetupContext } from 'vue';
+import { defineComponent, App, PropType, SetupContext } from 'vue';
 import './index.scss';
 import { guid } from '../../src/utils/util';
 
@@ -21,8 +21,6 @@ const nCheckbox = defineComponent({
   name: 'NCheckbox',
   props: CheckboxProps,
   setup (props, { slots }: SetupContext) {
-
-
     const id = guid();
     const checkeval = () => {
       if (props.checked) {
@@ -32,8 +30,8 @@ const nCheckbox = defineComponent({
     };
     return () => (
       <div class="n-checkbox">
-        <input id={id} class={[props.disabled ? 'n-checkbox-disble': '']} disabled={props.disabled} type="checkbox" checked={checkeval()}/>
-        <label for={id} class={[props.disabled ? 'n-checkbox-disble': '']}/>
+        <input id={id} class={[props.disabled ? 'n-checkbox-disble' : '']} disabled={props.disabled} type="checkbox" checked={checkeval()}/>
+        <label for={id} class={[props.disabled ? 'n-checkbox-disble' : '']}/>
         <div class="slot-text">
           {slots.default && slots.default()}
         </div>
