uepay-mesh 4.0.2-beta → 4.0.4

package/mesh/config/serverEnums.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.UpdateState = exports.TableUpdateFlag = exports.TableOrderTypeMapping = exports.ShowType = exports.RelationType = exports.QueryType = exports.OrderType = exports.OptionsState = exports.OptionsFlag = exports.OptionsDict = exports.DefaultConditionValue = exports.ConditionType = exports.ColumnSecurityOptions = exports.ColumnSecurity = exports.BETWEENCondMapping = exports.AlisaFlag = void 0;
+exports.UpdateState = exports.TableUpdateFlag = exports.TableOrderTypeMapping = exports.ShowTypeList = exports.ShowType = exports.RelationType = exports.QueryType = exports.OrderType = exports.OptionsState = exports.OptionsFlag = exports.OptionsDict = exports.DefaultConditionValue = exports.ConditionType = exports.ColumnSecurityOptions = exports.ColumnSecurity = exports.BETWEENCondMapping = exports.AlisaFlag = void 0;
 
 /**
  * 匹配模式的字典
@@ -101,33 +101,41 @@ const TableOrderTypeMapping = {
   ascend: 'ASC',
   descend: 'DESC'
 };
+exports.TableOrderTypeMapping = TableOrderTypeMapping;
+const ShowType = {
+  NONE: {
+    value: 'NONE',
+    label: '缺省',
+    tip: '不顯示不查詢不傳輸'
+  },
+  HIDE: {
+    value: 'HIDE',
+    label: '隱藏',
+    tip: '不在列表、表單中顯示，但是會傳輸'
+  },
+  LIST: {
+    value: 'LIST',
+    label: '列显示',
+    tip: '僅在列表中顯示'
+  },
+  FORM: {
+    value: 'FORM',
+    label: '表显示',
+    tip: '盡再表單中顯示'
+  },
+  ALL: {
+    value: 'ALL',
+    label: '全显示',
+    tip: '會在列、表單中都顯示'
+  }
+};
 /**
  * 顯示類型
  * @type {*[]}
  */
 
-exports.TableOrderTypeMapping = TableOrderTypeMapping;
-const ShowType = [{
-  value: 'NONE',
-  label: '缺省',
-  tip: '不顯示不查詢不傳輸'
-}, {
-  value: 'HIDE',
-  label: '隱藏',
-  tip: '不在列表、表單中顯示，但是會傳輸'
-}, {
-  value: 'LIST',
-  label: '列显示',
-  tip: '僅在列表中顯示'
-}, {
-  value: 'FORM',
-  label: '表显示',
-  tip: '盡再表單中顯示'
-}, {
-  value: 'ALL',
-  label: '全显示',
-  tip: '會在列、表單中都顯示'
-}]; // /**
+exports.ShowType = ShowType;
+const ShowTypeList = [ShowType.NONE, ShowType.HIDE, ShowType.LIST, ShowType.FORM, ShowType.ALL]; // /**
 //  * 表單編輯狀態
 //  * @deprecated
 //  * @type {*[]}
@@ -152,7 +160,7 @@ const ShowType = [{
  * @type {{"1": number, "3": number, "7": number, "15": number}}
  */
 
-exports.ShowType = ShowType;
+exports.ShowTypeList = ShowTypeList;
 const OptionsFlag = {
   QUERY: 1,
   //查詢 1

package/mesh/data/reduxSearch.js

@@ -69,6 +69,14 @@ class ReduxSearch {
     this.scribe();
   }
 
+  remove(label) {
+    this.search = _objectSpread({}, this.search);
+    this.condition = _objectSpread({}, this.condition);
+    delete this.search[label];
+    delete this.condition[label];
+    this.scribe();
+  }
+
   scribe() {
     for (let consumer of this.listener) {
       consumer(this.search, this.condition);

package/mesh/data/reduxTableLabel.js

@@ -0,0 +1,159 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.buildReduxTableLabel = buildReduxTableLabel;
+
+require("core-js/modules/web.dom.iterable.js");
+
+var _localStore = require("./localStore");
+
+var _serverEnums = require("../config/serverEnums");
+
+const IncludeTableKeysName = 'TableIncludeKeysOptions',
+      ExcludeTableKeysName = 'TableExcludeKeysOptions';
+/**
+ * 读取本地存储数据
+ * @param collectId
+ * @returns {{excludeKeys: {}, includesKeys: {}}}
+ */
+
+function getLocalStorage(collectId) {
+  let includesKeys, excludeKeys;
+
+  if (collectId) {
+    includesKeys = (0, _localStore.get)("".concat(IncludeTableKeysName).concat(collectId));
+    excludeKeys = (0, _localStore.get)("".concat(ExcludeTableKeysName).concat(collectId));
+  }
+
+  return {
+    includesKeys: includesKeys || {},
+    excludeKeys: excludeKeys || {}
+  };
+}
+/**
+ * 设置本地存储数据
+ * @param collectId
+ * @param includesKeys
+ * @param excludeKeys
+ */
+
+
+function setLocalStorage(collectId, includesKeys, excludeKeys) {
+  if (collectId) {
+    (0, _localStore.put)("".concat(IncludeTableKeysName).concat(collectId), includesKeys);
+    (0, _localStore.put)("".concat(ExcludeTableKeysName).concat(collectId), excludeKeys);
+  }
+}
+/**
+ * 根据 columns, includesKeys, excludeKeys 的参数重建 actKeys。重建过程只修改数据，不会改变actKeys的指针地址
+ * @param columns
+ * @param includesKeys
+ * @param excludeKeys
+ * @returns {*}
+ */
+
+
+function buildActKeys(columns, includesKeys, excludeKeys) {
+  const actKeys = {};
+
+  for (let col of columns) {
+    if (_serverEnums.ShowType.ALL.value === col.show || _serverEnums.ShowType.LIST.value === col.show) {
+      !excludeKeys[col.column] && (actKeys[col.column] = 1);
+    } else {
+      includesKeys[col.column] && (actKeys[col.column] = 1);
+    }
+  }
+
+  return actKeys;
+}
+/**
+ *
+ * @param collectId
+ * @param columns
+ * @returns {{excludeKeys: {}, actKeys: *, includesKeys: {}}}
+ */
+
+
+function initKeys(collectId, columns) {
+  const {
+    includesKeys,
+    excludeKeys
+  } = getLocalStorage(collectId);
+  return {
+    actKeys: buildActKeys(columns, includesKeys, excludeKeys),
+    includesKeys,
+    excludeKeys
+  };
+}
+/**
+ * 对外实例，用于管理单个Table的显示标签。對象中的KEY一般對於字段的column值。
+ * @param collectId
+ * @param columns
+ * @param flushCall
+ * @constructor
+ */
+
+
+function ReduxTableLabel(collectId, columns, flushCall) {
+  let {
+    actKeys,
+    includesKeys,
+    excludeKeys
+  } = initKeys(collectId, columns);
+
+  this.getColumns = () => columns;
+
+  this.getActKeys = () => actKeys;
+
+  this.getDisableKeyList = () => columns.map(col => col.column).filter(key => !actKeys[key]);
+
+  this.included = function (keys) {
+    for (let key of keys) {
+      includesKeys[key] = 1;
+      delete excludeKeys[key];
+      actKeys[key] = 1;
+    }
+
+    setLocalStorage(collectId, includesKeys, excludeKeys);
+    flushCall(actKeys);
+  };
+
+  this.excluded = function (keyList) {
+    for (let key of keyList) {
+      excludeKeys[key] = 1;
+      delete includesKeys[key];
+      delete actKeys[key];
+    }
+
+    setLocalStorage(collectId, includesKeys, excludeKeys);
+    flushCall(actKeys);
+  };
+  /**
+   * 根據字段的關鍵字進行刪除
+   * @param key
+   */
+
+
+  this.remove = function (key) {
+    excludeKeys[key] = 1;
+    delete includesKeys[key];
+    delete actKeys[key];
+    setLocalStorage(collectId, includesKeys, excludeKeys);
+    flushCall(actKeys);
+  };
+
+  this.reset = function () {
+    excludeKeys = {};
+    includesKeys = {};
+    actKeys = {};
+    columns.filter(col => _serverEnums.ShowType.ALL.value === col.show || _serverEnums.ShowType.LIST.value === col.show).map(col => col.column).forEach(key => actKeys[key] = 1);
+    setLocalStorage(collectId, includesKeys, excludeKeys);
+    flushCall(actKeys);
+  };
+}
+
+function buildReduxTableLabel(collectId, columns, flushCall) {
+  return new ReduxTableLabel(collectId, columns, flushCall);
+}

package/mesh/excel/processor.js

@@ -74,7 +74,7 @@ const modifyAbleHeaderRow = collect => {
         explainHeaderRow = [],
         displayHeaderRow = [],
         colsOptions = [],
-        NONE = _serverEnums.ShowType[0].value,
+        NONE = _serverEnums.ShowType.NONE.value,
         fieldLabelDict = {},
         formatDict = {},
         rowsOptions = [{
@@ -82,14 +82,15 @@ const modifyAbleHeaderRow = collect => {
   }, {
     hidden: true
   }];
+  let field;
 
-  for (let field of collect.fieldList) {
+  for (field of collect.fieldList) {
     fieldLabelDict[field.label] = field;
     formatDict[field.label] = obtainFormat(field.component);
   }
 
-  for (let field of collect.fieldList) {
-    if (NONE !== collect.show) {
+  for (field of collect.fieldList) {
+    if (NONE !== field.show) {
       colsOptions.push({
         wch: 15
       });

package/mesh/table/standardTable/searchExtend.js

@@ -41,6 +41,7 @@ const TabPane = _antd.Tabs.TabPane,
  * @param labelColumnDict
  * @param search
  * @param condition
+ * @param onChange
  * @return {*}
  * @constructor
  */

package/mesh/table/standardTable/{tableOptons/labelShowOptions.js → tableLabelExtend.js}

@@ -5,8 +5,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
-require("core-js/modules/es6.regexp.to-string.js");
-
 require("core-js/modules/web.dom.iterable.js");
 
 var _react = _interopRequireWildcard(require("react"));
@@ -17,81 +15,65 @@ 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 mockData = [];
-
-for (let i = 0; i < 20; i++) {
-  mockData.push({
-    key: i.toString(),
-    title: "content".concat(i + 1),
-    description: "description of content".concat(i + 1),
-    disabled: i % 3 < 1
-  });
-}
-
-function strList2Dict(list) {
-  let dict = {};
-
-  for (let item of list) {
-    dict[item] = 1;
-  }
-
-  return dict;
-}
-
-function strDict2List(dict) {
-  const keys = Object.keys(dict);
-  return keys.map(key => key);
+/**
+ *
+ * @param reduxTableLabel
+ * @returns {[String]}
+ */
+function initTargetKeys(reduxTableLabel) {
+  const actKeys = reduxTableLabel.getActKeys();
+  return reduxTableLabel.getColumns().filter(col => !actKeys[col.column]).map(col => col.column);
 }
 /**
  *
- * @param allField
- * @param excludeKeys
- * @param onSet
+ * @param reduxTableLabel {ReduxTableLabel} ReduxTableLabel的实例
+ * @param children {ReactDOM} 子标签，标签必须包含onClick方法
  * @return {*}
  * @constructor
  */
 
 
-function LabelShowOptions(_ref) {
+function TableLabelExtend(_ref) {
   let {
-    allField,
-    excludeKeys,
-    onSet
+    reduxTableLabel,
+    children
   } = _ref;
-  let list = strDict2List(excludeKeys);
+
   const [visible, setVisible] = (0, _react.useState)(false),
-        [targetKeys, setTargetKeys] = (0, _react.useState)(list);
-  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_antd.Button, {
-    size: "small",
-    onClick: () => {
+        comp = /*#__PURE__*/_react.default.cloneElement(_react.default.Children.only(children), {
+    onClick: function onClick(e) {
       setVisible(true);
     }
-  }, "\u8A2D\u7F6E"), /*#__PURE__*/_react.default.createElement(_antd.Modal, {
+  });
+
+  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, comp, /*#__PURE__*/_react.default.createElement(_antd.Modal, {
     zIndex: 1001,
     visible: visible,
+    okText: "\u91CD\u7F6E",
     onOk: () => {
-      onSet(strList2Dict(targetKeys));
-      setVisible(false);
+      reduxTableLabel.reset();
     },
+    cancelText: "\u5173\u95ED",
     onCancel: () => {
       setVisible(false);
     }
   }, /*#__PURE__*/_react.default.createElement(_antd.Transfer, {
     titles: ['显示', '隐藏'],
-    dataSource: allField.map(item => ({
+    dataSource: reduxTableLabel.getColumns().map(item => ({
       key: item.column,
       title: item.display
     })),
-    onChange: (nextTargetKeys, direction, moveKeys) => {
-      setTargetKeys(nextTargetKeys);
+    onChange: (next, direction, keyList) => {
+      if ('left' === direction) {
+        reduxTableLabel.included(keyList);
+      } else if ('right') {
+        reduxTableLabel.excluded(keyList);
+      }
     },
-    targetKeys: targetKeys,
+    targetKeys: reduxTableLabel.getDisableKeyList(),
     render: item => item.title
   })));
 }
 
-LabelShowOptions.defaultProps = {
-  excludeKeys: []
-};
-var _default = LabelShowOptions;
+var _default = TableLabelExtend;
 exports.default = _default;

package/mesh/table/standardTable/tableOptions.js

@@ -11,8 +11,6 @@ var _react = _interopRequireDefault(require("react"));
 
 var _propTypes = _interopRequireDefault(require("prop-types"));
 
-var _labelShowOptions = _interopRequireDefault(require("./tableOptons/labelShowOptions"));
-
 var _icons = require("@ant-design/icons");
 
 var _antd = require("antd");
@@ -29,13 +27,14 @@ var _OrderedListOutlined = _interopRequireDefault(require("@ant-design/icons/lib
 
 var _multiOptions = _interopRequireDefault(require("./tableOptons/multiOptions"));
 
+var _tableLabelExtend = _interopRequireDefault(require("./tableLabelExtend"));
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 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,
-      LocalStorageName = 'localUserOptions',
-      ExcludeTableKeysName = 'TableExcludeKeysOptions';
+      LocalStorageName = 'localUserOptions';
 const Options = {
   tableSize: [{
     value: 'middle',
@@ -70,17 +69,14 @@ const DefOptions = {
   columnRelation: Options.columnRelation[0].value,
   pageSize: Options.pageSize[1].value
 };
-const DefExcludeKeys = {};
 /**
  *
  * @return {{columnRelation: *, tableSize: *, pageSize: *}}
  */
 
 const initOptions = collectId => {
-  const options = (0, _localStore.get)(LocalStorageName),
-        excludeKeys = collectId && (0, _localStore.get)("".concat(ExcludeTableKeysName).concat(collectId));
+  const options = (0, _localStore.get)(LocalStorageName);
   let retOptions = options ? options : DefOptions;
-  retOptions.excludeKeys = excludeKeys ? excludeKeys : DefExcludeKeys;
   return retOptions;
 };
 /**
@@ -91,7 +87,7 @@ const initOptions = collectId => {
  * @param props.collect {Object} 数据集对象
  * @param props.columns {Array} 已经过滤的列表显示字段
  * @param props.onMultiple {Function} (multiVisible)=>{是否激活多选}
- * @param props.onModify {Function} (options:{tableSize, columnRelation, pageSize, excludeKeys})=>{}
+ * @param props.onModify {Function} (options:{tableSize, columnRelation, pageSize})=>{}
  * @example options：{
  *     excel: 显示Excel操作框
  *     add:显示添加按钮
@@ -123,8 +119,7 @@ class TableOptions extends _react.default.Component {
       const {
         tableSize,
         columnRelation,
-        pageSize,
-        excludeKeys
+        pageSize
       } = this.state,
             {
         collectId
@@ -132,12 +127,10 @@ class TableOptions extends _react.default.Component {
             options = {
         tableSize,
         columnRelation,
-        pageSize,
-        excludeKeys
+        pageSize
       };
       (0, _localStore.put)(LocalStorageName, options); //本地存储
 
-      collectId && excludeKeys && (0, _localStore.put)("".concat(ExcludeTableKeysName).concat(collectId), excludeKeys);
       this.props.onModify(options);
     });
 
@@ -177,24 +170,16 @@ class TableOptions extends _react.default.Component {
       this.props.onAction(_serverEnums.OptionsState.ADD);
     });
 
-    _defineProperty(this, "handleExcludeField", excludeKeys => {
-      this.setState({
-        excludeKeys
-      });
-    });
-
     const {
       tableSize: _tableSize,
       columnRelation: _columnRelation,
-      pageSize: _pageSize,
-      excludeKeys: _excludeKeys
+      pageSize: _pageSize
     } = initOptions(this.props.collect && this.props.collect.collectId);
     this.state = {
       visible: false,
       tableSize: _tableSize,
       columnRelation: _columnRelation,
-      pageSize: _pageSize,
-      excludeKeys: _excludeKeys
+      pageSize: _pageSize
     };
   }
 
@@ -226,17 +211,16 @@ class TableOptions extends _react.default.Component {
       visible,
       tableSize,
       pageSize,
-      columnRelation,
-      excludeKeys
+      columnRelation
     } = this.state,
           {
       loading,
       collect,
-      columns,
       options,
       deliverAuth,
       multiple,
       reduxSearch,
+      reduxTableLabel,
       onMultiDelete
     } = this.props;
     return /*#__PURE__*/_react.default.createElement("span", null, multiple ? /*#__PURE__*/_react.default.createElement(_multiOptions.default, {
@@ -269,11 +253,11 @@ class TableOptions extends _react.default.Component {
       onCancel: this.handleCancel
     }, /*#__PURE__*/_react.default.createElement("div", {
       className: "uepay-standard-table-opt-item"
-    }, "\u96B1\u85CF\u5B57\u6BB5:", /*#__PURE__*/_react.default.createElement(_labelShowOptions.default, {
-      allField: columns,
-      excludeKeys: excludeKeys,
-      onSet: this.handleExcludeField
-    })), /*#__PURE__*/_react.default.createElement("div", {
+    }, "\u96B1\u85CF\u5B57\u6BB5:", /*#__PURE__*/_react.default.createElement(_tableLabelExtend.default, {
+      reduxTableLabel: reduxTableLabel
+    }, /*#__PURE__*/_react.default.createElement(_antd.Button, {
+      size: "small"
+    }, "\u8A2D\u7F6E"))), /*#__PURE__*/_react.default.createElement("div", {
       className: "uepay-standard-table-opt-item"
     }, "\u8868\u683C\u5C3A\u5BF8\uFF1A", /*#__PURE__*/_react.default.createElement(_antd.Radio.Group, {
       onChange: this.handleTableSizeChange,

package/mesh/table/standardTable/thColumn.js

@@ -1,5 +1,7 @@
 "use strict";
 
+require("core-js/modules/es6.symbol.js");
+
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -23,11 +25,21 @@ 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); }
 
+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; }
+
 const {
   Column
 } = _antd.Table;
 const Style = {
   maxWidth: '7rem'
+},
+      TooltipProps = {
+  color: '#FFF',
+  placement: 'bottomLeft'
 };
 /**
  * @param collect {Object} 数据集对象
@@ -40,6 +52,7 @@ const Style = {
  * @param field.component.view {Function} React 顯示組件
  * @param field.component.config {Object} 组件录入的配置信息
  * @param field.component.type {String} 组件录入的配置信息
+ * @param reduxTableLabel {ReduxTableLabel} 搜索相关的内容以及管理容器
  * @param reduxSearch {ReduxSearch} 搜索相关的内容以及管理容器
  * @param labelSearchDict {Object} 上一次搜索内容的字典
  * @param deliverAuth {Number} 传递权限
@@ -53,6 +66,7 @@ const thColumn = _ref => {
     collect,
     field,
     reduxSearch,
+    reduxTableLabel,
     labelSearchDict,
     deliverAuth,
     onSearch
@@ -69,6 +83,13 @@ const thColumn = _ref => {
   let value, searchValue;
   return /*#__PURE__*/_react.default.createElement(Column, _extends({
     key: label,
+    showSorterTooltip: _objectSpread({
+      title: /*#__PURE__*/_react.default.createElement(ColumnOptions, {
+        field: field,
+        reduxSearch: reduxSearch,
+        reduxTableLabel: reduxTableLabel
+      })
+    }, TooltipProps),
     title: /*#__PURE__*/_react.default.createElement(_withReduxSearch.ReduxSearchItemWrapper, {
       display: display,
       reduxSearch: reduxSearch,
@@ -149,4 +170,49 @@ function columnProperties(_ref3) {
       filterIcon: /*#__PURE__*/_react.default.createElement(_icons.SearchOutlined, null)
     };
   }
+}
+
+function ColumnOptions(_ref4) {
+  let {
+    field,
+    reduxSearch,
+    reduxTableLabel
+  } = _ref4;
+  return /*#__PURE__*/_react.default.createElement("div", {
+    className: "uepay-standard-table-label"
+  }, /*#__PURE__*/_react.default.createElement(ColumnHideShow, {
+    field: field,
+    reduxTableLabel: reduxTableLabel
+  }), /*#__PURE__*/_react.default.createElement(ColumnCleanSearch, {
+    field: field,
+    reduxSearch: reduxSearch
+  }));
+}
+
+function ColumnHideShow(_ref5) {
+  let {
+    field,
+    reduxTableLabel
+  } = _ref5;
+  return /*#__PURE__*/_react.default.createElement("a", {
+    onClick: e => {
+      e.stopPropagation();
+      reduxTableLabel.remove(field.column);
+    },
+    className: "ach"
+  }, /*#__PURE__*/_react.default.createElement(_antd.Space, null, /*#__PURE__*/_react.default.createElement(_icons.EyeInvisibleOutlined, null), /*#__PURE__*/_react.default.createElement("span", null, "\u96B1\u85CF\"", field.display, "\"")));
+}
+
+function ColumnCleanSearch(_ref6) {
+  let {
+    field,
+    reduxSearch
+  } = _ref6;
+  return /*#__PURE__*/_react.default.createElement("a", {
+    onClick: e => {
+      e.stopPropagation();
+      reduxSearch.remove(field.label);
+    },
+    className: "ach"
+  }, /*#__PURE__*/_react.default.createElement(_antd.Space, null, /*#__PURE__*/_react.default.createElement(_icons.EyeInvisibleOutlined, null), /*#__PURE__*/_react.default.createElement("span", null, "\u6E05\u7A7A\"", field.display, "\"\u641C\u7D22\u689D\u4EF6")));
 }

package/mesh/table/standardTable.js

@@ -35,6 +35,12 @@ var _reduxSearch = _interopRequireDefault(require("../data/reduxSearch"));
 
 var _withReduxSearch = require("../hoc/withReduxSearch");
 
+var _reduxTableLabel = require("../data/reduxTableLabel");
+
+var _icons = require("@ant-design/icons");
+
+var _tableLabelExtend = _interopRequireDefault(require("./standardTable/tableLabelExtend"));
+
 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; }
@@ -51,8 +57,9 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 
 const TableShowType = (() => {
   const Show = {};
-  Show[_serverEnums.ShowType[2].value] = true;
-  Show[_serverEnums.ShowType[4].value] = true;
+  Show[_serverEnums.ShowType.ALL.value] = true;
+  Show[_serverEnums.ShowType.FORM.value] = true;
+  Show[_serverEnums.ShowType.LIST.value] = true;
   return Show;
 })();
 /**
@@ -135,6 +142,14 @@ class StandardTable extends _react.default.Component {
   /**
    * label到字段的映射字典
    */
+
+  /**
+   * 用于管理搜索内容的实例
+   */
+
+  /**
+   * 用于管理列表的可显字段
+   */
   constructor() {
     super(...arguments);
 
@@ -148,6 +163,10 @@ class StandardTable extends _react.default.Component {
 
     _defineProperty(this, "labelColumnDict", {});
 
+    _defineProperty(this, "reduxSearch", void 0);
+
+    _defineProperty(this, "reduxTableLabel", void 0);
+
     _defineProperty(this, "handleOptionsChange", _ref => {
       let {
         tableSize,
@@ -179,6 +198,12 @@ class StandardTable extends _react.default.Component {
       })();
     });
 
+    _defineProperty(this, "handleTableLabelChange", actKeys => {
+      this.setState({
+        actKeys
+      });
+    });
+
     _defineProperty(this, "handleMultipleChange", multiVisible => {
       this.multiRows = [];
       this.setState({
@@ -233,18 +258,21 @@ class StandardTable extends _react.default.Component {
       this.props.onAction('Row', record[this.pkColumn.label], record);
     });
 
+    this.processColumns(this.props.collect); //字段數據，將組件的內容清洗為對象格式。
+
+    this.reduxTableLabel = (0, _reduxTableLabel.buildReduxTableLabel)(this.props.collect.collectId, this.columns, this.handleTableLabelChange);
     let {
       columnRelation: _columnRelation,
       tableSize: _tableSize,
       pageSize: _pageSize,
       excludeKeys: _excludeKeys
     } = (0, _tableOptions.initOptions)(this.props.collect.collectId);
-    this.processColumns(this.props.collect); //字段數據，將組件的內容清洗為對象格式。
-
     _pageSize = this.props.pageSize ? this.props.pageSize : _pageSize; //讀取初始化數據
 
     this.state = {
+      actKeys: this.reduxTableLabel.getActKeys(),
       excludeKeys: _excludeKeys,
+      //指示列表顯示排除的字段
       tableSize: _tableSize,
       multiVisible: false //支持table列表的多选操作，目前仅支持删除项。是否激活
 
@@ -488,7 +516,7 @@ class StandardTable extends _react.default.Component {
     } = result,
           {
       tableSize,
-      excludeKeys,
+      actKeys,
       multiVisible
     } = this.state,
           {
@@ -512,7 +540,15 @@ class StandardTable extends _react.default.Component {
       className: "options"
     }, /*#__PURE__*/_react.default.createElement("div", {
       className: "search-ext"
-    }, /*#__PURE__*/_react.default.createElement(_withReduxSearch.ReduxSearchWrapper, {
+    }, /*#__PURE__*/_react.default.createElement(_tableLabelExtend.default, {
+      reduxTableLabel: this.reduxTableLabel
+    }, /*#__PURE__*/_react.default.createElement("a", {
+      className: "column"
+    }, /*#__PURE__*/_react.default.createElement("div", {
+      className: "contain"
+    }, /*#__PURE__*/_react.default.createElement("span", {
+      className: "tip"
+    }, "\u5B57\u6BB5\uFF1A"), /*#__PURE__*/_react.default.createElement(_icons.SplitCellsOutlined, null)))), /*#__PURE__*/_react.default.createElement(_withReduxSearch.ReduxSearchWrapper, {
       reduxSearch: this.reduxSearch,
       Comp: _searchExtend.default,
       labelColumnDict: this.labelColumnDict
@@ -525,14 +561,16 @@ class StandardTable extends _react.default.Component {
       onMultiple: this.handleMultipleChange,
       onMultiDelete: this.handleBatchDelete,
       collect: collect,
-      columns: this.columns,
+      reduxTableLabel: this.reduxTableLabel,
       deliverAuth: deliverAuth,
       reduxSearch: this.reduxSearch,
       onSearch: this.handleSearch,
       onModify: this.handleOptionsChange,
       onExcel: this.handleExcel,
       onAction: onAction
-    }))), /*#__PURE__*/_react.default.createElement(_antd.Table, _extends({
+    }))), /*#__PURE__*/_react.default.createElement("div", {
+      className: "table"
+    }, /*#__PURE__*/_react.default.createElement(_antd.Table, _extends({
       rowSelection: multiVisible ? this.rowSelection : false,
       size: size || tableSize,
       dataSource: dataSource,
@@ -540,12 +578,13 @@ class StandardTable extends _react.default.Component {
       pagination: this.pagination(total),
       loading: loading,
       rowClassName: this.handleRowClass
-    }, extParams), this.columns.filter(item => !excludeKeys[item.column]).map(item => {
+    }, extParams), this.columns.filter(item => actKeys[item.column]).map(item => {
       //显示数据列
       return (0, _thColumn.default)({
-        collect: collect,
+        collect,
         field: item,
         labelSearchDict,
+        reduxTableLabel: this.reduxTableLabel,
         reduxSearch: this.reduxSearch,
         deliverAuth,
         onSearch: this.handleSearch
@@ -557,7 +596,7 @@ class StandardTable extends _react.default.Component {
       collect,
       pkColumn: this.pkColumn,
       onAction: onAction
-    })));
+    }))));
   }
 
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "uepay-mesh",
-    "version": "4.0.2-beta",
+    "version": "4.0.4",
     "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": "4.0.1",
-        "uepay-ops2": "4.0.1"
+        "uepay-mesh": "4.0.4",
+        "uepay-ops2": "4.0.3"
     }
 }

package/style.css

@@ -4,14 +4,38 @@
 
 /*table*/
 /*standard-table*/
+.uepay-standard-table-contain{
+}
+
 .uepay-standard-table {
-    overflow-y: auto;
+    position: relative;
+    display: flex;
+    flex-direction: column;
+    height: 100%;
 }
 
 .uepay-standard-table .th-title-search{
     color: #40a9ff;
 }
 
+/*獨立彈窗*/
+.uepay-standard-table-label{
+    color: #000000;
+}
+
+.uepay-standard-table-label .ach{
+    display: block;
+    padding: .2rem .2rem;
+    color: #40a9ff;
+    text-decoration: underline;
+    border-radius: .1rem;
+}
+
+.uepay-standard-table-label .ach:hover{
+    background-color: #40a9ff;
+    color: #ffffff;
+}
+
 .uepay-standard-table .uepay-row{
     cursor: pointer;
 }
@@ -22,11 +46,27 @@
     justify-content: space-between;
 }
 
+.uepay-standard-table .table{
+    flex-grow: 1;
+    flex-shrink: 1;
+    overflow-y: auto;
+}
+
 .uepay-standard-table .search-ext {
+    display: flex;
     padding: 0;
     width: 45%;
 }
 
+.uepay-standard-table .search-ext .column{
+    padding: 0 1rem;
+    line-height: 1.8rem;
+}
+
+.uepay-standard-table .search-ext .column .contain{
+    border-bottom: 1px solid #f0f0f0;
+}
+
 .uepay-standard-table .search-ext .search-ext-options {
     margin-right: 1rem;
 }