ls-pro-common 3.0.4 → 3.0.6

package/lib/components/ImageSelector.js

@@ -155,10 +155,12 @@ function ImageSelector(prop) {
     loadData(searchKey);
   }, [visible, searchKey]);
   (0, _react.useEffect)(function () {
-    var val = formRef.current.getFieldsValue();
+    var _formRef$current, _formRef$current$getF;
+    var val = (formRef === null || formRef === void 0 ? void 0 : (_formRef$current = formRef.current) === null || _formRef$current === void 0 ? void 0 : (_formRef$current$getF = _formRef$current.getFieldsValue) === null || _formRef$current$getF === void 0 ? void 0 : _formRef$current$getF.call(_formRef$current)) || {};
     var url = val === null || val === void 0 ? void 0 : val[name];
     if (!url) {
-      url = formRef.current.getFieldValue(name);
+      var _formRef$current2, _formRef$current2$get;
+      url = formRef === null || formRef === void 0 ? void 0 : (_formRef$current2 = formRef.current) === null || _formRef$current2 === void 0 ? void 0 : (_formRef$current2$get = _formRef$current2.getFieldValue) === null || _formRef$current2$get === void 0 ? void 0 : _formRef$current2$get.call(_formRef$current2, name);
     }
     if (url) {
       var urls = url.toString().split(',');
@@ -184,14 +186,14 @@ function ImageSelector(prop) {
         (0, _utils.showSuccess)(result.flag.retMsg);
         // 直接上传
         if (isDirect) {
-          var _result$rows$;
+          var _result$rows$, _formRef$current3, _formRef$current3$get, _formRef$current4, _formRef$current4$set;
           var img = showImgApi + '?fileName=' + (result === null || result === void 0 ? void 0 : (_result$rows$ = result.rows[0]) === null || _result$rows$ === void 0 ? void 0 : _result$rows$.newFileId);
           setImgUrl(img);
-          var formVal = formRef.current.getFieldsValue();
+          var formVal = formRef === null || formRef === void 0 ? void 0 : (_formRef$current3 = formRef.current) === null || _formRef$current3 === void 0 ? void 0 : (_formRef$current3$get = _formRef$current3.getFieldsValue) === null || _formRef$current3$get === void 0 ? void 0 : _formRef$current3$get.call(_formRef$current3);
           var val = (0, _objectSpread2.default)({}, formVal);
           //@ts-ignore
           val[name] = img;
-          formRef.current.setFieldsValue(val);
+          formRef === null || formRef === void 0 ? void 0 : (_formRef$current4 = formRef.current) === null || _formRef$current4 === void 0 ? void 0 : (_formRef$current4$set = _formRef$current4.setFieldsValue) === null || _formRef$current4$set === void 0 ? void 0 : _formRef$current4$set.call(_formRef$current4, val);
         }
       } else {
         var _result$flag2;
@@ -241,7 +243,8 @@ function ImageSelector(prop) {
     }
   };
   var confirmImage = function confirmImage() {
-    var formVal = formRef.current.getFieldsValue();
+    var _formRef$current5, _formRef$current5$get;
+    var formVal = formRef === null || formRef === void 0 ? void 0 : (_formRef$current5 = formRef.current) === null || _formRef$current5 === void 0 ? void 0 : (_formRef$current5$get = _formRef$current5.getFieldsValue) === null || _formRef$current5$get === void 0 ? void 0 : _formRef$current5$get.call(_formRef$current5);
     var val = (0, _objectSpread2.default)({}, formVal);
     //@ts-ignore
     val[name] = selectedUrl.join(',');
@@ -251,9 +254,9 @@ function ImageSelector(prop) {
   };
   var clearValue = function clearValue(e) {
     if (!e || !e.target.value) {
-      var _formRef$current;
+      var _formRef$current6, _formRef$current6$get;
       setImgUrl('');
-      var formValue = formRef === null || formRef === void 0 ? void 0 : (_formRef$current = formRef.current) === null || _formRef$current === void 0 ? void 0 : _formRef$current.getFieldsValue();
+      var formValue = (formRef === null || formRef === void 0 ? void 0 : (_formRef$current6 = formRef.current) === null || _formRef$current6 === void 0 ? void 0 : (_formRef$current6$get = _formRef$current6.getFieldsValue) === null || _formRef$current6$get === void 0 ? void 0 : _formRef$current6$get.call(_formRef$current6)) || {};
       formValue[name] = '';
       formRef.current.setFieldsValue((0, _objectSpread2.default)({}, formValue));
     }

package/lib/components/InputMultiLine.js

@@ -61,10 +61,10 @@ var InputMultiLine = /*#__PURE__*/_react.default.forwardRef(function (prop, ref)
   (0, _react.useEffect)(function () {
     if (defaultValue) {
       setText(defaultValue);
-    } else if (name) {
-      var _formRef$current;
-      var formValue = formRef === null || formRef === void 0 ? void 0 : (_formRef$current = formRef.current) === null || _formRef$current === void 0 ? void 0 : _formRef$current.getFieldsValue();
-      setText(formValue[name]);
+    } else if (name && (formRef === null || formRef === void 0 ? void 0 : formRef.current)) {
+      var _formRef$current, _formRef$current$getF;
+      var formValue = formRef === null || formRef === void 0 ? void 0 : (_formRef$current = formRef.current) === null || _formRef$current === void 0 ? void 0 : (_formRef$current$getF = _formRef$current.getFieldValue) === null || _formRef$current$getF === void 0 ? void 0 : _formRef$current$getF.call(_formRef$current, name);
+      setText(formValue);
     }
   }, []);
   // 显示多行输入时，赋值给多行文本框
@@ -75,10 +75,10 @@ var InputMultiLine = /*#__PURE__*/_react.default.forwardRef(function (prop, ref)
   }, [visible, text]);
   // 输入框值变化时，赋值给表单项
   (0, _react.useEffect)(function () {
-    var _formRef$current2, _formRef$current3;
-    var formValue = formRef === null || formRef === void 0 ? void 0 : (_formRef$current2 = formRef.current) === null || _formRef$current2 === void 0 ? void 0 : _formRef$current2.getFieldsValue();
+    var _formRef$current2, _formRef$current2$get, _formRef$current3, _formRef$current3$set;
+    var formValue = (formRef === null || formRef === void 0 ? void 0 : (_formRef$current2 = formRef.current) === null || _formRef$current2 === void 0 ? void 0 : (_formRef$current2$get = _formRef$current2.getFieldsValue) === null || _formRef$current2$get === void 0 ? void 0 : _formRef$current2$get.call(_formRef$current2)) || {};
     formValue[name] = text;
-    (_formRef$current3 = formRef.current) === null || _formRef$current3 === void 0 ? void 0 : _formRef$current3.setFieldsValue((0, _objectSpread2.default)({}, formValue));
+    formRef === null || formRef === void 0 ? void 0 : (_formRef$current3 = formRef.current) === null || _formRef$current3 === void 0 ? void 0 : (_formRef$current3$set = _formRef$current3.setFieldsValue) === null || _formRef$current3$set === void 0 ? void 0 : _formRef$current3$set.call(_formRef$current3, (0, _objectSpread2.default)({}, formValue));
   }, [text]);
   var lineInput = function lineInput(e) {
     var line = (e.target.value || '').split('\n').filter(function (o, i) {

package/lib/components/InputTable.d.ts

@@ -39,6 +39,7 @@ export declare type InputTableProps = ProFormItemProps<InputProps> & {
     loadOnShow?: boolean;
     placement?: TooltipPlacement;
     arrowPointAtCenter?: boolean;
+    rowKey?: any;
     /**@name 选择行事件 */
     onSelectChange?: (item: any, formRef?: any) => void;
     /**@name 加载之前事件,param为查询条件对象,可以通过此方法调整 */
@@ -93,6 +94,7 @@ declare const InputTable: React.ForwardRefExoticComponent<{
     loadOnShow?: boolean | undefined;
     placement?: TooltipPlacement | undefined;
     arrowPointAtCenter?: boolean | undefined;
+    rowKey?: any;
     /**@name 选择行事件 */
     onSelectChange?: ((item: any, formRef?: any) => void) | undefined;
     /**@name 加载之前事件,param为查询条件对象,可以通过此方法调整 */

package/lib/components/InputTable.js

@@ -15,6 +15,7 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
 require("antd/es/button/style");
 var _button = _interopRequireDefault(require("antd/es/button"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
@@ -24,7 +25,7 @@ var _lsProForm = require("ls-pro-form");
 var _icons = require("@ant-design/icons");
 var _http = require("../http");
 var _utils = require("../utils");
-var _excluded = ["columns", "url", "textName", "name", "tableConfig", "tableHeight", "tableWidth", "readonly", "multiple", "valueField", "labelWidth", "textField", "onSelectChange", "beforeLoad", "afterLoad", "isV2", "allowClear", "keepSelect", "fieldProps", "searchField", "fillMap", "loadOnShow", "triggerCheck", "getPopupContainer", "placement", "arrowPointAtCenter"],
+var _excluded = ["columns", "url", "textName", "name", "tableConfig", "tableHeight", "tableWidth", "readonly", "multiple", "valueField", "labelWidth", "textField", "onSelectChange", "beforeLoad", "afterLoad", "isV2", "allowClear", "keepSelect", "fieldProps", "searchField", "fillMap", "loadOnShow", "triggerCheck", "getPopupContainer", "placement", "arrowPointAtCenter", "rowKey"],
   _excluded2 = ["current", "pageSize"];
 var InputTable = /*#__PURE__*/_react.default.forwardRef(function (prop, ref) {
   //@ts-ignore
@@ -87,6 +88,7 @@ var InputTable = /*#__PURE__*/_react.default.forwardRef(function (prop, ref) {
     placement = _prop$placement === void 0 ? 'bottom' : _prop$placement,
     _prop$arrowPointAtCen = prop.arrowPointAtCenter,
     arrowPointAtCenter = _prop$arrowPointAtCen === void 0 ? true : _prop$arrowPointAtCen,
+    rowKey = prop.rowKey,
     rest = (0, _objectWithoutProperties2.default)(prop, _excluded);
   //显示输入框绑定的name,如果不设置textName,设置为$name__text
   var textNameProp = (0, _react.useMemo)(function () {
@@ -164,20 +166,35 @@ var InputTable = /*#__PURE__*/_react.default.forwardRef(function (prop, ref) {
   // 初始化数据
   (0, _react.useEffect)(function () {
     setTimeout(function () {
-      var _formRef$current, _formRef$current2;
-      var txt = formRef === null || formRef === void 0 ? void 0 : (_formRef$current = formRef.current) === null || _formRef$current === void 0 ? void 0 : _formRef$current.getFieldValue(textNameProp);
-      var val = formRef === null || formRef === void 0 ? void 0 : (_formRef$current2 = formRef.current) === null || _formRef$current2 === void 0 ? void 0 : _formRef$current2.getFieldValue(name);
+      var txt = '',
+        val = '';
+      if (rowKey) {
+        try {
+          var _formRef$current, _formRef$current$getF, _formRef$current$getF2;
+          var row = formRef === null || formRef === void 0 ? void 0 : (_formRef$current = formRef.current) === null || _formRef$current === void 0 ? void 0 : (_formRef$current$getF = _formRef$current.getFieldsValue) === null || _formRef$current$getF === void 0 ? void 0 : (_formRef$current$getF2 = _formRef$current$getF.call(_formRef$current)) === null || _formRef$current$getF2 === void 0 ? void 0 : _formRef$current$getF2[rowKey];
+          txt = row === null || row === void 0 ? void 0 : row[textNameProp];
+          val = row === null || row === void 0 ? void 0 : row[name];
+        } catch (_unused) {}
+      } else {
+        var _formRef$current2, _formRef$current2$get, _formRef$current3, _formRef$current3$get;
+        txt = formRef === null || formRef === void 0 ? void 0 : (_formRef$current2 = formRef.current) === null || _formRef$current2 === void 0 ? void 0 : (_formRef$current2$get = _formRef$current2.getFieldValue) === null || _formRef$current2$get === void 0 ? void 0 : _formRef$current2$get.call(_formRef$current2, textNameProp);
+        val = formRef === null || formRef === void 0 ? void 0 : (_formRef$current3 = formRef.current) === null || _formRef$current3 === void 0 ? void 0 : (_formRef$current3$get = _formRef$current3.getFieldValue) === null || _formRef$current3$get === void 0 ? void 0 : _formRef$current3$get.call(_formRef$current3, name);
+      }
       if (txt) {
         setText(txt);
       } else if (val) {
         setText(val);
       }
     }, 0);
-  }, []);
+  }, [rowKey]);
   // 处理返回数据
   var handleValue = function handleValue(row) {
-    var _formRef$current3, _formRef$current4;
-    var formValue = formRef === null || formRef === void 0 ? void 0 : (_formRef$current3 = formRef.current) === null || _formRef$current3 === void 0 ? void 0 : _formRef$current3.getFieldsValue();
+    var _formRef$current4, _formRef$current4$get;
+    var formValue = (formRef === null || formRef === void 0 ? void 0 : (_formRef$current4 = formRef.current) === null || _formRef$current4 === void 0 ? void 0 : (_formRef$current4$get = _formRef$current4.getFieldsValue) === null || _formRef$current4$get === void 0 ? void 0 : _formRef$current4$get.call(_formRef$current4)) || {};
+    if (rowKey) {
+      formValue = formValue[rowKey] || {};
+    }
+    if (!formValue) return;
     var txt;
     //支持多选
     if (Array.isArray(row)) {
@@ -212,7 +229,13 @@ var InputTable = /*#__PURE__*/_react.default.forwardRef(function (prop, ref) {
     formValue[textNameProp] = txt;
     setText(txt);
     setVisible(false);
-    (_formRef$current4 = formRef.current) === null || _formRef$current4 === void 0 ? void 0 : _formRef$current4.setFieldsValue((0, _objectSpread2.default)({}, formValue));
+    if (rowKey) {
+      var _formRef$current5, _formRef$current5$set;
+      formRef === null || formRef === void 0 ? void 0 : (_formRef$current5 = formRef.current) === null || _formRef$current5 === void 0 ? void 0 : (_formRef$current5$set = _formRef$current5.setFieldsValue) === null || _formRef$current5$set === void 0 ? void 0 : _formRef$current5$set.call(_formRef$current5, (0, _defineProperty2.default)({}, rowKey, formValue));
+    } else {
+      var _formRef$current6, _formRef$current6$set;
+      formRef === null || formRef === void 0 ? void 0 : (_formRef$current6 = formRef.current) === null || _formRef$current6 === void 0 ? void 0 : (_formRef$current6$set = _formRef$current6.setFieldsValue) === null || _formRef$current6$set === void 0 ? void 0 : _formRef$current6$set.call(_formRef$current6, (0, _objectSpread2.default)({}, formValue));
+    }
     onSelectChange === null || onSelectChange === void 0 ? void 0 : onSelectChange(row, formRef);
   };
   // 可输入时,回车或失去焦点调接口查询数据
@@ -242,29 +265,41 @@ var InputTable = /*#__PURE__*/_react.default.forwardRef(function (prop, ref) {
   };
   //直接输入不回车,value 和 text 为同一个值
   var onInput = function onInput(e) {
-    var _formRef$current5;
-    var formValue = formRef === null || formRef === void 0 ? void 0 : (_formRef$current5 = formRef.current) === null || _formRef$current5 === void 0 ? void 0 : _formRef$current5.getFieldsValue();
+    var _formRef$current7, _formRef$current7$get;
+    var formValue = (formRef === null || formRef === void 0 ? void 0 : (_formRef$current7 = formRef.current) === null || _formRef$current7 === void 0 ? void 0 : (_formRef$current7$get = _formRef$current7.getFieldsValue) === null || _formRef$current7$get === void 0 ? void 0 : _formRef$current7$get.call(_formRef$current7)) || {};
+    if (rowKey) {
+      formValue = formValue[rowKey] || {};
+    }
     var val = e.target.value;
     formValue[name] = val;
     formValue[textNameProp] = val;
     setText(val);
-    formRef.current.setFieldsValue((0, _objectSpread2.default)({}, formValue));
+    if (rowKey) {
+      var _formRef$current8, _formRef$current8$set;
+      formRef === null || formRef === void 0 ? void 0 : (_formRef$current8 = formRef.current) === null || _formRef$current8 === void 0 ? void 0 : (_formRef$current8$set = _formRef$current8.setFieldsValue) === null || _formRef$current8$set === void 0 ? void 0 : _formRef$current8$set.call(_formRef$current8, (0, _defineProperty2.default)({}, rowKey, formValue));
+    } else {
+      var _formRef$current9, _formRef$current9$set;
+      formRef === null || formRef === void 0 ? void 0 : (_formRef$current9 = formRef.current) === null || _formRef$current9 === void 0 ? void 0 : (_formRef$current9$set = _formRef$current9.setFieldsValue) === null || _formRef$current9$set === void 0 ? void 0 : _formRef$current9$set.call(_formRef$current9, (0, _objectSpread2.default)({}, formValue));
+    }
   };
   // 当表单重置或点clear时,处理值
   var clearValue = function clearValue(e) {
     if (!e.target.value) {
-      var _formRef$current6;
+      var _formRef$current10, _formRef$current10$ge;
       setText('');
-      var formValue = formRef === null || formRef === void 0 ? void 0 : (_formRef$current6 = formRef.current) === null || _formRef$current6 === void 0 ? void 0 : _formRef$current6.getFieldsValue();
+      var formValue = (formRef === null || formRef === void 0 ? void 0 : (_formRef$current10 = formRef.current) === null || _formRef$current10 === void 0 ? void 0 : (_formRef$current10$ge = _formRef$current10.getFieldsValue) === null || _formRef$current10$ge === void 0 ? void 0 : _formRef$current10$ge.call(_formRef$current10)) || {};
+      if (rowKey) {
+        formValue = formValue[rowKey] || {};
+      }
       formValue[name] = '';
       formValue[textNameProp] = '';
-      // 不处理，其它表单自己清空
-      // if (fillMap) {
-      //     for (let key in fillMap) {
-      //         formValue[key] = '';
-      //     }
-      // }
-      formRef.current.setFieldsValue((0, _objectSpread2.default)({}, formValue));
+      if (rowKey) {
+        var _formRef$current11, _formRef$current11$se;
+        formRef === null || formRef === void 0 ? void 0 : (_formRef$current11 = formRef.current) === null || _formRef$current11 === void 0 ? void 0 : (_formRef$current11$se = _formRef$current11.setFieldsValue) === null || _formRef$current11$se === void 0 ? void 0 : _formRef$current11$se.call(_formRef$current11, (0, _defineProperty2.default)({}, rowKey, formValue));
+      } else {
+        var _formRef$current12, _formRef$current12$se;
+        formRef === null || formRef === void 0 ? void 0 : (_formRef$current12 = formRef.current) === null || _formRef$current12 === void 0 ? void 0 : (_formRef$current12$se = _formRef$current12.setFieldsValue) === null || _formRef$current12$se === void 0 ? void 0 : _formRef$current12$se.call(_formRef$current12, (0, _objectSpread2.default)({}, formValue));
+      }
     }
   };
   (0, _react.useEffect)(function () {
@@ -275,12 +310,18 @@ var InputTable = /*#__PURE__*/_react.default.forwardRef(function (prop, ref) {
     }
   }, [text]);
   var tableDom = /*#__PURE__*/_react.default.createElement(_lsProTable.default, (0, _extends2.default)({
+    className: "ls-input-table",
     columns: columns,
     request: loadData,
     manualRequest: false,
     actionRef: tableRef,
     search: {
-      labelWidth: labelWidth
+      labelWidth: labelWidth,
+      optionRender: function optionRender(p, s, _dom) {
+        return _dom.filter(function (item) {
+          return item.key === 'submit';
+        });
+      }
     },
     options: {
       density: false,
@@ -316,7 +357,13 @@ var InputTable = /*#__PURE__*/_react.default.forwardRef(function (prop, ref) {
       }, "\u786E\u8BA4")];
     },
     headerTitle: "\u53CC\u51FB\u9009\u4E2D\u5F53\u524D\u884C\u6570\u636E"
-  }, tableConfig));
+  }, tableConfig, {
+    cardProps: {
+      bodyStyle: {
+        padding: 0
+      }
+    }
+  }));
   // 处理有值时，可清空
   (0, _react.useEffect)(function () {
     if (rest.disabled || (fieldProps === null || fieldProps === void 0 ? void 0 : fieldProps.disabled)) return;
@@ -349,6 +396,12 @@ var InputTable = /*#__PURE__*/_react.default.forwardRef(function (prop, ref) {
         }
       }, loadOnShow ? visible ? tableDom : null : tableDom),
       trigger: "click",
+      overlayInnerStyle: {
+        width: 'max-content'
+      },
+      overlayStyle: {
+        width: 'max-content'
+      },
       visible: rest.disabled || (fieldProps === null || fieldProps === void 0 ? void 0 : fieldProps.disabled) ? false : visible,
       onVisibleChange: setVisible,
       getPopupContainer: getPopupContainer,
@@ -390,6 +443,12 @@ var InputTable = /*#__PURE__*/_react.default.forwardRef(function (prop, ref) {
         }
       }, loadOnShow ? visible ? tableDom : null : tableDom),
       trigger: "click",
+      overlayInnerStyle: {
+        width: 'max-content'
+      },
+      overlayStyle: {
+        width: 'max-content'
+      },
       visible: rest.disabled || (fieldProps === null || fieldProps === void 0 ? void 0 : fieldProps.disabled) ? false : visible,
       onVisibleChange: setVisible,
       getPopupContainer: getPopupContainer,