vap1 0.5.5 → 0.5.8

package/cems/admin/utils.d.ts

@@ -7,3 +7,28 @@ export type InitSchema = (schema: any) => any;
 export type ConvertOptions = (opt: any, callTemplateFunc?: Function) => Array<any>;
 export type RegExpTest = (rules: any, nValue: any) => string | undefined;
 export type CallWhereWhileFunc = (wLogic: any, wValue: any, gFunc: any, fValue?: any, init?: any) => boolean;
+/**
+ * 通过XMLHttpRequest的方式发送请求获取数据
+ * @param _url 接口地址
+ * @param _type 请求类型 "POST"|'GET'，默认是POST请求
+ * @param _param 需要传入的参数 例如：{name:"tester"}
+ * @param _requestType 后台接口接收的参数类型 "RequestParam"|"RequestBody"，一般用于POST请求，不传默认为“RequestBody”，不指定该值可能会导致传入的参数后台接收不到报错的问题
+ * @param isAsync 是否是发送异步请求，默认是true异步，true：异步；false：同步
+ * @param callBackFun 请求成功后的回调函数
+ * @param headerList 需要放到请求头header中的数据，数据格式：{"name":"t1","age":"18"}
+ * @param _isEncodeURIComponent 一般用于GET请求，是否用 encodeURIComponent 对参数进行编码（注：decodeURIComponent解码），即：中文、特殊字符会被转码，例如：“对” 会被转成 %E5%AF%B9，get请求传中文在后台接收时容易变成乱码
+ */
+export type GetApiDataXMLHttpRequest = (_url: any, _type: "POST" | 'GET', _param?: any, _requestType?: "RequestParam" | "RequestBody", _isAsync?: any, _callBackFun?: any, _headerList?: any, _isEncodeURIComponent?: any) => any;
+/**
+ * 通过jquery.ajax的方式发送同步请求获取数据
+ * @param _url 接口地址
+ * @param _type 请求类型 "POST"|'GET'
+ * @param _param 需要传入的参数 例如：{name:"tester"}
+ * @param _requestType 后台接口接收的参数类型 "RequestParam"|"RequestBody"，不传默认为“RequestBody”，不指定该值可能会导致传入的参数后台接收不到报错的问题
+ * @param isAsync 是否是发送异步请求，默认是false同步，true：异步；false：同步
+ * @param callBackFun 请求成功后的回调函数
+ * @param headerList 需要放到请求头header中的数据，数据格式：{"name":"t1","age":"18"}
+ * @param _isEncodeURIComponent 一般用于GET请求，是否用 encodeURIComponent 对参数进行编码（注：decodeURIComponent解码），即：中文、特殊字符会被转码，例如：“对” 会被转成 %E5%AF%B9，get请求传中文在后台接收时容易变成乱码
+ * @returns 当为同步请求时，返回查询到的所有数据
+ */
+export type GetApiData = (_url: any, _type: "POST" | 'GET', _param?: any, _requestType?: "RequestParam" | "RequestBody", _isAsync?: any, _callBackFun?: any, _headerList?: any, _isEncodeURIComponent?: any) => void;

package/cems/index.d.ts

@@ -13,7 +13,7 @@ interface BuiltInAdminComponents {
     AsyncSelect: AsyncSelectComponent;
     CustomPagination: CustomPaginationComponent;
 }
-import type { GetTreeIconNumByOrgFlag, GetOrgFlagByTreeIconNum, MD5, AES, RSA, InitSchema, ConvertOptions, RegExpTest, CallWhereWhileFunc } from './admin/utils';
+import type { GetTreeIconNumByOrgFlag, GetOrgFlagByTreeIconNum, MD5, AES, RSA, InitSchema, ConvertOptions, RegExpTest, CallWhereWhileFunc, GetApiData, GetApiDataXMLHttpRequest } from './admin/utils';
 import type { Validator } from './admin/validator';
 interface BuiltInAdminUtils {
     getTreeIconNumByOrgFlag: GetTreeIconNumByOrgFlag;
@@ -26,6 +26,8 @@ interface BuiltInAdminUtils {
     convertOptions: ConvertOptions;
     regExpTest: RegExpTest;
     callWhereWhileFunc: CallWhereWhileFunc;
+    getApiData: GetApiData;
+    getApiDataXMLHttpRequest: GetApiDataXMLHttpRequest;
 }
 import type { ChartBarComponent, ChartBaseComponent, ChartPieComponent } from './assets/Charts';
 export type { ChartBarProps, ChartBaseProps, ChartPieProps, ChartRef, } from "./assets/Charts";
@@ -184,6 +186,8 @@ export declare const initSchema: InitSchema;
 export declare const convertOptions: ConvertOptions;
 export declare const regExpTest: RegExpTest;
 export declare const callWhereWhileFunc: CallWhereWhileFunc;
+export declare const getApiData: GetApiData;
+export declare const getApiDataXMLHttpRequest: GetApiDataXMLHttpRequest;
 export declare const ChartBase: ChartBaseComponent;
 export declare const ChartBar: ChartBarComponent;
 export declare const ChartPie: ChartPieComponent;

package/cems/index.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DSlider = exports.DSelect = exports.DSCTable = exports.DRadio = exports.DLabel = exports.DInput = exports.DDynamicTreeSelect = exports.DDynamicSelect = exports.DDatePicker = exports.DColorPicker = exports.DCheckboxGroup = exports.DCheckbox = exports.DButton = exports.DApiTable = exports.DForm = exports.CForm = exports.formatCols = exports.formatColumns = exports.useDApiGlobal = exports.useDApi = exports.useDModals = exports.getReload = exports.AjaxPostData = exports.Patch = exports.DivWidth = exports.Sensitive = exports.DModalInfo = exports.DInfo = exports.DModalTable = exports.DTable = exports.CUpload = exports.ChartPie = exports.ChartBar = exports.ChartBase = exports.callWhereWhileFunc = exports.regExpTest = exports.convertOptions = exports.initSchema = exports.rsa = exports.aes = exports.md5 = exports.validator = exports.getOrgFlagByTreeIconNum = exports.getTreeIconNumByOrgFlag = exports.CustomPagination = exports.AsyncSelect = exports.EasyuiTree = exports.CardTable = exports.UTILS = exports.COMPONENTS = void 0;
-exports.registerComponent = exports.ComponentLibrary = exports.useDForm = exports.convertArrayToObject = exports.convertObjectToArray = exports.compareVersion = exports.uuid = exports.checkIpPort = exports.checkIpRange = exports.checkIPRangeIntersect = exports.DDrawer = exports.DIcon = exports.DDiv = exports.DCol = exports.DUpload = exports.DTree = exports.DTimePicker = exports.DPTable = exports.DTab = exports.DSwitch = void 0;
+exports.DSCTable = exports.DRadio = exports.DLabel = exports.DInput = exports.DDynamicTreeSelect = exports.DDynamicSelect = exports.DDatePicker = exports.DColorPicker = exports.DCheckboxGroup = exports.DCheckbox = exports.DButton = exports.DApiTable = exports.DForm = exports.CForm = exports.formatCols = exports.formatColumns = exports.useDApiGlobal = exports.useDApi = exports.useDModals = exports.getReload = exports.AjaxPostData = exports.Patch = exports.DivWidth = exports.Sensitive = exports.DModalInfo = exports.DInfo = exports.DModalTable = exports.DTable = exports.CUpload = exports.ChartPie = exports.ChartBar = exports.ChartBase = exports.getApiDataXMLHttpRequest = exports.getApiData = exports.callWhereWhileFunc = exports.regExpTest = exports.convertOptions = exports.initSchema = exports.rsa = exports.aes = exports.md5 = exports.validator = exports.getOrgFlagByTreeIconNum = exports.getTreeIconNumByOrgFlag = exports.CustomPagination = exports.AsyncSelect = exports.EasyuiTree = exports.CardTable = exports.UTILS = exports.COMPONENTS = void 0;
+exports.registerComponent = exports.ComponentLibrary = exports.useDForm = exports.convertArrayToObject = exports.convertObjectToArray = exports.compareVersion = exports.uuid = exports.checkIpPort = exports.checkIpRange = exports.checkIPRangeIntersect = exports.DDrawer = exports.DIcon = exports.DDiv = exports.DCol = exports.DUpload = exports.DTree = exports.DTimePicker = exports.DPTable = exports.DTab = exports.DSwitch = exports.DSlider = exports.DSelect = void 0;
 /**
  * 说明,如需要使用 `vap2/deps/cems`  请确保是 CEMS 应用/模块
 */
@@ -26,6 +26,8 @@ exports.initSchema = exports.UTILS['initSchema'];
 exports.convertOptions = exports.UTILS['convertOptions'];
 exports.regExpTest = exports.UTILS['regExpTest'];
 exports.callWhereWhileFunc = exports.UTILS['callWhereWhileFunc'];
+exports.getApiData = exports.UTILS['getApiData'];
+exports.getApiDataXMLHttpRequest = exports.UTILS['getApiDataXMLHttpRequest'];
 // export assets components
 exports.ChartBase = exports.COMPONENTS['ChartBase'];
 exports.ChartBar = exports.COMPONENTS['ChartBar'];

package/components/Box/Box.d.ts

@@ -6,6 +6,10 @@ import type { ActButton } from '../SearchTool/SearchBar/ActionButtons';
 import type { Key, PlainObject } from '../../basetype';
 import type { UPaginationProps } from '../_common/Upagination';
 type BoxState = {
+    /**
+     * 是否折叠
+    */
+    collapsed?: boolean;
     /**
      * 内容区域高度
     */

package/components/Box/Box.js

@@ -106,17 +106,22 @@ exports.Box = (0, react_1.forwardRef)(function (props, ref) {
     var rootRef = (0, react_1.useRef)(null);
     var contextRef = (0, react_1.useRef)(null);
     var selectRef = (0, react_1.useRef)(null);
+    var _b = __read((0, react_1.useState)(function () {
+        if (props.selectBar == null)
+            return true;
+        return props.selectBar.defaultCollapse || false;
+    }), 2), collapsed = _b[0], setCollapsed = _b[1];
     var mode = (0, react_1.useMemo)(function () {
         return props.mode || 'common';
     }, [props.mode]);
     var className = (0, react_1.useMemo)(function () {
-        var clazz = ['c-box'];
-        clazz.push('c-box-nobg');
-        clazz.push('c-box-' + mode);
+        var clazz = ['c-box', 'c-box-' + mode];
+        if (props.nobg)
+            clazz.push('c-box-nobg');
         if (props.className)
             clazz.push(props.className);
         return clazz.join(' ');
-    }, [props.className, props.nobg, mode]);
+    }, [mode, collapsed]);
     var style = (0, react_1.useMemo)(function () {
         var css = __assign({}, props.style);
         if (mode == 'inner') {
@@ -174,8 +179,13 @@ exports.Box = (0, react_1.forwardRef)(function (props, ref) {
     (0, react_1.useEffect)(function () { setTimeout(resize, 120); }, [app === null || app === void 0 ? void 0 : app.theme.contentHeight]); // 1.5 版本：延时 120ms
     (0, react_1.useImperativeHandle)(ref, function () { return ({ resize: resize }); }, [mode]);
     (0, react_1.useLayoutEffect)(function () {
-        setTimeout(resize, 5);
+        setTimeout(resize, 10);
     }, []);
+    var maxWidth = (0, react_1.useMemo)(function () {
+        if (collapsed)
+            return undefined;
+        return "calc(100% - ".concat(props.selectBar.width || utils_1.GLOBAL.CONFIG.BOX.SELECTBAR_WIDTH || 250, "px)");
+    }, [collapsed]);
     var SearchTool = (0, react_1.useMemo)(function () {
         var hasBar = lodash_1.default.has(props, 'searchBar'), 
         // hasBand = _.has(props, 'searchBand'),
@@ -228,8 +238,8 @@ exports.Box = (0, react_1.forwardRef)(function (props, ref) {
                     args[_a] = arguments[_a];
                 }
                 return setState({ selected: args });
-            } })),
-        react_1.default.createElement(Layout_1.Layout.Content, { style: { overflow: props.overflowAuto ? 'auto' : 'hidden' }, ref: function () {
+            }, onSelectCollapse: setCollapsed })),
+        react_1.default.createElement(Layout_1.Layout.Content, { style: { overflow: props.overflowAuto ? 'auto' : 'hidden', maxWidth: maxWidth }, ref: function () {
                 if (_layoutRef.current == null) {
                     var layout = document.getElementById(domId);
                     if (layout) {

package/components/Box/SelectBar.d.ts

@@ -56,10 +56,6 @@ type _BoxSelectBarProps = BaseItem & {
      * 初始为收起状态，默认不收起
     */
     defaultCollapse?: boolean;
-    /**
-     * 边栏状态变更触发
-    */
-    onSelectCollapse?: (boolean: any) => void;
     /**
      * 选择区映射，用于一些特殊场景
     */
@@ -94,5 +90,6 @@ type ExtendSelectProps = {
 export type SelectBarProps = _BoxSelectBarProps & ExtendSelectProps;
 export declare const SelectBar: React.ForwardRefExoticComponent<Omit<SelectBarProps, "onSelect"> & {
     onSelect: (key: Key, object?: PlainObject, ...args: any[]) => void;
+    onSelectCollapse: (boolean: any) => void;
 } & React.RefAttributes<any>>;
 export {};

package/components/Box/SelectBar.js

@@ -75,12 +75,9 @@ 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];
-    // const setKeyword = _.debounce(_setKeyword, 100);
     var component = (0, _register_1.getSelectBar)(props.type);
     (0, react_1.useLayoutEffect)(function () {
-        if (lodash_1.default.isFunction(props.onSelectCollapse)) {
-            props.onSelectCollapse(collapsed);
-        }
+        props.onSelectCollapse(collapsed);
     }, [collapsed]);
     if (component == undefined) {
         console.warn('SelectBar Type is not registerd ', props.type);
@@ -88,7 +85,7 @@ exports.SelectBar = (0, react_1.forwardRef)(function (props, ref) {
     }
     if (props.roleCode && !utils_1.PageUtil.hasRole(props.roleCode))
         return utils_1.Const.NONE;
-    var width = lodash_1.default.isNumber(props.width) ? props.width : 250;
+    var width = lodash_1.default.isNumber(props.width) ? props.width : utils_1.GLOBAL.CONFIG.BOX.SELECTBAR_WIDTH;
     var renderContent = function () {
         if (props.type == 'custom') {
             if (!lodash_1.default.has(props, 'content')) {
@@ -117,7 +114,7 @@ exports.SelectBar = (0, react_1.forwardRef)(function (props, ref) {
         return react_1.default.createElement(antd_1.Popconfirm, { placement: "right", title: props.confirm, onConfirm: props.onClick },
             react_1.default.createElement(Icon_1.Icon, __assign({}, iconProps, { evt: true })));
     };
-    return react_1.default.createElement(antd_1.Layout.Sider, { className: 'c-selectbar-' + utils_1.GLOBAL.CONFIG.BOX.SELECT_CLOSE, collapsed: collapsed, collapsedWidth: utils_1.GLOBAL.CONFIG.BOX.SELECT_CLOSE == 2 ? 0 : 6, width: width },
+    return react_1.default.createElement(antd_1.Layout.Sider, { className: 'c-selectbar-' + utils_1.GLOBAL.CONFIG.BOX.SELECTBAR_CLOSE, collapsed: collapsed, collapsedWidth: utils_1.GLOBAL.CONFIG.BOX.SELECTBAR_CLOSE == 1 ? 6 : 0, width: width },
         react_1.default.createElement("div", { className: 'c-selectbar-closed', onClick: setCollapsed, title: utils_1.i18n.txt(_i18n_1.V.TXT_EXPAND) }),
         react_1.default.createElement("div", { className: 'c-selectbar' },
             react_1.default.createElement("div", { className: 'c-selectbar-head' },

package/components/Lists/Grid/index.js

@@ -41,7 +41,6 @@ var GridList = function (props) {
     var grids = props.grids, dataSource = props.dataSource, loading = props.loading;
     var itemRender = (0, react_1.useMemo)(function () {
         if (grids.ratio) {
-            // console.log(grids.ratio)
         }
         return function (record, i) { return react_1.default.createElement(antd_1.List.Item, null, grids.itemRender(record, i)); };
     }, [grids]);

package/components/SearchTool/SearchBar/ByKeyword.js

@@ -75,7 +75,7 @@ var SearchBarByKeyword = function (props) {
         var searchProps = {
             className: "c-searchbar-keyword",
             placeholder: utils_1.i18n.txt(_i18n_1.V.INPUT_SEARCH_KEYWORD),
-            allowClear: true,
+            allowClear: false,
         };
         if (props.keyword !== true) {
             if (props.keyword.placeholder) {

package/components/Tables/VTable.js

@@ -260,7 +260,9 @@ var VTableRoot = (0, react_1.forwardRef)(function (props, ref) {
             }
         }
         if (props.searchBar) {
-            boxProps.searchBar = __assign(__assign({}, props.searchBar), { disabled: isQuerying, onSearch: function (data) {
+            boxProps.searchBar = __assign(__assign({}, props.searchBar), { 
+                // disabled: isQuerying,
+                onSearch: function (data) {
                     var queryParam = lodash_1.default.extend({}, props.model.param, data);
                     query(queryParam, true);
                     setParam(queryParam, utils_1.GLOBAL.CONFIG.TABLE.UNSELECT_ON_QUERY);
@@ -282,6 +284,7 @@ var VTableRoot = (0, react_1.forwardRef)(function (props, ref) {
         // props.searchBand,
         props.actionBar,
         props.selectBar,
+        // isQuerying
         // props.className,
         // props.style,
         // props.mode

package/components/Trees/STree.js

@@ -119,7 +119,7 @@ var _Stree = function (props) {
         // 如果根节点只有一个，则自动展开这个根结点
         treeProps.defaultExpandedKeys = [treeState.treeData[0][treeState.keyField]];
     }
-    return react_1.default.createElement(antd_1.Tree, __assign({}, baseProps, treeProps, { disabled: props.disabled, selectedKeys: treeState.selectedKeys, onSelect: onSelect }), renderRoot(props, treeState));
+    return react_1.default.createElement(antd_1.Tree, __assign({}, baseProps, treeProps, { showLine: true, disabled: props.disabled, selectedKeys: treeState.selectedKeys, onSelect: onSelect }), renderRoot(props, treeState));
 };
 var renderNode = function (node, position, state, search, disabledNode, folderChecker) {
     if (search.keyword && !search.match.has(position.join('-')))

package/package.json

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

package/utils/Global.d.ts

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

package/utils/Global.js

@@ -59,7 +59,7 @@ 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 },
+    BOX: { SELECT_CLOSE: 2, SELECTBAR_CLOSE: 2, SELECTBAR_WIDTH: 250 },
     AJAX: {
         timeout: 30000,
         beforeSend: null,

package/utils/StringUtil.js

@@ -557,6 +557,8 @@ var getSuffix = function (fileName) {
     if (fileName == '' || fileName == null)
         return '';
     var idx = lodash_1.default.lastIndexOf(fileName, '.');
+    if (idx <= 0)
+        return '';
     return lodash_1.default.toLower(lodash_1.default.trim(idx >= 0 ? fileName.substring(idx + 1) : fileName));
 };
 exports.getSuffix = getSuffix;

package/utils/_AjaxUtil.d.ts

@@ -26,3 +26,4 @@ export interface Result {
 export declare const filterNull: (param: any) => any;
 export declare const setFixedHeader: (header: Record<string, string>) => void;
 export declare const AOP_BEFORE: (url: string, method: "GET" | "POST" | "PUT" | "DELETE" | "PATCH", headers: HeadersInit, query: PlainObject) => [string, "GET" | "POST" | "PUT" | "DELETE" | "PATCH", HeadersInit, PlainObject];
+export declare const LOG_AJAX: (url: string, method: string, param?: any) => void;

package/utils/_AjaxUtil.js

@@ -26,7 +26,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 var e_1, _a;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.AOP_BEFORE = exports.setFixedHeader = exports.filterNull = exports.CLEAR = exports.SESSION = exports.SESSION_TIME = exports.WAIT = exports.CACHE_TIMER = exports.CACHE_URL = void 0;
+exports.LOG_AJAX = exports.AOP_BEFORE = exports.setFixedHeader = exports.filterNull = exports.CLEAR = exports.SESSION = exports.SESSION_TIME = exports.WAIT = exports.CACHE_TIMER = exports.CACHE_URL = void 0;
 var lodash_1 = __importDefault(require("lodash"));
 var _Support_1 = require("./_Support");
 var Global_1 = require("./Global");
@@ -144,3 +144,20 @@ exports.AOP_BEFORE = (0, _Support_1.globalDefault)('_VAP_BEFORE_SEND', function
     }
     return [resloveApiRoot, method, __assign(__assign({}, FIXED_HEADER), { headers: headers }), data];
 });
+var CODES = { bold: [1, 22], green: [32, 39], blue: [34, 39], bgYellow: [43, 49], bgGray: [100, 49] };
+var SIGN = '\u001b[';
+var style = function (msg, code) { return SIGN + code[0] + 'm' + msg + SIGN + code[1] + 'm'; };
+var styleBold = function (msg) { return style(msg, CODES.bold); };
+var bgYellow = function (msg) { return style(msg, CODES.bgYellow); };
+var bgGray = function (msg) { return style(msg, CODES.bgGray); };
+var colorGreen = function (msg) { return style(msg, CODES.green); };
+var colorBlue = function (msg) { return style(msg, CODES.blue); };
+var LOG_AJAX = function (url, method, param) {
+    if (method == 'GET') {
+        console.log("---------> ".concat(bgYellow(colorBlue(' GET')), " ").concat(styleBold(colorGreen(url))));
+        return;
+    }
+    console.log("---------> ".concat(bgYellow(colorBlue(method)), " ").concat(styleBold(colorGreen(url))));
+    console.log(bgGray(colorGreen('--param--:')), param);
+};
+exports.LOG_AJAX = LOG_AJAX;

package/utils/index.d.ts

@@ -36,6 +36,7 @@ export type Route = {
      * 2. 缓存页面暂不支持错误判定，请自行写好代码，避免白屏
      * 3. 仅支持2.0版本，1.5版本无法支持。
     */
+    cache?: true;
     /**
      * 页面组件
      * 1. 可以为一个 ReactNode, 如 <div></div>