@hw-component/table 1.10.50 → 1.10.52

package/es/DialogTable/Content.js

@@ -55,7 +55,8 @@ var EditTableContent = function EditTableContent(_ref2) {
     configData: configData || [],
     request: request,
     pagination: cuPagination,
-    dataSource: dataSource
+    dataSource: dataSource,
+    manualRequest: false
   }));
   return jsx(Fragment, {
     children: contentRender ? contentRender(node) : node

package/es/EditTable/hooks.js

@@ -159,6 +159,7 @@ var useColsMk = function useColsMk(_ref5) {
     var valueType = item.valueType,
       _render = item.render;
     var configType = valueType;
+    console.log(item, "iiiiiiii");
     if (config[configType]) {
       return _objectSpread(_objectSpread({}, item), {}, {
         render: function render(dom, entity, index, action, schema) {

package/es/EditTable/index.d.ts

@@ -1,4 +1,4 @@
 /// <reference types="react" />
 import { HEditTableProps } from "./modal";
-declare const _default: ({ configData, rowKey, creatorButtonText, recordCreatorProps, defaultRecordValue, pagination, editable, dataSource, request, manual, emptyRender, errorRender, onAdd, onEdit, style, table, ...props }: HEditTableProps) => JSX.Element;
+declare const _default: ({ configData, rowKey, creatorButtonText, recordCreatorProps, defaultRecordValue, pagination, editable, dataSource, request, manual, emptyRender, errorRender, onAdd, onEdit, style, table, manualRequest, ...props }: HEditTableProps) => JSX.Element;
 export default _default;

package/es/EditTable/index.js

@@ -22,7 +22,7 @@ import { useHTableConfigContext } from '../TableConfig.js';
 import { useCuEditTable, useListRequest, useEditTableInit, useColsMk } from './hooks.js';
 import { useRef } from 'react';
 
-var _excluded = ["configData", "rowKey", "creatorButtonText", "recordCreatorProps", "defaultRecordValue", "pagination", "editable", "dataSource", "request", "manual", "emptyRender", "errorRender", "onAdd", "onEdit", "style", "table"],
+var _excluded = ["configData", "rowKey", "creatorButtonText", "recordCreatorProps", "defaultRecordValue", "pagination", "editable", "dataSource", "request", "manual", "emptyRender", "errorRender", "onAdd", "onEdit", "style", "table", "manualRequest"],
   _excluded2 = ["index", "id"];
 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 _context3, _context4; var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? _forEachInstanceProperty(_context3 = ownKeys(Object(t), !0)).call(_context3, function (r) { _defineProperty(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(e, _Object$getOwnPropertyDescriptors(t)) : _forEachInstanceProperty(_context4 = ownKeys(Object(t))).call(_context4, function (r) { _Object$defineProperty(e, r, _Object$getOwnPropertyDescriptor(t, r)); }); } return e; }
@@ -48,6 +48,8 @@ var EditTable = (function (_ref) {
     onEdit = _ref.onEdit,
     style = _ref.style,
     table = _ref.table,
+    _ref$manualRequest = _ref.manualRequest,
+    manualRequest = _ref$manualRequest === void 0 ? true : _ref$manualRequest,
     props = _objectWithoutProperties(_ref, _excluded);
   var cuTable = useCuEditTable({
     table: table
@@ -102,7 +104,7 @@ var EditTable = (function (_ref) {
         editableFormRef: defaultEditableFormRef,
         actionRef: defaultActionRef,
         value: data === null || data === void 0 ? void 0 : data.records,
-        manualRequest: true,
+        manualRequest: manualRequest,
         request: function request(params, sorter) {
           run({}, sorter);
           return _Promise.resolve({});

package/es/EditTable/modal.d.ts

@@ -1,18 +1,18 @@
 import { EditableFormInstance, EditableProTableProps } from "@ant-design/pro-table/lib/components/EditableTable";
 import { ParamsType } from "@ant-design/pro-provider";
 import { IPaginationProps } from "../HTablePagination";
-import { EmptyPageRender, ErrorPageRender } from "../modal";
+import { EmptyPageRender, ErrorPageRender, ResultModal } from "../modal";
 import { ActionType, ProColumns } from "@ant-design/pro-table/lib/typing";
 export interface EditTableInstance {
     editableForm: EditableFormInstance | {};
     action: ActionType | {};
     reload: () => void;
 }
-export interface HEditTableProps<T = any> extends Omit<EditableProTableProps<T, ParamsType>, "recordCreatorProps" | "request" | "pagination"> {
+export interface HEditTableProps<T = any> extends Omit<EditableProTableProps<T, ParamsType>, "recordCreatorProps" | "request" | "pagination" | "dataSource"> {
     creatorButtonText?: string;
     defaultRecordValue?: T;
     recordCreatorProps?: Partial<EditableProTableProps<T, ParamsType>["recordCreatorProps"]>;
-    dataSource?: any[];
+    dataSource?: ResultModal | any[];
     request?: (params: Record<string, any>) => Promise<T>;
     pagination?: IPaginationProps | false;
     manual?: boolean;

package/es/render/TagsComponent.js

@@ -150,7 +150,7 @@ var TagsComponent = function TagsComponent(props) {
             e.preventDefault();
             cuTagProps === null || cuTagProps === void 0 || cuTagProps.onClose(cuKey, tableInstance);
           },
-          children: contentItemRender ? tagNode : tagNode
+          children: contentItemRender ? contentItemRender(tagItem) : tagNode
         }), cuKey)
       }));
     }), !moreLen ? null : jsx(Popover, {

package/lib/DialogTable/Content.js

@@ -56,7 +56,8 @@ var EditTableContent = function EditTableContent(_ref2) {
     configData: configData || [],
     request: request,
     pagination: cuPagination,
-    dataSource: dataSource
+    dataSource: dataSource,
+    manualRequest: false
   }));
   return jsxRuntime.jsx(jsxRuntime.Fragment, {
     children: contentRender ? contentRender(node) : node

package/lib/EditTable/hooks.js

@@ -160,6 +160,7 @@ var useColsMk = function useColsMk(_ref5) {
     var valueType = item.valueType,
       _render = item.render;
     var configType = valueType;
+    console.log(item, "iiiiiiii");
     if (config.default[configType]) {
       return _objectSpread(_objectSpread({}, item), {}, {
         render: function render(dom, entity, index, action, schema) {

package/lib/EditTable/index.d.ts

@@ -1,4 +1,4 @@
 /// <reference types="react" />
 import { HEditTableProps } from "./modal";
-declare const _default: ({ configData, rowKey, creatorButtonText, recordCreatorProps, defaultRecordValue, pagination, editable, dataSource, request, manual, emptyRender, errorRender, onAdd, onEdit, style, table, ...props }: HEditTableProps) => JSX.Element;
+declare const _default: ({ configData, rowKey, creatorButtonText, recordCreatorProps, defaultRecordValue, pagination, editable, dataSource, request, manual, emptyRender, errorRender, onAdd, onEdit, style, table, manualRequest, ...props }: HEditTableProps) => JSX.Element;
 export default _default;

package/lib/EditTable/index.js

@@ -25,7 +25,7 @@ var TableConfig = require('../TableConfig.js');
 var hooks = require('./hooks.js');
 var React = require('react');
 
-var _excluded = ["configData", "rowKey", "creatorButtonText", "recordCreatorProps", "defaultRecordValue", "pagination", "editable", "dataSource", "request", "manual", "emptyRender", "errorRender", "onAdd", "onEdit", "style", "table"],
+var _excluded = ["configData", "rowKey", "creatorButtonText", "recordCreatorProps", "defaultRecordValue", "pagination", "editable", "dataSource", "request", "manual", "emptyRender", "errorRender", "onAdd", "onEdit", "style", "table", "manualRequest"],
   _excluded2 = ["index", "id"];
 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 _context3, _context4; var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? _forEachInstanceProperty(_context3 = ownKeys(Object(t), !0)).call(_context3, function (r) { _defineProperty(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(e, _Object$getOwnPropertyDescriptors(t)) : _forEachInstanceProperty(_context4 = ownKeys(Object(t))).call(_context4, function (r) { _Object$defineProperty(e, r, _Object$getOwnPropertyDescriptor(t, r)); }); } return e; }
@@ -51,6 +51,8 @@ var EditTable = (function (_ref) {
     onEdit = _ref.onEdit,
     style = _ref.style,
     table = _ref.table,
+    _ref$manualRequest = _ref.manualRequest,
+    manualRequest = _ref$manualRequest === void 0 ? true : _ref$manualRequest,
     props = _objectWithoutProperties(_ref, _excluded);
   var cuTable = hooks.useCuEditTable({
     table: table
@@ -105,7 +107,7 @@ var EditTable = (function (_ref) {
         editableFormRef: defaultEditableFormRef,
         actionRef: defaultActionRef,
         value: data === null || data === void 0 ? void 0 : data.records,
-        manualRequest: true,
+        manualRequest: manualRequest,
         request: function request(params, sorter) {
           run({}, sorter);
           return _Promise.resolve({});

package/lib/EditTable/modal.d.ts

@@ -1,18 +1,18 @@
 import { EditableFormInstance, EditableProTableProps } from "@ant-design/pro-table/lib/components/EditableTable";
 import { ParamsType } from "@ant-design/pro-provider";
 import { IPaginationProps } from "../HTablePagination";
-import { EmptyPageRender, ErrorPageRender } from "../modal";
+import { EmptyPageRender, ErrorPageRender, ResultModal } from "../modal";
 import { ActionType, ProColumns } from "@ant-design/pro-table/lib/typing";
 export interface EditTableInstance {
     editableForm: EditableFormInstance | {};
     action: ActionType | {};
     reload: () => void;
 }
-export interface HEditTableProps<T = any> extends Omit<EditableProTableProps<T, ParamsType>, "recordCreatorProps" | "request" | "pagination"> {
+export interface HEditTableProps<T = any> extends Omit<EditableProTableProps<T, ParamsType>, "recordCreatorProps" | "request" | "pagination" | "dataSource"> {
     creatorButtonText?: string;
     defaultRecordValue?: T;
     recordCreatorProps?: Partial<EditableProTableProps<T, ParamsType>["recordCreatorProps"]>;
-    dataSource?: any[];
+    dataSource?: ResultModal | any[];
     request?: (params: Record<string, any>) => Promise<T>;
     pagination?: IPaginationProps | false;
     manual?: boolean;

package/lib/render/TagsComponent.js

@@ -153,7 +153,7 @@ var TagsComponent = function TagsComponent(props) {
             e.preventDefault();
             cuTagProps === null || cuTagProps === void 0 || cuTagProps.onClose(cuKey, tableInstance);
           },
-          children: contentItemRender ? tagNode : tagNode
+          children: contentItemRender ? contentItemRender(tagItem) : tagNode
         }), cuKey)
       }));
     }), !moreLen ? null : jsxRuntime.jsx(antd.Popover, {

package/package.json

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

package/src/components/DialogTable/Content.tsx

@@ -52,6 +52,7 @@ export const EditTableContent = ({
       request={request}
       pagination={cuPagination as any}
       dataSource={dataSource}
+      manualRequest={false}
     />
   );
   return <>{contentRender ? contentRender(node) : node}</>;

package/src/components/EditTable/hooks.ts

@@ -134,6 +134,7 @@ export const useColsMk = ({ configData, reload }: ColProps) => {
   return configData?.map((item) => {
     const { valueType, render } = item;
     const configType = valueType as string;
+    console.log(item,"iiiiiiii")
     if (config[configType]) {
       return {
         ...item,

package/src/components/EditTable/index.tsx

@@ -34,6 +34,7 @@ export default ({
   onEdit,
   style,
   table,
+  manualRequest=true,
   ...props
 }: HEditTableProps) => {
   const cuTable = useCuEditTable({ table });
@@ -77,7 +78,7 @@ export default ({
           editableFormRef={defaultEditableFormRef}
           actionRef={defaultActionRef}
           value={data?.records}
-          manualRequest
+          manualRequest={manualRequest}
           request={(params, sorter) => {
             run({}, sorter);
             return Promise.resolve({});

package/src/components/EditTable/modal.ts

@@ -4,7 +4,7 @@ import {
 } from "@ant-design/pro-table/lib/components/EditableTable";
 import { ParamsType } from "@ant-design/pro-provider";
 import { IPaginationProps } from "../HTablePagination";
-import { EmptyPageRender, ErrorPageRender } from "../modal";
+import {EmptyPageRender, ErrorPageRender, ResultModal} from "../modal";
 import { ActionType, ProColumns } from "@ant-design/pro-table/lib/typing";
 
 export interface EditTableInstance {
@@ -16,14 +16,14 @@ export interface EditTableInstance {
 export interface HEditTableProps<T = any>
   extends Omit<
     EditableProTableProps<T, ParamsType>,
-    "recordCreatorProps" | "request" | "pagination"
+    "recordCreatorProps" | "request" | "pagination"|"dataSource"
   > {
   creatorButtonText?: string;
   defaultRecordValue?: T;
   recordCreatorProps?: Partial<
     EditableProTableProps<T, ParamsType>["recordCreatorProps"]
   >;
-  dataSource?: any[];
+  dataSource?: ResultModal | any[];
   request?: (params: Record<string, any>) => Promise<T>;
   pagination?: IPaginationProps | false;
   manual?: boolean;

package/src/components/render/TagsComponent.tsx

@@ -143,7 +143,7 @@ const TagsComponent = (props: IProps) => {
                 cuTagProps?.onClose(cuKey, tableInstance);
               }}
             >
-              {contentItemRender ? tagNode : tagNode}
+              {contentItemRender ? contentItemRender(tagItem) : tagNode}
             </Tag>
           </Tooltip>
         );

package/src/pages/EditTable/index.tsx

@@ -34,7 +34,6 @@ export default () => {
         pagination={false}
         onEdit={async (data) => {}}
         request={async () => {
-          console.log("fffff");
           return {
             records: [{ title: "1", id: 1 }],
             size: 10,
@@ -43,7 +42,17 @@ export default () => {
           };
         }}
         configData={[
-          { title: "标题", sorter: true, dataIndex: "title" },
+            {
+                title: '排序',
+                sorter: true,
+                dataIndex: 'sort',
+                valueType: 'digit',
+                width: 100,
+                fieldProps: { min: 1 },
+                formItemProps: () => ({
+                    rules: [{ required: true, message: '请输入排序' }],
+                }),
+            },
           {
             title: "标题2",
             dataIndex: "time",

package/src/pages/ModalEditTable/index.tsx

@@ -58,7 +58,7 @@ export default () => {
             </>
           );
         }}
-        request={() => {
+        request={(params) => {
           return new Promise((resolve) => {
             setTimeout(() => {
               resolve({
@@ -81,7 +81,7 @@ export default () => {
         }}
         editDialogTable={dialogTable}
         configData={[
-          { title: "标题", dataIndex: "title" },
+          { title: "标题", dataIndex: "title" ,sorter:true},
           { title: "标题2", dataIndex: "time", valueType: "date" },
           {
             title: "操作",

package/src/pages/Table/index.tsx

@@ -152,6 +152,7 @@ export default () => {
       width: 888,
       sorter: true,
       showSearch: true,
+      searchType: "selectInput",
     },
     {
       title: "操作2",
@@ -277,7 +278,10 @@ export default () => {
             formInitValues={{
               op1: "orderNo",
             }}
-            request={listReq}
+            request={(params)=>{
+              console.log("request,request,request,request")
+              return listReq(params);
+            }}
             headerTitle={
               <Space size={8}>
                 <Button