@donglegeyu/company-ui 1.2.32 → 1.2.34

package/dist/cjs/template-components/IconSelect/index.js

@@ -286,6 +286,7 @@ function IconSelectInner({
         placeholder,
         size,
         style: { width: "100%", ...style },
+        classNames: { popup: { root: "icon-select-popup" } },
         allowClear: true,
         showSearch: true,
         filterOption: false,
@@ -302,7 +303,7 @@ function IconSelectInner({
       {
         open: showAddModal,
         title: "添加自定义图标",
-        width: 380,
+        size: 380,
         onClose: closeAddModal,
         placement: "right",
         zIndex: 2e3,

package/dist/cjs/template-components/IconSelect/index.scss

@@ -77,7 +77,9 @@
     display: flex;
     align-items: center;
   }
+}
 
+.icon-select-popup {
   .icon-option-item {
     display: flex;
     align-items: center;
@@ -85,6 +87,10 @@
     height: 100%;
     min-height: 32px;
 
+    svg {
+      vertical-align: middle;
+    }
+
     .icon-option-label {
       font-size: 13px;
       line-height: 1;

package/dist/cjs/template-components/SmartListTemplate/index.js

@@ -260,6 +260,7 @@ function SmartListTemplate({
         width: field.width || 120,
         fixed: field.fixed,
         ellipsis: enableEllipsis,
+        sorter: field.sortable === true ? true : void 0,
         render: (_, record) => {
           const customContent = bodyCell ? bodyCell({ ...field, key: field.key }, record) : null;
           if (customContent !== null) {
@@ -566,8 +567,14 @@ function SmartListTemplate({
     [onChange]
   );
   const handleTableChange = (0, import_react.useCallback)(
-    (_pagination) => {
-      onChange == null ? void 0 : onChange(_pagination);
+    (_pagination, _filters, sorter) => {
+      const sortInfo = Array.isArray(sorter) ? sorter[0] : sorter;
+      const sortField = sortInfo == null ? void 0 : sortInfo.field;
+      const sortOrder = sortInfo == null ? void 0 : sortInfo.order;
+      onChange == null ? void 0 : onChange({
+        sortField,
+        sortOrder
+      });
     },
     [onChange]
   );

package/dist/cjs/types/index.d.ts

@@ -31,7 +31,7 @@ export interface FilterItem {
 export interface DisplayItem {
     key: string;
     label?: string;
-    type: 'item' | 'button';
+    type: "item" | "button";
     inputType?: string;
     placeholder?: string | string[];
     options?: {
@@ -42,16 +42,18 @@ export interface DisplayItem {
 export interface FieldDefinition {
     key: string;
     label: string;
-    type?: 'input' | 'select' | 'date' | 'daterange' | 'item';
+    type?: "input" | "select" | "date" | "daterange" | "item";
     placeholder?: string;
     options?: {
         label: string;
         value: string | number;
     }[];
     width?: number;
-    fixed?: 'left' | 'right';
+    fixed?: "left" | "right";
     ellipsis?: boolean;
     hideInFilter?: boolean;
+    /** 是否支持列排序（表头显示排序按钮）。默认 false */
+    sortable?: boolean;
 }
 export interface PaginationConfig {
     current: number;

package/dist/es/template-components/IconSelect/index.js

@@ -462,6 +462,11 @@ function IconSelectInner(_ref) {
       style: _objectSpread({
         width: "100%"
       }, style),
+      classNames: {
+        popup: {
+          root: "icon-select-popup"
+        }
+      },
       allowClear: true,
       showSearch: true,
       filterOption: false,
@@ -474,7 +479,7 @@ function IconSelectInner(_ref) {
     }), /*#__PURE__*/_jsx(CompanyDrawer, {
       open: showAddModal,
       title: "\u6DFB\u52A0\u81EA\u5B9A\u4E49\u56FE\u6807",
-      width: 380,
+      size: 380,
       onClose: closeAddModal,
       placement: "right",
       zIndex: 2000,

package/dist/es/template-components/IconSelect/index.scss

@@ -77,7 +77,9 @@
     display: flex;
     align-items: center;
   }
+}
 
+.icon-select-popup {
   .icon-option-item {
     display: flex;
     align-items: center;
@@ -85,6 +87,10 @@
     height: 100%;
     min-height: 32px;
 
+    svg {
+      vertical-align: middle;
+    }
+
     .icon-option-label {
       font-size: 13px;
       line-height: 1;

package/dist/es/template-components/SmartListTemplate/index.js

@@ -335,6 +335,7 @@ export default function SmartListTemplate(_ref) {
         width: field.width || 120,
         fixed: field.fixed,
         ellipsis: enableEllipsis,
+        sorter: field.sortable === true ? true : undefined,
         render: function render(_, record) {
           var customContent = bodyCell ? bodyCell(_objectSpread(_objectSpread({}, field), {}, {
             key: field.key
@@ -797,8 +798,14 @@ export default function SmartListTemplate(_ref) {
   var handleFilterChange = useCallback(function (data) {
     onChange === null || onChange === void 0 || onChange(data);
   }, [onChange]);
-  var handleTableChange = useCallback(function (_pagination) {
-    onChange === null || onChange === void 0 || onChange(_pagination);
+  var handleTableChange = useCallback(function (_pagination, _filters, sorter) {
+    var sortInfo = Array.isArray(sorter) ? sorter[0] : sorter;
+    var sortField = sortInfo === null || sortInfo === void 0 ? void 0 : sortInfo.field;
+    var sortOrder = sortInfo === null || sortInfo === void 0 ? void 0 : sortInfo.order;
+    onChange === null || onChange === void 0 || onChange({
+      sortField: sortField,
+      sortOrder: sortOrder
+    });
   }, [onChange]);
   var handlePageChange = useCallback(function (page, pageSize) {
     setPaginationConfig({

package/dist/es/types/index.d.ts

@@ -31,7 +31,7 @@ export interface FilterItem {
 export interface DisplayItem {
     key: string;
     label?: string;
-    type: 'item' | 'button';
+    type: "item" | "button";
     inputType?: string;
     placeholder?: string | string[];
     options?: {
@@ -42,16 +42,18 @@ export interface DisplayItem {
 export interface FieldDefinition {
     key: string;
     label: string;
-    type?: 'input' | 'select' | 'date' | 'daterange' | 'item';
+    type?: "input" | "select" | "date" | "daterange" | "item";
     placeholder?: string;
     options?: {
         label: string;
         value: string | number;
     }[];
     width?: number;
-    fixed?: 'left' | 'right';
+    fixed?: "left" | "right";
     ellipsis?: boolean;
     hideInFilter?: boolean;
+    /** 是否支持列排序（表头显示排序按钮）。默认 false */
+    sortable?: boolean;
 }
 export interface PaginationConfig {
     current: number;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@donglegeyu/company-ui",
-  "version": "1.2.32",
+  "version": "1.2.34",
   "main": "dist/cjs/index.js",
   "module": "dist/es/index.js",
   "types": "dist/es/index.d.ts",