@yilianjituan/yilian_dgerm 1.0.3 → 1.0.5-alpha.1

package/dist/components/PageTemplate/resizable/index.js

@@ -1,6 +1,10 @@
 var _excluded = ["onResize", "width", "isEnd"],
   _excluded2 = ["components", "columns", "dataSource", "tableLayout"];
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
@@ -16,7 +20,7 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 import { Table } from 'antd';
-import React, { useEffect, useRef } from 'react';
+import React, { useEffect, useRef, useState } from 'react';
 import { Resizable } from 'react-resizable';
 import "./index.scss";
 /**
@@ -55,15 +59,15 @@ var handleResize = function handleResize(index, columns, newColumnsVoid) {
   };
 };
 /**
-* 设置表格列宽的初始化值
-* ^判断初始columns中设置的width是否为number
-* ^使用ref获取所有的列宽，存储在widthsList，如果width不为number，则取获取的dom宽或者默认为150
-*
-* @param columns - 初始化的columns.
-* @param tableRef - table外层的div的ref，用于获取table的dom的列宽.
-* @param newColumnsVoid - callback，传出新的columns.
-* @return 给columns里的增加onResize属性，用于在Resizable进行控制.
-*/
+ * 设置表格列宽的初始化值
+ * ^判断初始columns中设置的width是否为number
+ * ^使用ref获取所有的列宽，存储在widthsList，如果width不为number，则取获取的dom宽或者默认为150
+ *
+ * @param columns - 初始化的columns.
+ * @param tableRef - table外层的div的ref，用于获取table的dom的列宽.
+ * @param newColumnsVoid - callback，传出新的columns.
+ * @return 给columns里的增加onResize属性，用于在Resizable进行控制.
+ */
 var mergedColumns = function mergedColumns(columns, tableRef, newColumnsVoid) {
   if (!columns || columns.length === 0) {
     return []; // 处理columns为空或长度为0的情况
@@ -155,18 +159,42 @@ var ResizableTitle = function ResizableTitle(props) {
   }, /*#__PURE__*/React.createElement("th", restProps));
 };
 var CustomTable = function CustomTable(props) {
+  var _document$querySelect3, _restProps$scroll, _restProps$scroll2;
   var components = props.components,
     columns = props.columns,
     dataSource = props.dataSource,
     tableLayout = props.tableLayout,
     restProps = _objectWithoutProperties(props, _excluded2);
   var tableRef = useRef(null); // 引用 Table 外层容器
-  var _React$useState = React.useState(columns),
-    _React$useState2 = _slicedToArray(_React$useState, 2),
-    column = _React$useState2[0],
-    setColumn = _React$useState2[1];
+  var _useState = useState(columns),
+    _useState2 = _slicedToArray(_useState, 2),
+    column = _useState2[0],
+    setColumn = _useState2[1];
+  var _useState3 = useState(null),
+    _useState4 = _slicedToArray(_useState3, 2),
+    tableHeight = _useState4[0],
+    setTableHeight = _useState4[1];
   useEffect(function () {
-    setColumn(columns);
+    var _document$querySelect;
+    if ((_document$querySelect = document.querySelector('.ant-table-small')) !== null && _document$querySelect !== void 0 && _document$querySelect.clientHeight) {
+      var _document$querySelect2;
+      setTableHeight((((_document$querySelect2 = document.querySelector('.ant-table-small')) === null || _document$querySelect2 === void 0 ? void 0 : _document$querySelect2.clientHeight) || 0) - 40);
+    }
+  }, [(_document$querySelect3 = document.querySelector('.ant-table-small')) === null || _document$querySelect3 === void 0 ? void 0 : _document$querySelect3.clientHeight]);
+  useEffect(function () {
+    if (!columns || columns.length === 0) {
+      return; // 如果 columns 为空或长度为0，直接返回
+    }
+    var _columns = _toConsumableArray(columns);
+    _columns = _columns.map(function (item) {
+      return _objectSpread(_objectSpread({}, item), {}, {
+        minWidth: item.minWidth || item.title.length * 20 + 20,
+        ellipsis: item.ellipsis || true,
+        align: item.align || 'center',
+        fixed: item.fixed || (['action', 'operation', 'handle', 'handle_box'].includes(item.dataIndex) ? 'right' : ['rowIndex'].includes(item.key) ? 'left' : undefined)
+      });
+    });
+    setColumn(_columns);
   }, [dataSource, columns]);
   var customComponents = _objectSpread({
     header: _objectSpread({
@@ -174,14 +202,23 @@ var CustomTable = function CustomTable(props) {
     }, components === null || components === void 0 ? void 0 : components.header)
   }, components);
   return /*#__PURE__*/React.createElement("div", {
+    className: "custom-ant-table",
     ref: tableRef
-  }, /*#__PURE__*/React.createElement(Table, _extends({}, restProps, {
-    columns: mergedColumns(column, tableRef, function (_columns) {
-      return setColumn(_columns);
-    }),
-    components: customComponents,
+  }, /*#__PURE__*/React.createElement(Table, _extends({
+    size: "small"
+    // columns={mergedColumns(column as any, tableRef, (_columns) => setColumn(_columns as any)) as any}
+    ,
+    columns: column
+    // components={customComponents}
+    ,
+    components: components,
     dataSource: dataSource || [],
     tableLayout: tableLayout || 'auto'
+  }, restProps, {
+    scroll: {
+      x: (restProps === null || restProps === void 0 || (_restProps$scroll = restProps.scroll) === null || _restProps$scroll === void 0 ? void 0 : _restProps$scroll.x) || 1500,
+      y: (restProps === null || restProps === void 0 || (_restProps$scroll2 = restProps.scroll) === null || _restProps$scroll2 === void 0 ? void 0 : _restProps$scroll2.y) || tableHeight || undefined
+    }
   })));
 };
-export { mergedColumns, ResizableTitle, CustomTable };
+export { CustomTable, mergedColumns, ResizableTitle };

package/dist/components/PageTemplate/resizable/index.scss

@@ -22,4 +22,45 @@
 .react-resizable {
   word-wrap: break-word !important;
   word-break: break-all !important;
+}
+
+.custom-ant-table {
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+  overflow: hidden;
+
+  .ant-table-wrapper {
+    flex: 1;
+    overflow: hidden;
+
+    .ant-spin-nested-loading {
+      height: 100%;
+      overflow: hidden;
+
+      .ant-spin-container {
+        height: 100%;
+        overflow: hidden;
+        display: flex;
+        flex-direction: column;
+
+        .ant-table-small {
+          flex: 1;
+          overflow: hidden;
+
+          .ant-table-body {
+            max-height: none !important;
+            flex: 1;
+          }
+
+          .ant-table-container {
+            height: 100%;
+            overflow: hidden;
+            display: flex;
+            flex-direction: column;
+          }
+        }
+      }
+    }
+  }
 }

package/dist/utils/common.d.ts

@@ -4,8 +4,8 @@
  */
 export declare function revertUTF8(szInput: any): string;
 /**
-* 导出编译
-*/
+ * 导出编译
+ */
 export declare function exportCompile(res: {
     data: BlobPart;
     headers: {

package/dist/utils/common.js

@@ -1,4 +1,4 @@
-import { message } from "antd";
+import { message } from 'antd';
 
 /**
  * UTF8编码转成汉字字符串
@@ -8,22 +8,22 @@ export function revertUTF8(szInput) {
   var x,
     wch,
     wch1,
-    wch2 = "",
-    szRet = "";
+    wch2 = '',
+    szRet = '';
   for (x = 0; x < szInput.length; x++) {
-    if (szInput.charAt(x) === "%") {
+    if (szInput.charAt(x) === '%') {
       wch = parseInt(szInput.charAt(++x) + szInput.charAt(++x), 16);
       if (!wch) {
         break;
       }
       if (!(wch & 0x80)) {
-        // eslint-disable-next-line 
+        // eslint-disable-next-line
         wch = wch;
       } else if (!(wch & 0x20)) {
         x++;
         wch1 = parseInt(szInput.charAt(++x) + szInput.charAt(++x), 16);
-        wch = (wch & 0x1F) << 6;
-        wch1 = wch1 & 0x3F;
+        wch = (wch & 0x1f) << 6;
+        wch1 = wch1 & 0x3f;
         wch = wch + wch1;
       } else {
         x++;
@@ -32,11 +32,11 @@ export function revertUTF8(szInput) {
         // eslint-disable-next-line @typescript-eslint/ban-ts-comment
         // @ts-ignore
         wch2 = parseInt(szInput.charAt(++x) + szInput.charAt(++x), 16);
-        wch = (wch & 0x0F) << 12;
-        wch1 = (wch1 & 0x3F) << 6;
+        wch = (wch & 0x0f) << 12;
+        wch1 = (wch1 & 0x3f) << 6;
         // eslint-disable-next-line @typescript-eslint/ban-ts-comment
         // @ts-ignore
-        wch2 = wch2 & 0x3F;
+        wch2 = wch2 & 0x3f;
         wch = wch + wch1 + wch2;
       }
       // eslint-disable-next-line @typescript-eslint/ban-ts-comment
@@ -49,8 +49,8 @@ export function revertUTF8(szInput) {
   return szRet;
 }
 /**
-* 导出编译
-*/
+ * 导出编译
+ */
 export function exportCompile(res) {
   var data = res.data;
   // 有可能下载失败，设置了responseType: 'blob'，axios会把data强制转为blob
@@ -66,12 +66,13 @@ export function exportCompile(res) {
     try {
       var resData = JSON.parse(e.target.result); // this.result为FileReader获取blob数据转换为json后的数据，即后台返回的原始数据
       // 如果执行到这里，说明下载报错了，进行后续处理
-      if (resData.result === "NULL") {
+      if (resData.result === 'NULL') {
         message.error('无数据无法导出，请确认后操作');
       } else {
         message.error(resData.message);
       }
     } catch (err) {
+      var _res$headers$content;
       // 下载正常处理
       var fileName = res.headers['content-disposition'];
       // 获取文件名
@@ -90,12 +91,12 @@ export function exportCompile(res) {
         return;
       }
       var blob = new Blob([res.data], {
-        type: ""
+        type: ''
       });
       var objectUrl = URL.createObjectURL(blob);
-      var a = document.createElement("a");
+      var a = document.createElement('a');
       a.href = objectUrl;
-      a.download = revertUTF8(res.headers['content-disposition'].split('=')[1]);
+      a.download = revertUTF8((_res$headers$content = res.headers['content-disposition']) === null || _res$headers$content === void 0 ? void 0 : _res$headers$content.split('=')[1]);
       a.click();
     }
   };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yilianjituan/yilian_dgerm",
-  "version": "1.0.3",
+  "version": "1.0.5-alpha.1",
   "description": "A react library developed with dumi",
   "keywords": [
     "React",

package/CHANGELOG.md

@@ -1,61 +0,0 @@
-# [1.0.0](https://git.yljt.cn:522/web-module/yl_dgerm/compare/v0.0.1-alpha.47...v1.0.0) (2025-03-06)
-
-### Features
-
-- 时间组件添加 showTime 判断，用来兼容 showTime === false 的情况 ([c365fc3](https://git.yljt.cn:522/web-module/yl_dgerm/commits/c365fc350bb7154bdebd7dc1ab69bccd5a8f5c7b))
-
-## [0.0.1-alpha.47](https://git.yljt.cn:522/web-module/yl_dgerm/compare/v0.0.1-alpha.39...v0.0.1-alpha.47) (2025-02-25)
-
-### Features
-
-- YLModal 拖拽方案修改 ([4d0135](https://git.yljt.cn/web-module/yl_dgerm/-/commit/4d0135edc8bbf1acff4c66d6ebff3d9f7f1fc0f7))
-
-### Bug Fixes
-
-- 修复 DropDownSelect 组件 ([40cf036](https://git.yljt.cn:522/web-module/yl_dgerm/commits/40cf03694b74d59e863e561830e10045074c49c7))
-
-## [0.0.1-alpha.39](https://git.yljt.cn:522/web-module/yl_dgerm/compare/eced17d51f298c04b61797eaea829549ed2c4bfa...v0.0.1-alpha.39) (2024-12-04)
-
-### Bug Fixes
-
-- 版本修改 ([db121a2](https://git.yljt.cn:522/web-module/yl_dgerm/commits/db121a29a55e964bd8c2f54e74b51dd9961f93a8))
-- 变量名称优化 ([3efe62f](https://git.yljt.cn:522/web-module/yl_dgerm/commits/3efe62f5037660137e01e2ad00b48345c93998d7))
-- 封装 ocr 通用组件 ([de37c47](https://git.yljt.cn:522/web-module/yl_dgerm/commits/de37c476c1c70f3b17a264260c887342c0942095))
-- 更新版本号 ([bb49068](https://git.yljt.cn:522/web-module/yl_dgerm/commits/bb49068c4aec1a75a095b5cbbc84885237fc6305))
-- 更新版本号 ([22008e6](https://git.yljt.cn:522/web-module/yl_dgerm/commits/22008e6823a236515e88ff587ba998c23d0ea446))
-- 清空粘贴板 ([0a38d1e](https://git.yljt.cn:522/web-module/yl_dgerm/commits/0a38d1ef8f9df314e68aff6265a9d4707a5ed152))
-- 删除 html ([8bececc](https://git.yljt.cn:522/web-module/yl_dgerm/commits/8bececc59c80b0e98841f29f197896a95391fe60))
-- 删除 jest ([bdbd693](https://git.yljt.cn:522/web-module/yl_dgerm/commits/bdbd693aa37c48f46310f94796ad51ac14c4b389))
-- 文档维护 ([bd96292](https://git.yljt.cn:522/web-module/yl_dgerm/commits/bd9629247a451d22ca708cb9c6ca21026cfc9235))
-- 文档维护 ([0794420](https://git.yljt.cn:522/web-module/yl_dgerm/commits/0794420b9fff50e5e497a49bcab898d61556bd9d))
-- 文档维护 ([9503527](https://git.yljt.cn:522/web-module/yl_dgerm/commits/95035277799162ccb76fcaa82d877760114cf1da))
-- 文档维护 ([e4d15d4](https://git.yljt.cn:522/web-module/yl_dgerm/commits/e4d15d4e86cfa79be49a46d7175adf59e9bbe2ca))
-- 文档维护 ([303a5b6](https://git.yljt.cn:522/web-module/yl_dgerm/commits/303a5b60aef5b62463e95ca1ad62fa9f5699e072))
-- 文档维护 ([b695706](https://git.yljt.cn:522/web-module/yl_dgerm/commits/b695706fd17290320f0b797b413612a617acc386))
-- 文档维护 ([95dc2da](https://git.yljt.cn:522/web-module/yl_dgerm/commits/95dc2dae2d23e7141216ebd2bb86a33bac8099c8))
-- 文档维护 ([5523d28](https://git.yljt.cn:522/web-module/yl_dgerm/commits/5523d28f00a8527a131a409ea3fd23a8fa5f8b05))
-- 文档维护 ([8418bc2](https://git.yljt.cn:522/web-module/yl_dgerm/commits/8418bc288628080a93cfd504b11ac91505527573))
-- 文档维护 ([0ca0a06](https://git.yljt.cn:522/web-module/yl_dgerm/commits/0ca0a06cce9c842b5f8b8a6e77883ae07c8d9d18))
-- 文档维护 ([6303e90](https://git.yljt.cn:522/web-module/yl_dgerm/commits/6303e90100ea4cb545a3dfdbc591b0af74e6c124))
-- 新版 ocr ([466896c](https://git.yljt.cn:522/web-module/yl_dgerm/commits/466896cbd5cdf8e67d66a3a6bdbdd8ab6f3bb5d9))
-- 修复 ocr ([b5e1e6d](https://git.yljt.cn:522/web-module/yl_dgerm/commits/b5e1e6d3b4b456f674d49f653695ff976e52bf9c))
-- 修复 ocr ([873297b](https://git.yljt.cn:522/web-module/yl_dgerm/commits/873297bd74ce73baebd33b9e5131ec36a1789646))
-- 修复 ocr 样式 ([a5e2805](https://git.yljt.cn:522/web-module/yl_dgerm/commits/a5e2805007f0746918a9c0788c05221e9209e425))
-- 修改版本号 ([7979da1](https://git.yljt.cn:522/web-module/yl_dgerm/commits/7979da1e60320e2c4ac393976986dfb8c01a168c))
-- 修改名称 ([77d7d7d](https://git.yljt.cn:522/web-module/yl_dgerm/commits/77d7d7d174b79913b421208bb3e3408a5b61494a))
-- 修改配置文件 ([3f1b7fa](https://git.yljt.cn:522/web-module/yl_dgerm/commits/3f1b7fa71c46fa09fe61b398429887aec356728d))
-- 修改 favicon ([eced17d](https://git.yljt.cn:522/web-module/yl_dgerm/commits/eced17d51f298c04b61797eaea829549ed2c4bfa))
-- 引入 jest 测试单元 ([9da3ee1](https://git.yljt.cn:522/web-module/yl_dgerm/commits/9da3ee178c7d2665b8da6dc61754e2fade1da02b))
-- 组件梳理 ([8148b07](https://git.yljt.cn:522/web-module/yl_dgerm/commits/8148b07d054339c9b381eeba0a5554fc783dc8b3))
-- config 配置 ([5615a1c](https://git.yljt.cn:522/web-module/yl_dgerm/commits/5615a1c763a6b834abefa8dcd29bb5e9debcbffb))
-- config 配置 ([2504b67](https://git.yljt.cn:522/web-module/yl_dgerm/commits/2504b678703d5fc1bb679f949a348d6b5090da2f))
-- config 配置 ([6f44588](https://git.yljt.cn:522/web-module/yl_dgerm/commits/6f44588e05fcd808c069e0f26e4c6e1da2923c89))
-- jsdom 降版本 ([e37a38c](https://git.yljt.cn:522/web-module/yl_dgerm/commits/e37a38c4ff90f4ed24f52aaf0b3f5265e10f1ccc))
-- jsdom 降版本 ([0b9dd48](https://git.yljt.cn:522/web-module/yl_dgerm/commits/0b9dd4871c5aff303c8c3eb1bb2e2da794861b76))
-- jsdom 降版本 ([23d8f01](https://git.yljt.cn:522/web-module/yl_dgerm/commits/23d8f0188014fcee865396aaf665d06ede41929a))
-- ocr 添加依赖 ([d23cd95](https://git.yljt.cn:522/web-module/yl_dgerm/commits/d23cd95f033fbd9ff4659e481136f87d0f5dbd8f))
-- ocr 通用组件增加请求回调勾子 ([99951c9](https://git.yljt.cn:522/web-module/yl_dgerm/commits/99951c945fee863200909e135bead9e8110ca1bf))
-- ocr 修复 ([42264e7](https://git.yljt.cn:522/web-module/yl_dgerm/commits/42264e76c39d9c1490d086b7a7b751edb6f7143c))
-- test-library 降版本 ([1f93a8c](https://git.yljt.cn:522/web-module/yl_dgerm/commits/1f93a8caabe91943f534f19c3514bc3bae7951cb))
-- test-library 降版本 ([03a5423](https://git.yljt.cn:522/web-module/yl_dgerm/commits/03a542314ce9736ec5a0faa8f0ee42243395e56f))
-- title 文案修复 ([ed69177](https://git.yljt.cn:522/web-module/yl_dgerm/commits/ed69177cc96b63bc7a3bdeff483aa5a946f285dd))