uepay-ops2 4.0.13 → 4.0.15-beta.1

package/lib/components/layout.js

@@ -15,24 +15,20 @@ var _en_US = _interopRequireDefault(require("antd/lib/locale-provider/en_US"));
 
 var _zh_TW = _interopRequireDefault(require("antd/lib/locale-provider/zh_TW"));
 
-var _sider = _interopRequireDefault(require("./layout/sider"));
+var _menuAble = _interopRequireDefault(require("./layout/menuAble"));
 
-var _header = _interopRequireDefault(require("./layout/header"));
+var _single = _interopRequireDefault(require("./layout/single"));
 
 var _context = require("./locale/context");
 
 var _withOptions = _interopRequireDefault(require("./auth/withOptions"));
 
-var _multiPage = _interopRequireDefault(require("./layout/multiPage"));
+var _ctx = require("../data/ctx");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
-const {
-  Footer,
-  Content
-} = _antd.Layout;
 /**
  * 布局组件
  * @param props
@@ -43,25 +39,13 @@ const {
  * @return {*}
  * @constructor
  */
-
 class LayoutExt extends _react.default.Component {
   constructor() {
     super(...arguments);
 
     _defineProperty(this, "state", {
-      collapsed: false,
       locale: 'cn'
     });
-
-    _defineProperty(this, "els", {});
-
-    _defineProperty(this, "comps", []);
-
-    _defineProperty(this, "handleCollapse", collapsed => {
-      this.setState((state, props) => ({
-        collapsed: !state.collapsed
-      }));
-    });
   }
 
   render() {
@@ -72,33 +56,19 @@ class LayoutExt extends _react.default.Component {
       locale,
       onLogin
     } = this.props,
-          {
-      collapsed
-    } = this.state,
-          isCn = 'cn' === locale.value;
+          isCn = 'cn' === locale.value,
+          PageComp = pageProps && pageProps.opt === _ctx.PageOptType.new && _single.default || _menuAble.default;
     return /*#__PURE__*/_react.default.createElement(_antd.ConfigProvider, {
       locale: isCn ? _zh_TW.default : _en_US.default
     }, /*#__PURE__*/_react.default.createElement(_context.LocaleProvider, {
       value: locale
-    }, /*#__PURE__*/_react.default.createElement(_antd.Layout, {
-      className: "uepay-ops-layout",
-      hasSider: true
-    }, /*#__PURE__*/_react.default.createElement(_sider.default, {
-      collapsed: collapsed
-    }), /*#__PURE__*/_react.default.createElement(_antd.Layout, null, /*#__PURE__*/_react.default.createElement(_header.default, {
-      collapsed: collapsed,
-      onCollapse: this.handleCollapse,
+    }, /*#__PURE__*/_react.default.createElement(PageComp, {
       locale: locale,
       onLocale: onLocale,
-      onLogin: onLogin
-    }), /*#__PURE__*/_react.default.createElement(Content, {
-      className: "ops-content"
-    }, /*#__PURE__*/_react.default.createElement(_multiPage.default, {
       Component: Component,
-      pageProps: pageProps
-    })), /*#__PURE__*/_react.default.createElement(Footer, {
-      className: "ops-footer"
-    }, "Power by Uepay Technology")))));
+      pageProps: pageProps,
+      onLogin: onLogin
+    })));
   }
 
 }
@@ -113,41 +83,4 @@ LayoutExt.propTypes = {
 
 var _default = (0, _withOptions.default)()(LayoutExt);
 
-exports.default = _default;
-const Hide = {
-  display: 'none'
-},
-      Show = {
-  display: 'block'
-};
-/**
- *
- * @param props.children 要渲染的子组件
- * @param props.show 数据显示或关闭
- * @return {*}
- * @constructor
- */
-
-class CompWrapper extends _react.default.Component {
-  constructor() {
-    super(...arguments);
-
-    _defineProperty(this, "show", false);
-
-    this.show = this.props.show;
-  }
-
-  setIsShow(show) {
-    this.show = show;
-  }
-
-  render() {
-    const {
-      children
-    } = this.props;
-    return /*#__PURE__*/_react.default.createElement("div", {
-      style: this.show ? Show : Hide
-    }, children);
-  }
-
-}
+exports.default = _default;

package/lib/components/locale/withLocale.js

@@ -58,6 +58,7 @@ const withLocale = function withLocale() {
 
     }
 
+    Wrapper.tabName = Comp.tabName;
     Wrapper.displayName = "withLocale(".concat((0, _tool.getDisplayName)(Comp), ")");
     return Wrapper;
   };

package/lib/data/appUrl.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.logout = exports.login = exports.getSts = exports.getMenus = exports.getLoginConfig = exports.getCollectById = exports.getBpmForm = exports.checkLogin = exports.changePassword = exports.captcha = void 0;
+exports.logout = exports.login = exports.getSts = exports.getMenus = exports.checkLogin = exports.changePassword = exports.captcha = void 0;
 
 var _ctx = require("./ctx");
 
@@ -40,18 +40,6 @@ exports.getSts = getSts;
 const getMenus = () => {
   return (0, _net.get)("".concat((0, _ctx.getHost)(), "/api/uepay/assist/authority/runtimeserver/identitymgr/tree/menu/"));
 };
-/**
- * 獲取當前登錄配置
- * 密码：password；动态码：googleAuth；短信：sms
- * @returns {Promise<Response>}
- */
-
-
-exports.getMenus = getMenus;
-
-const getLoginConfig = () => {
-  return (0, _net.get)("".concat((0, _ctx.getHost)(), "/api/uepay/assist/authority/runtimeserver/identitymgr/token/way"));
-};
 /**
  * 登陸接口
  * @param account 用戶名
@@ -61,7 +49,7 @@ const getLoginConfig = () => {
  */
 
 
-exports.getLoginConfig = getLoginConfig;
+exports.getMenus = getMenus;
 
 const login = (account, password, captcha) => {
   let params = {
@@ -122,34 +110,5 @@ const changePassword = (oldPasswd, newPasswd, verifyPasswd, captcha) => {
   };
   return (0, _net.post)("".concat((0, _ctx.getHost)(), "/api/authority/service/usr/passwd"), params);
 };
-/**
- * 获取流程表单
- * @param insId 流程实例ID
- * @return {Promise<Response>}
- *
- */
-
-
-exports.changePassword = changePassword;
-
-const getBpmForm = insId => {
-  return (0, _net.get)("".concat((0, _ctx.getHost)(), "/api/pbm/execute/usr/form?ins=").concat(insId));
-};
-/**
- *
- * @param host
- * @param collectId
- * @return {Promise<Response>}
- */
-
-
-exports.getBpmForm = getBpmForm;
-
-const getCollectById = _ref => {
-  let {
-    collectId
-  } = _ref;
-  return (0, _net.get)("".concat((0, _ctx.getHost)(), "/data/mesh/execute/collect?collectId=").concat(collectId));
-};
 
-exports.getCollectById = getCollectById;
+exports.changePassword = changePassword;

package/lib/data/ctx.d.ts

@@ -0,0 +1,37 @@
+/**
+ * 获取服务后台地址
+ */
+export function getHost(): string;
+
+/**
+ * 获取鉴权中心的地址
+ */
+export function getServerUrl(): string;
+
+/**
+ * 获取流程表单页面地址
+ */
+export function getBpmFormPage(insId: string | number): string;
+
+/**
+ * 获取项目中文名称
+ */
+export function getTitleCn(): string;
+
+/**
+ * 获取项目英文名
+ */
+export function getTitleEn(): string;
+
+/**
+ * 获取项目中的配置
+ * @param key 配置项的key
+ */
+export function get(key?: string | boolean): any;
+
+/**
+ * 用于网页打开的的指向参数。
+ * origin表示在原页面上打开多窗口
+ * new表示打开一个新的窗口
+ */
+export const PageOptType: { origin: "origin", new: "new" };

package/lib/data/ctx.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getTitleEn = exports.getTitleCn = exports.getServerUrl = exports.getModuleId = exports.getHost = exports.get = exports.default = void 0;
+exports.getTitleEn = exports.getTitleCn = exports.getServerUrl = exports.getHost = exports.getBpmFormPage = exports.get = exports.default = exports.PageOptType = void 0;
 
 var _config = _interopRequireDefault(require("next/config"));
 
@@ -33,15 +33,16 @@ const getServerUrl = () => {
   return config['module.server.url'];
 };
 /**
- * 获取当前的模块编号
+ * 构建跳转对应流程表单的URL
+ * @param insId {string|number} 流程实例Id
  * @return {*}
  */
 
 
 exports.getServerUrl = getServerUrl;
 
-const getModuleId = () => {
-  return config['module.current.id'];
+const getBpmFormPage = insId => {
+  return "".concat(config['module.bpm.form_page'], "?insId=").concat(insId);
 };
 /**
  * 获取项目中文名称
@@ -49,7 +50,7 @@ const getModuleId = () => {
  */
 
 
-exports.getModuleId = getModuleId;
+exports.getBpmFormPage = getBpmFormPage;
 
 const getTitleCn = () => {
   return config['module.current.title_cn'];
@@ -77,15 +78,27 @@ const get = function get() {
   let key = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
   return key ? config[key] : config;
 };
+/**
+ * Page的操作頁面
+ * @type {{origin: string, new_window: string}}
+ */
+
 
 exports.get = get;
+const PageOptType = {
+  origin: 'origin',
+  //原窗口控制
+  new: 'new' //新窗口
+
+};
+exports.PageOptType = PageOptType;
 const Ctx = {
   getHost,
   getServerUrl,
-  getModuleId,
   getTitleCn,
   getTitleEn,
-  get
+  get,
+  PageOptType
 };
 var _default = Ctx;
 exports.default = _default;

package/lib/util/net.d.ts

@@ -0,0 +1,25 @@
+/**
+ * get請求方法
+ */
+export function get(url: string, headers?: object): Promise<Response>;
+
+/**
+ * post請求方法
+ */
+export function post(url: string, params: object, headers?: object): Promise<Response>;
+
+/**
+ * put請求方法
+ */
+export function put(url: string, params: object, headers?: object): Promise<Response>;
+
+/**
+ * patch請求方法
+ */
+export function patch(url: string, params: object, headers?: object): Promise<Response>;
+
+/**
+ * remove請求方法
+ */
+export function remove(url: string, params?: object, headers?: object): Promise<Response>;
+

package/lib/util/net.js

@@ -15,24 +15,23 @@ var _cookie = _interopRequireDefault(require("cookie"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
+function onCatchError(e) {
+  console.error(e);
+}
 /**
  * get请求，
  * @param url {String} 访问地址的url
  * @param headers {Object} 附加頭部參數
  * @return {Promise<Response>}
  */
-const get = function get(url) {
-  let headers = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-  const innerHeaders = {
-    'Content-Type': 'application/json'
-  };
+
+
+const get = (url, headers) => {
   return fetch(url, {
     method: 'GET',
     mode: "cors",
     headers: buildHeaders(headers)
-  }).then(res => onRes(res)).catch(function (error) {
-    console.log('Fetch Error: ', error.message);
-  });
+  }).then(res => onRes(res)).catch(onCatchError);
 };
 /**
  * post请求，表示新增数据
@@ -45,21 +44,8 @@ const get = function get(url) {
 
 exports.get = get;
 
-const post = function post(url, params) {
-  let headers = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
-
-  if (params) {
-    return fetch(url, {
-      method: 'POST',
-      mode: "cors",
-      body: JSON.stringify(params),
-      headers: buildHeaders(headers)
-    }).then(res => onRes(res)).catch(function (error) {
-      console.log('Fetch Error: ', error.message);
-    });
-  } else {
-    throw "必须设置Post传递参数的值";
-  }
+const post = (url, params, headers) => {
+  return request('POST', url, params, headers);
 };
 /**
  * put请求，表示修改数据
@@ -72,21 +58,8 @@ const post = function post(url, params) {
 
 exports.post = post;
 
-const put = function put(url, params) {
-  let headers = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
-
-  if (params) {
-    return fetch(url, {
-      method: 'PUT',
-      mode: "cors",
-      body: JSON.stringify(params),
-      headers: buildHeaders(headers)
-    }).then(res => onRes(res)).catch(function (error) {
-      console.log('Fetch Error: ', error.message);
-    });
-  } else {
-    throw "必须设置Put传递参数的值";
-  }
+const put = (url, params, headers) => {
+  return request('PUT', url, params, headers);
 };
 /**
  * patch请求，表示修改数据
@@ -99,25 +72,13 @@ const put = function put(url, params) {
 
 exports.put = put;
 
-const patch = function patch(url, params) {
-  let headers = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
-
-  if (params) {
-    return fetch(url, {
-      method: 'PATCH',
-      mode: "cors",
-      body: JSON.stringify(params),
-      headers: buildHeaders(headers)
-    }).then(res => onRes(res)).catch(function (error) {
-      console.log('Fetch Error: ', error.message);
-    });
-  } else {
-    throw "必须设置Patch传递参数的值";
-  }
+const patch = (url, params, headers) => {
+  return request('PATCH', url, params, headers);
 };
 /**
  * delete请求，表示修改数据
  * @param url {String} 访问地址的url
+ * @param params {Object} 附加頭部參數
  * @param headers {Object} 附加頭部參數
  * @return {Promise<Response>}
  */
@@ -125,16 +86,35 @@ const patch = function patch(url, params) {
 
 exports.patch = patch;
 
-const remove = function remove(url) {
-  let headers = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-  return fetch(url, {
-    method: 'DELETE',
-    mode: "cors",
-    headers: buildHeaders(headers)
-  }).then(res => onRes(res)).catch(function (error) {
-    console.log('Fetch Error: ', error.message);
-  });
+const remove = (url, params, headers) => {
+  return request('DELETE', url, params, headers);
 };
+/**
+ * fetch请求方式
+ * @param method {String} 请求方法
+ * @param url {String} 访问地址的url
+ * @param params {Object} 附加頭部參數
+ * @param headers {Object} 附加頭部參數
+ * @returns {Promise<Response>}
+ */
+
+
+exports.remove = remove;
+
+function request(method, url, params, headers) {
+  if (!url) {
+    return new Promise((suc, err) => {
+      err("".concat(method, " Method Must Support url"));
+    });
+  } else {
+    return fetch(url, {
+      method: method,
+      mode: "cors",
+      body: JSON.stringify(params),
+      headers: buildHeaders(headers)
+    }).then(res => onRes(res)).catch(onCatchError);
+  }
+}
 /**
  * 处理返回数据
  * @param res
@@ -142,8 +122,6 @@ const remove = function remove(url) {
  */
 
 
-exports.remove = remove;
-
 const onRes = res => {
   if (res && res.ok) {
     const _token = res.headers.get('Token'),
@@ -179,19 +157,19 @@ const buildHeaders = function buildHeaders() {
         menu = (0, _authRoute.getCurMenu)();
 
   return Object.assign({
-    Authorization: parseMesh(menu.path) || 'UePay',
+    Authorization: parsePath(menu.path),
     'Content-Type': 'application/json',
     Token: _token2.token.get() || 'UePay',
     STS: _c.sts
   }, headers);
 };
 /**
- * 解析提取mesh字符塊
+ * 解析提取相关的URL信息，如果没有指向当前菜单则获取浏览器Path
  * @param path {String}
  */
 
 
-const parseMesh = path => {
+const parsePath = path => {
   if (path) {
     let pos = -1;
 
@@ -201,5 +179,7 @@ const parseMesh = path => {
     } else {
       return btoa(path);
     }
+  } else {
+    return btoa(window.location.pathname);
   }
 };

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "uepay-ops2",
-    "version": "4.0.13",
+    "version": "4.0.15-beta.1",
     "description": "",
     "main": "index.js",
     "typings": "index.d.ts",
@@ -30,6 +30,7 @@
         "moment": "^2.24.0"
     },
     "devDependencies": {
+        "antd": "^4.5.1",
         "core-js": "^2.6.11",
         "@zeit/next-css": "^1.0.1",
         "@zeit/next-sass": "^1.0.1",
@@ -45,7 +46,6 @@
         "react": "^16.12.0",
         "react-dom": "^16.12.0",
         "@ant-design/icons": "^4.2.1",
-        "antd": "^4.5.1",
-        "uepay-mesh": "^4.0.19"
+        "uepay-mesh": "^4.0.1"
     }
 }

package/styles.css

@@ -19,8 +19,10 @@ html {
 }
 
 .ant-tabs-tabpane {
+    position: relative;
+    display: flex;
     height: 100%;
-    overflow-y: auto;
+    flex-direction: column;
 }
 
 /*frame*/
@@ -52,7 +54,7 @@ html {
     align-items: center;
 }
 
-.uepay-ops-header .usr-setting{
+.uepay-ops-header .usr-setting {
     width: 100%;
     height: 100%;
     background-color: rgba(0, 0, 0, 0.5);
@@ -72,14 +74,14 @@ html {
 }
 
 .uepay-ops-header .usr-setting-title {
-    padding: 15px 0 ;
+    padding: 15px 0;
     margin: 0 20px;
     font-size: 18px;
     border-bottom: 1px solid #ccc;
 }
 
 .uepay-ops-header .usr-setting-form {
-    padding:40px 20px 10px 20px;
+    padding: 40px 20px 10px 20px;
 }
 
 .uepay-ops-header #uepay-frame-avatar {
@@ -167,6 +169,13 @@ html {
     padding: 4px;
 }
 
+.uepay-ops-layout-single {
+    height: 100%;
+    width: 100%;
+    overflow-y: auto;
+    padding: .5rem 1rem;
+}
+
 /*login*/
 .uepay-ops-user-global {
     cursor: pointer;
@@ -184,7 +193,7 @@ html {
     height: 100%;
 }
 
-.uepay-ops-login{
+.uepay-ops-login {
     display: flex;
     justify-content: center;
     align-items: center;
@@ -192,38 +201,38 @@ html {
     background: #f3f3f3;
 }
 
-.uepay-ops-login .login-form{
+.uepay-ops-login .login-form {
     width: 320px;
     padding: 36px;
     box-shadow: 0 0 100px rgba(0, 0, 0, 0.08);
     background: #fff;
 }
 
-.uepay-ops-login .login-logo{
+.uepay-ops-login .login-logo {
     width: 100%;
     height: 40px;
 }
 
-.uepay-ops-login .login-name{
+.uepay-ops-login .login-name {
     line-height: 40px;
     text-align: center;
     padding-left: 15px;
     font-size: 20px;
 }
 
-.uepay-ops-login .login-btn{
+.uepay-ops-login .login-btn {
     width: 100%;
 }
 
 /*captcha*/
-.uepay-ops-captcha{
+.uepay-ops-captcha {
     position: relative;
     width: 60px;
     height: 20px;
     cursor: pointer;
 }
 
-.uepay-ops-captcha .ops-spin{
+.uepay-ops-captcha .ops-spin {
     position: absolute;
     padding-top: 2px;
     padding-left: 22px;
@@ -232,7 +241,7 @@ html {
     background-color: #fff;
 }
 
-.uepay-ops-captcha img{
+.uepay-ops-captcha img {
     display: block;
     width: 100%;
     height: 100%;