uepay-mesh 4.0.17 → 4.0.19

package/index.d.ts

@@ -7,3 +7,4 @@ export {default as EditCompareForm} from './mesh/form/editCompareForm'
 export {default as BpmList} from './bpm/list'
 export {default as BpmForm} from './bpm/form'
 export {default as CollectEntry} from './mesh/pages/collectEntry'
+export {default as Page} from './mesh/pages/page'

package/index.js

@@ -39,6 +39,12 @@ Object.defineProperty(exports, "OptionsFormQueryAbleTable", {
     return _optionsFormQueryAbleTable.default;
   }
 });
+Object.defineProperty(exports, "Page", {
+  enumerable: true,
+  get: function get() {
+    return _page.default;
+  }
+});
 Object.defineProperty(exports, "PopSelectQueryAbleTable", {
   enumerable: true,
   get: function get() {
@@ -76,4 +82,6 @@ var _list = _interopRequireDefault(require("./bpm/list"));
 
 var _collectEntry = _interopRequireDefault(require("./mesh/pages/collectEntry"));
 
+var _page = _interopRequireDefault(require("./mesh/pages/page"));
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }

package/mesh/data/localStore.js

@@ -4,12 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.put = exports.get = exports.clean = void 0;
-const Config = {
-  Prefix: 'UePay',
-  Json: '-JSON-',
-  Def: '-None-'
-};
-let localData = {};
+const localData = {};
 /**
  *
  * @param key
@@ -30,7 +25,7 @@ const get = key => {
     data = localStorage.getItem(key);
 
     if (data) {
-      data = JSON.parse(localStorage.getItem(key));
+      data = JSON.parse(data);
     }
   }
 

package/mesh/data/sessionStore.js

@@ -0,0 +1,41 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.put = exports.get = exports.clean = void 0;
+const sessionData = {};
+/**
+ *
+ * @param key
+ * @param value {Object} value必須是一個對象
+ */
+
+const put = (key, value) => {
+  sessionData[key] = value;
+  typeof sessionStorage !== 'undefined' && sessionStorage.setItem(key, JSON.stringify(value));
+};
+
+exports.put = put;
+
+const get = key => {
+  let data = sessionData[key];
+
+  if (!data && typeof sessionStorage !== 'undefined') {
+    data = sessionStorage.getItem(key);
+
+    if (data) {
+      data = JSON.parse(data);
+    }
+  }
+
+  return data;
+};
+
+exports.get = get;
+
+const clean = () => {
+  localData = {};
+};
+
+exports.clean = clean;

package/mesh/form/options/extendsBtn.js

@@ -13,27 +13,21 @@ var _antd = require("antd");
 
 var _request = require("../../data/request");
 
+var _router = require("next/router");
+
+var _sessionStore = require("../../data/sessionStore");
+
 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); }
 
-function mockRequest() {
-  return new Promise(resolve => {
-    const idl = setTimeout(() => {
-      clearTimeout(idl);
-      resolve({
-        suc: true
-      });
-    }, 1000);
-  });
-}
-
 function ExtendsBtn(_ref) {
   let {
     btn,
     url,
+    linkType,
     warnType,
     warn,
     view,
@@ -47,74 +41,88 @@ function ExtendsBtn(_ref) {
   } = _ref;
   const [loading, setLoading] = (0, _react.useState)(false),
         [visible, setVisible] = (0, _react.useState)(false),
-        ref = (0, _react.useRef)(null);
+        ref = (0, _react.useRef)(null),
+        router = (0, _router.useRouter)();
 
   const handleSubmit = () => {
-    setLoading(true);
+    const content = ref.current && ref.current.resizableTextArea.textArea.value || '';
 
-    _antd.message.loading({
-      content: '提交中，請勿關閉頁面...',
-      key: "".concat(collectId),
-      duration: 30
-    });
+    if ('Site' === linkType) {
+      const sign = btoa("".concat(collectId || Math.ceil(Math.random() * 10000000)).concat(pkData));
+      (0, _sessionStore.put)(sign, {
+        pkData,
+        data,
+        collectId,
+        confirmType: warnType,
+        content
+      });
+      router.push("".concat(url, "?sign=").concat(sign));
+    } else {
+      setLoading(true);
+
+      _antd.message.loading({
+        content: '提交中，請勿關閉頁面...',
+        key: "".concat(collectId),
+        duration: 30
+      });
 
-    const content = ref.current && ref.current.resizableTextArea.textArea.value || '';
-    (0, _request.postFormbtns)({
-      host,
-      url,
-      collectId,
-      pkData,
-      data,
-      confirmType: warnType,
-      content
-    }).then(res => {
-      setLoading(false);
-
-      if (res && res.suc) {
-        setVisible(false);
-        fresh && fresh();
-
-        if ('SingleField' === res.viewType) {
-          _antd.message.destroy();
-
-          _antd.Modal.info({
-            title: 'SUCCESS',
-            content: res.msg || '操作成功'
-          });
-        } else if ('MultiField' === res.viewType) {
-          _antd.message.destroy();
-
-          const pojo = JSON.parse(res.msg);
-
-          _antd.Modal.info({
-            title: 'SUCCESS',
-            content: /*#__PURE__*/_react.default.createElement(_antd.Space, {
-              direction: "vertical",
-              size: "small",
-              style: {
-                display: 'flex'
-              }
-            }, Object.keys(pojo).map(key => /*#__PURE__*/_react.default.createElement(_antd.Space, {
-              key: key
-            }, /*#__PURE__*/_react.default.createElement("span", null, key, ":"), /*#__PURE__*/_react.default.createElement("span", null, pojo[key]))))
-          });
+      (0, _request.postFormbtns)({
+        host,
+        url,
+        collectId,
+        pkData,
+        data,
+        confirmType: warnType,
+        content
+      }).then(res => {
+        setLoading(false);
+
+        if (res && res.suc) {
+          setVisible(false);
+          fresh && fresh();
+
+          if ('SingleField' === res.viewType) {
+            _antd.message.destroy();
+
+            _antd.Modal.info({
+              title: 'SUCCESS',
+              content: res.msg || '操作成功'
+            });
+          } else if ('MultiField' === res.viewType) {
+            _antd.message.destroy();
+
+            const pojo = JSON.parse(res.msg);
+
+            _antd.Modal.info({
+              title: 'SUCCESS',
+              content: /*#__PURE__*/_react.default.createElement(_antd.Space, {
+                direction: "vertical",
+                size: "small",
+                style: {
+                  display: 'flex'
+                }
+              }, Object.keys(pojo).map(key => /*#__PURE__*/_react.default.createElement(_antd.Space, {
+                key: key
+              }, /*#__PURE__*/_react.default.createElement("span", null, key, ":"), /*#__PURE__*/_react.default.createElement("span", null, pojo[key]))))
+            });
+          } else {
+            _antd.message.success({
+              content: res.msg || '操作成功',
+              key: "".concat(collectId),
+              duration: 5
+            });
+          }
         } else {
-          _antd.message.success({
-            content: res.msg || '操作成功',
+          const props = {
+            content: res.msg || '操作失敗',
             key: "".concat(collectId),
             duration: 5
-          });
+          };
+
+          _antd.message.error(props);
         }
-      } else {
-        const props = {
-          content: res.msg || '操作失敗',
-          key: "".concat(collectId),
-          duration: 5
-        };
-
-        _antd.message.error(props);
-      }
-    });
+      });
+    }
   };
 
   const props = 'danger' === type ? {

package/mesh/pages/page.d.ts

@@ -0,0 +1,26 @@
+import * as React from "react";
+/**
+ * 用于页面的包装处理，比如内部跳转、框架传递数据等
+ */
+declare class Page {
+    /**
+     * @function 页面包装
+     * @description 对扩展按钮跳转的页面进修包装，当扩展按钮选择为页面跳转时，若需获取表单数据需要用此方法包装。
+     * @param {React.Component} PageComp 页面组件
+     * @return {React.Component}
+     * @example 
+     * import {Page} from 'uepay-mesh'
+     * const MyPage = ({confirmType, content, records, pk}) => {
+     * // 参数说明：
+     * // confirmType 当前表单的提交方式'NONE'|'Warning'|'Message'
+     * // content 当confirmType为'Message'时，用户输入的提交内容
+     * // records 点击按钮时对应的表单所有数据，字典结构
+     * // pk 点击按钮时对应的表单的主键值
+     * 
+     *     return <span>My MyPage</span> //输出对应的页面内容，逻辑处理
+     * };
+     * export default Page.btnform(MyPage);
+     */
+    static btnform(PageComp: React.Component): React.Component
+}
+export default Page

package/mesh/pages/page.js

@@ -0,0 +1,51 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+require("core-js/modules/es6.regexp.match.js");
+
+var _react = _interopRequireDefault(require("react"));
+
+var _sessionStore = require("../data/sessionStore");
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+/**
+ * 
+ */
+class Page {
+  /**
+   * 
+   * @param {React.Component} PageComp 
+   * @returns 
+   */
+  static btnform(PageComp) {
+    return function BtnForm(_ref) {
+      let {
+        pageId
+      } = _ref;
+      const params = split(pageId);
+      return /*#__PURE__*/_react.default.createElement(PageComp, params);
+    };
+  }
+
+}
+
+var _default = Page;
+exports.default = _default;
+
+const split = query => {
+  const match = query.match(/sign=/),
+        start = match.index,
+        sign = query.slice(start + 5),
+        data = (0, _sessionStore.get)(sign);
+  return {
+    confirmType: data.confirmType,
+    content: data.content,
+    records: data.data,
+    pk: data.pkData
+  };
+};

package/mesh/table/standardTable/innerTable.js

@@ -21,7 +21,7 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && 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); }
 
-const Prefixed = 98;
+const Prefixed = 105;
 /**
  * @constructor
  * @param {boolean} multiVisible - 是否显示多选框

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "uepay-mesh",
-    "version": "4.0.17",
+    "version": "4.0.19",
     "description": "数据中心数据集设计工具前端",
     "main": "index.js",
     "typings": "index.d.ts",