ls-pro-common 3.0.61 → 3.0.62

package/lib/components/InputTable.d.ts

@@ -3,48 +3,49 @@ import type { InputProps } from 'antd';
 import type { ProFormItemProps } from 'ls-pro-form';
 import { TooltipPlacement } from 'antd/lib/tooltip';
 export declare type InputTableProps = ProFormItemProps<InputProps> & {
-    /**@name 弹框选择表格列配置 */
+    /** @name 弹框选择表格列配置 */
     columns: any[];
-    /**@name 调用后端API地址 */
+    /** @name 调用后端API地址 */
     url: string;
-    /**@name 弹框表格高度，默认400 */
+    /** @name 弹框表格高度，默认400 */
     tableHeight?: number;
-    /**@name 弹框表格宽度，默认650*/
+    /** @name 弹框表格宽度，默认650 */
     tableWidth?: number;
-    /**@name 是否支持多选 */
+    /** @name 是否支持多选 */
     multiple?: boolean;
-    /**@name 表单项name, 跟 form.item 的 name一致 */
+    /** @name 表单项name, 跟 form.item 的 name一致 */
     name: string;
-    /**@name 返回的值字段，表格中valueField配置的字段时返回给name */
+    /** @name 返回的值字段，表格中valueField配置的字段时返回给name */
     valueField: string;
-    /**@name 返回输入框显示的字段，textField字段值返回给textName */
+    /** @name 返回输入框显示的字段，textField字段值返回给textName */
     textField?: string;
-    /**@name 用于接收textField返回的值 */
+    /** @name 用于接收textField返回的值 */
     textName?: string;
     /** @name 表格的其它配置 */
     tableConfig?: any;
-    /**@name 表单label宽度，默认70 */
+    /** @name 表单label宽度，默认70 */
     labelWidth?: number;
-    /**@name 是否2.0接口  */
+    /** @name 是否2.0接口 */
     isV2?: boolean;
-    /**@name 是否支持跨页选择 */
+    /** @name 是否支持跨页选择 */
     keepSelect?: boolean;
-    /**@name 回车事件查询关键字 */
+    /** @name 回车事件查询关键字 */
     searchField?: string;
-    /**@name 填充其它表单项目配置 */
+    /** @name 填充其它表单项目配置 */
     fillMap?: Record<string, string>;
-    /**@name 输入后检查数据的触发方式，默认为entry回车触发 */
+    /** @name 输入后检查数据的触发方式，默认为entry回车触发 */
     triggerCheck?: 'entry' | 'blur';
-    /**@name 每次展示面板时都加载数据，接合 tableConfig里的 manualRequest 一起使用 */
+    /** @name 每次展示面板时都加载数据，接合 tableConfig里的 manualRequest 一起使用 */
     loadOnShow?: boolean;
     placement?: TooltipPlacement;
     arrowPointAtCenter?: boolean;
+    method?: 'GET' | 'POST';
     rowKey?: any;
-    /**@name 选择行事件 */
+    /** @name 选择行事件 */
     onSelectChange?: (item: any, formRef?: any) => void;
-    /**@name 加载之前事件,param为查询条件对象,可以通过此方法调整 */
+    /** @name 加载之前事件,param为查询条件对象,可以通过此方法调整 */
     beforeLoad?: (param: any) => void;
-    /**@name 加载之后事件,row为接口返回数据，可以通过此方法调整 */
+    /** @name 加载之后事件,row为接口返回数据，可以通过此方法调整 */
     afterLoad?: (rows: any[]) => void;
     getPopupContainer?: (triggerNode: any) => HTMLElement;
 };
@@ -58,48 +59,49 @@ declare const InputTable: React.ForwardRefExoticComponent<{
     proFieldProps?: import("ls-pro-utils").ProFieldProps | undefined;
     footerRender?: import("ls-pro-form").LightFilterFooterRender | undefined;
 } & Omit<import("ls-pro-form/lib/components/FormItem").ProFormItemProps, "valueType"> & import("ls-pro-form/lib/interface").ExtendsProps & {
-    /**@name 弹框选择表格列配置 */
+    /** @name 弹框选择表格列配置 */
     columns: any[];
-    /**@name 调用后端API地址 */
+    /** @name 调用后端API地址 */
     url: string;
-    /**@name 弹框表格高度，默认400 */
+    /** @name 弹框表格高度，默认400 */
     tableHeight?: number | undefined;
-    /**@name 弹框表格宽度，默认650*/
+    /** @name 弹框表格宽度，默认650 */
     tableWidth?: number | undefined;
-    /**@name 是否支持多选 */
+    /** @name 是否支持多选 */
     multiple?: boolean | undefined;
-    /**@name 表单项name, 跟 form.item 的 name一致 */
+    /** @name 表单项name, 跟 form.item 的 name一致 */
     name: string;
-    /**@name 返回的值字段，表格中valueField配置的字段时返回给name */
+    /** @name 返回的值字段，表格中valueField配置的字段时返回给name */
     valueField: string;
-    /**@name 返回输入框显示的字段，textField字段值返回给textName */
+    /** @name 返回输入框显示的字段，textField字段值返回给textName */
     textField?: string | undefined;
-    /**@name 用于接收textField返回的值 */
+    /** @name 用于接收textField返回的值 */
     textName?: string | undefined;
     /** @name 表格的其它配置 */
     tableConfig?: any;
-    /**@name 表单label宽度，默认70 */
+    /** @name 表单label宽度，默认70 */
     labelWidth?: number | undefined;
-    /**@name 是否2.0接口  */
+    /** @name 是否2.0接口 */
     isV2?: boolean | undefined;
-    /**@name 是否支持跨页选择 */
+    /** @name 是否支持跨页选择 */
     keepSelect?: boolean | undefined;
-    /**@name 回车事件查询关键字 */
+    /** @name 回车事件查询关键字 */
     searchField?: string | undefined;
-    /**@name 填充其它表单项目配置 */
+    /** @name 填充其它表单项目配置 */
     fillMap?: Record<string, string> | undefined;
-    /**@name 输入后检查数据的触发方式，默认为entry回车触发 */
+    /** @name 输入后检查数据的触发方式，默认为entry回车触发 */
     triggerCheck?: "entry" | "blur" | undefined;
-    /**@name 每次展示面板时都加载数据，接合 tableConfig里的 manualRequest 一起使用 */
+    /** @name 每次展示面板时都加载数据，接合 tableConfig里的 manualRequest 一起使用 */
     loadOnShow?: boolean | undefined;
     placement?: TooltipPlacement | undefined;
     arrowPointAtCenter?: boolean | undefined;
+    method?: "POST" | "GET" | undefined;
     rowKey?: any;
-    /**@name 选择行事件 */
+    /** @name 选择行事件 */
     onSelectChange?: ((item: any, formRef?: any) => void) | undefined;
-    /**@name 加载之前事件,param为查询条件对象,可以通过此方法调整 */
+    /** @name 加载之前事件,param为查询条件对象,可以通过此方法调整 */
     beforeLoad?: ((param: any) => void) | undefined;
-    /**@name 加载之后事件,row为接口返回数据，可以通过此方法调整 */
+    /** @name 加载之后事件,row为接口返回数据，可以通过此方法调整 */
     afterLoad?: ((rows: any[]) => void) | undefined;
     getPopupContainer?: ((triggerNode: any) => HTMLElement) | undefined;
 } & React.RefAttributes<unknown>>;

package/lib/components/InputTable.js

@@ -11,14 +11,14 @@ import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 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", "loadOnShow", "triggerCheck", "getPopupContainer", "placement", "arrowPointAtCenter", "rowKey"],
+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", "method"],
   _excluded2 = ["current", "pageSize"];
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 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 { httpGet, httpPost } from '../http';
 import { isDev, showWarn } from '../utils';
 var InputTable = /*#__PURE__*/React.forwardRef(function (prop, ref) {
   //@ts-ignore
@@ -66,7 +66,7 @@ var InputTable = /*#__PURE__*/React.forwardRef(function (prop, ref) {
     _prop$allowClear = prop.allowClear,
     allowClear = _prop$allowClear === void 0 ? true : _prop$allowClear,
     _prop$keepSelect = prop.keepSelect,
-    keepSelect = _prop$keepSelect === void 0 ? false : _prop$keepSelect,
+    keepSelect = _prop$keepSelect === void 0 ? true : _prop$keepSelect,
     fieldProps = prop.fieldProps,
     searchField = prop.searchField,
     fillMap = prop.fillMap,
@@ -83,6 +83,8 @@ var InputTable = /*#__PURE__*/React.forwardRef(function (prop, ref) {
     _prop$arrowPointAtCen = prop.arrowPointAtCenter,
     arrowPointAtCenter = _prop$arrowPointAtCen === void 0 ? true : _prop$arrowPointAtCen,
     rowKey = prop.rowKey,
+    _prop$method = prop.method,
+    method = _prop$method === void 0 ? 'GET' : _prop$method,
     rest = _objectWithoutProperties(prop, _excluded);
   if (!valueField && isDev) {
     console.error('valueField 属性必须设置');
@@ -132,7 +134,6 @@ var InputTable = /*#__PURE__*/React.forwardRef(function (prop, ref) {
               data.page = current;
               data.pageSize = pageSize;
             }
-            ;
             if (Object.keys(rest).length && !isV2) {
               data.where = rest;
             } else {
@@ -145,11 +146,22 @@ var InputTable = /*#__PURE__*/React.forwardRef(function (prop, ref) {
             if (beforeLoad) {
               beforeLoad(data);
             }
-            ;
-            _context.next = 10;
+            if (!(method !== 'GET')) {
+              _context.next = 12;
+              break;
+            }
+            _context.next = 9;
+            return httpPost(url, data);
+          case 9:
+            result = _context.sent;
+            _context.next = 15;
+            break;
+          case 12:
+            _context.next = 14;
             return httpGet(url, data);
-          case 10:
+          case 14:
             result = _context.sent;
+          case 15:
             rows = result.rows || [];
             if (afterLoad) {
               afterLoad(rows);
@@ -161,7 +173,7 @@ var InputTable = /*#__PURE__*/React.forwardRef(function (prop, ref) {
                 arr = val.split(',');
                 pageSelectedRows = rows.filter(function (row) {
                   return arr.includes(row[valueField]);
-                }); // 过滤 selectRowRef.current 中已存在的行 
+                }); // 过滤 selectRowRef.current 中已存在的行
                 pageSelectedRows = pageSelectedRows.filter(function (row) {
                   return !selectRowRef.current.some(function (o) {
                     return o[valueField] === row[valueField];
@@ -179,7 +191,7 @@ var InputTable = /*#__PURE__*/React.forwardRef(function (prop, ref) {
               total: Number(result.total || 0),
               success: true
             });
-          case 15:
+          case 19:
           case "end":
             return _context.stop();
         }
@@ -272,6 +284,11 @@ var InputTable = /*#__PURE__*/React.forwardRef(function (prop, ref) {
     }
     onSelectChange === null || onSelectChange === void 0 ? void 0 : onSelectChange(row, formRef);
   };
+  var handleClear = function handleClear() {
+    var _tableRef$current2, _tableRef$current2$cl;
+    selectRowRef.current = [];
+    (_tableRef$current2 = tableRef.current) === null || _tableRef$current2 === void 0 ? void 0 : (_tableRef$current2$cl = _tableRef$current2.clearSelected) === null || _tableRef$current2$cl === void 0 ? void 0 : _tableRef$current2$cl.call(_tableRef$current2);
+  };
   // 可输入时,回车或失去焦点调接口查询数据
   var onQuery = function onQuery(e) {
     if (rest.disabled || (fieldProps === null || fieldProps === void 0 ? void 0 : fieldProps.disabled) || readonly) return;
@@ -343,35 +360,39 @@ var InputTable = /*#__PURE__*/React.forwardRef(function (prop, ref) {
   };
   useEffect(function () {
     if (!text && multiple) {
-      var _tableRef$current2, _tableRef$current2$cl;
+      var _tableRef$current3, _tableRef$current3$cl;
       selectRowRef.current = [];
-      (_tableRef$current2 = tableRef.current) === null || _tableRef$current2 === void 0 ? void 0 : (_tableRef$current2$cl = _tableRef$current2.clearSelected) === null || _tableRef$current2$cl === void 0 ? void 0 : _tableRef$current2$cl.call(_tableRef$current2);
+      (_tableRef$current3 = tableRef.current) === null || _tableRef$current3 === void 0 ? void 0 : (_tableRef$current3$cl = _tableRef$current3.clearSelected) === null || _tableRef$current3$cl === void 0 ? void 0 : _tableRef$current3$cl.call(_tableRef$current3);
     }
   }, [text, multiple]);
   useEffect(function () {
     if (visible && loadOnShow) {
-      var _tableRef$current3, _tableRef$current3$re;
-      (_tableRef$current3 = tableRef.current) === null || _tableRef$current3 === void 0 ? void 0 : (_tableRef$current3$re = _tableRef$current3.reload) === null || _tableRef$current3$re === void 0 ? void 0 : _tableRef$current3$re.call(_tableRef$current3);
+      var _tableRef$current4, _tableRef$current4$re;
+      (_tableRef$current4 = tableRef.current) === null || _tableRef$current4 === void 0 ? void 0 : (_tableRef$current4$re = _tableRef$current4.reload) === null || _tableRef$current4$re === void 0 ? void 0 : _tableRef$current4$re.call(_tableRef$current4);
     }
   }, [visible, loadOnShow]);
+  useEffect(function () {
+    // if (!visible || !multiple || !text) return;
+    // const list = tableRef.current?.getDatasource();
+    // if (list?.length > 0 && selectRowRef.current.length === 0) {
+    // }
+  }, [visible, text]);
   var tableDom = /*#__PURE__*/React.createElement(ProTable, _extends({
     className: "ls-input-table",
     columns: columns,
     request: loadData,
     manualRequest: false,
     actionRef: tableRef,
+    cellSelectable: false,
     search: {
-      labelWidth: labelWidth
-      // optionRender: (p, s, _dom) => _dom.filter((item: any) => item.key === 'submit')
+      labelWidth: labelWidth,
+      btnInline: true
     },
     options: {
       density: false,
       reload: false,
       setting: false
     },
-    form: {
-      btnInline: true
-    },
     height: 'full',
     rowKey: tableKey,
     onRow: function onRow(record) {
@@ -391,7 +412,7 @@ var InputTable = /*#__PURE__*/React.forwardRef(function (prop, ref) {
         }
       }, "\u786E\u8BA4")] : [];
     },
-    headerTitle: multiple ? null : "双击选中当前行数据",
+    headerTitle: multiple ? null : '双击选中当前行数据',
     cardProps: {
       bodyStyle: {
         padding: 0
@@ -406,7 +427,9 @@ var InputTable = /*#__PURE__*/React.forwardRef(function (prop, ref) {
         selectRowRef.current = rows;
         setSelectedKeys(keys);
       }
-    } : false
+    } : false,
+    showClear: true,
+    selectedTagField: textField || valueField
   }));
   // 处理有值时，可清空
   useEffect(function () {

package/lib/components/TagCheck.d.ts

@@ -11,5 +11,7 @@ declare const TagCheck: (props: {
         label: string;
     }[];
     multiple?: boolean | undefined;
+    readonly?: boolean | undefined;
+    disabled?: boolean | undefined;
 }) => JSX.Element;
 export default TagCheck;

package/lib/components/TagCheck.js

@@ -16,25 +16,27 @@ var TagCheck = function TagCheck(props) {
     tagStyle = props.tagStyle,
     options = props.options,
     _props$multiple = props.multiple,
-    multiple = _props$multiple === void 0 ? true : _props$multiple;
+    multiple = _props$multiple === void 0 ? true : _props$multiple,
+    _props$disabled = props.disabled,
+    disabled = _props$disabled === void 0 ? false : _props$disabled,
+    _props$readonly = props.readonly,
+    readonly = _props$readonly === void 0 ? false : _props$readonly;
   var _useState = useState(toArray(props.value)),
     _useState2 = _slicedToArray(_useState, 2),
     innerValue = _useState2[0],
     setInnerValue = _useState2[1];
   useEffect(function () {
-    if (!('value' in props)) return;
     setInnerValue(toArray(props.value));
   }, [props.value]);
   return /*#__PURE__*/React.createElement("div", {
     style: style,
     className: classNames('tag-check', className)
-  }, multiple && options.length > 0 && /*#__PURE__*/React.createElement(_Tag.CheckableTag, {
+  }, multiple && options.length > 0 && !disabled && !readonly && /*#__PURE__*/React.createElement(_Tag.CheckableTag, {
     checked: innerValue.length === options.length,
     onChange: function onChange(checked) {
       var val = checked ? options.map(function (o) {
         return o.value;
       }) : [];
-      setInnerValue(val);
       _onChange === null || _onChange === void 0 ? void 0 : _onChange(val.length ? val : undefined, 'all', checked);
     }
   }, "\u5168\u90E8"), options && options.map(function (item) {
@@ -46,6 +48,7 @@ var TagCheck = function TagCheck(props) {
         return item.value == o;
       }).length > 0,
       onChange: function onChange(checked) {
+        if (readonly || disabled) return;
         var val = [];
         if (checked) {
           val = multiple ? [].concat(_toConsumableArray(innerValue), [item.value]) : [item.value];
@@ -54,7 +57,6 @@ var TagCheck = function TagCheck(props) {
             return o != item.value;
           });
         }
-        setInnerValue(val);
         _onChange === null || _onChange === void 0 ? void 0 : _onChange(val.length ? multiple ? val : val[0] : undefined, item, checked);
       }
     }, item.label);

package/lib/components/antd-custom.less

@@ -152,13 +152,13 @@
 
 .ant-btn-dangerous {
   color: #f5222d;
-  background-color: #ffccc7;
+  background-color: #fff1f0;
   border-color: transparent;
 
   &:hover,
   &:focus {
     color: #f5222d;
-    background-color: #fff1f0;
+    background-color: #ffccc7;
     border-color: transparent;
   }