ls-pro-common 1.0.88 → 1.0.89

package/es/components/DescritionCard.js

@@ -41,6 +41,7 @@ function DescritionCard(props) {
       rotate: !!collapsed ? 180 : undefined,
       style: {
         margin: 'auto',
+        marginLeft: '24px',
         fontSize: '16px',
         color: 'var(--ant-primary-color, #4997e6)'
       },

package/es/components/InputMultiLine.d.ts

@@ -1,5 +1,6 @@
 import React from 'react';
 import type { InputProps } from 'antd';
+import type { TextAreaProps } from 'antd/lib/input';
 import type { ProFormItemProps } from 'ls-pro-form';
 export declare type InputMultiLineProps = ProFormItemProps<InputProps> & {
     /**@name 表单项name, 跟 form.item 的 name一致 */
@@ -15,6 +16,7 @@ export declare type InputMultiLineProps = ProFormItemProps<InputProps> & {
     /** @name 最大输入行数 */
     maxRows?: number;
     getPopupContainer?: (triggerNode: any) => HTMLElement;
+    textAreaProps?: TextAreaProps;
 };
 declare const InputMultiLine: React.ForwardRefExoticComponent<{
     fieldProps?: (import("../../../form/lib/interface").FieldProps & InputProps) | undefined;
@@ -39,5 +41,6 @@ declare const InputMultiLine: React.ForwardRefExoticComponent<{
     /** @name 最大输入行数 */
     maxRows?: number | undefined;
     getPopupContainer?: ((triggerNode: any) => HTMLElement) | undefined;
+    textAreaProps?: TextAreaProps | undefined;
 } & React.RefAttributes<unknown>>;
 export default InputMultiLine;

package/es/components/InputMultiLine.js

@@ -1,12 +1,12 @@
-import _extends from "@babel/runtime/helpers/esm/extends";
 import "antd/es/popover/style";
 import _Popover from "antd/es/popover";
 import "antd/es/input/style";
 import _Input from "antd/es/input";
+import _extends from "@babel/runtime/helpers/esm/extends";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
-var _excluded = ["name", "rows", "maxRows", "placement", "popWidth", "fieldProps", "defaultValue", "allowClear", "getPopupContainer"];
+var _excluded = ["name", "rows", "maxRows", "placement", "popWidth", "fieldProps", "defaultValue", "allowClear", "getPopupContainer", "textAreaProps"];
 import React, { useRef, useState, useEffect, useContext, useMemo, useImperativeHandle } from 'react';
 import { ProFormText, ProFormContext } from 'ls-pro-form';
 import { UnorderedListOutlined } from '@ant-design/icons';
@@ -52,6 +52,7 @@ var InputMultiLine = /*#__PURE__*/React.forwardRef(function (prop, ref) {
       getPopupContainer = _prop$getPopupContain === void 0 ? function (triggerNode) {
     return triggerNode.parentNode.parentNode.parentNode.parentNode;
   } : _prop$getPopupContain,
+      textAreaProps = prop.textAreaProps,
       rest = _objectWithoutProperties(prop, _excluded); // 设置初始值
 
 
@@ -106,14 +107,16 @@ var InputMultiLine = /*#__PURE__*/React.forwardRef(function (prop, ref) {
         style: {
           width: popWidth
         }
-      }, /*#__PURE__*/React.createElement(_Input.TextArea, {
+      }, /*#__PURE__*/React.createElement(_Input.TextArea, _extends({
+        placeholder: "\u8BF7\u8F93\u5165"
+      }, textAreaProps, {
         rows: rows,
         value: lineText,
         onInput: lineInput,
         onKeyPress: function onKeyPress(e) {
           if (e.key === 'Enter') e.stopPropagation();
         }
-      })),
+      }))),
       trigger: "click",
       visible: rest.disabled || (fieldProps === null || fieldProps === void 0 ? void 0 : fieldProps.disabled) ? false : visible,
       onVisibleChange: setVisible,

package/es/components/InputTable.js

@@ -176,25 +176,28 @@ var InputTable = /*#__PURE__*/React.forwardRef(function (prop, ref) {
     return function loadData(_x) {
       return _ref.apply(this, arguments);
     };
-  }();
+  }(); // 初始化数据
+
 
   useEffect(function () {
-    var _formRef$current;
+    setTimeout(function () {
+      var _formRef$current, _formRef$current2;
 
-    var formValue = formRef === null || formRef === void 0 ? void 0 : (_formRef$current = formRef.current) === null || _formRef$current === void 0 ? void 0 : _formRef$current.getFieldsValue();
+      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);
 
-    if (!textName && formValue[name]) {
-      formValue[textNameProp] = formValue[name];
-      formRef === null || formRef === void 0 ? void 0 : formRef.current.setFieldsValue(_objectSpread({}, formValue));
-    } else if (textName && formValue[textName]) {
-      setText(formValue[textName]);
-    }
+      if (txt) {
+        setText(txt);
+      } else if (val) {
+        setText(val);
+      }
+    }, 0);
   }, []); // 处理返回数据
 
   var handleValue = function handleValue(row) {
-    var _formRef$current2, _formRef$current3;
+    var _formRef$current3, _formRef$current4;
 
-    var formValue = formRef === null || formRef === void 0 ? void 0 : (_formRef$current2 = formRef.current) === null || _formRef$current2 === void 0 ? void 0 : _formRef$current2.getFieldsValue();
+    var formValue = formRef === null || formRef === void 0 ? void 0 : (_formRef$current3 = formRef.current) === null || _formRef$current3 === void 0 ? void 0 : _formRef$current3.getFieldsValue();
     var txt; //支持多选
 
     if (Array.isArray(row)) {
@@ -232,7 +235,7 @@ var InputTable = /*#__PURE__*/React.forwardRef(function (prop, ref) {
     formValue[textNameProp] = txt;
     setText(txt);
     setVisible(false);
-    (_formRef$current3 = formRef.current) === null || _formRef$current3 === void 0 ? void 0 : _formRef$current3.setFieldsValue(_objectSpread({}, formValue));
+    (_formRef$current4 = formRef.current) === null || _formRef$current4 === void 0 ? void 0 : _formRef$current4.setFieldsValue(_objectSpread({}, formValue));
     onSelectChange === null || onSelectChange === void 0 ? void 0 : onSelectChange(row, formRef);
   }; // 可输入时,回车或失去焦点调接口查询数据
 
@@ -266,9 +269,9 @@ var InputTable = /*#__PURE__*/React.forwardRef(function (prop, ref) {
 
 
   var onInput = function onInput(e) {
-    var _formRef$current4;
+    var _formRef$current5;
 
-    var formValue = formRef === null || formRef === void 0 ? void 0 : (_formRef$current4 = formRef.current) === null || _formRef$current4 === void 0 ? void 0 : _formRef$current4.getFieldsValue();
+    var formValue = formRef === null || formRef === void 0 ? void 0 : (_formRef$current5 = formRef.current) === null || _formRef$current5 === void 0 ? void 0 : _formRef$current5.getFieldsValue();
     var val = e.target.value;
     formValue[name] = val;
     formValue[textNameProp] = val;
@@ -279,10 +282,10 @@ var InputTable = /*#__PURE__*/React.forwardRef(function (prop, ref) {
 
   var clearValue = function clearValue(e) {
     if (!e.target.value) {
-      var _formRef$current5;
+      var _formRef$current6;
 
       setText('');
-      var formValue = formRef === null || formRef === void 0 ? void 0 : (_formRef$current5 = formRef.current) === null || _formRef$current5 === void 0 ? void 0 : _formRef$current5.getFieldsValue();
+      var formValue = formRef === null || formRef === void 0 ? void 0 : (_formRef$current6 = formRef.current) === null || _formRef$current6 === void 0 ? void 0 : _formRef$current6.getFieldsValue();
       formValue[name] = '';
       formValue[textNameProp] = ''; // 不处理，其它表单自己清空
       // if (fillMap) {

package/es/components/Loading.d.ts

@@ -2,6 +2,7 @@
 import './common.less';
 declare type LoadingType = {
     Text?: string | JSX.Element;
+    className?: string;
 };
 declare const _default: (props: LoadingType) => JSX.Element;
 export default _default;

package/es/components/Loading.js

@@ -1,10 +1,23 @@
+import _extends from "@babel/runtime/helpers/esm/extends";
 import "antd/es/spin/style";
 import _Spin from "antd/es/spin";
+import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
+var _excluded = ["Text", "className"];
 import React from 'react';
 import './common.less';
 export default (function (props) {
-  var text = props.Text || '加载中...';
-  return /*#__PURE__*/React.createElement("div", {
-    className: "loading"
-  }, /*#__PURE__*/React.createElement(_Spin, null), text);
+  var _props$Text = props.Text,
+      Text = _props$Text === void 0 ? '加载中...' : _props$Text,
+      className = props.className,
+      rest = _objectWithoutProperties(props, _excluded);
+
+  var cls = "loading";
+
+  if (className) {
+    cls += " " + className;
+  }
+
+  return /*#__PURE__*/React.createElement("div", _extends({
+    className: cls
+  }, rest), " ", /*#__PURE__*/React.createElement(_Spin, null), Text);
 });

package/es/components/common.less

@@ -304,8 +304,13 @@ a:hover {
 
 
 .description-card {
+
+  .ant-pro-card-header {
+    height     : 50px;   
+  }
+
   .ant-pro-card-body {
-    padding: 20px 24px;
+    padding: 12px 24px 2px;
   }
 
   .ant-pro-card-header-border {
@@ -313,11 +318,11 @@ a:hover {
   }
 
   .ant-descriptions-item-label {
-    color: #666666;
+    color: #595959;
   }
 
   .ant-descriptions-item-content {
-    color: #333333;
+    color: #262626;
   }
 }
 

package/lib/components/DescritionCard.js

@@ -61,6 +61,7 @@ function DescritionCard(props) {
       rotate: !!collapsed ? 180 : undefined,
       style: {
         margin: 'auto',
+        marginLeft: '24px',
         fontSize: '16px',
         color: 'var(--ant-primary-color, #4997e6)'
       },

package/lib/components/InputMultiLine.d.ts

@@ -1,5 +1,6 @@
 import React from 'react';
 import type { InputProps } from 'antd';
+import type { TextAreaProps } from 'antd/lib/input';
 import type { ProFormItemProps } from 'ls-pro-form';
 export declare type InputMultiLineProps = ProFormItemProps<InputProps> & {
     /**@name 表单项name, 跟 form.item 的 name一致 */
@@ -15,6 +16,7 @@ export declare type InputMultiLineProps = ProFormItemProps<InputProps> & {
     /** @name 最大输入行数 */
     maxRows?: number;
     getPopupContainer?: (triggerNode: any) => HTMLElement;
+    textAreaProps?: TextAreaProps;
 };
 declare const InputMultiLine: React.ForwardRefExoticComponent<{
     fieldProps?: (import("../../../form/lib/interface").FieldProps & InputProps) | undefined;
@@ -39,5 +41,6 @@ declare const InputMultiLine: React.ForwardRefExoticComponent<{
     /** @name 最大输入行数 */
     maxRows?: number | undefined;
     getPopupContainer?: ((triggerNode: any) => HTMLElement) | undefined;
+    textAreaProps?: TextAreaProps | undefined;
 } & React.RefAttributes<unknown>>;
 export default InputMultiLine;

package/lib/components/InputMultiLine.js

@@ -9,8 +9,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
-var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
-
 require("antd/es/popover/style");
 
 var _popover = _interopRequireDefault(require("antd/es/popover"));
@@ -19,6 +17,8 @@ require("antd/es/input/style");
 
 var _input = _interopRequireDefault(require("antd/es/input"));
 
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
@@ -31,7 +31,7 @@ var _lsProForm = require("ls-pro-form");
 
 var _icons = require("@ant-design/icons");
 
-var _excluded = ["name", "rows", "maxRows", "placement", "popWidth", "fieldProps", "defaultValue", "allowClear", "getPopupContainer"];
+var _excluded = ["name", "rows", "maxRows", "placement", "popWidth", "fieldProps", "defaultValue", "allowClear", "getPopupContainer", "textAreaProps"];
 
 var InputMultiLine = /*#__PURE__*/_react.default.forwardRef(function (prop, ref) {
   //@ts-ignore
@@ -74,6 +74,7 @@ var InputMultiLine = /*#__PURE__*/_react.default.forwardRef(function (prop, ref)
       getPopupContainer = _prop$getPopupContain === void 0 ? function (triggerNode) {
     return triggerNode.parentNode.parentNode.parentNode.parentNode;
   } : _prop$getPopupContain,
+      textAreaProps = prop.textAreaProps,
       rest = (0, _objectWithoutProperties2.default)(prop, _excluded); // 设置初始值
 
   (0, _react.useEffect)(function () {
@@ -127,14 +128,16 @@ var InputMultiLine = /*#__PURE__*/_react.default.forwardRef(function (prop, ref)
         style: {
           width: popWidth
         }
-      }, /*#__PURE__*/_react.default.createElement(_input.default.TextArea, {
+      }, /*#__PURE__*/_react.default.createElement(_input.default.TextArea, (0, _extends2.default)({
+        placeholder: "\u8BF7\u8F93\u5165"
+      }, textAreaProps, {
         rows: rows,
         value: lineText,
         onInput: lineInput,
         onKeyPress: function onKeyPress(e) {
           if (e.key === 'Enter') e.stopPropagation();
         }
-      })),
+      }))),
       trigger: "click",
       visible: rest.disabled || (fieldProps === null || fieldProps === void 0 ? void 0 : fieldProps.disabled) ? false : visible,
       onVisibleChange: setVisible,

package/lib/components/InputTable.js

@@ -204,25 +204,28 @@ var InputTable = /*#__PURE__*/_react.default.forwardRef(function (prop, ref) {
     return function loadData(_x) {
       return _ref.apply(this, arguments);
     };
-  }();
+  }(); // 初始化数据
+
 
   (0, _react.useEffect)(function () {
-    var _formRef$current;
+    setTimeout(function () {
+      var _formRef$current, _formRef$current2;
 
-    var formValue = formRef === null || formRef === void 0 ? void 0 : (_formRef$current = formRef.current) === null || _formRef$current === void 0 ? void 0 : _formRef$current.getFieldsValue();
+      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);
 
-    if (!textName && formValue[name]) {
-      formValue[textNameProp] = formValue[name];
-      formRef === null || formRef === void 0 ? void 0 : formRef.current.setFieldsValue((0, _objectSpread2.default)({}, formValue));
-    } else if (textName && formValue[textName]) {
-      setText(formValue[textName]);
-    }
+      if (txt) {
+        setText(txt);
+      } else if (val) {
+        setText(val);
+      }
+    }, 0);
   }, []); // 处理返回数据
 
   var handleValue = function handleValue(row) {
-    var _formRef$current2, _formRef$current3;
+    var _formRef$current3, _formRef$current4;
 
-    var formValue = formRef === null || formRef === void 0 ? void 0 : (_formRef$current2 = formRef.current) === null || _formRef$current2 === void 0 ? void 0 : _formRef$current2.getFieldsValue();
+    var formValue = formRef === null || formRef === void 0 ? void 0 : (_formRef$current3 = formRef.current) === null || _formRef$current3 === void 0 ? void 0 : _formRef$current3.getFieldsValue();
     var txt; //支持多选
 
     if (Array.isArray(row)) {
@@ -260,7 +263,7 @@ var InputTable = /*#__PURE__*/_react.default.forwardRef(function (prop, ref) {
     formValue[textNameProp] = txt;
     setText(txt);
     setVisible(false);
-    (_formRef$current3 = formRef.current) === null || _formRef$current3 === void 0 ? void 0 : _formRef$current3.setFieldsValue((0, _objectSpread2.default)({}, formValue));
+    (_formRef$current4 = formRef.current) === null || _formRef$current4 === void 0 ? void 0 : _formRef$current4.setFieldsValue((0, _objectSpread2.default)({}, formValue));
     onSelectChange === null || onSelectChange === void 0 ? void 0 : onSelectChange(row, formRef);
   }; // 可输入时,回车或失去焦点调接口查询数据
 
@@ -294,9 +297,9 @@ var InputTable = /*#__PURE__*/_react.default.forwardRef(function (prop, ref) {
 
 
   var onInput = function onInput(e) {
-    var _formRef$current4;
+    var _formRef$current5;
 
-    var formValue = formRef === null || formRef === void 0 ? void 0 : (_formRef$current4 = formRef.current) === null || _formRef$current4 === void 0 ? void 0 : _formRef$current4.getFieldsValue();
+    var formValue = formRef === null || formRef === void 0 ? void 0 : (_formRef$current5 = formRef.current) === null || _formRef$current5 === void 0 ? void 0 : _formRef$current5.getFieldsValue();
     var val = e.target.value;
     formValue[name] = val;
     formValue[textNameProp] = val;
@@ -307,10 +310,10 @@ var InputTable = /*#__PURE__*/_react.default.forwardRef(function (prop, ref) {
 
   var clearValue = function clearValue(e) {
     if (!e.target.value) {
-      var _formRef$current5;
+      var _formRef$current6;
 
       setText('');
-      var formValue = formRef === null || formRef === void 0 ? void 0 : (_formRef$current5 = formRef.current) === null || _formRef$current5 === void 0 ? void 0 : _formRef$current5.getFieldsValue();
+      var formValue = formRef === null || formRef === void 0 ? void 0 : (_formRef$current6 = formRef.current) === null || _formRef$current6 === void 0 ? void 0 : _formRef$current6.getFieldsValue();
       formValue[name] = '';
       formValue[textNameProp] = ''; // 不处理，其它表单自己清空
       // if (fillMap) {

package/lib/components/Loading.d.ts

@@ -2,6 +2,7 @@
 import './common.less';
 declare type LoadingType = {
     Text?: string | JSX.Element;
+    className?: string;
 };
 declare const _default: (props: LoadingType) => JSX.Element;
 export default _default;

package/lib/components/Loading.js

@@ -7,19 +7,34 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+
 require("antd/es/spin/style");
 
 var _spin = _interopRequireDefault(require("antd/es/spin"));
 
+var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
+
 var _react = _interopRequireDefault(require("react"));
 
 require("./common.less");
 
+var _excluded = ["Text", "className"];
+
 var _default = function _default(props) {
-  var text = props.Text || '加载中...';
-  return /*#__PURE__*/_react.default.createElement("div", {
-    className: "loading"
-  }, /*#__PURE__*/_react.default.createElement(_spin.default, null), text);
+  var _props$Text = props.Text,
+      Text = _props$Text === void 0 ? '加载中...' : _props$Text,
+      className = props.className,
+      rest = (0, _objectWithoutProperties2.default)(props, _excluded);
+  var cls = "loading";
+
+  if (className) {
+    cls += " " + className;
+  }
+
+  return /*#__PURE__*/_react.default.createElement("div", (0, _extends2.default)({
+    className: cls
+  }, rest), " ", /*#__PURE__*/_react.default.createElement(_spin.default, null), Text);
 };
 
 exports.default = _default;

package/lib/components/common.less

@@ -304,8 +304,13 @@ a:hover {
 
 
 .description-card {
+
+  .ant-pro-card-header {
+    height     : 50px;   
+  }
+
   .ant-pro-card-body {
-    padding: 20px 24px;
+    padding: 12px 24px 2px;
   }
 
   .ant-pro-card-header-border {
@@ -313,11 +318,11 @@ a:hover {
   }
 
   .ant-descriptions-item-label {
-    color: #666666;
+    color: #595959;
   }
 
   .ant-descriptions-item-content {
-    color: #333333;
+    color: #262626;
   }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ls-pro-common",
-  "version": "1.0.88",
+  "version": "1.0.89",
   "description": "ls-pro-common",
   "keywords": [
     "antd",  
@@ -27,7 +27,7 @@
   ],
   "dependencies": {
     "@ant-design/icons": "^4.3.0",
-    "ls-pro-table": "2.62.63",
+    "ls-pro-table": "2.62.64",
     "ls-pro-form": "1.52.34",
     "ls-pro-descriptions":"^1.10.33",
     "@babel/runtime": "^7.16.3",