修改 grid 和table(Modify grid And Table)

HomWang · Mar 8, 2020 · b1b08f1 · b1b08f1
1 parent 00186d0
commit b1b08f1
Show file tree

Hide file tree

Showing 6 changed files with 301 additions and 339 deletions.
diff --git a/components/NInput.vue b/components/NInput.vue
@@ -31,7 +31,7 @@ const {
 export default {
   name: "NInput",
 
-  install(Vue, theme) {
+  install (Vue, theme) {
     selfInstall(Vue, theme, this);
   },
 
@@ -49,7 +49,7 @@ export default {
     size: {
       type: String,
       default: "sm",
-      validator: function(value) {
+      validator: function (value) {
         return (
           value === null ||
           ["xs", "sm", "base", "lg", "xl"].indexOf(value) !== -1
@@ -75,6 +75,7 @@ export default {
       type: Boolean,
       default: false
     },
+    // 带有必填字段的表单
     required: {
       type: Boolean,
       default: false
@@ -109,14 +110,17 @@ export default {
       type: [String, Number],
       default: null
     },
+    // 可接受多个值的文件上传字段
     multiple: {
       type: Boolean,
       default: false
     },
+    // 只读
     readonly: {
       type: Boolean,
       default: undefined
     },
+    // 规定用于验证输入字段的模式
     pattern: {
       type: String,
       default: null
@@ -234,15 +238,14 @@ export default {
     }
   },
 
-  data() {
+  data () {
     return {
       currentValue: this.value
     };
   },
 
   watch: {
-    value(value) {
-      console.log("监听的value值：", value);
+    value (value) {
       if (!value) {
         this.$el.children[0].value = "";
       }
@@ -256,7 +259,7 @@ export default {
      * 输入框的默认类
      * @return {Array}
      */
-    currentClass() {
+    currentClass () {
       let classes = [
         `${this.$options._componentTag}`,
         `${this.$options._componentTag}-size-${this.size || "default"}`,
@@ -382,7 +385,7 @@ export default {
      * icon的默认类
      * @return {Array}
      */
-    iconCurrentClass() {
+    iconCurrentClass () {
       let classes = [this.iconClass, this.icon];
 
       // 判断之后
@@ -416,8 +419,9 @@ export default {
           break;
       }
 
-      if (this.clearable) {
+      if (this.clearable && this.currentValue) {
         classes.push(this.clearableClass);
+        classes.push("n-icon-clean")
       }
 
       switch (this.status) {
@@ -436,33 +440,33 @@ export default {
   },
 
   methods: {
-    onBlur(e) {
+    onBlur (e) {
       this.$emit("blur", e);
     },
 
-    onFocus(e) {
+    onFocus (e) {
       this.$emit("focus", e);
     },
 
-    onInput(e) {
+    onInput (e) {
       this.$emit("input", e.target.value);
     },
 
-    onChange(e) {
+    onChange (e) {
       if (this.currentValue !== e.target.value) {
         this.$emit("change", e.target.value);
       }
     },
 
     // 清除input的值
-    onClearable() {
+    onClearable () {
       this.$emit("input", "");
       this.$emit("change", "");
       this.$emit("clear");
       this.currentValue = "";
     },
 
-    getAttributes() {
+    getAttributes () {
       return {
         id: this.id,
         type: this.type,
@@ -483,13 +487,13 @@ export default {
       };
     },
 
-    getIconAttributes() {
+    getIconAttributes () {
       return {
         id: this.id
       };
     },
 
-    getDivAttributes() {
+    getDivAttributes () {
       return {
         id: this.id
       };
@@ -500,7 +504,7 @@ export default {
      * 渲染Input组件
      * @return {String}
      */
-    inputToRender(createElement) {
+    inputToRender (createElement) {
       return createElement(
         "input",
         {
@@ -522,7 +526,7 @@ export default {
      * 根据Input的状态渲染的Icon组件
      * @return {String}
      */
-    iconToRender(createElement) {
+    iconToRender (createElement) {
       let [...newIconCurrentClass] = this.iconCurrentClass;
       return this.$createElement(
         "i",
@@ -539,7 +543,7 @@ export default {
     }
   },
 
-  render: function(createElement) {
+  render: function (createElement) {
     return createElement(
       "div",
       {