@hw-component/form 1.9.87 → 1.9.88

package/es/Select/TagSelect/hooks.d.ts

@@ -8,3 +8,7 @@ export declare const useChangeControl: ({ options, value, onChange, fieldNames }
     change: (val: any) => void;
     allCheck: (e: any) => void | undefined;
 };
+export declare const useCollapseControl: ({ visible, defaultVisible, onVisibleChange }: HTagSelectProps) => {
+    activeKey: string[];
+    onChange: (keys: any) => void;
+};

package/es/Select/TagSelect/hooks.js

@@ -1,6 +1,7 @@
 // welcome to hoo hoo hoo
+import _slicedToArray from '@babel/runtime-corejs3/helpers/slicedToArray';
 import _toConsumableArray from '@babel/runtime-corejs3/helpers/toConsumableArray';
-import { useMemo } from 'react';
+import { useMemo, useState, useEffect } from 'react';
 
 var useTagControl = function useTagControl(_ref) {
   var value = _ref.value,
@@ -92,6 +93,30 @@ var useChangeControl = function useChangeControl(_ref2) {
     allCheck: allCheck
   };
 };
+var useCollapseControl = function useCollapseControl(_ref4) {
+  var visible = _ref4.visible,
+    defaultVisible = _ref4.defaultVisible,
+    onVisibleChange = _ref4.onVisibleChange;
+  var _useState = useState(defaultVisible ? ["1"] : []),
+    _useState2 = _slicedToArray(_useState, 2),
+    activeKey = _useState2[0],
+    setActiveKey = _useState2[1];
+  useEffect(function () {
+    if (typeof visible === "undefined") {
+      return;
+    }
+    setActiveKey(visible ? ["1"] : []);
+  }, [visible]);
+  var onChange = function onChange(keys) {
+    var len = keys === null || keys === void 0 ? void 0 : keys.length;
+    onVisibleChange === null || onVisibleChange === void 0 || onVisibleChange(!!len);
+    setActiveKey(keys);
+  };
+  return {
+    activeKey: activeKey,
+    onChange: onChange
+  };
+};
 
-export { useChangeControl, useTagControl };
+export { useChangeControl, useCollapseControl, useTagControl };
 // powered by hdj

package/es/Select/TagSelect/index.js

@@ -6,7 +6,7 @@ import { Collapse, Checkbox } from 'antd';
 import { useClassName, useMatchConfigProps } from '../../hooks/index.js';
 import { useSelectReq } from '../hooks/norHooks.js';
 import Content from './Content.js';
-import { useTagControl, useChangeControl } from './hooks.js';
+import { useCollapseControl, useTagControl, useChangeControl } from './hooks.js';
 import HFormConnect from '../../Form/HFormConnect.js';
 
 var _excluded = ["children"];
@@ -37,13 +37,22 @@ var Index = function Index(_ref2) {
     manual = _ref2.manual,
     _ref2$className = _ref2.className,
     className = _ref2$className === void 0 ? "" : _ref2$className,
-    collapseProps = _ref2.collapseProps,
+    visible = _ref2.visible,
+    defaultVisible = _ref2.defaultVisible,
+    onVisibleChange = _ref2.onVisibleChange,
     addDispatchListener = _ref2.addDispatchListener;
   var collapseClassName = useClassName("hw-tag-select");
   var _useMatchConfigProps = useMatchConfigProps({
       fieldNames: propsFieldNames
     }),
     fieldNames = _useMatchConfigProps.fieldNames;
+  var _useCollapseControl = useCollapseControl({
+      defaultVisible: defaultVisible,
+      visible: visible,
+      onVisibleChange: onVisibleChange
+    }),
+    activeKey = _useCollapseControl.activeKey,
+    colChange = _useCollapseControl.onChange;
   var _useSelectReq = useSelectReq({
       options: options,
       manual: manual,
@@ -70,10 +79,11 @@ var Index = function Index(_ref2) {
     }),
     allCheck = _useChangeControl.allCheck;
   addDispatchListener === null || addDispatchListener === void 0 || addDispatchListener("reload", reload);
-  return jsx(Collapse, _objectSpread(_objectSpread({
+  return jsx(Collapse, {
     bordered: false,
-    ghost: true
-  }, collapseProps), {}, {
+    ghost: true,
+    activeKey: activeKey,
+    onChange: colChange,
     className: "".concat(collapseClassName, " ").concat(className),
     children: jsx(Panel, {
       header: jsx(ItemTitle, {
@@ -92,7 +102,7 @@ var Index = function Index(_ref2) {
         fieldNames: fieldNames
       })
     }, "1")
-  }));
+  });
 };
 var HTagSelect = HFormConnect(Index);
 

package/es/Select/modal.d.ts

@@ -2,7 +2,6 @@ import type { SelectProps } from "antd";
 import type React from "react";
 import type { PromiseFnResult } from "../modal";
 import type { addFormatItemModal, argsFn, DispatchModal } from "../Form/modal";
-import { CollapseProps } from "antd/lib/collapse/Collapse";
 export type OptionType = Record<string, any>;
 export type RenderFn = (data: OptionType) => React.ReactNode;
 interface ModeConfigItem {
@@ -47,7 +46,9 @@ export interface FilterDataModal {
 }
 export interface HTagSelectProps extends HSelectProps {
     title?: React.ReactNode;
-    collapseProps?: CollapseProps;
+    defaultVisible?: boolean;
+    visible?: boolean;
+    onVisibleChange?: (visible: boolean) => void;
 }
 export type PartialHSelectProps = Partial<HSelectProps>;
 export {};

package/lib/Select/TagSelect/hooks.d.ts

@@ -8,3 +8,7 @@ export declare const useChangeControl: ({ options, value, onChange, fieldNames }
     change: (val: any) => void;
     allCheck: (e: any) => void | undefined;
 };
+export declare const useCollapseControl: ({ visible, defaultVisible, onVisibleChange }: HTagSelectProps) => {
+    activeKey: string[];
+    onChange: (keys: any) => void;
+};

package/lib/Select/TagSelect/hooks.js

@@ -1,5 +1,6 @@
 'use strict';
 
+var _slicedToArray = require('@babel/runtime-corejs3/helpers/slicedToArray');
 var _toConsumableArray = require('@babel/runtime-corejs3/helpers/toConsumableArray');
 var React = require('react');
 
@@ -93,7 +94,32 @@ var useChangeControl = function useChangeControl(_ref2) {
     allCheck: allCheck
   };
 };
+var useCollapseControl = function useCollapseControl(_ref4) {
+  var visible = _ref4.visible,
+    defaultVisible = _ref4.defaultVisible,
+    onVisibleChange = _ref4.onVisibleChange;
+  var _useState = React.useState(defaultVisible ? ["1"] : []),
+    _useState2 = _slicedToArray(_useState, 2),
+    activeKey = _useState2[0],
+    setActiveKey = _useState2[1];
+  React.useEffect(function () {
+    if (typeof visible === "undefined") {
+      return;
+    }
+    setActiveKey(visible ? ["1"] : []);
+  }, [visible]);
+  var onChange = function onChange(keys) {
+    var len = keys === null || keys === void 0 ? void 0 : keys.length;
+    onVisibleChange === null || onVisibleChange === void 0 || onVisibleChange(!!len);
+    setActiveKey(keys);
+  };
+  return {
+    activeKey: activeKey,
+    onChange: onChange
+  };
+};
 
 exports.useChangeControl = useChangeControl;
+exports.useCollapseControl = useCollapseControl;
 exports.useTagControl = useTagControl;
 // powered by h

package/lib/Select/TagSelect/index.js

@@ -40,13 +40,22 @@ var Index = function Index(_ref2) {
     manual = _ref2.manual,
     _ref2$className = _ref2.className,
     className = _ref2$className === void 0 ? "" : _ref2$className,
-    collapseProps = _ref2.collapseProps,
+    visible = _ref2.visible,
+    defaultVisible = _ref2.defaultVisible,
+    onVisibleChange = _ref2.onVisibleChange,
     addDispatchListener = _ref2.addDispatchListener;
   var collapseClassName = index.useClassName("hw-tag-select");
   var _useMatchConfigProps = index.useMatchConfigProps({
       fieldNames: propsFieldNames
     }),
     fieldNames = _useMatchConfigProps.fieldNames;
+  var _useCollapseControl = hooks.useCollapseControl({
+      defaultVisible: defaultVisible,
+      visible: visible,
+      onVisibleChange: onVisibleChange
+    }),
+    activeKey = _useCollapseControl.activeKey,
+    colChange = _useCollapseControl.onChange;
   var _useSelectReq = norHooks.useSelectReq({
       options: options,
       manual: manual,
@@ -73,10 +82,11 @@ var Index = function Index(_ref2) {
     }),
     allCheck = _useChangeControl.allCheck;
   addDispatchListener === null || addDispatchListener === void 0 || addDispatchListener("reload", reload);
-  return jsxRuntime.jsx(antd.Collapse, _objectSpread(_objectSpread({
+  return jsxRuntime.jsx(antd.Collapse, {
     bordered: false,
-    ghost: true
-  }, collapseProps), {}, {
+    ghost: true,
+    activeKey: activeKey,
+    onChange: colChange,
     className: "".concat(collapseClassName, " ").concat(className),
     children: jsxRuntime.jsx(Panel, {
       header: jsxRuntime.jsx(ItemTitle, {
@@ -95,7 +105,7 @@ var Index = function Index(_ref2) {
         fieldNames: fieldNames
       })
     }, "1")
-  }));
+  });
 };
 var HTagSelect = HFormConnect.default(Index);
 

package/lib/Select/modal.d.ts

@@ -2,7 +2,6 @@ import type { SelectProps } from "antd";
 import type React from "react";
 import type { PromiseFnResult } from "../modal";
 import type { addFormatItemModal, argsFn, DispatchModal } from "../Form/modal";
-import { CollapseProps } from "antd/lib/collapse/Collapse";
 export type OptionType = Record<string, any>;
 export type RenderFn = (data: OptionType) => React.ReactNode;
 interface ModeConfigItem {
@@ -47,7 +46,9 @@ export interface FilterDataModal {
 }
 export interface HTagSelectProps extends HSelectProps {
     title?: React.ReactNode;
-    collapseProps?: CollapseProps;
+    defaultVisible?: boolean;
+    visible?: boolean;
+    onVisibleChange?: (visible: boolean) => void;
 }
 export type PartialHSelectProps = Partial<HSelectProps>;
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hw-component/form",
-  "version": "1.9.87",
+  "version": "1.9.88",
   "description": "基于antd二次开发",
   "repository": {
     "type": "git",

package/src/components/Select/TagSelect/hooks.ts

@@ -1,4 +1,4 @@
-import {useMemo} from "react";
+import {useEffect, useMemo, useState} from "react";
 import {HTagSelectProps, OptionType} from "@/components/Select/modal";
 
 export const useTagControl=({value,options,title}:HTagSelectProps)=>{
@@ -80,4 +80,23 @@ export const useChangeControl=({options,value,onChange,fieldNames}:HTagSelectPro
         change,
         allCheck
     }
+}
+
+export const useCollapseControl=({visible,defaultVisible,onVisibleChange}:HTagSelectProps)=>{
+     const [activeKey,setActiveKey]=useState(defaultVisible?["1"]:[]);
+    useEffect(() => {
+        if (typeof visible==="undefined"){
+            return;
+        }
+        setActiveKey(visible?["1"]:[]);
+    }, [visible]);
+    const onChange=(keys)=>{
+         const len=keys?.length;
+         onVisibleChange?.(!!len);
+         setActiveKey(keys)
+    }
+     return {
+         activeKey,
+         onChange
+     }
 }

package/src/components/Select/TagSelect/index.tsx

@@ -5,7 +5,7 @@ import {useSelectReq} from "../hooks/norHooks";
 import {HTagSelectProps} from "../modal";
 import {CheckboxProps} from "antd/lib/checkbox/Checkbox";
 import Content from './Content';
-import {useChangeControl, useTagControl} from "@/components/Select/TagSelect/hooks";
+import {useChangeControl, useCollapseControl, useTagControl} from "@/components/Select/TagSelect/hooks";
 import HFormConnect from "@/components/Form/HFormConnect";
 const { Panel } = Collapse;
 
@@ -18,9 +18,24 @@ const ItemTitle:React.FC<CheckboxProps>=({children,...props})=>{
         </Checkbox>
     </div>
 }
-const Index:React.FC<HTagSelectProps>=({options,value=[],onChange,dispatch,fieldNames:propsFieldNames,request,title,manual,className="",collapseProps,addDispatchListener})=>{
+const Index:React.FC<HTagSelectProps>=({
+                                           options,
+                                           value=[],
+                                           onChange,
+                                           dispatch,
+                                           fieldNames:propsFieldNames,
+                                           request,
+                                           title,
+                                           manual,
+                                           className="",
+    visible,
+    defaultVisible,
+    onVisibleChange,
+                                           addDispatchListener
+})=>{
     const collapseClassName = useClassName("hw-tag-select");
     const { fieldNames } = useMatchConfigProps({ fieldNames: propsFieldNames });
+    const {activeKey,onChange:colChange}=useCollapseControl({defaultVisible,visible,onVisibleChange})
     const {
         loading,
         data: resultData,
@@ -42,7 +57,8 @@ const Index:React.FC<HTagSelectProps>=({options,value=[],onChange,dispatch,field
     addDispatchListener?.("reload", reload);
     return <Collapse bordered={false}
                      ghost
-                     {...collapseProps}
+                     activeKey={activeKey}
+                     onChange={colChange}
                      className={`${collapseClassName} ${className}`}
     >
         <Panel key="1" header={<ItemTitle indeterminate={indeterminate}

package/src/components/Select/modal.ts

@@ -50,6 +50,8 @@ export interface FilterDataModal {
 }
 export interface HTagSelectProps extends HSelectProps{
   title?:React.ReactNode;
-  collapseProps?:CollapseProps
+  defaultVisible?:boolean;
+  visible?:boolean;
+  onVisibleChange?:(visible:boolean)=>void;
 }
 export type PartialHSelectProps = Partial<HSelectProps>;

package/src/pages/Select/index.tsx

@@ -6,7 +6,7 @@ export default () => {
   const [op, setOp] = useState([{ label: "1", value: 1 }]);
   const [val, setVal] = useState([2, 3]);
     const [tagVal, setTagVal] = useState([]);
-
+  const [visible,setVisible]=useState(true);
   return (
     <Space size={"large"} direction={"vertical"} style={{ width: "100%" }}>
       <HSelect
@@ -46,10 +46,16 @@ export default () => {
         }}
         mode="multiple"
       />
+        <div onClick={()=>{
+            setVisible(false)
+        }}>
+            关闭
+        </div>
         <HTagSelect
             value={tagVal}
-            collapseProps={{
-                defaultActiveKey:'1'
+            visible={visible}
+            onVisibleChange={(v)=>{
+                 console.log(v)
             }}
             request={()=>{
                 return new Promise((resolve, reject)=>{