@hw-component/table 1.9.95 → 1.9.97

package/lib/EditTable/hooks.js

@@ -12,8 +12,10 @@ var _defineProperty = require('@babel/runtime-corejs3/helpers/defineProperty');
 var _asyncToGenerator = require('@babel/runtime-corejs3/helpers/asyncToGenerator');
 var _regeneratorRuntime = require('@babel/runtime-corejs3/regenerator');
 var _Array$isArray = require('@babel/runtime-corejs3/core-js-stable/array/is-array');
+var _mapInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/map');
 var ahooks = require('ahooks');
 var React = require('react');
+var config = require('../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; }
@@ -22,40 +24,41 @@ var useListRequest = function useListRequest(_ref) {
     dataSource = _ref.dataSource;
   var saveParams = React.useMemo(function () {
     return {
-      params: {}
+      params: {
+        current: 1,
+        pageSize: 10
+      }
     };
   }, []);
-  return ahooks.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 ahooks.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]
   });
@@ -72,7 +75,28 @@ 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.default[configType]) {
+      return item;
+    }
+    return _objectSpread(_objectSpread({}, item), {}, {
+      render: function render(dom, entity, index, action, schema) {
+        var node = config.default[configType](item, entity, index);
+        if (_render) {
+          return _render(node, entity, index, action, schema);
+        }
+        return node;
+      }
+    });
+  });
+};
 
+exports.useColsMk = useColsMk;
 exports.useCuRef = useCuRef;
 exports.useListRequest = useListRequest;
 // powered by h

package/lib/EditTable/index.js

@@ -75,6 +75,9 @@ var EditTable = (function (_ref) {
     }),
     cuActionRef = _useCuRef.cuActionRef,
     cuEditableFormRef = _useCuRef.cuEditableFormRef;
+  var columns = hooks.useColsMk({
+    configData: configData
+  });
   return jsxRuntime.jsxs("div", {
     className: tableBody,
     children: [jsxRuntime.jsx(antd.ConfigProvider, {
@@ -88,7 +91,7 @@ var EditTable = (function (_ref) {
         return tableEmptyRender === null || tableEmptyRender === void 0 ? void 0 : tableEmptyRender();
       },
       children: jsxRuntime.jsx(ProTable.EditableProTable, _objectSpread({
-        columns: configData,
+        columns: columns,
         loading: loading,
         rowKey: rowKey,
         editableFormRef: cuEditableFormRef,

package/lib/render/Text.d.ts

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hw-component/table",
-  "version": "1.9.95",
+  "version": "1.9.97",
   "description": "基于antd二次开发table组件",
   "keywords": [
     "table"

package/src/components/EditTable/hooks.ts

@@ -3,15 +3,19 @@ import { EditTableProps } from "./modal";
 import { MutableRefObject, useMemo, useRef } from "react";
 import type { ActionType } from "@ant-design/pro-table";
 import { EditableFormInstance } from "@ant-design/pro-table/lib/components/EditableTable";
+import config from "../render/config";
 
 export const useListRequest = ({ request, dataSource }: EditTableProps) => {
   const saveParams = useMemo(() => {
     return {
-      params: {},
+      params: {
+        current: 1,
+        pageSize: 10,
+      },
     };
   }, []);
   return useRequest(
-    async (params) => {
+    async (params = {}) => {
       const newParams = {
         ...saveParams.params,
         ...params,
@@ -41,3 +45,23 @@ export const useCuRef = ({ actionRef, editableFormRef }: EditTableProps) => {
     cuEditableFormRef,
   };
 };
+
+export const useColsMk = ({ configData }: EditTableProps) => {
+  return configData?.map((item) => {
+    const { valueType, render } = item;
+    const configType = valueType as string;
+    if (!config[configType]) {
+      return item;
+    }
+    return {
+      ...item,
+      render: (dom, entity, index, action, schema) => {
+        const node = config[configType](item, entity, index);
+        if (render) {
+          return render(node, entity, index, action, schema);
+        }
+        return node;
+      },
+    };
+  });
+};

package/src/components/EditTable/index.tsx

@@ -8,7 +8,7 @@ import {
   errorDefaultRender,
 } from "@/components/HTableBody/defaultRender";
 import { useHTableConfigContext } from "@/components/TableConfig";
-import { useCuRef, useListRequest } from "./hooks";
+import { useColsMk, useCuRef, useListRequest } from "./hooks";
 import React from "react";
 
 export default ({
@@ -46,6 +46,7 @@ export default ({
     actionRef,
     editableFormRef,
   });
+  const columns = useColsMk({ configData });
 
   return (
     <div className={tableBody}>
@@ -61,7 +62,7 @@ export default ({
         }}
       >
         <EditableProTable
-          columns={configData as any}
+          columns={columns}
           loading={loading}
           rowKey={rowKey}
           editableFormRef={cuEditableFormRef}

package/src/pages/EditTable/index.tsx

@@ -6,6 +6,7 @@ const dataSource = [
   {
     id: 1,
     title: "1",
+    time: "1757574280",
   },
   {
     id: 2,
@@ -46,7 +47,7 @@ export default () => {
       dataSource={cuData}
       configData={[
         { title: "标题", dataIndex: "title" },
-        { title: "标题2", dataIndex: "title1" },
+        { title: "标题2", dataIndex: "time", valueType: "date" },
         {
           title: "操作",
           valueType: "option",

package/src/pages/ModalEditTable/index.tsx

@@ -5,6 +5,7 @@ const dataSource = [
   {
     id: 1,
     title: "1",
+    time: "1757574280",
   },
   {
     id: 2,
@@ -42,7 +43,6 @@ export default () => {
         dataSource={cuData}
         editTableProps={{
           onAdd: async (data) => {
-            console.log("addd");
             const newData = [...cuData];
             newData.push({
               id: newData.length + 1,
@@ -59,7 +59,7 @@ export default () => {
         dialogTable={dialogTable}
         configData={[
           { title: "标题", dataIndex: "title" },
-          { title: "标题2", dataIndex: "title1" },
+          { title: "标题2", dataIndex: "time", valueType: "date" },
           {
             title: "操作",
             valueType: "option",
@@ -69,7 +69,6 @@ export default () => {
                 key="editable"
                 type={"link"}
                 onClick={() => {
-                  console.log(action);
                   action?.startEditable?.(record.id);
                 }}
               >