cloud-b2b 1.1.2 → 1.1.3

package/es/Control/Control.js

@@ -334,11 +334,16 @@ var captcha = function captcha(props) {
 };
 
 var uploadImg = function uploadImg(props) {
-  var uploadProps = _objectSpread(_objectSpread({}, props), {}, {
+  var uploadProps = {
     fileList: props.value || [],
+    required: props.require,
+    multiple: false,
+    limitNumber: props.limitNumber || 10,
+    onFileChange: props.onFileChange,
+    needText: props.needText,
+    remark: props.remark,
     readonly: props.readonly || false
-  });
-
+  };
   return /*#__PURE__*/React.createElement(SuperUpload, uploadProps);
 }; // 支持的控件类型
 

package/es/SuperForm/SuperForm.js

@@ -45,7 +45,7 @@ import variables from '../variables';
 var FormItem = _Form.Item;
 var defaultSize = 'small';
 var defaultColNum = 4;
-var TYPE = ['readonly', 'text', 'search', 'searchText', 'select', 'selectText', 'radioGroup', 'number', 'date', 'textArea', 'password', 'editor', 'selectWriting', 'selectSearch', 'empty', 'area', 'uploadImg'];
+var TYPE = ['readonly', 'text', 'search', 'searchText', 'select', 'selectText', 'radioGroup', 'number', 'date', 'textArea', 'password', 'editor', 'selectWriting', 'selectSearch', 'empty', 'area', 'uploadImg', 'cascader'];
 /**
  * key：[必须]，用于唯一标识该Form下的一个表单元素
  * title：[必须]，表单元素的标签
@@ -256,6 +256,10 @@ var SuperForm = /*#__PURE__*/function (_React$Component2) {
       return colNum * 250;
     });
 
+    _defineProperty(_assertThisInitialized(_this2), "getContainer", function () {
+      return _this2.props.getContainer;
+    });
+
     _defineProperty(_assertThisInitialized(_this2), "getControls", function () {
       var _this2$props2 = _this2.props,
           hideControls = _this2$props2.hideControls,
@@ -515,6 +519,17 @@ var SuperForm = /*#__PURE__*/function (_React$Component2) {
       return /*#__PURE__*/React.createElement(Control, props);
     });
 
+    _defineProperty(_assertThisInitialized(_this2), "toCascader", function (props, control) {
+      var container = _this2.getContainer();
+
+      container && (props.getPopupContainer = container);
+      props.options = control.options || [];
+      props.onSearch = _this2.createSearchEvent(control);
+      props.placeholder = props.placeholder || '';
+      props.loadData = _this2.createSearchEvent(control);
+      return /*#__PURE__*/React.createElement(Control, props);
+    });
+
     _defineProperty(_assertThisInitialized(_this2), "toControl", function (props, control) {
       switch (props.type) {
         case 'readonly':
@@ -564,6 +579,9 @@ var SuperForm = /*#__PURE__*/function (_React$Component2) {
         case 'uploadImg':
           return _this2.uploadImg(props, control);
 
+        case 'cascader':
+          return _this2.toCascader(props, control);
+
         default:
           return 'type error';
       }

package/es/SuperForm2/SuperForm.js

@@ -30,7 +30,7 @@ import _mapInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance
 
 function ownKeys(object, enumerableOnly) { var keys = _Object$keys(object); if (_Object$getOwnPropertySymbols) { var symbols = _Object$getOwnPropertySymbols(object); enumerableOnly && (symbols = _filterInstanceProperty(symbols).call(symbols, 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 _context22, _context23; var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? _forEachInstanceProperty(_context22 = ownKeys(Object(source), !0)).call(_context22, function (key) { _defineProperty(target, key, source[key]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(target, _Object$getOwnPropertyDescriptors(source)) : _forEachInstanceProperty(_context23 = ownKeys(Object(source))).call(_context23, function (key) { _Object$defineProperty(target, key, _Object$getOwnPropertyDescriptor(source, key)); }); } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var _context20, _context21; var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? _forEachInstanceProperty(_context20 = ownKeys(Object(source), !0)).call(_context20, function (key) { _defineProperty(target, key, source[key]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(target, _Object$getOwnPropertyDescriptors(source)) : _forEachInstanceProperty(_context21 = ownKeys(Object(source))).call(_context21, function (key) { _Object$defineProperty(target, key, _Object$getOwnPropertyDescriptor(source, key)); }); } return target; }
 
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = _Reflect$construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
 
@@ -45,7 +45,7 @@ import variables from '../variables';
 var FormItem = _Form.Item;
 var defaultSize = 'small';
 var defaultColNum = 4;
-var TYPE = ['readonly', 'text', 'search', 'searchText', 'select', 'selectText', 'radioGroup', 'number', 'date', 'textArea', 'password', 'editor', 'selectWriting', 'selectSearch', 'empty', 'captcha', 'area', 'uploadImg'];
+var TYPE = ['readonly', 'text', 'search', 'searchText', 'select', 'selectText', 'radioGroup', 'number', 'date', 'textArea', 'password', 'editor', 'selectWriting', 'selectSearch', 'empty', 'captcha', 'area', 'uploadImg', 'cascader'];
 /**
  * key：[必须]，用于唯一标识该Form下的一个表单元素
  * title：[必须]，表单元素的标签
@@ -67,9 +67,7 @@ var ControlType = {
   onCheckItem: PropTypes.any,
   showAdd: PropTypes.any,
   rule: PropTypes.object,
-  props: PropTypes.object,
-  buildSuperUploadProps: PropTypes.func //构建type===uploadImg时，SuperUpload组件需要的公共属性函数，已在项目公共文件state.js中提供，可直接引用
-
+  props: PropTypes.object
 };
 
 var Controlled = /*#__PURE__*/function (_React$Component) {
@@ -269,6 +267,10 @@ var SuperForm2 = /*#__PURE__*/function (_React$Component2) {
       return colNum * 1200;
     });
 
+    _defineProperty(_assertThisInitialized(_this2), "getContainer", function () {
+      return _this2.props.getContainer;
+    });
+
     _defineProperty(_assertThisInitialized(_this2), "getControls", function () {
       var _this2$props2 = _this2.props,
           hideControls = _this2$props2.hideControls,
@@ -367,21 +369,13 @@ var SuperForm2 = /*#__PURE__*/function (_React$Component2) {
           onBlur: _bindInstanceProperty(_context14 = _this2.onExitValid).call(_context14, _assertThisInitialized(_this2), key),
           onAreaSearch: _this2.props.onAreaSearch
         });
-      } else if (type === 'uploadImg') {
+      } else {
         var _context15, _context16;
 
-        var commonProps = _this2.props.buildSuperUploadProps ? _this2.props.buildSuperUploadProps() : {};
-        return _objectSpread(_objectSpread(_objectSpread({}, props), commonProps), {}, {
+        return _objectSpread(_objectSpread({}, props), {}, {
           onChange: _bindInstanceProperty(_context15 = _this2.onBlur).call(_context15, _assertThisInitialized(_this2), key),
           onBlur: _bindInstanceProperty(_context16 = _this2.onExitValid).call(_context16, _assertThisInitialized(_this2), key)
         });
-      } else {
-        var _context17, _context18;
-
-        return _objectSpread(_objectSpread({}, props), {}, {
-          onChange: _bindInstanceProperty(_context17 = _this2.onBlur).call(_context17, _assertThisInitialized(_this2), key),
-          onBlur: _bindInstanceProperty(_context18 = _this2.onExitValid).call(_context18, _assertThisInitialized(_this2), key)
-        });
       }
     });
 
@@ -538,17 +532,28 @@ var SuperForm2 = /*#__PURE__*/function (_React$Component2) {
     });
 
     _defineProperty(_assertThisInitialized(_this2), "uploadImg", function (props, control) {
-      var _context19;
+      var _context17;
 
       var readonly = _this2.props.readonly;
       props.required = control.required || false;
-      props.onFileChange = _bindInstanceProperty(_context19 = _this2.onFileChange).call(_context19, _assertThisInitialized(_this2), control);
+      props.onFileChange = _bindInstanceProperty(_context17 = _this2.onFileChange).call(_context17, _assertThisInitialized(_this2), control);
       props.readonly = readonly === true || _Array$isArray(readonly) && _someInstanceProperty(readonly).call(readonly, function (readonlyKey) {
         return readonlyKey === control.key;
       }) ? true : false;
       return /*#__PURE__*/React.createElement(Control, props);
     });
 
+    _defineProperty(_assertThisInitialized(_this2), "toCascader", function (props, control) {
+      var container = _this2.getContainer();
+
+      container && (props.getPopupContainer = container);
+      props.options = control.options || [];
+      props.onSearch = _this2.createSearchEvent(control);
+      props.placeholder = props.placeholder || '';
+      props.loadData = _this2.createSearchEvent(control);
+      return /*#__PURE__*/React.createElement(Control, props);
+    });
+
     _defineProperty(_assertThisInitialized(_this2), "toControl", function (props, control) {
       switch (props.type) {
         case 'readonly':
@@ -601,6 +606,9 @@ var SuperForm2 = /*#__PURE__*/function (_React$Component2) {
         case 'uploadImg':
           return _this2.uploadImg(props, control);
 
+        case 'cascader':
+          return _this2.toCascader(props, control);
+
         default:
           return 'type error';
       }
@@ -612,9 +620,9 @@ var SuperForm2 = /*#__PURE__*/function (_React$Component2) {
           key = _ref11.key;
 
       if (showAdd && type !== 'readonly') {
-        var _context20;
+        var _context18;
 
-        var onClick = _bindInstanceProperty(_context20 = _this2.onAdd).call(_context20, _assertThisInitialized(_this2), key, title);
+        var onClick = _bindInstanceProperty(_context18 = _this2.onAdd).call(_context18, _assertThisInitialized(_this2), key, title);
 
         return /*#__PURE__*/React.createElement("span", null, title, /*#__PURE__*/React.createElement(_Icon, {
           role: "add",
@@ -676,7 +684,7 @@ var SuperForm2 = /*#__PURE__*/function (_React$Component2) {
     });
 
     _defineProperty(_assertThisInitialized(_this2), "toCols", function () {
-      var _context21;
+      var _context19;
 
       var _this2$props4 = _this2.props,
           _this2$props4$colNum = _this2$props4.colNum,
@@ -688,7 +696,7 @@ var SuperForm2 = /*#__PURE__*/function (_React$Component2) {
       }
 
       var span = 24 / colNum;
-      return _mapInstanceProperty(_context21 = _this2.getControls()).call(_context21, function (control) {
+      return _mapInstanceProperty(_context19 = _this2.getControls()).call(_context19, function (control) {
         if (allFullFather) {
           control.allFullFather = allFullFather;
         }

package/es/SuperTable/FilterDropDown.less

@@ -1,30 +1,30 @@
-@import '../variables.less';
-
-.@{cloudlink-prefix}-FilterDropDown {
-  background: white;
-  padding: @padding-vertical @padding-horizontal;
-  border-radius: @border-radius-base;
-  border: 1px solid #d9d9d9;
-
-  > :first-child {
-    width: 135px;
-    margin-right: 10px;
-  }
-  .date{
-    background: white;
-    padding: @padding-vertical @padding-horizontal;
-    border-radius: @border-radius-base;
-    border: 1px solid #d9d9d9;
-
-    > :first-child > div {
-      display: inline-block;
-    }
-
-    > :last-child {
-      text-align: right;
-      margin-top: 5px;
-    }
-  }
-}
-
-
+@import '../variables.less';
+
+.@{cloudlink-prefix}-FilterDropDown {
+  background: white;
+  padding: @padding-vertical @padding-horizontal;
+  border-radius: @border-radius-base;
+  border: 1px solid #d9d9d9;
+
+  > :first-child {
+    width: 135px;
+    margin-right: 10px;
+  }
+  .date{
+    background: white;
+    padding: @padding-vertical @padding-horizontal;
+    border-radius: @border-radius-base;
+    border: 1px solid #d9d9d9;
+
+    > :first-child > div {
+      display: inline-block;
+    }
+
+    > :last-child {
+      text-align: right;
+      margin-top: 5px;
+    }
+  }
+}
+
+

package/es/SuperTable/package.json

@@ -1,6 +1,6 @@
-{
-  "name": "SuperTable",
-  "version": "0.0.0",
-  "private": true,
-  "main": "./SuperTable.js"
-}
+{
+  "name": "SuperTable",
+  "version": "0.0.0",
+  "private": true,
+  "main": "./SuperTable.js"
+}

package/es/SuperTable2/package.json

@@ -1,6 +1,6 @@
-{
-  "name": "SuperTable2",
-  "version": "0.0.0",
-  "private": true,
-  "main": "./SuperTable2.js"
-}
+{
+  "name": "SuperTable2",
+  "version": "0.0.0",
+  "private": true,
+  "main": "./SuperTable2.js"
+}

package/es/SuperUpload/SuperUpload.js

@@ -4,6 +4,9 @@ import _Button from "antd/es/button";
 import _Icon from "antd/es/icon";
 import _asyncToGenerator from "@babel/runtime-corejs3/helpers/asyncToGenerator";
 import _defineProperty from "@babel/runtime-corejs3/helpers/defineProperty";
+
+var _this = this;
+
 import _regeneratorRuntime from "@babel/runtime-corejs3/regenerator";
 
 function ownKeys(object, enumerableOnly) { var keys = _Object$keys(object); if (_Object$getOwnPropertySymbols) { var symbols = _Object$getOwnPropertySymbols(object); enumerableOnly && (symbols = _filterInstanceProperty(symbols).call(symbols, function (sym) { return _Object$getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
@@ -116,9 +119,6 @@ var getUploadProps = function getUploadProps(props, onPreview, fileList, setFile
         while (1) {
           switch (_context2.prev = _context2.next) {
             case 0:
-              props.onRemove && props.onRemove(fileRemove, fileList, fileDeleteList, onFileChange);
-
-            case 1:
             case "end":
               return _context2.stop();
           }
@@ -132,7 +132,7 @@ var getUploadProps = function getUploadProps(props, onPreview, fileList, setFile
   }();
 
   return {
-    action: props.action || '/api/proxy/zuul/archiver-service/file/upload/document',
+    action: _this.props.action || '/api/proxy/zuul/ict-service/file/upload/document',
     fileList: fileList,
     listType: listType,
     multiple: multiple,
@@ -170,11 +170,7 @@ function UploadButton(_ref3) {
       _ref3$limitNumber = _ref3.limitNumber,
       limitNumber = _ref3$limitNumber === void 0 ? 10 : _ref3$limitNumber,
       _ref3$listType = _ref3.listType,
-      listType = _ref3$listType === void 0 ? 'picture-card' : _ref3$listType,
-      _ref3$needText = _ref3.needText,
-      needText = _ref3$needText === void 0 ? false : _ref3$needText,
-      _ref3$remark = _ref3.remark,
-      remark = _ref3$remark === void 0 ? '大小>=5M' : _ref3$remark;
+      listType = _ref3$listType === void 0 ? 'picture-card' : _ref3$listType;
   var canUpload = fileList.length < limitNumber;
   return canUpload ? listType === 'picture-card' ? /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(_Icon, {
     type: "plus"
@@ -196,6 +192,8 @@ function UploadButton(_ref3) {
 }
 
 function SuperUpload(props) {
+  var _this2 = this;
+
   var _useState = useState(true),
       _useState2 = _slicedToArray(_useState, 2),
       loading = _useState2[0],
@@ -206,6 +204,7 @@ function SuperUpload(props) {
       fileList = _useState4[0],
       setFileList = _useState4[1];
 
+  var getFileList = this.props.getFileList;
   useEffect(function () {
     function fetchImgData() {
       return _fetchImgData.apply(this, arguments);
@@ -218,28 +217,15 @@ function SuperUpload(props) {
           while (1) {
             switch (_context3.prev = _context3.next) {
               case 0:
-                if (!props.getFileList) {
-                  _context3.next = 6;
-                  break;
-                }
-
-                _context3.next = 3;
-                return props.getFileList(props.fileList);
-
-              case 3:
-                _context3.t0 = _context3.sent;
-                _context3.next = 7;
-                break;
-
-              case 6:
-                _context3.t0 = [];
+                _context3.next = 2;
+                return getFileList(props.fileList);
 
-              case 7:
-                initFileList = _context3.t0;
+              case 2:
+                initFileList = _context3.sent;
                 setFileList(initFileList);
                 setLoading(false);
 
-              case 10:
+              case 5:
               case "end":
                 return _context3.stop();
             }
@@ -254,13 +240,15 @@ function SuperUpload(props) {
 
   var onPreview = /*#__PURE__*/function () {
     var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(file) {
+      var onPreview;
       return _regeneratorRuntime.wrap(function _callee3$(_context4) {
         while (1) {
           switch (_context4.prev = _context4.next) {
             case 0:
-              props.onPreview && props.onPreview(file, fileList);
+              onPreview = _this2.props.onPreview;
+              onPreview && onPreview(file);
 
-            case 1:
+            case 2:
             case "end":
               return _context4.stop();
           }
@@ -288,7 +276,7 @@ function SuperUpload(props) {
     required: props.required
   }) : null, /*#__PURE__*/React.createElement(_Upload, uploadProps, readonly ? null : /*#__PURE__*/React.createElement(UploadButton, _objectSpread(_objectSpread({}, props), {}, {
     fileList: fileList
-  }))), props.needText ? /*#__PURE__*/React.createElement("span", null, props.remark) : null);
+  }))));
 }
 
 export default SuperUpload;

package/es/Title/Title.less

@@ -1,35 +1,35 @@
-@import '../variables';
-
-.@{cloudlink-prefix}-title {
-  > *:first-child {
-    display: inline-block;
-    color: @brand-primary;
-    line-height: 1.2;
-
-    &[data-border='true'] {
-      padding: 0 5px;
-      border-left: @brand-primary solid 3px;
-    }
-
-    &[data-fold='true'] {
-      cursor: pointer;
-      margin: 8px 0;
-    }
-
-    &[data-required='true'] {
-      &::after {
-        display: inline-block;
-        margin-left: 4px;
-        color: #f5222d;
-        font-size: 12px;
-        font-family: SimSun, sans-serif;
-        line-height: 1;
-        content: '*';
-      }
-    }
-  }
-
-  > [role = 'toolbar'] {
-    display: inline-block;
-  }
-}
+@import '../variables';
+
+.@{cloudlink-prefix}-title {
+  > *:first-child {
+    display: inline-block;
+    color: @brand-primary;
+    line-height: 1.2;
+
+    &[data-border='true'] {
+      padding: 0 5px;
+      border-left: @brand-primary solid 3px;
+    }
+
+    &[data-fold='true'] {
+      cursor: pointer;
+      margin: 8px 0;
+    }
+
+    &[data-required='true'] {
+      &::after {
+        display: inline-block;
+        margin-left: 4px;
+        color: #f5222d;
+        font-size: 12px;
+        font-family: SimSun, sans-serif;
+        line-height: 1;
+        content: '*';
+      }
+    }
+  }
+
+  > [role = 'toolbar'] {
+    display: inline-block;
+  }
+}

package/es/Title/package.json

@@ -1,6 +1,6 @@
-{
-  "name": "Title",
-  "version": "0.0.0",
-  "private": true,
-  "main": "./Title.js"
-}
+{
+  "name": "Title",
+  "version": "0.0.0",
+  "private": true,
+  "main": "./Title.js"
+}

package/es/adjust.less

@@ -1,89 +1,89 @@
-
-.ant-table-small {
-  .ant-table-thead {
-    background-color: @table-header-bg;
-
-    > tr > th {
-      padding: 12px 8px 11px !important;
-    }
-  }
-
-  .ant-table-tbody > tr > td {
-    padding: 8px 8px 7px !important;
-  }
-
-  .ant-table-tbody > tr.ant-table-row-selected td {
-    background-color: @primary-1 !important;
-  }
-
-  .ant-table-tbody > tr:hover:not(.ant-table-expanded-row) > td {
-    background-color: @table-header-bg !important;
-  }
-
-  .ant-table-selection-column {
-    min-width: 62px;
-  }
-
-  table {
-    border-collapse: separate;
-    border-spacing: 0;
-  }
-}
-
-.ant-modal {
-  top: 50px;
-  padding-bottom: 0;
-}
-
-.ant-form-item {
-  margin-bottom: 6px;
-}
-
-.ant-select-sm .ant-select-selection--single {
-  height: @input-height-sm !important;
-  overflow: hidden;
-}
-
-.ant-form-vertical .ant-form-item {
-  padding-bottom: 0;
-}
-
-.ant-form-item-control {
-  line-height: @input-height-sm;
-
-  > .ant-form-explain-holder[aria-hidden='true'] {
-    display: none;
-  }
-}
-
-.ant-form-vertical .ant-form-item-label {
-  padding: 0;
-  line-height: 1.2;
-}
-
-.ant-input-lg {
-  font-size: 12px;
-}
-
-.ant-btn-lg {
-  height: @input-height-lg;
-}
-
-.ant-menu-inline .ant-menu-item {
-  margin-top: 0;
-  margin-bottom: 0 !important;
-}
-
-.ant-modal-header {
-  padding: 13px 16px;
-}
-
-.ant-modal-body {
-  padding: 16px;
-}
-
-.ant-btn-primary:focus {
-  background-color: white;
-  color: @primary-color;
-  text-shadow: none;
-}
+
+.ant-table-small {
+  .ant-table-thead {
+    background-color: @table-header-bg;
+
+    > tr > th {
+      padding: 12px 8px 11px !important;
+    }
+  }
+
+  .ant-table-tbody > tr > td {
+    padding: 8px 8px 7px !important;
+  }
+
+  .ant-table-tbody > tr.ant-table-row-selected td {
+    background-color: @primary-1 !important;
+  }
+
+  .ant-table-tbody > tr:hover:not(.ant-table-expanded-row) > td {
+    background-color: @table-header-bg !important;
+  }
+
+  .ant-table-selection-column {
+    min-width: 62px;
+  }
+
+  table {
+    border-collapse: separate;
+    border-spacing: 0;
+  }
+}
+
+.ant-modal {
+  top: 50px;
+  padding-bottom: 0;
+}
+
+.ant-form-item {
+  margin-bottom: 6px;
+}
+
+.ant-select-sm .ant-select-selection--single {
+  height: @input-height-sm !important;
+  overflow: hidden;
+}
+
+.ant-form-vertical .ant-form-item {
+  padding-bottom: 0;
+}
+
+.ant-form-item-control {
+  line-height: @input-height-sm;
+
+  > .ant-form-explain-holder[aria-hidden='true'] {
+    display: none;
+  }
+}
+
+.ant-form-vertical .ant-form-item-label {
+  padding: 0;
+  line-height: 1.2;
+}
+
+.ant-input-lg {
+  font-size: 12px;
+}
+
+.ant-btn-lg {
+  height: @input-height-lg;
+}
+
+.ant-menu-inline .ant-menu-item {
+  margin-top: 0;
+  margin-bottom: 0 !important;
+}
+
+.ant-modal-header {
+  padding: 13px 16px;
+}
+
+.ant-modal-body {
+  padding: 16px;
+}
+
+.ant-btn-primary:focus {
+  background-color: white;
+  color: @primary-color;
+  text-shadow: none;
+}