uepay-mesh 4.0.13 → 4.0.15

package/mesh/data/request.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.updateWithId = exports.updateWithClassDes = exports.listQueryWithId = exports.listQueryWithClassDes = exports.getCollectById = exports.formWithId = exports.formWithClassDes = exports.deleteWithId = exports.deleteWithClassDes = exports.batchUpdateWithId = exports.batchUpdateWithClassDes = exports.batchAddWithId = exports.batchAddWithClassDes = exports.addWithId = exports.addWithClassDes = void 0;
+exports.updateWithId = exports.updateWithClassDes = exports.postFormbtns = exports.listQueryWithId = exports.listQueryWithClassDes = exports.getCollectById = exports.formWithId = exports.formWithClassDes = exports.deleteWithId = exports.deleteWithClassDes = exports.batchUpdateWithId = exports.batchUpdateWithClassDes = exports.batchAddWithId = exports.batchAddWithClassDes = exports.addWithId = exports.addWithClassDes = void 0;
 
 require("core-js/modules/es6.regexp.search.js");
 
@@ -416,5 +416,25 @@ const deleteWithClassDes = _ref15 => {
     bpm
   });
 };
+/** */
 
-exports.deleteWithClassDes = deleteWithClassDes;
+
+exports.deleteWithClassDes = deleteWithClassDes;
+
+const postFormbtns = _ref16 => {
+  let {
+    host,
+    url,
+    collectId,
+    pkData,
+    data
+  } = _ref16;
+  return (0, _net.post)("".concat(host).concat(url), {
+    url,
+    collectId,
+    pkData,
+    data
+  });
+};
+
+exports.postFormbtns = postFormbtns;

package/mesh/define/collect/extension.js

@@ -18,8 +18,10 @@ var _clientEnums = require("../../config/clientEnums");
  */
 function Extension(json) {
   this.pipe = _clientEnums.PipeType.CoreNio.value;
+  this.formbtns = [];
   const obj = json ? JSON.parse(json) : {};
   obj.pipe && (this.pipe = obj.pipe);
+  obj.formbtns && (this.formbtns = obj.formbtns);
 }
 
 Extension.prototype.toJson = function () {
@@ -39,6 +41,12 @@ Extension.prototype.clone = function (other, combine) {
     const val = combine[key];
     this[key] = val || other[key];
   }
+
+  Object.keys(combine).forEach(key => {
+    if (!this[key]) {
+      this[key] = combine[key];
+    }
+  });
 };
 
 var _default = Extension;

package/mesh/excel/processor.js

@@ -658,7 +658,7 @@ const doSubmit = _ref4 => {
 
         processCb(_type, _present, _from, _to, res.count);
 
-        if (++index < page.length) {
+        if (++index < pageList.length) {
           submit();
         } else {
           cb('complete');

package/mesh/form/editAbleForm.js

@@ -470,7 +470,9 @@ class EditAbleForm extends _react.default.Component {
       pkData: pkData,
       collect: collect,
       onClick: this.handleClick,
-      state: state
+      state: state,
+      host: host,
+      data: data
     }), Comp, loading && /*#__PURE__*/_react.default.createElement(_parentPosLoading.default, null), data && /*#__PURE__*/_react.default.createElement(_relateTabs.default, {
       host: host,
       collect: collect,

package/mesh/form/options.js

@@ -23,12 +23,20 @@ var _insertBtn = _interopRequireDefault(require("./options/insertBtn"));
 
 var _deleteBtn = _interopRequireDefault(require("./options/deleteBtn"));
 
+var _extension = _interopRequireWildcard(require("../define/collect/extension"));
+
+var _request = require("../data/request");
+
+var _parentPosLoading = _interopRequireDefault(require("./loading/parentPosLoading"));
+
 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 _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
 const ButtonGroup = _antd.Button.Group;
@@ -162,12 +170,28 @@ const getOptionsValue = opts => {
   };
 };
 
-const processState = (deliverAuth, collect, state) => {
+const processState = (deliverAuth, collect, state, host, pkData, data) => {
   const {
     options
   } = collect,
         ret = [],
         opts = options === (options & deliverAuth) ? options : deliverAuth;
+  const extension = collect.extension && (0, _extension.buildExtension)(collect.extension),
+        formbtnsDict = {};
+  extension && extension.formbtns && extension.formbtns.map(item => {
+    const {
+      edit,
+      view
+    } = item;
+
+    if (edit) {
+      formbtnsDict.edit ? formbtnsDict.edit.push(item) : formbtnsDict.edit = [item];
+    }
+
+    if (view) {
+      formbtnsDict.view ? formbtnsDict.view.push(item) : formbtnsDict.view = [item];
+    }
+  });
   let btns = {};
 
   if (_serverEnums.OptionsFlag.ADD === (_serverEnums.OptionsFlag.ADD & opts)) {
@@ -215,6 +239,17 @@ const processState = (deliverAuth, collect, state) => {
       delete btns.Edit;
       delete btns.Back;
       delete btns.Delete;
+      formbtnsDict.edit && formbtnsDict.edit.map((item, index) => {
+        btns["Edit".concat(index)] = {
+          type: 'ext',
+          btn: /*#__PURE__*/_react.default.createElement(BtnWrapper, _extends({}, item, {
+            host: host,
+            collectId: collect.collectId,
+            pkData: pkData,
+            data: data
+          }))
+        };
+      });
       break;
 
     case _serverEnums.OptionsState.VIEW:
@@ -222,6 +257,17 @@ const processState = (deliverAuth, collect, state) => {
       delete btns.Submit;
       delete btns.Rollback;
       delete btns.Cancel;
+      formbtnsDict.view && formbtnsDict.view.map((item, index) => {
+        btns["View".concat(index)] = {
+          type: 'ext',
+          btn: /*#__PURE__*/_react.default.createElement(BtnWrapper, _extends({}, item, {
+            host: host,
+            collectId: collect.collectId,
+            pkData: pkData,
+            data: data
+          }))
+        };
+      });
       break;
 
     default:
@@ -241,16 +287,20 @@ const Options = _ref => {
     collect,
     state,
     pkData,
+    host,
+    data,
     onClick
   } = _ref;
   return /*#__PURE__*/_react.default.createElement("div", {
     className: "uepay-form-options"
-  }, /*#__PURE__*/_react.default.createElement(ButtonGroup, null, processState(deliverAuth, collect, state).map((Comp, index) => /*#__PURE__*/_react.default.createElement(Comp, {
-    key: index,
-    collect: collect,
-    pkData: pkData,
-    onClick: onClick
-  }))));
+  }, /*#__PURE__*/_react.default.createElement(ButtonGroup, null, processState(deliverAuth, collect, state, host, pkData, data).map((Comp, index) => {
+    return Comp.type ? Comp.btn : /*#__PURE__*/_react.default.createElement(Comp, {
+      key: index,
+      collect: collect,
+      pkData: pkData,
+      onClick: onClick
+    });
+  })));
 };
 
 Options.propTypes = {
@@ -260,11 +310,86 @@ Options.propTypes = {
   //当前控制状态
   collect: _propTypes.default.object.isRequired,
   onClick: _propTypes.default.func.isRequired,
-  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]),
+  data: _propTypes.default.oneOfType([_propTypes.default.object, _propTypes.default.bool])
 };
 Options.defaultProps = {
   state: _serverEnums.OptionsState.VIEW,
   deliverAuth: _serverEnums.OptionsFlag.QUERY
 };
 var _default = Options;
-exports.default = _default;
+exports.default = _default;
+
+function BtnWrapper(_ref2) {
+  let {
+    btn,
+    url,
+    isWarn,
+    warn,
+    view,
+    edit,
+    type,
+    host,
+    collectId,
+    pkData,
+    data
+  } = _ref2;
+  const [loading, setLoading] = (0, _react.useState)(false);
+
+  const handleSubmit = () => {
+    setLoading(true);
+
+    _antd.message.loading({
+      content: '提交中，請勿關閉頁面...',
+      key: "".concat(collectId),
+      duration: 30
+    });
+
+    (0, _request.postFormbtns)({
+      host,
+      url,
+      collectId,
+      pkData,
+      data
+    }).then(res => {
+      setLoading(false);
+
+      if (res && res.suc) {
+        const props = {
+          content: res.msg || '操作成功',
+          key: "".concat(collectId),
+          duration: 5
+        };
+
+        _antd.message.success(props);
+      } else {
+        const props = {
+          content: res.msg || '操作失敗',
+          key: "".concat(collectId),
+          duration: 5
+        };
+
+        _antd.message.error(props);
+      }
+    });
+  };
+
+  const props = 'danger' === type ? {
+    danger: true,
+    type: 'primary'
+  } : {
+    type
+  };
+  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, isWarn ? /*#__PURE__*/_react.default.createElement(_antd.Popconfirm, {
+    title: warn,
+    okText: "\u63D0\u4EA4",
+    cancelText: "\u53D6\u6D88",
+    onConfirm: handleSubmit
+  }, /*#__PURE__*/_react.default.createElement(_antd.Button, _extends({
+    loading: loading
+  }, props), btn)) : /*#__PURE__*/_react.default.createElement(_antd.Button, _extends({
+    loading: loading
+  }, props, {
+    onClick: handleSubmit
+  }), btn));
+}

package/mesh/table/webAddFormQueryAbleTable.js

@@ -0,0 +1,78 @@
+"use strict";
+
+require("core-js/modules/es6.symbol.js");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _react = _interopRequireDefault(require("react"));
+
+var _propTypes = _interopRequireDefault(require("prop-types"));
+
+var _actionColumnForm = _interopRequireDefault(require("./standardTable/actionColumnForm"));
+
+var _queryAbleTable = _interopRequireDefault(require("./queryAbleTable"));
+
+var _formBridging = _interopRequireDefault(require("./queryAbleTable/formBridging"));
+
+var _excelBridging = _interopRequireDefault(require("./queryAbleTable/excelBridging"));
+
+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; }
+
+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; }
+
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
+/**
+ * 具备打开表单功能的查询列表
+ */
+class WebAddFormQueryAbleTable extends FormQueryAbleTable {
+  /**
+   * 向數據行添加數據
+   * @param {Object} data 要添加的數據，其結構要對應數據的{lable:''}
+   * @memberof WebAddFormQueryAbleTable
+   */
+  add(data) {}
+  /**
+   * 編輯一行數據
+   * @param {string|number} key 對應行數據的查詢主鍵
+   * @param {*} data 要編輯修改的數據，其結構要對應數據的{lable:''}
+   * @memberof WebAddFormQueryAbleTable
+   */
+
+
+  modify(key, data) {}
+  /**
+   * 按key(查詢主鍵)刪除一行數據
+   * @param {*} key
+   * @memberof WebAddFormQueryAbleTable
+   */
+
+
+  remove(key) {}
+
+}
+
+FormQueryAbleTable.propTypes = _objectSpread(_objectSpread({}, _queryAbleTable.default.propTypes), {}, {
+  /**
+   * 当进行新增时指定的强制默认值.
+   * @link StandardAddForm
+   */
+  insertForceValue: _propTypes.default.object
+});
+FormQueryAbleTable.defaultProps = _objectSpread(_objectSpread({}, _queryAbleTable.default.defaultProps), {}, {
+  options: {
+    add: true,
+    multiple: true,
+    search: true,
+    setting: true,
+    excel: true,
+    refresh: true
+  }
+});
+var _default = FormQueryAbleTable;
+exports.default = _default;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "uepay-mesh",
-    "version": "4.0.13",
+    "version": "4.0.15",
     "description": "数据中心数据集设计工具前端",
     "main": "index.js",
     "typings": "index.d.ts",
@@ -31,7 +31,7 @@
         "@ant-design/icons": "^4.2.1",
         "@zeit/next-css": "^1.0.1",
         "@zeit/next-sass": "^1.0.1",
-        "antd": "^4.17.4",
+        "antd": "4.22.8",
         "babel-plugin-import": "^1.12.2",
         "classnames": "^2.2.6",
         "core-js": "^2.6.11",

package/style.css

@@ -67,6 +67,8 @@
 }
 
 .uepay-standard-table .search-ext .column{
+    flex-grow: 0;
+    flex-shrink: 0;
     padding: 0 1rem;
     line-height: 1.8rem;
 }