ls-pro-common 1.0.32 → 1.0.35

package/lib/components/InputMultiLine.js

@@ -0,0 +1,165 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+
+require("antd/es/popover/style");
+
+var _popover = _interopRequireDefault(require("antd/es/popover"));
+
+require("antd/es/input/style");
+
+var _input = _interopRequireDefault(require("antd/es/input"));
+
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+
+var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
+
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+
+var _react = _interopRequireWildcard(require("react"));
+
+var _lsProForm = require("ls-pro-form");
+
+var _icons = require("@ant-design/icons");
+
+var _excluded = ["name", "rows", "maxRows", "placement", "popWidth", "fieldProps", "value", "allowClear"];
+
+var InputMultiLine = /*#__PURE__*/_react.default.forwardRef(function (prop, ref) {
+  //@ts-ignore
+  var _useContext = (0, _react.useContext)(_lsProForm.ProFormContext),
+      formRef = _useContext.formRef;
+
+  var _useState = (0, _react.useState)(''),
+      _useState2 = (0, _slicedToArray2.default)(_useState, 2),
+      text = _useState2[0],
+      setText = _useState2[1];
+
+  var _useState3 = (0, _react.useState)(''),
+      _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
+      lineText = _useState4[0],
+      setLineText = _useState4[1];
+
+  var _useState5 = (0, _react.useState)(false),
+      _useState6 = (0, _slicedToArray2.default)(_useState5, 2),
+      visible = _useState6[0],
+      setVisible = _useState6[1];
+
+  var inputRef = (0, _react.useRef)();
+  (0, _react.useImperativeHandle)(ref, function () {
+    return inputRef.current;
+  });
+  var name = prop.name,
+      _prop$rows = prop.rows,
+      rows = _prop$rows === void 0 ? 12 : _prop$rows,
+      _prop$maxRows = prop.maxRows,
+      maxRows = _prop$maxRows === void 0 ? 20 : _prop$maxRows,
+      _prop$placement = prop.placement,
+      placement = _prop$placement === void 0 ? 'bottom' : _prop$placement,
+      _prop$popWidth = prop.popWidth,
+      popWidth = _prop$popWidth === void 0 ? '400px' : _prop$popWidth,
+      fieldProps = prop.fieldProps,
+      value = prop.value,
+      _prop$allowClear = prop.allowClear,
+      allowClear = _prop$allowClear === void 0 ? true : _prop$allowClear,
+      rest = (0, _objectWithoutProperties2.default)(prop, _excluded); // 设置初始值
+
+  (0, _react.useEffect)(function () {
+    if (value) {
+      setText(value);
+    } 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]);
+    }
+  }, []); // 显示多行输入时，赋值给多行文本框
+
+  (0, _react.useEffect)(function () {
+    if (!visible) return;
+    var line = (text || '').split(',').join('\n');
+    setLineText(line);
+  }, [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();
+    formValue[name] = text;
+    (_formRef$current3 = formRef.current) === null || _formRef$current3 === void 0 ? void 0 : _formRef$current3.setFieldsValue((0, _objectSpread2.default)({}, formValue));
+  }, [text]);
+
+  var lineInput = function lineInput(e) {
+    var line = (e.target.value || '').split('\n').filter(function (o, i) {
+      return i <= (maxRows < 1 ? 1000 : maxRows);
+    }).join('\n');
+    var txt = line.split('\n').join(',');
+    setLineText(line);
+    setText(txt);
+  };
+
+  var textInput = function textInput(e) {
+    setText(e.target.value);
+  };
+
+  var clearValue = function clearValue(e) {
+    if (!e.target.value) {
+      setText('');
+      setLineText('');
+    }
+  };
+
+  var PopoverDom = (0, _react.useMemo)(function () {
+    return /*#__PURE__*/_react.default.createElement(_popover.default, {
+      content: /*#__PURE__*/_react.default.createElement("div", {
+        style: {
+          width: popWidth
+        }
+      }, /*#__PURE__*/_react.default.createElement(_input.default.TextArea, {
+        rows: rows,
+        value: lineText,
+        onInput: lineInput,
+        onKeyPress: function onKeyPress(e) {
+          if (e.key === 'Enter') e.stopPropagation();
+        }
+      })),
+      trigger: "click",
+      visible: visible,
+      onVisibleChange: setVisible
+    }, /*#__PURE__*/_react.default.createElement(_icons.UnorderedListOutlined, {
+      onClick: function onClick(e) {
+        if (rest.disabled || (fieldProps === null || fieldProps === void 0 ? void 0 : fieldProps.disabled)) return;
+        setVisible(true);
+      }
+    }));
+  }, [visible, popWidth, lineText, rest]);
+  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, rest.label && name ? /*#__PURE__*/_react.default.createElement(_lsProForm.ProFormText, (0, _extends2.default)({
+    name: name
+  }, rest), /*#__PURE__*/_react.default.createElement(_input.default, (0, _extends2.default)({
+    suffix: PopoverDom
+  }, fieldProps, {
+    onChange: clearValue,
+    onInput: textInput,
+    allowClear: allowClear,
+    ref: inputRef
+  }))) : /*#__PURE__*/_react.default.createElement(_input.default, (0, _extends2.default)({
+    suffix: PopoverDom,
+    allowClear: allowClear
+  }, fieldProps, {
+    onChange: clearValue,
+    onInput: textInput,
+    value: text,
+    ref: inputRef
+  })));
+});
+
+var _default = InputMultiLine;
+exports.default = _default;

package/lib/components/InputTable.d.ts

@@ -1,4 +1,4 @@
-/// <reference types="react" />
+import React from 'react';
 import type { InputProps } from 'antd';
 import type { ProFormItemProps } from 'ls-pro-form';
 export declare type InputTableProps = ProFormItemProps<InputProps> & {
@@ -41,5 +41,53 @@ export declare type InputTableProps = ProFormItemProps<InputProps> & {
     /**@name 加载之后事件,row为接口返回数据，可以通过此方法调整 */
     afterLoad?: (rows: any[]) => void;
 };
-declare function InputTable(prop: InputTableProps): JSX.Element;
+declare const InputTable: React.ForwardRefExoticComponent<{
+    fieldProps?: (import("../../../form/lib/interface").FieldProps & InputProps) | undefined;
+    placeholder?: string | string[] | undefined;
+    secondary?: boolean | undefined;
+    allowClear?: boolean | undefined;
+    disabled?: boolean | undefined;
+    width?: number | "sm" | "md" | "xl" | "xs" | "lg" | undefined;
+    proFieldProps?: import("../../../utils/lib").ProFieldProps | undefined;
+    footerRender?: import("../../../form/lib").LightFilterFooterRender | undefined;
+} & Omit<import("../../../form/lib/components/FormItem").ProFormItemProps, "valueType"> & import("../../../form/lib/interface").ExtendsProps & {
+    /**@name 弹框选择表格列配置 */
+    columns: any[];
+    /**@name 调用后端API地址 */
+    url: string;
+    /**@name 弹框表格高度，默认400 */
+    tableHeight?: number | undefined;
+    /**@name 弹框表格宽度，默认650*/
+    tableWidth?: number | undefined;
+    /**@name 是否支持多选 */
+    multiple?: boolean | undefined;
+    /**@name 表单项name, 跟 form.item 的 name一致 */
+    name: string;
+    /**@name 返回的值字段，表格中valueField配置的字段时返回给name */
+    valueField: string;
+    /**@name 返回输入框显示的字段，textField字段值返回给textName */
+    textField?: string | undefined;
+    /**@name 用于接收textField返回的值 */
+    textName?: string | undefined;
+    /** @name 表格的其它配置 */
+    tableConfig?: any;
+    /**@name 表单label宽度，默认70 */
+    labelWidth?: number | undefined;
+    /**@name 是否2.0接口  */
+    isV2?: boolean | undefined;
+    /**@name 是否支持跨页选择 */
+    keepSelect?: boolean | undefined;
+    /**@name 回车事件查询关键字 */
+    searchField?: string | undefined;
+    /**@name 填充其它表单项目配置 */
+    fillMap?: Record<string, string> | undefined;
+    /**@name 输入后检查数据的触发方式，默认为entry回车触发 */
+    triggerCheck?: "entry" | "blur" | undefined;
+    /**@name 选择行事件 */
+    onSelectChange?: ((item: any, formRef?: any) => void) | undefined;
+    /**@name 加载之前事件,param为查询条件对象,可以通过此方法调整 */
+    beforeLoad?: ((param: any) => void) | undefined;
+    /**@name 加载之后事件,row为接口返回数据，可以通过此方法调整 */
+    afterLoad?: ((rows: any[]) => void) | undefined;
+} & React.RefAttributes<unknown>>;
 export default InputTable;

package/lib/components/InputTable.js

@@ -48,7 +48,7 @@ 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", "triggerCheck"],
     _excluded2 = ["current", "pageSize"];
 
-function InputTable(prop) {
+var InputTable = /*#__PURE__*/_react.default.forwardRef(function (prop, ref) {
   //@ts-ignore
   var _useContext = (0, _react.useContext)(_lsProForm.ProFormContext),
       formRef = _useContext.formRef;
@@ -70,6 +70,10 @@ function InputTable(prop) {
       text = _useState6[0],
       setText = _useState6[1];
 
+  var inputRef = (0, _react.useRef)();
+  (0, _react.useImperativeHandle)(ref, function () {
+    return inputRef.current;
+  });
   var columns = prop.columns,
       url = prop.url,
       textName = prop.textName,
@@ -396,7 +400,8 @@ function InputTable(prop) {
       }
     },
     readOnly: readonly,
-    allowClear: allowClear
+    allowClear: allowClear,
+    ref: inputRef
   }, fieldProps))) : /*#__PURE__*/_react.default.createElement(_input.default, (0, _extends2.default)({
     suffix: /*#__PURE__*/_react.default.createElement(_popover.default, {
       content: /*#__PURE__*/_react.default.createElement("div", {
@@ -434,9 +439,10 @@ function InputTable(prop) {
     onChange: clearValue,
     readOnly: readonly,
     value: text,
-    allowClear: allowClear
+    allowClear: allowClear,
+    ref: inputRef
   }, fieldProps)));
-}
+});
 
 var _default = InputTable;
 exports.default = _default;

package/lib/hooks/useDtl/index.js

@@ -757,35 +757,44 @@ function useDtl(dtlParam) {
             case 9:
               result = _context8.sent;
 
+              if (!(result.data && typeof result.data === 'string')) {
+                _context8.next = 13;
+                break;
+              }
+
+              window.open(result.data);
+              return _context8.abrupt("return", true);
+
+            case 13:
               if (!(((_result$flag5 = result.flag) === null || _result$flag5 === void 0 ? void 0 : _result$flag5.retCode) === '0')) {
-                _context8.next = 15;
+                _context8.next = 18;
                 break;
               }
 
               (0, _utils.showSuccess)(((_result$flag6 = result.flag) === null || _result$flag6 === void 0 ? void 0 : _result$flag6.retMsg) || '导出成功');
               return _context8.abrupt("return", true);
 
-            case 15:
+            case 18:
               (0, _utils.showError)(((_result$flag7 = result.flag) === null || _result$flag7 === void 0 ? void 0 : _result$flag7.retMsg) || '导出失败,请联系系统管理员');
               return _context8.abrupt("return", false);
 
-            case 17:
-              _context8.next = 24;
+            case 20:
+              _context8.next = 27;
               break;
 
-            case 19:
-              _context8.prev = 19;
+            case 22:
+              _context8.prev = 22;
               _context8.t0 = _context8["catch"](6);
               console.log(_context8.t0);
               (0, _utils.showError)(_context8.t0.message);
               return _context8.abrupt("return", false);
 
-            case 24:
+            case 27:
             case "end":
               return _context8.stop();
           }
         }
-      }, _callee8, null, [[6, 19]]);
+      }, _callee8, null, [[6, 22]]);
     }));
 
     return function onExportDtl(_x6, _x7) {

package/lib/hooks/useSingle/index.js

@@ -628,35 +628,44 @@ function useSingle(inParam) {
             case 9:
               result = _context7.sent;
 
+              if (!(result.data && typeof result.data === 'string')) {
+                _context7.next = 13;
+                break;
+              }
+
+              window.open(result.data);
+              return _context7.abrupt("return", true);
+
+            case 13:
               if (!(((_result$flag4 = result.flag) === null || _result$flag4 === void 0 ? void 0 : _result$flag4.retCode) === '0')) {
-                _context7.next = 15;
+                _context7.next = 18;
                 break;
               }
 
               (0, _utils.showSuccess)(((_result$flag5 = result.flag) === null || _result$flag5 === void 0 ? void 0 : _result$flag5.retMsg) || '导出成功');
               return _context7.abrupt("return", true);
 
-            case 15:
+            case 18:
               (0, _utils.showError)(((_result$flag6 = result.flag) === null || _result$flag6 === void 0 ? void 0 : _result$flag6.retMsg) || '导出失败,请联系系统管理员');
               return _context7.abrupt("return", false);
 
-            case 17:
-              _context7.next = 24;
+            case 20:
+              _context7.next = 27;
               break;
 
-            case 19:
-              _context7.prev = 19;
+            case 22:
+              _context7.prev = 22;
               _context7.t0 = _context7["catch"](6);
               console.log(_context7.t0);
               (0, _utils.showError)(_context7.t0.message);
               return _context7.abrupt("return", false);
 
-            case 24:
+            case 27:
             case "end":
               return _context7.stop();
           }
         }
-      }, _callee7, null, [[6, 19]]);
+      }, _callee7, null, [[6, 22]]);
     }));
 
     return function onExport(_x8, _x9) {

package/lib/http/index.js

@@ -307,12 +307,9 @@ function _getDict() {
           case 0:
             showValue = _args6.length > 1 && _args6[1] !== undefined ? _args6[1] : true;
             needGateWay = _args6.length > 2 && _args6[2] !== undefined ? _args6[2] : true;
-            api = '/lesoon-integration/sysDictDtl';
+            api = '/lesoon-integration/sysDictDtl/listByProperties';
             param = {
-              where: {
-                dictCode: dictCode
-              },
-              ifPage: 0
+              dictCode: dictCode
             };
             return _context6.abrupt("return", fetchOptions(api, param, 'dictValue', 'displayName', showValue, needGateWay));
 

package/lib/index.d.ts

@@ -3,6 +3,7 @@ import InputTable from './components/InputTable';
 import Page404 from './components/404';
 import Loading from './components/Loading';
 import IconSelector from './components/IconSelector';
+import InputMultiLine from './components/InputMultiLine';
 import BaseService from './service/BaseService';
 import request, { httpGet, httpPut, httpPost, httpDelete, getDict, fetchOptions } from './http';
 import * as utils from './utils';
@@ -14,4 +15,4 @@ import usePermission from './hooks/usePermission';
 import type { ApiResponse, TableToolbar, BaseApiType, MethodType } from './typing';
 import type { DtlLyaoutProps } from './components/DtlLayout';
 export type { ApiResponse, TableToolbar, BaseApiType, MethodType, DtlLyaoutProps };
-export { DtlLayout, InputTable, Page404, Loading, IconSelector, BaseService, request, httpDelete, httpGet, httpPost, httpPut, getDict, fetchOptions, utils, useSingle, useDtl, usePermission };
+export { DtlLayout, InputTable, Page404, Loading, IconSelector, InputMultiLine, BaseService, request, httpDelete, httpGet, httpPost, httpPut, getDict, fetchOptions, utils, useSingle, useDtl, usePermission };

package/lib/index.js

@@ -25,6 +25,12 @@ Object.defineProperty(exports, "IconSelector", {
     return _IconSelector.default;
   }
 });
+Object.defineProperty(exports, "InputMultiLine", {
+  enumerable: true,
+  get: function get() {
+    return _InputMultiLine.default;
+  }
+});
 Object.defineProperty(exports, "InputTable", {
   enumerable: true,
   get: function get() {
@@ -115,6 +121,8 @@ var _Loading = _interopRequireDefault(require("./components/Loading"));
 
 var _IconSelector = _interopRequireDefault(require("./components/IconSelector"));
 
+var _InputMultiLine = _interopRequireDefault(require("./components/InputMultiLine"));
+
 var _BaseService = _interopRequireDefault(require("./service/BaseService"));
 
 var _http = _interopRequireWildcard(require("./http"));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ls-pro-common",
-  "version": "1.0.32",
+  "version": "1.0.35",
   "description": "ls-pro-common",
   "keywords": [
     "antd",  
@@ -28,8 +28,8 @@
   ],
   "dependencies": {
     "@ant-design/icons": "^4.3.0",
-    "ls-pro-table": "2.62.26",
-    "ls-pro-form": "1.52.24",
+    "ls-pro-table": "2.62.28",
+    "ls-pro-form": "1.52.25",
     "@babel/runtime": "^7.16.3",
     "classnames": "^2.2.6",
     "moment": "^2.27.0",