@fonixtree/magic-design 2.0.11 → 2.0.12

package/es/core/Designer/AiImageGenerator/History/index.js

@@ -39,7 +39,7 @@ function History(_a) {
   var source = _a.source,
       onClick = _a.onClick,
       onChange = _a.onChange,
-      selectIndex = _a.selectIndex;
+      selectKey = _a.selectKey;
 
   var _b = (0, _react.useState)(false),
       isEdit = _b[0],
@@ -65,7 +65,10 @@ function History(_a) {
     var newSource = source.filter(function (src, index) {
       return !selected.includes(index);
     });
-    onChange(newSource.length ? newSource : []);
+    var newSelectIndex = source.findIndex(function (src) {
+      return src.key === selected;
+    });
+    onChange(newSource.length ? newSource : [], newSelectIndex);
     setIsEdit(false);
   };
 
@@ -104,7 +107,7 @@ function History(_a) {
   }, source.length > 0 && source.map(function (his, index) {
     return /*#__PURE__*/_react["default"].createElement("div", {
       className: (0, _classnames["default"])('historyNode', {
-        active: selectIndex === index
+        active: selectKey === index
       }),
       onClick: function onClick() {
         return onHisItemClick(index);

package/es/core/Designer/AiImageGenerator/History/index.less

@@ -68,5 +68,6 @@
     margin-top: 10px;
     color: #FF4141;
     text-align: center;
+    font-size: 14px;
   }
 }

package/es/core/Designer/AiImageGenerator/index.js

@@ -11,6 +11,8 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _antd = require("antd");
 
+var _uuid = require("uuid");
+
 var _GenerateSize = _interopRequireDefault(require("./GenerateSize"));
 
 var _GenerateArtist = _interopRequireDefault(require("./GenerateArtist"));
@@ -243,12 +245,18 @@ function (_super) {
 
     _this.onHisConfigClick = function () {};
 
-    _this.historyChange = function (newHis) {
+    _this.historyChange = function (newHis, newIndex) {
       (0, _storeUtil.setSessionStore)(_constants.STORAGE_KEY.FONIXTREE_AI_IMG_HIS, newHis);
 
       _this.setState({
         history: newHis
       });
+
+      if (newIndex) {
+        _this.setState({
+          hisCursor: newIndex
+        });
+      }
     };
 
     _this.getColumnNum = function (num) {
@@ -338,6 +346,7 @@ function (_super) {
             case 2:
               result = _a.sent();
               history.push({
+                key: (0, _uuid.v4)(),
                 images: result.imageList,
                 params: params
               });
@@ -370,17 +379,17 @@ function (_super) {
 
     _this.onRegenerate = function () {
       return __awaiter(_this, void 0, void 0, function () {
-        var _a, history, hisCursor, params, result, e_2;
+        var _a, history, hisCursor, _b, params, key, result, e_2;
 
-        return __generator(this, function (_b) {
-          switch (_b.label) {
+        return __generator(this, function (_c) {
+          switch (_c.label) {
             case 0:
               _a = this.state, history = _a.history, hisCursor = _a.hisCursor;
-              params = history[hisCursor].params;
-              _b.label = 1;
+              _b = history[hisCursor], params = _b.params, key = _b.key;
+              _c.label = 1;
 
             case 1:
-              _b.trys.push([1, 3,, 4]);
+              _c.trys.push([1, 3,, 4]);
 
               this.setState({
                 loading: true
@@ -390,8 +399,9 @@ function (_super) {
               , (0, _commonUtil.commonFetch)('/designer/v1/ai/create-image', params, 'POST')];
 
             case 2:
-              result = _b.sent();
+              result = _c.sent();
               history[hisCursor] = {
+                key: key,
                 images: result.imageList,
                 params: params
               };
@@ -404,7 +414,7 @@ function (_super) {
               , 4];
 
             case 3:
-              e_2 = _b.sent();
+              e_2 = _c.sent();
               this.setState({
                 loading: false
               });
@@ -577,14 +587,18 @@ function (_super) {
   };
 
   AiImageGenerator.prototype.render = function () {
-    var _a;
-
-    var _b = this.state,
-        loading = _b.loading,
-        history = _b.history,
-        hisCursor = _b.hisCursor;
+    var _a = this.state,
+        loading = _a.loading,
+        history = _a.history,
+        hisCursor = _a.hisCursor;
     var visible = this.props.visible;
-    var images = ((_a = history[hisCursor]) === null || _a === void 0 ? void 0 : _a.images) || [];
+
+    var _b = history[hisCursor] || {},
+        _c = _b.images,
+        images = _c === void 0 ? [] : _c,
+        _d = _b.key,
+        key = _d === void 0 ? '' : _d;
+
     var columnNum = this.getColumnNum(images.length || []);
     return /*#__PURE__*/_react["default"].createElement(_antd.Drawer, {
       bodyStyle: {
@@ -699,7 +713,7 @@ function (_super) {
     }))), /*#__PURE__*/_react["default"].createElement(_History["default"], {
       onChange: this.historyChange,
       onClick: this.onHistoryClick,
-      selectIndex: hisCursor,
+      selectKey: key,
       source: history
     }))));
   };

package/lib/core/Designer/AiImageGenerator/History/index.js

@@ -39,7 +39,7 @@ function History(_a) {
   var source = _a.source,
       onClick = _a.onClick,
       onChange = _a.onChange,
-      selectIndex = _a.selectIndex;
+      selectKey = _a.selectKey;
 
   var _b = (0, _react.useState)(false),
       isEdit = _b[0],
@@ -65,7 +65,10 @@ function History(_a) {
     var newSource = source.filter(function (src, index) {
       return !selected.includes(index);
     });
-    onChange(newSource.length ? newSource : []);
+    var newSelectIndex = source.findIndex(function (src) {
+      return src.key === selected;
+    });
+    onChange(newSource.length ? newSource : [], newSelectIndex);
     setIsEdit(false);
   };
 
@@ -104,7 +107,7 @@ function History(_a) {
   }, source.length > 0 && source.map(function (his, index) {
     return /*#__PURE__*/_react["default"].createElement("div", {
       className: (0, _classnames["default"])('historyNode', {
-        active: selectIndex === index
+        active: selectKey === index
       }),
       onClick: function onClick() {
         return onHisItemClick(index);

package/lib/core/Designer/AiImageGenerator/History/index.less

@@ -68,5 +68,6 @@
     margin-top: 10px;
     color: #FF4141;
     text-align: center;
+    font-size: 14px;
   }
 }

package/lib/core/Designer/AiImageGenerator/index.js

@@ -11,6 +11,8 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _antd = require("antd");
 
+var _uuid = require("uuid");
+
 var _GenerateSize = _interopRequireDefault(require("./GenerateSize"));
 
 var _GenerateArtist = _interopRequireDefault(require("./GenerateArtist"));
@@ -243,12 +245,18 @@ function (_super) {
 
     _this.onHisConfigClick = function () {};
 
-    _this.historyChange = function (newHis) {
+    _this.historyChange = function (newHis, newIndex) {
       (0, _storeUtil.setSessionStore)(_constants.STORAGE_KEY.FONIXTREE_AI_IMG_HIS, newHis);
 
       _this.setState({
         history: newHis
       });
+
+      if (newIndex) {
+        _this.setState({
+          hisCursor: newIndex
+        });
+      }
     };
 
     _this.getColumnNum = function (num) {
@@ -338,6 +346,7 @@ function (_super) {
             case 2:
               result = _a.sent();
               history.push({
+                key: (0, _uuid.v4)(),
                 images: result.imageList,
                 params: params
               });
@@ -370,17 +379,17 @@ function (_super) {
 
     _this.onRegenerate = function () {
       return __awaiter(_this, void 0, void 0, function () {
-        var _a, history, hisCursor, params, result, e_2;
+        var _a, history, hisCursor, _b, params, key, result, e_2;
 
-        return __generator(this, function (_b) {
-          switch (_b.label) {
+        return __generator(this, function (_c) {
+          switch (_c.label) {
             case 0:
               _a = this.state, history = _a.history, hisCursor = _a.hisCursor;
-              params = history[hisCursor].params;
-              _b.label = 1;
+              _b = history[hisCursor], params = _b.params, key = _b.key;
+              _c.label = 1;
 
             case 1:
-              _b.trys.push([1, 3,, 4]);
+              _c.trys.push([1, 3,, 4]);
 
               this.setState({
                 loading: true
@@ -390,8 +399,9 @@ function (_super) {
               , (0, _commonUtil.commonFetch)('/designer/v1/ai/create-image', params, 'POST')];
 
             case 2:
-              result = _b.sent();
+              result = _c.sent();
               history[hisCursor] = {
+                key: key,
                 images: result.imageList,
                 params: params
               };
@@ -404,7 +414,7 @@ function (_super) {
               , 4];
 
             case 3:
-              e_2 = _b.sent();
+              e_2 = _c.sent();
               this.setState({
                 loading: false
               });
@@ -577,14 +587,18 @@ function (_super) {
   };
 
   AiImageGenerator.prototype.render = function () {
-    var _a;
-
-    var _b = this.state,
-        loading = _b.loading,
-        history = _b.history,
-        hisCursor = _b.hisCursor;
+    var _a = this.state,
+        loading = _a.loading,
+        history = _a.history,
+        hisCursor = _a.hisCursor;
     var visible = this.props.visible;
-    var images = ((_a = history[hisCursor]) === null || _a === void 0 ? void 0 : _a.images) || [];
+
+    var _b = history[hisCursor] || {},
+        _c = _b.images,
+        images = _c === void 0 ? [] : _c,
+        _d = _b.key,
+        key = _d === void 0 ? '' : _d;
+
     var columnNum = this.getColumnNum(images.length || []);
     return /*#__PURE__*/_react["default"].createElement(_antd.Drawer, {
       bodyStyle: {
@@ -699,7 +713,7 @@ function (_super) {
     }))), /*#__PURE__*/_react["default"].createElement(_History["default"], {
       onChange: this.historyChange,
       onClick: this.onHistoryClick,
-      selectIndex: hisCursor,
+      selectKey: key,
       source: history
     }))));
   };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@fonixtree/magic-design",
   "author": "Cylon Team",
-  "version": "2.0.11",
+  "version": "2.0.12",
   "description": "Magic Design",
   "license": "MIT",
   "module": "es/index.js",