uepay-mesh 4.0.10 → 4.0.13

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

@@ -25,6 +25,12 @@ var _serverEnums = require("../config/serverEnums");
 
 var _remove = require("../crud/remove");
 
+var _extension = _interopRequireDefault(require("../define/collect/extension"));
+
+var _errorTip = _interopRequireDefault(require("../../common/model/errorTip"));
+
+var _delayTip = _interopRequireDefault(require("../../common/model/delayTip"));
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
@@ -50,6 +56,11 @@ const InitState = {
     msg: '預覽类型Table必须設置collect結構!'
   }
 };
+let id = 0;
+
+function obtainId() {
+  return "tab".concat(++id);
+}
 /**
  * 標準數據包裝列表
  * @param props.type {String} 列表類型 目前支持"preview"和"auto"。
@@ -92,6 +103,7 @@ const InitState = {
  * handleAction(state, pkValue, record, text) 操作cell被点击的回调
  */
 
+
 class QueryAbleTable extends _react.default.Component {
   constructor() {
     super(...arguments);
@@ -107,8 +119,12 @@ class QueryAbleTable extends _react.default.Component {
     _defineProperty(this, "handleQuery", params => {
       const {
         collect,
-        collectId
+        collectId,
+        extension
       } = this,
+            {
+        pipe
+      } = extension,
             _this = this,
             {
         host,
@@ -136,45 +152,16 @@ class QueryAbleTable extends _react.default.Component {
         collectId,
         search,
         sorter,
-        page
-      }).then(this.handleResult) : (0, _request.listQueryWithClassDes)({
+        page,
+        pipe
+      }).then(this.handleResult(params)) : (0, _request.listQueryWithClassDes)({
         host,
         collect,
         search,
         sorter,
-        page
-      }).then(this.handleResult);
-    });
-
-    _defineProperty(this, "handleResult", res => {
-      const {
-        onResult
-      } = this.props;
-
-      if (res && 0 < res.code) {
-        const result = {
-          data: res.result,
-          page: res.page,
-          total: res.total,
-          search: res.search,
-          sorter: res.sorter
-        };
-        this.setState({
-          loading: false,
-          result
-        });
-        onResult && onResult(_objectSpread({
-          suc: true
-        }, result));
-      } else {
-        QueryAbleTable.errTip(res && res.msg ? res.msg : '網絡故障，請稍後再試!', '服務器請求錯誤!');
-        this.setState({
-          loading: false
-        });
-        onResult && onResult({
-          suc: false
-        });
-      }
+        page,
+        pipe
+      }).then(this.handleResult(params));
     });
 
     _defineProperty(this, "handleExcel", () => {});
@@ -250,6 +237,7 @@ class QueryAbleTable extends _react.default.Component {
       } else {
         if (_collect) {
           this.collect = _collect;
+          this.extension = new _extension.default(_collect.extension);
           this.initState = InitState.PreView;
         } else {
           this.initState = InitState.UnCollect;
@@ -258,6 +246,8 @@ class QueryAbleTable extends _react.default.Component {
     } else {
       this.initMsg = '未指定接口host地址!';
     }
+
+    this.id = obtainId(); //當前組件的唯一標識ID
   }
 
   componentDidMount() {
@@ -288,6 +278,7 @@ class QueryAbleTable extends _react.default.Component {
           if (res && 0 < res.code) {
             if (res.data) {
               _this.collect = res.data;
+              _this.extension = new _extension.default(res.data.extension);
               _this.initState = InitState.InitComplete;
 
               _this.setState({
@@ -324,6 +315,67 @@ class QueryAbleTable extends _react.default.Component {
    */
 
 
+  /**
+   * 進行搜索
+   * @param params.search
+   * @param params.sorter
+   * @param params.page
+   */
+  handleResult(params) {
+    const _this = this;
+    /**
+     * 搜索结果
+     * @param res
+     */
+
+
+    return res => {
+      const {
+        onResult
+      } = this.props;
+
+      if (res && 0 < res.code) {
+        const result = {
+          data: res.result,
+          page: res.page,
+          total: res.total,
+          search: res.search,
+          sorter: res.sorter
+        };
+        this.setState({
+          loading: false,
+          result
+        });
+        onResult && onResult(_objectSpread({
+          suc: true
+        }, result));
+      } else if (res && -100 === res.code) {
+        this.setState({
+          loading: false
+        });
+        (0, _delayTip.default)("查詢隊列已滿", res.msg, '自動查詢', 20, () => {
+          _this.handleQuery(params);
+        });
+      } else {
+        QueryAbleTable.errTip(res && res.msg ? res.msg : '網絡故障，請稍後再試!', '服務器請求錯誤!');
+        this.setState({
+          loading: false
+        });
+        onResult && onResult({
+          suc: false
+        });
+      }
+    };
+  }
+  /**
+   * 处理点击Excel按钮
+   */
+
+
+  getId() {
+    return this.id;
+  }
+
   getContextProvider() {
     const {
       type,
@@ -377,6 +429,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.13",
     "description": "数据中心数据集设计工具前端",
     "main": "index.js",
     "typings": "index.d.ts",
@@ -44,6 +44,6 @@
         "node-sass": "^4.13.0",
         "react": "^16.12.0",
         "react-dom": "^16.12.0",
-        "uepay-ops2": "4.0.7"
+        "uepay-ops2": "4.0.8"
     }
 }

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;
 }
@@ -136,10 +136,10 @@
     flex-wrap: wrap;
     align-content: flex-start;
     background-color: #fff;
+    overflow-y: auto;
 }
 
 .uepay-form {
-    position: relative;
     display: flex;
     flex-direction: column;
     align-items: stretch;
@@ -148,6 +148,33 @@
     width: 100%;
 }
 
+.uepay-form .ant-tabs{
+    flex-grow: 1;
+}
+
+/*右上角關聯選項的按鈕*/
+.uepay-form .rl-bar{
+    position: absolute;
+    padding: .1rem .5rem 1rem .5rem;
+    top: 2rem;
+    right: 2rem;
+    width: 7rem;
+    border-left: 1px solid #cccccc;
+}
+
+.uepay-form .rl-bar a{
+    color: #000000;
+    text-decoration: none;
+}
+
+.uepay-form .rl-bar a:hover{
+    color:#40a9ff;
+}
+
+.uepay-form .rl-bar span{
+    margin-right: .2rem;
+}
+
 .uepay-edit-empty {
     width: 100%;
     height: 100%;

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;