@yilianjituan/yilian_dgerm 1.0.4 → 1.0.5

package/dist/components/DateTimePicker/index.js

@@ -2,10 +2,11 @@ var _excluded = ["type", "tlTimeLimit", "format"];
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
-import React from 'react';
-import { DatePicker, TimePicker } from "antd";
+import { DatePicker, TimePicker } from 'antd';
 import dayjs from 'dayjs';
+import React from 'react';
 var RangePicker = DatePicker.RangePicker;
+
 // 基于antd，具体参照antd
 var Index = function Index(props) {
   var _props$type = props.type,

package/dist/components/FileUpload/index.d.ts

@@ -1,5 +1,5 @@
-import React from "react";
-import './index.scss';
+import React from 'react';
 import { IProps } from './index.interface';
+import './index.scss';
 declare const Index: React.FC<IProps>;
 export default Index;

package/dist/components/FileUpload/index.interface.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="react" />
-import { FormItemProps, UploadProps } from "antd";
+import { FormItemProps, UploadProps } from 'antd';
 export interface IProps {
     /**
      * @description 阿里云上传实例和配置

package/dist/components/FileUpload/index.js

@@ -22,13 +22,13 @@ function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" !=
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
-import { CloseOutlined, DeleteOutlined, PlusOutlined } from "@ant-design/icons";
+import { CloseOutlined, DeleteOutlined, PlusOutlined } from '@ant-design/icons';
 import { useUpdateEffect } from 'ahooks';
-import { Form, Image, message, Tooltip, Upload } from "antd";
-import heic2any from "heic2any";
-import React, { useEffect, useState } from "react";
-import "./index.scss";
+import { Form, Image, message, Tooltip, Upload } from 'antd';
+import heic2any from 'heic2any';
+import React, { useEffect, useState } from 'react';
 import { acceptListTypes, acceptTypes, dataChange, documentExtensions, fileChange, fileExtensions, imageListChange, videoFormats } from "./fileUtil";
+import "./index.scss";
 var AliyunOSSUpload = function AliyunOSSUpload(props) {
   var value = props.value,
     formOnChange = props.onChange,
@@ -208,7 +208,7 @@ var AliyunOSSUpload = function AliyunOSSUpload(props) {
               _context.next = 32;
               break;
             }
-            message.error("上传失败");
+            message.error('上传失败');
             event === null || event === void 0 || event.onError({
               errorMessage: '上传失败',
               uploadStatus: 'error'
@@ -251,7 +251,7 @@ var AliyunOSSUpload = function AliyunOSSUpload(props) {
         }).then(function (blob) {
           return heic2any({
             blob: blob,
-            toType: "image/jpeg",
+            toType: 'image/jpeg',
             quality: 0.5 // cuts the quality and size by half
           });
         }).then(function (conversionResult) {
@@ -295,7 +295,7 @@ var AliyunOSSUpload = function AliyunOSSUpload(props) {
         onClick: function onClick() {
           return actions.remove(file);
         }
-      }, /*#__PURE__*/React.createElement(DeleteOutlined, null), " "), originNode) : /*#__PURE__*/React.createElement(Tooltip, {
+      }, /*#__PURE__*/React.createElement(DeleteOutlined, null), ' '), originNode) : /*#__PURE__*/React.createElement(Tooltip, {
         title: (file === null || file === void 0 ? void 0 : file.name) || ''
       }, " ", originNode, " "));
     },
@@ -303,11 +303,11 @@ var AliyunOSSUpload = function AliyunOSSUpload(props) {
     onChange: onChange,
     fileList: fileList
   }, otherUploadProps);
-  return /*#__PURE__*/React.createElement(Upload, uploadProp, fileList.length < maxCount && /*#__PURE__*/React.createElement("div", null, uploadButton || /*#__PURE__*/React.createElement(React.Fragment, null, " ", /*#__PURE__*/React.createElement(PlusOutlined, null), " ", /*#__PURE__*/React.createElement("div", {
+  return /*#__PURE__*/React.createElement(Upload, uploadProp, fileList.length < maxCount && /*#__PURE__*/React.createElement("div", null, uploadButton || /*#__PURE__*/React.createElement(React.Fragment, null, ' ', /*#__PURE__*/React.createElement(PlusOutlined, null), " ", /*#__PURE__*/React.createElement("div", {
     style: {
       marginTop: 8
     }
-  }, "\u4E0A\u4F20"), " ")));
+  }, "\u4E0A\u4F20"), ' ')));
 };
 var Index = function Index(props) {
   var formProps = props.formProps,

package/dist/components/PageTemplate/index.interface.d.ts

@@ -1,5 +1,5 @@
-import { MethodEnum } from "../../commonType/globalEnum";
-import { ReactNode } from "react";
+import { ReactNode } from 'react';
+import { MethodEnum } from '../../commonType/globalEnum';
 export interface IPageTemPropsData {
     http: any;
     ref?: any;
@@ -21,6 +21,7 @@ export interface IPageTemPropsData {
     afterRequest?: typeEmptyFunc;
     afterReset?: typeEmptyFunc;
     beforeSearch?: typeEmptyFunc;
+    afterExport?: typeEmptyFunc;
     beforeExport?: typeEmptyFunc;
     afterErrorRequest?: typeEmptyFunc;
     columns: IColumnsProps[];
@@ -38,7 +39,7 @@ export interface IColumnsProps {
     title: string;
     dataIndex?: string;
     render?: typeEmptyFunc | ((text: string | number, record: any, index: string | number) => any);
-    [name: string]: typeEmptyFunc | string | boolean | undefined | number;
+    [name: string]: typeEmptyFunc | string | boolean | undefined | number | any;
 }
 export interface IFilterProps {
     component: string | Element | ReactNode;

package/dist/components/PageTemplate/index.js

@@ -34,10 +34,10 @@ import ExportExcels from "../ExportExcels";
 import FilterRadio from "../FilterRadio";
 import SelectMax from "../SelectMax";
 import "./index.scss";
-import { mergedColumns, ResizableTitle } from "./resizable";
 var FormItem = Form.Item;
 var RangePicker = DatePicker.RangePicker;
 var PageTemplate = function PageTemplate(props, ref) {
+  var _document$querySelect3;
   var _Form$useForm = Form.useForm(),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     form = _Form$useForm2[0];
@@ -61,6 +61,7 @@ var PageTemplate = function PageTemplate(props, ref) {
     _useState2 = _slicedToArray(_useState, 2),
     dataSource = _useState2[0],
     setDataSource = _useState2[1];
+  var dataSourceRef = useRef([]);
   var _useState3 = useState(false),
     _useState4 = _slicedToArray(_useState3, 2),
     tableLoading = _useState4[0],
@@ -69,7 +70,7 @@ var PageTemplate = function PageTemplate(props, ref) {
     _useState6 = _slicedToArray(_useState5, 2),
     total = _useState6[0],
     setTotal = _useState6[1]; // 总数
-  var pageSizeRef = useRef(10); //每页条数
+  var pageSizeRef = useRef(20); //每页条数
   var _useState7 = useState(1),
     _useState8 = _slicedToArray(_useState7, 2),
     current = _useState8[0],
@@ -92,7 +93,17 @@ var PageTemplate = function PageTemplate(props, ref) {
     additionalExport = _useState16[0],
     setAdditionalExport = _useState16[1]; // 额外的按钮
   var tableRef = useRef(null); // 引用 Table 外层容器
-
+  var _useState17 = useState(null),
+    _useState18 = _slicedToArray(_useState17, 2),
+    tableHeight = _useState18[0],
+    setTableHeight = _useState18[1];
+  useEffect(function () {
+    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]);
   useImperativeHandle(ref, function () {
     return {
       onSearch: function onSearch(param) {
@@ -125,29 +136,41 @@ var PageTemplate = function PageTemplate(props, ref) {
     var _props$searchOnLoad = props.searchOnLoad,
       searchOnLoad = _props$searchOnLoad === void 0 ? true : _props$searchOnLoad,
       pageSize = props.pageSize;
-    pageSizeRef.current = pageSize || 10;
+    pageSizeRef.current = pageSize || 20;
     if (searchOnLoad) {
       _onSearch(1);
     }
   }, [props.url && props.url.url]);
   useEffect(function () {
+    if (!props.columns) return;
+    var _columns = _toConsumableArray(props.columns);
     if (addNo) {
       // 默认添加序号
       var initColumn = {
         title: '序号',
         dataIndex: '',
         key: 'rowIndex',
-        width: 70,
         align: 'center',
         fixed: 'left',
+        minWidth: 70,
+        ellipsis: {
+          showTitle: false
+        },
         render: function render(_, __, index) {
           return (current - 1) * pageSizeRef.current + index + 1;
         }
       };
-      setColumns([initColumn].concat(_toConsumableArray(props.columns)));
-      return;
+      _columns = [initColumn].concat(_toConsumableArray(_columns));
     }
-    setColumns(props.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)
+      });
+    });
+    setColumns(_columns);
   }, [props.columns, current, pageSizeRef.current]);
   var _onSearch = function _onSearch() {
     var current = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 1;
@@ -205,9 +228,10 @@ var PageTemplate = function PageTemplate(props, ref) {
                   result = _context.sent;
                   _ref3 = result || {}, totalElements = _ref3.totalElements, content = _ref3.content;
                   setDataSource(content || []);
+                  dataSourceRef.current = content || [];
                   setTotal(totalElements || '');
                   setCurrent(current);
-                case 7:
+                case 8:
                 case "end":
                   return _context.stop();
               }
@@ -318,15 +342,22 @@ var PageTemplate = function PageTemplate(props, ref) {
    * 导出
    */
   var exportList = function exportList() {
-    if (dataSource.length === 0) {
-      message.error('暂无数据，无法导出！');
-      return;
-    }
-    setIsSpinLoading(true);
     _onSearch();
-
-    // 需要等待搜索结束
     setTimeout(function () {
+      var _props$afterExport = props.afterExport,
+        afterExport = _props$afterExport === void 0 ? function (val) {
+          return val;
+        } : _props$afterExport;
+      if (dataSourceRef.current.length === 0) {
+        message.error('暂无数据，无法导出！');
+        return;
+      }
+      var params = form.getFieldsValue();
+      paramsRef.current = afterExport(_objectSpread(_objectSpread({}, paramsRef.current), params));
+      if (!paramsRef.current) return;
+      setIsSpinLoading(true);
+
+      // 需要等待搜索结束
       exportApi(paramsRef.current).then(function (item) {
         if (item.status === 200) {
           exportCompile(item);
@@ -408,7 +439,7 @@ var PageTemplate = function PageTemplate(props, ref) {
       onChange: _onSearch,
       current: current,
       total: total,
-      pageSizeOptions: ['10', '50', '200', '1000'],
+      pageSizeOptions: ['20', '50', '200', '1000'],
       showSizeChanger: true,
       showQuickJumper: true,
       onShowSizeChange: onShowSizeChange
@@ -418,21 +449,20 @@ var PageTemplate = function PageTemplate(props, ref) {
     style: {
       marginTop: 10
     },
-    scroll: isScroll ? {
-      x: 1200
-    } : {},
+    scroll: {
+      x: 1500,
+      y: tableHeight || undefined
+    },
     bordered: true,
-    dataSource: dataSource
+    dataSource: dataSource,
+    size: "small"
   }, tableProps, {
-    tableLayout: (tableProps === null || tableProps === void 0 ? void 0 : tableProps.tableLayout) || 'auto',
-    components: {
-      header: {
-        cell: ResizableTitle
-      }
-    },
-    columns: mergedColumns(columns, tableRef, function (_columns) {
-      return setColumns(_columns);
-    })
+    columns: columns,
+    tableLayout: (tableProps === null || tableProps === void 0 ? void 0 : tableProps.tableLayout) || 'auto'
+    // components={{ header: { cell: ResizableTitle } }}
+    // columns={mergedColumns(columns, tableRef, (_columns) =>
+    //   setColumns(_columns),
+    // )}
   }))), isSpinLoading && /*#__PURE__*/React.createElement(ExportExcels, exportProps));
 };
 export default /*#__PURE__*/forwardRef(PageTemplate);

package/dist/components/PageTemplate/index.scss

@@ -105,4 +105,52 @@
   .radioInfos {
     margin-left: 10px;
   }
+}
+
+.page-template {
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+  overflow: hidden;
+
+  .page-template__content {
+    flex: 1;
+    display: flex;
+    overflow: hidden;
+    flex-direction: column;
+
+    .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;
+            }
+          }
+        }
+      }
+    }
+  }
 }