uepay-mesh 4.0.10 → 4.0.11

package/mesh/table/formQueryAbleTable.js

@@ -95,6 +95,7 @@ class FormQueryAbleTable extends _queryAbleTable.default {
       collectId
     } = this;
     return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_formBridging.default, {
+      id: this.getId(),
       onClose: this.handleFormClose,
       deliverAuth: deliverAuth,
       onSubmit: this.handleFormSubmit,
@@ -106,6 +107,7 @@ class FormQueryAbleTable extends _queryAbleTable.default {
       insertForceValue: insertForceValue,
       state: form.state
     }), /*#__PURE__*/_react.default.createElement(_excelBridging.default, {
+      id: this.getId(),
       onClose: this.handleExcelClose,
       collect: collect,
       collectId: collectId,

package/mesh/table/queryAbleTable/bridgingDrawer.js

@@ -0,0 +1,72 @@
+"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 _antd = require("antd");
+
+var _icons = require("@ant-design/icons");
+
+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 DrawerProps = {
+  placement: 'right',
+  closable: false,
+  width: '95%',
+  style: {
+    position: 'absolute'
+  }
+};
+
+function BridgingDrawer(_ref) {
+  let {
+    containId,
+    visible,
+    children
+  } = _ref;
+  const [fullScream, setFullScream] = (0, _react.useState)(false),
+        monoEl = (0, _react.useMemo)(() => fullScream ? document.getElementsByTagName('body') : document.getElementById(containId), [visible, fullScream]);
+  return /*#__PURE__*/_react.default.createElement(_antd.Drawer, _extends({}, DrawerProps, {
+    visible: visible,
+    getContainer: monoEl
+  }), /*#__PURE__*/_react.default.createElement(ScreamOperation, {
+    fullScream: fullScream,
+    onChange: full => setFullScream(full)
+  }), visible && children);
+}
+
+var _default = BridgingDrawer;
+exports.default = _default;
+const ScreamOperationProps = {
+  className: 'ach',
+  style: {
+    position: 'absolute',
+    top: 0,
+    left: 0
+  }
+};
+
+function ScreamOperation(_ref2) {
+  let {
+    fullScream,
+    onChange
+  } = _ref2;
+  return /*#__PURE__*/_react.default.createElement("a", _extends({}, ScreamOperationProps, {
+    onClick: () => onChange(!fullScream)
+  }), ScreenOperationBtm[fullScream]);
+}
+
+const ScreenOperationBtm = {
+  true: /*#__PURE__*/_react.default.createElement(_icons.MenuUnfoldOutlined, null),
+  false: /*#__PURE__*/_react.default.createElement(_icons.MenuFoldOutlined, null)
+};

package/mesh/table/queryAbleTable/excelBridging.js

@@ -15,6 +15,10 @@ var _antd = require("antd");
 
 var _optionsAbleExcel = _interopRequireDefault(require("../../excel/optionsAbleExcel"));
 
+var _editAbleForm = _interopRequireDefault(require("../../form/editAbleForm"));
+
+var _bridgingDrawer = _interopRequireDefault(require("./bridgingDrawer"));
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 /**
@@ -23,15 +27,10 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
  * @return {*}
  * @constructor
  */
-const ExcelBridging = props => /*#__PURE__*/_react.default.createElement(_antd.Drawer, {
-  placement: "right",
-  closable: false,
-  visible: props.visible,
-  width: "85%",
-  bodyStyle: {
-    height: '100%'
-  }
-}, props.visible && /*#__PURE__*/_react.default.createElement(_optionsAbleExcel.default, {
+const ExcelBridging = props => /*#__PURE__*/_react.default.createElement(_bridgingDrawer.default, {
+  containId: props.id,
+  visible: props.visible
+}, /*#__PURE__*/_react.default.createElement(_optionsAbleExcel.default, {
   collect: props.collect,
   collectId: props.collectId,
   sorter: props.sorter,

package/mesh/table/queryAbleTable/formBridging.js

@@ -15,23 +15,30 @@ var _editAbleForm = _interopRequireDefault(require("../../form/editAbleForm"));
 
 var _serverEnums = require("../../config/serverEnums");
 
+var _bridgingDrawer = _interopRequireDefault(require("./bridgingDrawer"));
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 /**
  * table到標攤的橋接
- * @param props
+ * @param props.id
+ * @param props.visible
+ * @param props.collectId
+ * @param props.collect
+ * @param props.deliverAuth
+ * @param props.host
+ * @param props.state
+ * @param props.pkData
+ * @param props.insertForceValue
+ * @param props.onSubmit
+ * @param props.onClose
  * @return {*}
  * @constructor
  */
-const FormBridging = props => /*#__PURE__*/_react.default.createElement(_antd.Drawer, {
-  placement: "right",
-  closable: false,
-  visible: props.visible,
-  width: "85%",
-  bodyStyle: {
-    height: '100%'
-  }
-}, props.visible && /*#__PURE__*/_react.default.createElement(_editAbleForm.default, {
+const FormBridging = props => /*#__PURE__*/_react.default.createElement(_bridgingDrawer.default, {
+  containId: props.id,
+  visible: props.visible
+}, /*#__PURE__*/_react.default.createElement(_editAbleForm.default, {
   collect: props.collect,
   collectId: props.collectId,
   deliverAuth: props.deliverAuth,

package/mesh/table/queryAbleTable.js

@@ -50,6 +50,11 @@ const InitState = {
     msg: '預覽类型Table必须設置collect結構!'
   }
 };
+let id = 0;
+
+function obtainId() {
+  return "tab".concat(++id);
+}
 /**
  * 標準數據包裝列表
  * @param props.type {String} 列表類型 目前支持"preview"和"auto"。
@@ -92,6 +97,7 @@ const InitState = {
  * handleAction(state, pkValue, record, text) 操作cell被点击的回调
  */
 
+
 class QueryAbleTable extends _react.default.Component {
   constructor() {
     super(...arguments);
@@ -258,6 +264,8 @@ class QueryAbleTable extends _react.default.Component {
     } else {
       this.initMsg = '未指定接口host地址!';
     }
+
+    this.id = obtainId(); //當前組件的唯一標識ID
   }
 
   componentDidMount() {
@@ -324,6 +332,10 @@ class QueryAbleTable extends _react.default.Component {
    */
 
 
+  getId() {
+    return this.id;
+  }
+
   getContextProvider() {
     const {
       type,
@@ -377,6 +389,7 @@ class QueryAbleTable extends _react.default.Component {
           deliverAuth
         } = this.props;
         Comp = /*#__PURE__*/_react.default.createElement(_standardTable.default, {
+          id: this.getId(),
           onQuery: this.handleQuery,
           onExcel: this.handleExcel,
           ref: dom => {

package/mesh/table/standardTable.js

@@ -65,6 +65,7 @@ const TableShowType = (() => {
 /**
  * 标准查询列表。用于通用的数据查询和数据操作。
  * table的表头只能定义在组件初始化的时候定义且只能定义一次，如果需要更新表头结构或内容，需要卸载组件再装载。
+ * @param props,id {String} 分配給table容器 uepay-standard-table 的ID，用於標識DOM組件
  * @param props.loading {Boolean} 是否处于加载状态
  * @param props.actionColumn {Function} 列表操作按鈕
  * @param props.options {Object|Boolean} 右上角的操作选项配置,结构
@@ -502,6 +503,7 @@ class StandardTable extends _react.default.Component {
 
   render() {
     const {
+      id,
       result,
       loading,
       collectId,
@@ -532,6 +534,7 @@ class StandardTable extends _react.default.Component {
     onRow && (extParams.onRow = onRow);
     rowClassName && (extParams.rowClassName = rowClassName);
     return /*#__PURE__*/_react.default.createElement("div", {
+      id: id,
       className: "uepay-standard-table",
       ref: div => {
         this.table = div;
@@ -602,6 +605,7 @@ class StandardTable extends _react.default.Component {
 }
 
 StandardTable.propTypes = {
+  id: _propTypes.default.string.isRequired,
   options: _propTypes.default.oneOfType([_propTypes.default.bool, _propTypes.default.object]),
   loading: _propTypes.default.bool.isRequired,
   collectId: _propTypes.default.number,

package/package.json

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

package/style.css

@@ -31,7 +31,7 @@
     color: #000000;
 }
 
-.uepay-standard-table-label .ach{
+.ach{
     display: block;
     padding: .2rem .2rem;
     color: #40a9ff;
@@ -39,7 +39,7 @@
     border-radius: .1rem;
 }
 
-.uepay-standard-table-label .ach:hover{
+.ach:hover{
     background-color: #40a9ff;
     color: #ffffff;
 }

package/mesh/util/validate.js

@@ -1,17 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.isNotBlank = void 0;
-
-/**
- * 检查是否为无效内容
- * @param val
- * @return {boolean}
- */
-const isNotBlank = val => {
-  return typeof val !== 'undefined' && val !== '' && val !== 'null';
-};
-
-exports.isNotBlank = isNotBlank;