@hw-component/table 1.9.96 → 1.9.97

package/es/EditTable/hooks.js

@@ -11,8 +11,10 @@ import _defineProperty from '@babel/runtime-corejs3/helpers/defineProperty';
 import _asyncToGenerator from '@babel/runtime-corejs3/helpers/asyncToGenerator';
 import _regeneratorRuntime from '@babel/runtime-corejs3/regenerator';
 import _Array$isArray from '@babel/runtime-corejs3/core-js-stable/array/is-array';
+import _mapInstanceProperty from '@babel/runtime-corejs3/core-js-stable/instance/map';
 import { useRequest } from 'ahooks';
 import { useMemo, useRef } from 'react';
+import config from '../render/config.js';
 
 function ownKeys(e, r) { var t = _Object$keys(e); if (_Object$getOwnPropertySymbols) { var o = _Object$getOwnPropertySymbols(e); r && (o = _filterInstanceProperty(o).call(o, function (r) { return _Object$getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var _context2, _context3; var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? _forEachInstanceProperty(_context2 = ownKeys(Object(t), !0)).call(_context2, function (r) { _defineProperty(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(e, _Object$getOwnPropertyDescriptors(t)) : _forEachInstanceProperty(_context3 = ownKeys(Object(t))).call(_context3, function (r) { _Object$defineProperty(e, r, _Object$getOwnPropertyDescriptor(t, r)); }); } return e; }
@@ -21,40 +23,41 @@ var useListRequest = function useListRequest(_ref) {
     dataSource = _ref.dataSource;
   var saveParams = useMemo(function () {
     return {
-      params: {}
+      params: {
+        current: 1,
+        pageSize: 10
+      }
     };
   }, []);
-  return useRequest( /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(params) {
-      var newParams;
-      return _regeneratorRuntime.wrap(function _callee$(_context) {
-        while (1) switch (_context.prev = _context.next) {
-          case 0:
-            newParams = _objectSpread(_objectSpread({}, saveParams.params), params);
-            saveParams.params = newParams;
-            if (!request) {
-              _context.next = 4;
-              break;
-            }
-            return _context.abrupt("return", request(newParams));
-          case 4:
-            if (!_Array$isArray(dataSource)) {
-              _context.next = 6;
-              break;
-            }
-            return _context.abrupt("return", dataSource);
-          case 6:
-            return _context.abrupt("return", dataSource);
-          case 7:
-          case "end":
-            return _context.stop();
-        }
-      }, _callee);
-    }));
-    return function (_x) {
-      return _ref2.apply(this, arguments);
-    };
-  }(), {
+  return useRequest( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
+    var params,
+      newParams,
+      _args = arguments;
+    return _regeneratorRuntime.wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          params = _args.length > 0 && _args[0] !== undefined ? _args[0] : {};
+          newParams = _objectSpread(_objectSpread({}, saveParams.params), params);
+          saveParams.params = newParams;
+          if (!request) {
+            _context.next = 5;
+            break;
+          }
+          return _context.abrupt("return", request(newParams));
+        case 5:
+          if (!_Array$isArray(dataSource)) {
+            _context.next = 7;
+            break;
+          }
+          return _context.abrupt("return", dataSource);
+        case 7:
+          return _context.abrupt("return", dataSource);
+        case 8:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee);
+  })), {
     manual: true,
     refreshDeps: [dataSource]
   });
@@ -71,6 +74,26 @@ var useCuRef = function useCuRef(_ref3) {
     cuEditableFormRef: cuEditableFormRef
   };
 };
+var useColsMk = function useColsMk(_ref4) {
+  var configData = _ref4.configData;
+  return configData === null || configData === void 0 ? void 0 : _mapInstanceProperty(configData).call(configData, function (item) {
+    var valueType = item.valueType,
+      _render = item.render;
+    var configType = valueType;
+    if (!config[configType]) {
+      return item;
+    }
+    return _objectSpread(_objectSpread({}, item), {}, {
+      render: function render(dom, entity, index, action, schema) {
+        var node = config[configType](item, entity, index);
+        if (_render) {
+          return _render(node, entity, index, action, schema);
+        }
+        return node;
+      }
+    });
+  });
+};
 
-export { useCuRef, useListRequest };
+export { useColsMk, useCuRef, useListRequest };
 // powered by hdj

package/es/EditTable/index.js

@@ -19,7 +19,7 @@ import HTablePagination from '../HTablePagination/index.js';
 import { ConfigProvider } from 'antd';
 import { emptyDefaultRender, errorDefaultRender } from '../HTableBody/defaultRender.js';
 import { useHTableConfigContext } from '../TableConfig.js';
-import { useListRequest, useCuRef } from './hooks.js';
+import { useListRequest, useCuRef, useColsMk } from './hooks.js';
 
 var _excluded = ["configData", "rowKey", "creatorButtonText", "recordCreatorProps", "defaultRecordValue", "pagination", "editable", "dataSource", "request", "manual", "emptyRender", "errorRender", "onAdd", "onEdit", "actionRef", "editableFormRef"],
   _excluded2 = ["index", "id"];
@@ -72,6 +72,9 @@ var EditTable = (function (_ref) {
     }),
     cuActionRef = _useCuRef.cuActionRef,
     cuEditableFormRef = _useCuRef.cuEditableFormRef;
+  var columns = useColsMk({
+    configData: configData
+  });
   return jsxs("div", {
     className: tableBody,
     children: [jsx(ConfigProvider, {
@@ -85,7 +88,7 @@ var EditTable = (function (_ref) {
         return tableEmptyRender === null || tableEmptyRender === void 0 ? void 0 : tableEmptyRender();
       },
       children: jsx(EditableProTable, _objectSpread({
-        columns: configData,
+        columns: columns,
         loading: loading,
         rowKey: rowKey,
         editableFormRef: cuEditableFormRef,

package/es/render/Text.d.ts

@@ -1,2 +1,3 @@
+/// <reference types="react" />
 declare const _default: () => JSX.Element;
 export default _default;