@hw-component/table 0.0.6-beta-v16 → 0.0.6-beta-v20

package/es/HTableHeader/defaultSubComponent.js

@@ -1,9 +1,21 @@
 // welcome to hoo hoo hoo
+import _Object$keys from '@babel/runtime-corejs3/core-js/object/keys';
+import _Object$getOwnPropertySymbols from '@babel/runtime-corejs3/core-js/object/get-own-property-symbols';
+import _filterInstanceProperty from '@babel/runtime-corejs3/core-js/instance/filter';
+import _Object$getOwnPropertyDescriptor from '@babel/runtime-corejs3/core-js/object/get-own-property-descriptor';
+import _forEachInstanceProperty from '@babel/runtime-corejs3/core-js/instance/for-each';
+import _Object$getOwnPropertyDescriptors from '@babel/runtime-corejs3/core-js/object/get-own-property-descriptors';
+import _Object$defineProperties from '@babel/runtime-corejs3/core-js/object/define-properties';
+import _Object$defineProperty from '@babel/runtime-corejs3/core-js/object/define-property';
+import _defineProperty from '@babel/runtime-corejs3/helpers/defineProperty';
 import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
 import { Row, Space, Button, Typography } from 'antd';
 import { useHTableContext } from '../context.js';
+import { useMemo } from 'react';
 import { DownOutlined, UpOutlined } from '@ant-design/icons';
 
+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 OpenComponent = function OpenComponent() {
   var _useHTableContext = useHTableContext(),
     headerOpen = _useHTableContext.headerOpen,
@@ -27,11 +39,28 @@ var DefaultSubComponent = function DefaultSubComponent(_ref) {
   var _useHTableContext2 = useHTableContext(),
     loading = _useHTableContext2.loading,
     headerOpen = _useHTableContext2.headerOpen;
+  var hide = typeof headerOpen === "undefined";
+  var _useMemo = useMemo(function () {
+      if (hide) {
+        return {
+          justify: "start",
+          style: {
+            marginLeft: 20
+          }
+        };
+      }
+      return {
+        justify: "end",
+        style: {}
+      };
+    }, [hide]),
+    justify = _useMemo.justify,
+    style = _useMemo.style;
   return jsx(Row, {
-    justify: "end",
-    style: {
-      marginLeft: -20
-    },
+    justify: justify,
+    style: _objectSpread({
+      width: "100%"
+    }, style),
     children: jsxs(Space, {
       size: 6,
       children: [jsx(Button, {
@@ -52,7 +81,7 @@ var DefaultSubComponent = function DefaultSubComponent(_ref) {
           form.resetFields();
         },
         children: "\u91CD\u7F6E"
-      }), typeof headerOpen === "undefined" ? null : jsx(OpenComponent, {})]
+      }), hide ? null : jsx(OpenComponent, {})]
     })
   });
 };

package/es/HTableHeader/hooks.js

@@ -55,6 +55,10 @@ var defaultSubItem = {
   itemProps: {
     position: "end"
   },
+  style: {
+    padding: 0,
+    marginLeft: -20
+  },
   render: function render(item, node, form) {
     return jsx(DefaultSubComponent, {
       form: form

package/lib/HTableHeader/defaultSubComponent.js

@@ -1,10 +1,22 @@
 'use strict';
 
+var _Object$keys = require('@babel/runtime-corejs3/core-js/object/keys');
+var _Object$getOwnPropertySymbols = require('@babel/runtime-corejs3/core-js/object/get-own-property-symbols');
+var _filterInstanceProperty = require('@babel/runtime-corejs3/core-js/instance/filter');
+var _Object$getOwnPropertyDescriptor = require('@babel/runtime-corejs3/core-js/object/get-own-property-descriptor');
+var _forEachInstanceProperty = require('@babel/runtime-corejs3/core-js/instance/for-each');
+var _Object$getOwnPropertyDescriptors = require('@babel/runtime-corejs3/core-js/object/get-own-property-descriptors');
+var _Object$defineProperties = require('@babel/runtime-corejs3/core-js/object/define-properties');
+var _Object$defineProperty = require('@babel/runtime-corejs3/core-js/object/define-property');
+var _defineProperty = require('@babel/runtime-corejs3/helpers/defineProperty');
 var jsxRuntime = require('react/jsx-runtime');
 var antd = require('antd');
 var context = require('../context.js');
+var React = require('react');
 var icons = require('@ant-design/icons');
 
+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 OpenComponent = function OpenComponent() {
   var _useHTableContext = context.useHTableContext(),
     headerOpen = _useHTableContext.headerOpen,
@@ -28,11 +40,28 @@ var DefaultSubComponent = function DefaultSubComponent(_ref) {
   var _useHTableContext2 = context.useHTableContext(),
     loading = _useHTableContext2.loading,
     headerOpen = _useHTableContext2.headerOpen;
+  var hide = typeof headerOpen === "undefined";
+  var _useMemo = React.useMemo(function () {
+      if (hide) {
+        return {
+          justify: "start",
+          style: {
+            marginLeft: 20
+          }
+        };
+      }
+      return {
+        justify: "end",
+        style: {}
+      };
+    }, [hide]),
+    justify = _useMemo.justify,
+    style = _useMemo.style;
   return jsxRuntime.jsx(antd.Row, {
-    justify: "end",
-    style: {
-      marginLeft: -20
-    },
+    justify: justify,
+    style: _objectSpread({
+      width: "100%"
+    }, style),
     children: jsxRuntime.jsxs(antd.Space, {
       size: 6,
       children: [jsxRuntime.jsx(antd.Button, {
@@ -53,7 +82,7 @@ var DefaultSubComponent = function DefaultSubComponent(_ref) {
           form.resetFields();
         },
         children: "\u91CD\u7F6E"
-      }), typeof headerOpen === "undefined" ? null : jsxRuntime.jsx(OpenComponent, {})]
+      }), hide ? null : jsxRuntime.jsx(OpenComponent, {})]
     })
   });
 };

package/lib/HTableHeader/hooks.js

@@ -56,6 +56,10 @@ var defaultSubItem = {
   itemProps: {
     position: "end"
   },
+  style: {
+    padding: 0,
+    marginLeft: -20
+  },
   render: function render(item, node, form) {
     return jsxRuntime.jsx(defaultSubComponent.DefaultSubComponent, {
       form: form

package/package.json

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

package/src/components/HTableHeader/defaultSubComponent.tsx

@@ -1,8 +1,9 @@
 import { Button, Row, Space, Typography } from "antd";
 import type { HFormInstance } from "@hw-component/form/es/Form/modal";
 import { useHTableContext } from "../context";
-import React from "react";
+import React, {useMemo} from "react";
 import { DownOutlined, UpOutlined } from "@ant-design/icons";
+import {RowProps} from "antd/lib/grid/row";
 interface IProps {
   form: HFormInstance;
 }
@@ -34,8 +35,25 @@ const OpenComponent = () => {
 };
 export const DefaultSubComponent = ({ form }: IProps) => {
   const { loading, headerOpen } = useHTableContext();
+  const hide=typeof headerOpen === "undefined";
+  const {justify,style}=useMemo(()=>{
+       if (hide){
+          return {
+            justify:"start",
+            style:{
+              marginLeft:20
+            }
+          }
+       }
+    return {
+      justify:"end",
+      style:{
+
+      }
+    }
+  },[hide]);
   return (
-    <Row justify="end" style={{ marginLeft: -20 }}>
+    <Row justify={(justify as RowProps["justify"])} style={{width:"100%",...style}}>
       <Space size={6}>
         <Button
           type={"primary"}
@@ -55,7 +73,7 @@ export const DefaultSubComponent = ({ form }: IProps) => {
         >
           重置
         </Button>
-        {typeof headerOpen === "undefined" ? null : <OpenComponent />}
+        {hide? null : <OpenComponent />}
       </Space>
     </Row>
   );

package/src/components/HTableHeader/hooks.tsx

@@ -35,6 +35,10 @@ const defaultSubItem = {
   itemProps:{
      position:"end"
   },
+  style:{
+     padding:0,
+     marginLeft:-20
+  },
   render: (item: HItemProps, node: React.ReactNode, form: HFormInstance) => {
     return <DefaultSubComponent form={form} />;
   },