uepay-ops2 4.0.12 → 4.0.14

package/lib/util/net.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "uepay-ops2",
-    "version": "4.0.12",
+    "version": "4.0.14",
     "description": "",
     "main": "index.js",
     "typings": "index.d.ts",
@@ -30,7 +30,6 @@
         "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",
@@ -46,6 +45,7 @@
         "react": "^16.12.0",
         "react-dom": "^16.12.0",
         "@ant-design/icons": "^4.2.1",
-        "uepay-mesh": "^4.0.1"
+        "antd": "^4.5.1",
+        "uepay-mesh": "^4.0.19"
     }
 }

package/styles.css

@@ -19,10 +19,8 @@ html {
 }
 
 .ant-tabs-tabpane {
-    position: relative;
-    display: flex;
     height: 100%;
-    flex-direction: column;
+    overflow-y: auto;
 }
 
 /*frame*/
@@ -54,7 +52,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);
@@ -74,14 +72,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 {
@@ -169,13 +167,6 @@ html {
     padding: 4px;
 }
 
-.uepay-ops-layout-single {
-    height: 100%;
-    width: 100%;
-    overflow-y: auto;
-    padding: .5rem 1rem;
-}
-
 /*login*/
 .uepay-ops-user-global {
     cursor: pointer;
@@ -193,7 +184,7 @@ html {
     height: 100%;
 }
 
-.uepay-ops-login {
+.uepay-ops-login{
     display: flex;
     justify-content: center;
     align-items: center;
@@ -201,38 +192,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;
@@ -241,7 +232,7 @@ html {
     background-color: #fff;
 }
 
-.uepay-ops-captcha img {
+.uepay-ops-captcha img{
     display: block;
     width: 100%;
     height: 100%;

package/lib/components/applicationLight.js

@@ -1,109 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-
-require("core-js/modules/web.dom.iterable.js");
-
-var _react = _interopRequireWildcard(require("react"));
-
-var _userMgrLayout = _interopRequireDefault(require("./userMgr/userMgrLayout"));
-
-var _loading = _interopRequireDefault(require("./spin/loading"));
-
-var _appUrl = require("../data/appUrl");
-
-var _userInfo = require("./userMgr/userInfo");
-
-var _token = require("../util/token");
-
-var _antd = require("antd");
-
-var _localDefined = _interopRequireDefault(require("../data/localDefined"));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
-function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
-
-const DefaultLocal = typeof window !== 'undefined' ? localStorage.getItem("uepey_locale") : false,
-      LoginState = {
-  Check: 1,
-  Login: 2,
-  LogOut: 3
-};
-
-function ApplicationLight(_ref) {
-  let {
-    Component,
-    pageProps
-  } = _ref;
-  const [login, setLongin] = (0, _react.useState)(LoginState.Check),
-        [local, setLocal] = (0, _react.useState)(DefaultLocal ? JSON.parse(DefaultLocal) : _localDefined.default[0]);
-  (0, _react.useEffect)(() => {
-    (0, _appUrl.checkLogin)().then(res => {
-      let data;
-
-      if (res && 0 < res.code && (data = res.data)) {
-        _userInfo.user.set(data.code, data.name);
-
-        setLongin(LoginState.Login);
-      } else {
-        setLongin(LoginState.LogOut);
-      }
-    });
-  }, []); //登陸狀態控制
-
-  function handleLogin(login) {
-    setLongin(login ? LoginState.Login : LoginState.LogOut);
-  }
-
-  ;
-
-  function handleLocale(local) {}
-
-  ;
-
-  function handLoginOut() {
-    (0, _appUrl.logout)().then(res => {
-      if (res && 0 < res.code) {
-        _token.token.del();
-
-        setLongin(LoginState.LogOut);
-      } else {
-        _antd.message.error(res && res.msg || '网络故障，请稍后再试!');
-      }
-    }).catch(err => {
-      _antd.message.error('网络故障，请稍后再试!');
-
-      console.log(err);
-    });
-  }
-
-  switch (login) {
-    case LoginState.Login:
-      return /*#__PURE__*/_react.default.createElement(Component, _extends({}, pageProps, {
-        onLoginOut: handLoginOut
-      }));
-
-    case LoginState.LogOut:
-      return /*#__PURE__*/_react.default.createElement(_userMgrLayout.default, {
-        waySignList: [],
-        onLogin: handleLogin,
-        onLocale: handleLocale,
-        locale: local
-      });
-
-    case LoginState.Check:
-    default:
-      return /*#__PURE__*/_react.default.createElement(_loading.default, null);
-  }
-}
-
-var _default = ApplicationLight;
-exports.default = _default;

package/lib/components/client.d.ts

@@ -1,6 +0,0 @@
-import * as React from "react";
-
-interface Props {}
-
-declare class Client extends React.Component<Props> {}
-export default Client

package/lib/components/home/home.d.ts

@@ -1,6 +0,0 @@
-import * as React from "react";
-
-interface Props {}
-
-declare class Home extends React.Component<Props> {}
-export default Home

package/lib/components/layout/single.js

@@ -1,60 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-
-var _react = _interopRequireDefault(require("react"));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
-
-/**
- *
- * @param locale
- * @param onLocale
- * @param onLogin
- * @param Component
- * @param pageProps
- * @return {*}
- * @constructor
- */
-function Single(_ref) {
-  let {
-    locale,
-    onLocale,
-    onLogin,
-    Component,
-    pageProps
-  } = _ref;
-  return /*#__PURE__*/_react.default.createElement("div", {
-    className: "uepay-ops-layout-single"
-  }, /*#__PURE__*/_react.default.createElement(Component, _extends({}, pageProps, {
-    pageId: "single",
-    onPageClose: handleClose
-  })));
-}
-
-var _default = Single;
-exports.default = _default;
-
-function handleClose() {
-  if (navigator.userAgent.indexOf("MSIE") > 0) {
-    if (navigator.userAgent.indexOf("MSIE 6.0") > 0) {
-      window.opener = null;
-      window.close();
-    } else {
-      window.open('', '_top');
-      window.top.close();
-    }
-  } else if (navigator.userAgent.indexOf("Firefox") > 0) {
-    window.location.href = 'about:blank '; //火狐默认状态非window.open的页面window.close是无效的
-    //window.history.go(-2);
-  } else {
-    window.opener = null;
-    window.open('', '_self', '');
-    window.close();
-  }
-}

package/lib/data/ctx.d.ts

@@ -1,37 +0,0 @@
-/**
- * 获取服务后台地址
- */
-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/util/net.d.ts

@@ -1,25 +0,0 @@
-/**
- * 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>;
-