eoss 0.1.0-alpha.47 → 0.1.0-alpha.49

package/lib/eoss.common.js

@@ -391,37 +391,37 @@ module.exports = require("eoss/lib/tooltip");
 /* 25 */
 /***/ (function(module, exports) {
 
-module.exports = require("eoss/lib/utils/scrollbar.js");
+module.exports = require("eoss/lib/utils/bus.js");
 
 /***/ }),
 /* 26 */
 /***/ (function(module, exports) {
 
-module.exports = require("eoss/lib/utils/bus.js");
+module.exports = require("eoss/lib/utils/merge.js");
 
 /***/ }),
 /* 27 */
 /***/ (function(module, exports) {
 
-module.exports = require("eoss/lib/utils/merge.js");
+module.exports = require("eoss/lib/option");
 
 /***/ }),
 /* 28 */
 /***/ (function(module, exports) {
 
-module.exports = require("eoss/lib/option");
+module.exports = require("eoss/lib/utils/clickoutside.js");
 
 /***/ }),
 /* 29 */
 /***/ (function(module, exports) {
 
-module.exports = require("eoss/lib/utils/clickoutside.js");
+module.exports = require("eoss/lib/mixins/migrating.js");
 
 /***/ }),
 /* 30 */
 /***/ (function(module, exports) {
 
-module.exports = require("eoss/lib/mixins/migrating.js");
+module.exports = require("eoss/lib/utils/scrollbar.js");
 
 /***/ }),
 /* 31 */
@@ -4097,7 +4097,7 @@ autocompletevue_type_template_id_2a7fb7a9_render._withStripped = true
 var external_throttle_debounce_ = __webpack_require__(11);
 
 // EXTERNAL MODULE: external "eoss/lib/utils/clickoutside.js"
-var clickoutside_js_ = __webpack_require__(29);
+var clickoutside_js_ = __webpack_require__(28);
 var clickoutside_js_default = /*#__PURE__*/__webpack_require__.n(clickoutside_js_);
 
 // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/autocomplete/src/autocomplete-suggestions.vue?vue&type=template&id=5bc092d2&
@@ -4273,7 +4273,7 @@ var autocomplete_suggestions_component = Object(componentNormalizer["a" /* defau
 
 /* harmony default export */ var autocomplete_suggestions = (autocomplete_suggestions_component.exports);
 // EXTERNAL MODULE: external "eoss/lib/mixins/migrating.js"
-var migrating_js_ = __webpack_require__(30);
+var migrating_js_ = __webpack_require__(29);
 var migrating_js_default = /*#__PURE__*/__webpack_require__.n(migrating_js_);
 
 // EXTERNAL MODULE: external "eoss/lib/mixins/focus.js"
@@ -11831,11 +11831,11 @@ var store_Store = function () {
 
 /* harmony default export */ var src_store = (store_Store);
 // EXTERNAL MODULE: external "eoss/lib/utils/merge.js"
-var merge_js_ = __webpack_require__(27);
+var merge_js_ = __webpack_require__(26);
 var merge_js_default = /*#__PURE__*/__webpack_require__.n(merge_js_);
 
 // EXTERNAL MODULE: external "eoss/lib/utils/scrollbar.js"
-var scrollbar_js_ = __webpack_require__(25);
+var scrollbar_js_ = __webpack_require__(30);
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/cascader-panel/src/cascader-panel.vue?vue&type=script&lang=js&
 var cascader_panelvue_type_script_lang_js_extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
@@ -17945,7 +17945,7 @@ cronvue_type_template_id_91c19ae2_render._withStripped = true
 // CONCATENATED MODULE: ./packages/cron/src/cron.vue?vue&type=template&id=91c19ae2&
 
 // EXTERNAL MODULE: external "eoss/lib/option"
-var option_ = __webpack_require__(28);
+var option_ = __webpack_require__(27);
 var option_default = /*#__PURE__*/__webpack_require__.n(option_);
 
 // EXTERNAL MODULE: external "eoss/lib/tab-pane"
@@ -18999,8 +18999,8 @@ cron.install = function (Vue) {
 };
 
 /* harmony default export */ var packages_cron = (cron);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/data-table/src/data-table.vue?vue&type=template&id=a0d290e2&
-var data_tablevue_type_template_id_a0d290e2_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/data-table/src/data-table.vue?vue&type=template&id=0c0ac1b9&
+var data_tablevue_type_template_id_0c0ac1b9_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -19048,12 +19048,13 @@ var data_tablevue_type_template_id_a0d290e2_render = function () {
                 {
                   ref: "esTable",
                   attrs: {
-                    thead: _vm.thead,
+                    thead: _vm.theads,
                     data: _vm.datas,
                     height: _vm.tableHeight,
                     readonly: _vm.readonly,
                     "infinite-scroll": _vm.handleInfiniteScroll,
                     "infinite-scroll-disabled": _vm.isInfiniteScrollDisabled,
+                    "show-summary": _vm.showSummary,
                   },
                 },
                 "es-table",
@@ -19085,16 +19086,34 @@ var data_tablevue_type_template_id_a0d290e2_render = function () {
             )
           )
         : _vm._e(),
+      _c(
+        "es-dialog",
+        {
+          attrs: { title: "列表设置", visible: _vm.showSizer },
+          on: {
+            "update:visible": function ($event) {
+              _vm.showSizer = $event
+            },
+          },
+        },
+        [
+          _c("sizer", {
+            attrs: { data: _vm.thead, "show-summary": _vm.showSummary },
+            on: { confirm: _vm.mergeThead },
+          }),
+        ],
+        1
+      ),
       _vm._t("default"),
     ],
     2
   )
 }
-var data_tablevue_type_template_id_a0d290e2_staticRenderFns = []
-data_tablevue_type_template_id_a0d290e2_render._withStripped = true
+var data_tablevue_type_template_id_0c0ac1b9_staticRenderFns = []
+data_tablevue_type_template_id_0c0ac1b9_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/data-table/src/data-table.vue?vue&type=template&id=a0d290e2&
+// CONCATENATED MODULE: ./packages/data-table/src/data-table.vue?vue&type=template&id=0c0ac1b9&
 
 // EXTERNAL MODULE: external "eoss/lib/table"
 var table_ = __webpack_require__(58);
@@ -19239,6 +19258,277 @@ var pagination_default = /*#__PURE__*/__webpack_require__.n(pagination_);
     }
   }
 });
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/data-table/src/sizer.vue?vue&type=template&id=8a8cface&
+var sizervue_type_template_id_8a8cface_render = function () {
+  var _vm = this
+  var _h = _vm.$createElement
+  var _c = _vm._self._c || _h
+  return _c(
+    "div",
+    [
+      _c("es-table", {
+        attrs: { height: "380px", data: _vm.rows, thead: _vm.thead },
+        on: {
+          "update:data": function ($event) {
+            _vm.rows = $event
+          },
+        },
+      }),
+      _c(
+        "div",
+        { staticClass: "es-data-table__sizer-btn" },
+        [
+          _c(
+            "es-button",
+            {
+              attrs: { type: "primary", size: "medium" },
+              on: { click: _vm.handleConfirm },
+            },
+            [_vm._v("确定")]
+          ),
+        ],
+        1
+      ),
+    ],
+    1
+  )
+}
+var sizervue_type_template_id_8a8cface_staticRenderFns = []
+sizervue_type_template_id_8a8cface_render._withStripped = true
+
+
+// CONCATENATED MODULE: ./packages/data-table/src/sizer.vue?vue&type=template&id=8a8cface&
+
+// CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/data-table/src/sizer.vue?vue&type=script&lang=js&
+var sizervue_type_script_lang_js_extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
+
+function sizervue_type_script_lang_js_objectWithoutProperties(obj, keys) { var target = {}; for (var i in obj) { if (keys.indexOf(i) >= 0) continue; if (!Object.prototype.hasOwnProperty.call(obj, i)) continue; target[i] = obj[i]; } return target; }
+
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+
+
+
+
+/* harmony default export */ var sizervue_type_script_lang_js_ = ({
+  name: 'Sizer',
+  components: { EsButton: button_default.a, EsDataTable: data_table },
+
+  props: {
+    data: Array,
+    showSummary: Boolean
+  },
+  computed: {
+    thead: function thead() {
+      var thead = [{
+        type: 'drag'
+      }, {
+        title: '名称',
+        field: 'title'
+      }, {
+        title: '锁定列位置',
+        field: 'fixed',
+        type: 'select',
+        config: {
+          clearable: true
+        },
+        optionData: [{
+          value: 'left',
+          name: '左'
+        }, {
+          value: 'right',
+          name: '右'
+        }]
+      }, {
+        title: '列是否显示',
+        field: 'hide',
+        type: 'switch',
+        align: 'center',
+        // row.hide 为「是否显示」（true=显示），与 thead.hide（true=隐藏）互反，
+        // es-switch 的 ON(true)/OFF(false) 文案按显示语义对应
+        config: {
+          data: [{
+            value: false,
+            name: '隐藏'
+          }, {
+            value: true,
+            name: '显示'
+          }]
+        }
+      }];
+      return this.showSummary ? [].concat(thead, [{
+        title: '是否开启合计',
+        field: 'total',
+        type: 'switch',
+        align: 'center',
+        data: [{
+          value: false,
+          name: '关闭'
+        }, {
+          value: true,
+          name: '开启'
+        }]
+      }]) : thead;
+    }
+  },
+  data: function data() {
+    return {
+      visible: false,
+      newThead: [],
+      // sizer 表格行模型（活模型）：拖拽顺序经 :data.sync 回写，
+      // 锁定/显示/合计等编辑由 renderDom 的 setValue 直接写回行对象
+      rows: []
+    };
+  },
+  mounted: function mounted() {
+    this.newThead = Object(util_js_["extend"])(true, [], this.data);
+    this.getThead(this.data, this.rows);
+  },
+
+  methods: {
+    show: function show() {
+      this.visible = true;
+    },
+    getThead: function getThead(res, data) {
+      var _this = this;
+
+      res.forEach(function (item, index) {
+        if (item.type !== 'index' && item.type !== 'selection' && item.type !== 'handle' && item.type !== 'drag') {
+          var fixed = item.fixed,
+              hide = item.hide,
+              childHead = item.childHead,
+              children = item.children,
+              title = item.title,
+              other = sizervue_type_script_lang_js_objectWithoutProperties(item, ['fixed', 'hide', 'childHead', 'children', 'title']);
+
+          var items = sizervue_type_script_lang_js_extends({
+            title: title ? title : item.label,
+            fixed: fixed === true ? 'left' : fixed === undefined || fixed === false ? '' : fixed,
+            hide: hide ? false : true,
+            id: index
+          }, other);
+          if (childHead && childHead.length) {
+            var childHeads = [];
+            _this.getThead(childHead, childHeads);
+            items.childHead = childHeads;
+          }
+          if (children && children.length) {
+            var _childHeads = [];
+            _this.getThead(children, _childHeads);
+            items.children = _childHeads;
+          }
+          data.push(items);
+        }
+      });
+    },
+    setThead: function setThead(res, thead) {
+      var name = res.name,
+          value = res.value,
+          data = res.data;
+
+      for (var i in thead) {
+        var item = thead[i];
+        if (data.field === item.field) {
+          thead[i][name] = name === 'hide' ? !value : value;
+          thead[i].hide === false && delete thead[i].hide;
+          break;
+        } else {
+          if (item.childHead && item.childHead.length) {
+            this.setThead(res, item.childHead);
+          }
+          if (item.children && item.children.length) {
+            this.setThead(res, item.children);
+          }
+        }
+      }
+    },
+    handleConfirm: function handleConfirm() {
+      var _this2 = this;
+
+      console.log(this.newThead, this.rows);
+      this.visible = false;
+      // rows 是拖拽+编辑后的活模型：按 field 把各列新值反写回 newThead
+      // （取值映射与 getThead/setThead 的约定互逆），再按 rows 顺序重排，
+      // drag/handle 等不在 rows 里的结构列保持原槽位不动
+      var rowByField = {};
+      this.rows.forEach(function (row) {
+        rowByField[row.field] = row;
+      });
+      var applyRow = function applyRow(item) {
+        var row = rowByField[item.field];
+        if (row) {
+          if (row.fixed === 'left') {
+            item.fixed = true;
+          } else if (row.fixed === 'right') {
+            item.fixed = 'right';
+          } else {
+            delete item.fixed;
+          }
+          // row.hide 为「是否显示」，与 thead.hide（true=隐藏）互反，回写时取反；
+          // false 时删键保持 thead 干净（与 setThead 的历史处理一致）
+          item.hide = !row.hide;
+          item.hide === false && delete item.hide;
+          // 合计列在展示时把每列 total 标记显式回写：table-footer 默认对
+          // 除 total===false 外的所有列求和，不显式化会把未开启合计的列也算进去
+          if (_this2.showSummary || 'total' in row) {
+            item.total = !!row.total;
+          }
+        }
+        if (item.childHead && item.childHead.length) {
+          item.childHead.forEach(applyRow);
+        }
+        if (item.children && item.children.length) {
+          item.children.forEach(applyRow);
+        }
+      };
+      this.newThead.forEach(applyRow);
+      var order = this.rows.map(function (row) {
+        return row.field;
+      });
+      var pool = this.newThead.filter(function (item) {
+        return order.includes(item.field);
+      }).sort(function (a, b) {
+        return order.indexOf(a.field) - order.indexOf(b.field);
+      });
+      var i = 0;
+      var merged = this.newThead.map(function (item) {
+        return order.includes(item.field) ? pool[i++] : item;
+      });
+      this.$emit('confirm', merged);
+    }
+  }
+});
+// CONCATENATED MODULE: ./packages/data-table/src/sizer.vue?vue&type=script&lang=js&
+ /* harmony default export */ var src_sizervue_type_script_lang_js_ = (sizervue_type_script_lang_js_); 
+// CONCATENATED MODULE: ./packages/data-table/src/sizer.vue
+
+
+
+
+
+/* normalize component */
+
+var sizer_component = Object(componentNormalizer["a" /* default */])(
+  src_sizervue_type_script_lang_js_,
+  sizervue_type_template_id_8a8cface_render,
+  sizervue_type_template_id_8a8cface_staticRenderFns,
+  false,
+  null,
+  null,
+  null
+  
+)
+
+/* harmony default export */ var sizer = (sizer_component.exports);
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/data-table/src/data-table.vue?vue&type=script&lang=js&
 var data_tablevue_type_script_lang_js_typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
 
@@ -19326,6 +19616,12 @@ var data_tablevue_type_script_lang_js_extends = Object.assign || function (targe
 //
 //
 //
+//
+//
+//
+//
+//
+
 
 
 
@@ -19343,6 +19639,7 @@ var DEFAULT_PAGES = {
   name: 'EsDataTable',
   mixins: [table_methods],
   components: {
+    sizer: sizer,
     EsTable: table_default.a,
     EsToolbar: toolbar_default.a,
     EsPagination: pagination_default.a
@@ -19440,7 +19737,11 @@ var DEFAULT_PAGES = {
      * @type {Boolean}
      * @default false
      */
-    infiniteScrollDisabled: Boolean
+    infiniteScrollDisabled: Boolean,
+    /**
+     * 筛选列配置
+     */
+    showSummary: Boolean
   },
   computed: {
     /**
@@ -19496,7 +19797,12 @@ var DEFAULT_PAGES = {
     tableListeners: function tableListeners() {
       var _this = this;
 
-      var listeners = data_tablevue_type_script_lang_js_extends({}, this.$listeners);
+      var listeners = data_tablevue_type_script_lang_js_extends({
+        'filter-column': function filterColumn() {
+          console.log('filter-column');
+          _this.showSizer = !_this.showSizer;
+        }
+      }, this.$listeners);
       var originChange = listeners.change;
       listeners.change = function () {
         for (var _len = arguments.length, args = Array(_len), _key = 0; _key < _len; _key++) {
@@ -19528,6 +19834,13 @@ var DEFAULT_PAGES = {
         this.getData(val);
       }
     },
+    thead: {
+      immediate: true,
+      deep: true,
+      handler: function handler(val) {
+        this.theads = val;
+      }
+    },
     data: {
       immediate: true,
       deep: true,
@@ -19567,6 +19880,7 @@ var DEFAULT_PAGES = {
   },
   data: function data() {
     return {
+      theads: [],
       toolbars: [],
       tableHeight: this.height,
       datas: [],
@@ -19578,7 +19892,8 @@ var DEFAULT_PAGES = {
         currentPage: 1,
         pageSize: 20
       },
-      isInfiniteScrollDisabled: this.infiniteScrollDisabled
+      isInfiniteScrollDisabled: this.infiniteScrollDisabled,
+      showSizer: false
     };
   },
   created: function created() {
@@ -19594,6 +19909,11 @@ var DEFAULT_PAGES = {
   },
 
   methods: {
+    mergeThead: function mergeThead(thead) {
+      this.showSizer = false;
+      this.theads = thead;
+    },
+
     /**
      * 对外抛数据变化通知（:data.sync / v-model 承接）
      * @param {Array} val - 最新表格数据，默认当前 datas
@@ -19651,6 +19971,10 @@ var DEFAULT_PAGES = {
      * @param {Array} val - 表格数据
      */
     setDatas: function setDatas(val) {
+      // 回写拦截：datas 对外 emit 后被 .sync 原样带回时与 datas 同引用，
+      // 再走下面的空数据分支会每次新建引用，让 data watch 与 datas watch
+      // 互相触发无限循环（拖拽排序先 emit [] 重置时必现，数组无限增长卡死页面）
+      if (val === this.datas) return;
       if (!this.isTotal || !this.showPagination) {
         this.datas = val || [];
         return;
@@ -19663,7 +19987,8 @@ var DEFAULT_PAGES = {
           this.datas = val;
         }
       } else {
-        this.datas = [];
+        // 复用传入引用而非新建 []，避免与 .sync 回写形成引用循环
+        this.datas = val || [];
       }
     },
 
@@ -19833,8 +20158,8 @@ var DEFAULT_PAGES = {
 
 var data_table_component = Object(componentNormalizer["a" /* default */])(
   src_data_tablevue_type_script_lang_js_,
-  data_tablevue_type_template_id_a0d290e2_render,
-  data_tablevue_type_template_id_a0d290e2_staticRenderFns,
+  data_tablevue_type_template_id_0c0ac1b9_render,
+  data_tablevue_type_template_id_0c0ac1b9_staticRenderFns,
   false,
   null,
   null,
@@ -26870,8 +27195,8 @@ src_item.install = function install(Vue) {
 };
 
 /* harmony default export */ var descriptions_item = (src_item);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/dialog/src/dialog.vue?vue&type=template&id=3526f8eb&
-var dialogvue_type_template_id_3526f8eb_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/dialog/src/dialog.vue?vue&type=template&id=8f9d4b2c&
+var dialogvue_type_template_id_8f9d4b2c_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -27021,11 +27346,11 @@ var dialogvue_type_template_id_3526f8eb_render = function () {
     ]
   )
 }
-var dialogvue_type_template_id_3526f8eb_staticRenderFns = []
-dialogvue_type_template_id_3526f8eb_render._withStripped = true
+var dialogvue_type_template_id_8f9d4b2c_staticRenderFns = []
+dialogvue_type_template_id_8f9d4b2c_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/dialog/src/dialog.vue?vue&type=template&id=3526f8eb&
+// CONCATENATED MODULE: ./packages/dialog/src/dialog.vue?vue&type=template&id=8f9d4b2c&
 
 // EXTERNAL MODULE: external "eoss/lib/utils/popup/popup-manager.js"
 var popup_manager_js_ = __webpack_require__(47);
@@ -27990,14 +28315,16 @@ var availHeight = 600;
      * 获取定位基准矩形（视口）
      * wujie 沙箱（非降级）下 document.body 为 shadowRoot.body，其 rect 只是子应用在主应用内的容器区域
      * （扣除了主应用侧栏/顶栏），fixed 定位的 dialog 用它居中、定边界会整体偏移；
-     * documentElement 的尺寸已被 wujie-polyfill 的 DocElementRectPlugin 修正为主应用视口值，改用它做基准；
+     * 沙箱内 documentElement 仅在主应用注册了 wujie-polyfill 的 DocElementRectPlugin 时才被修正（如 eoss-ui 的 main 未注册），
+     * 故直接通过 __WUJIE_RAW_WINDOW__ 取主应用真实视口尺寸做基准，不依赖主应用是否配置插件；
      * 降级模式与非微前端环境保持原有 document.body 基准不变
      */
     getViewportRect: function getViewportRect() {
       if (window.__WUJIE && !window.__WUJIE.degrade) {
-        var _document$documentEle = document.documentElement,
-            width = _document$documentEle.clientWidth,
-            height = _document$documentEle.clientHeight;
+        var rawWindow = window.__WUJIE_RAW_WINDOW__ || window;
+        var _rawWindow$document$d = rawWindow.document.documentElement,
+            width = _rawWindow$document$d.clientWidth,
+            height = _rawWindow$document$d.clientHeight;
 
         return { width: width, height: height, top: 0, left: 0 };
       }
@@ -28299,8 +28626,8 @@ var availHeight = 600;
 
 var dialog_component = Object(componentNormalizer["a" /* default */])(
   src_dialogvue_type_script_lang_js_,
-  dialogvue_type_template_id_3526f8eb_render,
-  dialogvue_type_template_id_3526f8eb_staticRenderFns,
+  dialogvue_type_template_id_8f9d4b2c_render,
+  dialogvue_type_template_id_8f9d4b2c_staticRenderFns,
   false,
   null,
   null,
@@ -29713,12 +30040,12 @@ dropdown.install = function (Vue) {
 };
 
 /* harmony default export */ var packages_dropdown = (dropdown);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/dropdown/src/dropdown-item.vue?vue&type=template&id=9fae2152&
-var dropdown_itemvue_type_template_id_9fae2152_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/dropdown/src/dropdown-item.vue?vue&type=template&id=2e18ceea&
+var dropdown_itemvue_type_template_id_2e18ceea_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
-  return !_vm.rules || _vm.rules(_vm.param)
+  return _vm.checkRules()
     ? _c(
         "li",
         {
@@ -29782,11 +30109,11 @@ var dropdown_itemvue_type_template_id_9fae2152_render = function () {
       )
     : _vm._e()
 }
-var dropdown_itemvue_type_template_id_9fae2152_staticRenderFns = []
-dropdown_itemvue_type_template_id_9fae2152_render._withStripped = true
+var dropdown_itemvue_type_template_id_2e18ceea_staticRenderFns = []
+dropdown_itemvue_type_template_id_2e18ceea_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/dropdown/src/dropdown-item.vue?vue&type=template&id=9fae2152&
+// CONCATENATED MODULE: ./packages/dropdown/src/dropdown-item.vue?vue&type=template&id=2e18ceea&
 
 // EXTERNAL MODULE: external "dompurify"
 var external_dompurify_ = __webpack_require__(74);
@@ -29850,7 +30177,11 @@ var external_dompurify_default = /*#__PURE__*/__webpack_require__.n(external_dom
   name: 'EsDropdownItem',
 
   mixins: [emitter_js_default.a],
-  inject: ['dropdownMenu'],
+  inject: {
+    dropdownMenu: { default: null },
+    // 按钮组内使用时由 es-button-group provide；独立使用 dropdown 时为 null
+    esButtonGroup: { default: null }
+  },
   components: { EsTooltip: tooltip_default.a, EsIcon: icon_default.a },
 
   props: {
@@ -29912,6 +30243,21 @@ var external_dompurify_default = /*#__PURE__*/__webpack_require__.n(external_dom
   },
 
   methods: {
+    /**
+     * rules 校验：按钮组场景（表格操作列）用行数据调用，
+     * 否则 rules 拿到 undefined 会把本该显示的菜单项判掉
+     * @returns {Boolean} 是否渲染该菜单项
+     */
+    checkRules: function checkRules() {
+      if (!this.rules) {
+        return true;
+      }
+      if (this.esButtonGroup) {
+        return this.rules(this.esButtonGroup.data, this.esButtonGroup.rowData);
+      }
+      return this.rules(this.param);
+    },
+
     /**
      * 处理点击事件
      * @param {Event} evt - 点击事件对象
@@ -29951,8 +30297,8 @@ var external_dompurify_default = /*#__PURE__*/__webpack_require__.n(external_dom
 
 var dropdown_item_component = Object(componentNormalizer["a" /* default */])(
   src_dropdown_itemvue_type_script_lang_js_,
-  dropdown_itemvue_type_template_id_9fae2152_render,
-  dropdown_itemvue_type_template_id_9fae2152_staticRenderFns,
+  dropdown_itemvue_type_template_id_2e18ceea_render,
+  dropdown_itemvue_type_template_id_2e18ceea_staticRenderFns,
   false,
   null,
   null,
@@ -68552,8 +68898,8 @@ flow_list_src_main.install = function (Vue) {
 };
 
 /* harmony default export */ var flow_list = (flow_list_src_main);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/form/src/form.vue?vue&type=template&id=00fbe61f&
-var formvue_type_template_id_00fbe61f_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/form/src/form.vue?vue&type=template&id=17d1941f&
+var formvue_type_template_id_17d1941f_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -68736,11 +69082,11 @@ var formvue_type_template_id_00fbe61f_render = function () {
     2
   )
 }
-var formvue_type_template_id_00fbe61f_staticRenderFns = []
-formvue_type_template_id_00fbe61f_render._withStripped = true
+var formvue_type_template_id_17d1941f_staticRenderFns = []
+formvue_type_template_id_17d1941f_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/form/src/form.vue?vue&type=template&id=00fbe61f&
+// CONCATENATED MODULE: ./packages/form/src/form.vue?vue&type=template&id=17d1941f&
 
 // EXTERNAL MODULE: external "eoss/lib/utils/rules.js"
 var rules_js_ = __webpack_require__(62);
@@ -71784,11 +72130,12 @@ var formvue_type_script_lang_js_win = Object(util_js_["getWinTop"])();
       return this.$refs.scrollbar;
     },
 
-    // 滚动条样式
+    // 滚动条样式：只声明滚动方向，原生滚动条由 CSS 隐藏（见 form.scss 的
+    // .es-form-scroll），它不占位，也就不需要再按条宽加宽容器——那样在浏览器
+    // 缩放时量到的 15px 和实际渲染宽度对不上，容器右侧会露出一条灰边
     scrollStyle: function scrollStyle() {
       if (!this.inline && !this.accordion) {
-        var barWidth = Object(scrollbar_js_["getScrollbarWidth"])();
-        return { width: 'calc(100% + ' + barWidth + 'px)', 'overflow-y': 'scroll' };
+        return { 'overflow-y': 'scroll' };
       }
       return {};
     }
@@ -72470,8 +72817,8 @@ var formvue_type_script_lang_js_win = Object(util_js_["getWinTop"])();
 
 var src_form_component = Object(componentNormalizer["a" /* default */])(
   packages_form_src_formvue_type_script_lang_js_,
-  formvue_type_template_id_00fbe61f_render,
-  formvue_type_template_id_00fbe61f_staticRenderFns,
+  formvue_type_template_id_17d1941f_render,
+  formvue_type_template_id_17d1941f_staticRenderFns,
   false,
   null,
   null,
@@ -80598,8 +80945,8 @@ icon.install = function (Vue) {
 };
 
 /* harmony default export */ var packages_icon = (icon);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/icons/src/icons.vue?vue&type=template&id=3012fd9e&
-var iconsvue_type_template_id_3012fd9e_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/icons/src/icons.vue?vue&type=template&id=40e06ef0&
+var iconsvue_type_template_id_40e06ef0_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -80724,11 +81071,11 @@ var iconsvue_type_template_id_3012fd9e_render = function () {
     2
   )
 }
-var iconsvue_type_template_id_3012fd9e_staticRenderFns = []
-iconsvue_type_template_id_3012fd9e_render._withStripped = true
+var iconsvue_type_template_id_40e06ef0_staticRenderFns = []
+iconsvue_type_template_id_40e06ef0_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/icons/src/icons.vue?vue&type=template&id=3012fd9e&
+// CONCATENATED MODULE: ./packages/icons/src/icons.vue?vue&type=template&id=40e06ef0&
 
 // CONCATENATED MODULE: ./packages/icons/src/icon.js
 /* harmony default export */ var src_icon = ([{
@@ -83411,7 +83758,7 @@ var iconsvue_type_script_lang_js_extends = Object.assign || function (target) {
         }
 
         var keyword = newVal.toLowerCase();
-        this.filteredIconsList = this.filterIcon(keyword);
+        this.filteredIconsList = this.filterIcons(keyword);
       }),
       immediate: true
     }
@@ -83432,7 +83779,7 @@ var iconsvue_type_script_lang_js_extends = Object.assign || function (target) {
      * @param {string} keyword - 搜索关键词
      * @returns {Array} 过滤后的图标列表
      */
-    filterIcon: function filterIcon(keyword) {
+    filterIcons: function filterIcons(keyword) {
       var _this = this;
 
       return this.allIcons.filter(function (name) {
@@ -83560,8 +83907,8 @@ var iconsvue_type_script_lang_js_extends = Object.assign || function (target) {
 
 var icons_component = Object(componentNormalizer["a" /* default */])(
   src_iconsvue_type_script_lang_js_,
-  iconsvue_type_template_id_3012fd9e_render,
-  iconsvue_type_template_id_3012fd9e_staticRenderFns,
+  iconsvue_type_template_id_40e06ef0_render,
+  iconsvue_type_template_id_40e06ef0_staticRenderFns,
   false,
   null,
   null,
@@ -90017,7 +90364,7 @@ lowcodevue_type_template_id_562c9876_render._withStripped = true
 // CONCATENATED MODULE: ./packages/lowcode/src/lowcode.vue?vue&type=template&id=562c9876&
 
 // EXTERNAL MODULE: external "eoss/lib/utils/bus.js"
-var bus_js_ = __webpack_require__(26);
+var bus_js_ = __webpack_require__(25);
 var bus_js_default = /*#__PURE__*/__webpack_require__.n(bus_js_);
 
 // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/lowcode/src/toolbar.vue?vue&type=template&id=2a1307ec&
@@ -107456,27 +107803,6 @@ var lowcode_view_default = /*#__PURE__*/__webpack_require__.n(lowcode_view_);
         type: 'text',
         contents: 'tooltipWidth'
       }]
-    }, {
-      name: 'dragSort',
-      type: 'switch',
-      default: false,
-      label: [{
-        type: 'tips',
-        contents: '是否行拖拽排序（需清除列固定）'
-      }, {
-        type: 'text',
-        contents: 'dragSort'
-      }]
-    }, {
-      name: 'dragSortClass',
-      type: 'text',
-      label: [{
-        type: 'tips',
-        contents: '行拖拽排序指示器(handle)类名'
-      }, {
-        type: 'text',
-        contents: 'dragSortClass'
-      }]
     }, {
       name: 'infiniteScroll',
       type: 'text',
@@ -107649,17 +107975,6 @@ var lowcode_view_default = /*#__PURE__*/__webpack_require__.n(lowcode_view_);
         type: 'text',
         contents: 'defaultExpandAll'
       }]
-    }, {
-      name: 'dragSort',
-      type: 'switch',
-      default: false,
-      label: [{
-        type: 'tips',
-        contents: '是否行拖拽排序'
-      }, {
-        type: 'text',
-        contents: 'dragSort'
-      }]
     }, {
       name: 'readonly',
       type: 'switch',
@@ -108061,17 +108376,6 @@ var lowcode_view_default = /*#__PURE__*/__webpack_require__.n(lowcode_view_);
         type: 'text',
         contents: 'executeFilter'
       }]
-    }, {
-      name: 'dragSortIcon',
-      type: 'text',
-      default: 'es-icon-caidan',
-      label: [{
-        type: 'tips',
-        contents: '行拖拽排序操作列图标'
-      }, {
-        type: 'text',
-        contents: 'dragSortIcon'
-      }]
     }]
   }, {
     name: 'EsTree',
@@ -127692,8 +127996,12 @@ function mixins_objectWithoutProperties(obj, keys) { var target = {}; for (var i
           open = item.open,
           extendData = item.extendData,
           rest = mixins_objectWithoutProperties(item, ['id', 'index', 'open', 'extendData']);
+      // extendData 存在时以它为准，没有则回退到 item 自身的 open；
+      // 原写法 `open || extendData ? Boolean(extendData.openStatus)` 在
+      // 只声明了 open、没带 extendData 的菜单项上会直接抛错
+
 
-      var openStatus = open || extendData ? Boolean(extendData.openStatus) : false;
+      var openStatus = extendData ? Boolean(extendData.openStatus) : Boolean(open);
       var props = void 0;
       if (this.isFourthTabs) {
         if (item.children && item.children.length || item.fourthTabs && item.fourthTabs.length) {
@@ -127851,8 +128159,8 @@ menu_item_group.install = function (Vue) {
 };
 
 /* harmony default export */ var packages_menu_item_group = (menu_item_group);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/menu/src/menu.vue?vue&type=template&id=31887554&
-var menuvue_type_template_id_31887554_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/menu/src/menu.vue?vue&type=template&id=6eb83e82&
+var menuvue_type_template_id_6eb83e82_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -127946,14 +128254,14 @@ var menuvue_type_template_id_31887554_render = function () {
     1
   )
 }
-var menuvue_type_template_id_31887554_staticRenderFns = []
-menuvue_type_template_id_31887554_render._withStripped = true
+var menuvue_type_template_id_6eb83e82_staticRenderFns = []
+menuvue_type_template_id_6eb83e82_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/menu/src/menu.vue?vue&type=template&id=31887554&
+// CONCATENATED MODULE: ./packages/menu/src/menu.vue?vue&type=template&id=6eb83e82&
 
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/menu/src/submenu.vue?vue&type=template&id=09f0751a&
-var submenuvue_type_template_id_09f0751a_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/menu/src/submenu.vue?vue&type=template&id=87f03422&
+var submenuvue_type_template_id_87f03422_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -128163,8 +128471,11 @@ var submenuvue_type_template_id_09f0751a_render = function () {
                             style: {
                               backgroundColor:
                                 _vm.rootMenu.backgroundColor || "",
+                              // 原生条已由 CSS 隐藏（见 menu.scss 的
+                              // .es-menu-hidden > .es-menu--popup），不占位也就无需再用
+                              // marginRight: -条宽 把它推出容器——缩放时量到的 15px 和
+                              // 实际渲染宽度对不上，popup 右/下侧会露出一条灰边
                               maxHeight: _vm.maxH === undefined ? "" : _vm.maxH,
-                              marginRight: _vm.isScroll ? _vm.gutterWith : "",
                             },
                             attrs: { role: "menu" },
                           },
@@ -128255,11 +128566,11 @@ var submenuvue_type_template_id_09f0751a_render = function () {
     2
   )
 }
-var submenuvue_type_template_id_09f0751a_staticRenderFns = []
-submenuvue_type_template_id_09f0751a_render._withStripped = true
+var submenuvue_type_template_id_87f03422_staticRenderFns = []
+submenuvue_type_template_id_87f03422_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/menu/src/submenu.vue?vue&type=template&id=09f0751a&
+// CONCATENATED MODULE: ./packages/menu/src/submenu.vue?vue&type=template&id=87f03422&
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/menu/src/submenu.vue?vue&type=script&lang=js&
 //
@@ -128425,7 +128736,9 @@ submenuvue_type_template_id_09f0751a_render._withStripped = true
 //
 //
 //
-
+//
+//
+//
 
 
 
@@ -128659,9 +128972,6 @@ var poperMixins = {
       }
       return rootMenu.mode === 'horizontal' && isFirstLevel ? 'es-icon-xia' : 'es-icon-you';
     },
-    gutterWith: function gutterWith() {
-      return '-' + Object(scrollbar_js_["getScrollbarWidth"])() + 'px';
-    },
     iconClass: function iconClass() {
       return this.icon || this.rootMenu.parentMenuIcon || this.rootMenu.icon;
     },
@@ -128721,7 +129031,6 @@ var poperMixins = {
       items: {},
       submenus: {},
       mouseInChild: false,
-      isScroll: false,
       height: '',
       isHoveringTitle: false
     };
@@ -128864,11 +129173,8 @@ var poperMixins = {
 
     this.$nextTick(function () {
       var dom = _this5.$refs.menucontent;
-      if (dom && (dom.scrollHeight > dom.clientHeight || dom.offsetHeight > dom.clientHeight)) {
-        _this5.isScroll = true;
-      } else {
-        _this5.isScroll = false;
-      }
+      // 只需要给 es-scrollbar 分支算高度；popup 分支的原生条由 CSS 隐藏，
+      // 不再需要判定是否出了滚动条去抵消它的占位
       if (dom && _this5.maxH && dom.clientHeight > parseInt(_this5.maxH, 10)) {
         _this5.height = _this5.maxH;
       } else {
@@ -128893,8 +129199,8 @@ var poperMixins = {
 
 var submenu_component = Object(componentNormalizer["a" /* default */])(
   src_submenuvue_type_script_lang_js_,
-  submenuvue_type_template_id_09f0751a_render,
-  submenuvue_type_template_id_09f0751a_staticRenderFns,
+  submenuvue_type_template_id_87f03422_render,
+  submenuvue_type_template_id_87f03422_staticRenderFns,
   false,
   null,
   null,
@@ -129240,18 +129546,12 @@ var aria_menubar_js_default = /*#__PURE__*/__webpack_require__.n(aria_menubar_js
     isMenuPopup: function isMenuPopup() {
       return this.mode === 'horizontal' || this.mode === 'vertical' && this.collapse;
     },
+
+    // 菜单容器自身滚动，原生条由 CSS 隐藏（见 menu.scss 的 .es-menu-container），
+    // 不占位也就无需按条宽加大容器把它推出去——那样在浏览器缩放时量到的 15px
+    // 和实际渲染宽度对不上，容器右/下侧会露出一条灰边
     styles: function styles() {
-      // 优化：使用预计算的滚动条宽度，避免重复计算
-      var barWidth = this.scrollbarWidth;
-      return this.mode === 'horizontal' ? {
-        height: 'calc(100% + ' + barWidth + 'px)',
-        width: '100%',
-        'overflow-x': 'scroll'
-      } : {
-        width: 'calc(100% + ' + barWidth + 'px)',
-        height: '100%',
-        'overflow-y': 'scroll'
-      };
+      return this.mode === 'horizontal' ? { height: '100%', width: '100%', 'overflow-x': 'scroll' } : { width: '100%', height: '100%', 'overflow-y': 'scroll' };
     }
   },
   watch: {
@@ -129301,8 +129601,7 @@ var aria_menubar_js_default = /*#__PURE__*/__webpack_require__.n(aria_menubar_js
       items: {},
       submenus: {},
       moveTo: 0,
-      barSize: 0,
-      scrollbarWidth: 0
+      barSize: 0
     };
   },
   beforeCreate: function beforeCreate() {
@@ -129314,8 +129613,6 @@ var aria_menubar_js_default = /*#__PURE__*/__webpack_require__.n(aria_menubar_js
   },
   created: function created() {},
   mounted: function mounted() {
-    // 计算并存储滚动条宽度，避免重复计算
-    this.scrollbarWidth = Object(scrollbar_js_["getScrollbarWidth"])();
     this.initOpenedMenu();
     this.$on('item-click', this.handleItemClick);
     this.$on('submenu-click', this.handleSubmenuClick);
@@ -129587,8 +129884,8 @@ var aria_menubar_js_default = /*#__PURE__*/__webpack_require__.n(aria_menubar_js
 
 var menu_component = Object(componentNormalizer["a" /* default */])(
   src_menuvue_type_script_lang_js_,
-  menuvue_type_template_id_31887554_render,
-  menuvue_type_template_id_31887554_staticRenderFns,
+  menuvue_type_template_id_6eb83e82_render,
+  menuvue_type_template_id_6eb83e82_staticRenderFns,
   false,
   null,
   null,
@@ -138689,18 +138986,50 @@ var src_main_typeof = typeof Symbol === "function" && typeof Symbol.iterator ===
 
 
 
+// 数字或纯数字字符串补 px，其余形式（100%、inherit 等）原样透传
+function toCssSize(val) {
+  var str = String(val).trim();
+  return (/^-?\d+(\.\d+)?$/.test(str) ? str + 'px' : str
+  );
+}
 
-// 缓存 getScrollbarWidth 计算结果
-var cachedScrollbarWidth = null;
-function getCachedScrollbarWidth() {
-  if (cachedScrollbarWidth === null) {
-    cachedScrollbarWidth = Object(scrollbar_js_["getScrollbarWidth"])();
-    // 监听窗口大小变化，重置缓存
-    window.addEventListener('resize', function () {
-      cachedScrollbarWidth = null;
-    });
+// 把 'a: b; c-d: e' 形式的样式串解析成驼峰对象
+function parseStyleText(styleText) {
+  var res = {};
+  var list = String(styleText || '').split(';');
+  for (var i = 0; i < list.length; i++) {
+    var item = list[i];
+    var index = item.indexOf(':');
+    if (index < 0) continue;
+    var key = item.slice(0, index).trim();
+    if (!key) continue;
+    res[key.replace(/-(\w)/g, function (match, letter) {
+      return letter.toUpperCase();
+    })] = item.slice(index + 1).trim();
+  }
+  return res;
+}
+
+// wrap-style 可以是 String / Object / Array，统一归一化成新对象：
+// Vue 2 仅解析绑定为字符串的顶层 style，数组里的字符串项会被丢掉，
+// 另外也不能直接在传入的对象上写字段，避免变更 prop
+function normalizeWrapStyle(val) {
+  if (typeof val === 'string') {
+    return parseStyleText(val);
+  }
+  if (Array.isArray(val)) {
+    return Object(util_js_["toObject"])(val.map(function (item) {
+      return typeof item === 'string' ? parseStyleText(item) : item || {};
+    }));
   }
-  return cachedScrollbarWidth;
+  var res = {};
+  var source = val || {};
+  for (var key in source) {
+    if (Object.prototype.hasOwnProperty.call(source, key)) {
+      res[key] = source[key];
+    }
+  }
+  return res;
 }
 
 /* istanbul ignore next */
@@ -138795,7 +139124,6 @@ function getCachedScrollbarWidth() {
       sizeHeight: '0',
       moveX: 0,
       moveY: 0,
-      height: null,
       initialized: false,
       isHovering: false,
       hideTimer: null,
@@ -138826,45 +139154,26 @@ function getCachedScrollbarWidth() {
     }
   },
 
-  // 在 render 方法中使用缓存
   render: function render(h) {
-    var gutter = getCachedScrollbarWidth();
-    var style = this.wrapStyle;
-    if (gutter) {
-      var gutterWith = '-' + gutter + 'px';
-      var gutterStyle = 'margin-bottom: ' + gutterWith + '; margin-right: ' + gutterWith + ';';
-      if (this.styles || this.height || this.maxHeight) {
-        var height = this.height || this.styles && this.styles.height;
-        if (height === '100%') {
-          gutterStyle += 'height:calc(100% + ' + gutter + 'px);';
-        } else {
-          gutterStyle += height ? 'height:' + (parseInt(height, 10) + gutter) + 'px' : '';
-        }
-        var maxHeight = this.maxHeight || this.styles && this.styles.maxHeight || this.styles && this.styles['max-height'];
-        if (maxHeight === '100%') {
-          gutterStyle += 'max-height:calc(100% + ' + gutter + 'px);';
-        } else {
-          gutterStyle += maxHeight ? 'max-height:' + parseInt(maxHeight, 10) + 'px' : '';
-        }
-      } else {
-        gutterStyle += 'height:calc(100% + ' + gutter + 'px);';
-      }
+    // wrap 内联样式只负责高度声明与自定义样式，不再做原生滚动条的占位补偿：
+    // 原生滚动条已由 CSS 隐藏（--hidden-default 恒挂，IE 走 -ms-overflow-style），
+    // 本身不占位；此前的负 margin + calc(100% + gutter) 在浏览器缩放时，量取的
+    // gutter 取整宽度和实际渲染宽度对不上，底部/右侧就会露出一条灰边。
+    var wrapStyles = normalizeWrapStyle(this.wrapStyle);
+    var height = this.styles && this.styles.height;
+    var maxHeight = this.maxHeight || this.styles && (this.styles.maxHeight || this.styles['max-height']);
 
-      if (Array.isArray(this.wrapStyle)) {
-        style = Object(util_js_["toObject"])(this.wrapStyle);
-        style.marginRight = style.marginBottom = gutterWith;
-        if (!style.height && !style.maxHeight) {
-          style.height = '100%';
-        }
-      } else if (typeof this.wrapStyle === 'string') {
-        style += gutterStyle;
-      } else {
-        style = gutterStyle;
-      }
-    } else {
-      style = 'height:100%;';
+    // 已有的键不覆盖，保证用户显式写的 wrap-style 优先
+    if (height && wrapStyles.height === undefined) {
+      wrapStyles.height = toCssSize(height);
+    }
+    if (maxHeight && wrapStyles.maxHeight === undefined) {
+      wrapStyles.maxHeight = toCssSize(maxHeight);
     }
 
+    var hasStyle = Object.keys(wrapStyles).length > 0;
+    var style = hasStyle ? wrapStyles : undefined;
+
     // 虚拟滚动实现
     var view = h(this.tag, {
       class: ['es-scrollbar__view', this.viewClass],
@@ -138881,7 +139190,7 @@ function getCachedScrollbarWidth() {
           'scroll': this.handleScroll
         },
 
-        'class': [this.wrapClass, 'es-scrollbar__wrap', gutter ? '' : 'es-scrollbar__wrap--hidden-default']
+        'class': [this.wrapClass, 'es-scrollbar__wrap es-scrollbar__wrap--hidden-default']
       },
       [[view]]
     );
@@ -138919,8 +139228,12 @@ function getCachedScrollbarWidth() {
         'div',
         {
           ref: 'wrap',
-          'class': [this.wrapClass, 'es-scrollbar__wrap'],
-          style: style
+          style: style,
+          on: {
+            'scroll': this.handleScroll
+          },
+
+          'class': [this.wrapClass, 'es-scrollbar__wrap']
         },
         [[view]]
       )];
@@ -139249,18 +139562,8 @@ function getCachedScrollbarWidth() {
         var wrap = _this5.wrap;
         if (!wrap) return;
 
-        // 确保 wrap 元素有正确的高度设置，特别是在嵌套场景下
-        if (!wrap.style.height && !wrap.style.maxHeight && !_this5.height && !_this5.maxHeight) {
-          // 如果没有设置高度，尝试从父元素获取
-          var parent = wrap.parentNode;
-          if (parent && parent.style.height) {
-            wrap.style.height = parent.style.height;
-          } else if (parent && parent.style.maxHeight) {
-            wrap.style.height = parent.style.maxHeight;
-          } else if (parent && parent.clientHeight) {
-            wrap.style.height = parent.clientHeight + 'px';
-          }
-        }
+        // wrap 高度：CSS 给默认的 height: 100%，需要限高时由调用方通过
+        // max-height / wrap-style 声明（组件自身的 wrap-class 限高不受干扰）
 
         // 缓存计算值
         var clientHeight = wrap.clientHeight;
@@ -139281,18 +139584,6 @@ function getCachedScrollbarWidth() {
         }
 
         _this5.onReady && _this5.onReady(_this5.sizeHeight, _this5.sizeWidth);
-
-        // 延迟执行高度计算逻辑
-        requestAnimationFrame(function () {
-          var maxH = wrap.parentNode.style['max-height'];
-          if (maxH) {
-            maxH = parseInt(maxH, 10);
-            var gutter = getCachedScrollbarWidth();
-            if (wrap.offsetHeight - gutter > maxH) {
-              _this5.height = maxH;
-            }
-          }
-        });
       });
     },
 
@@ -139373,8 +139664,8 @@ scrollbar_src_main.install = function (Vue) {
 };
 
 /* harmony default export */ var packages_scrollbar = (scrollbar_src_main);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/select/src/select.vue?vue&type=template&id=5f1334b0&
-var selectvue_type_template_id_5f1334b0_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/select/src/select.vue?vue&type=template&id=4639eab5&
+var selectvue_type_template_id_4639eab5_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -140105,11 +140396,11 @@ var selectvue_type_template_id_5f1334b0_render = function () {
     2
   )
 }
-var selectvue_type_template_id_5f1334b0_staticRenderFns = []
-selectvue_type_template_id_5f1334b0_render._withStripped = true
+var selectvue_type_template_id_4639eab5_staticRenderFns = []
+selectvue_type_template_id_4639eab5_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/select/src/select.vue?vue&type=template&id=5f1334b0&
+// CONCATENATED MODULE: ./packages/select/src/select.vue?vue&type=template&id=4639eab5&
 
 // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/select/src/select-dropdown.vue?vue&type=template&id=3d0b907d&
 var select_dropdownvue_type_template_id_3d0b907d_render = function () {
@@ -141687,6 +141978,10 @@ var selectvue_type_script_lang_js_this = undefined;
 
 
     results: {
+      // 树形模式的 options 完全由 data/results 驱动（树节点不是 es-option，不会自注册），
+      // 必须 immediate：否则静态传入 data 时 results 初始化不触发 watcher，
+      // options 恒为 []，下拉被 v-show="options.length > 0" 隐藏并显示「无数据」
+      immediate: true,
       deep: true,
       handler: function handler(val) {
         if (this.tree) {
@@ -142280,11 +142575,17 @@ var selectvue_type_script_lang_js_this = undefined;
         if (this.filterable) this.$refs.input.focus();
         this.resetInputHeight();
       } else {
+        var selectValue = option.value;
         if (this.valueType === 'string') {
-          this.$emit('input', Object(util_js_["getValueByPath"])(option.value, this.actualValueKey));
-        } else {
-          this.$emit('input', option.value);
+          selectValue = Object(util_js_["getValueByPath"])(option.value, this.actualValueKey);
+          // 树节点未提供 value-key 对应字段时取值为 undefined，直接写入 v-model 会让
+          // setSelected 解析不出 label（表现为选中后不回显），此处退回整节点对象，
+          // 由 getOption 的对象分支按 label-key 取标签
+          if (this.tree && selectValue === undefined) {
+            selectValue = option.value;
+          }
         }
+        this.$emit('input', selectValue);
         this.emitChange(option.value);
         this.visible = false;
       }
@@ -142508,8 +142809,8 @@ var selectvue_type_script_lang_js_this = undefined;
 
 var select_component = Object(componentNormalizer["a" /* default */])(
   src_selectvue_type_script_lang_js_,
-  selectvue_type_template_id_5f1334b0_render,
-  selectvue_type_template_id_5f1334b0_staticRenderFns,
+  selectvue_type_template_id_4639eab5_render,
+  selectvue_type_template_id_4639eab5_staticRenderFns,
   false,
   null,
   null,
@@ -142526,8 +142827,8 @@ src_select.install = function (Vue) {
 };
 
 /* harmony default export */ var packages_select = (src_select);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/selector/src/selector.vue?vue&type=template&id=015c6e04&
-var selectorvue_type_template_id_015c6e04_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/selector/src/selector.vue?vue&type=template&id=950e8dd4&
+var selectorvue_type_template_id_950e8dd4_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -142783,11 +143084,11 @@ var selectorvue_type_template_id_015c6e04_render = function () {
       )
     : _vm._e()
 }
-var selectorvue_type_template_id_015c6e04_staticRenderFns = []
-selectorvue_type_template_id_015c6e04_render._withStripped = true
+var selectorvue_type_template_id_950e8dd4_staticRenderFns = []
+selectorvue_type_template_id_950e8dd4_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/selector/src/selector.vue?vue&type=template&id=015c6e04&
+// CONCATENATED MODULE: ./packages/selector/src/selector.vue?vue&type=template&id=950e8dd4&
 
 // EXTERNAL MODULE: external "eoss/lib/autocomplete"
 var autocomplete_ = __webpack_require__(120);
@@ -143381,8 +143682,7 @@ var selectorvue_type_script_lang_js_extends = Object.assign || function (target)
       timer: null,
       tagsHeight: 0,
       moveTo: 0,
-      barSize: 0,
-      scrollbarWidth: 0
+      barSize: 0
     };
   },
 
@@ -143390,12 +143690,12 @@ var selectorvue_type_script_lang_js_extends = Object.assign || function (target)
     styles: function styles() {
       return this.tagsHeight ? { 'max-height': this.tagsHeight + 'px', overflow: 'hidden' } : {};
     },
+
+    // tags 折叠限高时内层容器自身滚动，原生条由 CSS 隐藏（见 selector.scss），
+    // 不占位也就无需按条宽加宽容器把它推出去——那样在浏览器缩放时量到的
+    // 15px 和实际渲染宽度对不上，右侧会露出一条灰边
     tagsStyle: function tagsStyle() {
-      return this.tagsHeight ? {
-        'max-height': this.tagsHeight + 'px',
-        overflowY: 'scroll',
-        width: 'calc(100% + ' + this.scrollbarWidth + 'px)'
-      } : {};
+      return this.tagsHeight ? { 'max-height': this.tagsHeight + 'px', overflowY: 'scroll' } : {};
     },
 
     // 滚动容器
@@ -143516,7 +143816,6 @@ var selectorvue_type_script_lang_js_extends = Object.assign || function (target)
   mounted: function mounted() {
     var _this2 = this;
 
-    this.scrollbarWidth = Object(scrollbar_js_["getScrollbarWidth"])();
     //this.resetInputHeight();
     if (this.filterable) {
       this.$nextTick(function () {
@@ -143827,8 +144126,8 @@ var selectorvue_type_script_lang_js_extends = Object.assign || function (target)
 
 var selector_component = Object(componentNormalizer["a" /* default */])(
   src_selectorvue_type_script_lang_js_,
-  selectorvue_type_template_id_015c6e04_render,
-  selectorvue_type_template_id_015c6e04_staticRenderFns,
+  selectorvue_type_template_id_950e8dd4_render,
+  selectorvue_type_template_id_950e8dd4_staticRenderFns,
   false,
   null,
   null,
@@ -148118,8 +148417,8 @@ src_switch.install = function (Vue) {
 };
 
 /* harmony default export */ var packages_switch = (src_switch);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/table/src/table.vue?vue&type=template&id=10e33a98&
-var tablevue_type_template_id_10e33a98_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/table/src/table.vue?vue&type=template&id=4f193eb2&
+var tablevue_type_template_id_4f193eb2_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -148327,7 +148626,7 @@ var tablevue_type_template_id_10e33a98_render = function () {
             1
           )
         : _vm._e(),
-      _vm.fixedColumns.length > 0 && !_vm.dragSort
+      _vm.fixedColumns.length > 0 && !_vm.dragEnabled
         ? _c(
             "div",
             {
@@ -148485,7 +148784,7 @@ var tablevue_type_template_id_10e33a98_render = function () {
             ]
           )
         : _vm._e(),
-      _vm.rightFixedColumns.length > 0 && !_vm.dragSort
+      _vm.rightFixedColumns.length > 0 && !_vm.dragEnabled
         ? _c(
             "div",
             {
@@ -148689,11 +148988,11 @@ var tablevue_type_template_id_10e33a98_render = function () {
     2
   )
 }
-var tablevue_type_template_id_10e33a98_staticRenderFns = []
-tablevue_type_template_id_10e33a98_render._withStripped = true
+var tablevue_type_template_id_4f193eb2_staticRenderFns = []
+tablevue_type_template_id_4f193eb2_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/table/src/table.vue?vue&type=template&id=10e33a98&
+// CONCATENATED MODULE: ./packages/table/src/table.vue?vue&type=template&id=4f193eb2&
 
 // EXTERNAL MODULE: external "eoss/lib/directives/mousewheel.js"
 var mousewheel_js_ = __webpack_require__(122);
@@ -148726,6 +149025,13 @@ var cellStarts = {
     minWidth: 48,
     realWidth: 48,
     order: ''
+  },
+  drag: {
+    width: 48,
+    minWidth: 48,
+    realWidth: 48,
+    order: '',
+    className: 'es-table__drag-column'
   }
 };
 
@@ -148890,6 +149196,51 @@ var cellForced = {
     sortable: false,
     resizable: false,
     className: 'es-table__expand-column'
+  },
+
+  drag: {
+    /**
+     * 拖拽列默认不渲染表头文案
+     * @param {Function} h - createElement函数
+     * @param {Object} options - 包含列配置的对象
+     * @returns {VNode} Vue虚拟节点
+     */
+    renderHeader: function renderHeader(h, _ref7) {
+      var column = _ref7.column;
+
+      return column.label || '';
+    },
+
+    /**
+     * 渲染拖拽手柄图标：这一列存在即代表开启行拖拽排序（见 table.vue 的
+     * dragEnabled），Sortable 的 handle 指向 es-table__drag-handle。
+     * rules 为函数时按行判定（返回假值该行不可拖），rules 显式为 false 时
+     * 整列不可拖；不可拖时不给手柄类，Sortable 自然拖不动该行
+     * @param {Function} h - createElement函数
+     * @param {Object} options - 包含行数据、列配置等的对象
+     * @returns {VNode} Vue虚拟节点
+     */
+    renderCell: function renderCell(h, _ref8) {
+      var row = _ref8.row,
+          column = _ref8.column,
+          $index = _ref8.$index,
+          store = _ref8.store;
+
+      var rules = column.rules;
+      var byRules = typeof rules === 'function' ? rules(row, { row: row, column: column, $index: $index, store: store }) !== false : rules !== false;
+      // 行数据 fixed 为 true 的行本来就不可拖（tr 上的 drag-sort-disabled
+      // 会被 Sortable 的 filter 拦掉），图标同步置灰
+      var enabled = byRules && !(row && row.fixed);
+      var classes = ['es-icon-tuozhuai'];
+      if (enabled) {
+        classes.push('es-table__drag-handle');
+      } else {
+        classes.push('is-disabled');
+      }
+      return h('i', { 'class': classes });
+    },
+    sortable: false,
+    resizable: false
   }
 };
 // CONCATENATED MODULE: ./packages/table/src/util.js
@@ -150652,7 +151003,12 @@ var doFlattenColumns = function doFlattenColumns(columns) {
      */
     updateColumns: function updateColumns() {
       var states = this.states;
-      var _columns = states._columns || [];
+      // hide 是「是否隐藏列」的列级契约（文档 thead 列配置）：隐藏列不参与
+      // 渲染与布局，在列构建入口统一剔除，首屏与运行中换 thead（setThead）
+      // 都经这一条路径生效；states._columns 仍保留全量供增删列等操作使用
+      var _columns = (states._columns || []).filter(function (column) {
+        return !column.hide;
+      });
 
       // 计算固定列和右侧固定列
       states.fixedColumns = _columns.filter(function (column) {
@@ -150668,11 +151024,17 @@ var doFlattenColumns = function doFlattenColumns(columns) {
         states.fixedColumns.unshift(_columns[0]);
       }
 
+      // 开启拖拽排序时左右固定层不渲染（见 table.vue 的 dragEnabled），fixed 不生效，
+      // 也就不做「固定列前置」重排，保持声明顺序，避免列序被静默打乱
+      var dragEnabled = _columns.some(function (column) {
+        return column.type === 'drag';
+      });
+
       // 计算非固定列并生成原始列配置
       var notFixedColumns = _columns.filter(function (column) {
         return !column.fixed;
       });
-      states.originColumns = [].concat(states.fixedColumns, notFixedColumns, states.rightFixedColumns);
+      states.originColumns = dragEnabled ? [].concat(_columns) : [].concat(states.fixedColumns, notFixedColumns, states.rightFixedColumns);
 
       // 扁平化各类列配置
       var leafColumns = doFlattenColumns(notFixedColumns);
@@ -150685,7 +151047,7 @@ var doFlattenColumns = function doFlattenColumns(columns) {
       states.rightFixedLeafColumnsLength = rightFixedLeafColumns.length;
 
       // 生成最终的列配置和复杂度标记
-      states.columns = [].concat(fixedLeafColumns, leafColumns, rightFixedLeafColumns);
+      states.columns = dragEnabled ? doFlattenColumns(_columns) : [].concat(fixedLeafColumns, leafColumns, rightFixedLeafColumns);
       states.isComplex = states.fixedColumns.length > 0 || states.rightFixedColumns.length > 0;
     },
 
@@ -151279,14 +151641,17 @@ watcher.prototype.mutations = {
         // 特殊类型列不设置默认 renderHeader，交由 setColumnRenders 应用 cellForced 的强制渲染（如 selection 复选框）
         var columnId = 'es-table_1_column_' + Math.floor(Math.random() * 10000);
         var column = null;
-        if (type === 'selection' || type === 'index' || type === 'expand') {
+        if (type === 'selection' || type === 'index' || type === 'expand' || type === 'drag') {
           column = store_extends({
             id: columnId,
             type: type,
             label: _label,
             prop: _field,
             property: _field
-          }, cellStarts[type], normalized, config);
+          }, cellStarts[type], normalized, config, {
+            // drag 列用 rules 控制行是否可拖（见 config.js）
+            rules: rules
+          });
         } else {
           column = store_extends({
             id: columnId,
@@ -151295,7 +151660,9 @@ watcher.prototype.mutations = {
             property: _field,
             formatter: formatter
           }, normalized, {
-            required: _required
+            required: _required,
+            // 保留 rules 到列对象：drag 列用它控制行是否可拖（见 config.js）
+            rules: rules
           });
         }
         var childrens = null;
@@ -151467,7 +151834,7 @@ watcher.prototype.mutations = {
           };
         } else if (children) {
           column.children = createColumns(children);
-        } else if (type === 'selection' || type === 'index' || type === 'expand') {
+        } else if (type === 'selection' || type === 'index' || type === 'expand' || type === 'drag') {
           // 特殊类型列不设置默认 renderCell，由 setColumnRenders 套用 cellForced 中的强制渲染函数
         } else {
           // 如果用户配置了render函数，则使用用户的render函数
@@ -151549,6 +151916,11 @@ watcher.prototype.mutations = {
 
     states._columns = createColumns(thead);
     this.updateColumns();
+    // 换 thead 后列对象全部新建、realWidth 为空，若不重排布局，
+    // 表头与表体 colgroup 会各自按内容回退自动表格布局，列宽错位（sizer 确认改表头后必现）
+    if (this.table && this.table.$ready) {
+      this.scheduleLayout();
+    }
   },
 
 
@@ -152977,8 +153349,8 @@ var table_body_typeof = typeof Symbol === "function" && typeof Symbol.iterator =
     },
 
 
-    // 监听拖拽排序配置变化
-    '$parent.dragSort': function $parentDragSort(val) {
+    // 监听拖拽列（type: 'drag'）的增删，有则开启拖拽排序
+    'table.dragEnabled': function tableDragEnabled(val) {
       if (val) {
         this.initSortable();
       } else {
@@ -153001,7 +153373,7 @@ var table_body_typeof = typeof Symbol === "function" && typeof Symbol.iterator =
     });
   },
   mounted: function mounted() {
-    if (this.$parent.dragSort) {
+    if (this.table.dragEnabled) {
       this.initSortable();
     }
   },
@@ -153026,7 +153398,9 @@ var table_body_typeof = typeof Symbol === "function" && typeof Symbol.iterator =
       this.$nextTick(function () {
         try {
           _this3._sortable = new external_sortablejs_default.a(_this3.$refs.dragSort, {
-            handle: _this3.$parent.dragSortClass ? '.' + _this3.$parent.dragSortClass : undefined,
+            // 手柄就是拖拽列里的图标；不可拖的行（rules 判定为假、
+            // 或行数据 fixed 为 true）不带这个类，因此拖不动
+            handle: '.es-table__drag-handle',
             animation: 150,
             onUpdate: _this3.handleUpdate,
             filter: '.drag-sort-disabled'
@@ -153076,6 +153450,9 @@ var table_body_typeof = typeof Symbol === "function" && typeof Symbol.iterator =
       } else if (this.fixed === 'right') {
         return index < this.columnsCount - this.rightFixedLeafCount;
       } else {
+        // 开启拖拽排序时左右固定层不渲染（见 table.vue 的 dragEnabled），
+        // 固定列只能靠主表显示，不能再用 is-hidden 藏起来
+        if (this.table.dragEnabled) return false;
         return index < this.leftFixedLeafCount || index >= this.columnsCount - this.rightFixedLeafCount;
       }
     },
@@ -154598,7 +154975,7 @@ var convertToRows = function convertToRows(originColumns) {
                   {
                     'class': ['cell', column.filteredValue && column.filteredValue.length > 0 ? 'highlight' : '', column.labelClassName]
                   },
-                  [_this._renderFilterIcon(h, column), _this._renderColumnLabel(h, cellIndex, column), _this._renderSortIcon(h, column), _this._renderFilterTrigger(h, column), _this._renderColumnIcon(h, column), _this._renderColumnButton(h, column)]
+                  [_this._renderfilterColumn(h, column), _this._renderColumnLabel(h, cellIndex, column), _this._renderSortIcon(h, column), _this._renderFilterTrigger(h, column), _this._renderColumnIcon(h, column), _this._renderColumnButton(h, column)]
                 )]
               );
             }), _this.hasGutter && _this._renderGutterCell(columnRows, rowIndex)]
@@ -154749,6 +155126,8 @@ var convertToRows = function convertToRows(originColumns) {
       } else if (this.fixed === 'right') {
         return start < this.columnsCount - this.rightFixedLeafCount;
       } else {
+        // 开启拖拽排序时左右固定层不渲染，固定列表头只能靠主表显示
+        if (this.table.dragEnabled) return false;
         return after < this.leftFixedLeafCount || start >= this.columnsCount - this.rightFixedLeafCount;
       }
     },
@@ -154919,7 +155298,8 @@ var convertToRows = function convertToRows(originColumns) {
      * @param {Event} event - 事件对象
      * @param {Object} column - 列配置
      */
-    handleFilterColumn: function handleFilterColumn(event, column) {
+    handlefilterColumnumn: function handlefilterColumnumn(event, column) {
+      console.log('filter-column');
       if (this.$parent) {
         this.$parent.$emit('filter-column', column, event);
       }
@@ -155054,10 +155434,10 @@ var convertToRows = function convertToRows(originColumns) {
      * @param {Object} column - 列配置
      * @returns {VNode|null} 渲染结果
      */
-    _renderFilterIcon: function _renderFilterIcon(h, column) {
+    _renderfilterColumn: function _renderfilterColumn(h, column) {
       var _this3 = this;
 
-      if (!column.filterIcon) return null;
+      if (!column.filterColumn) return null;
 
       return h(
         'span',
@@ -155065,12 +155445,12 @@ var convertToRows = function convertToRows(originColumns) {
           'class': 'filter-column',
           on: {
             'click': function click($event) {
-              return _this3.handleFilterColumn($event, column);
+              return _this3.handlefilterColumnumn($event, column);
             }
           }
         },
         [h('i', {
-          'class': [typeof column.filterIcon === 'string' ? column.filterIcon : 'es-icon-menu', 'filter-icon']
+          'class': [typeof column.filterColumn === 'string' ? column.filterColumn : 'es-icon-yingyong', 'filter-icon']
         })]
       );
     },
@@ -155877,9 +156257,11 @@ var table_footer_typeof = typeof Symbol === "function" && typeof Symbol.iterator
         }
         return before < this.columnsCount - this.rightFixedLeafCount;
       } else if (!this.fixed && column && column.fixed) {
-        // 当页脚实例不固定而列固定时隐藏单元格
-        return true;
+        // 当页脚实例不固定而列固定时隐藏单元格；
+        // 开启拖拽排序时固定层不渲染，固定列要留在主表里显示
+        return !this.table.dragEnabled;
       } else {
+        if (this.table.dragEnabled) return false;
         return index < this.leftFixedCount || index >= this.columnsCount - this.rightFixedCount;
       }
     },
@@ -156583,17 +156965,6 @@ var tableIdSeed = 1;
      * @default 'auto'
      */
     tooltipWidth: { type: String, default: 'auto' },
-    /**
-     * 是否开启拖拽排序
-     * @type {Boolean}
-     * @default false
-     */
-    dragSort: Boolean,
-    /**
-     * 拖拽排序的类名
-     * @type {String}
-     */
-    dragSortClass: String,
     /**
      * 无限滚动的回调方法
      * @type {Function}
@@ -156691,13 +157062,10 @@ var tableIdSeed = 1;
     },
     scrollStyle: function scrollStyle() {
       var _layout3 = this.layout,
-          gutterWidth = _layout3.gutterWidth,
           _layout3$headerHeight = _layout3.headerHeight,
           headerHeight = _layout3$headerHeight === undefined ? 0 : _layout3$headerHeight,
           _layout3$footerHeight = _layout3.footerHeight,
-          footerHeight = _layout3$footerHeight === undefined ? 0 : _layout3$footerHeight,
-          scrollX = _layout3.scrollX,
-          scrollY = _layout3.scrollY;
+          footerHeight = _layout3$footerHeight === undefined ? 0 : _layout3$footerHeight;
 
       var height = 0;
       var maxHeight = 0;
@@ -156706,11 +157074,14 @@ var tableIdSeed = 1;
       } else if (this.maxHeight) {
         maxHeight = parseHeight(this.maxHeight) - footerHeight - (this.showHeader ? headerHeight : 0);
       }
+      // 美化滚动条时原生条已由 CSS 隐藏（见 table.scss），不占位也就无需
+      // 按条宽加宽/加高容器；此前的 calc(100% + gutterWidth) 在浏览器缩放时
+      // 和实际条宽对不上，容器右、下两侧会露出一条灰边
       return {
-        width: gutterWidth && scrollY ? 'calc(100% + ' + gutterWidth + 'px)' : '100%',
-        height: height && gutterWidth ? height + (scrollX ? gutterWidth : 0) + 'px' : '100%',
+        width: '100%',
+        height: height ? height + 'px' : '100%',
         maxHeight: maxHeight ? maxHeight + 'px' : '',
-        'overflow-x': height && gutterWidth ? '' : 'hidden'
+        'overflow-x': height ? '' : 'hidden'
       };
     },
     fixedBodyHeight: function fixedBodyHeight() {
@@ -156768,6 +157139,28 @@ var tableIdSeed = 1;
     rightFixedColumns: 'rightFixedColumns'
   }), {
 
+    /**
+     * 是否开启行拖拽排序：有 type 为 drag 的列即开启，
+     * 该列自己渲染拖拽手柄图标（见 config.js 的 cellForced.drag）
+     * @returns {Boolean}
+     */
+    dragEnabled: function dragEnabled() {
+      return this.columns.some(function (column) {
+        return column.type === 'drag';
+      });
+    },
+
+
+    /**
+     * 是否同时配了拖拽排序和固定列：两者互斥（开启拖拽后固定层不渲染），
+     * 用于给一次显式告警，避免 fixed 静默失效
+     * @returns {Boolean}
+     */
+    dragFixedConflict: function dragFixedConflict() {
+      return this.dragEnabled && (this.fixedColumns.length > 0 || this.rightFixedColumns.length > 0);
+    },
+
+
     // 优化类名绑定，提高模板可读性
     getTableClasses: function getTableClasses() {
       var _ref;
@@ -156795,6 +157188,18 @@ var tableIdSeed = 1;
   }),
 
   watch: {
+    dragFixedConflict: {
+      immediate: true,
+      handler: function handler(val) {
+        // 固定列靠另一张浮层表渲染，Sortable 只挪主表的行，两者没法共存；
+        // 冲突时告警一次，避免消费方配了 fixed 却发现不生效又查不到原因
+        if (val && "production" !== 'production' && !this._dragFixedWarned) {
+          this._dragFixedWarned = true;
+          console.warn('[Warn][Table]存在 type 为 drag 的列时开启行拖拽排序，左右固定列不会渲染，fixed 不生效');
+        }
+      }
+    },
+
     // 优化高度变化监听，使用防抖减少频繁更新
     height: {
       immediate: true,
@@ -157707,8 +158112,8 @@ var tableIdSeed = 1;
 
 var src_table_component = Object(componentNormalizer["a" /* default */])(
   packages_table_src_tablevue_type_script_lang_js_,
-  tablevue_type_template_id_10e33a98_render,
-  tablevue_type_template_id_10e33a98_staticRenderFns,
+  tablevue_type_template_id_4f193eb2_render,
+  tablevue_type_template_id_4f193eb2_staticRenderFns,
   false,
   null,
   null,
@@ -157747,7 +158152,19 @@ var columnIdSeed = 1;
       type: String,
       default: 'default'
     },
-    filterIcon: [String, Boolean],
+    /**
+     * 列的规则；type 为 drag 时用它判定行是否可拖：
+     * 函数按行判定（返回 false 该行不可拖），false 表示整列不可拖。
+     * 必须显式写 default: undefined：类型里带 Boolean 时，Vue 会把未传的
+     * 值铸成 false，那就等于默认把整列拖拽关掉了
+     * @type {Function|Boolean|Array|Object}
+     */
+    rules: {
+      type: [Function, Boolean, Array, Object],
+      default: undefined
+    },
+    // Boolean 必须在 String 前：裸写 filterColumn 时 Vue 才会把空串铸成 true（同 sortable 的约定）
+    filterColumn: [Boolean, String],
     label: String,
     labelKey: String,
     valueKey: String,
@@ -158154,11 +158571,13 @@ var columnIdSeed = 1;
       filterPlacement: '',
       isColumnGroup: false,
       filterOpened: false,
-      filterIcon: this.filterIcon,
+      filterColumn: this.filterColumn,
       // 排序相关属性
       sortable: sortable,
       // 索引列
-      index: this.index
+      index: this.index,
+      // drag 列用它控制行是否可拖（见 config.js 的 cellForced.drag）
+      rules: this.rules
     });
 
     // 收集不同类型的属性
@@ -163292,8 +163711,8 @@ transfer.install = function (Vue) {
 };
 
 /* harmony default export */ var packages_transfer = (transfer);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/tree/src/tree.vue?vue&type=template&id=5e49a128&
-var treevue_type_template_id_5e49a128_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/tree/src/tree.vue?vue&type=template&id=79d373f6&
+var treevue_type_template_id_79d373f6_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -163476,11 +163895,11 @@ var treevue_type_template_id_5e49a128_render = function () {
     ]
   )
 }
-var treevue_type_template_id_5e49a128_staticRenderFns = []
-treevue_type_template_id_5e49a128_render._withStripped = true
+var treevue_type_template_id_79d373f6_staticRenderFns = []
+treevue_type_template_id_79d373f6_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/tree/src/tree.vue?vue&type=template&id=5e49a128&
+// CONCATENATED MODULE: ./packages/tree/src/tree.vue?vue&type=template&id=79d373f6&
 
 // CONCATENATED MODULE: ./packages/tree/src/model/util.js
 var NODE_KEY = '$treeNodeId';
@@ -165528,8 +165947,7 @@ var treevue_type_script_lang_js_extends = Object.assign || function (target) { f
     },
     styles: function styles() {
       return {
-        height: this.height,
-        '--scrollbar-width': this.scrollbarWidth + 'px'
+        height: this.height
       };
     },
     showSearch: function showSearch() {
@@ -165632,10 +166050,6 @@ var treevue_type_script_lang_js_extends = Object.assign || function (target) { f
        * 当前选中节点的键值
        */
       currentKey: '',
-      /**
-       * 滚动条宽度
-       */
-      scrollbarWidth: 0,
       /**
        * 搜索配置
        */
@@ -165732,8 +166146,6 @@ var treevue_type_script_lang_js_extends = Object.assign || function (target) { f
     var _this5 = this;
 
     !this.lazy && this.getData();
-    // 计算并存储滚动条宽度，避免重复计算
-    this.scrollbarWidth = Object(scrollbar_js_["getScrollbarWidth"])();
     this.isTree = true;
 
     this.store = new tree_store({
@@ -166441,8 +166853,8 @@ var treevue_type_script_lang_js_extends = Object.assign || function (target) { f
 
 var src_tree_component = Object(componentNormalizer["a" /* default */])(
   packages_tree_src_treevue_type_script_lang_js_,
-  treevue_type_template_id_5e49a128_render,
-  treevue_type_template_id_5e49a128_staticRenderFns,
+  treevue_type_template_id_79d373f6_render,
+  treevue_type_template_id_79d373f6_staticRenderFns,
   false,
   null,
   null,
@@ -167582,8 +167994,8 @@ srcvue_type_template_id_0f120158_render._withStripped = true
 // EXTERNAL MODULE: external "lodash"
 var external_lodash_ = __webpack_require__(135);
 
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/upload/src/upload-list.vue?vue&type=template&id=667db7eb&
-var upload_listvue_type_template_id_667db7eb_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/upload/src/upload-list.vue?vue&type=template&id=30007bc1&
+var upload_listvue_type_template_id_30007bc1_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -167632,6 +168044,7 @@ var upload_listvue_type_template_id_667db7eb_render = function () {
           "div",
           {
             ref: "container",
+            staticClass: "es-upload-lists__scroll",
             style: _vm.barStyles,
             on: { scroll: _vm.handleScroll, wheel: _vm.handleWheel },
           },
@@ -167851,11 +168264,11 @@ var upload_listvue_type_template_id_667db7eb_render = function () {
     ),
   ])
 }
-var upload_listvue_type_template_id_667db7eb_staticRenderFns = []
-upload_listvue_type_template_id_667db7eb_render._withStripped = true
+var upload_listvue_type_template_id_30007bc1_staticRenderFns = []
+upload_listvue_type_template_id_30007bc1_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/upload/src/upload-list.vue?vue&type=template&id=667db7eb&
+// CONCATENATED MODULE: ./packages/upload/src/upload-list.vue?vue&type=template&id=30007bc1&
 
 // EXTERNAL MODULE: external "eoss/lib/progress"
 var progress_ = __webpack_require__(81);
@@ -168252,6 +168665,7 @@ var list_extends = Object.assign || function (target) { for (var i = 1; i < argu
 //
 //
 //
+//
 
 
 
@@ -168314,12 +168728,12 @@ var list_extends = Object.assign || function (target) { for (var i = 1; i < argu
     }
   },
   computed: {
+    // 列表容器自身滚动，原生条由 CSS 隐藏（见 upload.scss 的
+    // .es-upload-lists__scroll），不占位也就无需按条宽加宽容器把它推出去——
+    // 那样在浏览器缩放时量到的 15px 和实际渲染宽度对不上，右侧会露出一条灰边
     barStyles: function barStyles() {
-      // 优化：使用预计算的滚动条宽度，避免重复计算
       if (this.height && this.height !== 'auto') {
-        var barWidth = this.scrollbarWidth;
         return {
-          width: 'calc(100% + ' + barWidth + 'px)',
           height: '100%',
           'overflow-y': 'scroll'
         };
@@ -168342,7 +168756,6 @@ var list_extends = Object.assign || function (target) { for (var i = 1; i < argu
   },
   data: function data() {
     return {
-      scrollbarWidth: 0,
       moveTo: 0,
       barSize: 0
     };
@@ -168355,7 +168768,6 @@ var list_extends = Object.assign || function (target) { for (var i = 1; i < argu
     });
   },
   mounted: function mounted() {
-    this.scrollbarWidth = Object(scrollbar_js_["getScrollbarWidth"])();
     if (this.dragSort && !this.disabled) {
       this.sortable = new external_sortablejs_default.a(this.$refs.listContainer.$el, {
         animation: 150,
@@ -168427,8 +168839,8 @@ var list_extends = Object.assign || function (target) { for (var i = 1; i < argu
 
 var upload_list_component = Object(componentNormalizer["a" /* default */])(
   src_upload_listvue_type_script_lang_js_,
-  upload_listvue_type_template_id_667db7eb_render,
-  upload_listvue_type_template_id_667db7eb_staticRenderFns,
+  upload_listvue_type_template_id_30007bc1_render,
+  upload_listvue_type_template_id_30007bc1_staticRenderFns,
   false,
   null,
   null,
@@ -175637,7 +176049,7 @@ if (typeof window !== 'undefined' && window.Vue) {
 }
 
 /* harmony default export */ var src_0 = __webpack_exports__["default"] = ({
-  version: '0.1.0-alpha.47',
+  version: '0.1.0-alpha.49',
   install: src_install,
   CollapseTransition: collapse_transition_js_default.a,
   Loading: packages_loading,