@arim-aisdc/public-components 2.3.14 → 2.3.16

package/dist/components/ConditionExpression/index.less

@@ -17,6 +17,7 @@
 
     .condition-all-content {
       overflow: auto;
+      border: 1px dashed @global-card-effect-background-color;
     }
 
     /* 添加相对定位 */
@@ -24,7 +25,6 @@
       display: flex;
       align-items: center;
       position: relative;
-      border: 1px dashed @global-card-effect-background-color;
       border-radius: 6px;
       padding: 6px 8px 6px 6px;
 
@@ -76,6 +76,7 @@
       .condition-add {
         i {
           font-size: 20px;
+          cursor: pointer;
         }
       }
     }

package/dist/components/ConfigProvider/context.d.ts

@@ -23,12 +23,15 @@ export interface ConfigConsumerProps {
     themePackageName?: 'DefaultThemePackage' | 'DyImsBlueThemePackage';
     /**语言 */
     locale?: Locale;
+    /**tablemax dateFormat */
+    dateFormat?: string;
 }
 export declare const DEFAULT_CONTEXT: {
     theme: string;
     userId: string;
     tableKeyPrefixCls: string;
     locale: Locale;
+    dateFormat: string;
 };
 declare const ConfigContext: import("react").Context<ConfigConsumerProps>;
 export default ConfigContext;

package/dist/components/ConfigProvider/context.js

@@ -7,7 +7,8 @@ export var DEFAULT_CONTEXT = {
   theme: 'light',
   userId: '',
   tableKeyPrefixCls: 'TableMax',
-  locale: public_zhCN
+  locale: public_zhCN,
+  dateFormat: 'YYYY-MM-DD HH:mm'
   // locale: public_enUS
 };
 var ConfigContext = /*#__PURE__*/createContext(DEFAULT_CONTEXT);

package/dist/components/TableMax/TableBody/Row.js

@@ -21,6 +21,7 @@ import { getPinningStyle } from "../TableHeader/utils";
 import { EditableCell } from "../components/ColumnEdit";
 import "./index.less";
 import dayjs from 'dayjs';
+import { useConfig } from "../../ConfigProvider";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { Fragment as _Fragment } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
@@ -202,7 +203,7 @@ var Row = function Row(_ref) {
       else {
         if (evt.shiftKey) {
           var _table$getRowModel$ro2;
-          console.log('table.getState().rowSelection :>> ', table.getState().rowSelection);
+          // console.log('table.getState().rowSelection :>> ', table.getState().rowSelection);
           var _selectionConfig2 = _objectSpread({}, table.getState().rowSelection);
           var _min = Math.min(initselectedIndex || 0, row.index);
           var _max = Math.max(initselectedIndex || 0, row.index);
@@ -303,6 +304,8 @@ var Row = function Row(_ref) {
 
   var rowCom = function rowCom() {
     var _row;
+    var _useConfig = useConfig(),
+      dateFormat = _useConfig.dateFormat;
     return /*#__PURE__*/_jsx("tr", {
       id: rowEditing ? "".concat(tableId, "-tbody-tr-editing") : undefined,
       ref: function ref(node) {
@@ -348,7 +351,7 @@ var Row = function Row(_ref) {
           // 格式化值获取
           getFormattedValue: function getFormattedValue() {
             var _cell$column$columnDe2;
-            return isDateColumn(cell.column.columnDef) ? formatDate(rawValue, (_cell$column$columnDe2 = cell.column.columnDef) === null || _cell$column$columnDe2 === void 0 || (_cell$column$columnDe2 = _cell$column$columnDe2.meta) === null || _cell$column$columnDe2 === void 0 ? void 0 : _cell$column$columnDe2.dateFormat) : rawValue;
+            return isDateColumn(cell.column.columnDef) ? formatDate(rawValue, ((_cell$column$columnDe2 = cell.column.columnDef) === null || _cell$column$columnDe2 === void 0 || (_cell$column$columnDe2 = _cell$column$columnDe2.meta) === null || _cell$column$columnDe2 === void 0 ? void 0 : _cell$column$columnDe2.dateFormat) || dateFormat) : rawValue;
           },
           // 默认渲染使用格式化值
           renderValue: function renderValue() {
@@ -416,7 +419,7 @@ function formatDate(dateValue) {
   if (!dateValue) return '';
   var date = dayjs(dateValue);
   if (!date.isValid()) return 'Invalid Date';
-  console.log(date.format(pattern), pattern, 'pattern');
+  // console.log(date.format(pattern), pattern, 'pattern')
   return date.format(pattern);
 }
 function isDateColumn(column) {

package/dist/components/TableMax/TableMax.js

@@ -54,7 +54,7 @@ var getCurrentRouterName = function getCurrentRouterName() {
   return window.location.pathname.slice(1);
 };
 var TableMax = function TableMax(_ref) {
-  var _JSON$parse, _tableContentRef$curr, _tableContentRef$curr2;
+  var _JSON$parse, _tableContentRef$curr;
   var tableId = _ref.tableId,
     originColumns = _ref.columns,
     _ref$datas = _ref.datas,
@@ -298,7 +298,6 @@ var TableMax = function TableMax(_ref) {
     onColumnSizingChange = _useColumnWidth.onColumnSizingChange,
     tableContainerWidth = _useColumnWidth.tableContainerWidth,
     handleVisibleConfigChange = _useColumnWidth.handleVisibleConfigChange;
-  console.log('columnSizing', columnSizing, tableContentRef === null || tableContentRef === void 0 || (_tableContentRef$curr = tableContentRef.current) === null || _tableContentRef$curr === void 0 ? void 0 : _tableContentRef$curr.getBoundingClientRect().width, tableContainerWidth);
 
   /**列筛选 */
   var _useState21 = useState(defaultColumnFilters),
@@ -437,7 +436,6 @@ var TableMax = function TableMax(_ref) {
     onExpandedChange: setExpanded,
     sortDescFirst: true // 首次排序为递减排序，不加这个属性的话，有些列的排序会有问题
   });
-  console.log(tableColumns, 'table.columns');
 
   // 暴露给外部的api
   useImperativeHandle(refInstance, function () {
@@ -659,7 +657,7 @@ var TableMax = function TableMax(_ref) {
 
   // 筛选回调
   useEffect(function () {
-    console.log('columnFilters :>> ', tableId, columnFilters);
+    // console.log('columnFilters :>> ', tableId, columnFilters);
     var filteredRowModel = table.getRowModel();
     var filteredData = filteredRowModel.rows.map(function (item) {
       return item.original;
@@ -715,7 +713,6 @@ var TableMax = function TableMax(_ref) {
   /**缓存table数据 */
   useUpdateEffect(function () {
     var tableState = table.getState();
-    // console.log('set cache data', compactMode);
     localStorage.setItem(tableKey, JSON.stringify({
       enableFilters: enableFilters,
       headerRowNum: headerRowNum,
@@ -961,7 +958,7 @@ var TableMax = function TableMax(_ref) {
   useEffect(function () {
     // 表格宽度变化时（比如调整页面宽度大小），重新计算是否展示阴影
     getPinShadowInfo();
-  }, [tableContentRef === null || tableContentRef === void 0 || (_tableContentRef$curr2 = tableContentRef.current) === null || _tableContentRef$curr2 === void 0 ? void 0 : _tableContentRef$curr2.clientWidth, table.getState().columnSizing]);
+  }, [tableContentRef === null || tableContentRef === void 0 || (_tableContentRef$curr = tableContentRef.current) === null || _tableContentRef$curr === void 0 ? void 0 : _tableContentRef$curr.clientWidth, table.getState().columnSizing]);
   var scrollHandler = useCallback(function (event) {
     if (!event.currentTarget) return;
     tableHeaderRef.current.scrollLeft = event.currentTarget.scrollLeft / event.currentTarget.scrollWidth * (tableHeaderRef === null || tableHeaderRef === void 0 ? void 0 : tableHeaderRef.current.scrollWidth);
@@ -1051,9 +1048,6 @@ var TableMax = function TableMax(_ref) {
     compactMode: compactMode,
     onEditValueChange: onEditValueChange
   };
-
-  // console.log('columnsSizeMap render');
-
   var changeCompactMode = function changeCompactMode() {
     setCompactMode(!compactMode);
   };

package/dist/components/TableMax/components/ColumnFilterV2/index.js

@@ -45,10 +45,8 @@ export function setDefaultFilterFn(columns) {
       if (!column.meta) {
         column.meta = {};
         column.meta.isDate = true;
-        column.meta.dateFormat = 'YYYY-MM-DD HH:mm';
       } else {
         column.meta.isDate = column.meta.isDate || true;
-        column.meta.dateFormat = column.meta.dateFormat || 'YYYY-MM-DD HH:mm';
       }
     }
     if (column.filterType && !column.filterFn && FILTER_FN_ENUM[column.filterType]) {

package/dist/components/TableMax/components/ColumnSort/customSortFns.d.ts

@@ -1,13 +1,13 @@
 import { TableMaxColumnType } from "../../type";
-export declare const numberSortFn: (rowA: any, rowB: any, columnId: string) => 0 | 1 | -1;
-export declare const stringSortFn: (rowA: any, rowB: any, columnId: string) => 0 | 1 | -1;
-export declare const numberOrStringSortFn: (rowA: any, rowB: any, columnId: string) => 0 | 1 | -1;
-export declare const timeSortFn: (rowA: any, rowB: any, columnId: string) => 0 | 1 | -1;
+export declare const numberSortFn: (rowA: any, rowB: any, columnId: string) => 1 | 0 | -1;
+export declare const stringSortFn: (rowA: any, rowB: any, columnId: string) => 1 | 0 | -1;
+export declare const numberOrStringSortFn: (rowA: any, rowB: any, columnId: string) => 1 | 0 | -1;
+export declare const timeSortFn: (rowA: any, rowB: any, columnId: string) => 1 | 0 | -1;
 declare const customSortFns: {
-    numberSortFn: (rowA: any, rowB: any, columnId: string) => 0 | 1 | -1;
-    stringSortFn: (rowA: any, rowB: any, columnId: string) => 0 | 1 | -1;
-    timeSortFn: (rowA: any, rowB: any, columnId: string) => 0 | 1 | -1;
-    numberOrStringSortFn: (rowA: any, rowB: any, columnId: string) => 0 | 1 | -1;
+    numberSortFn: (rowA: any, rowB: any, columnId: string) => 1 | 0 | -1;
+    stringSortFn: (rowA: any, rowB: any, columnId: string) => 1 | 0 | -1;
+    timeSortFn: (rowA: any, rowB: any, columnId: string) => 1 | 0 | -1;
+    numberOrStringSortFn: (rowA: any, rowB: any, columnId: string) => 1 | 0 | -1;
 };
 export default customSortFns;
 export type SortFnType = keyof typeof customSortFns | undefined;

package/dist/components/TableMax/components/ColumnSort/index.less

@@ -13,7 +13,8 @@
     height: 0;
     border-left: 4px solid transparent;
     border-right: 4px solid transparent;
-    border-bottom: 6px solid #fff;
+    // border-bottom: 6px solid #fff;
+    border-bottom: 6px solid @global-sort-flag-color;
 
     &-red {
       border-bottom: 6px solid #fa541cff;
@@ -27,7 +28,8 @@
     margin-top: 3px;
     border-left: 4px solid transparent;
     border-right: 4px solid transparent;
-    border-top: 6px solid #fff;
+    // border-top: 6px solid #fff;
+    border-top: 6px solid @global-sort-flag-color;
 
     &-red {
       border-top: 6px solid #fa541cff;

package/dist/components/TableMax/hooks/useColumnWidth.js

@@ -56,6 +56,7 @@ export var useColumnWidth = function useColumnWidth(_ref) {
   var handleResize = useCallback(function () {
     if (!tableContentRef.current) return;
     var newWidth = getTableWidth();
+    if (!newWidth) return;
     setState(function (prevState) {
       // 计算可见列，排除特定列
       var visibleColumns = Object.keys(prevState.columnSizing).filter(function (key) {
@@ -81,7 +82,6 @@ export var useColumnWidth = function useColumnWidth(_ref) {
             visibleColumns.forEach(function (key) {
               newVisibleColumnsSizing[key] = (newVisibleColumnsSizing[key] || 0) + averageWidth;
             });
-            console.log(newVisibleColumnsSizing, 'newVisibleColumnsSizing');
             return _objectSpread(_objectSpread({}, prevState), {}, {
               columnSizing: newVisibleColumnsSizing,
               allColumnSizing: _objectSpread(_objectSpread({}, prevState.allColumnSizing || {}), newVisibleColumnsSizing),
@@ -89,7 +89,7 @@ export var useColumnWidth = function useColumnWidth(_ref) {
             });
           }
         }
-      } else if (prevState.tableContainerWidth > 0 && JSON.stringify(prevState.initColumnsSizeMap) !== '{}') {
+      } else if (prevState.tableContainerWidth > 0 && newWidth < prevState.tableContainerWidth && JSON.stringify(prevState.initColumnsSizeMap) !== '{}') {
         // 容器变小时，重新计算
         var reducedWidth = newWidth - totalVisibleWidth - 10;
         var _unselectedCount = visibleColumns.length;
@@ -139,7 +139,7 @@ export var useColumnWidth = function useColumnWidth(_ref) {
     setState(function (prevState) {
       //列宽增加
       if (value) {
-        console.log(prevState.allColumnSizing[key], prevState.allColumnSizing, 'prevState.allColumnSizing[key]');
+        // console.log(prevState.allColumnSizing[key], prevState.allColumnSizing, 'prevState.allColumnSizing[key]')
         return _objectSpread(_objectSpread({}, prevState), {}, {
           columnSizing: _objectSpread(_objectSpread({}, prevState.columnSizing), {}, {
             key: prevState.allColumnSizing[key]
@@ -157,7 +157,6 @@ export var useColumnWidth = function useColumnWidth(_ref) {
         var totalWidth = Object.values(newVisibleColumnsSizing).reduce(function (sum, width) {
           return Number(sum || 0) + Number(width || 0);
         }, 0);
-        console.log(newVisibleColumnsSizing, totalWidth, containerWidth, 'newVisibleColumnsSizing');
         if (containerWidth < totalWidth) {
           // 容器宽度小于增加列后的列总和，其他列宽度不变
           return _objectSpread(_objectSpread({}, prevState), {}, {
@@ -173,7 +172,6 @@ export var useColumnWidth = function useColumnWidth(_ref) {
           joinCalculateColumns === null || joinCalculateColumns === void 0 || joinCalculateColumns.forEach(function (key) {
             newVisibleColumnsSizing[key] = (newVisibleColumnsSizing[key] || 0) + averageWidthIncrease;
           });
-          console.log(newVisibleColumnsSizing, joinCalculateColumns, 'newVisibleColumnsSizing', averageWidthIncrease);
           return _objectSpread(_objectSpread({}, prevState), {}, {
             columnSizing: newVisibleColumnsSizing,
             allColumnSizing: _objectSpread(_objectSpread({}, prevState.allColumnSizing), newVisibleColumnsSizing)
@@ -201,7 +199,6 @@ export var useColumnWidth = function useColumnWidth(_ref) {
     }, 0);
     var remainTableContainerWidth = currentWidth - allColumnWidth - 10;
     var newColumnSizeMap = _objectSpread({}, columnsSizeMap);
-    console.log(remainColumnCount, 'remainColumnCount');
 
     // 处理未设置宽度的列
     if (remainColumnCount > 0) {
@@ -283,7 +280,6 @@ export var useColumnWidth = function useColumnWidth(_ref) {
     });
     setState(function (prevState) {
       var columnSizing = calculateColumnSizing(visibleColumnsSizeMap, newAllColumnCount, prevState.tableContainerWidth);
-      console.log(columnSizing, _objectSpread(_objectSpread({}, initColumnsSizeMap), columnSizing), 'columnSizing11');
       return {
         columnSizing: columnSizing,
         allColumnSizing: _objectSpread(_objectSpread({}, initColumnsSizeMap), columnSizing),
@@ -314,14 +310,12 @@ export var useColumnWidth = function useColumnWidth(_ref) {
 
       // 创建新的列宽映射
       var newVisibleColumnsSizing = _objectSpread(_objectSpread({}, prevState.columnSizing), changedColumn);
-      console.log(newVisibleColumnsSizing, 'newVisibleColumnsSizing');
 
       // 计算当前总宽度
       var totalWidth = Object.values(newVisibleColumnsSizing).reduce(function (sum, width) {
         return Number(sum || 0) + Number(width || 0);
       }, 0);
       var containerWidth = getTableWidth() - 10 || 0;
-      console.log(widthDiff, newWidth, oldWidth, changedColumnKey, prevState, 3344);
 
       // 处理列宽变大
       if (widthDiff > 0) {
@@ -349,7 +343,6 @@ export var useColumnWidth = function useColumnWidth(_ref) {
           } else {
             targetColumnKey = columns[currentIndex + 1]; // 下一列
           }
-          console.log(widthDifference, newVisibleColumnsSizing[targetColumnKey], 'newVisibleColumnsSizing');
           // 增加目标列的宽度
           if (targetColumnKey) {
             newVisibleColumnsSizing[targetColumnKey] = (newVisibleColumnsSizing[targetColumnKey] || 0) + widthDifference;

package/dist/themes/variables.less

@@ -87,3 +87,4 @@
 @global-splitter-panel-top-height: var(--global-splitter-panel-top-height, 100%);
 @global-splitter-panel-bottom-height: var(--global-splitter-panel-bottom-height, 100%);
 @global-splitter-panel-margin: var(--global-splitter-panel-margin, 0);
+@global-sort-flag-color: var(--global-sort-flag-color, #ffffff);

package/dist/themes/variablesConfig.js

@@ -140,7 +140,8 @@ export var PublicThemeVariablesConfig = {
     // messageTip
     '--global-messageTip-background-color': '#0c1b3b',
     '--global-messageTip-text-color': '#eaeaea',
-    '--global-messageTip-box-shadow': '0px 5px 12px 4px rgba(3,5,33,0.45)'
+    '--global-messageTip-box-shadow': '0px 5px 12px 4px rgba(3,5,33,0.45)',
+    '--global-sort-flag-color': '#FFFFFF'
   }),
   dark: _objectSpread(_objectSpread({
     '--global-curd-input-background-color': '#494c5dff',
@@ -226,7 +227,8 @@ export var PublicThemeVariablesConfig = {
     // messageTip
     '--global-messageTip-background-color': '#ffffff',
     '--global-messageTip-text-color': '#242A30',
-    '--global-messageTip-box-shadow': '0px 5px 12px 4px rgba(3,6,33,0.15)'
+    '--global-messageTip-box-shadow': '0px 5px 12px 4px rgba(3,6,33,0.15)',
+    '--global-sort-flag-color': '#FFFFFF'
   })
 };
 export var PublicThemeVariablesConfigTwo = {
@@ -313,7 +315,8 @@ export var PublicThemeVariablesConfigTwo = {
     // messageTip
     '--global-messageTip-background-color': 'rgb(71,85,105,0.95)',
     '--global-messageTip-text-color': '#FFFFFF',
-    '--global-messageTip-box-shadow': '0px 5px 12px 4px rgba(3,5,33,0.45)'
+    '--global-messageTip-box-shadow': '0px 5px 12px 4px rgba(3,5,33,0.45)',
+    '--global-sort-flag-color': '#242A30'
   }),
   dark: _objectSpread(_objectSpread({
     '--global-curd-input-background-color': '#494c5dff',
@@ -400,7 +403,8 @@ export var PublicThemeVariablesConfigTwo = {
     // messageTip
     '--global-messageTip-background-color': 'rgb(255,255,255,0.95)',
     '--global-messageTip-text-color': '#242A30',
-    '--global-messageTip-box-shadow': '0px 5px 12px 4px rgba(3,6,33,0.15)'
+    '--global-messageTip-box-shadow': '0px 5px 12px 4px rgba(3,6,33,0.15)',
+    '--global-sort-flag-color': '#FFFFFF'
   })
 };
 export var publicThemeMap = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arim-aisdc/public-components",
-  "version": "2.3.14",
+  "version": "2.3.16",
   "description": "前端组件库",
   "license": "MIT",
   "main": "dist/index.js",