uepay-mesh 4.0.9 → 4.0.12

package/common/model/errorTip.js

@@ -0,0 +1,39 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _react = _interopRequireDefault(require("react"));
+
+var _antd = require("antd");
+
+var _CloseCircleOutlined = _interopRequireDefault(require("@ant-design/icons/lib/icons/CloseCircleOutlined"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+const {
+  confirm,
+  error
+} = _antd.Modal;
+
+function errorTip(title, content) {
+  function destroy() {
+    clearTimeout(idl);
+    instance.destroy();
+  }
+
+  const idl = setTimeout(destroy, 5000),
+        instance = error({
+    title: title,
+    icon: /*#__PURE__*/_react.default.createElement(_CloseCircleOutlined.default, null),
+    content: content,
+    okText: '5秒后自动关闭',
+    okType: 'danger',
+    onOk: destroy
+  });
+}
+
+var _default = errorTip;
+exports.default = _default;

package/common/model/loadTip.js

@@ -0,0 +1,58 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _react = _interopRequireDefault(require("react"));
+
+var _antd = require("antd");
+
+var _CloseCircleOutlined = _interopRequireDefault(require("@ant-design/icons/lib/icons/CloseCircleOutlined"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+const {
+  confirm,
+  info
+} = _antd.Modal;
+
+function none(e) {}
+/**
+ * 加载数据提示
+ * @param title 弹窗title信息
+ * @param content 弹窗content信息
+ * @return {{close:function}} close方法用于关闭弹窗
+ */
+
+
+function loadTip(_ref) {
+  let {
+    title = '等待系统处理',
+    content = '系统处理中......'
+  } = _ref;
+  const instance = info({
+    title: title,
+    content: /*#__PURE__*/_react.default.createElement(_antd.Spin, null, /*#__PURE__*/_react.default.createElement(_antd.Alert, {
+      message: content,
+      type: "info"
+    })),
+    okButtonProps: {
+      size: 'small',
+      loading: true,
+      type: 'link'
+    },
+    okText: '.',
+    onOk: none
+  }),
+        options = {
+    close: function close() {
+      instance.destroy();
+    }
+  };
+  return options;
+}
+
+var _default = loadTip;
+exports.default = _default;

package/mesh/form/editAbleForm.js

@@ -415,7 +415,8 @@ class EditAbleForm extends _react.default.Component {
       host,
       collect,
       deliverAuth,
-      pkData
+      pkData,
+      insertForceValue
     } = this.props,
           {
       state,
@@ -453,7 +454,8 @@ class EditAbleForm extends _react.default.Component {
           ref: dom => {
             this.dom = dom;
           },
-          collect: collect
+          collect: collect,
+          insertForceValue: insertForceValue
         });
         break;
 
@@ -489,7 +491,13 @@ EditAbleForm.propTypes = {
   onClose: _propTypes.default.func.isRequired,
   onSubmit: _propTypes.default.func.isRequired,
   //提交数据成功的回调 (record)=>{}
-  pkData: _propTypes.default.oneOfType([_propTypes.default.string, _propTypes.default.number, _propTypes.default.bool])
+  pkData: _propTypes.default.oneOfType([_propTypes.default.string, _propTypes.default.number, _propTypes.default.bool]),
+
+  /**
+   * 当进行新增时指定的强制默认值.
+   * @link StandardAddForm
+   */
+  insertForceValue: _propTypes.default.object
 };
 EditAbleForm.defaultProps = {
   state: 'VIEW',

package/mesh/form/standardAddForm.js

@@ -33,6 +33,11 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 
 /**
  * 表單視圖
+ * @param props.insertForceValue {Object} {label:value} 外部传入的强制默认值。当进行添加操作时，这鞋数值会默认填入。如果希望修改数据库
+ * @example insertForceValue的使用说明：
+ * 外部传入的强制默认值。当进行添加操作时，这鞋数值会默认填入。如果希望修改数据库需要将字段配置为可新增。
+ * 结构是{label1:value1,label2:value2}
+ * label对应字段的label值，value为默认的数值
  */
 class StandardAddForm extends _standardForm.default {
   constructor() {
@@ -43,6 +48,10 @@ class StandardAddForm extends _standardForm.default {
     });
   }
 
+  initState() {
+    return this.props.insertForceValue;
+  }
+
   processColumns(collect) {
     return (0, _modifyFormProcessor.processInitColumns)(collect);
   }
@@ -102,19 +111,31 @@ class StandardAddForm extends _standardForm.default {
     const {
       props,
       state
-    } = this;
+    } = this,
+          {
+      host,
+      data,
+      insertForceValue
+    } = props;
     return /*#__PURE__*/_react.default.createElement("div", {
       className: "uepay-standard-form"
     }, this.collect.fieldList.filter(i => "FORM" === i.show || "ALL" === i.show).map(i => {
       let Comp = null;
 
       if (_authOptions.OptValidateUtil.isInsert(i.edit)) {
-        if (i.alias && i.aliasId) {
+        if (insertForceValue[i.label]) {
+          Comp = /*#__PURE__*/_react.default.createElement(_redundanceCellItem.default, {
+            key: i.name,
+            column: i,
+            defaultData: data,
+            data: state
+          });
+        } else if (i.alias && i.aliasId) {
           Comp = /*#__PURE__*/_react.default.createElement(_aliasCellItem.default, {
-            host: props.host,
+            host: host,
             key: i.name,
             column: i,
-            defaultData: props.data,
+            defaultData: data,
             data: state,
             onChange: this.handleChange
           });
@@ -129,7 +150,7 @@ class StandardAddForm extends _standardForm.default {
           Comp = /*#__PURE__*/_react.default.createElement(_redundanceCellItem.default, {
             key: i.name,
             column: i,
-            defaultData: props.data,
+            defaultData: data,
             data: state
           });
         } else {
@@ -144,7 +165,7 @@ class StandardAddForm extends _standardForm.default {
         Comp = /*#__PURE__*/_react.default.createElement(_redundanceCellItem.default, {
           key: i.name,
           column: i,
-          defaultData: props.data,
+          defaultData: data,
           data: state
         });
       }
@@ -157,7 +178,13 @@ class StandardAddForm extends _standardForm.default {
 
 StandardAddForm.propTypes = {
   host: _propTypes.default.string.isRequired,
-  collect: _propTypes.default.object.isRequired
+  collect: _propTypes.default.object.isRequired,
+  insertForceValue: _propTypes.default.object
+};
+StandardAddForm.defaultProps = {
+  data: {},
+  insertForceValue: {} //從外部傳遞的强制限制的數值，儅對此進行限定時候，表單必須提交此數值
+
 };
 var _default = StandardAddForm;
 exports.default = _default;

package/mesh/form/standardForm.js

@@ -53,9 +53,13 @@ class StandardForm extends _react.default.Component {
       this.columnDict[field.label] = field;
     }
 
-    this.state = this.props.data;
+    this.state = this.initState();
     this.collect = collect;
   }
+
+  initState() {
+    return this.props.data;
+  }
   /**
    * @param label 当前修改对应的label
    * @param record 修改后的数值 {label:value}

package/mesh/form/tabs/relateTabs.js

@@ -11,7 +11,7 @@ require("core-js/modules/web.dom.iterable.js");
 
 require("core-js/modules/es6.regexp.search.js");
 
-var _react = _interopRequireDefault(require("react"));
+var _react = _interopRequireWildcard(require("react"));
 
 var _propTypes = _interopRequireDefault(require("prop-types"));
 
@@ -19,8 +19,16 @@ var _antd = require("antd");
 
 var _formQueryAbleTable = _interopRequireDefault(require("../../table/formQueryAbleTable"));
 
+var _icons = require("@ant-design/icons");
+
 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); }
+
 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; }
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
@@ -30,6 +38,35 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 const {
   TabPane
 } = _antd.Tabs;
+
+function obtainRelates(fieldList) {
+  let relates = [];
+
+  for (let field of fieldList) {
+    if (field.formRelates) {
+      const _relate = JSON.parse(field.formRelates);
+
+      relates = relates.concat(_relate.map(item => _objectSpread(_objectSpread({}, item), {}, {
+        relLabel: field.label
+      })));
+    }
+  }
+
+  if (0 < relates.length) {
+    return relates;
+  } else {
+    return false;
+  }
+}
+
+const ArcherProps = {
+  className: 'ach',
+  style: {
+    position: 'absolute',
+    top: 0,
+    left: 0
+  }
+};
 /**
  * @param props
  * @param props.host
@@ -38,60 +75,45 @@ const {
  * @constructor
  */
 
-class RelateTabs extends _react.default.Component {
-  constructor() {
-    super(...arguments);
-    this.formRelates = [];
-
-    for (let field of this.props.collect.fieldList) {
-      if (field.formRelates) {
-        const _relate = JSON.parse(field.formRelates);
-
-        this.formRelates = this.formRelates.concat(_relate.map(item => _objectSpread(_objectSpread({}, item), {}, {
-          relLabel: field.label
-        })));
-      }
+function RelateTabs(_ref) {
+  let {
+    host,
+    collect,
+    data
+  } = _ref;
+  const relates = (0, _react.useMemo)(() => {
+    return obtainRelates(collect.fieldList);
+  }, [collect.collectId]),
+        [visible, setVisible] = (0, _react.useState)(false);
+  return relates ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("div", {
+    className: "rl-bar"
+  }, /*#__PURE__*/_react.default.createElement("a", {
+    onClick: () => setVisible(true)
+  }, /*#__PURE__*/_react.default.createElement("span", null, /*#__PURE__*/_react.default.createElement(_icons.MenuFoldOutlined, null)), " \u5173\u8054\u4FE1\u606F")), /*#__PURE__*/_react.default.createElement(_antd.Drawer, {
+    closable: false,
+    bodyStyle: {
+      position: 'relative'
+    },
+    push: false,
+    placement: "right",
+    width: "90%",
+    style: {
+      position: 'absolute'
+    },
+    visible: visible,
+    getContainer: false
+  }, /*#__PURE__*/_react.default.createElement("a", _extends({}, ArcherProps, {
+    onClick: () => setVisible(false)
+  }), /*#__PURE__*/_react.default.createElement(_icons.MenuUnfoldOutlined, null)), /*#__PURE__*/_react.default.createElement("div", {
+    style: {
+      height: '100%',
+      display: "flex"
     }
-  }
-
-  render() {
-    const {
-      data,
-      host
-    } = this.props;
-    return /*#__PURE__*/_react.default.createElement(_antd.Tabs, {
-      size: "small"
-    }, this.formRelates.map(item => /*#__PURE__*/_react.default.createElement(TabPane, {
-      key: item.collectId,
-      tab: item.name
-    }, /*#__PURE__*/_react.default.createElement(_formQueryAbleTable.default, {
-      host: host,
-      options: false,
-      size: "small",
-      onSearch: _ref => {
-        let {
-          search,
-          sorter,
-          page
-        } = _ref;
-        search.push({
-          p: data[item.relLabel],
-          s: undefined,
-          column: item.label,
-          cond: "ER",
-          relate: "AND"
-        });
-        return {
-          search,
-          sorter,
-          page
-        };
-      },
-      type: "auto",
-      collectId: item.collectId
-    }))));
-  }
-
+  }, /*#__PURE__*/_react.default.createElement(Relates, {
+    host: host,
+    relates: relates,
+    data: data
+  })))) : null;
 }
 
 RelateTabs.propTypes = {
@@ -100,4 +122,43 @@ RelateTabs.propTypes = {
   data: _propTypes.default.object
 };
 var _default = RelateTabs;
-exports.default = _default;
+exports.default = _default;
+
+function Relates(_ref2) {
+  let {
+    host,
+    relates,
+    data
+  } = _ref2;
+  return /*#__PURE__*/_react.default.createElement(_antd.Tabs, {
+    size: "small"
+  }, relates.map(item => /*#__PURE__*/_react.default.createElement(TabPane, {
+    key: item.collectId,
+    tab: item.name
+  }, /*#__PURE__*/_react.default.createElement(_formQueryAbleTable.default, {
+    host: host,
+    options: false,
+    size: "small",
+    onSearch: _ref3 => {
+      let {
+        search,
+        sorter,
+        page
+      } = _ref3;
+      search.push({
+        p: data[item.relLabel],
+        s: undefined,
+        column: item.label,
+        cond: "ER",
+        relate: "AND"
+      });
+      return {
+        search,
+        sorter,
+        page
+      };
+    },
+    type: "auto",
+    collectId: item.collectId
+  }))));
+}

package/mesh/table/context/queryAbleTableContext.js

@@ -13,13 +13,14 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 
 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; }
 
-const OptionsFormQueryAbleTableContext = /*#__PURE__*/(0, _react.createContext)({
+const QueryAbleTableContext = /*#__PURE__*/(0, _react.createContext)({
+  options: [],
   host: undefined,
   type: 'auto',
   collectId: undefined,
   flush: () => {}
 });
-const Provider = OptionsFormQueryAbleTableContext.Provider;
+const Provider = QueryAbleTableContext.Provider;
 exports.Provider = Provider;
-const Consumer = OptionsFormQueryAbleTableContext.Consumer;
+const Consumer = QueryAbleTableContext.Consumer;
 exports.Consumer = Consumer;

package/mesh/table/formQueryAbleTable.d.ts

@@ -1,5 +1,13 @@
 import QueryAbleTable, {Props} from './queryAbleTable'
 
-declare class FormQueryAbleTable extends QueryAbleTable<Props> {}
+
+interface FormQueryAbleTableProps extends Props{
+
+    /**
+     * 当进行新增时指定的强制默认值. 见StandardAddForm说明
+     */
+    insertForceValue?: Object
+}
+declare class FormQueryAbleTable extends QueryAbleTable<FormQueryAbleTableProps> {}
 
 export default FormQueryAbleTable

package/mesh/table/formQueryAbleTable.js

@@ -21,8 +21,6 @@ var _formBridging = _interopRequireDefault(require("./queryAbleTable/formBridgin
 
 var _excelBridging = _interopRequireDefault(require("./queryAbleTable/excelBridging"));
 
-var _serverEnums = require("../config/serverEnums");
-
 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; }
@@ -89,13 +87,15 @@ class FormQueryAbleTable extends _queryAbleTable.default {
     } = this.state,
           {
       host,
-      deliverAuth
+      deliverAuth,
+      insertForceValue
     } = this.props,
           {
       collect,
       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,
@@ -104,8 +104,10 @@ class FormQueryAbleTable extends _queryAbleTable.default {
       collectId: collectId,
       host: host,
       pkData: form.pkValue,
+      insertForceValue: insertForceValue,
       state: form.state
     }), /*#__PURE__*/_react.default.createElement(_excelBridging.default, {
+      id: this.getId(),
       onClose: this.handleExcelClose,
       collect: collect,
       collectId: collectId,
@@ -118,7 +120,13 @@ class FormQueryAbleTable extends _queryAbleTable.default {
 
 }
 
-FormQueryAbleTable.propTypes = _objectSpread({}, _queryAbleTable.default.propTypes);
+FormQueryAbleTable.propTypes = _objectSpread(_objectSpread({}, _queryAbleTable.default.propTypes), {}, {
+  /**
+   * 当进行新增时指定的强制默认值.
+   * @link StandardAddForm
+   */
+  insertForceValue: _propTypes.default.object
+});
 FormQueryAbleTable.defaultProps = _objectSpread(_objectSpread({}, _queryAbleTable.default.defaultProps), {}, {
   options: {
     add: true,

package/mesh/table/optionsFormQueryAbleTable.js

@@ -15,7 +15,7 @@ var _actionColumnFormOptions = _interopRequireDefault(require("./standardTable/a
 
 var _formQueryAbleTable = _interopRequireDefault(require("./formQueryAbleTable"));
 
-var _optionsFormQueryAbleTableContext = require("./context/optionsFormQueryAbleTableContext");
+var _queryAbleTableContext = require("./context/queryAbleTableContext");
 
 var _serverEnums = require("../config/serverEnums");
 
@@ -64,7 +64,7 @@ class OptionsFormQueryAbleTable extends _formQueryAbleTable.default {
     } = this.props,
           flush = this.flush;
     return actionOptions ? {
-      Provider: _optionsFormQueryAbleTableContext.Provider,
+      Provider: _queryAbleTableContext.Provider,
       value: {
         actionOptions,
         type,

package/mesh/table/queryAbleTable/bridgingDrawer.js

@@ -0,0 +1,73 @@
+"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 = {
+  push: false,
+  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,29 +15,37 @@ 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,
   host: props.host,
   state: props.state,
   pkData: props.pkData,
+  insertForceValue: props.insertForceValue,
   onSubmit: props.onSubmit,
   onClose: props.onClose
 }));
@@ -50,6 +58,12 @@ FormBridging.propTypes = {
   collectId: _propTypes.default.number,
   pkData: _propTypes.default.oneOfType([_propTypes.default.string, _propTypes.default.number, _propTypes.default.bool]),
   visible: _propTypes.default.bool.isRequired,
+
+  /**
+   * 当进行新增时指定的强制默认值.
+   * @link StandardAddForm
+   */
+  insertForceValue: _propTypes.default.object,
   onSubmit: _propTypes.default.func.isRequired,
   //(record)=>{}
   onClose: _propTypes.default.func.isRequired

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);
@@ -114,11 +120,17 @@ class QueryAbleTable extends _react.default.Component {
         host,
         onSearch
       } = this.props,
-            {
+            result = onSearch(_objectSpread({}, params));
+
+      if (result) {
+        Object.assign(params, result);
+      }
+
+      const {
         search,
         sorter,
         page
-      } = onSearch(params);
+      } = params;
 
       _this.setState({
         loading: true,
@@ -252,6 +264,8 @@ class QueryAbleTable extends _react.default.Component {
     } else {
       this.initMsg = '未指定接口host地址!';
     }
+
+    this.id = obtainId(); //當前組件的唯一標識ID
   }
 
   componentDidMount() {
@@ -318,6 +332,10 @@ class QueryAbleTable extends _react.default.Component {
    */
 
 
+  getId() {
+    return this.id;
+  }
+
   getContextProvider() {
     const {
       type,
@@ -371,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/actionColumnForm/actionDefOptions.js

@@ -0,0 +1,58 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _serverEnums = require("../../../config/serverEnums");
+
+var _icons = require("@ant-design/icons");
+
+var _antd = require("antd");
+
+var _deleteRow = _interopRequireDefault(require("./deleteRow"));
+
+var _react = _interopRequireDefault(require("react"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+const ActionDefOptions = _ref => {
+  let {
+    collectId,
+    collect,
+    deliverAuth,
+    text,
+    record,
+    pkColumn,
+    onAction
+  } = _ref;
+  const {
+    options
+  } = collect;
+  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null,
+  /*显示控件*/
+  options >= _serverEnums.OptionsFlag.QUERY && /*#__PURE__*/_react.default.createElement("span", {
+    onClick: () => {
+      onAction(_serverEnums.OptionsState.VIEW, record[pkColumn.label], record, text);
+    }
+  }, /*#__PURE__*/_react.default.createElement("a", null, /*#__PURE__*/_react.default.createElement(_icons.EyeOutlined, null))),
+  /*编辑控件*/
+  _serverEnums.OptionsFlag.EDIT === (deliverAuth & _serverEnums.OptionsFlag.EDIT) && _serverEnums.OptionsFlag.EDIT === (options & _serverEnums.OptionsFlag.EDIT) && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_antd.Divider, {
+    type: "vertical"
+  }), /*#__PURE__*/_react.default.createElement("span", {
+    onClick: () => {
+      onAction(_serverEnums.OptionsState.EDIT, record[pkColumn.label], record, text);
+    }
+  }, /*#__PURE__*/_react.default.createElement("a", null, /*#__PURE__*/_react.default.createElement(_icons.EditOutlined, null)))), /*#__PURE__*/_react.default.createElement(_deleteRow.default, {
+    collectId: collectId,
+    collect: collect,
+    text: text,
+    record: record,
+    deliverAuth: deliverAuth,
+    pkColumn: pkColumn
+  }));
+};
+
+var _default = ActionDefOptions;
+exports.default = _default;

package/mesh/table/standardTable/actionColumnForm/deleteRow.js

@@ -57,16 +57,13 @@ function DeleteRow(_ref) {
     text,
     record
   } = _ref;
-  return /*#__PURE__*/_react.default.createElement(_queryAbleTableContext.Consumer, null, function (_ref2) {
-    let {
-      flush
-    } = _ref2;
+  return /*#__PURE__*/_react.default.createElement(_queryAbleTableContext.Consumer, null, prams => {
     return /*#__PURE__*/_react.default.createElement(DeleteOptions, {
       collectId: collectId,
       collect: collect,
       pkColumn: pkColumn,
       deliverAuth: deliverAuth,
-      flush: flush,
+      flush: prams.flush,
       text: text,
       record: record
     });
@@ -79,7 +76,7 @@ const ERR = {
   color: 'red'
 };
 
-function DeleteOptions(_ref3) {
+function DeleteOptions(_ref2) {
   let {
     collectId,
     collect,
@@ -88,7 +85,7 @@ function DeleteOptions(_ref3) {
     flush,
     text,
     record
-  } = _ref3;
+  } = _ref2;
   const {
     options
   } = collect,

package/mesh/table/standardTable/actionColumnForm.js

@@ -7,15 +7,9 @@ exports.default = void 0;
 
 var _react = _interopRequireDefault(require("react"));
 
-var _icons = require("@ant-design/icons");
-
 var _antd = require("antd");
 
-var _serverEnums = require("../../config/serverEnums");
-
-var _DeleteOutlined = _interopRequireDefault(require("@ant-design/icons/lib/icons/DeleteOutlined"));
-
-var _deleteRow = _interopRequireDefault(require("./actionColumnForm/deleteRow"));
+var _actionDefOptions = _interopRequireDefault(require("./actionColumnForm/actionDefOptions"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -42,30 +36,18 @@ const actionColumnForm = _ref => {
     deliverAuth,
     onAction
   } = _ref;
-  const {
-    options
-  } = collect;
   return /*#__PURE__*/_react.default.createElement(Column, {
     title: "\u64CD\u4F5C",
     key: "action",
     render: (text, record) => {
-      return /*#__PURE__*/_react.default.createElement("span", null, options >= _serverEnums.OptionsFlag.QUERY && /*#__PURE__*/_react.default.createElement("span", {
-        onClick: () => {
-          onAction(_serverEnums.OptionsState.VIEW, record[pkColumn.label], record, text);
-        }
-      }, /*#__PURE__*/_react.default.createElement("a", null, /*#__PURE__*/_react.default.createElement(_icons.EyeOutlined, null))), _serverEnums.OptionsFlag.EDIT === (deliverAuth & _serverEnums.OptionsFlag.EDIT) && _serverEnums.OptionsFlag.EDIT === (options & _serverEnums.OptionsFlag.EDIT) && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_antd.Divider, {
-        type: "vertical"
-      }), /*#__PURE__*/_react.default.createElement("span", {
-        onClick: () => {
-          onAction(_serverEnums.OptionsState.EDIT, record[pkColumn.label], record, text);
-        }
-      }, /*#__PURE__*/_react.default.createElement("a", null, /*#__PURE__*/_react.default.createElement(_icons.EditOutlined, null)))), /*#__PURE__*/_react.default.createElement(_deleteRow.default, {
+      return /*#__PURE__*/_react.default.createElement("span", null, /*#__PURE__*/_react.default.createElement(_actionDefOptions.default, {
         collectId: collectId,
         collect: collect,
+        deliverAuth: deliverAuth,
         text: text,
         record: record,
-        deliverAuth: deliverAuth,
-        pkColumn: pkColumn
+        pkColumn: pkColumn,
+        onAction: onAction
       }));
     }
   });

package/mesh/table/standardTable/actionColumnFormOptions.js

@@ -7,13 +7,11 @@ exports.default = void 0;
 
 var _react = _interopRequireDefault(require("react"));
 
-var _icons = require("@ant-design/icons");
-
 var _antd = require("antd");
 
-var _serverEnums = require("../../config/serverEnums");
+var _queryAbleTableContext = require("../context/queryAbleTableContext");
 
-var _optionsFormQueryAbleTableContext = require("../context/optionsFormQueryAbleTableContext");
+var _actionDefOptions = _interopRequireDefault(require("./actionColumnForm/actionDefOptions"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -26,6 +24,7 @@ const {
 } = _antd.Table;
 /**
  *
+ * @param collectId 数据集ID，如果是预览模式该值不存在
  * @param collect
  * @param pkColumn
  * @param deliverAuth {Number} 传递权限
@@ -36,41 +35,32 @@ const {
 
 const actionColumnFormOptions = _ref => {
   let {
+    collectId,
     collect,
     pkColumn,
     deliverAuth,
     onAction
   } = _ref;
-  const {
-    options
-  } = collect;
   return /*#__PURE__*/_react.default.createElement(Column, {
     title: "\u64CD\u4F5C",
     key: "action",
     render: (text, record) => {
-      return /*#__PURE__*/_react.default.createElement("span", null, /*#__PURE__*/_react.default.createElement(_optionsFormQueryAbleTableContext.Consumer, null, _ref2 => {
-        let {
-          actionOptions
-        } = _ref2;
-        return actionOptions.map(i => /*#__PURE__*/_react.default.createElement(Option, _extends({
-          key: i.type
-        }, i, {
-          pkColumn: pkColumn,
-          record: record,
-          text: text,
-          onAction: onAction
-        })));
-      }), deliverAuth >= _serverEnums.OptionsFlag.QUERY && options >= _serverEnums.OptionsFlag.QUERY && /*#__PURE__*/_react.default.createElement("span", {
-        onClick: () => {
-          onAction(_serverEnums.OptionsState.VIEW, record[pkColumn.label], record, text);
-        }
-      }, /*#__PURE__*/_react.default.createElement("a", null, /*#__PURE__*/_react.default.createElement(_icons.EyeOutlined, null))), deliverAuth >= _serverEnums.OptionsFlag.EDIT && options >= _serverEnums.OptionsFlag.EDIT && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_antd.Divider, {
-        type: "vertical"
-      }), /*#__PURE__*/_react.default.createElement("span", {
-        onClick: () => {
-          onAction(_serverEnums.OptionsState.EDIT, record[pkColumn.label], record, text);
-        }
-      }, /*#__PURE__*/_react.default.createElement("a", null, /*#__PURE__*/_react.default.createElement(_icons.EditOutlined, null)))));
+      return /*#__PURE__*/_react.default.createElement("span", null, /*#__PURE__*/_react.default.createElement(_queryAbleTableContext.Consumer, null, params => params.actionOptions.map(i => /*#__PURE__*/_react.default.createElement(Option, _extends({
+        key: i.type
+      }, i, {
+        pkColumn: pkColumn,
+        record: record,
+        text: text,
+        onAction: onAction
+      })))), /*#__PURE__*/_react.default.createElement(_actionDefOptions.default, {
+        collectId: collectId,
+        collect: collect,
+        deliverAuth: deliverAuth,
+        text: text,
+        record: record,
+        pkColumn: pkColumn,
+        onAction: onAction
+      }));
     }
   });
 };

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.9",
+    "version": "4.0.12",
     "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.4"
+        "uepay-ops2": "4.0.7"
     }
 }

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/table/context/optionsFormQueryAbleTableContext.js

@@ -1,26 +0,0 @@
-"use strict";
-
-require("core-js/modules/web.dom.iterable.js");
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.Provider = exports.Consumer = void 0;
-
-var _react = _interopRequireWildcard(require("react"));
-
-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; }
-
-const OptionsFormQueryAbleTableContext = /*#__PURE__*/(0, _react.createContext)({
-  options: [],
-  host: undefined,
-  type: 'auto',
-  collectId: undefined,
-  flush: () => {}
-});
-const Provider = OptionsFormQueryAbleTableContext.Provider;
-exports.Provider = Provider;
-const Consumer = OptionsFormQueryAbleTableContext.Consumer;
-exports.Consumer = Consumer;

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;