@pisell/materials 1.0.222 → 1.0.224

package/es/components/table/Table/fields/search/Edit/index.js

@@ -17,6 +17,7 @@ var Edit = function Edit(props, ref) {
     trigger = _props$trigger === void 0 ? ["onPressEnter"] : _props$trigger,
     others = _objectWithoutProperties(props, _excluded);
   return /*#__PURE__*/React.createElement(Input, _extends({}, others, {
+    style: style,
     prefix: /*#__PURE__*/React.createElement(SearchOutlined, null),
     onChange: function onChange(e) {
       if (trigger !== null && trigger !== void 0 && trigger.includes("onChange")) {

package/es/components/table/hooks/useTransColumns.js

@@ -76,13 +76,14 @@ var useTransColumns = function useTransColumns(params) {
     }, /*#__PURE__*/React.createElement("span", null, dom), /*#__PURE__*/React.createElement("span", null, children.length, " ", getText("table-column-group-records")));
   }, [groupField, columns]);
   var _columns = useMemo(function () {
+    var _newColumns$;
     // 过滤掉不显示的列
     var newColumns = columns.filter(function (item) {
       return !(isBoolean(item.isShow) && !item.isShow);
     });
 
     // 分组后不展示拖拽排序
-    if (dragSort && !groupField) {
+    if (dragSort && !groupField && (newColumns === null || newColumns === void 0 ? void 0 : (_newColumns$ = newColumns[0]) === null || _newColumns$ === void 0 ? void 0 : _newColumns$.key) !== "__sort") {
       newColumns.unshift({
         key: "__sort",
         width: 60,

package/lib/components/table/Table/fields/search/Edit/index.js

@@ -51,6 +51,7 @@ var Edit = (props, ref) => {
     import_input.default,
     {
       ...others,
+      style,
       prefix: /* @__PURE__ */ import_react.default.createElement(import_icons.SearchOutlined, null),
       onChange: (e) => {
         if (trigger == null ? void 0 : trigger.includes("onChange")) {

package/lib/components/table/hooks/useTransColumns.js

@@ -108,10 +108,11 @@ var useTransColumns = (params) => {
     [groupField, columns]
   );
   const _columns = (0, import_react.useMemo)(() => {
+    var _a2;
     let newColumns = columns.filter(
       (item) => !((0, import_utils.isBoolean)(item.isShow) && !item.isShow)
     );
-    if (dragSort && !groupField) {
+    if (dragSort && !groupField && ((_a2 = newColumns == null ? void 0 : newColumns[0]) == null ? void 0 : _a2.key) !== "__sort") {
       newColumns.unshift({
         key: "__sort",
         width: 60,
@@ -119,7 +120,7 @@ var useTransColumns = (params) => {
       });
     }
     return newColumns.map((col, index) => {
-      var _a2;
+      var _a3;
       let position = "";
       if (index === 0) {
         position = "start";
@@ -132,11 +133,11 @@ var useTransColumns = (params) => {
           fixed: "left",
           width: 350,
           render: (text, record) => {
-            var _a3;
+            var _a4;
             if (record.__is_group && groupFieldRender) {
               return groupFieldRender(text, record);
             }
-            return ((_a3 = col == null ? void 0 : col.render) == null ? void 0 : _a3.call(col, text, record)) || text;
+            return ((_a4 = col == null ? void 0 : col.render) == null ? void 0 : _a4.call(col, text, record)) || text;
           }
         };
       }
@@ -160,7 +161,7 @@ var useTransColumns = (params) => {
           filterObj = (0, import_stringFilter.default)({ dataIndex: col.dataIndex });
         }
       }
-      if (((_a2 = col.filters) == null ? void 0 : _a2.length) > 0) {
+      if (((_a3 = col.filters) == null ? void 0 : _a3.length) > 0) {
         filterObj = {
           ...(0, import_selectFilter.default)({
             dataIndex: col.dataIndex,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/materials",
-  "version": "1.0.222",
+  "version": "1.0.224",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",