vap1 0.2.7 → 0.2.8

package/components/Box/Box.js

@@ -64,11 +64,6 @@ var Upagination_1 = require("../_common/Upagination");
 var utils_1 = require("../../utils");
 var _register_1 = require("./_register");
 var HEIGHT_OMIT = 'ubox-omit';
-var getParentByClassName = function (el, clazz) {
-    if (el.classList.contains(clazz))
-        return el;
-    return getParentByClassName(el.parentElement, clazz);
-};
 var BoxContext = (0, react_1.createContext)(null);
 /**
  * 说明：如果需要使用 useBox 获取BOX内部状态
@@ -110,7 +105,7 @@ exports.Box = (0, react_1.forwardRef)(function (props, ref) {
             style.display = 'none';
         }
         else {
-            var container = getParentByClassName(rootRef.current.parentElement, 'c-box');
+            var container = utils_1.PageUtil.getParentByClassName(rootRef.current.parentElement, 'c-box');
             style.height = Math.floor(container.parentElement.getBoundingClientRect().height);
         }
     }

package/components/SearchBar/ByField.js

@@ -72,6 +72,9 @@ var InnerSearchBarByField = function (props) {
         lodash_1.default.keys(prev).map(function (item) {
             data[item] = null;
         });
+        if (props.default) {
+            return lodash_1.default.extend({}, data, props.default);
+        }
         return data;
     }); };
     var search = function () { return props.onSearch(data); };
@@ -118,14 +121,13 @@ var InnerSearchBarByField = function (props) {
                 field.span = SearchField.defaultSpan || 1;
             }
             var tryfill = rowUse + field.span;
-            if (tryfill > cols) {
+            if (tryfill > cols && rowUse != 0) {
                 rows.push([{ field: field, SearchField: SearchField.component }]);
                 rowUse = field.span;
+                return;
             }
-            else {
-                rows[rows.length - 1].push({ field: field, SearchField: SearchField.component });
-                rowUse += field.span;
-            }
+            rows[rows.length - 1].push({ field: field, SearchField: SearchField.component });
+            rowUse += field.span;
         });
         return { rows: rows, isOutSide: isOutSide };
     }, [props.fields]);
@@ -216,9 +218,15 @@ var InnerSearchBarByField = function (props) {
             !isAwaysExpand && react_1.default.createElement(Button_1.Button, { disabled: props.disabled, icon: 'filter', onClick: function (e) { return utils_1.PageUtil.stopEvent(e, function () { return setIsExpand(false); }); } }, utils_1.i18n.txt(_i18n_1.V.BTN_LESS)))
     ]; };
     var fieldsStyle = (0, react_1.useMemo)(function () {
-        if (layout == null)
+        if (layout == null || layout.rows.length == 0)
             return {};
-        var width = cols * (labelWidth + inputWidth);
+        var width = 0;
+        if (layout.rows.length == 1) {
+            width = (labelWidth + inputWidth) * lodash_1.default.sum(layout.rows[0].map(function (item) { return item.field.span; }));
+        }
+        else {
+            width = cols * (labelWidth + inputWidth);
+        }
         if (props.__innnerPopup)
             return { width: width + 12 };
         return { minWidth: width + 90 };

package/components/SearchBar/ByKeyword.js

@@ -83,19 +83,7 @@ var SearchBarByKeyword = function (props) {
                         react_1.default.createElement(ByField_1.InnerSearchBarByField, __assign({}, props, { __innerExpand: true, __innerOutside: true, __innnerPopup: true, onSearch: function (param) {
                                 props.onSearch(param);
                                 setOpen(false);
-                            } })))), overlayClassName: 'c-searchbar-keyword-more', getPopupContainer: function () {
-                    var maskEls = document.getElementsByClassName('ant-modal-mask');
-                    var hasMask = false;
-                    for (var i = 0, _i = maskEls.length; i < _i; i++) {
-                        if (!maskEls.item(i).classList.contains('ant-modal-mask-hidden')) {
-                            hasMask = true;
-                            break;
-                        }
-                    }
-                    if (!hasMask)
-                        return document.getElementById('vap-app-content');
-                    return spanRef.current.parentElement.parentElement.parentElement.parentElement.parentElement.parentElement;
-                } }));
+                            } })))), overlayClassName: 'c-searchbar-keyword-more', getPopupContainer: function (triggerNode) { return utils_1.PageUtil.getParentByClassName(triggerNode, 'c-searchbar'); } }));
     }
     return react_1.default.createElement(antd_1.Input.Search, __assign({}, inputProps, suffixProps, { onSearch: function (keyword) { return props.onSearch({ keyword_: keyword }); }, enterButton: utils_1.i18n.txt(_i18n_1.V.BTN_SEARCH) }));
 };

package/components/Tables/VTable.js

@@ -108,6 +108,16 @@ var _VTable = (0, react_1.forwardRef)(function (props, ref) {
         if (props.model.mode == 'static')
             update();
     }, [pageSize, pageNo]);
+    // 更新选中
+    (0, react_1.useLayoutEffect)(function () {
+        var diff = lodash_1.default.xor(ref.current.selected[0], list.map(function (item) { return item[rowKey]; }));
+        if (diff.length > 0) {
+            var toRemove_1 = new Set(diff);
+            ref.current.selected[0] = ref.current.selected[0].filter(function (key) { return !toRemove_1.has(key); });
+            ref.current.selected[1] = ref.current.selected[1].filter(function (item) { return !toRemove_1.has(item[rowKey]); });
+            ref.current.onSelected();
+        }
+    }, [list]);
     // 计算 clolum 及 高亮keyword
     var columns = (0, react_1.useMemo)(function () {
         var cols = [];

package/components/UForm/FormWrapper.js

@@ -147,7 +147,7 @@ var getMaxTitleWidth = function (field) {
 // 遍历字段，计算表单属性
 var _LOOP = function (fs, maxLabel, isInfo, isEdit, isAdd, hiddFields, disableFields) {
     fs.map(function (field) {
-        // @ts-ignore // 兼容 && 写法
+        // @ts-ignore // 兼容 `&&` 写法
         if (field == null || field === false)
             return;
         var show = true;

package/components/UForm/UForm.js

@@ -388,8 +388,15 @@ var getValue = function (multipleFields, values, initRef) {
             });
             return;
         }
-        if (RTNData[property] !== undefined && RTNData[property] !== null) {
-            data[property] = RTNData[property];
+        if (lodash_1.default.has(RTNData, property) && lodash_1.default.get(RTNData, property) !== null) {
+            var value = lodash_1.default.get(RTNData, property);
+            // 说明：此处留争议：自动去除字符串类型的前后空格
+            if (lodash_1.default.isString(value)) {
+                lodash_1.default.set(data, property, lodash_1.default.trim(value));
+            }
+            else {
+                lodash_1.default.set(data, property, value);
+            }
         }
     });
     return data;

package/components/UForm/_register.d.ts

@@ -17,6 +17,8 @@ export type FormFieldProps = {
     /**
      * 说明，必须使用 props.onChange 事件接收值的变化内容
      * 不然会有（联动） Bug
+     * 第一个参数为变化的值，多字段时，需要传对象
+     * 第二个参数为扩展数据，传递时，会带入到字段联动link/call 的第三个参数中
     */
     onChange: Function;
     /**

package/components/_adapt/Layout.js

@@ -93,7 +93,7 @@ var antd_1 = require("antd");
 var BasicLayout = /** @class */ (function (_super) {
     __extends(BasicLayout, _super);
     function BasicLayout() {
-        var _this = _super !== null && _super.apply(this, arguments) || this;
+        var _this = _super.apply(this, __spreadArray([], __read(arguments), false)) || this;
         _this.state = { siders: [] };
         return _this;
     }

package/components/_common/DateRange.js

@@ -63,6 +63,28 @@ var DateRange = function (props) {
         var endPlaceholder = props.endPlaceholder ? props.endPlaceholder : (props.showTime ? utils_1.i18n.getText(_i18n_1.V.DATETIME_END) : utils_1.i18n.getText(_i18n_1.V.DATE_END));
         return [FORMAT, startPlaceholder, endPlaceholder];
     }, [props.showTime, props.startPlaceholder, props.endPlaceholder]), 3), FORMAT = _c[0], startPlaceholder = _c[1], endPlaceholder = _c[2];
+    (0, react_1.useLayoutEffect)(function () {
+        if (props.start == null && start == null)
+            return;
+        if (props.start == null)
+            setStart(undefined);
+        var newStart = (0, dayjs_1.default)(props.start);
+        if (start == null)
+            setStart(newStart);
+        if (newStart.diff(start) != 0)
+            setStart(newStart);
+    }, [props.start]);
+    (0, react_1.useLayoutEffect)(function () {
+        if (props.end == null && end == null)
+            return;
+        if (props.end == null)
+            setEnd(undefined);
+        var newEnd = (0, dayjs_1.default)(props.end);
+        if (end == null)
+            setEnd(newEnd);
+        if (newEnd.diff(end) != 0)
+            setEnd(newEnd);
+    }, [props.end]);
     // 是否在范围内
     var inRange = (0, react_1.useCallback)(function (value) {
         if (props.minDate) {

package/package.json

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

package/utils/PageUtil.d.ts

@@ -65,4 +65,5 @@ type SubmitFormOptions = {
     urlParam?: Record<string, string | number | boolean>;
 };
 export declare const submitForm: (options: SubmitFormOptions) => void;
+export declare const getParentByClassName: (el: HTMLElement, clazz: string, defaultNode?: HTMLElement) => HTMLElement;
 export {};

package/utils/PageUtil.js

@@ -50,7 +50,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.submitForm = exports.waitFor = exports.getOptions = exports.currentApp = exports.clearURL = exports.resolveURL = exports.hasRole = exports.IpToInt = exports.paramToUri = exports.stopEvent = void 0;
+exports.getParentByClassName = exports.submitForm = exports.waitFor = exports.getOptions = exports.currentApp = exports.clearURL = exports.resolveURL = exports.hasRole = exports.IpToInt = exports.paramToUri = exports.stopEvent = void 0;
 var lodash_1 = __importDefault(require("lodash"));
 var StringUtil_1 = require("./StringUtil");
 var _Support_1 = require("./_Support");
@@ -213,3 +213,11 @@ var submitForm = function (options) {
     window.setTimeout(function () { return document.body.removeChild(form); }, 200);
 };
 exports.submitForm = submitForm;
+var getParentByClassName = function (el, clazz, defaultNode) {
+    if (el.classList.contains(clazz))
+        return el;
+    if (el.parentElement == null)
+        return defaultNode || el;
+    return (0, exports.getParentByClassName)(el.parentElement, clazz, defaultNode);
+};
+exports.getParentByClassName = getParentByClassName;

package/utils/Renders/FileRender.d.ts

@@ -1,3 +1,11 @@
 import React from "react";
 export declare const fileRender: (fileId: string, fileName?: string) => React.JSX.Element;
-export declare const imgRender: (fileId: string) => void;
+type ImgRenderOptions = {
+    style?: React.CSSProperties;
+    width?: number;
+    height?: number;
+    default?: string;
+};
+export declare const ImgRender: (option?: ImgRenderOptions) => (link: string) => React.JSX.Element;
+export declare const imgRender: (link: string) => React.JSX.Element;
+export {};

package/utils/Renders/FileRender.js

@@ -1,4 +1,15 @@
 "use strict";
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
 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);
@@ -14,7 +25,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.imgRender = exports.fileRender = void 0;
+exports.imgRender = exports.ImgRender = exports.fileRender = void 0;
 var react_1 = __importDefault(require("react"));
 var lodash_1 = __importDefault(require("lodash"));
 var Icon_1 = require("../../components/_adapt/Icon");
@@ -54,15 +65,47 @@ var fileRender = function (fileId, fileName) {
         fileName ? fileName : index_1.i18n.txt(_i18n_1.V.BTN_DOWNLOAD));
 };
 exports.fileRender = fileRender;
-var imgRender = function (fileId) {
-    // if (portrait) {
-    //     if (_.startsWith(portrait, '/') || _.startsWith(portrait, 'http:')) {
-    //         return portrait;
-    //     } else {
-    //         return '/api/fs/view/' + portrait
-    //     }
-    // }
-    // return '/images/default_user.png';
-    // <img src={userAvatar(user.portrait)} alt="avatar" style={{ height: 120, minWidth: 80, maxWidth: 320, borderRadius: 4, border: '2px solid #A82932' }} />
+var getUrl = function (link, def) {
+    if (link == null) {
+        if (def != null)
+            return index_1.PageUtil.resolveURL(def);
+        return '';
+    }
+    var url = lodash_1.default.startsWith(link, '/') ? link : index_1.GLOBAL.CONFIG.UPLOAD.PREVIEW + link;
+    return index_1.PageUtil.resolveURL(url);
+};
+var ImgRender = function (option) {
+    var style = { borderRadius: '2px' };
+    if (lodash_1.default.has(option, 'width')) {
+        style.width = option.width;
+        if (lodash_1.default.has(option, 'height')) {
+            style.height = option.height;
+        }
+        else {
+            style.height = option.width;
+        }
+    }
+    else if (lodash_1.default.has(option, 'height')) {
+        style.height = option.height;
+        if (lodash_1.default.has(option, 'width')) {
+            style.width = option.width;
+        }
+        else {
+            style.width = option.height;
+        }
+    }
+    else {
+        style.height = 80;
+        style.width = 80;
+    }
+    var def = (option === null || option === void 0 ? void 0 : option.default) || null;
+    if (lodash_1.default.has(option, 'style')) {
+        style = __assign(__assign({}, style), option.style);
+    }
+    return function (link) {
+        var url = getUrl(link, def);
+        return react_1.default.createElement("img", { src: url, style: style });
+    };
 };
-exports.imgRender = imgRender;
+exports.ImgRender = ImgRender;
+exports.imgRender = (0, exports.ImgRender)();

package/utils/Renders/index.d.ts

@@ -1,7 +1,7 @@
 export { ApiGetRender } from './ApiGetRender';
 export { ApiPostRender } from './ApiPostRender';
 export { DateRender, dateRender } from './DateRender';
-export { fileRender, imgRender } from './FileRender';
+export { fileRender, ImgRender, imgRender } from './FileRender';
 export { ListRender, switchYesNoRender, switchOpenRender, switchCloseRender, switchEnableRender, switchDisableRender, switchShowRender, switchHideRender, } from './ListRender';
 export { NumberRender, intRender, numberRender, sizeRender, usdRender, chineseRender, percentRender } from './NumberRender';
 export { StatusRender } from './StatusRender';

package/utils/Renders/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DICT = exports.DictRender = exports.strCopyRender = exports.StrCopyRender = exports.htmlRender = exports.strRender = exports.HTMRender = exports.StrRender = exports.StatusRender = exports.percentRender = exports.chineseRender = exports.usdRender = exports.sizeRender = exports.numberRender = exports.intRender = exports.NumberRender = exports.switchHideRender = exports.switchShowRender = exports.switchDisableRender = exports.switchEnableRender = exports.switchCloseRender = exports.switchOpenRender = exports.switchYesNoRender = exports.ListRender = exports.imgRender = exports.fileRender = exports.dateRender = exports.DateRender = exports.ApiPostRender = exports.ApiGetRender = void 0;
+exports.DICT = exports.DictRender = exports.strCopyRender = exports.StrCopyRender = exports.htmlRender = exports.strRender = exports.HTMRender = exports.StrRender = exports.StatusRender = exports.percentRender = exports.chineseRender = exports.usdRender = exports.sizeRender = exports.numberRender = exports.intRender = exports.NumberRender = exports.switchHideRender = exports.switchShowRender = exports.switchDisableRender = exports.switchEnableRender = exports.switchCloseRender = exports.switchOpenRender = exports.switchYesNoRender = exports.ListRender = exports.imgRender = exports.ImgRender = exports.fileRender = exports.dateRender = exports.DateRender = exports.ApiPostRender = exports.ApiGetRender = void 0;
 var ApiGetRender_1 = require("./ApiGetRender");
 Object.defineProperty(exports, "ApiGetRender", { enumerable: true, get: function () { return ApiGetRender_1.ApiGetRender; } });
 var ApiPostRender_1 = require("./ApiPostRender");
@@ -10,6 +10,7 @@ Object.defineProperty(exports, "DateRender", { enumerable: true, get: function (
 Object.defineProperty(exports, "dateRender", { enumerable: true, get: function () { return DateRender_1.dateRender; } });
 var FileRender_1 = require("./FileRender");
 Object.defineProperty(exports, "fileRender", { enumerable: true, get: function () { return FileRender_1.fileRender; } });
+Object.defineProperty(exports, "ImgRender", { enumerable: true, get: function () { return FileRender_1.ImgRender; } });
 Object.defineProperty(exports, "imgRender", { enumerable: true, get: function () { return FileRender_1.imgRender; } });
 var ListRender_1 = require("./ListRender");
 Object.defineProperty(exports, "ListRender", { enumerable: true, get: function () { return ListRender_1.ListRender; } });

package/utils/_Support.d.ts

@@ -10,8 +10,8 @@ declare global {
 type GLOBAL_KEY = '_V_APPACTION' | 'useApp' | '_V_STATE' | '_V_GLOBAL' | '_V_I18N' | '_V_DICT' | '_VAP' | 'NProgress' | 'echarts' | '_C_SELECT_BAR' | '_C_SEARCH_FIELD' | '_C_FORM_FIELD';
 export declare var getGlobal: () => any;
 export declare enum Language {
-    ZH_CN = "zh-CN",
-    ZH_HK = "zh-HK",
+    ZH_CN = "zh-CN",// 简体中文
+    ZH_HK = "zh-HK",// 繁體中文
     EN_US = "en-US"
 }
 export declare const globalDefault: <T>(key: GLOBAL_KEY, init: T) => T;

package/utils/screenful.js

@@ -30,8 +30,8 @@ var __read = (this && this.__read) || function (o, n) {
 Object.defineProperty(exports, "__esModule", { value: true });
 var METHOD_MAP = [
     ['requestFullscreen', 'exitFullscreen', 'fullscreenElement', 'fullscreenEnabled', 'fullscreenchange', 'fullscreenerror',],
-    ['webkitRequestFullscreen', 'webkitExitFullscreen', 'webkitFullscreenElement', 'webkitFullscreenEnabled', 'webkitfullscreenchange', 'webkitfullscreenerror',],
-    ['webkitRequestFullScreen', 'webkitCancelFullScreen', 'webkitCurrentFullScreenElement', 'webkitCancelFullScreen', 'webkitfullscreenchange', 'webkitfullscreenerror',],
+    ['webkitRequestFullscreen', 'webkitExitFullscreen', 'webkitFullscreenElement', 'webkitFullscreenEnabled', 'webkitfullscreenchange', 'webkitfullscreenerror',], // New WebKit
+    ['webkitRequestFullScreen', 'webkitCancelFullScreen', 'webkitCurrentFullScreenElement', 'webkitCancelFullScreen', 'webkitfullscreenchange', 'webkitfullscreenerror',], // Old WebKit
     ['mozRequestFullScreen', 'mozCancelFullScreen', 'mozFullScreenElement', 'mozFullScreenEnabled', 'mozfullscreenchange', 'mozfullscreenerror',],
     ['msRequestFullscreen', 'msExitFullscreen', 'msFullscreenElement', 'msFullscreenEnabled', 'MSFullscreenChange', 'MSFullscreenError',],
 ];