vap1 0.3.0 → 0.3.2

package/components/Box/Box.js

@@ -156,7 +156,7 @@ exports.Box = (0, react_1.forwardRef)(function (props, ref) {
         setTimeout(resize, 5);
     }, []);
     return react_1.default.createElement(Layout_1.Layout, { id: domId, className: utils_1.StringUtil.className(className, props.className), style: style, ref: _layoutRef },
-        props.selectBar && (0, _register_1.getSelectBar)(props.selectBar.type) != null && react_1.default.createElement(SelectBar_1.SelectBar, __assign({}, props.selectBar, { ref: selectRef, onSelect: function () {
+        props.selectBar && (0, _register_1.getSelectBar)(props.selectBar.type) != null && react_1.default.createElement(SelectBar_1.SelectBar, __assign({}, props.selectBar, { ref: props.selectBar.selectRef ? props.selectBar.selectRef : selectRef, onSelect: function () {
                 var args = [];
                 for (var _a = 0; _a < arguments.length; _a++) {
                     args[_a] = arguments[_a];
@@ -184,7 +184,7 @@ exports.Box = (0, react_1.forwardRef)(function (props, ref) {
                         props.searchBar.onExpand(isExpand);
                     }
                 } }), props.actionBar ? (lodash_1.default.isArray(props.actionBar) ? react_1.default.createElement(SearchBar_1.SearchBar.ActionButtons, { buttons: props.actionBar }) : props.actionBar) : []),
-            react_1.default.createElement(BoxContext.Provider, { value: { state: state, resize: resize, root: contextRef, selectRef: selectRef } },
+            react_1.default.createElement(BoxContext.Provider, { value: { state: state, resize: resize, root: contextRef, selectRef: (props.selectBar && props.selectBar.selectRef) ? props.selectBar.selectRef : selectRef } },
                 react_1.default.createElement("div", { className: 'ubox-content', ref: contextRef }, state != null && props.children)),
             props.pagination && react_1.default.createElement(Upagination_1.UPagination, __assign({}, props.pagination, { className: HEIGHT_OMIT }))));
 });

package/components/Box/SelectBar.d.ts

@@ -56,6 +56,10 @@ type _BoxSelectBarProps = BaseItem & {
      * 边栏状态变更触发
     */
     onSelectCollapse?: (boolean: any) => void;
+    /**
+     * 选择区映射，用于一些特殊场景
+    */
+    selectRef?: React.MutableRefObject<any>;
 };
 /**
  * 说明： 内置 stree/dtree/ftree 三种树类型，和 list 类型

package/components/Box/SelectBar.js

@@ -85,7 +85,7 @@ exports.SelectBar = (0, react_1.forwardRef)(function (props, ref) {
                 return utils_1.Const.NONE;
             }
             // @ts-ignore
-            return react_1.default.createElement(props.content, __assign({}, props, { collapsed: collapsed, searchValue: keyword }));
+            return react_1.default.createElement(props.content, __assign({}, props, { collapsed: collapsed, searchValue: keyword, ref: ref }));
         }
         return react_1.default.createElement(component.component, __assign({}, props, { collapsed: collapsed, searchValue: keyword, ref: ref }));
     };

package/components/Trees/ActionTree.js

@@ -172,6 +172,7 @@ var _Actiontree = (0, react_1.forwardRef)(function (props, ref) {
             action.canSort = true;
     }
     (0, react_1.useImperativeHandle)(ref, function () { return ({
+        getSelected: function () { return treeState.selectedNode; },
         updateData: updateData,
         update: update,
         del: del,
@@ -184,7 +185,7 @@ var _Actiontree = (0, react_1.forwardRef)(function (props, ref) {
             }
             add(data, { pos: INSER_POS.INNER, node: node, position: position });
         }
-    }); }, [treeState.treeData]);
+    }); }, [treeState.treeData, treeState.selectedNode]);
     (0, react_1.useLayoutEffect)(function () {
         if (props.formFields) {
             FIELDS.current = props.formFields;

package/components/Trees/index.d.ts

@@ -128,4 +128,5 @@ export type ActionTreeRef = {
     update: (node: PlainObject, pos: number[]) => Promise<void>;
     del: (node: PlainObject, pos: number[]) => Promise<void>;
     add: (node: PlainObject, pos: number[]) => void;
+    getSelected: () => PlainObject;
 };

package/components/Upload/UploadFile.js

@@ -36,7 +36,7 @@ var utils_1 = require("../../utils");
 var useUpload_1 = require("./useUpload");
 var antd_1 = require("antd");
 var Button_1 = require("../_adapt/Button");
-var _i18n_1 = require("../../components/_i18n");
+var _i18n_1 = require("../_i18n");
 var UploadFile = function (props) {
     var _a = __read((0, useUpload_1.useUpload)(props), 2), state = _a[0], onChange = _a[1];
     var uploadProps = (0, useUpload_1.getBaseOptions)(props);

package/components/Upload/UploadImage.js

@@ -71,7 +71,7 @@ var antd_1 = require("antd");
 var Modal_1 = require("../../components/_adapt/Modal");
 var useUpload_1 = require("./useUpload");
 var utils_1 = require("../../utils");
-var _i18n_1 = require("../../components/_i18n");
+var _i18n_1 = require("../_i18n");
 var Icon_1 = require("../../components/_adapt/Icon");
 var hooks_1 = require("../../hooks");
 var getImageUrl = function (uri) {
@@ -82,19 +82,19 @@ var getImageUrl = function (uri) {
     return utils_1.GLOBAL.CONFIG.UPLOAD.PREVIEW + uri;
 };
 var ImagePreview = function (props) {
-    var state = props.state, width = props.width, height = props.height, showPreview = props.showPreview, preview = props.preview;
+    var state = props.state, width = props.width, height = props.height, showPreview = props.showPreview;
     var _a = __read((0, hooks_1.useToggle)(), 2), open = _a[0], show = _a[1];
     var imgUrl = (0, react_1.useMemo)(function () {
-        if (lodash_1.default.isFunction(preview))
-            return preview(state.info);
+        if (lodash_1.default.isFunction(props.preview))
+            return props.preview(state.info);
         if (lodash_1.default.isString(state.info))
             return getImageUrl(state.info);
         return getImageUrl(state.info.guid || state.info.fileId);
-    }, [preview, state.info]);
+    }, [state.info]);
     var divProps = (0, react_1.useMemo)(function () {
         var param = {
             className: 'c-upload-img-preview',
-            style: { width: width, height: height, backgroundImage: "url(".concat(imgUrl, ")"), lineHeight: "".concat(height, "px") },
+            style: { width: width, height: height, backgroundImage: "url(\"".concat(imgUrl, "\")"), lineHeight: "".concat(height, "px") },
         };
         if (showPreview) {
             param.style.cursor = 'pointer';
@@ -104,7 +104,7 @@ var ImagePreview = function (props) {
     }, [imgUrl]);
     return react_1.default.createElement(react_1.default.Fragment, null,
         react_1.default.createElement("div", __assign({}, divProps), showPreview && react_1.default.createElement(Icon_1.Icon, { type: "zoom-in" })),
-        showPreview && react_1.default.createElement(Modal_1.Modal, { className: 'picture-card-preview', style: { top: 0, backgroundImage: "url(".concat(imgUrl, ")") }, open: open, maskClosable: true, width: '100%', footer: null, onCancel: show }));
+        showPreview && react_1.default.createElement(Modal_1.Modal, { className: 'picture-card-preview', style: { top: 0, backgroundImage: "url(\"".concat(imgUrl, "\")") }, open: open, maskClosable: true, width: '100%', footer: null, onCancel: show }));
 };
 var RATIO = 1280 / 1920;
 // 默认排版方式 数量 => span / (行个数为 24/span)
@@ -154,7 +154,9 @@ var BuiltInSelector = function (props) {
         }
         return [MAX_WIDTH, 6];
     }, []), 2), width = _a[0], span = _a[1];
-    return react_1.default.createElement(antd_1.Popover, { overlayClassName: 'c-upload-img-selector', content: react_1.default.createElement(antd_1.Row, { type: "flex", gutter: [GUTTER_H, GUTTER_V], style: { maxWidth: width } }, props.imgs.map(function (src) { return react_1.default.createElement(antd_1.Col, { span: span },
+    return react_1.default.createElement(antd_1.Popover, { overlayClassName: 'c-upload-img-selector', 
+        // visable
+        content: react_1.default.createElement(antd_1.Row, { type: "flex", gutter: [GUTTER_H, GUTTER_V], style: { maxWidth: width } }, props.imgs.map(function (src) { return react_1.default.createElement(antd_1.Col, { span: span },
             react_1.default.createElement("img", { src: utils_1.PageUtil.resolveURL(src), style: { width: props.width, height: props.height }, onClick: function () { return props.onSelect(src); } })); })) },
         react_1.default.createElement("a", null,
             react_1.default.createElement(Icon_1.Icon, { type: 'select' }),
@@ -237,7 +239,7 @@ var UploadImage = function (props) {
             (lodash_1.default.isArray(props.builtIn) && props.builtIn.length > 0) && react_1.default.createElement(BuiltInSelector, { onSelect: onSelect, imgs: props.builtIn, width: width, height: height }));
     }
     return react_1.default.createElement("div", { style: { height: height }, className: 'c-upload-img-root' },
-        react_1.default.createElement(ImagePreview, { state: state, width: width, height: height, showPreview: props.showPreview === false ? false : true }),
+        react_1.default.createElement(ImagePreview, { state: state, width: width, height: height, preview: props.preview, showPreview: props.showPreview === false ? false : true }),
         (lodash_1.default.isArray(props.builtIn) && props.builtIn.length > 0) && react_1.default.createElement(BuiltInSelector, { onSelect: onSelect, imgs: props.builtIn, width: width, height: height }),
         react_1.default.createElement("a", null,
             react_1.default.createElement(Icon_1.Icon, { type: 'upload' }),

package/components/Upload/UploadModal.js

@@ -99,7 +99,7 @@ var antd_1 = require("antd");
 var Alert_1 = require("../_adapt/Alert");
 var Button_1 = require("../_adapt/Button");
 var useUpload_1 = require("./useUpload");
-var _i18n_1 = require("../../components/_i18n");
+var _i18n_1 = require("../_i18n");
 var DEFAULT = { uploading: false, uploaded: false, percent: 0, error: false, };
 var UploadModal = function (props) {
     var _a = __read((0, react_1.useState)(DEFAULT), 2), state = _a[0], setState = _a[1];

package/package.json

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

package/utils/Global.js

@@ -32,7 +32,7 @@ var DEFAULT = {
         USER_INFO: '/api-common/user/info',
         USER_MODULE: '/api-common/preference',
         USER_LOGOUT: '/api-common/user/logout',
-        APP: '/api-common/app',
+        APP: '/api-common/app/private',
         APP_SSO: '/api-common/user/redirect/',
         ORG_ROOT: '/api-common/organization/root',
         ORG_ROOT_INFO: '/api-common/organization/rootinfo',