ls-pro-common 1.0.32 → 1.0.35

package/es/components/IconSelector.js

@@ -129,7 +129,14 @@ function IconSelector(prop) {
   var totalPage = useMemo(function () {
     if (total === 0) return 1;
     return Math.ceil(total / pageSize);
-  }, [total]); // 验证上传文件大小
+  }, [total]);
+  useEffect(function () {
+    var val = formRef.current.getFieldsValue();
+
+    if (val && val[name]) {
+      setImgUrl(toGatewayUrl(val[name]));
+    }
+  }, []); // 验证上传文件大小
 
   var beforeUpload = function beforeUpload(file) {
     var sizeLimit = file.size / 1024 / 1024 >= maxSize;

package/es/components/InputMultiLine.d.ts

@@ -0,0 +1,41 @@
+import React from 'react';
+import type { InputProps } from 'antd';
+import type { ProFormItemProps } from 'ls-pro-form';
+export declare type InputMultiLineProps = ProFormItemProps<InputProps> & {
+    /**@name 表单项name, 跟 form.item 的 name一致 */
+    name: string;
+    /**@name 表单值*/
+    value?: string;
+    /**@name 弹框宽度,默认为400 */
+    popWidth?: string;
+    /**@name 弹框位置，默认为bottom */
+    placement?: string;
+    /**@name 多行文本框行数 */
+    rows?: number;
+    /** @name 最大输入行数 */
+    maxRows?: number;
+};
+declare const InputMultiLine: 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 表单项name, 跟 form.item 的 name一致 */
+    name: string;
+    /**@name 表单值*/
+    value?: string | undefined;
+    /**@name 弹框宽度,默认为400 */
+    popWidth?: string | undefined;
+    /**@name 弹框位置，默认为bottom */
+    placement?: string | undefined;
+    /**@name 多行文本框行数 */
+    rows?: number | undefined;
+    /** @name 最大输入行数 */
+    maxRows?: number | undefined;
+} & React.RefAttributes<unknown>>;
+export default InputMultiLine;

package/es/components/InputMultiLine.js

@@ -0,0 +1,142 @@
+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 _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", "value", "allowClear"];
+import React, { useRef, useState, useEffect, useContext, useMemo, useImperativeHandle } from 'react';
+import { ProFormText, ProFormContext } from 'ls-pro-form';
+import { UnorderedListOutlined } from '@ant-design/icons';
+var InputMultiLine = /*#__PURE__*/React.forwardRef(function (prop, ref) {
+  //@ts-ignore
+  var _useContext = useContext(ProFormContext),
+      formRef = _useContext.formRef;
+
+  var _useState = useState(''),
+      _useState2 = _slicedToArray(_useState, 2),
+      text = _useState2[0],
+      setText = _useState2[1];
+
+  var _useState3 = useState(''),
+      _useState4 = _slicedToArray(_useState3, 2),
+      lineText = _useState4[0],
+      setLineText = _useState4[1];
+
+  var _useState5 = useState(false),
+      _useState6 = _slicedToArray(_useState5, 2),
+      visible = _useState6[0],
+      setVisible = _useState6[1];
+
+  var inputRef = useRef();
+  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 = _objectWithoutProperties(prop, _excluded); // 设置初始值
+
+
+  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]);
+    }
+  }, []); // 显示多行输入时，赋值给多行文本框
+
+  useEffect(function () {
+    if (!visible) return;
+    var line = (text || '').split(',').join('\n');
+    setLineText(line);
+  }, [visible, text]); // 输入框值变化时，赋值给表单项
+
+  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(_objectSpread({}, 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 = useMemo(function () {
+    return /*#__PURE__*/React.createElement(_Popover, {
+      content: /*#__PURE__*/React.createElement("div", {
+        style: {
+          width: popWidth
+        }
+      }, /*#__PURE__*/React.createElement(_Input.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.createElement(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.createElement(React.Fragment, null, rest.label && name ? /*#__PURE__*/React.createElement(ProFormText, _extends({
+    name: name
+  }, rest), /*#__PURE__*/React.createElement(_Input, _extends({
+    suffix: PopoverDom
+  }, fieldProps, {
+    onChange: clearValue,
+    onInput: textInput,
+    allowClear: allowClear,
+    ref: inputRef
+  }))) : /*#__PURE__*/React.createElement(_Input, _extends({
+    suffix: PopoverDom,
+    allowClear: allowClear
+  }, fieldProps, {
+    onChange: clearValue,
+    onInput: textInput,
+    value: text,
+    ref: inputRef
+  })));
+});
+export default InputMultiLine;

package/es/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/es/components/InputTable.js

@@ -12,15 +12,13 @@ import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutPr
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 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"];
-import React from "react";
-import { useRef, useState, useEffect, useContext, useMemo } from 'react';
+import React, { useRef, useState, useEffect, useContext, useMemo, useImperativeHandle } from 'react';
 import ProTable from 'ls-pro-table';
 import { ProFormText, ProFormContext } from 'ls-pro-form';
 import { MoreOutlined } from '@ant-design/icons';
 import { httpGet } from '../http';
 import { showWarn } from '../utils';
-
-function InputTable(prop) {
+var InputTable = /*#__PURE__*/React.forwardRef(function (prop, ref) {
   //@ts-ignore
   var _useContext = useContext(ProFormContext),
       formRef = _useContext.formRef;
@@ -42,6 +40,11 @@ function InputTable(prop) {
       text = _useState6[0],
       setText = _useState6[1];
 
+  var inputRef = useRef();
+  useImperativeHandle(ref, function () {
+    return inputRef.current;
+  });
+
   var columns = prop.columns,
       url = prop.url,
       textName = prop.textName,
@@ -368,7 +371,8 @@ function InputTable(prop) {
       }
     },
     readOnly: readonly,
-    allowClear: allowClear
+    allowClear: allowClear,
+    ref: inputRef
   }, fieldProps))) : /*#__PURE__*/React.createElement(_Input, _extends({
     suffix: /*#__PURE__*/React.createElement(_Popover, {
       content: /*#__PURE__*/React.createElement("div", {
@@ -406,8 +410,8 @@ function InputTable(prop) {
     onChange: clearValue,
     readOnly: readonly,
     value: text,
-    allowClear: allowClear
+    allowClear: allowClear,
+    ref: inputRef
   }, fieldProps)));
-}
-
+});
 export default InputTable;

package/es/hooks/useDtl/index.js

@@ -736,35 +736,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;
               }
 
               showSuccess(((_result$flag6 = result.flag) === null || _result$flag6 === void 0 ? void 0 : _result$flag6.retMsg) || '导出成功');
               return _context8.abrupt("return", true);
 
-            case 15:
+            case 18:
               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);
               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/es/hooks/useSingle/index.js

@@ -607,35 +607,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;
               }
 
               showSuccess(((_result$flag5 = result.flag) === null || _result$flag5 === void 0 ? void 0 : _result$flag5.retMsg) || '导出成功');
               return _context7.abrupt("return", true);
 
-            case 15:
+            case 18:
               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);
               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/es/http/index.js

@@ -283,12 +283,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/es/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/es/index.js

@@ -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';
@@ -11,4 +12,4 @@ import * as utils from './utils';
 import useSingle from './hooks/useSingle';
 import useDtl from './hooks/useDtl';
 import usePermission from './hooks/usePermission';
-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/components/IconSelector.js

@@ -159,7 +159,14 @@ function IconSelector(prop) {
   var totalPage = (0, _react.useMemo)(function () {
     if (total === 0) return 1;
     return Math.ceil(total / pageSize);
-  }, [total]); // 验证上传文件大小
+  }, [total]);
+  (0, _react.useEffect)(function () {
+    var val = formRef.current.getFieldsValue();
+
+    if (val && val[name]) {
+      setImgUrl((0, _utils.toGatewayUrl)(val[name]));
+    }
+  }, []); // 验证上传文件大小
 
   var beforeUpload = function beforeUpload(file) {
     var sizeLimit = file.size / 1024 / 1024 >= maxSize;

package/lib/components/InputMultiLine.d.ts

@@ -0,0 +1,41 @@
+import React from 'react';
+import type { InputProps } from 'antd';
+import type { ProFormItemProps } from 'ls-pro-form';
+export declare type InputMultiLineProps = ProFormItemProps<InputProps> & {
+    /**@name 表单项name, 跟 form.item 的 name一致 */
+    name: string;
+    /**@name 表单值*/
+    value?: string;
+    /**@name 弹框宽度,默认为400 */
+    popWidth?: string;
+    /**@name 弹框位置，默认为bottom */
+    placement?: string;
+    /**@name 多行文本框行数 */
+    rows?: number;
+    /** @name 最大输入行数 */
+    maxRows?: number;
+};
+declare const InputMultiLine: 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 表单项name, 跟 form.item 的 name一致 */
+    name: string;
+    /**@name 表单值*/
+    value?: string | undefined;
+    /**@name 弹框宽度,默认为400 */
+    popWidth?: string | undefined;
+    /**@name 弹框位置，默认为bottom */
+    placement?: string | undefined;
+    /**@name 多行文本框行数 */
+    rows?: number | undefined;
+    /** @name 最大输入行数 */
+    maxRows?: number | undefined;
+} & React.RefAttributes<unknown>>;
+export default InputMultiLine;