@hw-component/table 1.0.4 → 1.0.5

package/es/HTableHeader/hooks.js

@@ -24,7 +24,7 @@ import { DefaultSubComponent } from './defaultSubComponent.js';
 import { useHTableContext } from '../context.js';
 import { renderData } from './defaultFormRender.js';
 
-var _excluded = ["colon", "searchType", "title", "name", "dataIndex", "itemProps", "searchRender", "childrenDataIndex", "showSearch", "hideInTable", "align"];
+var _excluded = ["searchType", "title", "name", "dataIndex", "itemProps", "searchRender", "childrenDataIndex", "showSearch", "hideInTable", "align", "searchLabel", "titleStr"];
 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; }
 var sizeObj = {
@@ -85,9 +85,7 @@ var getCuSpanMaxNum = function getCuSpanMaxNum() {
   return 24 / cuSpan;
 };
 var formConfigDataItemProvider = function formConfigDataItemProvider(_ref, table) {
-  var _ref$colon = _ref.colon,
-    colon = _ref$colon === void 0 ? false : _ref$colon,
-    searchType = _ref.searchType,
+  var searchType = _ref.searchType,
     title = _ref.title,
     name = _ref.name,
     dataIndex = _ref.dataIndex,
@@ -98,15 +96,16 @@ var formConfigDataItemProvider = function formConfigDataItemProvider(_ref, table
     _ref.showSearch;
     _ref.hideInTable;
     _ref.align;
-    var props = _objectWithoutProperties(_ref, _excluded);
+    var searchLabel = _ref.searchLabel,
+    titleStr = _ref.titleStr,
+    props = _objectWithoutProperties(_ref, _excluded);
   var _itemProps$allowClear = itemProps.allowClear,
     allowClear = _itemProps$allowClear === void 0 ? true : _itemProps$allowClear;
   return _objectSpread(_objectSpread({}, props), {}, {
     itemProps: _objectSpread(_objectSpread({}, itemProps), {}, {
       allowClear: allowClear
     }),
-    label: title,
-    colon: colon,
+    label: searchLabel || titleStr || title,
     type: searchType,
     name: name || dataIndex,
     render: function render(item, node, form) {

package/es/HTableHeader/index.d.ts

@@ -1,3 +1,3 @@
 import type { IHeaderProps } from "./modal";
-declare const _default: ({ configData, onFinish, searchSpan, headerStyle, initValues, }: IHeaderProps) => JSX.Element;
+declare const _default: ({ configData, onFinish, searchSpan, headerStyle, initValues, hideLabel, labelWidth }: IHeaderProps) => JSX.Element;
 export default _default;

package/es/HTableHeader/index.js

@@ -30,12 +30,16 @@ var Header = (function (_ref) {
     _ref$searchSpan = _ref.searchSpan,
     searchSpan = _ref$searchSpan === void 0 ? defaultSearchSpan : _ref$searchSpan,
     headerStyle = _ref.headerStyle,
-    initValues = _ref.initValues;
+    initValues = _ref.initValues,
+    hideLabel = _ref.hideLabel,
+    labelWidth = _ref.labelWidth;
   var _useHTableContext = useHTableContext(),
     tableInstance = _useHTableContext.tableInstance,
     loading = _useHTableContext.loading,
     contextOnFinish = _useHTableContext.onFinish,
-    contextConfigData = _useHTableContext.configData;
+    contextConfigData = _useHTableContext.configData,
+    contextHideLabel = _useHTableContext.hideLabel,
+    contextLabelWidth = _useHTableContext.labelWidth;
   var headerConfigData = configData || contextConfigData;
   var form = tableInstance.form;
   var subOnFinish = onFinish || contextOnFinish;
@@ -44,7 +48,10 @@ var Header = (function (_ref) {
     configData: headerConfigData,
     table: tableInstance
   });
+  var tableHideLabel = typeof hideLabel === "undefined" ? contextHideLabel : hideLabel;
+  var tableLabelWidth = labelWidth || contextLabelWidth;
   var className = useClassName("hw-table-header");
+  console.log(nConfigData, "nConfigData");
   return jsx(Card, {
     style: _objectSpread({
       borderBottomLeftRadius: 0,
@@ -61,9 +68,11 @@ var Header = (function (_ref) {
       submitLoading: loading,
       gutter: [20, 0],
       initialValues: initValues,
-      hideLabel: true,
+      hideLabel: typeof tableHideLabel === "undefined" ? true : tableHideLabel,
       configData: nConfigData,
-      form: form
+      form: form,
+      colon: true,
+      labelWidth: tableLabelWidth
     })
   });
 });

package/es/HTableHeader/modal.d.ts

@@ -10,7 +10,11 @@ export interface IHeaderProps {
     headerStyle?: React.CSSProperties;
     table?: HTableInstance;
     initValues?: Record<string, any>;
+    hideLabel?: boolean;
+    labelWidth?: number;
 }
 export interface FormConfigDataItemProviderModal extends ConfigItemModal {
     className?: string;
+    searchLabel?: string;
+    titleStr?: string;
 }

package/es/Table.d.ts

@@ -1,3 +1,3 @@
 import type { HTableProps } from "./modal";
-declare const _default: ({ request, configData, searchSpan, table, hideHeader, headerStyle, tableStyle, action, spaceSize, className, paginationStyle, rowKey, onFinish, manual, formInitValues, ...props }: HTableProps) => JSX.Element;
+declare const _default: ({ request, configData, searchSpan, table, hideHeader, headerStyle, tableStyle, action, spaceSize, className, paginationStyle, rowKey, onFinish, manual, formInitValues, hideLabel, labelWidth, ...props }: HTableProps) => JSX.Element;
 export default _default;

package/es/Table.js

@@ -21,7 +21,7 @@ import useReq from './hooks/useReq.js';
 import useDispatch from './hooks/useDispatch.js';
 import { useState } from 'react';
 
-var _excluded = ["request", "configData", "searchSpan", "table", "hideHeader", "headerStyle", "tableStyle", "action", "spaceSize", "className", "paginationStyle", "rowKey", "onFinish", "manual", "formInitValues"];
+var _excluded = ["request", "configData", "searchSpan", "table", "hideHeader", "headerStyle", "tableStyle", "action", "spaceSize", "className", "paginationStyle", "rowKey", "onFinish", "manual", "formInitValues", "hideLabel", "labelWidth"];
 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 _context, _context2; var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? _forEachInstanceProperty(_context = ownKeys(Object(t), !0)).call(_context, function (r) { _defineProperty(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(e, _Object$getOwnPropertyDescriptors(t)) : _forEachInstanceProperty(_context2 = ownKeys(Object(t))).call(_context2, function (r) { _Object$defineProperty(e, r, _Object$getOwnPropertyDescriptor(t, r)); }); } return e; }
 var Table = (function (_ref) {
@@ -44,6 +44,8 @@ var Table = (function (_ref) {
     onFinish = _ref.onFinish,
     manual = _ref.manual,
     formInitValues = _ref.formInitValues,
+    hideLabel = _ref.hideLabel,
+    labelWidth = _ref.labelWidth,
     props = _objectWithoutProperties(_ref, _excluded);
   var _useReq = useReq({
       request: request,
@@ -103,7 +105,9 @@ var Table = (function (_ref) {
       setSelectedRowData: setSelectedRowData,
       rowKey: rowKey,
       headerOpen: open,
-      setHeaderOpen: setOpen
+      setHeaderOpen: setOpen,
+      hideLabel: hideLabel,
+      labelWidth: labelWidth
     },
     children: jsxs(Space, {
       direction: "vertical",

package/es/modal.d.ts

@@ -73,6 +73,8 @@ export interface HTableProps extends Omit<ProTableProps<any, any>, "request" | "
     paginationActionRender?: (tableInstance: HTableInstance) => React.ReactNode;
     localSorter?: boolean;
     formInitValues?: Record<string, any>;
+    labelWidth?: number;
+    hideLabel?: boolean;
 }
 export interface TableInstance {
     reload: (params?: ParamsModal) => Promise<any>;

package/lib/HTableHeader/hooks.js

@@ -25,7 +25,7 @@ var defaultSubComponent = require('./defaultSubComponent.js');
 var context = require('../context.js');
 var defaultFormRender = require('./defaultFormRender.js');
 
-var _excluded = ["colon", "searchType", "title", "name", "dataIndex", "itemProps", "searchRender", "childrenDataIndex", "showSearch", "hideInTable", "align"];
+var _excluded = ["searchType", "title", "name", "dataIndex", "itemProps", "searchRender", "childrenDataIndex", "showSearch", "hideInTable", "align", "searchLabel", "titleStr"];
 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; }
 var sizeObj = {
@@ -86,9 +86,7 @@ var getCuSpanMaxNum = function getCuSpanMaxNum() {
   return 24 / cuSpan;
 };
 var formConfigDataItemProvider = function formConfigDataItemProvider(_ref, table) {
-  var _ref$colon = _ref.colon,
-    colon = _ref$colon === void 0 ? false : _ref$colon,
-    searchType = _ref.searchType,
+  var searchType = _ref.searchType,
     title = _ref.title,
     name = _ref.name,
     dataIndex = _ref.dataIndex,
@@ -99,15 +97,16 @@ var formConfigDataItemProvider = function formConfigDataItemProvider(_ref, table
     _ref.showSearch;
     _ref.hideInTable;
     _ref.align;
-    var props = _objectWithoutProperties(_ref, _excluded);
+    var searchLabel = _ref.searchLabel,
+    titleStr = _ref.titleStr,
+    props = _objectWithoutProperties(_ref, _excluded);
   var _itemProps$allowClear = itemProps.allowClear,
     allowClear = _itemProps$allowClear === void 0 ? true : _itemProps$allowClear;
   return _objectSpread(_objectSpread({}, props), {}, {
     itemProps: _objectSpread(_objectSpread({}, itemProps), {}, {
       allowClear: allowClear
     }),
-    label: title,
-    colon: colon,
+    label: searchLabel || titleStr || title,
     type: searchType,
     name: name || dataIndex,
     render: function render(item, node, form) {

package/lib/HTableHeader/index.d.ts

@@ -1,3 +1,3 @@
 import type { IHeaderProps } from "./modal";
-declare const _default: ({ configData, onFinish, searchSpan, headerStyle, initValues, }: IHeaderProps) => JSX.Element;
+declare const _default: ({ configData, onFinish, searchSpan, headerStyle, initValues, hideLabel, labelWidth }: IHeaderProps) => JSX.Element;
 export default _default;

package/lib/HTableHeader/index.js

@@ -33,12 +33,16 @@ var Header = (function (_ref) {
     _ref$searchSpan = _ref.searchSpan,
     searchSpan = _ref$searchSpan === void 0 ? defaultSearchSpan : _ref$searchSpan,
     headerStyle = _ref.headerStyle,
-    initValues = _ref.initValues;
+    initValues = _ref.initValues,
+    hideLabel = _ref.hideLabel,
+    labelWidth = _ref.labelWidth;
   var _useHTableContext = context.useHTableContext(),
     tableInstance = _useHTableContext.tableInstance,
     loading = _useHTableContext.loading,
     contextOnFinish = _useHTableContext.onFinish,
-    contextConfigData = _useHTableContext.configData;
+    contextConfigData = _useHTableContext.configData,
+    contextHideLabel = _useHTableContext.hideLabel,
+    contextLabelWidth = _useHTableContext.labelWidth;
   var headerConfigData = configData || contextConfigData;
   var form$1 = tableInstance.form;
   var subOnFinish = onFinish || contextOnFinish;
@@ -47,7 +51,10 @@ var Header = (function (_ref) {
     configData: headerConfigData,
     table: tableInstance
   });
+  var tableHideLabel = typeof hideLabel === "undefined" ? contextHideLabel : hideLabel;
+  var tableLabelWidth = labelWidth || contextLabelWidth;
   var className = index.useClassName("hw-table-header");
+  console.log(nConfigData, "nConfigData");
   return jsxRuntime.jsx(antd.Card, {
     style: _objectSpread({
       borderBottomLeftRadius: 0,
@@ -64,9 +71,11 @@ var Header = (function (_ref) {
       submitLoading: loading,
       gutter: [20, 0],
       initialValues: initValues,
-      hideLabel: true,
+      hideLabel: typeof tableHideLabel === "undefined" ? true : tableHideLabel,
       configData: nConfigData,
-      form: form$1
+      form: form$1,
+      colon: true,
+      labelWidth: tableLabelWidth
     })
   });
 });

package/lib/HTableHeader/modal.d.ts

@@ -10,7 +10,11 @@ export interface IHeaderProps {
     headerStyle?: React.CSSProperties;
     table?: HTableInstance;
     initValues?: Record<string, any>;
+    hideLabel?: boolean;
+    labelWidth?: number;
 }
 export interface FormConfigDataItemProviderModal extends ConfigItemModal {
     className?: string;
+    searchLabel?: string;
+    titleStr?: string;
 }

package/lib/Table.d.ts

@@ -1,3 +1,3 @@
 import type { HTableProps } from "./modal";
-declare const _default: ({ request, configData, searchSpan, table, hideHeader, headerStyle, tableStyle, action, spaceSize, className, paginationStyle, rowKey, onFinish, manual, formInitValues, ...props }: HTableProps) => JSX.Element;
+declare const _default: ({ request, configData, searchSpan, table, hideHeader, headerStyle, tableStyle, action, spaceSize, className, paginationStyle, rowKey, onFinish, manual, formInitValues, hideLabel, labelWidth, ...props }: HTableProps) => JSX.Element;
 export default _default;

package/lib/Table.js

@@ -24,7 +24,7 @@ var useReq = require('./hooks/useReq.js');
 var useDispatch = require('./hooks/useDispatch.js');
 var React = require('react');
 
-var _excluded = ["request", "configData", "searchSpan", "table", "hideHeader", "headerStyle", "tableStyle", "action", "spaceSize", "className", "paginationStyle", "rowKey", "onFinish", "manual", "formInitValues"];
+var _excluded = ["request", "configData", "searchSpan", "table", "hideHeader", "headerStyle", "tableStyle", "action", "spaceSize", "className", "paginationStyle", "rowKey", "onFinish", "manual", "formInitValues", "hideLabel", "labelWidth"];
 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 _context, _context2; var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? _forEachInstanceProperty(_context = ownKeys(Object(t), !0)).call(_context, function (r) { _defineProperty(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(e, _Object$getOwnPropertyDescriptors(t)) : _forEachInstanceProperty(_context2 = ownKeys(Object(t))).call(_context2, function (r) { _Object$defineProperty(e, r, _Object$getOwnPropertyDescriptor(t, r)); }); } return e; }
 var Table = (function (_ref) {
@@ -47,6 +47,8 @@ var Table = (function (_ref) {
     onFinish = _ref.onFinish,
     manual = _ref.manual,
     formInitValues = _ref.formInitValues,
+    hideLabel = _ref.hideLabel,
+    labelWidth = _ref.labelWidth,
     props = _objectWithoutProperties(_ref, _excluded);
   var _useReq = useReq.default({
       request: request,
@@ -106,7 +108,9 @@ var Table = (function (_ref) {
       setSelectedRowData: setSelectedRowData,
       rowKey: rowKey,
       headerOpen: open,
-      setHeaderOpen: setOpen
+      setHeaderOpen: setOpen,
+      hideLabel: hideLabel,
+      labelWidth: labelWidth
     },
     children: jsxRuntime.jsxs(antd.Space, {
       direction: "vertical",

package/lib/modal.d.ts

@@ -73,6 +73,8 @@ export interface HTableProps extends Omit<ProTableProps<any, any>, "request" | "
     paginationActionRender?: (tableInstance: HTableInstance) => React.ReactNode;
     localSorter?: boolean;
     formInitValues?: Record<string, any>;
+    labelWidth?: number;
+    hideLabel?: boolean;
 }
 export interface TableInstance {
     reload: (params?: ParamsModal) => Promise<any>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hw-component/table",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "description": "基于antd二次开发table组件",
   "keywords": [
     "table"
@@ -31,7 +31,7 @@
   "dependencies": {
     "@ant-design/icons": "4.6.2",
     "@ant-design/pro-table": "2.70.0",
-    "@hw-component/form": "1.3.7",
+    "@hw-component/form": "1.3.8",
     "ahooks": "2.10.9",
     "antd": "4.20.7",
     "core-js": "3",

package/src/components/HTableHeader/hooks.tsx

@@ -59,7 +59,6 @@ const getCuSpanMaxNum = (searchSpan: ColProps = { span: 6 }) => {
 };
 const formConfigDataItemProvider = (
   {
-    colon = false,
     searchType,
     title,
     name,
@@ -70,6 +69,8 @@ const formConfigDataItemProvider = (
     showSearch,
     hideInTable,
     align,
+    searchLabel,
+    titleStr,
     ...props
   }: FormConfigDataItemProviderModal,
   table: HTableInstance
@@ -82,8 +83,7 @@ const formConfigDataItemProvider = (
       ...itemProps,
       allowClear,
     },
-    label: title,
-    colon,
+    label: searchLabel||titleStr||title,
     type: searchType,
     name: name || (dataIndex as string),
     render: (item, node, form) => {

package/src/components/HTableHeader/index.tsx

@@ -19,12 +19,16 @@ export default ({
   searchSpan = defaultSearchSpan,
   headerStyle,
   initValues,
+                  hideLabel,
+                  labelWidth
 }: IHeaderProps) => {
   const {
     tableInstance,
     loading,
     onFinish: contextOnFinish,
     configData: contextConfigData,
+    hideLabel:contextHideLabel,
+    labelWidth:contextLabelWidth
   } = useHTableContext();
   const headerConfigData = configData || contextConfigData;
   const { form } = tableInstance;
@@ -34,7 +38,11 @@ export default ({
     configData: headerConfigData,
     table: tableInstance,
   });
+  const tableHideLabel=typeof hideLabel==="undefined"?contextHideLabel:hideLabel;
+  const tableLabelWidth=labelWidth||contextLabelWidth;
+
   const className = useClassName("hw-table-header");
+  console.log(nConfigData,"nConfigData")
   return (
     <Card
       style={{
@@ -52,9 +60,11 @@ export default ({
         submitLoading={loading}
         gutter={[20, 0]}
         initialValues={initValues}
-        hideLabel={true}
+        hideLabel={typeof tableHideLabel==="undefined"?true:tableHideLabel}
         configData={nConfigData}
         form={form}
+        colon={true}
+        labelWidth={tableLabelWidth}
       />
     </Card>
   );

package/src/components/HTableHeader/modal.ts

@@ -11,8 +11,12 @@ export interface IHeaderProps {
   headerStyle?: React.CSSProperties;
   table?: HTableInstance;
   initValues?: Record<string, any>;
+  hideLabel?:boolean;
+  labelWidth?:number
 }
 
 export interface FormConfigDataItemProviderModal extends ConfigItemModal {
   className?: string;
+  searchLabel?:string
+  titleStr?:string;
 }

package/src/components/Table.tsx

@@ -24,6 +24,8 @@ export default ({
   onFinish,
   manual,
   formInitValues,
+  hideLabel,
+  labelWidth,
   ...props
 }: HTableProps) => {
   const { run, loading, data, error, saveParams } = useReq({ request, manual });
@@ -69,6 +71,8 @@ export default ({
         rowKey,
         headerOpen: open,
         setHeaderOpen: setOpen,
+          hideLabel,
+          labelWidth,
       }}
     >
       <Space direction={"vertical"} size={0} style={{ width: "100%" }}>

package/src/components/modal.ts

@@ -111,6 +111,8 @@ export interface HTableProps
   paginationActionRender?: (tableInstance: HTableInstance) => React.ReactNode;
   localSorter?: boolean;
   formInitValues?: Record<string, any>;
+  labelWidth?:number;
+  hideLabel?:boolean;
 }
 export interface TableInstance {
   reload: (params?: ParamsModal) => Promise<any>;

package/src/index.tsx

@@ -3,6 +3,7 @@ import App from "./app";
 import React from "react";
 import "antd/dist/antd.css";
 import zhCN from "antd/es/locale/zh_CN";
+import '@hw-component/form/src/components/styles/index.less';
 import { ConfigProvider } from "antd";
 render(
   <ConfigProvider locale={zhCN}>

package/src/pages/Table/index.tsx

@@ -1,7 +1,6 @@
 import { HTable, useHTable } from "@/components";
 import { Button } from "antd";
 import { HFormConfigProvider } from "@hw-component/form";
-import table from "@/components/Table";
 
 const configData = [
   {
@@ -9,6 +8,7 @@ const configData = [
     showSearch: true,
     searchType: "rangePicker",
     dataIndex: "id",
+    searchLabel:"fff",
     sorter: (a, b) => a.id - b.id,
     itemProps: {
       options: [{ label: "1", value: 1 }],
@@ -78,6 +78,8 @@ export default () => {
           configData={configData}
           rowKey={"id"}
           table={hTable}
+          hideLabel={false}
+          labelWidth={88}
           action={{
             test: (params) => {
               console.log(params, "lllll");