@fonixtree/magic-design 0.1.12 → 0.1.13

package/es/assets/less/datepicker.less

@@ -1,13 +1,13 @@
-[magic_design] .ant-picker {
+[magic_design] .cylon-picker {
   &:hover {
     border-color: #2F54EB !important;
   }
 
-  &.ant-picker-focused {
+  &.cylon-picker-focused {
     border-color: #2F54EB !important;
   }
 }
 
-[magic_design] .ant-picker-time-panel-column>li.ant-picker-time-panel-cell-selected .ant-picker-time-panel-cell-inner {
+[magic_design] .cylon-picker-time-panel-column>li.cylon-picker-time-panel-cell-selected .cylon-picker-time-panel-cell-inner {
   background-color: #E9F0FF !important;
 }

package/es/assets/less/form.less

@@ -1,8 +1,8 @@
-[magic_design] .ant-form {
-  .ant-form-item {
+[magic_design] .cylon-form {
+  .cylon-form-item {
     margin-bottom: 10px !important;
 
-    .ant-form-item-label {
+    .cylon-form-item-label {
       padding: 0 0 4px 0 !important;
     }
   }

package/es/assets/less/input.less

@@ -1,16 +1,16 @@
 @import './variables.less';
-[magic_design] .ant-input {
+[magic_design] .cylon-input {
   border-radius: @radius !important;
   height:@middle;
-  &.ant-input-sm {
+  &.cylon-input-sm {
     height:@small;
   }
 }
 
-[magic_design] .ant-input-number {
+[magic_design] .cylon-input-number {
   border-radius: @radius !important;
   height:@middle;
-  &.ant-input-number-sm {
+  &.cylon-input-number-sm {
     height:@small;
     input {
       height: 30px;

package/es/assets/less/menu.less

@@ -1,9 +1,9 @@
-[magic_design] .ant-dropdown {
-  .ant-dropdown-menu{
+[magic_design] .cylon-dropdown {
+  .cylon-dropdown-menu{
     border-radius: 10px;
     width: 200px;
     padding: 8px 0;
-    .ant-dropdown-menu-item {
+    .cylon-dropdown-menu-item {
       padding: 16px 24px;
       font-family: 'Open Sans';
       font-style: normal;
@@ -12,7 +12,7 @@
       line-height: 24px;
       color: #232F46;
     }
-    .ant-dropdown-menu-item-active {
+    .cylon-dropdown-menu-item-active {
       background: #E9F0FF;
       color: #2F54EB;
       font-weight: 600;

package/es/assets/less/modal.less

@@ -1,21 +1,21 @@
-[magic_design] .ant-modal-wrap {
+[magic_design] .cylon-modal-wrap {
   display: flex;
   align-items: center;
 
-  .ant-modal {
+  .cylon-modal {
     width: 100%;
     top: 0 !important;
     padding-bottom: 0px !important;
 
-    .ant-modal-content {
+    .cylon-modal-content {
       border-radius: 8px !important;
 
-      .ant-modal-header {
+      .cylon-modal-header {
         border-top-left-radius: 8px !important;
         border-top-right-radius: 8px !important;
       }
 
-      .ant-modal-body {
+      .cylon-modal-body {
         padding: 16px 16px 12px 16px !important;
         max-height: 800px !important;
       }

package/es/assets/less/select.less

@@ -1,28 +1,28 @@
 
 @import './variables.less';
-[magic_design] .ant-select {
+[magic_design] .cylon-select {
   border-radius: 4px;
   height: @middle;
   padding: 0 16px;
-  .ant-select-selector {
+  .cylon-select-selector {
     height: @middle !important;
     border-radius: @radius !important;
   }
-  &.ant-select-sm {
+  &.cylon-select-sm {
     height: @small;
-    .ant-select-selector {
+    .cylon-select-selector {
       height: @small !important;
-      .ant-select-selection-item {
+      .cylon-select-selection-item {
         line-height: 32px !important;
       }
-      .ant-select-selection-placeholder {
+      .cylon-select-selection-placeholder {
         line-height: calc(@small - 2px) !important;
       }
     }
-    &.ant-select-multiple {
-      .ant-select-selector {
+    &.cylon-select-multiple {
+      .cylon-select-selector {
         height: @small !important;
-        .ant-select-selection-item {
+        .cylon-select-selection-item {
           line-height: 20px !important;
           height: 22px !important;
         }

package/es/assets/less/slider.less

@@ -1,16 +1,16 @@
-[magic_design] .ant-slider {
-  .ant-slider-rail {
+[magic_design] .cylon-slider {
+  .cylon-slider-rail {
     background-color: #E9F0FF !important;
     height: 8px;
   }
-  .ant-slider-track {
+  .cylon-slider-track {
     background-color: #2F54EB !important;
     height: 8px;
   }
-  .ant-slider-step {
+  .cylon-slider-step {
     height: 8px;
   }
-  .ant-slider-handle {
+  .cylon-slider-handle {
     height: 20px;
     width: 20px;
     margin-top: -6px !important;

package/es/assets/less/switch.less

@@ -1,17 +1,17 @@
 [magic_design] .designer-wrap {
-  .ant-switch {
+  .cylon-switch {
     min-width:40px;
     height: 24px;
     &::after{
       content: none;
     }
-    &.ant-switch-checked{
+    &.cylon-switch-checked{
       background: #2F54EB !important;
-      .ant-switch-handle {
+      .cylon-switch-handle {
         left: calc(100% - 18px - 3px);
       }
     }
-    .ant-switch-handle {
+    .cylon-switch-handle {
       top: 3px;
       left: 3px;
     }

package/es/assets/less/table.less

@@ -1,6 +1,6 @@
-[magic_design] .ant-table {
-  .ant-table-container {
-    .ant-table-header {
+[magic_design] .cylon-table {
+  .cylon-table-container {
+    .cylon-table-header {
       tr {
         th {
           padding: 6px 16px;
@@ -9,7 +9,7 @@
       }
     }
     
-    .ant-table-body {
+    .cylon-table-body {
       tr {
         th {
           padding: 6px 16px;
@@ -18,19 +18,19 @@
         td {
           padding:6px 16px;
           line-height: 36px;
-          .ant-table-row-expand-icon {
+          .cylon-table-row-expand-icon {
             margin-top: 10px;
           }
         }
-        &.ant-table-row-selected {
+        &.cylon-table-row-selected {
           td {
             background: #E9F0FF;
           }
         }
       }
     }
-    .ant-table-content {
-      .ant-table-thead {
+    .cylon-table-content {
+      .cylon-table-thead {
         tr {
           th{
             padding: 6px 16px;
@@ -38,7 +38,7 @@
           }
         }
       }
-      .ant-table-tbody {
+      .cylon-table-tbody {
         tr {
           td{
             padding: 6px 16px;

package/es/common/ImageModal/index.js

@@ -23,6 +23,8 @@ var _CommonSelPicCard = _interopRequireDefault(require("./CommonSelPicCard"));
 
 var _const2 = require("./const");
 
+var _utils = require("./utils");
+
 var _Iconfont = _interopRequireDefault(require("../Iconfont"));
 
 var _commonUtil = require("../../utils/commonUtil");
@@ -267,25 +269,29 @@ function ImageModal(_a) {
       spinning = _m[0],
       setSpinning = _m[1];
 
-  var _o = (0, _react.useState)(''),
-      name = _o[0],
-      setName = _o[1];
+  var _o = (0, _react.useState)(null),
+      process = _o[0],
+      setProcess = _o[1];
+
+  var _p = (0, _react.useState)(''),
+      name = _p[0],
+      setName = _p[1];
 
-  var _p = (0, _react.useState)([]),
-      contentcatgsList = _p[0],
-      setContentcatgsList = _p[1];
+  var _q = (0, _react.useState)([]),
+      contentcatgsList = _q[0],
+      setContentcatgsList = _q[1];
 
-  var _q = (0, _react.useState)(''),
-      searchValue = _q[0],
-      setSearchValue = _q[1];
+  var _r = (0, _react.useState)(''),
+      searchValue = _r[0],
+      setSearchValue = _r[1];
 
-  var _r = (0, _react.useState)([]),
-      expandedKeys = _r[0],
-      setExpandedKeys = _r[1];
+  var _s = (0, _react.useState)([]),
+      expandedKeys = _s[0],
+      setExpandedKeys = _s[1];
 
-  var _s = (0, _react.useState)(true),
-      autoExpandParent = _s[0],
-      setAutoExpandParent = _s[1]; // const currentUser = sessionUtil.getUser() || {};
+  var _t = (0, _react.useState)(true),
+      autoExpandParent = _t[0],
+      setAutoExpandParent = _t[1]; // const currentUser = sessionUtil.getUser() || {};
   // const { _csrf } = currentUser;
   // const headers = {};
   // if (_csrf && _csrf.headerName) {
@@ -485,7 +491,7 @@ function ImageModal(_a) {
 
   var handleUpload = function handleUpload(file) {
     return __awaiter(_this, void 0, void 0, function () {
-      var form, result;
+      var result, form, result;
       return __generator(this, function (_a) {
         switch (_a.label) {
           case 0:
@@ -503,6 +509,31 @@ function ImageModal(_a) {
               }
             }
 
+            console.log('file: ', file);
+            if (!(file.size > 5 * 1024 * 1024)) return [3
+            /*break*/
+            , 2];
+            setSpinning(true);
+            setProcess(0);
+            return [4
+            /*yield*/
+            , (0, _utils.chunksUpload)({
+              file: file,
+              contentCatgId: selectedKeys[0]
+            }, function (process) {
+              // console.log('process', process);
+              setProcess(process);
+            })];
+
+          case 1:
+            result = _a.sent();
+            setProcess(null);
+            setSpinning(false);
+            return [2
+            /*return*/
+            , result];
+
+          case 2:
             form = new FormData();
             form.append('file', file); // 文件对象
 
@@ -516,7 +547,7 @@ function ImageModal(_a) {
             /*yield*/
             , onUpload(form)];
 
-          case 1:
+          case 3:
             result = _a.sent();
             return [2
             /*return*/
@@ -717,6 +748,15 @@ function ImageModal(_a) {
       return handleSearch(value);
     },
     placeholder: (0, _locale.i18n)('PLEASE_SEARCH')
+  })), process !== null && /*#__PURE__*/_react["default"].createElement("div", {
+    className: "image-modal-process-wrap"
+  }, /*#__PURE__*/_react["default"].createElement(_antd.Progress, {
+    format: function format(percent) {
+      return "upload " + percent + "%";
+    },
+    percent: Number(process).toFixed(2),
+    size: "small",
+    status: "active"
   }))), /*#__PURE__*/_react["default"].createElement(_antd.Row, null, /*#__PURE__*/_react["default"].createElement(_antd.Col, {
     span: 6
   }, /*#__PURE__*/_react["default"].createElement(_antd.Card, {

package/es/common/ImageModal/index.less

@@ -10,6 +10,8 @@
     white-space: nowrap;
     display: inline-block;
   }
+
+
 }
 
 .catg_img {
@@ -23,4 +25,10 @@
       object-fit: contain;
     }
   }
+}
+
+.image-modal-process-wrap {
+  margin-left: auto;
+  width: 300px;
+  padding-right: 60px;
 }