@fle-ui/plus-table 1.2.28-beta.1 → 1.2.30-beta.0

package/es/utils/common.d.ts

@@ -7,16 +7,6 @@ interface ShowMoneyType {
     (data: moneyType): string;
 }
 export declare const showMoney: ShowMoneyType;
-/**
- * 时间格式化
- * @param data
- * @param fmtType
- */
-type timeType = Date | number | string;
-interface ShowTimeType {
-    (data: timeType, fmtType: string): string;
-}
-export declare const showTime: ShowTimeType;
 /**
  * 格式化url参数
  */

package/es/utils/common.js

@@ -1,14 +1,9 @@
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
 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); }
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
-import dayjs from 'dayjs';
 export var showMoney = function showMoney(data) {
   return (+data / 100).toFixed(2);
 };
-export var showTime = function showTime(data) {
-  var fmtType = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'YYYY-MM-DD HH:mm:ss';
-  return data ? dayjs(data).format(fmtType) : '';
-};
 /**
  * 格式化url参数
  */

package/lib/{FormSearch → components/FormSearch}/FormRender.d.ts

@@ -1,4 +1,4 @@
-import type { BaseQueryFilterProps, ProFormInstance, ProFormProps } from '@ant-design/pro-form';
+import type { BaseQueryFilterProps, ProFormInstance, ProFormProps } from '@ant-design/pro-components';
 import type { ProSchemaComponentTypes } from '@ant-design/pro-utils';
 import type { FormItemProps } from 'antd';
 import React from 'react';

package/lib/{FormSearch → components/FormSearch}/FormRender.js

@@ -4,8 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _proForm = require("@ant-design/pro-form");
-var _proProvider = require("@ant-design/pro-provider");
+var _proComponents = require("@ant-design/pro-components");
 var _antd = require("antd");
 var _classnames = _interopRequireDefault(require("classnames"));
 var _omit = _interopRequireDefault(require("omit.js"));
@@ -106,7 +105,7 @@ var FormRender = function FormRender(_ref) {
     searchConfig = _ref.search,
     formConfig = _ref.form,
     bordered = _ref.bordered;
-  var _useContext = (0, _react.useContext)(_proProvider.ProProvider),
+  var _useContext = (0, _react.useContext)(_proComponents.ProProvider),
     hashId = _useContext.hashId;
   var isForm = type === 'form';
   /** 提交表单，根据两种模式不同，方法不相同 */
@@ -173,7 +172,7 @@ var FormRender = function FormRender(_ref) {
   }, [submitButtonLoading]);
   return /*#__PURE__*/_react.default.createElement("div", {
     className: (0, _classnames.default)(hashId, _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, getPrefixCls('pro-card'), true), "".concat(getPrefixCls('pro-card'), "-border"), !!bordered), "".concat(getPrefixCls('pro-card'), "-bordered"), !!bordered), "".concat(getPrefixCls('pro-card'), "-ghost"), !!ghost), className, true), formClassName, isForm), getPrefixCls("pro-table-search-".concat(toLowerLine(competentName))), true), "".concat(className, "-ghost"), ghost), searchConfig === null || searchConfig === void 0 ? void 0 : searchConfig.className, searchConfig !== false && (searchConfig === null || searchConfig === void 0 ? void 0 : searchConfig.className)))
-  }, /*#__PURE__*/_react.default.createElement(_proForm.BetaSchemaForm, _extends({
+  }, /*#__PURE__*/_react.default.createElement(_proComponents.BetaSchemaForm, _extends({
     layoutType: competentName,
     columns: columnsList,
     type: type

package/lib/{FormSearch → components/FormSearch}/index.js

@@ -175,14 +175,6 @@ var FormSearch = /*#__PURE__*/function (_React$Component) {
         search: search,
         form: _objectSpread(_objectSpread({
           onValuesChange: function onValuesChange(changeValue, allValue) {
-            for (var key in changeValue) {
-              if (Object.hasOwn(changeValue, key)) {
-                if (!changeValue[key]) {
-                  changeValue[key] = undefined;
-                  allValue[key] = undefined;
-                }
-              }
-            }
             _this.props.changeValue(changeValue, allValue);
           },
           autoFocusFirstInput: false

package/lib/{FormSearch → components/FormSearch}/index.less

@@ -3,9 +3,6 @@
   ::-webkit-scrollbar {
     width: 2px;
   }
-  // .ant-tree-checkbox-checked
-  // .ant-tree-checkbox-disabled
-  // pointer-events: none;
   .ant-pro-query-filter-row {
     row-gap: 12px;
   }
@@ -56,4 +53,9 @@
   &.turn-left {
     width: calc(100% - 356px);
   }
+
+  // antd tree 的虚拟滚动有问题，无法滚动到底部，这里强制使用原生滚动
+  .ant-tree.ant-tree-block-node .ant-tree-list-holder-inner {
+    transform: none !important;
+  }
 }

package/lib/index.d.ts

@@ -1,11 +1,11 @@
 import React from 'react';
 import type { ProTableProps, ProColumns } from '@ant-design/pro-components';
-import './FormSearch/index.less';
+import './components/FormSearch/index.less';
 interface PlusColumns extends ProColumns {
     baseSearch?: boolean;
 }
 export type { PlusColumns };
-export type settingsColumns = {
+export type SettingsColumns = {
     [key: string]: {
         hideInTable?: boolean;
         show?: boolean;
@@ -21,7 +21,7 @@ interface PlusTableProps<DataSource, U, ValueType> extends Omit<ProTableProps<Da
     columns: PlusColumns[];
     top?: number;
     fetchSetting?: () => Promise<Record<string, any>>;
-    updateSetting?: (params: settingsColumns) => void;
+    updateSetting?: (params: SettingsColumns) => void;
     resetSetting?: () => Promise<{
         success: boolean;
     }>;
@@ -34,6 +34,7 @@ interface PlusTableProps<DataSource, U, ValueType> extends Omit<ProTableProps<Da
     };
     hasShowFull?: boolean;
     getContainer?: string | HTMLElement | (() => HTMLElement) | false;
+    defaultShowFull?: boolean;
 }
 interface PlusTableRef {
     getFieldsValue: () => Promise<any>;