fix BUG2207190037关联记录表格分页

乔启韬
1 parent 202d7248
Showing 7 changed files with 47 additions and 70 deletions
es/core/RenderChildren/RenderList/VirtualList.js
es/core/RenderChildren/RenderList/index.js
es/core/RenderChildren/RenderList/list.css
lib/core/RenderChildren/RenderList/VirtualList.js
lib/core/RenderChildren/RenderList/index.js
lib/core/RenderChildren/RenderList/list.css
package.json
--- a/es/core/RenderChildren/RenderList/VirtualList.js
View file @ea4c3d0
+++ b/es/core/RenderChildren/RenderList/VirtualList.js
View file @ea4c3d0
@@ -76,8 +76,8 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
 /* eslint-disable jsx-a11y/anchor-is-valid */
 import React, { useEffect, useMemo, useRef, useState } from 'react';
 import Core from '../../index';
-var confirm = _Modal.confirm;
-import { useVT } from 'virtualizedtableforantd4';
+var confirm = _Modal.confirm; // import {useVT} from 'virtualizedtableforantd4';
+
 var BUTTON_ICONS_MAP = {
   ExportOutlined: /*#__PURE__*/React.createElement(_ExportOutlined, null),
   ImportOutlined: /*#__PURE__*/React.createElement(_ImportOutlined, null),
@@ -124,11 +124,10 @@ var VirtualList = function VirtualList(_ref) {
       fieldName = schema.fieldName,
       _schema$qxProps = schema.qxProps,
       qxProps = _schema$qxProps === void 0 ? {} : _schema$qxProps,
-      subformMode = schema.subformMode,
-      pageType = schema.pageType;
+      subformMode = schema.subformMode;
   var _props$scrollY = props.scrollY,
-      scrollY = _props$scrollY === void 0 ? 400 : _props$scrollY,
+      scrollY = _props$scrollY === void 0 ? 300 : _props$scrollY,
       _summary = props.summary,
       batchKey = props.batchKey,
       type = props.type,
@@ -139,18 +138,8 @@ var VirtualList = function VirtualList(_ref) {
       searchKey = props.searchKey,
       rowSelection = props.rowSelection,
       size = props.size,
-      rest = _objectWithoutProperties(props, _excluded);
+      rest = _objectWithoutProperties(props, _excluded); // const [vt, set_components] = useVT(() => ({scroll: {y: scrollY}}), []);
-  var _useVT = useVT(function () {
-    return {
-      scroll: {
-        y: scrollY
-      }
-    };
-  }, []),
-      _useVT2 = _slicedToArray(_useVT, 2),
-      vt = _useVT2[0],
-      set_components = _useVT2[1];
   var _useState = useState(''),
       _useState2 = _slicedToArray(_useState, 2),
@@ -190,6 +179,8 @@ var VirtualList = function VirtualList(_ref) {
   var newRowSelection = useMemo(function () {
     var _bar$buttons;
+    if (schema.isReadOnly) return null;
+
     var _rowSelection = _.cloneDeep(rowSelection); // 根据是否含有批量操作按钮，渲染表格是否可选择
@@ -210,7 +201,7 @@ var VirtualList = function VirtualList(_ref) {
     }
     return _rowSelection;
-  }, [rowSelection, selectedRowKeys, bar]);
+  }, [rowSelection, selectedRowKeys, bar, rowSelection]);
   useEffect(function () {
     displayList.forEach(function (item, index) {
       if (_typeof(item) === 'object') {
@@ -287,14 +278,14 @@ var VirtualList = function VirtualList(_ref) {
     return {
       total: dataSource.length,
       position: ['bottomRight'],
-      pageSize: 10,
+      pageSize: props.limit || 10,
       showTotal: function showTotal(total) {
         return handleTotal(total);
       },
       defaultCurrent: 1,
       size: 'default'
     };
-  }, [dataSource]);
+  }, [dataSource, props.limit]);
   var barButtons = useMemo(function () {
     var _barButtons = _.cloneDeep(bar.buttons || []); // 关联表的导入，先隐藏 TODO
@@ -331,7 +322,7 @@ var VirtualList = function VirtualList(_ref) {
       });
     }
-    if (props.originWidget === 'relSelector' && subformMode && type !== 'view') {
+    if (props.originWidget === 'relSelector' && subformMode && type === 'edit') {
       _barButtons.unshift({
         code: 'subformEdit',
         icon: 'EditOutlined',
@@ -419,12 +410,12 @@ var VirtualList = function VirtualList(_ref) {
       var column = ((_schema$props2 = schema.props) === null || _schema$props2 === void 0 ? void 0 : _schema$props2.column) || {};
       return {
         dataIndex: child,
-        width: column.width ? parseInt(column.width) : FIELD_LENGTH,
+        width: (column.width ? parseInt(column.width) : FIELD_LENGTH) + padding,
         align: column.align || 'left',
         fixed: column.fixed || props.fixed && index < props.fixed,
         title: /*#__PURE__*/React.createElement("div", {
           style: {
-            width: (column.width ? parseInt(column.width) : FIELD_LENGTH - padding) + "px"
+            width: (column.width ? parseInt(column.width) : FIELD_LENGTH) + "px"
           }
         }, schema.required ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("span", {
           className: "fr-label-required"
@@ -958,15 +949,13 @@ var VirtualList = function VirtualList(_ref) {
     scroll: {
       y: scrollY,
       x: '100%'
-    },
-    components: vt,
+    } // components={vt}
+    ,
     size: size || 'small',
     columns: columns,
     dataSource: dataSource,
-    pagination: pagination,
-    style: {
-      marginBottom: 25
-    },
+    pagination: pagination // style={{marginBottom: 25}}
+    ,
     rowSelection: newRowSelection,
     summary: function summary() {
       if (!_summary || Array.isArray(_summary) && !_summary.length) {
--- a/es/core/RenderChildren/RenderList/index.js
View file @ea4c3d0
+++ b/es/core/RenderChildren/RenderList/index.js
View file @ea4c3d0
@@ -175,6 +175,10 @@ var RenderList = function RenderList(_ref) {
     getFieldsProps: getFieldsProps
   };
+  if (renderWidget === 'listForMobile') {
+    return /*#__PURE__*/React.createElement(ListForMobile, displayProps);
+  }
+
   switch (renderWidget) {
     case 'list0':
     case 'cardList':
@@ -195,9 +199,8 @@ var RenderList = function RenderList(_ref) {
     case 'list4':
     case 'virtualList':
       return /*#__PURE__*/React.createElement(VirtualList, displayProps);
-
-    case 'listForMobile':
-      return /*#__PURE__*/React.createElement(ListForMobile, displayProps);
+    // case 'listForMobile':
+    //   return <ListForMobile {...displayProps} />
     default:
       return /*#__PURE__*/React.createElement(CardList, displayProps);
--- a/es/core/RenderChildren/RenderList/list.css
View file @ea4c3d0
+++ b/es/core/RenderChildren/RenderList/list.css
View file @ea4c3d0
@@ -49,9 +49,6 @@
 .rowReverse {
   flex-direction: row-reverse;
 }
-.ant-modal-body .qx-virtualList {
-  margin-bottom: 0 !important;
-}
 .qx-card-mobile .adm-list-item-content-main {
   font-size: 14px;
 }
--- a/lib/core/RenderChildren/RenderList/VirtualList.js
View file @ea4c3d0
+++ b/lib/core/RenderChildren/RenderList/VirtualList.js
View file @ea4c3d0
@@ -79,8 +79,6 @@ var _react = _interopRequireWildcard(require("react"));
 var _index2 = _interopRequireDefault(require("../../index"));
-var _virtualizedtableforantd = require("virtualizedtableforantd4");
-
 var _excluded = ["scrollY", "summary", "batchKey", "type", "bar", "line", "searchKey", "rowSelection", "size"];
 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); }
@@ -127,7 +125,8 @@ function _objectWithoutProperties(source, excluded) { if (source == null) return
 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; }
-var confirm = _modal.default.confirm;
+var confirm = _modal.default.confirm; // import {useVT} from 'virtualizedtableforantd4';
+
 var BUTTON_ICONS_MAP = {
   ExportOutlined: /*#__PURE__*/_react.default.createElement(_ExportOutlined2.default, null),
   ImportOutlined: /*#__PURE__*/_react.default.createElement(_ImportOutlined2.default, null),
@@ -174,11 +173,10 @@ var VirtualList = function VirtualList(_ref) {
       fieldName = schema.fieldName,
       _schema$qxProps = schema.qxProps,
       qxProps = _schema$qxProps === void 0 ? {} : _schema$qxProps,
-      subformMode = schema.subformMode,
-      pageType = schema.pageType;
+      subformMode = schema.subformMode;
   var _props$scrollY = props.scrollY,
-      scrollY = _props$scrollY === void 0 ? 400 : _props$scrollY,
+      scrollY = _props$scrollY === void 0 ? 300 : _props$scrollY,
       _summary = props.summary,
       batchKey = props.batchKey,
       type = props.type,
@@ -189,18 +187,8 @@ var VirtualList = function VirtualList(_ref) {
       searchKey = props.searchKey,
       rowSelection = props.rowSelection,
       size = props.size,
-      rest = _objectWithoutProperties(props, _excluded);
+      rest = _objectWithoutProperties(props, _excluded); // const [vt, set_components] = useVT(() => ({scroll: {y: scrollY}}), []);
-  var _useVT = (0, _virtualizedtableforantd.useVT)(function () {
-    return {
-      scroll: {
-        y: scrollY
-      }
-    };
-  }, []),
-      _useVT2 = _slicedToArray(_useVT, 2),
-      vt = _useVT2[0],
-      set_components = _useVT2[1];
   var _useState = (0, _react.useState)(''),
       _useState2 = _slicedToArray(_useState, 2),
@@ -240,6 +228,8 @@ var VirtualList = function VirtualList(_ref) {
   var newRowSelection = (0, _react.useMemo)(function () {
     var _bar$buttons;
+    if (schema.isReadOnly) return null;
+
     var _rowSelection = _.cloneDeep(rowSelection); // 根据是否含有批量操作按钮，渲染表格是否可选择
@@ -260,7 +250,7 @@ var VirtualList = function VirtualList(_ref) {
     }
     return _rowSelection;
-  }, [rowSelection, selectedRowKeys, bar]);
+  }, [rowSelection, selectedRowKeys, bar, rowSelection]);
   (0, _react.useEffect)(function () {
     displayList.forEach(function (item, index) {
       if (_typeof(item) === 'object') {
@@ -337,14 +327,14 @@ var VirtualList = function VirtualList(_ref) {
     return {
       total: dataSource.length,
       position: ['bottomRight'],
-      pageSize: 10,
+      pageSize: props.limit || 10,
       showTotal: function showTotal(total) {
         return handleTotal(total);
       },
       defaultCurrent: 1,
       size: 'default'
     };
-  }, [dataSource]);
+  }, [dataSource, props.limit]);
   var barButtons = (0, _react.useMemo)(function () {
     var _barButtons = _.cloneDeep(bar.buttons || []); // 关联表的导入，先隐藏 TODO
@@ -381,7 +371,7 @@ var VirtualList = function VirtualList(_ref) {
       });
     }
-    if (props.originWidget === 'relSelector' && subformMode && type !== 'view') {
+    if (props.originWidget === 'relSelector' && subformMode && type === 'edit') {
       _barButtons.unshift({
         code: 'subformEdit',
         icon: 'EditOutlined',
@@ -471,12 +461,12 @@ var VirtualList = function VirtualList(_ref) {
       var column = ((_schema$props2 = schema.props) === null || _schema$props2 === void 0 ? void 0 : _schema$props2.column) || {};
       return {
         dataIndex: child,
-        width: column.width ? parseInt(column.width) : FIELD_LENGTH,
+        width: (column.width ? parseInt(column.width) : FIELD_LENGTH) + padding,
         align: column.align || 'left',
         fixed: column.fixed || props.fixed && index < props.fixed,
         title: /*#__PURE__*/_react.default.createElement("div", {
           style: {
-            width: (column.width ? parseInt(column.width) : FIELD_LENGTH - padding) + "px"
+            width: (column.width ? parseInt(column.width) : FIELD_LENGTH) + "px"
           }
         }, schema.required ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("span", {
           className: "fr-label-required"
@@ -1010,15 +1000,13 @@ var VirtualList = function VirtualList(_ref) {
     scroll: {
       y: scrollY,
       x: '100%'
-    },
-    components: vt,
+    } // components={vt}
+    ,
     size: size || 'small',
     columns: columns,
     dataSource: dataSource,
-    pagination: pagination,
-    style: {
-      marginBottom: 25
-    },
+    pagination: pagination // style={{marginBottom: 25}}
+    ,
     rowSelection: newRowSelection,
     summary: function summary() {
       if (!_summary || Array.isArray(_summary) && !_summary.length) {
--- a/lib/core/RenderChildren/RenderList/index.js
View file @ea4c3d0
+++ b/lib/core/RenderChildren/RenderList/index.js
View file @ea4c3d0
@@ -192,6 +192,10 @@ var RenderList = function RenderList(_ref) {
     getFieldsProps: getFieldsProps
   };
+  if (renderWidget === 'listForMobile') {
+    return /*#__PURE__*/_react.default.createElement(_ListForMobile.default, displayProps);
+  }
+
   switch (renderWidget) {
     case 'list0':
     case 'cardList':
@@ -212,9 +216,8 @@ var RenderList = function RenderList(_ref) {
     case 'list4':
     case 'virtualList':
       return /*#__PURE__*/_react.default.createElement(_VirtualList.default, displayProps);
-
-    case 'listForMobile':
-      return /*#__PURE__*/_react.default.createElement(_ListForMobile.default, displayProps);
+    // case 'listForMobile':
+    //   return <ListForMobile {...displayProps} />
     default:
       return /*#__PURE__*/_react.default.createElement(_CardList.default, displayProps);
--- a/lib/core/RenderChildren/RenderList/list.css
View file @ea4c3d0
+++ b/lib/core/RenderChildren/RenderList/list.css
View file @ea4c3d0
@@ -49,9 +49,6 @@
 .rowReverse {
   flex-direction: row-reverse;
 }
-.ant-modal-body .qx-virtualList {
-  margin-bottom: 0 !important;
-}
 .qx-card-mobile .adm-list-item-content-main {
   font-size: 14px;
 }
--- a/package.json
View file @ea4c3d0
+++ b/package.json
View file @ea4c3d0
 {
   "name": "@qx/form-render",
-  "version": "0.0.31-fix",
+  "version": "0.0.32-fix",
   "description": "通过 JSON Schema 生成标准 Form，常用于自定义搭建配置界面生成",
   "repository": {
     "type": "git",