vap1 0.2.6 → 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/Box/SelectBar.js

@@ -60,7 +60,7 @@ var antd_1 = require("antd");
 var hooks_1 = require("../../hooks");
 var utils_1 = require("../../utils");
 var _register_1 = require("./_register");
-var Const_1 = require("../_setup/Const");
+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];
@@ -108,11 +108,11 @@ exports.SelectBar = (0, react_1.forwardRef)(function (props, ref) {
             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 },
-        react_1.default.createElement("div", { className: 'c-selectbar-closed', onClick: setCollapsed, title: utils_1.i18n.txt(Const_1.V.TXT_EXPAND) }),
+        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' },
                 react_1.default.createElement("div", { className: 'c-selectbar-title' },
-                    react_1.default.createElement(Icon_1.Icon, { type: "left-circle", title: utils_1.i18n.txt(Const_1.V.TXT_COLLAPSE), onClick: setCollapsed }),
+                    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, 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/components/SearchBar/ByField.js

@@ -60,7 +60,7 @@ var antd_1 = require("antd");
 var Button_1 = require("../_adapt/Button");
 var Popover_1 = require("../_adapt/Popover");
 var utils_1 = require("../../utils");
-var Const_1 = require("../_setup/Const");
+var _i18n_1 = require("../_i18n");
 var SearchField_1 = require("./SearchField");
 var _register_1 = require("./_register");
 var InnerSearchBarByField = function (props) {
@@ -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]);
@@ -158,7 +160,7 @@ var InnerSearchBarByField = function (props) {
         txt = (item.field.ik && utils_1.i18n.hasKey(item.field.ik)) ? utils_1.i18n.txt(item.field.ik) : item.field.label;
         field.label = txt;
         if (!lodash_1.default.has(field, 'placeholder')) {
-            var key = lodash_1.default.isArray(item.field.options) ? Const_1.V.INPUT_SELECT : Const_1.V.INPUT_TEXT;
+            var key = lodash_1.default.isArray(item.field.options) ? _i18n_1.V.INPUT_SELECT : _i18n_1.V.INPUT_TEXT;
             field.placeholder = utils_1.i18n.txt(key) + txt;
         }
         var SearchInput = layout.isOutSide ? SearchField_1.InputOutSide : SearchField_1.InputInSide;
@@ -211,14 +213,20 @@ var InnerSearchBarByField = function (props) {
     var moreRender = function (layout) { return [
         lodash_1.default.tail(layout.rows).map(function (row) { return layout.isOutSide ? react_1.default.createElement("div", { className: 'c-searchbar-outgroup' }, rowRender(row)) : react_1.default.createElement(antd_1.Input.Group, { compact: true }, rowRender(row)); }),
         props.hideAction ? utils_1.Const.NONE : react_1.default.createElement("div", { className: btnsClass },
-            react_1.default.createElement(Button_1.Button, { disabled: props.disabled, style: fristBtnStyle, icon: 'search', type: "primary", onClick: function (e) { return utils_1.PageUtil.stopEvent(e, search); } }, utils_1.i18n.txt(Const_1.V.BTN_SEARCH)),
-            react_1.default.createElement(Button_1.Button, { disabled: props.disabled, icon: 'redo', onClick: function (e) { return utils_1.PageUtil.stopEvent(e, clear); } }, utils_1.i18n.txt(Const_1.V.BTN_RESET)),
-            !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(Const_1.V.BTN_LESS)))
+            react_1.default.createElement(Button_1.Button, { disabled: props.disabled, style: fristBtnStyle, icon: 'search', type: "primary", onClick: function (e) { return utils_1.PageUtil.stopEvent(e, search); } }, utils_1.i18n.txt(_i18n_1.V.BTN_SEARCH)),
+            react_1.default.createElement(Button_1.Button, { disabled: props.disabled, icon: 'redo', onClick: function (e) { return utils_1.PageUtil.stopEvent(e, clear); } }, utils_1.i18n.txt(_i18n_1.V.BTN_RESET)),
+            !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

@@ -56,14 +56,14 @@ var antd_1 = require("antd");
 var Popover_1 = require("../_adapt/Popover");
 var ByField_1 = require("./ByField");
 var utils_1 = require("../../utils");
-var Const_1 = require("../_setup/Const");
+var _i18n_1 = require("../_i18n");
 var SearchBarByKeyword = function (props) {
     var _a = __read((0, react_1.useState)(false), 2), open = _a[0], setOpen = _a[1];
     var spanRef = (0, react_1.useRef)(null);
     var inputProps = (0, react_1.useMemo)(function () {
         var searchProps = {
             className: "c-searchbar-keyword",
-            placeholder: utils_1.i18n.txt(Const_1.V.INPUT_SEARCH_KEYWORD),
+            placeholder: utils_1.i18n.txt(_i18n_1.V.INPUT_SEARCH_KEYWORD),
             allowClear: true,
         };
         if (props.keyword !== true) {
@@ -76,27 +76,15 @@ var SearchBarByKeyword = function (props) {
     var suffixProps = {};
     if (props.fields && props.fields.length) {
         suffixProps.suffix = react_1.default.createElement(react_1.default.Fragment, null,
-            react_1.default.createElement("span", { ref: spanRef, onClick: function () { return setOpen(true); }, style: { pointerEvents: props.disabled ? 'none' : 'unset' }, className: 'vicon vicon-menu', title: utils_1.i18n.txt(Const_1.V.INPUT_SEARCH_ADVANCE) }, "\u00A0"),
+            react_1.default.createElement("span", { ref: spanRef, onClick: function () { return setOpen(true); }, style: { pointerEvents: props.disabled ? 'none' : 'unset' }, className: 'vicon vicon-menu', title: utils_1.i18n.txt(_i18n_1.V.INPUT_SEARCH_ADVANCE) }, "\u00A0"),
             react_1.default.createElement(Popover_1.Popover, { open: open, onOpenChange: setOpen, trigger: "click", placement: "bottom", content: react_1.default.createElement(react_1.default.Fragment, null,
-                    react_1.default.createElement("h3", null, utils_1.i18n.txt(Const_1.V.INPUT_SEARCH_ADVANCE)),
+                    react_1.default.createElement("h3", null, utils_1.i18n.txt(_i18n_1.V.INPUT_SEARCH_ADVANCE)),
                     react_1.default.createElement("div", { className: 'c-searchbar' },
                         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(Const_1.V.BTN_SEARCH) }));
+    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) }));
 };
 exports.SearchBarByKeyword = SearchBarByKeyword;

package/components/Tables/Components/ActionBar.js

@@ -57,7 +57,7 @@ exports.BUTTON_EXPORT = exports.BUTTON_IMPORT = exports.BUTTON_MORE = exports.BU
 var react_1 = __importStar(require("react"));
 var lodash_1 = __importDefault(require("lodash"));
 var ActionButtons_1 = require("../../SearchBar/ActionButtons");
-var Const_1 = require("../../_setup/Const");
+var _i18n_1 = require("../../_i18n");
 var i18n_1 = require("../../../utils/i18n");
 var hooks_1 = require("../../../hooks");
 var convertButton = function (item, selectedRowKeys, selectedObjects, queryParam) {
@@ -102,18 +102,18 @@ exports.ActionBar = ActionBar;
 /**
  * 通用添加按钮
 */
-var BUTTON_ADD = function (onClick, props) { return (__assign(__assign({ label: (0, i18n_1.txt)(Const_1.V.ACT_ADD), icon: 'plus', type: 'primary' }, props), { onClick: onClick })); };
+var BUTTON_ADD = function (onClick, props) { return (__assign(__assign({ label: (0, i18n_1.txt)(_i18n_1.V.ACT_ADD), icon: 'plus', type: 'primary' }, props), { onClick: onClick })); };
 exports.BUTTON_ADD = BUTTON_ADD;
 /**
  * 通用删除按钮
 */
-var BUTTON_DELETE = function (onClick, props) { return (__assign(__assign({ label: (0, i18n_1.txt)(Const_1.V.ACT_DELETE), icon: 'delete', danger: true, mustSelected: true, confirm: (0, i18n_1.txt)(Const_1.V.ACT_DELETE_BATCH) }, props), { onClick: onClick })); };
+var BUTTON_DELETE = function (onClick, props) { return (__assign(__assign({ label: (0, i18n_1.txt)(_i18n_1.V.ACT_DELETE), icon: 'delete', danger: true, mustSelected: true, confirm: (0, i18n_1.txt)(_i18n_1.V.ACT_DELETE_BATCH) }, props), { onClick: onClick })); };
 exports.BUTTON_DELETE = BUTTON_DELETE;
 /**
  * 通用更多按钮，需要传子菜单
 */
 var BUTTON_MORE = function (children) { return ({
-    label: (0, i18n_1.txt)(Const_1.V.BTN_MORE),
+    label: (0, i18n_1.txt)(_i18n_1.V.BTN_MORE),
     onClick: null,
     children: children
 }); };
@@ -121,10 +121,10 @@ exports.BUTTON_MORE = BUTTON_MORE;
 /**
  * 通用导入按钮
 */
-var BUTTON_IMPORT = function (onClick, props) { return (__assign(__assign({ label: (0, i18n_1.txt)(Const_1.V.BTN_IMPORT), icon: 'import' }, props), { onClick: onClick })); };
+var BUTTON_IMPORT = function (onClick, props) { return (__assign(__assign({ label: (0, i18n_1.txt)(_i18n_1.V.BTN_IMPORT), icon: 'import' }, props), { onClick: onClick })); };
 exports.BUTTON_IMPORT = BUTTON_IMPORT;
 /**
  * 通用导出按钮
 */
-var BUTTON_EXPORT = function (onClick, props) { return (__assign(__assign({ label: (0, i18n_1.txt)(Const_1.V.BTN_EXPORT), icon: 'export' }, props), { onClick: onClick })); };
+var BUTTON_EXPORT = function (onClick, props) { return (__assign(__assign({ label: (0, i18n_1.txt)(_i18n_1.V.BTN_EXPORT), icon: 'export' }, props), { onClick: onClick })); };
 exports.BUTTON_EXPORT = BUTTON_EXPORT;

package/components/Tables/Components/Actions.js

@@ -20,7 +20,7 @@ var lodash_1 = __importDefault(require("lodash"));
 var Popconfirm_1 = require("../../_adapt/Popconfirm");
 var Icon_1 = require("../../_adapt/Icon");
 var utils_1 = require("../../../utils");
-var Const_1 = require("../../_setup/Const");
+var _i18n_1 = require("../../_i18n");
 var DEFAULT_CLASS = {
     INFO: 'c-oper-info',
     EDIT: 'c-oper-edit',
@@ -29,7 +29,7 @@ var DEFAULT_CLASS = {
 var INFO = function (props) {
     if (props.roleCode && !utils_1.PageUtil.hasRole(props.roleCode))
         return react_1.default.createElement(react_1.default.Fragment, null);
-    var title = utils_1.i18n.getText(props.ik, props.title, Const_1.V.BTN_INFO);
+    var title = utils_1.i18n.getText(props.ik, props.title, _i18n_1.V.BTN_INFO);
     return react_1.default.createElement("span", { className: DEFAULT_CLASS.INFO, onClick: function (evt) { return utils_1.PageUtil.stopEvent(evt, props.onClick); }, title: "".concat(title, " ").concat(props.name || '') },
         react_1.default.createElement(Icon_1.Icon, { type: 'search' }),
         react_1.default.createElement("span", null, title));
@@ -38,7 +38,7 @@ exports.INFO = INFO;
 var EDIT = function (props) {
     if (props.roleCode && !utils_1.PageUtil.hasRole(props.roleCode))
         return react_1.default.createElement(react_1.default.Fragment, null);
-    var title = utils_1.i18n.getText(props.ik, props.title, Const_1.V.ACT_UPDATE);
+    var title = utils_1.i18n.getText(props.ik, props.title, _i18n_1.V.ACT_UPDATE);
     return react_1.default.createElement("span", { className: DEFAULT_CLASS.EDIT, onClick: function (evt) { return utils_1.PageUtil.stopEvent(evt, props.onClick); }, title: "".concat(title, " ").concat(props.name || '') },
         react_1.default.createElement(Icon_1.Icon, { type: 'edit' }),
         react_1.default.createElement("span", null, title));
@@ -47,8 +47,8 @@ exports.EDIT = EDIT;
 var DELETE = function (props) {
     if (props.roleCode && !utils_1.PageUtil.hasRole(props.roleCode))
         return react_1.default.createElement(react_1.default.Fragment, null);
-    var title = utils_1.i18n.getText(props.ik, props.title, Const_1.V.ACT_DELETE);
-    var popTitle = utils_1.i18n.txt(Const_1.V.ACT_DELETE_CONFIRM, props.name || '');
+    var title = utils_1.i18n.getText(props.ik, props.title, _i18n_1.V.ACT_DELETE);
+    var popTitle = utils_1.i18n.txt(_i18n_1.V.ACT_DELETE_CONFIRM, props.name || '');
     return react_1.default.createElement(Popconfirm_1.Popconfirm, { onConfirm: function (e) { return utils_1.PageUtil.stopEvent(e, function () { return props.onClick(); }); }, placement: "right", title: react_1.default.createElement("span", null, popTitle), overlayClassName: 'c-table-action-confirm' },
         react_1.default.createElement("span", { className: DEFAULT_CLASS.DELETE, title: "".concat(title, " ").concat(props.name || '') },
             react_1.default.createElement(Icon_1.Icon, { type: 'delete' }),
@@ -92,11 +92,11 @@ var COL_OPERACTION = function (props) {
         if (len > 0) {
             clazz.push('c-table-actions-' + len);
         }
-        return { align: 'center', title: utils_1.i18n.getText(Const_1.V.TXT_OPERATION), ellipsis: false, className: clazz.join(' '), render: props };
+        return { align: 'center', title: utils_1.i18n.getText(_i18n_1.V.TXT_OPERATION), ellipsis: false, className: clazz.join(' '), render: props };
     }
     else if (props.className) {
         clazz.push(props.className);
     }
-    return __assign(__assign({ align: 'center' }, props), { title: utils_1.i18n.getText(props.ik, null, Const_1.V.TXT_OPERATION), ellipsis: false, className: clazz.join(' ') });
+    return __assign(__assign({ align: 'center' }, props), { title: utils_1.i18n.getText(props.ik, null, _i18n_1.V.TXT_OPERATION), ellipsis: false, className: clazz.join(' ') });
 };
 exports.COL_OPERACTION = COL_OPERACTION;

package/components/Tables/Util.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getIdxColumn = void 0;
 var lodash_1 = __importDefault(require("lodash"));
 var utils_1 = require("../../utils");
-var Const_1 = require("../_setup/Const");
+var _i18n_1 = require("../_i18n");
 var getIdxColumn = function (ref, showIndex, isRank) {
     if (showIndex === void 0) { showIndex = null; }
     if (isRank === void 0) { isRank = false; }
@@ -21,7 +21,7 @@ var getIdxColumn = function (ref, showIndex, isRank) {
         }
     }
     else {
-        title = utils_1.i18n.txt(isRank ? Const_1.V.TXT_RANK : Const_1.V.TXT_IDX);
+        title = utils_1.i18n.txt(isRank ? _i18n_1.V.TXT_RANK : _i18n_1.V.TXT_IDX);
     }
     var width = 48;
     if (ref.current < 1000) {

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/Trees/ActionTree.js

@@ -108,7 +108,7 @@ var BaseTree_1 = require("./BaseTree");
 var Icon_1 = require("../_adapt/Icon");
 var UFormModal_1 = require("../UForm/UFormModal");
 var utils_1 = require("../../utils");
-var Const_1 = require("../_setup/Const");
+var _i18n_1 = require("../_i18n");
 var useModals_1 = require("../../hooks/useModals");
 var STEP = 16;
 var INSER_POS;
@@ -150,7 +150,7 @@ var _Actiontree = (0, react_1.forwardRef)(function (props, ref) {
     };
     if (props.notCache)
         action.notCache = true;
-    action.objectName = utils_1.i18n.getText(props.ik, props.objectName, Const_1.V.TREE_NODE);
+    action.objectName = utils_1.i18n.getText(props.ik, props.objectName, _i18n_1.V.TREE_NODE);
     if (props.api) {
         action.api = props.api;
         if (props.canAdd) {
@@ -247,10 +247,10 @@ var _Actiontree = (0, react_1.forwardRef)(function (props, ref) {
                 case 1:
                     result = _b.sent();
                     if (result.code != '0') {
-                        antd_1.message.error(txt(Const_1.V.ACT_ADD_FAIL_NAMED, "".concat(objectName, " : ").concat(data[titleField])));
+                        antd_1.message.error(txt(_i18n_1.V.ACT_ADD_FAIL_NAMED, "".concat(objectName, " : ").concat(data[titleField])));
                         return [2 /*return*/];
                     }
-                    antd_1.message.success(txt(Const_1.V.ACT_ADD_SUCCESS_NAMED, "".concat(objectName, " : ").concat(data[titleField])));
+                    antd_1.message.success(txt(_i18n_1.V.ACT_ADD_SUCCESS_NAMED, "".concat(objectName, " : ").concat(data[titleField])));
                     props.clearCache(rootCode);
                     tree = utils_1.ArrayUtil.add(treeData, result.data);
                     setTreeData(tree);
@@ -293,10 +293,10 @@ var _Actiontree = (0, react_1.forwardRef)(function (props, ref) {
                 case 4:
                     resp = _b.sent();
                     if (resp.code != '0') {
-                        antd_1.message.error(txt(Const_1.V.ACT_ADD_FAIL_NAMED, "".concat(objectName, " : ").concat(data[titleField])));
+                        antd_1.message.error(txt(_i18n_1.V.ACT_ADD_FAIL_NAMED, "".concat(objectName, " : ").concat(data[titleField])));
                         return [2 /*return*/];
                     }
-                    antd_1.message.success(txt(Const_1.V.ACT_ADD_SUCCESS_NAMED, "".concat(objectName, " : ").concat(data[titleField])));
+                    antd_1.message.success(txt(_i18n_1.V.ACT_ADD_SUCCESS_NAMED, "".concat(objectName, " : ").concat(data[titleField])));
                     arr.push(resp.data);
                     props.clearCache(node[keyField]);
                     lodash_1.default.set(tree, rootPath, arr);
@@ -414,10 +414,10 @@ var _Actiontree = (0, react_1.forwardRef)(function (props, ref) {
                     resps = _m.sent();
                     resp = resps[0];
                     if (resp.code != '0') {
-                        antd_1.message.error(txt(Const_1.V.ACT_ADD_FAIL_NAMED, "".concat(objectName, " : ").concat(data[titleField])));
+                        antd_1.message.error(txt(_i18n_1.V.ACT_ADD_FAIL_NAMED, "".concat(objectName, " : ").concat(data[titleField])));
                         return [2 /*return*/];
                     }
-                    antd_1.message.success(txt(Const_1.V.ACT_ADD_SUCCESS_NAMED, "".concat(objectName, " : ").concat(data[titleField])));
+                    antd_1.message.success(txt(_i18n_1.V.ACT_ADD_SUCCESS_NAMED, "".concat(objectName, " : ").concat(data[titleField])));
                     arr = utils_1.ArrayUtil.add(arr, resp.data);
                     if (canSort) {
                         arr = lodash_1.default.orderBy(arr, sortField, 'asc');
@@ -464,7 +464,7 @@ var _Actiontree = (0, react_1.forwardRef)(function (props, ref) {
                 case 1:
                     resp = _a.sent();
                     if (resp.code != '0') {
-                        antd_1.message.error(txt(Const_1.V.ACT_UPDATE_FAIL_NAMED, "".concat(objectName, " : ").concat(data[titleField])));
+                        antd_1.message.error(txt(_i18n_1.V.ACT_UPDATE_FAIL_NAMED, "".concat(objectName, " : ").concat(data[titleField])));
                         return [2 /*return*/];
                     }
                     root = lodash_1.default.concat([], position);
@@ -475,7 +475,7 @@ var _Actiontree = (0, react_1.forwardRef)(function (props, ref) {
                         nodePath = root.map(function (i) { return "[".concat(i, "]"); }).join('.children');
                         rootPath = nodePath + '.children';
                     }
-                    antd_1.message.success(txt(Const_1.V.ACT_UPDATE_SUCCESS_NAMED, "".concat(objectName, " : ").concat(data[titleField])));
+                    antd_1.message.success(txt(_i18n_1.V.ACT_UPDATE_SUCCESS_NAMED, "".concat(objectName, " : ").concat(data[titleField])));
                     node = lodash_1.default.get(tree, "".concat(rootPath, "[").concat(idx, "]"));
                     if (node) {
                         props.clearCache(lodash_1.default.get(node, parentField));
@@ -515,7 +515,7 @@ var _Actiontree = (0, react_1.forwardRef)(function (props, ref) {
                 case 1:
                     resp = _a.sent();
                     if (resp.code != '0') {
-                        antd_1.message.error(txt(Const_1.V.ACT_DELETE_FAIL_NAMED, "".concat(objectName, " : ").concat(node[titleField])));
+                        antd_1.message.error(txt(_i18n_1.V.ACT_DELETE_FAIL_NAMED, "".concat(objectName, " : ").concat(node[titleField])));
                         return [2 /*return*/];
                     }
                     props.clearCache(node[parentField]);
@@ -527,7 +527,7 @@ var _Actiontree = (0, react_1.forwardRef)(function (props, ref) {
                         tree = utils_1.ArrayUtil.del(tree, node[keyField], keyField);
                     }
                     setTreeData(tree);
-                    antd_1.message.success(txt(Const_1.V.ACT_DELETE_SUCCESS_NAMED, "".concat(objectName, " : ").concat(node[titleField])));
+                    antd_1.message.success(txt(_i18n_1.V.ACT_DELETE_SUCCESS_NAMED, "".concat(objectName, " : ").concat(node[titleField])));
                     return [2 /*return*/];
             }
         });
@@ -565,7 +565,7 @@ var _Actiontree = (0, react_1.forwardRef)(function (props, ref) {
                 case 1:
                     resp = _c.sent();
                     if (resp[0].code != '0' || resp[1].code != '0') {
-                        antd_1.message.error(txt(Const_1.V.TREE_SORT_FAIL));
+                        antd_1.message.error(txt(_i18n_1.V.TREE_SORT_FAIL));
                         return [2 /*return*/];
                     }
                     props.clearCache(node[parentField]);
@@ -576,7 +576,7 @@ var _Actiontree = (0, react_1.forwardRef)(function (props, ref) {
                         tree = lodash_1.default.orderBy(tree, sortField, 'asc');
                     }
                     setTreeData(tree);
-                    antd_1.message.success(txt(Const_1.V.TREE_SORT_SUCCESS));
+                    antd_1.message.success(txt(_i18n_1.V.TREE_SORT_SUCCESS));
                     return [2 /*return*/];
             }
         });
@@ -614,7 +614,7 @@ var _Actiontree = (0, react_1.forwardRef)(function (props, ref) {
                 case 1:
                     resp = _c.sent();
                     if (resp[0].code != '0' || resp[1].code != '0') {
-                        antd_1.message.error(txt(Const_1.V.TREE_SORT_FAIL));
+                        antd_1.message.error(txt(_i18n_1.V.TREE_SORT_FAIL));
                         return [2 /*return*/];
                     }
                     props.clearCache(node[parentField]);
@@ -625,7 +625,7 @@ var _Actiontree = (0, react_1.forwardRef)(function (props, ref) {
                         tree = lodash_1.default.orderBy(tree, sortField, 'asc');
                     }
                     setTreeData(tree);
-                    antd_1.message.success(txt(Const_1.V.TREE_SORT_SUCCESS));
+                    antd_1.message.success(txt(_i18n_1.V.TREE_SORT_SUCCESS));
                     return [2 /*return*/];
             }
         });
@@ -683,7 +683,7 @@ var _Actiontree = (0, react_1.forwardRef)(function (props, ref) {
         props.children,
         react_1.default.createElement(UFormModal_1.UFormModal, __assign({ title: modals.modalState.isEdit ? react_1.default.createElement("span", null,
                 " ",
-                txt(Const_1.V.ACT_UPDATE),
+                txt(_i18n_1.V.ACT_UPDATE),
                 action.objectName,
                 " : ",
                 react_1.default.createElement("b", null, modals.modalState.data[treeState.titleField])) : ADD_TITLE() }, modals.modalState.modalProps, { fields: FIELDS.current, default: getDefault(), onOk: function (data) {
@@ -715,37 +715,37 @@ var getActionParam = function (node, position, state, search, disabledNode, fold
         if (!canSort || !canAddRoot && isRoot) {
             actions.push(react_1.default.createElement(Dropdown_1.Dropdown, { trigger: ["click"], menu: {
                     items: [
-                        { label: txt(Const_1.V.TREE_INSERT_INNER), onClick: function (evt) { return utils_1.PageUtil.stopEvent(evt.domEvent, function () { return context.showAdd(INSER_POS.INNER, node, position); }); }, key: 'addInner' },
+                        { label: txt(_i18n_1.V.TREE_INSERT_INNER), onClick: function (evt) { return utils_1.PageUtil.stopEvent(evt.domEvent, function () { return context.showAdd(INSER_POS.INNER, node, position); }); }, key: 'addInner' },
                     ]
                 } },
-                react_1.default.createElement("span", { onClick: function (e) { return utils_1.PageUtil.stopEvent(e); }, className: "vicon vicon-plus vicon-clickable", title: txt(Const_1.V.ACT_ADD) + ' ' + txt(Const_1.V.TREE_NODE) })));
+                react_1.default.createElement("span", { onClick: function (e) { return utils_1.PageUtil.stopEvent(e); }, className: "vicon vicon-plus vicon-clickable", title: txt(_i18n_1.V.ACT_ADD) + ' ' + txt(_i18n_1.V.TREE_NODE) })));
         }
         else {
             actions.push(react_1.default.createElement(Dropdown_1.Dropdown, { trigger: ["click"], menu: {
                     items: [
-                        { label: txt(Const_1.V.TREE_INSERT_INNER), onClick: function (evt) { return utils_1.PageUtil.stopEvent(evt.domEvent, function () { return context.showAdd(INSER_POS.INNER, node, position); }); }, key: 'addInner' },
-                        { label: txt(Const_1.V.TREE_INSERT_BEFORE), onClick: function (evt) { return utils_1.PageUtil.stopEvent(evt.domEvent, function () { return context.showAdd(INSER_POS.BEFORE, node, position); }); }, key: 'addBefore' },
-                        { label: txt(Const_1.V.TREE_INSERT_AFTER), onClick: function (evt) { return utils_1.PageUtil.stopEvent(evt.domEvent, function () { return context.showAdd(INSER_POS.AFTER, node, position); }); }, key: 'addAfter' },
+                        { label: txt(_i18n_1.V.TREE_INSERT_INNER), onClick: function (evt) { return utils_1.PageUtil.stopEvent(evt.domEvent, function () { return context.showAdd(INSER_POS.INNER, node, position); }); }, key: 'addInner' },
+                        { label: txt(_i18n_1.V.TREE_INSERT_BEFORE), onClick: function (evt) { return utils_1.PageUtil.stopEvent(evt.domEvent, function () { return context.showAdd(INSER_POS.BEFORE, node, position); }); }, key: 'addBefore' },
+                        { label: txt(_i18n_1.V.TREE_INSERT_AFTER), onClick: function (evt) { return utils_1.PageUtil.stopEvent(evt.domEvent, function () { return context.showAdd(INSER_POS.AFTER, node, position); }); }, key: 'addAfter' },
                     ]
                 } },
-                react_1.default.createElement("span", { onClick: function (e) { return utils_1.PageUtil.stopEvent(e); }, className: "vicon vicon-plus vicon-clickable", title: txt(Const_1.V.ACT_ADD) + ' ' + txt(Const_1.V.TREE_NODE) })));
+                react_1.default.createElement("span", { onClick: function (e) { return utils_1.PageUtil.stopEvent(e); }, className: "vicon vicon-plus vicon-clickable", title: txt(_i18n_1.V.ACT_ADD) + ' ' + txt(_i18n_1.V.TREE_NODE) })));
         }
     }
     if (canUpdateRoot || (canUpdate && !isRoot)) {
-        actions.push(react_1.default.createElement(Icon_1.Icon, { type: "edit", title: txt(Const_1.V.ACT_UPDATE_TITLE_NAMED, node[state.titleField]), onClick: function () { return context.showEdit(node, position); } }));
+        actions.push(react_1.default.createElement(Icon_1.Icon, { type: "edit", title: txt(_i18n_1.V.ACT_UPDATE_TITLE_NAMED, node[state.titleField]), onClick: function () { return context.showEdit(node, position); } }));
     }
     if (canSort) {
         var idx = position[position.length - 1];
         if (idx > 0) {
-            actions.push(react_1.default.createElement(Icon_1.Icon, { type: "arrow-up", title: txt(Const_1.V.ACT_UPDATE_TITLE_NAMED, node[state.titleField]), onClick: function () { return context.up(node, position); } }));
+            actions.push(react_1.default.createElement(Icon_1.Icon, { type: "arrow-up", title: txt(_i18n_1.V.ACT_UPDATE_TITLE_NAMED, node[state.titleField]), onClick: function () { return context.up(node, position); } }));
         }
         if (idx < (parentLen - 1)) {
-            actions.push(react_1.default.createElement(Icon_1.Icon, { type: "arrow-down", title: txt(Const_1.V.ACT_UPDATE_TITLE_NAMED, node[state.titleField]), onClick: function () { return context.down(node, position); } }));
+            actions.push(react_1.default.createElement(Icon_1.Icon, { type: "arrow-down", title: txt(_i18n_1.V.ACT_UPDATE_TITLE_NAMED, node[state.titleField]), onClick: function () { return context.down(node, position); } }));
         }
     }
     if (canDelete && (!isRoot || canDeleteRoot)) {
-        actions.push(react_1.default.createElement(Popconfirm_1.Popconfirm, { onConfirm: function () { return context.del(node, position); }, title: txt(Const_1.V.ACT_DELETE_CONFIRM, node[state.titleField]) },
-            react_1.default.createElement("span", { onClick: function (e) { return utils_1.PageUtil.stopEvent(e); }, className: "vicon vicon-delete vicon-clickable", title: txt(Const_1.V.ACT_DELETE) + ' ' + node[state.titleField] })));
+        actions.push(react_1.default.createElement(Popconfirm_1.Popconfirm, { onConfirm: function () { return context.del(node, position); }, title: txt(_i18n_1.V.ACT_DELETE_CONFIRM, node[state.titleField]) },
+            react_1.default.createElement("span", { onClick: function (e) { return utils_1.PageUtil.stopEvent(e); }, className: "vicon vicon-delete vicon-clickable", title: txt(_i18n_1.V.ACT_DELETE) + ' ' + node[state.titleField] })));
     }
     if (actions.length) {
         param.title = [param.title, react_1.default.createElement("div", { className: 'c-tree-actions' },
@@ -776,7 +776,7 @@ var renderRoot = function (props, state, context) {
     var search = state.search, treeData = state.treeData;
     if (search.keyword) {
         if (search.match.size == 0)
-            return react_1.default.createElement(antd_1.Tree.TreeNode, { isLeaf: true, title: react_1.default.createElement(antd_1.Empty, { description: txt(Const_1.V.TXT_FIND_NULL, search.word) }), selectable: false, className: "c-tree-empty" });
+            return react_1.default.createElement(antd_1.Tree.TreeNode, { isLeaf: true, title: react_1.default.createElement(antd_1.Empty, { description: txt(_i18n_1.V.TXT_FIND_NULL, search.word) }), selectable: false, className: "c-tree-empty" });
         return renderNodes(props, state, treeData, [], search, context);
     }
     var _a = context.action, canAddRoot = _a.canAddRoot, canAdd = _a.canAdd, canSort = _a.canSort, objectName = _a.objectName;
@@ -787,14 +787,14 @@ var renderRoot = function (props, state, context) {
                         context.showAdd(INSER_POS.TOP, null, [0]);
                     } },
                     react_1.default.createElement(Icon_1.Icon, { type: 'plus' }),
-                    canSort ? txt(Const_1.V.TREE_INSERT_TOP, objectName) : "".concat(txt(Const_1.V.ACT_ADD), " ").concat(objectName)) }),
+                    canSort ? txt(_i18n_1.V.TREE_INSERT_TOP, objectName) : "".concat(txt(_i18n_1.V.ACT_ADD), " ").concat(objectName)) }),
             renderNodes(props, state, treeData, [], search, context),
             canSort && treeData.length > 0 && react_1.default.createElement(antd_1.Tree.TreeNode, { isLeaf: true, className: 'c-tree-add-root', selectable: false, selected: false, checkable: false, expanded: true, title: react_1.default.createElement("a", { onClick: function (evt) {
                         utils_1.PageUtil.stopEvent(evt);
                         context.showAdd(INSER_POS.BOTTOM, null, [0]);
                     } },
                     react_1.default.createElement(Icon_1.Icon, { type: 'plus' }),
-                    canSort ? txt(Const_1.V.TREE_INSERT_BOTTOM, objectName) : "".concat(txt(Const_1.V.ACT_ADD), " ").concat(objectName)) }));
+                    canSort ? txt(_i18n_1.V.TREE_INSERT_BOTTOM, objectName) : "".concat(txt(_i18n_1.V.ACT_ADD), " ").concat(objectName)) }));
     }
     else if (canAdd && treeData.length == 1) {
         // 说明 兼容树业务：有些项目技术上使用一个根节点，
@@ -808,12 +808,12 @@ var renderRoot = function (props, state, context) {
                     } },
                     react_1.default.createElement(Icon_1.Icon, { type: 'plus' }),
                     " ",
-                    (canSort && childs_1.length > 0) ? txt(Const_1.V.TREE_INSERT_TOP, objectName) : "".concat(txt(Const_1.V.ACT_ADD), " ").concat(objectName)) }),
+                    (canSort && childs_1.length > 0) ? txt(_i18n_1.V.TREE_INSERT_TOP, objectName) : "".concat(txt(_i18n_1.V.ACT_ADD), " ").concat(objectName)) }),
             renderNodes(props, state, childs_1, [0], search, context),
             canSort && childs_1.length > 0 && react_1.default.createElement(antd_1.Tree.TreeNode, { isLeaf: true, className: 'c-tree-add-root', selectable: false, selected: false, checkable: false, expanded: true, title: react_1.default.createElement("a", { onClick: function (evt) {
                         utils_1.PageUtil.stopEvent(evt);
                         context.showAdd(INSER_POS.BOTTOM, null, [0, childs_1.length - 1]);
-                    } }, canSort ? txt(Const_1.V.TREE_INSERT_BOTTOM, objectName) : "".concat(txt(Const_1.V.ACT_ADD), " ").concat(objectName)) }));
+                    } }, canSort ? txt(_i18n_1.V.TREE_INSERT_BOTTOM, objectName) : "".concat(txt(_i18n_1.V.ACT_ADD), " ").concat(objectName)) }));
     }
     return renderNodes(props, state, treeData, [], search, context);
 };

package/components/Trees/STree.js

@@ -69,7 +69,7 @@ var antd_1 = require("antd");
 var BaseTree_1 = require("./BaseTree");
 var TreeUtil_1 = require("../../utils/TreeUtil");
 var utils_1 = require("../../utils");
-var Const_1 = require("../_setup/Const");
+var _i18n_1 = require("../_i18n");
 /**
  * 静态树
  * CRUD        ：  不支持
@@ -124,7 +124,7 @@ var renderNodes = function (data, position, state, search, disabledNode, folderC
 var renderRoot = function (props, state) {
     var search = state.search;
     if (search.keyword && search.match.size == 0) {
-        return react_1.default.createElement(antd_1.Tree.TreeNode, { isLeaf: true, title: react_1.default.createElement(antd_1.Empty, { description: utils_1.i18n.txt(Const_1.V.TXT_FIND_NULL, search.word) }), selectable: false, className: "c-tree-empty" });
+        return react_1.default.createElement(antd_1.Tree.TreeNode, { isLeaf: true, title: react_1.default.createElement(antd_1.Empty, { description: utils_1.i18n.txt(_i18n_1.V.TXT_FIND_NULL, search.word) }), selectable: false, className: "c-tree-empty" });
     }
     return state.treeData.map(function (node, idx) { return renderNode(node, [idx], state, search, props.disabledNode, props.folderChecker); });
 };

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/UFormModal.js

@@ -81,7 +81,7 @@ var Popconfirm_1 = require("../_adapt/Popconfirm");
 var Button_1 = require("../_adapt/Button");
 var UForm_1 = require("./UForm");
 var utils_1 = require("../../utils");
-var Const_1 = require("../_setup/Const");
+var _i18n_1 = require("../_i18n");
 var FormWrapper_1 = require("./FormWrapper");
 var FORM_FIELDS = ['layout', 'fields', 'groupType', 'isEdit', 'tip', 'default', 'data', 'mode', 'size'];
 var UFormModal = function (props) {
@@ -130,10 +130,10 @@ var UFormModal = function (props) {
             }
         }
         if (name_1) {
-            modalProps.title = utils_1.i18n.txt(isAdd ? Const_1.V.ACT_ADD_TITLE_NAMED : Const_1.V.ACT_UPDATE_TITLE_NAMED, name_1);
+            modalProps.title = utils_1.i18n.txt(isAdd ? _i18n_1.V.ACT_ADD_TITLE_NAMED : _i18n_1.V.ACT_UPDATE_TITLE_NAMED, name_1);
         }
         else {
-            modalProps.title = utils_1.i18n.txt(isAdd ? Const_1.V.ACT_ADD_TITLE : Const_1.V.ACT_UPDATE_TITLE);
+            modalProps.title = utils_1.i18n.txt(isAdd ? _i18n_1.V.ACT_ADD_TITLE : _i18n_1.V.ACT_UPDATE_TITLE);
         }
     }
     if (props.buttons && props.buttons.length) {