@fonixtree/magic-design 2.0.76 → 2.0.78

package/es/assets/less/button.less

@@ -29,4 +29,9 @@
       color: #2F54EB;
     }
   }
+}
+.cylon-btn[disabled], .cylon-btn[disabled]:hover, .cylon-btn[disabled]:focus, .cylon-btn[disabled]:active {
+  color: rgba(0, 0, 0, 0.25) !important;
+  border-color: #d9d9d9 !important;
+  background: #f5f5f5 !important;
 }

package/es/core/Designer/ChatRobot/components/SearchCondition/index.js

@@ -5,7 +5,7 @@ function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" =
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports["default"] = SearchCondition;
+exports["default"] = void 0;
 
 var _react = _interopRequireWildcard(require("react"));
 
@@ -23,23 +23,37 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 
 var toneList = ['Concise', 'Formal', 'Youthful', 'Innovative', 'Enticing'];
 
-function SearchCondition() {
-  var _a = (0, _react.useState)('Concise'),
-      tone = _a[0],
-      setTone = _a[1];
+function SearchCondition(_a) {
+  var onRef = _a.onRef;
 
-  var _b = (0, _react.useState)('30'),
-      count = _b[0],
-      setCount = _b[1];
+  var _b = (0, _react.useState)('Concise'),
+      tone = _b[0],
+      setTone = _b[1];
 
-  var _c = (0, _react.useState)(''),
-      features = _c[0],
-      setFeatures = _c[1];
+  var _c = (0, _react.useState)('30'),
+      count = _c[0],
+      setCount = _c[1];
 
   var _d = (0, _react.useState)(''),
-      key = _d[0],
-      setKey = _d[1];
+      features = _d[0],
+      setFeatures = _d[1];
 
+  var _e = (0, _react.useState)(''),
+      keyDetail = _e[0],
+      setKeyDetail = _e[1];
+
+  (0, _react.useImperativeHandle)(onRef, function () {
+    return {
+      getValues: function getValues() {
+        return {
+          tone: tone,
+          count: count,
+          features: features,
+          keyDetail: keyDetail
+        };
+      }
+    };
+  });
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: "condition_wrap"
   }, /*#__PURE__*/_react["default"].createElement("div", {
@@ -103,8 +117,12 @@ function SearchCondition() {
     className: "cond_value"
   }, /*#__PURE__*/_react["default"].createElement(_antd.Input, {
     onChange: function onChange(e) {
-      return setKey(e.target.value);
+      return setKeyDetail(e.target.value);
     },
-    value: key
+    value: keyDetail
   }))));
-}
+}
+
+var _default = /*#__PURE__*/(0, _react.forwardRef)(SearchCondition);
+
+exports["default"] = _default;

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

@@ -71,6 +71,7 @@ function (_super) {
   function ChatRobot(props) {
     var _this = _super.call(this, props) || this;
 
+    _this.condRef = /*#__PURE__*/_react["default"].createRef();
     _this.state = {
       open: false,
       message: '',
@@ -96,15 +97,57 @@ function (_super) {
       return marked.parse(text);
     };
 
+    _this.getMessageObj = function (msg) {
+      var showCondition = _this.state.showCondition;
+
+      if (!showCondition) {
+        return {
+          content: msg,
+          showContent: msg
+        };
+      }
+
+      var newMsg = msg;
+
+      if (msg.endsWith('.')) {
+        newMsg += '.';
+      }
+
+      var cond = _this.condRef.current.getValues();
+
+      if (cond.tone) {
+        newMsg += " The tone should be " + cond.tone + ".";
+      }
+
+      if (cond.count) {
+        newMsg += " Within " + cond.count + " words.";
+      }
+
+      if (cond.features) {
+        newMsg += " The description should cover key features " + cond.features + ".";
+      }
+
+      if (cond.keyDetail) {
+        newMsg += " Emphasize " + cond.keyDetail + ".";
+      }
+
+      return {
+        content: newMsg,
+        showContent: msg
+      };
+    };
+
     _this.onEnter = function () {
       var message = _this.state.message;
 
       if (!message) {
         return;
-      } // chat
+      }
+
+      var messageObj = _this.getMessageObj(message); // chat
 
 
-      _this.chatGpt.sendMessage(message);
+      _this.chatGpt.sendMessage(messageObj);
 
       var context = _this.chatGpt.getContext();
 
@@ -312,7 +355,7 @@ function (_super) {
       }, /*#__PURE__*/_react["default"].createElement("div", {
         className: "messageContentWrap",
         dangerouslySetInnerHTML: {
-          __html: _this.getMarkText(ctxNode.content)
+          __html: _this.getMarkText(ctxNode.showContent || ctxNode.content)
         }
       }), ctxNode.role === 'assistant' && /*#__PURE__*/_react["default"].createElement("div", {
         className: "msgIconWrap"
@@ -343,7 +386,9 @@ function (_super) {
       className: (0, _classnames["default"])('more_condition', {
         more_condition_hide: !showCondition
       })
-    }, /*#__PURE__*/_react["default"].createElement(_SearchCondition["default"], null)))), /*#__PURE__*/_react["default"].createElement(_AiImageGenerator["default"], {
+    }, /*#__PURE__*/_react["default"].createElement(_SearchCondition["default"], {
+      onRef: this.condRef
+    })))), /*#__PURE__*/_react["default"].createElement(_AiImageGenerator["default"], {
       onClose: function onClose() {
         return _this.setState({
           aiImageVisible: false

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

@@ -11,6 +11,165 @@ var _commonUtil = require("../../../utils/commonUtil");
 
 var _storeUtil = require("../../../utils/storeUtil");
 
+var __assign = void 0 && (void 0).__assign || function () {
+  __assign = Object.assign || function (t) {
+    for (var s, i = 1, n = arguments.length; i < n; i++) {
+      s = arguments[i];
+
+      for (var p in s) {
+        if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
+      }
+    }
+
+    return t;
+  };
+
+  return __assign.apply(this, arguments);
+};
+
+var __awaiter = void 0 && (void 0).__awaiter || function (thisArg, _arguments, P, generator) {
+  function adopt(value) {
+    return value instanceof P ? value : new P(function (resolve) {
+      resolve(value);
+    });
+  }
+
+  return new (P || (P = Promise))(function (resolve, reject) {
+    function fulfilled(value) {
+      try {
+        step(generator.next(value));
+      } catch (e) {
+        reject(e);
+      }
+    }
+
+    function rejected(value) {
+      try {
+        step(generator["throw"](value));
+      } catch (e) {
+        reject(e);
+      }
+    }
+
+    function step(result) {
+      result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected);
+    }
+
+    step((generator = generator.apply(thisArg, _arguments || [])).next());
+  });
+};
+
+var __generator = void 0 && (void 0).__generator || function (thisArg, body) {
+  var _ = {
+    label: 0,
+    sent: function sent() {
+      if (t[0] & 1) throw t[1];
+      return t[1];
+    },
+    trys: [],
+    ops: []
+  },
+      f,
+      y,
+      t,
+      g;
+  return g = {
+    next: verb(0),
+    "throw": verb(1),
+    "return": verb(2)
+  }, typeof Symbol === "function" && (g[Symbol.iterator] = function () {
+    return this;
+  }), g;
+
+  function verb(n) {
+    return function (v) {
+      return step([n, v]);
+    };
+  }
+
+  function step(op) {
+    if (f) throw new TypeError("Generator is already executing.");
+
+    while (_) {
+      try {
+        if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+        if (y = 0, t) op = [op[0] & 2, t.value];
+
+        switch (op[0]) {
+          case 0:
+          case 1:
+            t = op;
+            break;
+
+          case 4:
+            _.label++;
+            return {
+              value: op[1],
+              done: false
+            };
+
+          case 5:
+            _.label++;
+            y = op[1];
+            op = [0];
+            continue;
+
+          case 7:
+            op = _.ops.pop();
+
+            _.trys.pop();
+
+            continue;
+
+          default:
+            if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) {
+              _ = 0;
+              continue;
+            }
+
+            if (op[0] === 3 && (!t || op[1] > t[0] && op[1] < t[3])) {
+              _.label = op[1];
+              break;
+            }
+
+            if (op[0] === 6 && _.label < t[1]) {
+              _.label = t[1];
+              t = op;
+              break;
+            }
+
+            if (t && _.label < t[2]) {
+              _.label = t[2];
+
+              _.ops.push(op);
+
+              break;
+            }
+
+            if (t[2]) _.ops.pop();
+
+            _.trys.pop();
+
+            continue;
+        }
+
+        op = body.call(thisArg, _);
+      } catch (e) {
+        op = [6, e];
+        y = 0;
+      } finally {
+        f = t = 0;
+      }
+    }
+
+    if (op[0] & 5) throw op[1];
+    return {
+      value: op[0] ? op[1] : void 0,
+      done: true
+    };
+  }
+};
+
 // 角色
 var roleMap = {
   ASSISTANT: 'assistant',
@@ -33,6 +192,7 @@ function () {
     this.initParams = {}; // 建立连接
 
     this.initChatConnect = function () {
+      // return new Promise((resolve, reject) => {
       var _a = _this.initParams,
           onMessage = _a.onMessage,
           onEnd = _a.onEnd;
@@ -43,14 +203,16 @@ function () {
 
       eventSource.onopen = function (event) {
         console.log('onOpen');
-        sse = event.target;
+        sse = event.target; // resolve();
       };
 
       eventSource.onmessage = function (event) {
         if (event.data == '[DONE]') {
           _this.isGenerating = false;
 
-          _this.insertMessage2Context(text, roleMap.ASSISTANT);
+          _this.insertMessage2Context({
+            content: text
+          }, roleMap.ASSISTANT);
 
           text = '';
           onEnd();
@@ -77,50 +239,80 @@ function () {
         _this.isGenerating = false;
 
         _this.regenerate();
-      };
-    }; // 获取chat上下文
+      }; // });
+
+    }; // 获取全部对话上下文
 
 
     this.getContext = function () {
       var messages = (0, _storeUtil.getSessionStore)(catchKey) || [];
       return messages;
+    }; // 获取发送消息上下文
+
+
+    this.getSendContext = function () {
+      var context = (0, _storeUtil.getSessionStore)(catchKey) || [];
+      context = context.splice(context.length - 5).map(function (ctx) {
+        return {
+          role: ctx.role,
+          content: ctx.content
+        };
+      });
+      return context;
     }; // 消息插入上下文中
 
 
-    this.insertMessage2Context = function (message, role) {
+    this.insertMessage2Context = function (messageObj, role) {
       if (role === void 0) {
         role = roleMap.USER;
       }
 
       var messages = (0, _storeUtil.getSessionStore)(catchKey) || [];
-      messages.push({
-        content: message,
+      messages.push(__assign({
         role: role
-      });
+      }, messageObj));
       (0, _storeUtil.setSessionStore)(catchKey, messages);
     }; // 发送消息
 
 
-    this.sendMessage = function (message) {
-      if (!message) {
-        return;
-      }
-
-      _this.isGenerating = true;
-
-      _this.insertMessage2Context(message);
-
-      var messages = _this.getContext();
-
-      _this.initChatConnect();
-
-      var newMessages = messages.splice(messages.length - 5);
-      setTimeout(function () {
-        (0, _commonUtil.commonFetch)('/designer/v1/ai/stream-chat-completion', {
-          clientId: _this.clientId,
-          messages: newMessages
-        }, 'POST');
-      }, 200);
+    this.sendMessage = function (messageObj) {
+      return __awaiter(_this, void 0, void 0, function () {
+        var messages, newMessages;
+
+        var _this = this;
+
+        return __generator(this, function (_a) {
+          switch (_a.label) {
+            case 0:
+              if (!messageObj.content) {
+                return [2
+                /*return*/
+                ];
+              }
+
+              this.isGenerating = true;
+              this.insertMessage2Context(messageObj);
+              messages = this.getSendContext();
+              return [4
+              /*yield*/
+              , this.initChatConnect()];
+
+            case 1:
+              _a.sent();
+
+              newMessages = messages.splice(messages.length - 5);
+              setTimeout(function () {
+                (0, _commonUtil.commonFetch)('/designer/v1/ai/stream-chat-completion', {
+                  clientId: _this.clientId,
+                  messages: newMessages
+                }, 'POST');
+              }, 200);
+              return [2
+              /*return*/
+              ];
+          }
+        });
+      });
     }; // 重新生成
 
 
@@ -139,7 +331,8 @@ function () {
 
       _this.initChatConnect();
 
-      var newMessages = messages.splice(messages.length - 5);
+      var newMessages = _this.getSendContext();
+
       setTimeout(function () {
         (0, _commonUtil.commonFetch)('/designer/v1/ai/stream-chat-completion', {
           clientId: _this.clientId,

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

@@ -183,15 +183,11 @@ function (_super) {
       type: "light"
     }, (0, _locale.i18n)('SAVE'))) : /*#__PURE__*/_react["default"].createElement("div", {
       className: "menu_right"
-    }, window.magicDesign.templateType === _constants.tempTypeMap.PAGE ? /*#__PURE__*/_react["default"].createElement(_Button["default"], {
+    }, window.magicDesign.templateType === _constants.tempTypeMap.PAGE && /*#__PURE__*/_react["default"].createElement(_Button["default"], {
       "data-code": _constants.quickMenuCode.SET_AS_TEMPLATE,
       onClick: this.onBtnClick,
       type: "text"
-    }, (0, _locale.i18n)('SET_AS_TEMPLATE')) : /*#__PURE__*/_react["default"].createElement(_Button["default"], {
-      "data-code": _constants.quickMenuCode.PUSH,
-      onClick: this.onBtnClick,
-      type: "text"
-    }, (0, _locale.i18n)('PUSH')), /*#__PURE__*/_react["default"].createElement(_Button["default"], {
+    }, (0, _locale.i18n)('SET_AS_TEMPLATE')), /*#__PURE__*/_react["default"].createElement(_Button["default"], {
       "data-code": _constants.quickMenuCode.PREVIEW,
       onClick: this.onBtnClick
     }, (0, _locale.i18n)('PREVIEW')), /*#__PURE__*/_react["default"].createElement(_Button["default"], {

package/es/decorator/metaDecorator.js

@@ -95,7 +95,7 @@ function metaDecorator(WrappedComponent) {
               GAData = _c.GAData;
           (0, _commonUtil.pushGA)(__assign(__assign({}, GAData), {
             elementId: data.id,
-            elementName: data.text || GAData.groupName
+            elementName: data.text || (GAData === null || GAData === void 0 ? void 0 : GAData.groupName)
           }));
           return;
         } // 组织冒泡

package/lib/assets/less/button.less

@@ -29,4 +29,9 @@
       color: #2F54EB;
     }
   }
+}
+.cylon-btn[disabled], .cylon-btn[disabled]:hover, .cylon-btn[disabled]:focus, .cylon-btn[disabled]:active {
+  color: rgba(0, 0, 0, 0.25) !important;
+  border-color: #d9d9d9 !important;
+  background: #f5f5f5 !important;
 }

package/lib/core/Designer/ChatRobot/components/SearchCondition/index.js

@@ -5,7 +5,7 @@ function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" =
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports["default"] = SearchCondition;
+exports["default"] = void 0;
 
 var _react = _interopRequireWildcard(require("react"));
 
@@ -23,23 +23,37 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 
 var toneList = ['Concise', 'Formal', 'Youthful', 'Innovative', 'Enticing'];
 
-function SearchCondition() {
-  var _a = (0, _react.useState)('Concise'),
-      tone = _a[0],
-      setTone = _a[1];
+function SearchCondition(_a) {
+  var onRef = _a.onRef;
 
-  var _b = (0, _react.useState)('30'),
-      count = _b[0],
-      setCount = _b[1];
+  var _b = (0, _react.useState)('Concise'),
+      tone = _b[0],
+      setTone = _b[1];
 
-  var _c = (0, _react.useState)(''),
-      features = _c[0],
-      setFeatures = _c[1];
+  var _c = (0, _react.useState)('30'),
+      count = _c[0],
+      setCount = _c[1];
 
   var _d = (0, _react.useState)(''),
-      key = _d[0],
-      setKey = _d[1];
+      features = _d[0],
+      setFeatures = _d[1];
 
+  var _e = (0, _react.useState)(''),
+      keyDetail = _e[0],
+      setKeyDetail = _e[1];
+
+  (0, _react.useImperativeHandle)(onRef, function () {
+    return {
+      getValues: function getValues() {
+        return {
+          tone: tone,
+          count: count,
+          features: features,
+          keyDetail: keyDetail
+        };
+      }
+    };
+  });
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: "condition_wrap"
   }, /*#__PURE__*/_react["default"].createElement("div", {
@@ -103,8 +117,12 @@ function SearchCondition() {
     className: "cond_value"
   }, /*#__PURE__*/_react["default"].createElement(_antd.Input, {
     onChange: function onChange(e) {
-      return setKey(e.target.value);
+      return setKeyDetail(e.target.value);
     },
-    value: key
+    value: keyDetail
   }))));
-}
+}
+
+var _default = /*#__PURE__*/(0, _react.forwardRef)(SearchCondition);
+
+exports["default"] = _default;

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

@@ -71,6 +71,7 @@ function (_super) {
   function ChatRobot(props) {
     var _this = _super.call(this, props) || this;
 
+    _this.condRef = /*#__PURE__*/_react["default"].createRef();
     _this.state = {
       open: false,
       message: '',
@@ -96,15 +97,57 @@ function (_super) {
       return marked.parse(text);
     };
 
+    _this.getMessageObj = function (msg) {
+      var showCondition = _this.state.showCondition;
+
+      if (!showCondition) {
+        return {
+          content: msg,
+          showContent: msg
+        };
+      }
+
+      var newMsg = msg;
+
+      if (msg.endsWith('.')) {
+        newMsg += '.';
+      }
+
+      var cond = _this.condRef.current.getValues();
+
+      if (cond.tone) {
+        newMsg += " The tone should be " + cond.tone + ".";
+      }
+
+      if (cond.count) {
+        newMsg += " Within " + cond.count + " words.";
+      }
+
+      if (cond.features) {
+        newMsg += " The description should cover key features " + cond.features + ".";
+      }
+
+      if (cond.keyDetail) {
+        newMsg += " Emphasize " + cond.keyDetail + ".";
+      }
+
+      return {
+        content: newMsg,
+        showContent: msg
+      };
+    };
+
     _this.onEnter = function () {
       var message = _this.state.message;
 
       if (!message) {
         return;
-      } // chat
+      }
+
+      var messageObj = _this.getMessageObj(message); // chat
 
 
-      _this.chatGpt.sendMessage(message);
+      _this.chatGpt.sendMessage(messageObj);
 
       var context = _this.chatGpt.getContext();
 
@@ -312,7 +355,7 @@ function (_super) {
       }, /*#__PURE__*/_react["default"].createElement("div", {
         className: "messageContentWrap",
         dangerouslySetInnerHTML: {
-          __html: _this.getMarkText(ctxNode.content)
+          __html: _this.getMarkText(ctxNode.showContent || ctxNode.content)
         }
       }), ctxNode.role === 'assistant' && /*#__PURE__*/_react["default"].createElement("div", {
         className: "msgIconWrap"
@@ -343,7 +386,9 @@ function (_super) {
       className: (0, _classnames["default"])('more_condition', {
         more_condition_hide: !showCondition
       })
-    }, /*#__PURE__*/_react["default"].createElement(_SearchCondition["default"], null)))), /*#__PURE__*/_react["default"].createElement(_AiImageGenerator["default"], {
+    }, /*#__PURE__*/_react["default"].createElement(_SearchCondition["default"], {
+      onRef: this.condRef
+    })))), /*#__PURE__*/_react["default"].createElement(_AiImageGenerator["default"], {
       onClose: function onClose() {
         return _this.setState({
           aiImageVisible: false

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

@@ -11,6 +11,165 @@ var _commonUtil = require("../../../utils/commonUtil");
 
 var _storeUtil = require("../../../utils/storeUtil");
 
+var __assign = void 0 && (void 0).__assign || function () {
+  __assign = Object.assign || function (t) {
+    for (var s, i = 1, n = arguments.length; i < n; i++) {
+      s = arguments[i];
+
+      for (var p in s) {
+        if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
+      }
+    }
+
+    return t;
+  };
+
+  return __assign.apply(this, arguments);
+};
+
+var __awaiter = void 0 && (void 0).__awaiter || function (thisArg, _arguments, P, generator) {
+  function adopt(value) {
+    return value instanceof P ? value : new P(function (resolve) {
+      resolve(value);
+    });
+  }
+
+  return new (P || (P = Promise))(function (resolve, reject) {
+    function fulfilled(value) {
+      try {
+        step(generator.next(value));
+      } catch (e) {
+        reject(e);
+      }
+    }
+
+    function rejected(value) {
+      try {
+        step(generator["throw"](value));
+      } catch (e) {
+        reject(e);
+      }
+    }
+
+    function step(result) {
+      result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected);
+    }
+
+    step((generator = generator.apply(thisArg, _arguments || [])).next());
+  });
+};
+
+var __generator = void 0 && (void 0).__generator || function (thisArg, body) {
+  var _ = {
+    label: 0,
+    sent: function sent() {
+      if (t[0] & 1) throw t[1];
+      return t[1];
+    },
+    trys: [],
+    ops: []
+  },
+      f,
+      y,
+      t,
+      g;
+  return g = {
+    next: verb(0),
+    "throw": verb(1),
+    "return": verb(2)
+  }, typeof Symbol === "function" && (g[Symbol.iterator] = function () {
+    return this;
+  }), g;
+
+  function verb(n) {
+    return function (v) {
+      return step([n, v]);
+    };
+  }
+
+  function step(op) {
+    if (f) throw new TypeError("Generator is already executing.");
+
+    while (_) {
+      try {
+        if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+        if (y = 0, t) op = [op[0] & 2, t.value];
+
+        switch (op[0]) {
+          case 0:
+          case 1:
+            t = op;
+            break;
+
+          case 4:
+            _.label++;
+            return {
+              value: op[1],
+              done: false
+            };
+
+          case 5:
+            _.label++;
+            y = op[1];
+            op = [0];
+            continue;
+
+          case 7:
+            op = _.ops.pop();
+
+            _.trys.pop();
+
+            continue;
+
+          default:
+            if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) {
+              _ = 0;
+              continue;
+            }
+
+            if (op[0] === 3 && (!t || op[1] > t[0] && op[1] < t[3])) {
+              _.label = op[1];
+              break;
+            }
+
+            if (op[0] === 6 && _.label < t[1]) {
+              _.label = t[1];
+              t = op;
+              break;
+            }
+
+            if (t && _.label < t[2]) {
+              _.label = t[2];
+
+              _.ops.push(op);
+
+              break;
+            }
+
+            if (t[2]) _.ops.pop();
+
+            _.trys.pop();
+
+            continue;
+        }
+
+        op = body.call(thisArg, _);
+      } catch (e) {
+        op = [6, e];
+        y = 0;
+      } finally {
+        f = t = 0;
+      }
+    }
+
+    if (op[0] & 5) throw op[1];
+    return {
+      value: op[0] ? op[1] : void 0,
+      done: true
+    };
+  }
+};
+
 // 角色
 var roleMap = {
   ASSISTANT: 'assistant',
@@ -33,6 +192,7 @@ function () {
     this.initParams = {}; // 建立连接
 
     this.initChatConnect = function () {
+      // return new Promise((resolve, reject) => {
       var _a = _this.initParams,
           onMessage = _a.onMessage,
           onEnd = _a.onEnd;
@@ -43,14 +203,16 @@ function () {
 
       eventSource.onopen = function (event) {
         console.log('onOpen');
-        sse = event.target;
+        sse = event.target; // resolve();
       };
 
       eventSource.onmessage = function (event) {
         if (event.data == '[DONE]') {
           _this.isGenerating = false;
 
-          _this.insertMessage2Context(text, roleMap.ASSISTANT);
+          _this.insertMessage2Context({
+            content: text
+          }, roleMap.ASSISTANT);
 
           text = '';
           onEnd();
@@ -77,50 +239,80 @@ function () {
         _this.isGenerating = false;
 
         _this.regenerate();
-      };
-    }; // 获取chat上下文
+      }; // });
+
+    }; // 获取全部对话上下文
 
 
     this.getContext = function () {
       var messages = (0, _storeUtil.getSessionStore)(catchKey) || [];
       return messages;
+    }; // 获取发送消息上下文
+
+
+    this.getSendContext = function () {
+      var context = (0, _storeUtil.getSessionStore)(catchKey) || [];
+      context = context.splice(context.length - 5).map(function (ctx) {
+        return {
+          role: ctx.role,
+          content: ctx.content
+        };
+      });
+      return context;
     }; // 消息插入上下文中
 
 
-    this.insertMessage2Context = function (message, role) {
+    this.insertMessage2Context = function (messageObj, role) {
       if (role === void 0) {
         role = roleMap.USER;
       }
 
       var messages = (0, _storeUtil.getSessionStore)(catchKey) || [];
-      messages.push({
-        content: message,
+      messages.push(__assign({
         role: role
-      });
+      }, messageObj));
       (0, _storeUtil.setSessionStore)(catchKey, messages);
     }; // 发送消息
 
 
-    this.sendMessage = function (message) {
-      if (!message) {
-        return;
-      }
-
-      _this.isGenerating = true;
-
-      _this.insertMessage2Context(message);
-
-      var messages = _this.getContext();
-
-      _this.initChatConnect();
-
-      var newMessages = messages.splice(messages.length - 5);
-      setTimeout(function () {
-        (0, _commonUtil.commonFetch)('/designer/v1/ai/stream-chat-completion', {
-          clientId: _this.clientId,
-          messages: newMessages
-        }, 'POST');
-      }, 200);
+    this.sendMessage = function (messageObj) {
+      return __awaiter(_this, void 0, void 0, function () {
+        var messages, newMessages;
+
+        var _this = this;
+
+        return __generator(this, function (_a) {
+          switch (_a.label) {
+            case 0:
+              if (!messageObj.content) {
+                return [2
+                /*return*/
+                ];
+              }
+
+              this.isGenerating = true;
+              this.insertMessage2Context(messageObj);
+              messages = this.getSendContext();
+              return [4
+              /*yield*/
+              , this.initChatConnect()];
+
+            case 1:
+              _a.sent();
+
+              newMessages = messages.splice(messages.length - 5);
+              setTimeout(function () {
+                (0, _commonUtil.commonFetch)('/designer/v1/ai/stream-chat-completion', {
+                  clientId: _this.clientId,
+                  messages: newMessages
+                }, 'POST');
+              }, 200);
+              return [2
+              /*return*/
+              ];
+          }
+        });
+      });
     }; // 重新生成
 
 
@@ -139,7 +331,8 @@ function () {
 
       _this.initChatConnect();
 
-      var newMessages = messages.splice(messages.length - 5);
+      var newMessages = _this.getSendContext();
+
       setTimeout(function () {
         (0, _commonUtil.commonFetch)('/designer/v1/ai/stream-chat-completion', {
           clientId: _this.clientId,

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

@@ -183,15 +183,11 @@ function (_super) {
       type: "light"
     }, (0, _locale.i18n)('SAVE'))) : /*#__PURE__*/_react["default"].createElement("div", {
       className: "menu_right"
-    }, window.magicDesign.templateType === _constants.tempTypeMap.PAGE ? /*#__PURE__*/_react["default"].createElement(_Button["default"], {
+    }, window.magicDesign.templateType === _constants.tempTypeMap.PAGE && /*#__PURE__*/_react["default"].createElement(_Button["default"], {
       "data-code": _constants.quickMenuCode.SET_AS_TEMPLATE,
       onClick: this.onBtnClick,
       type: "text"
-    }, (0, _locale.i18n)('SET_AS_TEMPLATE')) : /*#__PURE__*/_react["default"].createElement(_Button["default"], {
-      "data-code": _constants.quickMenuCode.PUSH,
-      onClick: this.onBtnClick,
-      type: "text"
-    }, (0, _locale.i18n)('PUSH')), /*#__PURE__*/_react["default"].createElement(_Button["default"], {
+    }, (0, _locale.i18n)('SET_AS_TEMPLATE')), /*#__PURE__*/_react["default"].createElement(_Button["default"], {
       "data-code": _constants.quickMenuCode.PREVIEW,
       onClick: this.onBtnClick
     }, (0, _locale.i18n)('PREVIEW')), /*#__PURE__*/_react["default"].createElement(_Button["default"], {

package/lib/decorator/metaDecorator.js

@@ -95,7 +95,7 @@ function metaDecorator(WrappedComponent) {
               GAData = _c.GAData;
           (0, _commonUtil.pushGA)(__assign(__assign({}, GAData), {
             elementId: data.id,
-            elementName: data.text || GAData.groupName
+            elementName: data.text || (GAData === null || GAData === void 0 ? void 0 : GAData.groupName)
           }));
           return;
         } // 组织冒泡

package/package.json

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