ls-pro-common 1.0.7 → 1.0.8

package/lib/components/InputTable.js

@@ -0,0 +1,254 @@
+"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;
+
+require("antd/es/input/style");
+
+var _input = _interopRequireDefault(require("antd/es/input"));
+
+require("antd/es/popover/style");
+
+var _popover = _interopRequireDefault(require("antd/es/popover"));
+
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+
+require("antd/es/button/style");
+
+var _button = _interopRequireDefault(require("antd/es/button"));
+
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+
+var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+
+var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
+
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+
+var _react = _interopRequireWildcard(require("react"));
+
+var _lsProTable = _interopRequireDefault(require("ls-pro-table"));
+
+var _lsProForm = require("ls-pro-form");
+
+var _icons = require("@ant-design/icons");
+
+var _http = require("../http");
+
+var _excluded = ["columns", "url", "textName", "name", "tableConfig", "tableHeight", "tableWidth", "readonly", "multiple", "valueField", "textField", "onSelectChange"],
+    _excluded2 = ["current", "pageSize"];
+
+function InputTable(prop) {
+  //@ts-ignore
+  var _useContext = (0, _react.useContext)(_lsProForm.ProFormContext),
+      formRef = _useContext.formRef;
+
+  var tableRef = (0, _react.useRef)();
+
+  var _useState = (0, _react.useState)(false),
+      _useState2 = (0, _slicedToArray2.default)(_useState, 2),
+      visible = _useState2[0],
+      setVisible = _useState2[1];
+
+  var _useState3 = (0, _react.useState)([]),
+      _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
+      selectedRows = _useState4[0],
+      setSelectedRows = _useState4[1];
+
+  var _useState5 = (0, _react.useState)(''),
+      _useState6 = (0, _slicedToArray2.default)(_useState5, 2),
+      text = _useState6[0],
+      setText = _useState6[1];
+
+  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,
+      textField = prop.textField,
+      onSelectChange = prop.onSelectChange,
+      rest = (0, _objectWithoutProperties2.default)(prop, _excluded);
+  var textNameProp = textName || name + '__text';
+
+  var loadData = /*#__PURE__*/function () {
+    var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(param) {
+      var current, pageSize, rest, data, result;
+      return _regenerator.default.wrap(function _callee$(_context) {
+        while (1) {
+          switch (_context.prev = _context.next) {
+            case 0:
+              current = param.current, pageSize = param.pageSize, rest = (0, _objectWithoutProperties2.default)(param, _excluded2);
+              data = {
+                page: current,
+                pageSize: pageSize
+              };
+
+              if (Object.keys(rest).length) {
+                data.where = rest;
+              }
+
+              _context.next = 5;
+              return (0, _http.httpGet)(url, data);
+
+            case 5:
+              result = _context.sent;
+              return _context.abrupt("return", {
+                data: result.rows || [],
+                total: result.total || 0,
+                success: true
+              });
+
+            case 7:
+            case "end":
+              return _context.stop();
+          }
+        }
+      }, _callee);
+    }));
+
+    return function loadData(_x) {
+      return _ref.apply(this, arguments);
+    };
+  }();
+
+  (0, _react.useEffect)(function () {
+    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();
+    var txt = formValue[textField || valueField];
+
+    if (txt) {
+      setText(txt);
+    }
+  }, []);
+
+  var tableDom = /*#__PURE__*/_react.default.createElement(_lsProTable.default, (0, _extends2.default)({
+    columns: columns,
+    request: loadData,
+    rowKey: valueField,
+    manualRequest: false,
+    actionRef: tableRef,
+    search: {
+      labelWidth: 70
+    },
+    options: {
+      density: false,
+      reload: false,
+      setting: false
+    },
+    form: {
+      submitter: {
+        resetButtonProps: false
+      }
+    },
+    height: 'full',
+    rowSelection: {
+      type: multiple ? 'checkbox' : 'radio',
+      onChange: function onChange(keys, rows) {
+        setSelectedRows(rows);
+      }
+    },
+    tableAlertRender: false,
+    onRow: function onRow(record) {
+      return {
+        onDoubleClick: function onDoubleClick() {
+          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] = record[valueField];
+          setText(record[textField || valueField]); // 如果需要接收名称(指定了名称属性名)，则反回名称
+
+          if (textName) {
+            formValue[textNameProp] = record[textField || valueField];
+          }
+
+          (_formRef$current3 = formRef.current) === null || _formRef$current3 === void 0 ? void 0 : _formRef$current3.setFieldsValue((0, _objectSpread2.default)({}, formValue));
+          setVisible(false);
+          onSelectChange === null || onSelectChange === void 0 ? void 0 : onSelectChange(record);
+        }
+      };
+    },
+    toolBarRender: function toolBarRender() {
+      return [/*#__PURE__*/_react.default.createElement(_button.default, {
+        onClick: function onClick() {
+          if (selectedRows.length) {
+            var _formRef$current4, _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();
+            formValue[name] = selectedRows.map(function (o) {
+              return o[valueField];
+            }).join(',');
+            var txt = selectedRows.map(function (o) {
+              return o[textField || valueField];
+            }).join(',');
+            setText(txt); // 如果需要接收名称，则反回名称
+
+            if (textName) {
+              formValue[textNameProp] = txt;
+            }
+
+            (_formRef$current5 = formRef.current) === null || _formRef$current5 === void 0 ? void 0 : _formRef$current5.setFieldsValue((0, _objectSpread2.default)({}, formValue));
+          }
+
+          setVisible(false);
+        }
+      }, "\u786E\u8BA4")];
+    },
+    headerTitle: "\u53CC\u51FB\u8FD4\u56DE\u5F53\u524D\u884C\u6570\u636E"
+  }, tableConfig));
+
+  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("div", {
+    style: {
+      display: 'none'
+    }
+  }, /*#__PURE__*/_react.default.createElement(_lsProForm.ProFormText, {
+    name: name
+  })), /*#__PURE__*/_react.default.createElement(_lsProForm.ProFormText, (0, _extends2.default)({
+    name: textNameProp
+  }, rest), /*#__PURE__*/_react.default.createElement(_input.default, {
+    suffix: /*#__PURE__*/_react.default.createElement(_popover.default, {
+      content: /*#__PURE__*/_react.default.createElement("div", {
+        style: {
+          width: tableWidth + 'px',
+          height: tableHeight + 'px',
+          maxHeight: '95vh',
+          overflow: 'auto'
+        }
+      }, tableDom),
+      trigger: "click",
+      visible: visible,
+      onVisibleChange: setVisible
+    }, /*#__PURE__*/_react.default.createElement(_icons.MoreOutlined, null)),
+    onClick: function onClick() {
+      return setVisible(true);
+    },
+    onInput: function onInput(e) {
+      var _formRef$current6;
+
+      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] = e.target.value;
+      formRef.current.setFieldsValue((0, _objectSpread2.default)({}, formValue));
+    },
+    readOnly: readonly,
+    value: text
+  })));
+}
+
+var _default = InputTable;
+exports.default = _default;

package/lib/hooks/useDtl/index.js

@@ -628,6 +628,11 @@ function useDtl(dtlParam) {
   if (toolConfig === null || toolConfig === void 0 ? void 0 : toolConfig.import) {
     tableTools.push( /*#__PURE__*/_react.default.createElement(_button.default, {
       key: "import",
+      onClick: function onClick() {
+        var _tableRef$current, _tableRef$current$sho;
+
+        tableRef === null || tableRef === void 0 ? void 0 : (_tableRef$current = tableRef.current) === null || _tableRef$current === void 0 ? void 0 : (_tableRef$current$sho = _tableRef$current.showImport) === null || _tableRef$current$sho === void 0 ? void 0 : _tableRef$current$sho.call(_tableRef$current);
+      },
       icon: /*#__PURE__*/_react.default.createElement(_icons.ImportOutlined, null)
     }, "\u5BFC\u5165"));
   }
@@ -635,6 +640,11 @@ function useDtl(dtlParam) {
   if (toolConfig === null || toolConfig === void 0 ? void 0 : toolConfig.export) {
     tableTools.push( /*#__PURE__*/_react.default.createElement(_button.default, {
       key: "export",
+      onClick: function onClick() {
+        var _tableRef$current2, _tableRef$current2$sh;
+
+        tableRef === null || tableRef === void 0 ? void 0 : (_tableRef$current2 = tableRef.current) === null || _tableRef$current2 === void 0 ? void 0 : (_tableRef$current2$sh = _tableRef$current2.showExport) === null || _tableRef$current2$sh === void 0 ? void 0 : _tableRef$current2$sh.call(_tableRef$current2);
+      },
       icon: /*#__PURE__*/_react.default.createElement(_icons.ExportOutlined, null)
     }, "\u5BFC\u51FA"));
   }

package/lib/hooks/useSingle/index.d.ts

@@ -36,5 +36,6 @@ declare function useSingle(inParam: SingleParamType): {
     onLoad: (params: Record<string, any>, sort: Record<string, any>, filter: Record<string, any>) => Promise<any>;
     onAdd: () => Promise<void>;
     onEdit: () => Promise<void>;
+    onExport: (url: string, param: any) => Promise<boolean>;
 };
 export default useSingle;

package/lib/hooks/useSingle/index.js

@@ -390,6 +390,27 @@ function useSingle(inParam) {
     };
   }();
 
+  var onExport = /*#__PURE__*/function () {
+    var _ref6 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee6(url, param) {
+      return _regenerator.default.wrap(function _callee6$(_context6) {
+        while (1) {
+          switch (_context6.prev = _context6.next) {
+            case 0:
+              return _context6.abrupt("return", true);
+
+            case 1:
+            case "end":
+              return _context6.stop();
+          }
+        }
+      }, _callee6);
+    }));
+
+    return function onExport(_x5, _x6) {
+      return _ref6.apply(this, arguments);
+    };
+  }();
+
   var tableTools = [];
 
   if (toolConfig === null || toolConfig === void 0 ? void 0 : toolConfig.add) {
@@ -422,6 +443,11 @@ function useSingle(inParam) {
   if (toolConfig === null || toolConfig === void 0 ? void 0 : toolConfig.import) {
     tableTools.push( /*#__PURE__*/_react.default.createElement(_button.default, {
       key: "import",
+      onClick: function onClick() {
+        var _tableRef$current, _tableRef$current$sho;
+
+        tableRef === null || tableRef === void 0 ? void 0 : (_tableRef$current = tableRef.current) === null || _tableRef$current === void 0 ? void 0 : (_tableRef$current$sho = _tableRef$current.showImport) === null || _tableRef$current$sho === void 0 ? void 0 : _tableRef$current$sho.call(_tableRef$current);
+      },
       icon: /*#__PURE__*/_react.default.createElement(_icons.ImportOutlined, null)
     }, "\u5BFC\u5165"));
   }
@@ -429,6 +455,11 @@ function useSingle(inParam) {
   if (toolConfig === null || toolConfig === void 0 ? void 0 : toolConfig.export) {
     tableTools.push( /*#__PURE__*/_react.default.createElement(_button.default, {
       key: "export",
+      onClick: function onClick() {
+        var _tableRef$current2, _tableRef$current2$sh;
+
+        tableRef === null || tableRef === void 0 ? void 0 : (_tableRef$current2 = tableRef.current) === null || _tableRef$current2 === void 0 ? void 0 : (_tableRef$current2$sh = _tableRef$current2.showExport) === null || _tableRef$current2$sh === void 0 ? void 0 : _tableRef$current2$sh.call(_tableRef$current2);
+      },
       icon: /*#__PURE__*/_react.default.createElement(_icons.ExportOutlined, null)
     }, "\u5BFC\u51FA"));
   }
@@ -448,7 +479,8 @@ function useSingle(inParam) {
     onSave: onSave,
     onLoad: onLoad,
     onAdd: onAdd,
-    onEdit: onEdit
+    onEdit: onEdit,
+    onExport: onExport
   };
 }
 

package/lib/index.d.ts

@@ -1,4 +1,5 @@
 import DtlLayout from './components/DtlLayout';
+import InputTable from './components/InputTable';
 import BaseService from './service/BaseService';
 import request, { httpGet, httpPut, httpPost, httpDelete, getDict, fetchOptions } from './http';
 import * as utils from './utils';
@@ -9,4 +10,4 @@ import useDtl from './hooks/useDtl';
 import type { ApiResponse, TableToolbar, BaseApiType, MethodType } from './typing';
 import type { DtlLyaoutProps } from './components/DtlLayout';
 export type { ApiResponse, TableToolbar, BaseApiType, MethodType, DtlLyaoutProps };
-export { DtlLayout, BaseService, request, httpDelete, httpGet, httpPost, httpPut, getDict, fetchOptions, utils, useSingle, useDtl };
+export { DtlLayout, InputTable, BaseService, request, httpDelete, httpGet, httpPost, httpPut, getDict, fetchOptions, utils, useSingle, useDtl };

package/lib/index.js

@@ -19,6 +19,12 @@ Object.defineProperty(exports, "DtlLayout", {
     return _DtlLayout.default;
   }
 });
+Object.defineProperty(exports, "InputTable", {
+  enumerable: true,
+  get: function get() {
+    return _InputTable.default;
+  }
+});
 Object.defineProperty(exports, "fetchOptions", {
   enumerable: true,
   get: function get() {
@@ -77,6 +83,8 @@ exports.utils = void 0;
 
 var _DtlLayout = _interopRequireDefault(require("./components/DtlLayout"));
 
+var _InputTable = _interopRequireDefault(require("./components/InputTable"));
+
 var _BaseService = _interopRequireDefault(require("./service/BaseService"));
 
 var _http = _interopRequireWildcard(require("./http"));

package/lib/utils/index.d.ts

@@ -6,6 +6,13 @@ export declare const getUrlQuery: (name: string, url?: string) => string;
  * @returns
  */
 export declare const setUrlQuery: (url: string, keyvals?: Record<string, any>) => string;
+/**
+ * 给 url 添加网关
+ * @param url 原url，以 / 打头
+ * @param defGateway 默认网关 /petrel
+ * @returns
+ */
+export declare const toGatewayUrl: (url: string, defGateway?: string) => string;
 /**
  * 设置文档title
  * @param {*} title

package/lib/utils/index.js

@@ -5,7 +5,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.yesnoList = exports.treeFind = exports.treeEach = exports.statusList = exports.showWarn = exports.showSuccess = exports.showError = exports.showConfirm = exports.setUrlQuery = exports.setTitle = exports.setCookie = exports.setCache = exports.rangeToSearch = exports.isLogin = exports.getUserName = exports.getUserInfo = exports.getUrlQuery = exports.getLoginName = exports.getCookie = exports.getCompanyId = exports.getCache = exports.dateFormat = void 0;
+exports.yesnoList = exports.treeFind = exports.treeEach = exports.toGatewayUrl = exports.statusList = exports.showWarn = exports.showSuccess = exports.showError = exports.showConfirm = exports.setUrlQuery = exports.setTitle = exports.setCookie = exports.setCache = exports.rangeToSearch = exports.isLogin = exports.getUserName = exports.getUserInfo = exports.getUrlQuery = exports.getLoginName = exports.getCookie = exports.getCompanyId = exports.getCache = exports.dateFormat = void 0;
 
 var _createForOfIteratorHelper2 = _interopRequireDefault(require("@babel/runtime/helpers/createForOfIteratorHelper"));
 
@@ -58,6 +58,22 @@ var setUrlQuery = function setUrlQuery(url) {
 
   return newUrl;
 };
+/**
+ * 给 url 添加网关
+ * @param url 原url，以 / 打头
+ * @param defGateway 默认网关 /petrel
+ * @returns
+ */
+
+
+exports.setUrlQuery = setUrlQuery;
+
+var toGatewayUrl = function toGatewayUrl(url) {
+  var defGateway = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '/petrel';
+  if (url.startsWith('http://') || url.startsWith('https://') || url.startsWith('//')) return url;
+  var gateway = getUrlQuery('gateway') || location.origin + defGateway;
+  return gateway + url;
+};
 /**
  * 设置文档title
  * @param {*} title
@@ -65,7 +81,7 @@ var setUrlQuery = function setUrlQuery(url) {
  */
 
 
-exports.setUrlQuery = setUrlQuery;
+exports.toGatewayUrl = toGatewayUrl;
 
 var setTitle = function setTitle(title) {
   if (!title) return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ls-pro-common",
-  "version": "1.0.7",
+  "version": "1.0.8",
   "description": "ls-pro-common",
   "keywords": [
     "antd",
@@ -28,8 +28,8 @@
   ],
   "dependencies": {
     "@ant-design/icons": "^4.3.0",
-    "ls-pro-table": "2.62.13",
-    "ls-pro-form": "1.52.18",
+    "ls-pro-table": "2.62.15",
+    "ls-pro-form": "1.52.19",
     "@babel/runtime": "^7.16.3",
     "classnames": "^2.2.6",
     "moment": "^2.27.0",