From 74c83eea339c3c6118889f35213b1b9e54724ff9 Mon Sep 17 00:00:00 2001
From: jiahengaa <2429803999@qq.com>
Date: Tue, 25 May 2021 11:10:40 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E7=AB=AF=E5=88=86=E9=A1=B5?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E4=BC=98=E5=8C=96=EF=BC=8C=E6=95=B0=E5=AD=97?=
 =?UTF-8?q?=E8=BE=93=E5=85=A5=E6=A1=86=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                                 |   2 +-
 src/components/input-number/input-number.vue | 587 ++++++++++---------
 src/components/page/options.vue              | 128 ++--
 src/components/table/table-head.vue          |   4 +-
 src/components/table/table.vue               |  60 +-
 src/styles/components/input-number.less      |  17 +-
 src/styles/components/table.less             |   5 +-
 7 files changed, 423 insertions(+), 380 deletions(-)

diff --git a/package.json b/package.json
index ec3fec7..28fe4f9 100644
--- a/package.json
+++ b/package.json
@@ -21,7 +21,7 @@
         "types"
     ],
     "scripts": {
-        "dev": "webpack-dev-server --content-base test/ --open --inline --hot --compress --history-api-fallback  --host localhost --port 8082 --config build/webpack.dev.config.js",
+        "dev": "webpack-dev-server --content-base test/ --open --inline --hot --compress --history-api-fallback  --host 192.168.3.44 --port 8082 --config build/webpack.dev.config.js",
         "dev:s": "webpack-dev-server --content-base test/ --open --inline --hot --compress --history-api-fallback --port 8083  --config build/webpack.dev.config.js",
         "dist:style": "gulp --gulpfile build/build-style.js",
         "dist:dev": "webpack --config build/webpack.dist.dev.config.js",
diff --git a/src/components/input-number/input-number.vue b/src/components/input-number/input-number.vue
index 50c3606..2c543d8 100644
--- a/src/components/input-number/input-number.vue
+++ b/src/components/input-number/input-number.vue
@@ -1,11 +1,11 @@
 <template>
   <div :class="wrapClasses">
     <div :class="handlerClasses">
-      <a @click="up" :class="upClasses">
-        <span :class="innerUpClasses" @click="preventDefault"></span>
+      <a :class="upClasses">
+        <span :class="innerUpClasses" ></span>
       </a>
-      <a @click="down" :class="downClasses">
-        <span :class="innerDownClasses" @click="preventDefault"></span>
+      <a :class="downClasses">
+        <span :class="innerDownClasses"></span>
       </a>
     </div>
     <div :class="inputWrapClasses">
@@ -13,6 +13,7 @@
         :id="elementId"
         :class="inputClasses"
         :disabled="itemDisabled"
+        type="number"
         autocomplete="off"
         spellcheck="false"
         :autofocus="autofocus"
@@ -39,312 +40,312 @@ const prefixCls = "bee-input-number";
 const iconPrefixCls = "bee-sys-icon ";
 
 function addNum(num1, num2) {
-  let sq1, sq2, m;
-  try {
-    sq1 = num1.toString().split(".")[1].length;
-  } catch (e) {
-    sq1 = 0;
-  }
-  try {
-    sq2 = num2.toString().split(".")[1].length;
-  } catch (e) {
-    sq2 = 0;
-  }
+    let sq1, sq2, m;
+    try {
+        sq1 = num1.toString().split(".")[1].length;
+    } catch (e) {
+        sq1 = 0;
+    }
+    try {
+        sq2 = num2.toString().split(".")[1].length;
+    } catch (e) {
+        sq2 = 0;
+    }
 
-  m = Math.pow(10, Math.max(sq1, sq2));
-  return (Math.round(num1 * m) + Math.round(num2 * m)) / m;
+    m = Math.pow(10, Math.max(sq1, sq2));
+    return (Math.round(num1 * m) + Math.round(num2 * m)) / m;
 }
 
 export default {
-  name: "InputNumber",
-  mixins: [Emitter, mixinsForm],
-  props: {
-    max: {
-      type: Number,
-      default: Infinity,
-    },
-    min: {
-      type: Number,
-      default: -Infinity,
-    },
-    step: {
-      type: Number,
-      default: 1,
-    },
-    activeChange: {
-      type: Boolean,
-      default: true,
-    },
-    value: {
-      type: Number,
-      default: 1,
-    },
-    size: {
-      validator(value) {
-        return oneOf(value, ["small", "large", "default"]);
-      },
-      default() {
-        return !this.$BEETABLE || this.$BEETABLE.size === ""
-          ? "default"
-          : this.$BEETABLE.size;
-      },
-    },
-    disabled: {
-      type: Boolean,
-      default: false,
-    },
-    autofocus: {
-      type: Boolean,
-      default: false,
-    },
-    readonly: {
-      type: Boolean,
-      default: false,
-    },
-    editable: {
-      type: Boolean,
-      default: true,
-    },
-    name: {
-      type: String,
-    },
-    precision: {
-      type: Number,
-    },
-    elementId: {
-      type: String,
-    },
-    formatter: {
-      type: Function,
-    },
-    parser: {
-      type: Function,
-    },
-    placeholder: {
-      type: String,
-      default: "",
-    },
-  },
-  data() {
-    return {
-      focused: false,
-      upDisabled: false,
-      downDisabled: false,
-      currentValue: this.value,
-    };
-  },
-  computed: {
-    wrapClasses() {
-      return [
-        `${prefixCls}`,
-        {
-          [`${prefixCls}-${this.size}`]: !!this.size,
-          [`${prefixCls}-disabled`]: this.itemDisabled,
-          [`${prefixCls}-focused`]: this.focused,
-        },
-      ];
-    },
-    handlerClasses() {
-      return `${prefixCls}-handler-wrap`;
-    },
-    upClasses() {
-      return [
-        `${prefixCls}-handler`,
-        `${prefixCls}-handler-up`,
-        {
-          [`${prefixCls}-handler-up-disabled`]: this.upDisabled,
-        },
-      ];
-    },
-    innerUpClasses() {
-      return `${prefixCls}-handler-up-inner ${iconPrefixCls} ${iconPrefixCls}-ios-arrow-up`;
-    },
-    downClasses() {
-      return [
-        `${prefixCls}-handler`,
-        `${prefixCls}-handler-down`,
-        {
-          [`${prefixCls}-handler-down-disabled`]: this.downDisabled,
-        },
-      ];
-    },
-    innerDownClasses() {
-      return `${prefixCls}-handler-down-inner ${iconPrefixCls} ${iconPrefixCls}-ios-arrow-down`;
-    },
-    inputWrapClasses() {
-      return `${prefixCls}-input-wrap`;
-    },
-    inputClasses() {
-      return `${prefixCls}-input`;
-    },
-    precisionValue() {
-      if (!this.currentValue) return this.currentValue;
-      return this.precision
-        ? this.currentValue.toFixed(this.precision)
-        : this.currentValue;
-    },
-    formatterValue() {
-      if (this.formatter && this.precisionValue !== null) {
-        return this.formatter(this.precisionValue);
-      } else {
-        return this.precisionValue;
-      }
-    },
-  },
-  methods: {
-    preventDefault(e) {
-      e.preventDefault();
-    },
-    up(e) {
-      const targetVal = Number(e.target.value);
-      if (this.upDisabled && isNaN(targetVal)) {
-        return false;
-      }
-      this.changeStep("up", e);
+    name: "InputNumber",
+    mixins: [Emitter, mixinsForm],
+    props: {
+        max: {
+            type: Number,
+            default: Infinity
+        },
+        min: {
+            type: Number,
+            default: -Infinity
+        },
+        step: {
+            type: Number,
+            default: 1
+        },
+        activeChange: {
+            type: Boolean,
+            default: true
+        },
+        value: {
+            type: Number,
+            default: 1
+        },
+        size: {
+            validator(value) {
+                return oneOf(value, ["small", "large", "default"]);
+            },
+            default() {
+                return !this.$BEETABLE || this.$BEETABLE.size === ""
+                    ? "default"
+                    : this.$BEETABLE.size;
+            }
+        },
+        disabled: {
+            type: Boolean,
+            default: false
+        },
+        autofocus: {
+            type: Boolean,
+            default: false
+        },
+        readonly: {
+            type: Boolean,
+            default: false
+        },
+        editable: {
+            type: Boolean,
+            default: true
+        },
+        name: {
+            type: String
+        },
+        precision: {
+            type: Number
+        },
+        elementId: {
+            type: String
+        },
+        formatter: {
+            type: Function
+        },
+        parser: {
+            type: Function
+        },
+        placeholder: {
+            type: String,
+            default: ""
+        }
     },
-    down(e) {
-      const targetVal = Number(e.target.value);
-      if (this.downDisabled && isNaN(targetVal)) {
-        return false;
-      }
-      this.changeStep("down", e);
+    data() {
+        return {
+            focused: false,
+            upDisabled: false,
+            downDisabled: false,
+            currentValue: this.value
+        };
+    },
+    computed: {
+        wrapClasses() {
+            return [
+                `${prefixCls}`,
+                {
+                    [`${prefixCls}-${this.size}`]: !!this.size,
+                    [`${prefixCls}-disabled`]: this.itemDisabled,
+                    [`${prefixCls}-focused`]: this.focused
+                }
+            ];
+        },
+        handlerClasses() {
+            return `${prefixCls}-handler-wrap`;
+        },
+        upClasses() {
+            return [
+                `${prefixCls}-handler`,
+                `${prefixCls}-handler-up`,
+                {
+                    [`${prefixCls}-handler-up-disabled`]: this.upDisabled
+                }
+            ];
+        },
+        innerUpClasses() {
+            return `${prefixCls}-handler-up-inner ${iconPrefixCls}`;
+        },
+        downClasses() {
+            return [
+                `${prefixCls}-handler`,
+                `${prefixCls}-handler-down`,
+                {
+                    [`${prefixCls}-handler-down-disabled`]: this.downDisabled
+                }
+            ];
+        },
+        innerDownClasses() {
+            return `${prefixCls}-handler-down-inner ${iconPrefixCls} `;
+        },
+        inputWrapClasses() {
+            return `${prefixCls}-input-wrap`;
+        },
+        inputClasses() {
+            return `${prefixCls}-input`;
+        },
+        precisionValue() {
+            if (!this.currentValue) return this.currentValue;
+            return this.precision
+                ? this.currentValue.toFixed(this.precision)
+                : this.currentValue;
+        },
+        formatterValue() {
+            if (this.formatter && this.precisionValue !== null) {
+                return this.formatter(this.precisionValue);
+            } else {
+                return this.precisionValue;
+            }
+        }
     },
-    changeStep(type, e) {
-      if (this.itemDisabled || this.readonly) {
-        return false;
-      }
+    methods: {
+        preventDefault(e) {
+            e.preventDefault();
+        },
+        up(e) {
+            const targetVal = Number(e.target.value);
+            if (this.upDisabled && isNaN(targetVal)) {
+                return false;
+            }
+            this.changeStep("up", e);
+        },
+        down(e) {
+            const targetVal = Number(e.target.value);
+            if (this.downDisabled && isNaN(targetVal)) {
+                return false;
+            }
+            this.changeStep("down", e);
+        },
+        changeStep(type, e) {
+            if (this.itemDisabled || this.readonly) {
+                return false;
+            }
 
-      const targetVal = Number(e.target.value);
-      let val = Number(this.currentValue);
-      const step = Number(this.step);
-      if (isNaN(val)) {
-        return false;
-      }
+            const targetVal = Number(e.target.value);
+            let val = Number(this.currentValue);
+            const step = Number(this.step);
+            if (isNaN(val)) {
+                return false;
+            }
 
-      if (!isNaN(targetVal)) {
-        if (type === "up") {
-          if (addNum(targetVal, step) <= this.max) {
-            val = targetVal;
-          } else {
-            return false;
-          }
-        } else if (type === "down") {
-          if (addNum(targetVal, -step) >= this.min) {
-            val = targetVal;
-          } else {
-            return false;
-          }
-        }
-      }
+            if (!isNaN(targetVal)) {
+                if (type === "up") {
+                    if (addNum(targetVal, step) <= this.max) {
+                        val = targetVal;
+                    } else {
+                        return false;
+                    }
+                } else if (type === "down") {
+                    if (addNum(targetVal, -step) >= this.min) {
+                        val = targetVal;
+                    } else {
+                        return false;
+                    }
+                }
+            }
 
-      if (type === "up") {
-        val = addNum(val, step);
-      } else if (type === "down") {
-        val = addNum(val, -step);
-      }
-      this.setValue(val);
-    },
-    setValue(val) {
-      if (val && !isNaN(this.precision))
-        val = Number(Number(val).toFixed(this.precision));
+            if (type === "up") {
+                val = addNum(val, step);
+            } else if (type === "down") {
+                val = addNum(val, -step);
+            }
+            this.setValue(val);
+        },
+        setValue(val) {
+            if (val && !isNaN(this.precision))
+                val = Number(Number(val).toFixed(this.precision));
 
-      const { min, max } = this;
-      if (val !== null) {
-        if (val > max) {
-          val = max;
-        } else if (val < min) {
-          val = min;
-        }
-      }
+            const { min, max } = this;
+            if (val !== null) {
+                if (val > max) {
+                    val = max;
+                } else if (val < min) {
+                    val = min;
+                }
+            }
 
-      this.$nextTick(() => {
-        this.currentValue = val;
-        this.$emit("input", val);
-        this.$emit("on-change", val);
-        this.dispatch("FormItem", "on-form-change", val);
-      });
-    },
-    focus(event) {
-      this.focused = true;
-      this.$emit("on-focus", event);
-    },
-    blur() {
-      this.focused = false;
-      this.$emit("on-blur");
-      if (
-        !findComponentUpward(this, [
-          "DatePicker",
-          "TimePicker",
-          "Cascader",
-          "Search",
-        ])
-      ) {
-        this.dispatch("FormItem", "on-form-blur", this.currentValue);
-      }
-    },
-    keyDown(e) {
-      if (e.keyCode === 38) {
-        e.preventDefault();
-        this.up(e);
-      } else if (e.keyCode === 40) {
-        e.preventDefault();
-        this.down(e);
-      }
-    },
-    change(event) {
-      if (event.type == "change" && this.activeChange) return;
+            this.$nextTick(() => {
+                this.currentValue = val;
+                this.$emit("input", val);
+                this.$emit("on-change", val);
+                this.dispatch("FormItem", "on-form-change", val);
+            });
+        },
+        focus(event) {
+            this.focused = true;
+            this.$emit("on-focus", event);
+        },
+        blur() {
+            this.focused = false;
+            this.$emit("on-blur");
+            if (
+                !findComponentUpward(this, [
+                    "DatePicker",
+                    "TimePicker",
+                    "Cascader",
+                    "Search"
+                ])
+            ) {
+                this.dispatch("FormItem", "on-form-blur", this.currentValue);
+            }
+        },
+        keyDown(e) {
+            if (e.keyCode === 38) {
+                e.preventDefault();
+                this.up(e);
+            } else if (e.keyCode === 40) {
+                e.preventDefault();
+                this.down(e);
+            }
+        },
+        change(event) {
+            if (event.type == "change" && this.activeChange) return;
 
-      if (event.type == "input" && !this.activeChange) return;
-      let val = event.target.value.trim();
-      if (this.parser) {
-        val = this.parser(val);
-      }
+            if (event.type == "input" && !this.activeChange) return;
+            let val = event.target.value.trim();
+            if (this.parser) {
+                val = this.parser(val);
+            }
 
-      const isEmptyString = val.length === 0;
-      if (isEmptyString) {
-        this.setValue(null);
-        return;
-      }
-      if (event.type == "input" && val.match(/^\-?\.?$|\.$/)) return;
+            const isEmptyString = val.length === 0;
+            if (isEmptyString) {
+                this.setValue(null);
+                return;
+            }
+            if (event.type == "input" && val.match(/^\-?\.?$|\.$/)) return;
 
-      val = Number(val);
+            val = Number(val);
 
-      if (!isNaN(val)) {
-        this.currentValue = val;
-        this.setValue(val);
-      } else {
-        event.target.value = this.currentValue;
-      }
-    },
-    changeVal(val) {
-      val = Number(val);
-      if (!isNaN(val)) {
-        const step = this.step;
+            if (!isNaN(val)) {
+                this.currentValue = val;
+                this.setValue(val);
+            } else {
+                event.target.value = this.currentValue;
+            }
+        },
+        changeVal(val) {
+            val = Number(val);
+            if (!isNaN(val)) {
+                const step = this.step;
 
-        this.upDisabled = val + step > this.max;
-        this.downDisabled = val - step < this.min;
-      } else {
-        this.upDisabled = true;
-        this.downDisabled = true;
-      }
-    },
-  },
-  mounted() {
-    this.changeVal(this.currentValue);
-  },
-  watch: {
-    value(val) {
-      this.currentValue = val;
-    },
-    currentValue(val) {
-      this.changeVal(val);
-    },
-    min() {
-      this.changeVal(this.currentValue);
+                this.upDisabled = val + step > this.max;
+                this.downDisabled = val - step < this.min;
+            } else {
+                this.upDisabled = true;
+                this.downDisabled = true;
+            }
+        }
     },
-    max() {
-      this.changeVal(this.currentValue);
+    mounted() {
+        this.changeVal(this.currentValue);
     },
-  },
+    watch: {
+        value(val) {
+            this.currentValue = val;
+        },
+        currentValue(val) {
+            this.changeVal(val);
+        },
+        min() {
+            this.changeVal(this.currentValue);
+        },
+        max() {
+            this.changeVal(this.currentValue);
+        }
+    }
 };
 </script>
diff --git a/src/components/page/options.vue b/src/components/page/options.vue
index 142fa87..a45ddfc 100644
--- a/src/components/page/options.vue
+++ b/src/components/page/options.vue
@@ -20,7 +20,7 @@
     <div v-if="showElevator" :class="ElevatorClasses">
       {{ t('i.page.goto') }}
       <input
-        type="text"
+        type="number"
         :value="_current"
         autocomplete="off"
         spellcheck="false"
@@ -39,78 +39,78 @@ import Locale from "../../mixins/locale";
 const prefixCls = "bee-page";
 
 function isValueNumber(value) {
-  return /^[1-9][0-9]*$/.test(value + "");
+    return /^[1-9][0-9]*$/.test(value + "");
 }
 
 export default {
-  name: "PageOption",
-  mixins: [Locale],
-  components: { iSelect, iOption },
-  props: {
-    pageSizeOpts: Array,
-    showSizer: Boolean,
-    showElevator: Boolean,
-    current: Number,
-    _current: Number,
-    pageSize: Number,
-    allPages: Number,
-    isSmall: Boolean,
-    placement: String,
-    transfer: Boolean,
-    disabled: Boolean,
-  },
-  data() {
-    return {
-      currentPageSize: this.pageSize,
-    };
-  },
-  watch: {
-    pageSize(val) {
-      this.currentPageSize = val;
+    name: "PageOption",
+    mixins: [Locale],
+    components: { iSelect, iOption },
+    props: {
+        pageSizeOpts: Array,
+        showSizer: Boolean,
+        showElevator: Boolean,
+        current: Number,
+        _current: Number,
+        pageSize: Number,
+        allPages: Number,
+        isSmall: Boolean,
+        placement: String,
+        transfer: Boolean,
+        disabled: Boolean
     },
-  },
-  computed: {
-    size() {
-      return this.isSmall ? "small" : "default";
+    data() {
+        return {
+            currentPageSize: this.pageSize
+        };
     },
-    optsClasses() {
-      return [`${prefixCls}-options`];
-    },
-    sizerClasses() {
-      return [`${prefixCls}-options-sizer`];
-    },
-    ElevatorClasses() {
-      return [`${prefixCls}-options-elevator`];
+    watch: {
+        pageSize(val) {
+            this.currentPageSize = val;
+        }
     },
-  },
-  methods: {
-    changeSize() {
-      this.$emit("on-size", this.currentPageSize);
+    computed: {
+        size() {
+            return this.isSmall ? "small" : "default";
+        },
+        optsClasses() {
+            return [`${prefixCls}-options`];
+        },
+        sizerClasses() {
+            return [`${prefixCls}-options-sizer`];
+        },
+        ElevatorClasses() {
+            return [`${prefixCls}-options-elevator`];
+        }
     },
-    changePage(event) {
-      let val = event.target.value.trim();
-      let page = 0;
+    methods: {
+        changeSize() {
+            this.$emit("on-size", this.currentPageSize);
+        },
+        changePage(event) {
+            let val = event.target.value.trim();
+            let page = 0;
 
-      if (isValueNumber(val)) {
-        val = Number(val);
-        if (val != this.current) {
-          const allPages = this.allPages;
+            if (isValueNumber(val)) {
+                val = Number(val);
+                if (val != this.current) {
+                    const allPages = this.allPages;
 
-          if (val > allPages) {
-            page = allPages;
-          } else {
-            page = val;
-          }
-        }
-      } else {
-        page = 1;
-      }
+                    if (val > allPages) {
+                        page = allPages;
+                    } else {
+                        page = val;
+                    }
+                }
+            } else {
+                page = 1;
+            }
 
-      if (page) {
-        this.$emit("on-page", page);
-        event.target.value = page;
-      }
-    },
-  },
+            if (page) {
+                this.$emit("on-page", page);
+                event.target.value = page;
+            }
+        }
+    }
 };
 </script>
diff --git a/src/components/table/table-head.vue b/src/components/table/table-head.vue
index 244de76..09d5816 100644
--- a/src/components/table/table-head.vue
+++ b/src/components/table/table-head.vue
@@ -136,12 +136,12 @@
                   </div>
                 </Poptip>
 
-                <Input
+                <InputNumber
                   v-if="
                     fcolumn._type === 'number' && isFilterPopperShow(fcolumn)
                   "
                   clearable
-                  number
+
                   v-model="fcolumn._filterValue"
                   placeholder
                   @input.native="handleInput($event, fcolumn)"
diff --git a/src/components/table/table.vue b/src/components/table/table.vue
index 5e37655..df60cf9 100644
--- a/src/components/table/table.vue
+++ b/src/components/table/table.vue
@@ -199,13 +199,14 @@
         <slot name="footer"></slot>
       </div>
 
-      <div style="margin-top: 15px" v-if="showPager">
+      <div v-if="showPager">
         <Page
           show-total
           :filterResultL="localeFilterResultL"
           :filterResultR="localeFilterResultR"
           ref="page"
-          style="margin-left: 20px; margin-bottom: 10px"
+          :styles="pageStyles"
+          :className="pageClassName"
           :total="total === null ? data.length:total"
           :current="page"
           :filterTotalData="filterTotal === null ?rebuildData.length:filterTotal"
@@ -336,6 +337,28 @@ export default {
                 return "";
             }
         },
+        pageClassName: {
+            type: String,
+            default() {
+                return "";
+            }
+        },
+        pageStyles: {
+            type: Object,
+            default() {
+                return {
+                    marginLeft: "20px",
+                    marginBottom: "15px",
+                    marginTop: "15px"
+                };
+            }
+        },
+        pageRowHeight: {
+            type: [Number, String],
+            default() {
+                return 60;
+            }
+        },
         context: {
             type: Object
         },
@@ -659,7 +682,6 @@ export default {
         styles() {
             let style = {};
             let summaryHeight = 0;
-            let pageRowHeight = 60;
             if (this.showSummary) {
                 if (this.size === "small") summaryHeight = 40;
                 else if (this.size === "large") summaryHeight = 60;
@@ -668,16 +690,18 @@ export default {
             if (this.height) {
                 let height = parseInt(this.height) + summaryHeight;
                 if (this.showPager) {
-                    style.height = `${height + pageRowHeight}px`;
+                    style.height = `${height + this.pageRowHeight}px`;
                 } else {
                     style.height = `${height}px`;
                 }
             }
             if (this.maxHeight) {
                 const maxHeight =
-                    parseInt(this.maxHeight) + summaryHeight + pageRowHeight;
+                    parseInt(this.maxHeight) +
+                    summaryHeight +
+                    this.pageRowHeight;
                 if (this.showPager) {
-                    style.maxHeight = `${maxHeight + pageRowHeight}px`;
+                    style.maxHeight = `${maxHeight + this.pageRowHeight}px`;
                 } else {
                     style.maxHeight = `${maxHeight}px`;
                 }
@@ -1116,10 +1140,28 @@ export default {
             const oldData =
                 oldIndex < 0
                     ? null
-                    : JSON.parse(JSON.stringify(this.rebuildData[oldIndex]));
+                    : this.rebuildData.find(p => p._index === oldIndex) ===
+                      undefined
+                        ? null
+                        : JSON.parse(
+                              JSON.stringify(
+                                  this.rebuildData.find(
+                                      p => p._index === oldIndex
+                                  )
+                              )
+                          );
             const newData =
                 type === "highlight"
-                    ? JSON.parse(JSON.stringify(this.rebuildData[_index]))
+                    ? this.rebuildData.find(p => p._index === _index) ===
+                      undefined
+                        ? null
+                        : JSON.parse(
+                              JSON.stringify(
+                                  this.rebuildData.find(
+                                      p => p._index === _index
+                                  )
+                              )
+                          )
                     : null;
             this.$emit("on-current-change", newData, oldData);
         },
@@ -1432,7 +1474,7 @@ export default {
             }
 
             for (let i = 0; i < this.rightFixedFilterRows.length; i++) {
-                if (this.leftFixedFilterRows[i].fixed === "right") {
+                if (this.rightFixedFilterRows[i].fixed === "right") {
                     if (
                         this.rightFixedFilterRows[i]._sortType === "desc" ||
                         this.rightFixedFilterRows[i]._sortType === "asc"
diff --git a/src/styles/components/input-number.less b/src/styles/components/input-number.less
index 32febc2..08074f5 100644
--- a/src/styles/components/input-number.less
+++ b/src/styles/components/input-number.less
@@ -10,32 +10,31 @@
     @radius-wrap: 0 @btn-border-radius @btn-border-radius 0;
 
     .input;
+    border:none !important;
     margin: 0;
     padding: 0;
-    width: 80px;
+    // width: 80px;
     height: @input-height-base;
     line-height: @input-height-base;
     vertical-align: middle;
-    border: 1px solid @border-color-base;
-    border-radius: @btn-border-radius;
+
     overflow: hidden;
     cursor: default;
 
     &-handler-wrap {
         width: 22px;
         height: 100%;
-        border-left: 1px solid @border-color-base;
-        border-radius: @radius-wrap;
         background: #fff;
         position: absolute;
         top: 0;
         right: 0;
-        opacity: 0;
-        transition: opacity @transition-time @ease-in-out;
+        opacity: 1;
+
     }
 
     &:hover &-handler-wrap {
         opacity: 1;
+        border-color: transparent !important;
     }
 
     &-handler-up {
@@ -46,7 +45,7 @@
     }
 
     &-handler-down {
-        border-top: 1px solid @border-color-base;
+        // border-top: 1px solid @border-color-base;
         top: -1px;
         cursor: pointer;
     }
@@ -85,7 +84,7 @@
     }
 
     &-focused {
-        .active();
+        // .active();
     }
 
     &-disabled {
diff --git a/src/styles/components/table.less b/src/styles/components/table.less
index 1ee1888..e0a8b6e 100644
--- a/src/styles/components/table.less
+++ b/src/styles/components/table.less
@@ -180,7 +180,7 @@
         }
     }
     &-filter-hidden {
-        min-height: 48px;
+        min-height: 32px;
     }
     &-cell {
         padding-left: 18px;
@@ -283,6 +283,7 @@
             }
         }
 
+
         &-ellipsis {
             word-break: keep-all;
             white-space: nowrap;
@@ -422,7 +423,7 @@
             height: 32px;
         }
         td {
-            height: 40px;
+            height: 32px;
         }
         &-title,
         &-footer {