uepay-mesh 3.0.11 → 4.0.1

package/bpm/list/applicantTable.js

@@ -29,7 +29,6 @@ const ApplicantTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref)
 
   function handleAction(type, pkValue, record, text) {
     if ("View" === type) {
-      console.info(ref);
       ref.current.flush();
       router.push("/bpm/form?insId=".concat(record['bpm_ins_id']));
     }

package/index.d.ts

@@ -6,3 +6,4 @@ export {default as QueryAbleTable} from './mesh/table/queryAbleTable'
 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'

package/index.js

@@ -15,6 +15,12 @@ Object.defineProperty(exports, "BpmList", {
     return _list.default;
   }
 });
+Object.defineProperty(exports, "CollectEntry", {
+  enumerable: true,
+  get: function get() {
+    return _collectEntry.default;
+  }
+});
 Object.defineProperty(exports, "EditCompareForm", {
   enumerable: true,
   get: function get() {
@@ -68,4 +74,6 @@ var _form = _interopRequireDefault(require("./bpm/form"));
 
 var _list = _interopRequireDefault(require("./bpm/list"));
 
+var _collectEntry = _interopRequireDefault(require("./mesh/pages/collectEntry"));
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }

package/mesh/cell/search/picker/timestampDatePickerSearch.js

@@ -30,8 +30,8 @@ const {
 } = _antd.DatePicker;
 
 function subtractNatural(subNum) {
-  const begin = (0, _moment.default)().hour(0).minute(0).second(0),
-        end = begin.clone().subtract(subNum, 'days').hour(23).minute(59).second(59);
+  const end = (0, _moment.default)().hour(23).minute(59).second(59),
+        begin = end.clone().subtract(subNum, 'days').hour(0).minute(0).second(0);
   return {
     begin,
     end
@@ -114,7 +114,7 @@ class TimestampDatePickerSearch extends _react.default.Component {
         p: moment && (0, _timestampDatePicker.moment2Date)(stringTime, showTime, moment) || undefined,
         s: undefined
       };
-      onChange && onChange(date, column);
+      onChange && onChange(date, column, _serverEnums.RelationType.BETWEEN.value);
     });
 
     _defineProperty(this, "handleCondChange", value => {
@@ -134,7 +134,7 @@ class TimestampDatePickerSearch extends _react.default.Component {
     const _search = {},
           _cond = {};
 
-    if (column.component && column.component.config && column.component.config.timePickerDefaultRange) {
+    if (column.component && column.component.config && column.component.config.timePickerDefaultRange && Range.none.value !== column.component.config.timePickerDefaultRange) {
       const {
         showTime,
         stringTime
@@ -199,6 +199,7 @@ class TimestampDatePickerSearch extends _react.default.Component {
       onChange: this.handleChange
     }), /*#__PURE__*/_react.default.createElement(_condSelect.default, {
       condOptions: TimestampDatePickerSearch.DefaultCondTypes,
+      defaultCondValue: _serverEnums.RelationType.BETWEEN.value,
       condValue: condValue,
       onChange: this.handleCondChange
     }), /*#__PURE__*/_react.default.createElement(_antd.Tooltip, {

package/mesh/cell/search/searchContain.js

@@ -22,6 +22,8 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 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); }
 
 /**
+ * @param props.condOptions {Array} 可选操作列表
+ * @param props.defaultCondValue {String} 默认条件关联选项
  * @param props.column {String} 字段信息
  * @param props.condValue {String} 搜索框的值
  * @param props.children {React} 包装搜索元素
@@ -51,7 +53,7 @@ function SearchContain(props) {
   }
 
   function handleValueChange(val) {
-    onChange(val, column);
+    onChange(val, column, defaultCondValue);
   }
 
   return /*#__PURE__*/_react.default.createElement("div", {

package/mesh/cell/search/select/standardSelectSearch.js

@@ -20,7 +20,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 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 Config = {
-  condOptions: [_serverEnums.ConditionType.ER],
+  condOptions: [_serverEnums.ConditionType.ER, _serverEnums.ConditionType.NE],
   defaultCondValue: _serverEnums.ConditionType.ER.value
 };
 /**

package/mesh/config/serverEnums.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.UpdateState = exports.TableOrderTypeMapping = exports.ShowType = exports.RelationType = exports.QueryType = exports.OrderType = exports.OptionsState = exports.OptionsFlag = exports.OptionsDict = exports.EditTypeDict = exports.EditType = exports.DefaultConditionValue = exports.ConditionType = exports.ColumnSecurityOptions = exports.ColumnSecurity = exports.BETWEENCondMapping = exports.AlisaFlag = void 0;
+exports.UpdateState = exports.TableUpdateFlag = exports.TableOrderTypeMapping = exports.ShowType = exports.RelationType = exports.QueryType = exports.OrderType = exports.OptionsState = exports.OptionsFlag = exports.OptionsDict = exports.EditTypeDict = exports.EditType = exports.DefaultConditionValue = exports.ConditionType = exports.ColumnSecurityOptions = exports.ColumnSecurity = exports.BETWEENCondMapping = exports.AlisaFlag = void 0;
 
 /**
  * 匹配模式的字典
@@ -136,12 +136,12 @@ const ShowType = [{
 exports.ShowType = ShowType;
 const EditType = [{
   value: 'NONE',
-  label: '禁止',
+  label: '仅只读',
   tip: '不允許進行修改和新增操作!'
 }, {
   value: 'EDIT',
-  label: '编辑',
-  tip: '數據存在時，可以進行編輯!'
+  label: '可更新',
+  tip: '數據存在時，可以進行編輯及更新!'
 }];
 exports.EditType = EditType;
 const EditTypeDict = {
@@ -149,19 +149,21 @@ const EditTypeDict = {
   EDIT: 'EDIT'
 };
 /**
- * 表單操作能力
+ * 表單操作能力,
+ * ADD包含EDIT包含QUERY。
+ * DELETE为完全独立的配置。
  * @type {{"1": number, "3": number, "7": number, "15": number}}
  */
 
 exports.EditTypeDict = EditTypeDict;
 const OptionsFlag = {
   QUERY: 1,
-  //查詢
+  //查詢 1
   EDIT: 3,
-  //更新
+  //更新 11
   ADD: 7,
-  //添加
-  DEL: 15 //删除
+  //添加 111
+  DEL: 8 //删除 1000
 
 };
 exports.OptionsFlag = OptionsFlag;
@@ -180,7 +182,8 @@ exports.OptionsDict = OptionsDict;
 const OptionsState = {
   VIEW: 'VIEW',
   EDIT: 'EDIT',
-  ADD: 'ADD'
+  ADD: 'ADD',
+  DEL: 'DEL'
 };
 /**
  * 外鍵關聯別名的一些特殊標記處理
@@ -265,4 +268,18 @@ const ColumnSecurityOptions = [{
   value: 'Virginia',
   label: '字母表替換(維吉尼娜密碼)'
 }];
-exports.ColumnSecurityOptions = ColumnSecurityOptions;
+/**
+ *
+ * @type {{AddExistsUpdate: number, ModifyExistsUpdate: number, RemoveExistsDelete: number, AddNotExistsInsert: number, None: number, ModifyNotExistsInsert: number}}
+ */
+
+exports.ColumnSecurityOptions = ColumnSecurityOptions;
+const TableUpdateFlag = {
+  None: 0,
+  AddNotExistsInsert: 1,
+  AddExistsUpdate: 2,
+  ModifyNotExistsInsert: 4,
+  ModifyExistsUpdate: 8,
+  RemoveExistsDelete: 16
+};
+exports.TableUpdateFlag = TableUpdateFlag;

package/mesh/crud/remove.js

@@ -0,0 +1,144 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.removeDataList = void 0;
+exports.removeRecords = removeRecords;
+
+require("core-js/modules/web.dom.iterable.js");
+
+var _request = require("../data/request");
+
+var _antd = require("antd");
+
+/**
+ * 根据输入的记录列表来删除数据
+ * @param host
+ * @param collect
+ * @param collectId
+ * @param records
+ * @param bpm
+ * @param handle {Function} (state, msg, sucPkList)=>{
+ *     state = ‘ERROR|SUC|ANY_SUC}’
+ */
+function removeRecords(_ref) {
+  let {
+    host,
+    collect,
+    collectId,
+    records,
+    bpm,
+    handle
+  } = _ref;
+  const {
+    fieldList,
+    tableList,
+    pkName
+  } = collect,
+        dataList = [],
+        tablePkNameDict = {}; //pkName=>table
+
+  for (let table of tableList) {
+    tablePkNameDict[table.pkName] = table.name;
+  }
+
+  for (let record of records) {
+    dataList.push(extractOneRowData(fieldList, tablePkNameDict, pkName, record));
+  }
+
+  removeDataList({
+    host,
+    collect,
+    collectId,
+    dataList,
+    bpm,
+    handle
+  });
+}
+
+function extractOneRowData(fieldList, tablePkNameDict, pkName, record) {
+  const pkValue = [],
+        data = [];
+  let pkData = null,
+      tablePkField = null,
+      value = null;
+
+  for (let field of fieldList) {
+    value = record[field.label];
+
+    if (field.name === pkName) {
+      pkData = value;
+    }
+
+    if (tablePkField = tablePkNameDict[field.name]) {
+      pkValue.push({
+        label: field.label,
+        table: tablePkField,
+        value: value
+      });
+    } else {
+      data.push({
+        label: field.label,
+        origin: value,
+        value
+      });
+    }
+  }
+
+  return {
+    pkData,
+    pkValue,
+    data
+  };
+}
+/**
+ * 删除数据
+ * @param host {String} 服务器地址
+ * @param collect {Object} 数据集结构
+ * @param collectId {Number} 数据集ID
+ * @param dataList {Array} 数据
+ * @example dataList:[{
+ *      data:[{label:String, origin:Any, value:Any}],
+ *      pkValue:[{label:String, table:String, value:Any}],
+ *      pkData:Any
+ * }]
+ * @param bpm {Object}
+ * @param handle {Function} (state, msg, sucPkList)=>{
+ *     state = ‘ERROR|SUC|ANY_SUC}’
+ * }
+ */
+
+
+const removeDataList = _ref2 => {
+  let {
+    host,
+    collect,
+    collectId,
+    dataList,
+    bpm,
+    handle
+  } = _ref2;
+  const request = collectId ? _request.deleteWithId : _request.deleteWithClassDes;
+  request({
+    host,
+    collect,
+    collectId,
+    dataList,
+    bpm
+  }).then(res => {
+    if (res && res.code === 1) {
+      _antd.message.success('数据删除成功!');
+
+      handle('SUC', null, res.pkDatas);
+    } else {
+      _antd.notification.error({
+        message: res && res.msg || '網絡故障，請稍後再試!'
+      });
+
+      handle('ERROR', res.msg | '網絡故障，請稍後再試!');
+    }
+  });
+};
+
+exports.removeDataList = removeDataList;

package/mesh/data/reduxSearch.js

@@ -56,9 +56,10 @@ class ReduxSearch {
     this.scribe();
   }
 
-  setValue(label, value) {
+  setValue(label, value, defaultCond) {
     this.search = _objectSpread({}, this.search);
     this.search[label] = value;
+    !this.condition[label] && defaultCond && (this.condition[label] = defaultCond);
     this.scribe();
   }
 
@@ -69,8 +70,6 @@ class ReduxSearch {
   }
 
   scribe() {
-    console.info('Scribe:', this.search, this.condition);
-
     for (let consumer of this.listener) {
       consumer(this.search, this.condition);
     }

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.downloadWithId = exports.downloadWithClassDes = exports.batchUpdateWithId = exports.batchUpdateWithClassDes = exports.batchAddWithId = exports.batchAddWithClassDes = exports.addWithId = exports.addWithClassDes = void 0;
+exports.updateWithId = exports.updateWithClassDes = exports.listQueryWithId = exports.listQueryWithClassDes = exports.getCollectById = exports.formWithId = exports.formWithClassDes = exports.downloadWithId = exports.downloadWithClassDes = 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");
 
@@ -423,5 +423,57 @@ const batchAddWithClassDes = _ref15 => {
     bpm
   });
 };
+/**
+ * 根據數據集ID刪除數據
+ * @param host
+ * @param collectId
+ * @param data
+ * @param dataList
+ * @param bpm
+ * @return {Promise<Response>}
+ */
+
+
+exports.batchAddWithClassDes = batchAddWithClassDes;
+
+const deleteWithId = _ref16 => {
+  let {
+    host,
+    collectId,
+    bpm,
+    dataList
+  } = _ref16;
+  return (0, _net.post)("".concat(host, "/data/mesh/execute/delete"), {
+    collectId,
+    dataList,
+    bpm
+  });
+};
+/**
+ * 根據數據集結構刪除數據
+ * @param host
+ * @param collect
+ * @param data
+ * @param dataList
+ * @param bpm
+ * @return {Promise<Response>}
+ */
+
+
+exports.deleteWithId = deleteWithId;
+
+const deleteWithClassDes = _ref17 => {
+  let {
+    host,
+    collect,
+    bpm,
+    dataList
+  } = _ref17;
+  return (0, _net.post)("".concat(host, "/data/mesh/execute/preview/delete"), {
+    collect,
+    dataList,
+    bpm
+  });
+};
 
-exports.batchAddWithClassDes = batchAddWithClassDes;
+exports.deleteWithClassDes = deleteWithClassDes;

package/mesh/excel/processor.js

@@ -93,7 +93,7 @@ const modifyAbleHeaderRow = collect => {
       });
       indexHeaderRow.push(field.label);
       explainHeaderRow.push(getExplainHeaderColumn(fieldLabelDict, field));
-      displayHeaderRow.push("".concat(field.display));
+      displayHeaderRow.push("".concat(field.required ? '!' : '').concat(field.display));
     }
   }
 
@@ -144,7 +144,7 @@ const addAbleHeaderRow = collect => {
       });
       indexHeaderRow.push(field.label);
       explainHeaderRow.push(getExplainHeaderColumn(fieldLabelDict, field));
-      displayHeaderRow.push("".concat(field.display));
+      displayHeaderRow.push("".concat(field.required ? '!' : '').concat(field.display));
     }
   }
 

package/mesh/form/editAbleForm.js

@@ -35,6 +35,8 @@ var _builder = require("../../bpm/builder");
 
 var _tip = require("./options/btn/tip");
 
+var _remove = require("../crud/remove");
+
 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; }
@@ -46,6 +48,10 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 class EditAbleForm extends _react.default.Component {
   constructor() {
     super(...arguments);
+    /**
+     *
+     * @type {{data: boolean, state: (string), loading: boolean}}
+     */
 
     _defineProperty(this, "handleClick", _ref => {
       let {
@@ -55,7 +61,7 @@ class EditAbleForm extends _react.default.Component {
 
       switch (type) {
         case _options.Classic.Cancel:
-          this.setState({
+          this.state.state === _serverEnums.OptionsState.ADD ? this.props.onClose() : this.setState({
             state: _serverEnums.OptionsState.VIEW
           });
           break;
@@ -88,6 +94,10 @@ class EditAbleForm extends _react.default.Component {
           this.insert(bpm);
           break;
 
+        case _options.Classic.Delete:
+          this.delete(bpm);
+          break;
+
         default:
           break;
       }
@@ -311,25 +321,13 @@ class EditAbleForm extends _react.default.Component {
         collect,
         collectId
       } = this.props,
-            defData = this.state.data,
-            pkDict = {},
             request = collectId ? _request.updateWithId : _request.updateWithClassDes;
-
-      for (let table of collect.tableList) {
-        pkDict[table.pkName] = table.name;
-      }
-
-      const pkValue = collect.fieldList.filter(i => pkDict[i.name]).map(i => ({
-        label: i.label,
-        table: pkDict[i.name],
-        value: defData[i.label]
-      }));
       request({
         host,
         collect,
         collectId,
         pkData: this.pkData,
-        pkValue,
+        pkValue: this.getPkValue(data),
         data,
         bpm
       }).then(this.handleSubmitResult(data));
@@ -341,6 +339,77 @@ class EditAbleForm extends _react.default.Component {
     }
   }
 
+  delete(bpm) {
+    this.setState({
+      loading: true
+    });
+
+    const _this = this,
+          data = this.dom.beginSubmit();
+
+    if (data) {
+      const {
+        host,
+        collect,
+        collectId
+      } = this.props,
+            request = collectId ? _request.deleteWithId : _request.deleteWithClassDes,
+            dataList = [{
+        data,
+        pkData: this.pkData,
+        pkValue: this.getPkValue(data)
+      }];
+      (0, _remove.removeDataList)({
+        host,
+        collect,
+        collectId,
+        bpm,
+        dataList,
+        handle: (state, msg, sucPkList) => {
+          if ('SUC' === state) {
+            const {
+              onClose,
+              onSubmit
+            } = this.props;
+            onSubmit();
+            onClose();
+          } else {
+            this.setState({
+              loading: false
+            });
+          }
+        }
+      });
+    } else {
+      this.setState({
+        loading: false
+      });
+    }
+  }
+
+  getPkValue(data) {
+    const {
+      collect
+    } = this.props,
+          defData = this.state.data,
+          dataDict = {},
+          pkDict = {};
+
+    for (let _data of data) {
+      dataDict[_data.label] = _data.value;
+    }
+
+    for (let table of collect.tableList) {
+      pkDict[table.pkName] = table.name;
+    }
+
+    return collect.fieldList.filter(i => pkDict[i.name]).map(i => ({
+      label: i.label,
+      table: pkDict[i.name],
+      value: dataDict[i.label] || defData[i.label]
+    }));
+  }
+
   render() {
     const {
       host,
@@ -415,7 +484,7 @@ EditAbleForm.propTypes = {
   state: _propTypes.default.oneOf(['VIEW', 'EDIT', 'ADD']),
   //当前传入表单状态
   collect: _propTypes.default.object,
-  collectId: _propTypes.default.object,
+  collectId: _propTypes.default.number,
   deliverAuth: _propTypes.default.number,
   onClose: _propTypes.default.func.isRequired,
   onSubmit: _propTypes.default.func.isRequired,

package/mesh/form/options/confirmBtn.js

@@ -15,23 +15,33 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 
 /**
  * 帶確認框的按鈕
- * @param props
- * @param props.type
- * @param props.title
- * @param props.name
- * @param props.onClick
+ * @param danger
+ * @param type
+ * @param title
+ * @param name
+ * @param onClick
  * @return {*}
  * @constructor
  */
-const ConfirmBtn = props => /*#__PURE__*/_react.default.createElement(_antd.Popconfirm, {
-  placement: "bottomLeft",
-  title: props.title,
-  onConfirm: props.onClick,
-  okText: "\u78BA\u5B9A",
-  cancelText: "\u53D6\u6D88"
-}, /*#__PURE__*/_react.default.createElement(_antd.Button, {
-  type: props.type
-}, props.name));
+const ConfirmBtn = _ref => {
+  let {
+    title,
+    danger = false,
+    type,
+    name,
+    onClick
+  } = _ref;
+  return /*#__PURE__*/_react.default.createElement(_antd.Popconfirm, {
+    placement: "bottomLeft",
+    title: title,
+    onConfirm: onClick,
+    okText: "\u78BA\u5B9A",
+    cancelText: "\u53D6\u6D88"
+  }, /*#__PURE__*/_react.default.createElement(_antd.Button, {
+    danger: danger,
+    type: type
+  }, name));
+};
 
 ConfirmBtn.propsTypes = {
   title: _propTypes.default.string.isRequired,

package/mesh/form/options/deleteBtn.js

@@ -0,0 +1,57 @@
+"use strict";
+
+require("core-js/modules/web.dom.iterable.js");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _react = _interopRequireWildcard(require("react"));
+
+var _options = require("../options");
+
+var _confirmBtn = _interopRequireDefault(require("./confirmBtn"));
+
+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; }
+
+/**
+ * 删除按钮
+ * @param router
+ * @param collect
+ * @param pkData
+ * @param onClick ({type:Classic, bpm:{draft:boolean}})=>{}
+ * @return {*}
+ * @constructor
+ */
+function DeleteBtn(_ref) {
+  let {
+    collect,
+    pkData,
+    onClick
+  } = _ref;
+
+  function handleClick(e, draft) {
+    const bpm = {
+      isDraft: draft || false
+    };
+    onClick({
+      type: _options.Classic.Delete,
+      bpm
+    });
+  }
+
+  return /*#__PURE__*/_react.default.createElement(_confirmBtn.default, {
+    danger: true,
+    title: "\u6570\u636E\u5220\u9664\u540E\u5C06\u65E0\u6CD5\u56DE\u590D\uFF0C\u786E\u8BA4\u5220\u9664?",
+    name: "\u522A\u9664",
+    onClick: handleClick
+  });
+}
+
+var _default = DeleteBtn;
+exports.default = _default;

package/mesh/form/options.js

@@ -21,6 +21,8 @@ var _submitBtn = _interopRequireDefault(require("./options/submitBtn"));
 
 var _insertBtn = _interopRequireDefault(require("./options/insertBtn"));
 
+var _deleteBtn = _interopRequireDefault(require("./options/deleteBtn"));
+
 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); }
@@ -68,7 +70,8 @@ const Classic = {
   Back: 'Back',
   Rollback: 'Rollback',
   Submit: 'Submit',
-  Insert: 'Insert'
+  Insert: 'Insert',
+  Delete: 'Delete'
 };
 exports.Classic = Classic;
 const BtnComp = {
@@ -102,6 +105,7 @@ const BtnComp = {
   },
   Insert: _insertBtn.default,
   Submit: _submitBtn.default,
+  Delete: _deleteBtn.default,
   Rollback: class Rollback extends Btn {
     constructor() {
       super(...arguments);
@@ -148,6 +152,16 @@ const BtnComp = {
   }
 };
 
+const getOptionsValue = opts => {
+  let opt = null,
+      del = null;
+  del = _serverEnums.OptionsFlag.DEL === (_serverEnums.OptionsFlag.DEL & options);
+  return {
+    opt,
+    del
+  };
+};
+
 const processState = (deliverAuth, collect, state) => {
   const {
     options
@@ -156,36 +170,32 @@ const processState = (deliverAuth, collect, state) => {
         opts = options === (options & deliverAuth) ? options : deliverAuth;
   let btns = {};
 
-  switch (opts) {
-    //设置按钮权限
-    case _serverEnums.OptionsFlag.ADD:
-      btns = {
-        Insert: BtnComp.Insert,
-        Submit: BtnComp.Submit,
-        Rollback: BtnComp.Rollback,
-        Cancel: BtnComp.Cancel,
-        Back: BtnComp.Back,
-        Add: BtnComp.Add,
-        Edit: BtnComp.Edit
-      };
-      break;
-
-    case _serverEnums.OptionsFlag.EDIT:
-      btns = {
-        Submit: BtnComp.Submit,
-        Rollback: BtnComp.Rollback,
-        Cancel: BtnComp.Cancel,
-        Edit: BtnComp.Edit,
-        Back: BtnComp.Back
-      };
-      break;
+  if (_serverEnums.OptionsFlag.ADD === (_serverEnums.OptionsFlag.ADD & opts)) {
+    btns = {
+      Insert: BtnComp.Insert,
+      Submit: BtnComp.Submit,
+      Rollback: BtnComp.Rollback,
+      Cancel: BtnComp.Cancel,
+      Back: BtnComp.Back,
+      Add: BtnComp.Add,
+      Edit: BtnComp.Edit
+    };
+  } else if (_serverEnums.OptionsFlag.EDIT === (_serverEnums.OptionsFlag.EDIT & opts)) {
+    btns = {
+      Submit: BtnComp.Submit,
+      Rollback: BtnComp.Rollback,
+      Cancel: BtnComp.Cancel,
+      Edit: BtnComp.Edit,
+      Back: BtnComp.Back
+    };
+  } else {
+    btns = {
+      Back: BtnComp.Back
+    };
+  }
 
-    case _serverEnums.OptionsFlag.QUERY:
-    default:
-      btns = {
-        Back: BtnComp.Back
-      };
-      break;
+  if (_serverEnums.OptionsFlag.DEL === (_serverEnums.OptionsFlag.DEL & opts)) {
+    btns.Delete = BtnComp.Delete;
   }
 
   switch (state) {
@@ -196,6 +206,7 @@ const processState = (deliverAuth, collect, state) => {
       delete btns.Back;
       delete btns.Add;
       delete btns.Edit;
+      delete btns.Delete;
       break;
 
     case _serverEnums.OptionsState.EDIT:
@@ -203,6 +214,7 @@ const processState = (deliverAuth, collect, state) => {
       delete btns.Add;
       delete btns.Edit;
       delete btns.Back;
+      delete btns.Delete;
       break;
 
     case _serverEnums.OptionsState.VIEW:

package/mesh/form/standardViewForm.js

@@ -5,6 +5,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
+require("core-js/modules/web.dom.iterable.js");
+
 var _react = _interopRequireDefault(require("react"));
 
 var _propTypes = _interopRequireDefault(require("prop-types"));
@@ -13,12 +15,35 @@ var _standardForm = _interopRequireDefault(require("./standardForm"));
 
 var _viewCellItem = _interopRequireDefault(require("./item/viewCellItem"));
 
+var _antd = require("antd");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 /**
  * 表單視圖
  */
 class StandardViewForm extends _standardForm.default {
+  beginSubmit() {
+    const {
+      fieldList
+    } = this.props.collect,
+          {
+      data
+    } = this.props,
+          retData = [];
+
+    for (let column of fieldList) {
+      const value = data[column.label];
+      retData.push({
+        label: column.label,
+        origin: value,
+        value
+      });
+    }
+
+    return retData;
+  }
+
   endSubmit() {}
 
   render() {

package/mesh/hoc/withReduxSearch.js

@@ -121,8 +121,8 @@ class ReduxSearchItemWrapper extends _react.default.Component {
       }
     });
 
-    _defineProperty(this, "handleSearchChange", (value, label) => {
-      this.props.reduxSearch.setValue(label, value);
+    _defineProperty(this, "handleSearchChange", (value, label, defaultCond) => {
+      this.props.reduxSearch.setValue(label, value, defaultCond);
     });
 
     _defineProperty(this, "handleConditionChange", (value, label) => {

package/mesh/pages/collectEntry.d.ts

@@ -0,0 +1,9 @@
+import * as React from "react";
+
+interface Props {}
+
+/**
+ * 用于覆盖Collect的承接页面
+ */
+declare class CollectEntry extends React.Component<Props> {}
+export default CollectEntry

package/mesh/pages/collectEntry.js

@@ -0,0 +1,55 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _react = _interopRequireDefault(require("react"));
+
+var _formQueryAbleTable = _interopRequireDefault(require("../table/formQueryAbleTable"));
+
+var _uepayOps = require("uepay-ops2");
+
+var _tool = require("uepay-ops2/lib/util/tool");
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+/**
+ *
+ */
+class CollectEntry extends _react.default.Component {
+  static getInitialProps(_ref) {
+    let {
+      query
+    } = _ref;
+
+    if (query) {
+      return {
+        mesh: query.mesh
+      };
+    } else {
+      return {};
+    }
+  }
+
+  render() {
+    const {
+      mesh
+    } = this.props,
+          {
+      id,
+      type,
+      flag
+    } = (0, _tool.decodeMeshPath)(mesh);
+    return /*#__PURE__*/_react.default.createElement(_formQueryAbleTable.default, {
+      deliverAuth: flag,
+      host: (0, _uepayOps.getHost)(),
+      collectId: id
+    });
+  }
+
+}
+
+var _default = CollectEntry;
+exports.default = _default;

package/mesh/table/formQueryAbleTable.js

@@ -21,6 +21,8 @@ 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); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }

package/mesh/table/queryAbleTable.js

@@ -341,6 +341,7 @@ class QueryAbleTable extends _react.default.Component {
             this.tableDom = dom;
           },
           deliverAuth: deliverAuth,
+          collectId: this.collectId,
           collect: this.collect,
           columns: fieldList,
           options: options,

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

@@ -0,0 +1,134 @@
+"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 _uepayOps = require("uepay-ops2");
+
+var _serverEnums = require("../../../config/serverEnums");
+
+var _antd = require("antd");
+
+var _DeleteOutlined = _interopRequireDefault(require("@ant-design/icons/lib/icons/DeleteOutlined"));
+
+var _remove = require("../../../crud/remove");
+
+var _LoadingOutlined = _interopRequireDefault(require("@ant-design/icons/lib/icons/LoadingOutlined"));
+
+var _queryAbleTableContext = require("../../context/queryAbleTableContext");
+
+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; }
+
+const icon = /*#__PURE__*/_react.default.createElement(_LoadingOutlined.default, {
+  style: {
+    fontSize: 16
+  },
+  spin: true
+});
+/**
+ *
+ * @param collectId
+ * @param collect
+ * @param pkColumn
+ * @param deliverAuth
+ * @param text
+ * @param record
+ * @return {*}
+ * @constructor
+ */
+
+
+function DeleteRow(_ref) {
+  let {
+    collectId,
+    collect,
+    pkColumn,
+    deliverAuth,
+    text,
+    record
+  } = _ref;
+  return /*#__PURE__*/_react.default.createElement(_queryAbleTableContext.Consumer, null, function (_ref2) {
+    let {
+      flush
+    } = _ref2;
+    return /*#__PURE__*/_react.default.createElement(DeleteOptions, {
+      collectId: collectId,
+      collect: collect,
+      pkColumn: pkColumn,
+      deliverAuth: deliverAuth,
+      flush: flush,
+      text: text,
+      record: record
+    });
+  });
+}
+
+var _default = DeleteRow;
+exports.default = _default;
+const ERR = {
+  color: 'red'
+};
+
+function DeleteOptions(_ref3) {
+  let {
+    collectId,
+    collect,
+    pkColumn,
+    deliverAuth,
+    flush,
+    text,
+    record
+  } = _ref3;
+  const {
+    options
+  } = collect,
+        [loading, setLoading] = (0, _react.useState)(false),
+        [err, setErr] = (0, _react.useState)(false);
+
+  function handleSubmit() {
+    setLoading(true);
+    (0, _remove.removeRecords)({
+      host: (0, _uepayOps.getHost)(),
+      collect,
+      collectId,
+      records: [record],
+      bpm: {
+        isDraft: false
+      },
+      handle: handleResult
+    });
+  }
+
+  function handleResult(state, msg, sucPkList) {
+    if ('SUC' === state) {
+      flush();
+    } else {
+      setErr(true);
+    }
+
+    setLoading(false);
+  }
+
+  return _serverEnums.OptionsFlag.DEL === (deliverAuth & _serverEnums.OptionsFlag.DEL) && _serverEnums.OptionsFlag.DEL === (options & _serverEnums.OptionsFlag.DEL) ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_antd.Divider, {
+    type: "vertical"
+  }), loading ? /*#__PURE__*/_react.default.createElement("span", null, /*#__PURE__*/_react.default.createElement("a", null, /*#__PURE__*/_react.default.createElement(_antd.Spin, {
+    indicator: icon
+  }))) : /*#__PURE__*/_react.default.createElement(_antd.Popconfirm, {
+    title: "刪除後將無法恢復,確認刪除該行數據?",
+    onConfirm: handleSubmit,
+    okText: "\u786E\u8BA4",
+    cancelText: "\u53D6\u6D88"
+  }, /*#__PURE__*/_react.default.createElement("a", null, /*#__PURE__*/_react.default.createElement("span", {
+    style: err ? ERR : {}
+  }, /*#__PURE__*/_react.default.createElement(_DeleteOutlined.default, null))))) : null;
+}

package/mesh/table/standardTable/actionColumnForm.js

@@ -13,7 +13,9 @@ var _antd = require("antd");
 
 var _serverEnums = require("../../config/serverEnums");
 
-var _optionsFormQueryAbleTableContext = require("../context/optionsFormQueryAbleTableContext");
+var _DeleteOutlined = _interopRequireDefault(require("@ant-design/icons/lib/icons/DeleteOutlined"));
+
+var _deleteRow = _interopRequireDefault(require("./actionColumnForm/deleteRow"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -23,6 +25,7 @@ const {
 } = _antd.Table;
 /**
  *
+ * @param collectId 数据集ID，如果是预览模式该值不存在
  * @param collect
  * @param pkColumn
  * @param deliverAuth {Number} 传递权限
@@ -33,6 +36,7 @@ const {
 
 const actionColumnForm = _ref => {
   let {
+    collectId,
     collect,
     pkColumn,
     deliverAuth,
@@ -49,13 +53,20 @@ const actionColumnForm = _ref => {
         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, {
+      }, /*#__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("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
+      }));
     }
   });
 };

package/mesh/table/standardTable/tableOptions.js

@@ -185,7 +185,7 @@ class TableOptions extends _react.default.Component {
   }
 
   static checkAddAuth(opt, auth, deliverAuth) {
-    return opt && deliverAuth >= _serverEnums.OptionsFlag.ADD && auth >= _serverEnums.OptionsFlag.ADD;
+    return opt && deliverAuth >= _serverEnums.OptionsFlag.ADD && _serverEnums.OptionsFlag.ADD === (auth & _serverEnums.OptionsFlag.ADD);
   }
 
   render() {

package/mesh/table/standardTable.d.ts

@@ -56,6 +56,12 @@ export interface Options {
 }
 
 interface Props {
+
+    /**
+     * 数据集ID
+     */
+    collectId?: number;
+
     /**
      * 传递权限
      */

package/mesh/table/standardTable.js

@@ -451,6 +451,7 @@ class StandardTable extends _react.default.Component {
     const {
       result,
       loading,
+      collectId,
       collect,
       options,
       deliverAuth,
@@ -521,6 +522,7 @@ class StandardTable extends _react.default.Component {
     }), action && onAction && action({
       //显示控制列
       deliverAuth,
+      collectId,
       collect,
       pkColumn: this.pkColumn,
       onAction: onAction
@@ -532,7 +534,8 @@ class StandardTable extends _react.default.Component {
 StandardTable.propTypes = {
   options: _propTypes.default.oneOfType([_propTypes.default.bool, _propTypes.default.object]),
   loading: _propTypes.default.bool.isRequired,
-  collect: _propTypes.default.object,
+  collectId: _propTypes.default.number,
+  collect: _propTypes.default.object.isRequired,
   deliverAuth: _propTypes.default.number,
   //传递权限，用于限制设置权限
   result: _propTypes.default.object.isRequired,

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "uepay-mesh",
-    "version": "3.0.11",
+    "version": "4.0.1",
     "description": "数据中心数据集设计工具前端",
     "main": "index.js",
     "typings": "index.d.ts",
@@ -44,7 +44,7 @@
         "node-sass": "^4.13.0",
         "react": "^16.12.0",
         "react-dom": "^16.12.0",
-        "uepay-mesh": "^3.0.10",
-        "uepay-ops2": "^3.0.2"
+        "uepay-mesh": "4.0.1",
+        "uepay-ops2": "4.0.1"
     }
 }