@kmkf-fe-packages/basic-components 2.0.79-beta.104 → 2.0.79-beta.108

package/dist/index.esm.js

@@ -21799,7 +21799,8 @@ var OrderSubForm = function OrderSubForm(props) {
     onChange = props.onChange,
     _props$tableHeader = props.tableHeader,
     tableHeader = _props$tableHeader === void 0 ? [] : _props$tableHeader,
-    disabled = props.disabled,
+    _props$disabled = props.disabled,
+    disabled = _props$disabled === void 0 ? false : _props$disabled,
     maxCount = props.maxCount,
     manual = props.manual,
     correlationList = props.subConfig.correlationList,
@@ -21848,7 +21849,7 @@ var OrderSubForm = function OrderSubForm(props) {
         isShow: true,
         isEdit: false,
         isRequired: false,
-        width: Number(next === null || next === void 0 ? void 0 : next.width) || 150
+        width: (next === null || next === void 0 ? void 0 : next.width) ? Number(next === null || next === void 0 ? void 0 : next.width) : 150
       };
       if (t && t.isShow) {
         prv.push(_objectSpread2(_objectSpread2(_objectSpread2({}, next), t), {}, {
@@ -21859,10 +21860,11 @@ var OrderSubForm = function OrderSubForm(props) {
     }, []);
   }, [orderSubformColumns, tableHeader]);
   var column = useMemo(function () {
-    return [{
+    var list = [{
       dataIndex: 'index',
       title: '序号',
       width: 80,
+      ellipsis: true,
       render: function render(val, record, index) {
         return /*#__PURE__*/React.createElement(HoverTableRowDeleteIcon, {
           index: index,
@@ -21871,17 +21873,17 @@ var OrderSubForm = function OrderSubForm(props) {
             return deleteHandle(record.uuid);
           }
         });
-        // return <div style={{ width: 25 }}>{index + 1}</div>;
       }
     }].concat(_toConsumableArray(newTableHeader.map(function (t) {
       return _objectSpread2(_objectSpread2({}, t), {}, {
+        ellipsis: true,
         dataIndex: t === null || t === void 0 ? void 0 : t.dataIndex,
         title: /*#__PURE__*/React.createElement("span", null, t.isRequired ? /*#__PURE__*/React.createElement("span", {
           style: {
             color: 'red'
           }
         }, "*") : null, (t === null || t === void 0 ? void 0 : t.settingName) || t.title),
-        width: Number(t.width),
+        width: (t === null || t === void 0 ? void 0 : t.width) ? Number(t === null || t === void 0 ? void 0 : t.width) : 150,
         render: function render(val, record, index) {
           // const column = orderSubformColumnMap[t.dataIndex];
           var isDisabled = t.isEdit || disabled;
@@ -21895,35 +21897,40 @@ var OrderSubForm = function OrderSubForm(props) {
           });
         }
       });
-    })), [disabled ? {} : {
-      dataIndex: 'operation',
-      title: '操作',
-      width: 70,
-      fixed: 'right',
-      render: function render(val, record, index) {
-        return /*#__PURE__*/React.createElement(Space, null, manual && /*#__PURE__*/React.createElement(Tooltip, {
-          title: "\u6DFB\u52A0"
-        }, /*#__PURE__*/React.createElement(PlusCircleFilled, {
-          style: {
-            fontSize: 18,
-            color: '#1890ff'
-          },
-          onClick: function onClick() {
-            return addHandle(index + 1);
-          }
-        })), /*#__PURE__*/React.createElement(Tooltip, {
-          title: "\u5220\u9664"
-        }, /*#__PURE__*/React.createElement(MinusCircleFilled, {
-          style: {
-            fontSize: 18
-          },
-          onClick: function onClick() {
-            return deleteHandle(record.uuid);
-          }
-        })));
-      }
-    }]);
+    })));
+    if (!disabled) {
+      list.push({
+        dataIndex: 'operation',
+        title: '操作',
+        width: 70,
+        fixed: 'right',
+        render: function render(val, record, index) {
+          return /*#__PURE__*/React.createElement(Space, null, manual && /*#__PURE__*/React.createElement(Tooltip, {
+            title: "\u6DFB\u52A0"
+          }, /*#__PURE__*/React.createElement(PlusCircleFilled, {
+            style: {
+              fontSize: 18,
+              color: '#1890ff'
+            },
+            onClick: function onClick() {
+              return addHandle(index + 1);
+            }
+          })), /*#__PURE__*/React.createElement(Tooltip, {
+            title: "\u5220\u9664"
+          }, /*#__PURE__*/React.createElement(MinusCircleFilled, {
+            style: {
+              fontSize: 18
+            },
+            onClick: function onClick() {
+              return deleteHandle(record.uuid);
+            }
+          })));
+        }
+      });
+    }
+    return list;
   }, [newTableHeader, disabled, updateHandle]);
+  console.log('column', column);
   var orderModalColumns = useMemo(function () {
     return [{
       dataIndex: '',
@@ -22033,8 +22040,9 @@ var OrderSubForm = function OrderSubForm(props) {
     rowKey: 'uuid',
     size: "small",
     pagination: false,
+    tableLayout: "fixed",
     scroll: {
-      x: '100%'
+      x: 'max-content'
     },
     locale: {
       emptyText: !disabled && manual ? /*#__PURE__*/React.createElement("span", null, "\u6682\u65E0\u6570\u636E,", /*#__PURE__*/React.createElement(Button, {

package/dist/index.js

@@ -21812,7 +21812,8 @@ var OrderSubForm = function OrderSubForm(props) {
     onChange = props.onChange,
     _props$tableHeader = props.tableHeader,
     tableHeader = _props$tableHeader === void 0 ? [] : _props$tableHeader,
-    disabled = props.disabled,
+    _props$disabled = props.disabled,
+    disabled = _props$disabled === void 0 ? false : _props$disabled,
     maxCount = props.maxCount,
     manual = props.manual,
     correlationList = props.subConfig.correlationList,
@@ -21861,7 +21862,7 @@ var OrderSubForm = function OrderSubForm(props) {
         isShow: true,
         isEdit: false,
         isRequired: false,
-        width: Number(next === null || next === void 0 ? void 0 : next.width) || 150
+        width: (next === null || next === void 0 ? void 0 : next.width) ? Number(next === null || next === void 0 ? void 0 : next.width) : 150
       };
       if (t && t.isShow) {
         prv.push(_objectSpread2(_objectSpread2(_objectSpread2({}, next), t), {}, {
@@ -21872,10 +21873,11 @@ var OrderSubForm = function OrderSubForm(props) {
     }, []);
   }, [orderSubformColumns, tableHeader]);
   var column = React.useMemo(function () {
-    return [{
+    var list = [{
       dataIndex: 'index',
       title: '序号',
       width: 80,
+      ellipsis: true,
       render: function render(val, record, index) {
         return /*#__PURE__*/React__default['default'].createElement(HoverTableRowDeleteIcon, {
           index: index,
@@ -21884,17 +21886,17 @@ var OrderSubForm = function OrderSubForm(props) {
             return deleteHandle(record.uuid);
           }
         });
-        // return <div style={{ width: 25 }}>{index + 1}</div>;
       }
     }].concat(_toConsumableArray(newTableHeader.map(function (t) {
       return _objectSpread2(_objectSpread2({}, t), {}, {
+        ellipsis: true,
         dataIndex: t === null || t === void 0 ? void 0 : t.dataIndex,
         title: /*#__PURE__*/React__default['default'].createElement("span", null, t.isRequired ? /*#__PURE__*/React__default['default'].createElement("span", {
           style: {
             color: 'red'
           }
         }, "*") : null, (t === null || t === void 0 ? void 0 : t.settingName) || t.title),
-        width: Number(t.width),
+        width: (t === null || t === void 0 ? void 0 : t.width) ? Number(t === null || t === void 0 ? void 0 : t.width) : 150,
         render: function render(val, record, index) {
           // const column = orderSubformColumnMap[t.dataIndex];
           var isDisabled = t.isEdit || disabled;
@@ -21908,35 +21910,40 @@ var OrderSubForm = function OrderSubForm(props) {
           });
         }
       });
-    })), [disabled ? {} : {
-      dataIndex: 'operation',
-      title: '操作',
-      width: 70,
-      fixed: 'right',
-      render: function render(val, record, index) {
-        return /*#__PURE__*/React__default['default'].createElement(antd.Space, null, manual && /*#__PURE__*/React__default['default'].createElement(antd.Tooltip, {
-          title: "\u6DFB\u52A0"
-        }, /*#__PURE__*/React__default['default'].createElement(icons.PlusCircleFilled, {
-          style: {
-            fontSize: 18,
-            color: '#1890ff'
-          },
-          onClick: function onClick() {
-            return addHandle(index + 1);
-          }
-        })), /*#__PURE__*/React__default['default'].createElement(antd.Tooltip, {
-          title: "\u5220\u9664"
-        }, /*#__PURE__*/React__default['default'].createElement(icons.MinusCircleFilled, {
-          style: {
-            fontSize: 18
-          },
-          onClick: function onClick() {
-            return deleteHandle(record.uuid);
-          }
-        })));
-      }
-    }]);
+    })));
+    if (!disabled) {
+      list.push({
+        dataIndex: 'operation',
+        title: '操作',
+        width: 70,
+        fixed: 'right',
+        render: function render(val, record, index) {
+          return /*#__PURE__*/React__default['default'].createElement(antd.Space, null, manual && /*#__PURE__*/React__default['default'].createElement(antd.Tooltip, {
+            title: "\u6DFB\u52A0"
+          }, /*#__PURE__*/React__default['default'].createElement(icons.PlusCircleFilled, {
+            style: {
+              fontSize: 18,
+              color: '#1890ff'
+            },
+            onClick: function onClick() {
+              return addHandle(index + 1);
+            }
+          })), /*#__PURE__*/React__default['default'].createElement(antd.Tooltip, {
+            title: "\u5220\u9664"
+          }, /*#__PURE__*/React__default['default'].createElement(icons.MinusCircleFilled, {
+            style: {
+              fontSize: 18
+            },
+            onClick: function onClick() {
+              return deleteHandle(record.uuid);
+            }
+          })));
+        }
+      });
+    }
+    return list;
   }, [newTableHeader, disabled, updateHandle]);
+  console.log('column', column);
   var orderModalColumns = React.useMemo(function () {
     return [{
       dataIndex: '',
@@ -22046,8 +22053,9 @@ var OrderSubForm = function OrderSubForm(props) {
     rowKey: 'uuid',
     size: "small",
     pagination: false,
+    tableLayout: "fixed",
     scroll: {
-      x: '100%'
+      x: 'max-content'
     },
     locale: {
       emptyText: !disabled && manual ? /*#__PURE__*/React__default['default'].createElement("span", null, "\u6682\u65E0\u6570\u636E,", /*#__PURE__*/React__default['default'].createElement(antd.Button, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/basic-components",
-  "version": "2.0.79-beta.104",
+  "version": "2.0.79-beta.108",
   "description": "> TODO: description",
   "homepage": "",
   "license": "ISC",
@@ -66,5 +66,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "da1500388741a5f19c19f3bad37815f0133748e2"
+  "gitHead": "ee349bcc1da14ee82f949ba880130402cbb5747f"
 }