vap1 0.8.7 → 0.8.9

package/components/Tables/VTable.js

@@ -155,6 +155,7 @@ var _VTable = (0, react_1.forwardRef)(function (props) {
     var _b = (0, useTableContext_1.useTableContext)(), selectedRowKeys = _b.selectedRowKeys, initObjects = _b.initObjects, reflushPage = _b.reflushPage, setSelection = _b.setSelection;
     var _c = (0, Box_1.useBox)(), state = _c.state, root = _c.root, resize = _c.resize;
     var update = (0, hooks_1.useUpdate)();
+    var isFristMount = (0, hooks_1.useFirstMountState)();
     var _d = __read((0, react_1.useState)(undefined), 2), scroll = _d[0], setScroll = _d[1];
     var _e = __read((0, react_1.useState)({}), 2), columnWidths = _e[0], setColumnWidths = _e[1];
     var _f = props.model, rowKey = _f.rowKey, list = _f.list, isQuerying = _f.isQuerying, pageNo = _f.pageNo, pageSize = _f.pageSize, orderBy = _f.orderBy, query = _f.query, total = _f.total, cost = _f.cost;
@@ -181,7 +182,12 @@ var _VTable = (0, react_1.forwardRef)(function (props) {
             return;
         if (lodash_1.default.isFunction((_b = props.selectBar) === null || _b === void 0 ? void 0 : _b.onSelect)) {
             var param = (_a = props.selectBar).onSelect.apply(_a, __spreadArray([], __read(state.selected), false));
-            query(__assign(__assign({}, (props.defaultParam || props.default)), param));
+            if (isFristMount) {
+                query(__assign(__assign({}, (props.defaultParam || props.default)), param));
+            }
+            else {
+                query(param, false);
+            }
         }
     }, [state.selected]);
     // 更新页数

package/components/Trees/STree.d.ts

@@ -1,5 +1,8 @@
-import type { FC } from 'react';
-import type { BaseTreeProps } from './index';
+import React from 'react';
+import type { ReactNode } from 'react';
+import type { BaseTreeProps, BaseTreeRef } from './index';
+import type { TreeProps } from 'antd/es/tree';
+import type { PlainObject } from '../../basetype';
 import type { TreeNodeData } from '../../utils/TreeUtil';
 export type STreeData = {
     /**
@@ -19,4 +22,12 @@ export type STreeProps = BaseTreeProps & STreeData;
  * 搜索         ： 支持
  * 数据         ： 需要组装好后传入
 */
-export declare const STree: FC<STreeProps>;
+export declare const STree: React.MemoExoticComponent<React.ForwardRefExoticComponent<import("../../utils/TreeUtil").BaseTreeOpts & Pick<TreeProps, "className" | "disabled" | "defaultExpandAll"> & {
+    iconField?: string | ((item: any) => ReactNode);
+    titleField: string | import("./index").LanguageField;
+    titleRender?: (node: PlainObject) => ReactNode;
+    mustSelect?: boolean;
+    disabledNode?: (node: PlainObject) => boolean;
+    onSelect?: (key: import("../../basetype").Key, node: PlainObject, parentNode: PlainObject, crumb: PlainObject[], pos: number[]) => void;
+    searchValue?: string;
+} & STreeData & React.RefAttributes<BaseTreeRef>>>;

package/components/Trees/STree.js

@@ -87,10 +87,13 @@ var _i18n_1 = require("../_i18n");
  * 搜索         ： 支持
  * 数据         ： 需要组装好后传入
 */
-exports.STree = (0, react_1.memo)(function (props) { return react_1.default.createElement(BaseTree_1.BaseTree, __assign({}, props),
-    react_1.default.createElement(_Stree, __assign({}, props))); }, function (p, n) { return p.searchValue == n.searchValue; });
+exports.STree = (0, react_1.memo)((0, react_1.forwardRef)(function (props, ref) { return react_1.default.createElement(BaseTree_1.BaseTree, __assign({}, props),
+    react_1.default.createElement(_Stree, __assign({}, props, { treeRef: ref }))); }), function (p, n) { return p.searchValue == n.searchValue; });
 var _Stree = function (props) {
     var _a = (0, BaseTree_1.useBaseTree)(), baseProps = _a.baseProps, treeState = _a.treeState, onSelect = _a.onSelect, setTreeData = _a.setTreeData;
+    (0, react_1.useImperativeHandle)(props.treeRef, function () { return ({
+        getSelected: function () { return treeState.selectedNode; },
+    }); }, [treeState.selectedNode]);
     (0, react_1.useLayoutEffect)(function () {
         var tree = [];
         if (props.isFlat) {

package/components/Trees/index.d.ts

@@ -123,14 +123,16 @@ export type BaseActionTreeProps = {
     */
     idForApiField?: string;
 };
+export type BaseTreeRef = {
+    getSelected: () => PlainObject;
+};
 /**
  * 说明 针对节点进行操作
  * 说明，节点信息，位置信息，可通过 onSelect 方法的第五个参数可以拿到
 */
-export type ActionTreeRef = {
+export type ActionTreeRef = BaseTreeRef & {
     updateData: (node: PlainObject, pos: number[]) => void;
     update: (node: PlainObject, pos: number[]) => Promise<void>;
     del: (node: PlainObject, pos: number[]) => Promise<void>;
     add: (node: PlainObject, pos: number[]) => void;
-    getSelected: () => PlainObject;
 };

package/package.json

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

package/utils/_AjaxUtil.js

@@ -1,4 +1,15 @@
 "use strict";
+var __values = (this && this.__values) || function(o) {
+    var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
+    if (m) return m.call(o);
+    if (o && typeof o.length === "number") return {
+        next: function () {
+            if (o && i >= o.length) o = void 0;
+            return { value: o && o[i++], done: !o };
+        }
+    };
+    throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
+};
 var __read = (this && this.__read) || function (o, n) {
     var m = typeof Symbol === "function" && o[Symbol.iterator];
     if (!m) return o;
@@ -15,17 +26,6 @@ var __read = (this && this.__read) || function (o, n) {
     }
     return ar;
 };
-var __values = (this && this.__values) || function(o) {
-    var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
-    if (m) return m.call(o);
-    if (o && typeof o.length === "number") return {
-        next: function () {
-            if (o && i >= o.length) o = void 0;
-            return { value: o && o[i++], done: !o };
-        }
-    };
-    throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -74,91 +74,76 @@ var CLEAR = function () {
 };
 exports.CLEAR = CLEAR;
 var sessionStorage = window.sessionStorage;
+// type MicorSessionItem = { value: string, source: string };
 var MICOR_SESSION_STORAGE = 'MICOR_SESSION';
-var MICOR_SESSION_HEADERS = [
-    { response: 'set-cems-cookies', request: 'cems-cookies' },
-    { response: 'set-vap-cookies', request: 'vap-cookies' },
-    { response: 'set-dlp-cookies', request: 'dlp-cookies' },
-];
-var readMicorSessionStore = function () {
-    var value = sessionStorage.getItem(MICOR_SESSION_STORAGE);
-    if (!value)
-        return {};
-    try {
-        return JSON.parse(value);
-    }
-    catch (_a) {
-        return {};
-    }
-};
-var splitMicorSessionHeader = function (headerValue) {
-    return headerValue.split(/,(?=\s*[^;,=\s]+=)/g).map(function (value) { return lodash_1.default.trim(value); }).filter(Boolean);
-};
-var parseMicorSessionCookie = function (cookieValue) {
-    var values = cookieValue.split(';').map(function (value) { return lodash_1.default.trim(value); }).filter(Boolean);
-    if (values.length == 0)
-        return null;
-    var cookiePair = values[0];
-    var idx = cookiePair.indexOf('=');
-    if (idx <= 0)
-        return null;
-    return {
-        name: cookiePair.substring(0, idx),
-        value: cookiePair.substring(idx + 1),
-        source: cookieValue,
-    };
-};
+var CEMS_SESSION_RESPONSE = 'set-cems-cookies';
+var CEMS_SESSION_REQUEST = 'cems-cookies';
+var CEMS_SESSION = { CEMS: '', VAP: '', };
+//set-cems-cookies  SESSION=ZDc5ZTkzOTQtOWM2NC00YmY5LWE2MmUtYmU2Y2ZiNWMzYjQ1; Path=/CEMSUI/; Secure; HttpOnly; SameSite=Lax
+// SESSION=ZDI3YmE0YmYtNmZlZi00M2M2LTlmYTgtZjllZWE5NzU2OTEz; VAP_SESSION=8d37a07c-20a6-4183-a64b-39824183e8dc
 var findHeaderKey = function (headers, headerName) {
     var lowerName = lodash_1.default.toLower(headerName);
     return lodash_1.default.find(lodash_1.default.keys(headers), function (key) { return lodash_1.default.toLower(key) == lowerName; });
 };
-var getMicorSessionHeaderValue = function (store, requestHeader) {
-    var session = store[requestHeader] || {};
-    return lodash_1.default.keys(session)
-        .map(function (name) { return "".concat(name, "=").concat(session[name].value); })
-        .join('; ');
-};
-var setMicorSessionGlobalHeaders = function (store) {
-    MICOR_SESSION_HEADERS.forEach(function (_a) {
-        var request = _a.request;
-        var value = getMicorSessionHeaderValue(store, request);
-        var headerKey = findHeaderKey(Global_1.CONFIG.AJAX.headers, request);
-        if (value) {
-            Global_1.CONFIG.AJAX.headers[headerKey || request] = value;
-            return;
-        }
-        if (headerKey)
-            delete Global_1.CONFIG.AJAX.headers[headerKey];
-    });
+var setMicorSessionGlobalHeaders = function () {
+    if (CEMS_SESSION.CEMS || CEMS_SESSION.VAP) {
+        Global_1.CONFIG.AJAX.headers[CEMS_SESSION_REQUEST] = [CEMS_SESSION.CEMS, CEMS_SESSION.VAP].filter(function (item) { return item.length > 0; }).join('; ');
+        sessionStorage.setItem(MICOR_SESSION_STORAGE, JSON.stringify(CEMS_SESSION));
+    }
+    else {
+        delete Global_1.CONFIG.AJAX.headers[CEMS_SESSION_REQUEST];
+        sessionStorage.removeItem(MICOR_SESSION_STORAGE);
+    }
 };
-var receiveMicorSession = function (requestHeader, headerValue) {
+var receiveMicorSessionHeaders = function (headerValue) {
+    var e_2, _a, e_3, _b;
     if (!headerValue)
-        return false;
-    var store = readMicorSessionStore();
-    if (!store[requestHeader])
-        store[requestHeader] = {};
-    var changed = false;
-    splitMicorSessionHeader(headerValue).forEach(function (value) {
-        var cookie = parseMicorSessionCookie(value);
-        if (cookie == null)
-            return;
-        store[requestHeader][cookie.name] = {
-            value: cookie.value,
-            source: cookie.source,
-        };
-        changed = true;
-    });
-    if (!changed)
-        return false;
-    sessionStorage.setItem(MICOR_SESSION_STORAGE, JSON.stringify(store));
-    setMicorSessionGlobalHeaders(store);
-    return true;
-};
-var receiveMicorSessionHeaders = function (getHeader) {
-    MICOR_SESSION_HEADERS.forEach(function (_a) {
-        var response = _a.response, request = _a.request;
-        receiveMicorSession(request, getHeader(response));
-    });
+        return;
+    var needChange = false;
+    var items = headerValue.split(/,(?=\s*[^;,=\s]+=)/g).map(function (value) { return lodash_1.default.trim(value); }).filter(Boolean);
+    try {
+        for (var items_1 = __values(items), items_1_1 = items_1.next(); !items_1_1.done; items_1_1 = items_1.next()) {
+            var item = items_1_1.value;
+            var values = item.split(';').map(function (value) { return lodash_1.default.trim(value); }).filter(Boolean);
+            if (values.length == 0)
+                continue;
+            try {
+                for (var values_1 = (e_3 = void 0, __values(values)), values_1_1 = values_1.next(); !values_1_1.done; values_1_1 = values_1.next()) {
+                    var cookieValue = values_1_1.value;
+                    var txt = lodash_1.default.toLower(lodash_1.default.trim(cookieValue));
+                    if (txt.startsWith('session=')) {
+                        if (CEMS_SESSION.CEMS != cookieValue) {
+                            CEMS_SESSION.CEMS = cookieValue;
+                            needChange = true;
+                        }
+                    }
+                    else if (txt.startsWith('vap_session=')) {
+                        if (CEMS_SESSION.VAP != cookieValue) {
+                            CEMS_SESSION.VAP = cookieValue;
+                            needChange = true;
+                        }
+                    }
+                }
+            }
+            catch (e_3_1) { e_3 = { error: e_3_1 }; }
+            finally {
+                try {
+                    if (values_1_1 && !values_1_1.done && (_b = values_1.return)) _b.call(values_1);
+                }
+                finally { if (e_3) throw e_3.error; }
+            }
+        }
+    }
+    catch (e_2_1) { e_2 = { error: e_2_1 }; }
+    finally {
+        try {
+            if (items_1_1 && !items_1_1.done && (_a = items_1.return)) _a.call(items_1);
+        }
+        finally { if (e_2) throw e_2.error; }
+    }
+    if (needChange) {
+        setMicorSessionGlobalHeaders();
+    }
 };
 var mergeHeaders = function () {
     var headersList = [];
@@ -195,10 +180,24 @@ var setXHRHeaders = function (xhr, headers) {
     lodash_1.default.keys(requestHeaders).forEach(function (key) { return xhr.setRequestHeader(key, requestHeaders[key]); });
 };
 exports.setXHRHeaders = setXHRHeaders;
-setMicorSessionGlobalHeaders(readMicorSessionStore());
-var receiveMicorSessionByFetch = function (response) { return receiveMicorSessionHeaders(function (header) { return response.headers.get(header); }); };
+var value = sessionStorage.getItem(MICOR_SESSION_STORAGE);
+if (value) {
+    try {
+        var cached = JSON.parse(value);
+        if (cached.CEMS) {
+            CEMS_SESSION.CEMS = cached.CEMS;
+        }
+        if (cached.VAP) {
+            CEMS_SESSION.VAP = cached.VAP;
+        }
+    }
+    catch (_b) {
+    }
+}
+setMicorSessionGlobalHeaders();
+var receiveMicorSessionByFetch = function (response) { return receiveMicorSessionHeaders(response.headers.get(CEMS_SESSION_RESPONSE)); };
 exports.receiveMicorSessionByFetch = receiveMicorSessionByFetch;
-var receiveMicorSessionByXHR = function (xhr) { return receiveMicorSessionHeaders(function (header) { return xhr.getResponseHeader(header); }); };
+var receiveMicorSessionByXHR = function (xhr) { return receiveMicorSessionHeaders(xhr.getResponseHeader(CEMS_SESSION_RESPONSE)); };
 exports.receiveMicorSessionByXHR = receiveMicorSessionByXHR;
 //过滤空参数
 var filterNull = function (param) {
@@ -247,12 +246,12 @@ if (FIXED_STORAGE) {
             finally { if (e_1) throw e_1.error; }
         }
     }
-    catch (_b) {
+    catch (_c) {
         console.log('parse error');
     }
 }
 var setFixedHeader = function (header) {
-    var e_2, _a;
+    var e_4, _a;
     var keys = lodash_1.default.keys(header);
     try {
         for (var keys_2 = __values(keys), keys_2_1 = keys_2.next(); !keys_2_1.done; keys_2_1 = keys_2.next()) {
@@ -260,12 +259,12 @@ var setFixedHeader = function (header) {
             FIXED_HEADER[key] = header[key];
         }
     }
-    catch (e_2_1) { e_2 = { error: e_2_1 }; }
+    catch (e_4_1) { e_4 = { error: e_4_1 }; }
     finally {
         try {
             if (keys_2_1 && !keys_2_1.done && (_a = keys_2.return)) _a.call(keys_2);
         }
-        finally { if (e_2) throw e_2.error; }
+        finally { if (e_4) throw e_4.error; }
     }
     sessionStorage.setItem(FIXED_HEADER_STROE, JSON.stringify(FIXED_HEADER));
 };