vap1 0.6.2 → 0.6.4

package/cems/policy/DButton.d.ts

@@ -13,5 +13,9 @@ export type DButtonProps = Pick<DBaseProps, 'cId' | 'style' | 'className' | 'val
      * 图标
      */
     icon?: string;
+    /**
+     * 保留位,用于紧急/临时扩展
+    */
+    [key: string]: any;
 };
 export type DButtonComponent = ForwardRefExoticComponent<DButtonProps & RefAttributes<DMethodRef>>;

package/cems/policy/DCol.d.ts

@@ -29,5 +29,9 @@ export type DColProps = Pick<DBaseProps, 'cId' | 'title' | 'style' | 'className'
      * 清理浮动
      */
     clearBoth?: boolean;
+    /**
+     * 保留位,用于紧急/临时扩展
+    */
+    [key: string]: any;
 };
 export type DColComponent = ForwardRefExoticComponent<DColProps & RefAttributes<DMethodRef>>;

package/cems/policy/DDiv.d.ts

@@ -61,5 +61,9 @@ export type DDivProps = Pick<DBaseProps, 'cId' | 'style' | 'className' | 'onChan
      * 子组件
      */
     children?: ReactNode;
+    /**
+ * 保留位,用于紧急/临时扩展
+*/
+    [key: string]: any;
 };
 export type DDivComponent = ForwardRefExoticComponent<DDivProps & RefAttributes<DMethodRef>>;

package/components/Box/SelectBar.d.ts

@@ -60,6 +60,10 @@ type _BoxSelectBarProps = BaseItem & {
      * 选择区映射，用于一些特殊场景
     */
     selectRef?: MutableRefObject<any>;
+    /**
+     * 是否隐藏 toggle 按钮
+    */
+    hideToggle?: boolean;
 };
 /**
  * 说明： 内置 stree/dtree/ftree 三种树类型，和 list 类型

package/components/Box/SelectBar.js

@@ -74,7 +74,11 @@ var _i18n_1 = require("../_i18n");
 var Icon_1 = require("../_adapt/Icon");
 exports.SelectBar = (0, react_1.forwardRef)(function (props, ref) {
     var _a = __read((0, react_1.useState)(null), 2), keyword = _a[0], setKeyword = _a[1];
-    var _b = __read((0, hooks_1.useToggle)(props.defaultCollapse || false), 2), collapsed = _b[0], setCollapsed = _b[1];
+    var _b = __read((0, hooks_1.useToggle)(function () {
+        if (utils_1.GLOBAL.CONFIG.BOX.SELECTBAR_HIDE_TOGGLE || props.hideToggle)
+            return false;
+        return props.defaultCollapse || false;
+    }), 2), collapsed = _b[0], setCollapsed = _b[1];
     var component = (0, _register_1.getSelectBar)(props.type);
     (0, react_1.useLayoutEffect)(function () {
         props.onSelectCollapse(collapsed);
@@ -119,7 +123,7 @@ exports.SelectBar = (0, react_1.forwardRef)(function (props, ref) {
         react_1.default.createElement("div", { className: 'c-selectbar' },
             react_1.default.createElement("div", { className: 'c-selectbar-head' },
                 react_1.default.createElement("div", { className: 'c-selectbar-title' },
-                    react_1.default.createElement(Icon_1.Icon, { type: "left-circle", title: utils_1.i18n.txt(_i18n_1.V.TXT_COLLAPSE), onClick: setCollapsed }),
+                    props.hideToggle ? react_1.default.createElement("span", { className: 'vicon' }) : react_1.default.createElement(Icon_1.Icon, { type: "left-circle", title: utils_1.i18n.txt(_i18n_1.V.TXT_COLLAPSE), onClick: setCollapsed }),
                     props.filter && react_1.default.createElement("input", { onChange: function (evt) { return utils_1.PageUtil.stopEvent(evt, function () { return setKeyword(evt.target.value); }); }, value: keyword, placeholder: utils_1.i18n.getText(props.ik, lodash_1.default.isString(props.title) ? props.title : '') }),
                     !props.filter && react_1.default.createElement("span", null, title)),
                 react_1.default.createElement("div", { className: 'c-selectbar-action' }, (props.actions || []).map(function (item) { return react_1.default.createElement(SearchAction, __assign({}, item)); }))),

package/hooks/useToggle.d.ts

@@ -1,6 +1,24 @@
+type ToggleInit = boolean | (() => boolean);
 /**
  * 快速控制一个 布尔状态
+ * 支持无参数调用方式，类似 useState
  * 使用方法参考
  * https://github.com/streamich/react-use/blob/master/docs/useToggle.md
+ *
+ * @example
+ * // 无参数调用（默认 false）
+ * const [isVisible, toggle] = useToggle();
+ *
+ * // 带初始值
+ * const [isVisible, toggle] = useToggle(true);
+ *
+ * // 带函数初始值
+ * const [isVisible, toggle] = useToggle(() => localStorage.getItem('visible') === 'true');
+ *
+ * // 使用方式
+ * toggle(); // 切换状态
+ * toggle(true); // 设置为 true
+ * toggle(false); // 设置为 false
 */
-export declare const useToggle: (initialValue?: boolean) => [boolean, (nextValue?: any) => void];
+export declare const useToggle: (initialValue?: ToggleInit) => [boolean, (nextValue?: any) => void];
+export {};

package/hooks/useToggle.js

@@ -1,15 +1,57 @@
 "use strict";
+var __read = (this && this.__read) || function (o, n) {
+    var m = typeof Symbol === "function" && o[Symbol.iterator];
+    if (!m) return o;
+    var i = m.call(o), r, ar = [], e;
+    try {
+        while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
+    }
+    catch (error) { e = { error: error }; }
+    finally {
+        try {
+            if (r && !r.done && (m = i["return"])) m.call(i);
+        }
+        finally { if (e) throw e.error; }
+    }
+    return ar;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.useToggle = void 0;
 var react_1 = require("react");
 var toggleReducer = function (state, nextValue) { return typeof nextValue === 'boolean' ? nextValue : !state; };
 /**
  * 快速控制一个 布尔状态
+ * 支持无参数调用方式，类似 useState
  * 使用方法参考
  * https://github.com/streamich/react-use/blob/master/docs/useToggle.md
+ *
+ * @example
+ * // 无参数调用（默认 false）
+ * const [isVisible, toggle] = useToggle();
+ *
+ * // 带初始值
+ * const [isVisible, toggle] = useToggle(true);
+ *
+ * // 带函数初始值
+ * const [isVisible, toggle] = useToggle(() => localStorage.getItem('visible') === 'true');
+ *
+ * // 使用方式
+ * toggle(); // 切换状态
+ * toggle(true); // 设置为 true
+ * toggle(false); // 设置为 false
 */
 var useToggle = function (initialValue) {
-    if (initialValue === void 0) { initialValue = false; }
-    return (0, react_1.useReducer)(toggleReducer, initialValue);
+    // 处理初始值，支持无参数调用
+    var getInitialValue = (0, react_1.useCallback)(function () {
+        if (initialValue === undefined) {
+            return false; // 默认值
+        }
+        if (typeof initialValue === 'function') {
+            return initialValue();
+        }
+        return initialValue;
+    }, [initialValue]);
+    var _a = __read((0, react_1.useReducer)(toggleReducer, getInitialValue()), 2), state = _a[0], dispatch = _a[1];
+    return [state, dispatch];
 };
 exports.useToggle = useToggle;

package/package.json

@@ -1 +1 @@
-{"name":"vap1","version":"0.6.2","description":"vap1, Both support MicroService and SAP FrameWork, Support IE>9","main":"index.js","author":"Xiang da","license":"ISC"}
+{"name":"vap1","version":"0.6.4","description":"vap1, Both support MicroService and SAP FrameWork, Support IE>9","main":"index.js","author":"Xiang da","license":"ISC"}

package/utils/Global.d.ts

@@ -128,6 +128,7 @@ export type GlobalSetting = {
         SELECT_CLOSE: 1 | 2;
         SELECTBAR_CLOSE: 1 | 2;
         SELECTBAR_WIDTH: number;
+        SELECTBAR_HIDE_TOGGLE: boolean;
     };
     /**
      * 通用上传服务，默认为微服务版的配置，单机版需要在 portal 里面定制一下

package/utils/Global.js

@@ -59,7 +59,12 @@ var DEFAULT = {
     RESULT: { code: 'code', message: 'message', success: '0' },
     VLIST: { list: 'list', total: 'total', totalAcc: 'totalAcc', start: 'start_', count: 'count_', order: 'order_', by: 'by_' },
     VDATA: { data: 'data' },
-    BOX: { SELECT_CLOSE: 2, SELECTBAR_CLOSE: 2, SELECTBAR_WIDTH: 250 },
+    BOX: {
+        SELECT_CLOSE: 2,
+        SELECTBAR_CLOSE: 2,
+        SELECTBAR_WIDTH: 250,
+        SELECTBAR_HIDE_TOGGLE: false
+    },
     AJAX: {
         timeout: 30000,
         beforeSend: null,