custom-vxe-table 2.0.13-beta → 2.0.15-beta

package/lib/index.common.js

@@ -24246,17 +24246,6 @@ var getBuiltIn = __webpack_require__("d066");
 module.exports = getBuiltIn('navigator', 'userAgent') || '';
 
 
-/***/ }),
-
-/***/ "347e":
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony import */ var _node_modules_mini_css_extract_plugin_dist_loader_js_ref_10_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_10_oneOf_1_1_node_modules_vue_cli_service_node_modules_vue_loader_v16_dist_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_10_oneOf_1_2_node_modules_less_loader_dist_cjs_js_ref_10_oneOf_1_3_node_modules_cache_loader_dist_cjs_js_ref_0_0_node_modules_vue_cli_service_node_modules_vue_loader_v16_dist_index_js_ref_0_1_CustomTable_vue_vue_type_style_index_0_id_b715f47c_lang_less__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("75b8");
-/* harmony import */ var _node_modules_mini_css_extract_plugin_dist_loader_js_ref_10_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_10_oneOf_1_1_node_modules_vue_cli_service_node_modules_vue_loader_v16_dist_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_10_oneOf_1_2_node_modules_less_loader_dist_cjs_js_ref_10_oneOf_1_3_node_modules_cache_loader_dist_cjs_js_ref_0_0_node_modules_vue_cli_service_node_modules_vue_loader_v16_dist_index_js_ref_0_1_CustomTable_vue_vue_type_style_index_0_id_b715f47c_lang_less__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_node_modules_mini_css_extract_plugin_dist_loader_js_ref_10_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_10_oneOf_1_1_node_modules_vue_cli_service_node_modules_vue_loader_v16_dist_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_10_oneOf_1_2_node_modules_less_loader_dist_cjs_js_ref_10_oneOf_1_3_node_modules_cache_loader_dist_cjs_js_ref_0_0_node_modules_vue_cli_service_node_modules_vue_loader_v16_dist_index_js_ref_0_1_CustomTable_vue_vue_type_style_index_0_id_b715f47c_lang_less__WEBPACK_IMPORTED_MODULE_0__);
-/* unused harmony reexport * */
-
-
 /***/ }),
 
 /***/ "349b":
@@ -34960,13 +34949,6 @@ var searchTree = helperCreateTreeFunc(function (parent, obj, iterate, context, p
 module.exports = searchTree
 
 
-/***/ }),
-
-/***/ "75b8":
-/***/ (function(module, exports, __webpack_require__) {
-
-// extracted by mini-css-extract-plugin
-
 /***/ }),
 
 /***/ "778e":
@@ -36975,6 +36957,17 @@ module.exports = staticEscapeMap
 
 module.exports = require("vue");
 
+/***/ }),
+
+/***/ "8c12":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony import */ var _node_modules_mini_css_extract_plugin_dist_loader_js_ref_10_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_10_oneOf_1_1_node_modules_vue_cli_service_node_modules_vue_loader_v16_dist_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_10_oneOf_1_2_node_modules_less_loader_dist_cjs_js_ref_10_oneOf_1_3_node_modules_cache_loader_dist_cjs_js_ref_0_0_node_modules_vue_cli_service_node_modules_vue_loader_v16_dist_index_js_ref_0_1_CustomTable_vue_vue_type_style_index_0_id_3a203e33_lang_less__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("e8a8");
+/* harmony import */ var _node_modules_mini_css_extract_plugin_dist_loader_js_ref_10_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_10_oneOf_1_1_node_modules_vue_cli_service_node_modules_vue_loader_v16_dist_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_10_oneOf_1_2_node_modules_less_loader_dist_cjs_js_ref_10_oneOf_1_3_node_modules_cache_loader_dist_cjs_js_ref_0_0_node_modules_vue_cli_service_node_modules_vue_loader_v16_dist_index_js_ref_0_1_CustomTable_vue_vue_type_style_index_0_id_3a203e33_lang_less__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_node_modules_mini_css_extract_plugin_dist_loader_js_ref_10_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_10_oneOf_1_1_node_modules_vue_cli_service_node_modules_vue_loader_v16_dist_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_10_oneOf_1_2_node_modules_less_loader_dist_cjs_js_ref_10_oneOf_1_3_node_modules_cache_loader_dist_cjs_js_ref_0_0_node_modules_vue_cli_service_node_modules_vue_loader_v16_dist_index_js_ref_0_1_CustomTable_vue_vue_type_style_index_0_id_3a203e33_lang_less__WEBPACK_IMPORTED_MODULE_0__);
+/* unused harmony reexport * */
+
+
 /***/ }),
 
 /***/ "8d47":
@@ -55120,6 +55113,13 @@ module.exports = function (target, source) {
 };
 
 
+/***/ }),
+
+/***/ "e8a8":
+/***/ (function(module, exports, __webpack_require__) {
+
+// extracted by mini-css-extract-plugin
+
 /***/ }),
 
 /***/ "e8b5":
@@ -58485,7 +58485,7 @@ var es_string_fixed = __webpack_require__("c7cd");
 // EXTERNAL MODULE: external {"commonjs":"vue","commonjs2":"vue","root":"Vue"}
 var external_commonjs_vue_commonjs2_vue_root_Vue_ = __webpack_require__("8bbf");
 
-// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js??ref--14-0!./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib!./node_modules/ts-loader??ref--14-3!./node_modules/@vue/cli-service/node_modules/vue-loader-v16/dist/templateLoader.js??ref--7!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/@vue/cli-service/node_modules/vue-loader-v16/dist??ref--0-1!./packages/CustomTable/src/CustomTable.vue?vue&type=template&id=b715f47c&ts=true
+// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js??ref--14-0!./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib!./node_modules/ts-loader??ref--14-3!./node_modules/@vue/cli-service/node_modules/vue-loader-v16/dist/templateLoader.js??ref--7!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/@vue/cli-service/node_modules/vue-loader-v16/dist??ref--0-1!./packages/CustomTable/src/CustomTable.vue?vue&type=template&id=3a203e33&ts=true
 
 
 
@@ -58513,7 +58513,7 @@ var _hoisted_5 = {
   href: "#"
 };
 var _hoisted_6 = ["onClick"];
-function CustomTablevue_type_template_id_b715f47c_ts_true_render(_ctx, _cache, $props, $setup, $data, $options) {
+function CustomTablevue_type_template_id_3a203e33_ts_true_render(_ctx, _cache, $props, $setup, $data, $options) {
   var _component_custom_buttons = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["resolveComponent"])("custom-buttons");
 
   var _component_vxe_input = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["resolveComponent"])("vxe-input");
@@ -58924,7 +58924,7 @@ function CustomTablevue_type_template_id_b715f47c_ts_true_render(_ctx, _cache, $
     "page-sizes": [10, 20, 100, 200, 500, 1000]
   }, null, 8, ["current-page", "page-size", "total", "onPageChange"])) : Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createCommentVNode"])("", true)]);
 }
-// CONCATENATED MODULE: ./packages/CustomTable/src/CustomTable.vue?vue&type=template&id=b715f47c&ts=true
+// CONCATENATED MODULE: ./packages/CustomTable/src/CustomTable.vue?vue&type=template&id=3a203e33&ts=true
 
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.object.assign.js
 var es_object_assign = __webpack_require__("cca6");
@@ -96016,6 +96016,37 @@ Sortable.mount(Remove, Revert);
       }
     };
 
+    var getVisibleColumn = function getVisibleColumn() {
+      var $grid = xTable1.value;
+
+      var _$grid$getTableColumn = $grid.getTableColumn(),
+          tableColumn = _$grid$getTableColumn.tableColumn,
+          collectColumn = _$grid$getTableColumn.collectColumn; // 处理分组的情况
+
+
+      var result = [];
+      tableColumn.forEach(function (item) {
+        if (item.level == 1) {
+          // 1级直接插入
+          result.push(item);
+        } else {
+          // 2级寻找父级再插入
+          var tmp = result.find(function (c) {
+            return c.id == item.parentId;
+          });
+
+          if (!tmp) {
+            var dt = collectColumn.find(function (c) {
+              return c.id == item.parentId;
+            });
+            result.push(dt);
+          }
+        }
+      }); // console.log("##############getVisibleColumn", result)
+
+      return result;
+    };
+
     var sortable;
 
     var columnDrop = function columnDrop() {
@@ -96027,9 +96058,10 @@ Sortable.mount(Remove, Revert);
           var newIndex = sortableEvent.newIndex;
           var oldIndex = sortableEvent.oldIndex;
 
-          var _$grid$getTableColumn = $grid.getTableColumn(),
-              collectColumn = _$grid$getTableColumn.collectColumn;
+          var _$grid$getTableColumn2 = $grid.getTableColumn(),
+              collectColumn = _$grid$getTableColumn2.collectColumn;
 
+          var visibleColumn = getVisibleColumn();
           var wrapperElem = targetThElem.parentNode;
           var newColumn = collectColumn[newIndex];
 
@@ -96050,17 +96082,17 @@ Sortable.mount(Remove, Revert);
           } else {
             // 转换真实索引
             var oldColumnIndex = collectColumn.findIndex(function (item) {
-              return item.field == collectColumn[oldIndex].field;
+              return item.field == visibleColumn[oldIndex].field;
             });
             var newColumnIndex = collectColumn.findIndex(function (item) {
-              return item.field == collectColumn[newIndex].field;
+              return item.field == visibleColumn[newIndex].field;
             }); // console.log(
             //   "######collectColumn###",
             //   collectColumn,
             //   $grid.getTableColumn()
             // );
 
-            var fieldId = collectColumn[oldIndex].field; // 移动到目标列
+            var fieldId = collectColumn[oldColumnIndex].field; // 移动到目标列
 
             var currRow = collectColumn.splice(oldColumnIndex, 1)[0];
             collectColumn.splice(newColumnIndex, 0, currRow); // console.log(
@@ -96191,7 +96223,7 @@ Sortable.mount(Remove, Revert);
       } else {
         // 2. 远程加载
         // 获取工具栏信息
-        if (props.api.getTableBtn) {
+        if (props.api && props.api.getTableBtn) {
           getTableBtn(props.api.getTableBtn, props.menuid).then(function (data) {
             if (data) {
               state.buttonList = data.buttons;
@@ -96284,8 +96316,8 @@ Sortable.mount(Remove, Revert);
 }));
 // CONCATENATED MODULE: ./packages/CustomTable/src/CustomTable.vue?vue&type=script&lang=ts
  
-// EXTERNAL MODULE: ./packages/CustomTable/src/CustomTable.vue?vue&type=style&index=0&id=b715f47c&lang=less
-var CustomTablevue_type_style_index_0_id_b715f47c_lang_less = __webpack_require__("347e");
+// EXTERNAL MODULE: ./packages/CustomTable/src/CustomTable.vue?vue&type=style&index=0&id=3a203e33&lang=less
+var CustomTablevue_type_style_index_0_id_3a203e33_lang_less = __webpack_require__("8c12");
 
 // CONCATENATED MODULE: ./packages/CustomTable/src/CustomTable.vue
 
@@ -96295,7 +96327,7 @@ var CustomTablevue_type_style_index_0_id_b715f47c_lang_less = __webpack_require_
 
 
 
-const CustomTable_exports_ = /*#__PURE__*/exportHelper_default()(CustomTablevue_type_script_lang_ts, [['render',CustomTablevue_type_template_id_b715f47c_ts_true_render]])
+const CustomTable_exports_ = /*#__PURE__*/exportHelper_default()(CustomTablevue_type_script_lang_ts, [['render',CustomTablevue_type_template_id_3a203e33_ts_true_render]])
 
 /* harmony default export */ var CustomTable = (CustomTable_exports_);
 // CONCATENATED MODULE: ./packages/CustomTable/index.ts

package/lib/index.umd.js

@@ -24255,17 +24255,6 @@ var getBuiltIn = __webpack_require__("d066");
 module.exports = getBuiltIn('navigator', 'userAgent') || '';
 
 
-/***/ }),
-
-/***/ "347e":
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony import */ var _node_modules_mini_css_extract_plugin_dist_loader_js_ref_10_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_10_oneOf_1_1_node_modules_vue_cli_service_node_modules_vue_loader_v16_dist_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_10_oneOf_1_2_node_modules_less_loader_dist_cjs_js_ref_10_oneOf_1_3_node_modules_cache_loader_dist_cjs_js_ref_0_0_node_modules_vue_cli_service_node_modules_vue_loader_v16_dist_index_js_ref_0_1_CustomTable_vue_vue_type_style_index_0_id_b715f47c_lang_less__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("75b8");
-/* harmony import */ var _node_modules_mini_css_extract_plugin_dist_loader_js_ref_10_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_10_oneOf_1_1_node_modules_vue_cli_service_node_modules_vue_loader_v16_dist_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_10_oneOf_1_2_node_modules_less_loader_dist_cjs_js_ref_10_oneOf_1_3_node_modules_cache_loader_dist_cjs_js_ref_0_0_node_modules_vue_cli_service_node_modules_vue_loader_v16_dist_index_js_ref_0_1_CustomTable_vue_vue_type_style_index_0_id_b715f47c_lang_less__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_node_modules_mini_css_extract_plugin_dist_loader_js_ref_10_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_10_oneOf_1_1_node_modules_vue_cli_service_node_modules_vue_loader_v16_dist_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_10_oneOf_1_2_node_modules_less_loader_dist_cjs_js_ref_10_oneOf_1_3_node_modules_cache_loader_dist_cjs_js_ref_0_0_node_modules_vue_cli_service_node_modules_vue_loader_v16_dist_index_js_ref_0_1_CustomTable_vue_vue_type_style_index_0_id_b715f47c_lang_less__WEBPACK_IMPORTED_MODULE_0__);
-/* unused harmony reexport * */
-
-
 /***/ }),
 
 /***/ "349b":
@@ -34969,13 +34958,6 @@ var searchTree = helperCreateTreeFunc(function (parent, obj, iterate, context, p
 module.exports = searchTree
 
 
-/***/ }),
-
-/***/ "75b8":
-/***/ (function(module, exports, __webpack_require__) {
-
-// extracted by mini-css-extract-plugin
-
 /***/ }),
 
 /***/ "778e":
@@ -36984,6 +36966,17 @@ module.exports = staticEscapeMap
 
 module.exports = __WEBPACK_EXTERNAL_MODULE__8bbf__;
 
+/***/ }),
+
+/***/ "8c12":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony import */ var _node_modules_mini_css_extract_plugin_dist_loader_js_ref_10_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_10_oneOf_1_1_node_modules_vue_cli_service_node_modules_vue_loader_v16_dist_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_10_oneOf_1_2_node_modules_less_loader_dist_cjs_js_ref_10_oneOf_1_3_node_modules_cache_loader_dist_cjs_js_ref_0_0_node_modules_vue_cli_service_node_modules_vue_loader_v16_dist_index_js_ref_0_1_CustomTable_vue_vue_type_style_index_0_id_3a203e33_lang_less__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("e8a8");
+/* harmony import */ var _node_modules_mini_css_extract_plugin_dist_loader_js_ref_10_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_10_oneOf_1_1_node_modules_vue_cli_service_node_modules_vue_loader_v16_dist_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_10_oneOf_1_2_node_modules_less_loader_dist_cjs_js_ref_10_oneOf_1_3_node_modules_cache_loader_dist_cjs_js_ref_0_0_node_modules_vue_cli_service_node_modules_vue_loader_v16_dist_index_js_ref_0_1_CustomTable_vue_vue_type_style_index_0_id_3a203e33_lang_less__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_node_modules_mini_css_extract_plugin_dist_loader_js_ref_10_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_10_oneOf_1_1_node_modules_vue_cli_service_node_modules_vue_loader_v16_dist_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_10_oneOf_1_2_node_modules_less_loader_dist_cjs_js_ref_10_oneOf_1_3_node_modules_cache_loader_dist_cjs_js_ref_0_0_node_modules_vue_cli_service_node_modules_vue_loader_v16_dist_index_js_ref_0_1_CustomTable_vue_vue_type_style_index_0_id_3a203e33_lang_less__WEBPACK_IMPORTED_MODULE_0__);
+/* unused harmony reexport * */
+
+
 /***/ }),
 
 /***/ "8d47":
@@ -55129,6 +55122,13 @@ module.exports = function (target, source) {
 };
 
 
+/***/ }),
+
+/***/ "e8a8":
+/***/ (function(module, exports, __webpack_require__) {
+
+// extracted by mini-css-extract-plugin
+
 /***/ }),
 
 /***/ "e8b5":
@@ -58494,7 +58494,7 @@ var es_string_fixed = __webpack_require__("c7cd");
 // EXTERNAL MODULE: external {"commonjs":"vue","commonjs2":"vue","root":"Vue"}
 var external_commonjs_vue_commonjs2_vue_root_Vue_ = __webpack_require__("8bbf");
 
-// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js??ref--14-0!./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib!./node_modules/ts-loader??ref--14-3!./node_modules/@vue/cli-service/node_modules/vue-loader-v16/dist/templateLoader.js??ref--7!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/@vue/cli-service/node_modules/vue-loader-v16/dist??ref--0-1!./packages/CustomTable/src/CustomTable.vue?vue&type=template&id=b715f47c&ts=true
+// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js??ref--14-0!./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib!./node_modules/ts-loader??ref--14-3!./node_modules/@vue/cli-service/node_modules/vue-loader-v16/dist/templateLoader.js??ref--7!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/@vue/cli-service/node_modules/vue-loader-v16/dist??ref--0-1!./packages/CustomTable/src/CustomTable.vue?vue&type=template&id=3a203e33&ts=true
 
 
 
@@ -58522,7 +58522,7 @@ var _hoisted_5 = {
   href: "#"
 };
 var _hoisted_6 = ["onClick"];
-function CustomTablevue_type_template_id_b715f47c_ts_true_render(_ctx, _cache, $props, $setup, $data, $options) {
+function CustomTablevue_type_template_id_3a203e33_ts_true_render(_ctx, _cache, $props, $setup, $data, $options) {
   var _component_custom_buttons = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["resolveComponent"])("custom-buttons");
 
   var _component_vxe_input = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["resolveComponent"])("vxe-input");
@@ -58933,7 +58933,7 @@ function CustomTablevue_type_template_id_b715f47c_ts_true_render(_ctx, _cache, $
     "page-sizes": [10, 20, 100, 200, 500, 1000]
   }, null, 8, ["current-page", "page-size", "total", "onPageChange"])) : Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createCommentVNode"])("", true)]);
 }
-// CONCATENATED MODULE: ./packages/CustomTable/src/CustomTable.vue?vue&type=template&id=b715f47c&ts=true
+// CONCATENATED MODULE: ./packages/CustomTable/src/CustomTable.vue?vue&type=template&id=3a203e33&ts=true
 
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.object.assign.js
 var es_object_assign = __webpack_require__("cca6");
@@ -96025,6 +96025,37 @@ Sortable.mount(Remove, Revert);
       }
     };
 
+    var getVisibleColumn = function getVisibleColumn() {
+      var $grid = xTable1.value;
+
+      var _$grid$getTableColumn = $grid.getTableColumn(),
+          tableColumn = _$grid$getTableColumn.tableColumn,
+          collectColumn = _$grid$getTableColumn.collectColumn; // 处理分组的情况
+
+
+      var result = [];
+      tableColumn.forEach(function (item) {
+        if (item.level == 1) {
+          // 1级直接插入
+          result.push(item);
+        } else {
+          // 2级寻找父级再插入
+          var tmp = result.find(function (c) {
+            return c.id == item.parentId;
+          });
+
+          if (!tmp) {
+            var dt = collectColumn.find(function (c) {
+              return c.id == item.parentId;
+            });
+            result.push(dt);
+          }
+        }
+      }); // console.log("##############getVisibleColumn", result)
+
+      return result;
+    };
+
     var sortable;
 
     var columnDrop = function columnDrop() {
@@ -96036,9 +96067,10 @@ Sortable.mount(Remove, Revert);
           var newIndex = sortableEvent.newIndex;
           var oldIndex = sortableEvent.oldIndex;
 
-          var _$grid$getTableColumn = $grid.getTableColumn(),
-              collectColumn = _$grid$getTableColumn.collectColumn;
+          var _$grid$getTableColumn2 = $grid.getTableColumn(),
+              collectColumn = _$grid$getTableColumn2.collectColumn;
 
+          var visibleColumn = getVisibleColumn();
           var wrapperElem = targetThElem.parentNode;
           var newColumn = collectColumn[newIndex];
 
@@ -96059,17 +96091,17 @@ Sortable.mount(Remove, Revert);
           } else {
             // 转换真实索引
             var oldColumnIndex = collectColumn.findIndex(function (item) {
-              return item.field == collectColumn[oldIndex].field;
+              return item.field == visibleColumn[oldIndex].field;
             });
             var newColumnIndex = collectColumn.findIndex(function (item) {
-              return item.field == collectColumn[newIndex].field;
+              return item.field == visibleColumn[newIndex].field;
             }); // console.log(
             //   "######collectColumn###",
             //   collectColumn,
             //   $grid.getTableColumn()
             // );
 
-            var fieldId = collectColumn[oldIndex].field; // 移动到目标列
+            var fieldId = collectColumn[oldColumnIndex].field; // 移动到目标列
 
             var currRow = collectColumn.splice(oldColumnIndex, 1)[0];
             collectColumn.splice(newColumnIndex, 0, currRow); // console.log(
@@ -96200,7 +96232,7 @@ Sortable.mount(Remove, Revert);
       } else {
         // 2. 远程加载
         // 获取工具栏信息
-        if (props.api.getTableBtn) {
+        if (props.api && props.api.getTableBtn) {
           getTableBtn(props.api.getTableBtn, props.menuid).then(function (data) {
             if (data) {
               state.buttonList = data.buttons;
@@ -96293,8 +96325,8 @@ Sortable.mount(Remove, Revert);
 }));
 // CONCATENATED MODULE: ./packages/CustomTable/src/CustomTable.vue?vue&type=script&lang=ts
  
-// EXTERNAL MODULE: ./packages/CustomTable/src/CustomTable.vue?vue&type=style&index=0&id=b715f47c&lang=less
-var CustomTablevue_type_style_index_0_id_b715f47c_lang_less = __webpack_require__("347e");
+// EXTERNAL MODULE: ./packages/CustomTable/src/CustomTable.vue?vue&type=style&index=0&id=3a203e33&lang=less
+var CustomTablevue_type_style_index_0_id_3a203e33_lang_less = __webpack_require__("8c12");
 
 // CONCATENATED MODULE: ./packages/CustomTable/src/CustomTable.vue
 
@@ -96304,7 +96336,7 @@ var CustomTablevue_type_style_index_0_id_b715f47c_lang_less = __webpack_require_
 
 
 
-const CustomTable_exports_ = /*#__PURE__*/exportHelper_default()(CustomTablevue_type_script_lang_ts, [['render',CustomTablevue_type_template_id_b715f47c_ts_true_render]])
+const CustomTable_exports_ = /*#__PURE__*/exportHelper_default()(CustomTablevue_type_script_lang_ts, [['render',CustomTablevue_type_template_id_3a203e33_ts_true_render]])
 
 /* harmony default export */ var CustomTable = (CustomTable_exports_);
 // CONCATENATED MODULE: ./packages/CustomTable/index.ts