framework / qx-form-render · Commits

Commit 202d72483597bc444d1e92a014a8261cf9b0bf7a

Authored by 乔启韬
1 parent fda8c291

子表删除按钮

Inline Side-by-side
Showing 3 changed files with 33 additions and 53 deletions
... ... @@ -2,8 +2,6 @@ import "antd/es/table/style";
2 2 import _Table from "antd/es/table";
3 3 import "antd/es/alert/style";
4 4 import _Alert from "antd/es/alert";
5   -import _FullscreenOutlined from "@ant-design/icons/es/icons/FullscreenOutlined";
6   -import _FullscreenExitOutlined from "@ant-design/icons/es/icons/FullscreenExitOutlined";
7 5 import "antd/es/dropdown/style";
8 6 import _Dropdown from "antd/es/dropdown";
9 7 import "antd/es/space/style";
... ... @@ -186,11 +184,6 @@ var VirtualList = function VirtualList(_ref) {
186 184 searchName = _useState12[0],
187 185 setSearchName = _useState12[1];
188 186
189   - var _useState13 = useState(false),
190   - _useState14 = _slicedToArray(_useState13, 2),
191   - isFullscreen = _useState14[0],
192   - setFullscreen = _useState14[1];
193   -
194 187 var padding = useMemo(function () {
195 188 return size === 'default' ? 32 : 16;
196 189 }, [size]);
... ... @@ -362,8 +355,14 @@ var VirtualList = function VirtualList(_ref) {
362 355 });
363 356
364 357 if (type === 'add') {
  358 + var addBtns = ['SELECT', 'IMPORT', 'ADD', 'BATCH_ADD'];
  359 +
  360 + if (props.originWidget === 'subform') {
  361 + addBtns.push('DELETE');
  362 + }
  363 +
365 364 return _barButtons.filter(function (item) {
366   - return ['SELECT', 'IMPORT', 'ADD', 'BATCH_ADD'].includes(item.code);
  365 + return addBtns.includes(item.code);
367 366 });
368 367 } else if (type === 'view') {
369 368 return _barButtons.filter(function (item) {
... ... @@ -423,7 +422,11 @@ var VirtualList = function VirtualList(_ref) {
423 422 width: column.width ? parseInt(column.width) : FIELD_LENGTH,
424 423 align: column.align || 'left',
425 424 fixed: column.fixed || props.fixed && index < props.fixed,
426   - title: /*#__PURE__*/React.createElement("div", null, schema.required ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("span", {
  425 + title: /*#__PURE__*/React.createElement("div", {
  426 + style: {
  427 + width: (column.width ? parseInt(column.width) : FIELD_LENGTH - padding) + "px"
  428 + }
  429 + }, schema.required ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("span", {
427 430 className: "fr-label-required"
428 431 }, " *"), /*#__PURE__*/React.createElement("span", null, schema.title)) : schema.title),
429 432 render: function render(value, record, index) {
... ... @@ -488,7 +491,7 @@ var VirtualList = function VirtualList(_ref) {
488 491 fixed = line.fixed,
489 492 buttons = line.buttons;
490 493
491   - if (pageType === 'add') {
  494 + if (type === 'add') {
492 495 if (props.originWidget === 'subform') {
493 496 line.buttons = buttons.filter(function (item) {
494 497 return item.code === 'DELETE';
... ... @@ -832,9 +835,7 @@ var VirtualList = function VirtualList(_ref) {
832 835 }
833 836 };
834 837
835   - return /*#__PURE__*/React.createElement("div", {
836   - className: isFullscreen ? 'qx-virtual_full' : ''
837   - }, props.editable ? isSubCanEdit ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(_Button, {
  838 + return /*#__PURE__*/React.createElement("div", null, props.editable ? isSubCanEdit ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(_Button, {
838 839 type: 'text',
839 840 size: "small",
840 841 icon: /*#__PURE__*/React.createElement(_CheckOutlined, null),
... ... @@ -903,18 +904,7 @@ var VirtualList = function VirtualList(_ref) {
903 904 style: {
904 905 marginLeft: 8
905 906 }
906   - }, /*#__PURE__*/React.createElement(_Space, null, "\u66F4\u591A\u64CD\u4F5C", /*#__PURE__*/React.createElement(_DownOutlined, null)))) : null, schema.fullscreen !== false ? /*#__PURE__*/React.createElement(_Tooltip, {
907   - title: isFullscreen ? '退出全屏' : '全屏'
908   - }, /*#__PURE__*/React.createElement(_Button, {
909   - type: 'icon',
910   - icon: isFullscreen ? /*#__PURE__*/React.createElement(_FullscreenExitOutlined, null) : /*#__PURE__*/React.createElement(_FullscreenOutlined, null),
911   - onClick: function onClick() {
912   - setFullscreen(!isFullscreen);
913   - },
914   - style: {
915   - marginLeft: 10
916   - }
917   - })) : null), Array.isArray(props.buttons) ? props.buttons.map(function (item, idx) {
  907 + }, /*#__PURE__*/React.createElement(_Space, null, "\u66F4\u591A\u64CD\u4F5C", /*#__PURE__*/React.createElement(_DownOutlined, null)))) : null), Array.isArray(props.buttons) ? props.buttons.map(function (item, idx) {
918 908 var callback = item.callback,
919 909 text = item.text,
920 910 html = item.html;
... ... @@ -962,6 +952,7 @@ var VirtualList = function VirtualList(_ref) {
962 952 handleCloseExport(exportProgressData.taskId);
963 953 }
964 954 }) : null, /*#__PURE__*/React.createElement(_Table, _extends({
  955 + id: 'qxVirtualList',
965 956 className: 'qx-virtualList',
966 957 rowKey: "index",
967 958 scroll: {
... ...
... ... @@ -13,10 +13,6 @@ require("antd/es/alert/style");
13 13
14 14 var _alert = _interopRequireDefault(require("antd/es/alert"));
15 15
16   -var _FullscreenOutlined2 = _interopRequireDefault(require("@ant-design/icons/lib/icons/FullscreenOutlined"));
17   -
18   -var _FullscreenExitOutlined2 = _interopRequireDefault(require("@ant-design/icons/lib/icons/FullscreenExitOutlined"));
19   -
20 16 require("antd/es/dropdown/style");
21 17
22 18 var _dropdown = _interopRequireDefault(require("antd/es/dropdown"));
... ... @@ -238,11 +234,6 @@ var VirtualList = function VirtualList(_ref) {
238 234 searchName = _useState12[0],
239 235 setSearchName = _useState12[1];
240 236
241   - var _useState13 = (0, _react.useState)(false),
242   - _useState14 = _slicedToArray(_useState13, 2),
243   - isFullscreen = _useState14[0],
244   - setFullscreen = _useState14[1];
245   -
246 237 var padding = (0, _react.useMemo)(function () {
247 238 return size === 'default' ? 32 : 16;
248 239 }, [size]);
... ... @@ -414,8 +405,14 @@ var VirtualList = function VirtualList(_ref) {
414 405 });
415 406
416 407 if (type === 'add') {
  408 + var addBtns = ['SELECT', 'IMPORT', 'ADD', 'BATCH_ADD'];
  409 +
  410 + if (props.originWidget === 'subform') {
  411 + addBtns.push('DELETE');
  412 + }
  413 +
417 414 return _barButtons.filter(function (item) {
418   - return ['SELECT', 'IMPORT', 'ADD', 'BATCH_ADD'].includes(item.code);
  415 + return addBtns.includes(item.code);
419 416 });
420 417 } else if (type === 'view') {
421 418 return _barButtons.filter(function (item) {
... ... @@ -477,7 +474,11 @@ var VirtualList = function VirtualList(_ref) {
477 474 width: column.width ? parseInt(column.width) : FIELD_LENGTH,
478 475 align: column.align || 'left',
479 476 fixed: column.fixed || props.fixed && index < props.fixed,
480   - title: /*#__PURE__*/_react.default.createElement("div", null, schema.required ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("span", {
  477 + title: /*#__PURE__*/_react.default.createElement("div", {
  478 + style: {
  479 + width: (column.width ? parseInt(column.width) : FIELD_LENGTH - padding) + "px"
  480 + }
  481 + }, schema.required ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("span", {
481 482 className: "fr-label-required"
482 483 }, " *"), /*#__PURE__*/_react.default.createElement("span", null, schema.title)) : schema.title),
483 484 render: function render(value, record, index) {
... ... @@ -542,7 +543,7 @@ var VirtualList = function VirtualList(_ref) {
542 543 fixed = line.fixed,
543 544 buttons = line.buttons;
544 545
545   - if (pageType === 'add') {
  546 + if (type === 'add') {
546 547 if (props.originWidget === 'subform') {
547 548 line.buttons = buttons.filter(function (item) {
548 549 return item.code === 'DELETE';
... ... @@ -886,9 +887,7 @@ var VirtualList = function VirtualList(_ref) {
886 887 }
887 888 };
888 889
889   - return /*#__PURE__*/_react.default.createElement("div", {
890   - className: isFullscreen ? 'qx-virtual_full' : ''
891   - }, props.editable ? isSubCanEdit ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_button.default, {
  890 + return /*#__PURE__*/_react.default.createElement("div", null, props.editable ? isSubCanEdit ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_button.default, {
892 891 type: 'text',
893 892 size: "small",
894 893 icon: /*#__PURE__*/_react.default.createElement(_CheckOutlined2.default, null),
... ... @@ -957,18 +956,7 @@ var VirtualList = function VirtualList(_ref) {
957 956 style: {
958 957 marginLeft: 8
959 958 }
960   - }, /*#__PURE__*/_react.default.createElement(_space.default, null, "\u66F4\u591A\u64CD\u4F5C", /*#__PURE__*/_react.default.createElement(_DownOutlined2.default, null)))) : null, schema.fullscreen !== false ? /*#__PURE__*/_react.default.createElement(_tooltip.default, {
961   - title: isFullscreen ? '退出全屏' : '全屏'
962   - }, /*#__PURE__*/_react.default.createElement(_button.default, {
963   - type: 'icon',
964   - icon: isFullscreen ? /*#__PURE__*/_react.default.createElement(_FullscreenExitOutlined2.default, null) : /*#__PURE__*/_react.default.createElement(_FullscreenOutlined2.default, null),
965   - onClick: function onClick() {
966   - setFullscreen(!isFullscreen);
967   - },
968   - style: {
969   - marginLeft: 10
970   - }
971   - })) : null), Array.isArray(props.buttons) ? props.buttons.map(function (item, idx) {
  959 + }, /*#__PURE__*/_react.default.createElement(_space.default, null, "\u66F4\u591A\u64CD\u4F5C", /*#__PURE__*/_react.default.createElement(_DownOutlined2.default, null)))) : null), Array.isArray(props.buttons) ? props.buttons.map(function (item, idx) {
972 960 var callback = item.callback,
973 961 text = item.text,
974 962 html = item.html;
... ... @@ -1016,6 +1004,7 @@ var VirtualList = function VirtualList(_ref) {
1016 1004 handleCloseExport(exportProgressData.taskId);
1017 1005 }
1018 1006 }) : null, /*#__PURE__*/_react.default.createElement(_table.default, _extends({
  1007 + id: 'qxVirtualList',
1019 1008 className: 'qx-virtualList',
1020 1009 rowKey: "index",
1021 1010 scroll: {
... ...
1 1 {
2 2 "name": "@qx/form-render",
3   - "version": "0.0.30",
  3 + "version": "0.0.31-fix",
4 4 "description": "通过 JSON Schema 生成标准 Form，常用于自定义搭建配置界面生成",
5 5 "repository": {
6 6 "type": "git",
... ...