ls-pro-common 1.1.1 → 1.1.3

package/es/components/InputTable.js

@@ -6,12 +6,12 @@ import _extends from "@babel/runtime/helpers/esm/extends";
 import "antd/es/button/style";
 import _Button from "antd/es/button";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import _regeneratorRuntime from "@babel/runtime/regenerator";
 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"],
-    _excluded2 = ["current", "pageSize"];
+  _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';
@@ -21,202 +21,173 @@ import { showWarn } from '../utils';
 var InputTable = /*#__PURE__*/React.forwardRef(function (prop, ref) {
   //@ts-ignore
   var _useContext = useContext(ProFormContext),
-      formRef = _useContext.formRef;
-
+    formRef = _useContext.formRef;
   var tableRef = useRef();
-
   var _useState = useState(false),
-      _useState2 = _slicedToArray(_useState, 2),
-      visible = _useState2[0],
-      setVisible = _useState2[1];
-
+    _useState2 = _slicedToArray(_useState, 2),
+    visible = _useState2[0],
+    setVisible = _useState2[1];
   var _useState3 = useState([]),
-      _useState4 = _slicedToArray(_useState3, 2),
-      selectedRows = _useState4[0],
-      setSelectedRows = _useState4[1];
-
+    _useState4 = _slicedToArray(_useState3, 2),
+    selectedRows = _useState4[0],
+    setSelectedRows = _useState4[1];
   var _useState5 = useState(''),
-      _useState6 = _slicedToArray(_useState5, 2),
-      text = _useState6[0],
-      setText = _useState6[1];
-
+    _useState6 = _slicedToArray(_useState5, 2),
+    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,
-      name = prop.name,
-      tableConfig = prop.tableConfig,
-      _prop$tableHeight = prop.tableHeight,
-      tableHeight = _prop$tableHeight === void 0 ? 400 : _prop$tableHeight,
-      _prop$tableWidth = prop.tableWidth,
-      tableWidth = _prop$tableWidth === void 0 ? 650 : _prop$tableWidth,
-      _prop$readonly = prop.readonly,
-      readonly = _prop$readonly === void 0 ? true : _prop$readonly,
-      multiple = prop.multiple,
-      valueField = prop.valueField,
-      _prop$labelWidth = prop.labelWidth,
-      labelWidth = _prop$labelWidth === void 0 ? 70 : _prop$labelWidth,
-      textField = prop.textField,
-      onSelectChange = prop.onSelectChange,
-      beforeLoad = prop.beforeLoad,
-      afterLoad = prop.afterLoad,
-      _prop$isV = prop.isV2,
-      isV2 = _prop$isV === void 0 ? false : _prop$isV,
-      _prop$allowClear = prop.allowClear,
-      allowClear = _prop$allowClear === void 0 ? true : _prop$allowClear,
-      _prop$keepSelect = prop.keepSelect,
-      keepSelect = _prop$keepSelect === void 0 ? false : _prop$keepSelect,
-      fieldProps = prop.fieldProps,
-      searchField = prop.searchField,
-      fillMap = prop.fillMap,
-      _prop$loadOnShow = prop.loadOnShow,
-      loadOnShow = _prop$loadOnShow === void 0 ? false : _prop$loadOnShow,
-      _prop$triggerCheck = prop.triggerCheck,
-      triggerCheck = _prop$triggerCheck === void 0 ? 'entry' : _prop$triggerCheck,
-      _prop$getPopupContain = prop.getPopupContainer,
-      getPopupContainer = _prop$getPopupContain === void 0 ? function (triggerNode) {
-    return triggerNode.parentNode.parentNode.parentNode.parentNode;
-  } : _prop$getPopupContain,
-      _prop$placement = prop.placement,
-      placement = _prop$placement === void 0 ? 'bottom' : _prop$placement,
-      _prop$arrowPointAtCen = prop.arrowPointAtCenter,
-      arrowPointAtCenter = _prop$arrowPointAtCen === void 0 ? true : _prop$arrowPointAtCen,
-      rest = _objectWithoutProperties(prop, _excluded); //显示输入框绑定的name,如果不设置textName,设置为$name__text
-
-
+    url = prop.url,
+    textName = prop.textName,
+    name = prop.name,
+    tableConfig = prop.tableConfig,
+    _prop$tableHeight = prop.tableHeight,
+    tableHeight = _prop$tableHeight === void 0 ? 400 : _prop$tableHeight,
+    _prop$tableWidth = prop.tableWidth,
+    tableWidth = _prop$tableWidth === void 0 ? 650 : _prop$tableWidth,
+    _prop$readonly = prop.readonly,
+    readonly = _prop$readonly === void 0 ? true : _prop$readonly,
+    multiple = prop.multiple,
+    valueField = prop.valueField,
+    _prop$labelWidth = prop.labelWidth,
+    labelWidth = _prop$labelWidth === void 0 ? 70 : _prop$labelWidth,
+    textField = prop.textField,
+    onSelectChange = prop.onSelectChange,
+    beforeLoad = prop.beforeLoad,
+    afterLoad = prop.afterLoad,
+    _prop$isV = prop.isV2,
+    isV2 = _prop$isV === void 0 ? false : _prop$isV,
+    _prop$allowClear = prop.allowClear,
+    allowClear = _prop$allowClear === void 0 ? true : _prop$allowClear,
+    _prop$keepSelect = prop.keepSelect,
+    keepSelect = _prop$keepSelect === void 0 ? false : _prop$keepSelect,
+    fieldProps = prop.fieldProps,
+    searchField = prop.searchField,
+    fillMap = prop.fillMap,
+    _prop$loadOnShow = prop.loadOnShow,
+    loadOnShow = _prop$loadOnShow === void 0 ? false : _prop$loadOnShow,
+    _prop$triggerCheck = prop.triggerCheck,
+    triggerCheck = _prop$triggerCheck === void 0 ? 'entry' : _prop$triggerCheck,
+    _prop$getPopupContain = prop.getPopupContainer,
+    getPopupContainer = _prop$getPopupContain === void 0 ? function (triggerNode) {
+      return triggerNode.parentNode.parentNode.parentNode.parentNode;
+    } : _prop$getPopupContain,
+    _prop$placement = prop.placement,
+    placement = _prop$placement === void 0 ? 'bottom' : _prop$placement,
+    _prop$arrowPointAtCen = prop.arrowPointAtCenter,
+    arrowPointAtCenter = _prop$arrowPointAtCen === void 0 ? true : _prop$arrowPointAtCen,
+    rest = _objectWithoutProperties(prop, _excluded);
+  //显示输入框绑定的name,如果不设置textName,设置为$name__text
   var textNameProp = useMemo(function () {
     return textName || name + '__text';
-  }, [textName, name]); // 输入框回车时，调用查询参数字段
-
+  }, [textName, name]);
+  // 输入框回车时，调用查询参数字段
   var searchKey = useMemo(function () {
     if (searchField) return searchField;
-    var col; //先取显示字段
-
+    var col;
+    //先取显示字段
     if (textField) {
       col = columns.find(function (o) {
         return o.dataIndex === textField || o.key === textField;
       });
-    } //取不到时取值字段
-
-
+    }
+    //取不到时取值字段
     if (!col) {
       col = columns.find(function (o) {
         return o.dataIndex === valueField || o.key === valueField;
       });
     }
-
     if (col) return col.searchField || col.dataIndex;
     return textField || valueField;
   }, [columns, searchField, valueField, textField]);
-
   var loadData = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(param) {
       var current, pageSize, rest, data, _tableRef$current, _tableRef$current$cle, result, rows;
-
       return _regeneratorRuntime.wrap(function _callee$(_context) {
-        while (1) {
-          switch (_context.prev = _context.next) {
-            case 0:
-              current = param.current, pageSize = param.pageSize, rest = _objectWithoutProperties(param, _excluded2);
-              data = {};
-
-              if (isV2) {
-                data['page.pn'] = current;
-                data['page.size'] = pageSize;
-              } else {
-                data.page = current;
-                data.pageSize = pageSize;
-              }
-
-              ;
-
-              if (Object.keys(rest).length && !isV2) {
-                data.where = rest;
-              }
-
-              if (!keepSelect) {
-                setSelectedRows([]);
-                (_tableRef$current = tableRef.current) === null || _tableRef$current === void 0 ? void 0 : (_tableRef$current$cle = _tableRef$current.clearSelected) === null || _tableRef$current$cle === void 0 ? void 0 : _tableRef$current$cle.call(_tableRef$current);
-              }
-
-              if (beforeLoad) {
-                beforeLoad(data);
-              }
-
-              ;
-              _context.next = 10;
-              return httpGet(url, data);
-
-            case 10:
-              result = _context.sent;
-              rows = result.rows || [];
-
-              if (afterLoad) {
-                afterLoad(rows);
-              }
-
-              return _context.abrupt("return", {
-                data: rows,
-                total: Number(result.total || 0),
-                success: true
-              });
-
-            case 14:
-            case "end":
-              return _context.stop();
-          }
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            current = param.current, pageSize = param.pageSize, rest = _objectWithoutProperties(param, _excluded2);
+            data = {};
+            if (isV2) {
+              data['page.pn'] = current;
+              data['page.size'] = pageSize;
+            } else {
+              data.page = current;
+              data.pageSize = pageSize;
+            }
+            ;
+            if (Object.keys(rest).length && !isV2) {
+              data.where = rest;
+            }
+            if (!keepSelect) {
+              setSelectedRows([]);
+              (_tableRef$current = tableRef.current) === null || _tableRef$current === void 0 ? void 0 : (_tableRef$current$cle = _tableRef$current.clearSelected) === null || _tableRef$current$cle === void 0 ? void 0 : _tableRef$current$cle.call(_tableRef$current);
+            }
+            if (beforeLoad) {
+              beforeLoad(data);
+            }
+            ;
+            _context.next = 10;
+            return httpGet(url, data);
+          case 10:
+            result = _context.sent;
+            rows = result.rows || [];
+            if (afterLoad) {
+              afterLoad(rows);
+            }
+            return _context.abrupt("return", {
+              data: rows,
+              total: Number(result.total || 0),
+              success: true
+            });
+          case 14:
+          case "end":
+            return _context.stop();
         }
       }, _callee);
     }));
-
     return function loadData(_x) {
       return _ref.apply(this, arguments);
     };
-  }(); // 初始化数据
-
-
+  }();
+  // 初始化数据
   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);
-
       if (txt) {
         setText(txt);
       } else if (val) {
         setText(val);
       }
     }, 0);
-  }, []); // 处理返回数据
-
+  }, []);
+  // 处理返回数据
   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 txt; //支持多选
-
+    var txt;
+    //支持多选
     if (Array.isArray(row)) {
       //返回值
       formValue[name] = row.map(function (o) {
         return o[valueField];
-      }).join(','); //显示值
-
+      }).join(',');
+      //显示值
       txt = row.map(function (o) {
         return o[textField || valueField];
-      }).join(','); //处理填充其它字段
-
+      }).join(',');
+      //处理填充其它字段
       if (fillMap) {
         var _loop = function _loop(key) {
           formValue[key] = row.map(function (o) {
             return o[fillMap[key]];
           }).join(',');
         };
-
         for (var key in fillMap) {
           _loop(key);
         }
@@ -224,26 +195,22 @@ var InputTable = /*#__PURE__*/React.forwardRef(function (prop, ref) {
     } else {
       formValue[name] = row[valueField] || '';
       txt = row[textField || valueField] || '';
-
       if (fillMap) {
         for (var _key in fillMap) {
           formValue[_key] = row[fillMap[_key]] || '';
         }
       }
     }
-
     formValue[textNameProp] = txt;
     setText(txt);
     setVisible(false);
     (_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);
-  }; // 可输入时,回车或失去焦点调接口查询数据
-
-
+  };
+  // 可输入时,回车或失去焦点调接口查询数据
   var onQuery = function onQuery(e) {
     if (rest.disabled || (fieldProps === null || fieldProps === void 0 ? void 0 : fieldProps.disabled) || readonly) return;
     var val = e.target.value;
-
     if (val) {
       var param = {
         current: 1,
@@ -252,7 +219,6 @@ var InputTable = /*#__PURE__*/React.forwardRef(function (prop, ref) {
       param[searchKey] = val;
       loadData(param).then(function (result) {
         var rows = result.data || [];
-
         if (!rows.length) {
           handleValue({});
           showWarn("".concat(val, "\u67E5\u627E\u4E0D\u5230\u5BF9\u5E94\u7684\u8BB0\u5F55\uFF01"));
@@ -265,43 +231,37 @@ var InputTable = /*#__PURE__*/React.forwardRef(function (prop, ref) {
       e.stopPropagation();
       e.preventDefault();
     }
-  }; //直接输入不回车,value 和 text 为同一个值
-
-
+  };
+  //直接输入不回车,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 val = e.target.value;
     formValue[name] = val;
     formValue[textNameProp] = val;
     setText(val);
     formRef.current.setFieldsValue(_objectSpread({}, formValue));
-  }; // 当表单重置或点clear时,处理值
-
-
+  };
+  // 当表单重置或点clear时,处理值
   var clearValue = function clearValue(e) {
     if (!e.target.value) {
       var _formRef$current6;
-
       setText('');
       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] = ''; // 不处理，其它表单自己清空
+      formValue[textNameProp] = '';
+      // 不处理，其它表单自己清空
       // if (fillMap) {
       //     for (let key in fillMap) {
       //         formValue[key] = '';
       //     }
       // }
-
       formRef.current.setFieldsValue(_objectSpread({}, formValue));
     }
   };
-
   useEffect(function () {
     if (!text) {
       var _tableRef$current2, _tableRef$current2$cl;
-
       setSelectedRows([]);
       (_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);
     }
@@ -348,15 +308,13 @@ var InputTable = /*#__PURE__*/React.forwardRef(function (prop, ref) {
       }, "\u786E\u8BA4")];
     },
     headerTitle: "\u53CC\u51FB\u9009\u4E2D\u5F53\u524D\u884C\u6570\u636E"
-  }, tableConfig)); // 处理有值时，可清空
-
+  }, tableConfig));
+  // 处理有值时，可清空
   useEffect(function () {
     if (rest.disabled || (fieldProps === null || fieldProps === void 0 ? void 0 : fieldProps.disabled)) return;
-
     try {
       var el = inputRef.current.input.parentNode;
       if (!el) return;
-
       if (text) {
         el.classList.add('ant-input-has-value');
       } else {

package/es/components/Loading.js

@@ -7,16 +7,13 @@ import React from 'react';
 import './common.less';
 export default (function (props) {
   var _props$Text = props.Text,
-      Text = _props$Text === void 0 ? '加载中...' : _props$Text,
-      className = props.className,
-      rest = _objectWithoutProperties(props, _excluded);
-
+    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/Permission.d.ts

@@ -0,0 +1,6 @@
+import React from 'react';
+export declare type PermissionProps = {
+    rightValue: number;
+};
+declare const Permission: React.FC<PermissionProps>;
+export default Permission;

package/es/components/Permission.js

@@ -0,0 +1,10 @@
+import React from 'react';
+import usePermission from "../hooks/usePermission";
+var Permission = function Permission(_ref) {
+  var children = _ref.children,
+    rightValue = _ref.rightValue;
+  var _usePermission = usePermission(),
+    checkRight = _usePermission.checkRight;
+  return checkRight(rightValue) ? /*#__PURE__*/React.createElement(React.Fragment, null, children) : null;
+};
+export default Permission;

package/es/components/common.less

@@ -82,6 +82,69 @@ body {
   // --ant-info-color-deprecated-border        : #ccebff;
 }
 
+
+body.theme-yellow {
+  --ant-primary-color: #fa8500;
+  --ant-primary-color-hover: #ffa229;
+  --ant-primary-color-active: #d46a00;
+  --ant-primary-color-outline: rgba(250, 133, 0, 0.2);
+  --ant-primary-bg: #fff;
+  --ant-primary-side: #fff7e6;
+  --ant-primary-0: #ffd9ad;
+  --ant-primary-1: #fff7e6;
+  --ant-primary-2: #ffe0a3;
+  --ant-primary-3: #ffce7a;
+  --ant-primary-4: #ffba52;
+  --ant-primary-5: #ffa229;
+  --ant-primary-6: #fa8500;
+  --ant-primary-7: #d46a00;
+  --ant-primary-color-deprecated-pure: #ffd9ad;
+  --ant-primary-color-deprecated-l-35: #ffd9ad;
+  --ant-primary-color-deprecated-l-20: #ffb561;
+  --ant-primary-color-deprecated-t-20: #fb9d33;
+  --ant-primary-color-deprecated-t-50: #fdc280;
+  --ant-primary-color-deprecated-f-12: rgba(250, 133, 0, 0.12);
+  --ant-primary-color-active-deprecated-f-30: rgba(255, 247, 230, 0.3);
+  --ant-primary-color-active-deprecated-d-02: #fff4dc;
+  --ant-success-color: #52c41a;
+  --ant-success-color-hover: #73d13d;
+  --ant-success-color-active: #389e0d;
+  --ant-success-color-outline: rgba(82, 196, 26, 0.2);
+  --ant-success-color-deprecated-bg: #f6ffed;
+  --ant-success-color-deprecated-border: #b7eb8f;
+  --ant-error-color: #ff4d4f;
+  --ant-error-color-hover: #ff7875;
+  --ant-error-color-active: #d9363e;
+  --ant-error-color-outline: rgba(255, 77, 79, 0.2);
+  --ant-error-color-deprecated-bg: #fff2f0;
+  --ant-error-color-deprecated-border: #ffccc7;
+  --ant-warning-color: #faad14;
+  --ant-warning-color-hover: #ffc53d;
+  --ant-warning-color-active: #d48806;
+  --ant-warning-color-outline: rgba(250, 173, 20, 0.2);
+  --ant-warning-color-deprecated-bg: #fffbe6;
+  --ant-warning-color-deprecated-border: #ffe58f;
+  --ant-info-color: #fa8500;
+  --ant-info-color-deprecated-bg: #fff7e6;
+  --ant-info-color-deprecated-border: #ffce7a;
+  --antd-wave-shadow-color: #fa8500;
+
+  .ant-table-cell,
+  .ant-pro-table-alert-info-content {
+    a {
+      color: var(--ant-primary-color);
+    }
+
+    a:hover {
+      color: var(--ant-primary-color-hover);
+    }
+
+    a:active {
+      color: var(--ant-primary-color-active);
+    }
+  }
+}
+
 .dtl-layout {
   position      : absolute;
   top           : 0;

package/es/hooks/useDtl/index.d.ts

@@ -19,8 +19,8 @@ export declare type DtlParamType = SingleParamType & {
     billType?: string;
     /**@name 动态编码规则字段,主从表一起保存传参 */
     codeRuleDynamicField?: string;
-    /**@是否查询历史数据 */
-    ifHistoryData?: 0 | 1;
+    /** 是否查询历史数据,通过主表查询面板用户受控组件传入 */
+    ifHistory?: 0 | 1;
 };
 declare function useDtl(dtlParam: DtlParamType): {
     formRef: import("react").MutableRefObject<ProFormInstance<any> | undefined>;