antd-management-fast-framework 1.1.74 → 1.2.5

package/es/framework/DataListView/Base/index.less

@@ -1,5 +1,4 @@
 @import '~antd/lib/style/themes/default.less';
-
 @import '../../../utils/utils.less';
 
 @media screen and (min-width: @screen-lg) {
@@ -139,6 +138,14 @@
   }
 }
 
+.tableContainor {
+  :global {
+    .ant-table-expanded-row .ant-card {
+      box-shadow: 0 2px 12px 2px #aaa;
+    }
+  }
+}
+
 :global {
   .ant-page-header-heading-title {
     font-size: 16px;

package/es/framework/DataListView/DensityAction/index.js

@@ -27,7 +27,7 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _icons = require("@ant-design/icons");
 
-var _StandardTableCustom = require("../../../customComponents/StandardTableCustom");
+var _constants = require("../../../utils/constants");
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
@@ -86,11 +86,11 @@ var DensityAction = /*#__PURE__*/function (_PureComponent) {
             width: 80
           }
         }, /*#__PURE__*/_react["default"].createElement(_menu["default"].Item, {
-          key: _StandardTableCustom.tableSizeConfig.small
+          key: _constants.listViewConfig.tableSize.small
         }, "\u7D27\u51D1"), /*#__PURE__*/_react["default"].createElement(_menu["default"].Item, {
-          key: _StandardTableCustom.tableSizeConfig.middle
+          key: _constants.listViewConfig.tableSize.middle
         }, "\u4E2D\u7B49"), /*#__PURE__*/_react["default"].createElement(_menu["default"].Item, {
-          key: _StandardTableCustom.tableSizeConfig.large
+          key: _constants.listViewConfig.tableSize.large
         }, "\u5BBD\u677E"))
       }, /*#__PURE__*/_react["default"].createElement(_tooltip["default"], {
         title: "\u8868\u683C\u5BC6\u5EA6"

package/es/framework/DataMenuContainer/index.d.ts

@@ -2,7 +2,7 @@ export default DataMenuContainer;
 declare class DataMenuContainer extends AuthorizationWrapper {
     constructor(props: any);
     loadDataAfterMount: boolean;
-    needSetFormValueAfterLoad: boolean;
+    resetDataAfterLoad: boolean;
     menuList: any[];
     state: any;
     beforeDidMount: () => void;

package/es/framework/DataMenuContainer/index.js

@@ -65,7 +65,7 @@ var DataMenuContainer = /*#__PURE__*/function (_AuthorizationWrapper) {
 
     _this = _super.call(this, props);
     _this.loadDataAfterMount = false;
-    _this.needSetFormValueAfterLoad = false;
+    _this.resetDataAfterLoad = false;
     _this.menuList = [];
 
     _this.beforeDidMount = function () {

package/es/framework/DataModal/Base/index.d.ts

@@ -24,7 +24,7 @@ declare class Base extends BaseWindow {
         externalData: null;
     };
     buildFormLayout: () => string;
-    buildOtherFormProps: () => {
+    buildFormAdditionalConfig: () => {
         labelCol: {
             span: number;
         };
@@ -34,8 +34,8 @@ declare class Base extends BaseWindow {
     };
     renderFormWrapper: () => JSX.Element;
     renderForm: () => JSX.Element;
-    formContentConfigData: () => null;
-    buildWrapperTypeConfig: () => {
+    establishCardCollectionConfig: () => null;
+    establishWrapperTypeConfig: () => {
         mode: string;
     };
     formContent: () => any;

package/es/framework/DataModal/Base/index.js

@@ -86,7 +86,7 @@ var Base = /*#__PURE__*/function (_BaseWindow) {
       return 'horizontal';
     };
 
-    _this.buildOtherFormProps = function () {
+    _this.buildFormAdditionalConfig = function () {
       return {
         labelCol: {
           span: 7
@@ -115,7 +115,7 @@ var Base = /*#__PURE__*/function (_BaseWindow) {
         metaOriginalData: metaOriginalData
       });
 
-      var otherFormProps = _this.buildOtherFormProps();
+      var otherFormProps = _this.buildFormAdditionalConfig();
 
       return /*#__PURE__*/_react["default"].createElement(_form["default"], _extends({
         ref: _this.formRef,
@@ -125,18 +125,18 @@ var Base = /*#__PURE__*/function (_BaseWindow) {
       }, otherFormProps), _this.formContent());
     };
 
-    _this.formContentConfigData = function () {
+    _this.establishCardCollectionConfig = function () {
       return null;
     };
 
-    _this.buildWrapperTypeConfig = function () {
+    _this.establishWrapperTypeConfig = function () {
       return {
-        mode: _constants.formContentConfig.wrapperType.model
+        mode: _constants.cardConfig.wrapperType.model
       };
     };
 
     _this.formContent = function () {
-      return _this.buildFormContent(_this.formContentConfigData());
+      return _this.buildCardCollection(_this.establishCardCollectionConfig());
     };
 
     _this.renderModalInner = function () {

package/es/framework/DataModal/BaseNeedlessLoadModal/index.d.ts

@@ -5,6 +5,6 @@ declare class BaseAddModal extends Base {
         needReset: boolean;
         externalData: any;
     };
-    fillFormDefaultInitialValues: () => {};
+    fillDefaultInitialValues: () => {};
 }
 import Base from "../Base";

package/es/framework/DataModal/BaseNeedlessLoadModal/index.js

@@ -53,7 +53,7 @@ var BaseAddModal = /*#__PURE__*/function (_Base) {
 
     _this = _super.call(this, props);
     _this.reloadWhenShow = false;
-    _this.needSetFormValueAfterLoad = false;
+    _this.resetDataAfterLoad = false;
 
     _this.doWorkWhenDidUpdate = function (preProps, preState, snapshot) {
       var visiblePre = preState.visible;
@@ -91,10 +91,10 @@ var BaseAddModal = /*#__PURE__*/function (_Base) {
     };
 
     _this.buildInitialValues = function () {
-      return _this.fillFormDefaultInitialValues();
+      return _this.fillDefaultInitialValues();
     };
 
-    _this.fillFormDefaultInitialValues = function () {
+    _this.fillDefaultInitialValues = function () {
       var initialValues = {};
       initialValues[_constants.formNameCollection.createTime.name] = (0, _tools.formatDatetime)(new Date(), _constants.datetimeFormat.yearMonthDayHourMinute);
       return initialValues;

package/es/framework/DataModal/BaseUpdateTransferModal/index.js

@@ -109,7 +109,7 @@ var BaseUpdateTransferModal = /*#__PURE__*/function (_BaseUpdateModal) {
       throw new Error('buildItem need overload');
     };
 
-    _this.formContentConfigData = function () {
+    _this.establishCardCollectionConfig = function () {
       var _this$state = _this.state,
           dataLoading = _this$state.dataLoading,
           processing = _this$state.processing,
@@ -120,7 +120,7 @@ var BaseUpdateTransferModal = /*#__PURE__*/function (_BaseUpdateModal) {
           spinning: dataLoading || processing,
           items: [{
             lg: 24,
-            type: _constants.formContentConfig.contentItemType.component,
+            type: _constants.cardConfig.contentItemType.component,
             component: /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement(_transfer["default"], {
               listStyle: {
                 width: 312

package/es/framework/DataMultiPageView/MultiPage/index.d.ts

@@ -17,8 +17,8 @@ declare class MultiPage extends Base {
     adjustRenderLoadRequestParamsWithKey: (d: any) => void;
     afterGetRequestResult: () => void;
     handleStandardTableChange: (pagination: any, filtersArg: any, sorter: any) => void;
+    handlePaginationChange: (page: any, pageSize: any) => void;
     handleListViewPaginationChange: (page: any, pageSize: any) => void;
-    renderTableView: () => JSX.Element;
-    renderView: () => JSX.Element | null;
+    handlePaginationShowSizeChange: (current: any, size: any) => void;
 }
 import Base from "../../DataListView/Base";

package/es/framework/DataMultiPageView/MultiPage/index.js

@@ -7,21 +7,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = void 0;
 
-require("antd/es/tooltip/style");
+require("antd/es/pagination/style");
 
-var _tooltip = _interopRequireDefault(require("antd/es/tooltip"));
-
-require("antd/es/button/style");
-
-var _button = _interopRequireDefault(require("antd/es/button"));
-
-require("antd/es/spin/style");
-
-var _spin = _interopRequireDefault(require("antd/es/spin"));
-
-require("antd/es/list/style");
-
-var _list = _interopRequireDefault(require("antd/es/list"));
+var _pagination2 = _interopRequireDefault(require("antd/es/pagination"));
 
 require("antd/es/message/style");
 
@@ -29,26 +17,18 @@ var _message2 = _interopRequireDefault(require("antd/es/message"));
 
 var _react = _interopRequireDefault(require("react"));
 
-var _icons = require("@ant-design/icons");
-
 var _tools = require("../../../utils/tools");
 
-var _constants = require("../../../utils/constants");
-
 var _globalStorageAssist = require("../../../utils/globalStorageAssist");
 
-var _Base2 = _interopRequireDefault(require("../../DataListView/Base"));
-
-var _DensityAction = _interopRequireDefault(require("../../DataListView/DensityAction"));
+var _FlexBox = _interopRequireDefault(require("../../../customComponents/FlexBox"));
 
-var _ColumnSetting = _interopRequireDefault(require("../../DataListView/ColumnSetting"));
-
-var _StandardTableCustom = _interopRequireDefault(require("../../../customComponents/StandardTableCustom"));
-
-var _index = _interopRequireDefault(require("./index.less"));
+var _Base2 = _interopRequireDefault(require("../../DataListView/Base"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
+function _extends() { _extends = Object.assign || 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 ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
@@ -85,7 +65,7 @@ var MultiPage = /*#__PURE__*/function (_Base) {
     _this.lastLoadParams = null;
     _this.useParamsKey = true;
 
-    _this.handleFormReset = function () {
+    _this.handleSearchReset = function () {
       var checkWorkDoing = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : true;
 
       if (checkWorkDoing) {
@@ -94,12 +74,12 @@ var MultiPage = /*#__PURE__*/function (_Base) {
         }
       }
 
-      var form = _this.getSearchForm();
+      var form = _this.getSearchCard();
 
       var pageSize = _this.state.pageSize;
       form.resetFields();
 
-      _this.handleFormOtherReset();
+      _this.handleAdditionalSearchReset();
 
       _this.setState({
         formValues: {},
@@ -181,7 +161,7 @@ var MultiPage = /*#__PURE__*/function (_Base) {
     };
 
     _this.afterGetFirstRequestResult = function (submitData, responseData) {
-      var form = _this.getSearchForm();
+      var form = _this.getSearchCard();
 
       var urlParams = _this.state.urlParams;
       var pageKey = 'no';
@@ -227,7 +207,7 @@ var MultiPage = /*#__PURE__*/function (_Base) {
         return;
       }
 
-      var form = _this.getSearchForm();
+      var form = _this.getSearchCard();
 
       var validateFields = form.validateFields;
       var pageSize = _this.state.pageSize;
@@ -300,6 +280,13 @@ var MultiPage = /*#__PURE__*/function (_Base) {
       _this.pageListData(params);
     };
 
+    _this.handlePaginationChange = function (page, pageSize) {
+      _this.handleStandardTableChange({
+        current: page,
+        pageSize: pageSize
+      }, {}, {});
+    };
+
     _this.handleListViewPaginationChange = function (page, pageSize) {
       if (_this.checkWorkDoing()) {
         return;
@@ -315,157 +302,73 @@ var MultiPage = /*#__PURE__*/function (_Base) {
       _this.pageListData(params);
     };
 
-    _this.renderTableView = function () {
-      var _this$state3 = _this.state,
-          tableScroll = _this$state3.tableScroll,
-          showSelect = _this$state3.showSelect,
-          selectedDataTableDataRows = _this$state3.selectedDataTableDataRows,
-          metaOriginalData = _this$state3.metaOriginalData,
-          dataLoading = _this$state3.dataLoading,
-          processing = _this$state3.processing;
-
-      var _this$buildTableConfi = _this.buildTableConfig(),
-          styleSet = _this$buildTableConfi.styleSet,
-          columns = _this$buildTableConfi.columns,
-          expandable = _this$buildTableConfi.expandable,
-          size = _this$buildTableConfi.size;
-
-      var standardTableCustomOption = {
-        loading: dataLoading || processing,
-        data: metaOriginalData || {
-          list: [],
-          pagination: {}
-        },
-        showSelect: showSelect,
-        selectedRows: selectedDataTableDataRows,
-        columns: columns,
-        size: size,
-        onSelectRow: _this.handleSelectRows,
-        onChange: _this.handleStandardTableChange
-      };
+    _this.handlePaginationShowSizeChange = function (current, size) {
+      _this.setState({
+        pageNo: 1
+      });
 
-      if ((styleSet || null) != null) {
-        standardTableCustomOption.style = styleSet;
-      }
+      _this.handleStandardTableChange({
+        current: 1,
+        pageSize: size
+      }, {}, {});
+    };
 
-      if ((tableScroll || null) != null) {
-        standardTableCustomOption.scroll = tableScroll;
-      }
+    _this.establishViewDataSource = function () {
+      var metaOriginalData = _this.state.metaOriginalData;
 
-      standardTableCustomOption.expandable = _objectSpread(_objectSpread({}, {}), expandable || {});
-      return /*#__PURE__*/_react["default"].createElement("div", {
-        className: _index["default"].tableContainor
-      }, /*#__PURE__*/_react["default"].createElement(_StandardTableCustom["default"], standardTableCustomOption));
+      var _list = _objectSpread(_objectSpread({}, {
+        list: []
+      }), metaOriginalData || {}),
+          list = _list.list;
+
+      return list;
     };
 
-    _this.renderListView = function () {
-      var _this$state4 = _this.state,
-          metaOriginalData = _this$state4.metaOriginalData,
-          dataLoading = _this$state4.dataLoading,
-          reloading = _this$state4.reloading,
-          processing = _this$state4.processing;
+    _this.establishViewPaginationConfig = function () {
+      var metaOriginalData = _this.state.metaOriginalData;
 
-      var _ref = metaOriginalData || {
-        list: [],
+      var _pagination = _objectSpread(_objectSpread({}, {
         pagination: {}
-      },
-          list = _ref.list,
-          pagination = _ref.pagination;
+      }), metaOriginalData || {}),
+          pagination = _pagination.pagination;
 
       var paginationConfig = _objectSpread({}, pagination);
 
       paginationConfig.onChange = _this.handleListViewPaginationChange;
-      return /*#__PURE__*/_react["default"].createElement(_spin["default"], {
-        spinning: dataLoading || reloading || processing
-      }, /*#__PURE__*/_react["default"].createElement(_list["default"], {
-        itemLayout: _this.renderListViewItemLayout(),
-        size: _this.renderListViewSize(),
-        dataSource: list,
-        pagination: paginationConfig,
-        renderItem: function renderItem(item, index) {
-          return _this.renderListViewItem(item, index);
-        }
-      }));
+      return paginationConfig;
     };
 
-    _this.renderView = function () {
-      var _this$state5 = _this.state,
-          showSelect = _this$state5.showSelect,
-          listViewMode = _this$state5.listViewMode;
-
-      if (listViewMode === _constants.listViewModeCollection.table) {
-        return _this.renderTableView();
-      }
-
-      if (listViewMode === _constants.listViewModeCollection.list) {
-        if (showSelect) {
-          var _text2 = 'MultiListView显示模式下不支持选择';
-          (0, _tools.showRuntimeError)({
-            message: _text2
-          });
-        }
-
-        return _this.renderListView();
-      }
+    _this.renderPaginationView = function () {
+      var _this$state3 = _this.state,
+          pageNo = _this$state3.pageNo,
+          pageSize = _this$state3.pageSize;
 
-      var text = '未知的显示模式';
-      (0, _tools.showRuntimeError)({
-        message: text
-      });
-      return null;
-    };
+      var paginationConfig = _this.establishViewPaginationConfig();
 
-    _this.renderCardExtraAction = function () {
-      var _this$state6 = _this.state,
-          listViewMode = _this$state6.listViewMode,
-          tableSize = _this$state6.tableSize,
-          refreshing = _this$state6.refreshing;
-
-      if (listViewMode === _constants.listViewModeCollection.table) {
-        return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_DensityAction["default"], {
-          tableSize: tableSize,
-          setTableSize: function setTableSize(key) {
-            _this.setTableSize(key);
-          }
-        }), /*#__PURE__*/_react["default"].createElement(_tooltip["default"], {
-          title: "\u5237\u65B0\u672C\u9875"
-        }, /*#__PURE__*/_react["default"].createElement(_button["default"], {
-          shape: "circle",
-          style: {
-            color: '#000',
-            border: 0
-          },
-          loading: refreshing,
-          icon: /*#__PURE__*/_react["default"].createElement(_icons.ReloadOutlined, null),
-          onClick: function onClick() {
-            _this.refreshData();
+      paginationConfig.onChange = _this.handleListViewPaginationChange;
+      return /*#__PURE__*/_react["default"].createElement(_FlexBox["default"], {
+        style: {
+          paddingTop: 16,
+          paddingBottom: 16
+        },
+        right: /*#__PURE__*/_react["default"].createElement(_pagination2["default"], _extends({
+          current: pageNo,
+          pageSize: pageSize,
+          size: "small",
+          showSizeChanger: true,
+          showQuickJumper: true,
+          showTotal: function showTotal(total) {
+            return "\u5171 ".concat(total, " \u6761\u4FE1\u606F");
           }
-        })), /*#__PURE__*/_react["default"].createElement(_ColumnSetting["default"], {
-          columns: _this.getColumn(),
-          columnsMap: _this.getColumnsMap(),
-          setColumnsMap: function setColumnsMap(e) {
-            _this.setColumnsMap(e);
+        }, paginationConfig, {
+          onChange: function onChange(page, size) {
+            _this.handlePaginationChange(page, size);
           },
-          setSortKeyColumns: function setSortKeyColumns(key) {
-            _this.setSortKeyColumns(key);
+          onShowSizeChange: function onShowSizeChange(current, size) {
+            _this.handlePaginationShowSizeChange(current, size);
           }
-        }));
-      }
-
-      return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_tooltip["default"], {
-        title: "\u5237\u65B0\u672C\u9875"
-      }, /*#__PURE__*/_react["default"].createElement(_button["default"], {
-        shape: "circle",
-        style: {
-          color: '#000',
-          border: 0
-        },
-        loading: refreshing,
-        icon: /*#__PURE__*/_react["default"].createElement(_icons.ReloadOutlined, null),
-        onClick: function onClick() {
-          _this.refreshData();
-        }
-      })));
+        }))
+      });
     };
 
     var defaultState = (0, _tools.defaultPageListState)();

package/es/framework/DataMultiPageView/MultiPageDrawer/index.d.ts

@@ -5,7 +5,7 @@ declare class MultiPageDrawer extends MultiPage {
         externalData: any;
     };
     loadDataAfterMount: boolean;
-    needSetFormValueAfterLoad: boolean;
+    resetDataAfterLoad: boolean;
     reloadWhenShow: boolean;
     doWorkWhenDidUpdate: (preProps: any, preState: any, snapshot: any) => void;
     doOtherWhenChangeVisible: (preProps: any, preState: any, snapshot: any) => void;
@@ -14,9 +14,7 @@ declare class MultiPageDrawer extends MultiPage {
     renderTitleIcon: () => JSX.Element;
     hideDrawer: () => void;
     selectRecord: (e: any, record: any) => void;
-    onPaginationChange: (page: any, pageSize: any) => void;
-    onPaginationShowSizeChange: (current: any, size: any) => void;
-    buildWrapperTypeConfig: () => {
+    establishWrapperTypeConfig: () => {
         mode: string;
     };
     renderViewContainor: () => JSX.Element;