@fonixtree/magic-design 1.0.65 → 1.0.67

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

@@ -15,8 +15,6 @@ var _classnames = _interopRequireDefault(require("classnames"));
 
 var _CopyBtn = _interopRequireDefault(require("./components/CopyBtn"));
 
-var _SearchCondition = _interopRequireDefault(require("./components/SearchCondition"));
-
 var _common = require("../../../common");
 
 var _FonixtreeGpt = _interopRequireDefault(require("../FonixtreeGpt"));
@@ -61,8 +59,6 @@ var __extends = void 0 && (void 0).__extends || function () {
   };
 }();
 
-var TextArea = _antd.Input.TextArea;
-
 var ChatRobot =
 /** @class */
 function (_super) {
@@ -71,15 +67,13 @@ function (_super) {
   function ChatRobot(props) {
     var _this = _super.call(this, props) || this;
 
-    _this.condRef = /*#__PURE__*/_react["default"].createRef();
     _this.state = {
       open: false,
       message: '',
       context: [],
       isGenerating: false,
       aiImageVisible: false,
-      loading: true,
-      showCondition: true
+      loading: true
     };
 
     _this.scrollBottom = function () {
@@ -97,57 +91,15 @@ 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(messageObj);
+      _this.chatGpt.sendMessage(message);
 
       var context = _this.chatGpt.getContext();
 
@@ -243,8 +195,7 @@ function (_super) {
         open = _a.open,
         isGenerating = _a.isGenerating,
         aiImageVisible = _a.aiImageVisible,
-        loading = _a.loading,
-        showCondition = _a.showCondition;
+        loading = _a.loading;
 
     if (loading) {
       return null;
@@ -267,17 +218,14 @@ function (_super) {
       closable: false,
       footer: /*#__PURE__*/_react["default"].createElement("div", {
         className: "dialog_bottom"
-      }, /*#__PURE__*/_react["default"].createElement("div", {
-        className: "bottom_input"
-      }, /*#__PURE__*/_react["default"].createElement(TextArea, {
-        autoSize: true,
-        className: "text_area",
+      }, /*#__PURE__*/_react["default"].createElement(_antd.Input, {
         onChange: this.onMessageChage,
         onPressEnter: this.onEnter,
         placeholder: "Send a message",
         value: message
-      }), /*#__PURE__*/_react["default"].createElement(_common.Iconfont, {
-        className: "image_btn",
+      }), /*#__PURE__*/_react["default"].createElement("div", {
+        className: "btn_wrap"
+      }, /*#__PURE__*/_react["default"].createElement(_common.Iconfont, {
         color: "#2F54EB",
         onClick: this.generateImage,
         size: 20,
@@ -286,21 +234,14 @@ function (_super) {
         },
         type: "icon-image"
       }), /*#__PURE__*/_react["default"].createElement(_common.Iconfont, {
-        className: "toggle_btn",
-        color: "#2F54EB",
-        onClick: function onClick() {
-          return _this.setState({
-            showCondition: !showCondition
-          });
+        color: message.length > 0 ? '#2F54EB' : '#C1C9D7',
+        onClick: this.onEnter,
+        size: 20,
+        style: {
+          cursor: 'pointer'
         },
-        size: 24,
-        type: showCondition ? 'icon-circle-down' : 'icon-circle-up'
-      })), /*#__PURE__*/_react["default"].createElement("div", {
-        className: (0, _classnames["default"])('generate_btn', {
-          disable_btn: message.length === 0
-        }),
-        onClick: this.onEnter
-      }, "Generate")),
+        type: message.length > 0 ? 'icon-send1' : 'icon-send'
+      }))),
       footerStyle: {
         padding: 12
       },
@@ -355,7 +296,7 @@ function (_super) {
       }, /*#__PURE__*/_react["default"].createElement("div", {
         className: "messageContentWrap",
         dangerouslySetInnerHTML: {
-          __html: _this.getMarkText(ctxNode.showContent || ctxNode.content)
+          __html: _this.getMarkText(ctxNode.content)
         }
       }), ctxNode.role === 'assistant' && /*#__PURE__*/_react["default"].createElement("div", {
         className: "msgIconWrap"
@@ -370,8 +311,6 @@ function (_super) {
     }, /*#__PURE__*/_react["default"].createElement(_antd.Spin, {
       spinning: true
     }))), /*#__PURE__*/_react["default"].createElement("div", {
-      className: "regenerate_btn_wrap"
-    }, /*#__PURE__*/_react["default"].createElement("div", {
       className: "regenerate_btn",
       onClick: this.onRegenarate
     }, /*#__PURE__*/_react["default"].createElement(_common.Iconfont, {
@@ -382,13 +321,7 @@ function (_super) {
         marginRight: 5
       },
       type: "icon-refresh"
-    }), "Regenerate Response")), /*#__PURE__*/_react["default"].createElement("div", {
-      className: (0, _classnames["default"])('more_condition', {
-        more_condition_hide: !showCondition
-      })
-    }, /*#__PURE__*/_react["default"].createElement(_SearchCondition["default"], {
-      onRef: this.condRef
-    })))), /*#__PURE__*/_react["default"].createElement(_AiImageGenerator["default"], {
+    }), "Regenerate Response"))), /*#__PURE__*/_react["default"].createElement(_AiImageGenerator["default"], {
       onClose: function onClose() {
         return _this.setState({
           aiImageVisible: false

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

@@ -32,15 +32,12 @@
     }
   }
   .chat_content_wrap {
-    display: flex;
-    flex-direction: column;
     position: relative;
+    padding-bottom: 40px;
     height: 100%;
     .content_wrap {
-      background: #F5F6F7;
-      flex: 1;
       padding: 16px;
-      // height: 100%;
+      height: 100%;
       overflow: scroll;
       font-family: 'Open Sans';
       font-size: 14px;
@@ -81,18 +78,16 @@
         display: flex;
         justify-content: flex-end;
         .messageWrap {
-          border: 1px solid #E6EAF0;
           border-radius: 4px;
-          background: #FFF;
-          color: #232F46;
+          background: #E9F0FF;
+          color: #2F54EB;
         }
       }
       .assistantMessage {
         .messageWrap {
           border-radius: 4px;
-          background: #E9F0FF;
-          color: #2F54EB;
-          border: 1px solid #D6E4FF;
+          background: #F5F6F7;
+          color: #232F46;
         }
       }
       .recent_response {
@@ -106,74 +101,38 @@
         }
       }
     }
-
-    .regenerate_btn_wrap {
-      background: #F5F6F7;
+    .regenerate_btn {
       display: flex;
       align-items: center;
-      justify-content: center;
-      padding-bottom: 12px;
-      .regenerate_btn {
-        background-color: #FFF;
-        bottom: 10px;
-        border: 1px solid #E6EAF0;
-        border-radius: 4px;
-        padding: 4px 12px;
-        cursor: pointer;
-        font-family: 'Open Sans';
-        font-style: normal;
-        font-weight: 400;
-        font-size: 13px;
-      }
-    }
-    
-    .more_condition {
-      transition: all 0.4s;
-      max-height: 400px;
-      overflow: hidden;
-      box-shadow: 3px 3px 8px 0px #2D304008;
-      box-shadow: -3px -3px 8px 0px #2D304008;
-    }
-    .more_condition_hide {
-      max-height: 0;
+      position: absolute;
+      bottom: 10px;
+      border: 1px solid #E6EAF0;
+      border-radius: 4px;
+      padding: 4px 12px;
+      left: 50%;
+      transform: translateX(-50%);
+      cursor: pointer;
+      font-family: 'Open Sans';
+      font-style: normal;
+      font-weight: 400;
+      font-size: 13px;
     }
   }
   .dialog_bottom {
     position: relative;
     font-size: 14px;
-    .bottom_input{
-      display: flex;
-      align-items: flex-start;
-      .text_area {
-        max-height: 200px;
-        padding-right: 30px;
-      }
-      .image_btn {
-        position: absolute;
-        right: 40px;
-        top: 6px;
-      }
-      .toggle_btn {
-        padding: 4px 0 4px 10px;
-        cursor: pointer;
-      }
+    input {
+      padding-right: 60px !important;
     }
-    .generate_btn {
+    .btn_wrap {
+      position: absolute;
+      right: 15px;
+      top: 0px;
+      width: 50px;
+      height: 36px;
       display: flex;
       align-items: center;
-      justify-content: center;
-      margin-top: 8px;
-      height: 36px;
-      background: #2F54EB;
-      border-radius: 6px;
-      color:#FFF;
-      font-family: Open Sans;
-      font-size: 14px;
-      font-weight: 600;
-      cursor: pointer;
-    }
-    .disable_btn {
-      background: #C1C9D7;
+      justify-content: space-between;
     }
   }
 }

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

@@ -81,6 +81,7 @@ var getSecondConfigName = function getSecondConfigName(selectedNode, clickedGrou
 
   switch (selectedNode.type) {
     case 'IMAGE_GALLERY':
+    case 'WALLET':
     case 'BANNER':
       groupName = ''; // if (!groupName) {
       //   groupName = isPc() ? panelProps.image?.content?.pcName : panelProps.image?.content?.h5Name;
@@ -108,14 +109,10 @@ var getSecondConfigName = function getSecondConfigName(selectedNode, clickedGrou
       break;
 
     case 'TEXT':
-    case 'WALLET':
-    case 'COMMON_FUNCTIONS':
       groupName = panelProps.title.text;
       break;
 
     case 'RECOMMEND':
-    case 'AFFILIATE_RECOMMEND':
-      // console.log('RECOMMEND ---panelProps.groupName.text', panelProps.groupName.text);
       groupName = panelProps.groupName.text;
       break;
 
@@ -130,11 +127,6 @@ var getSecondConfigName = function getSecondConfigName(selectedNode, clickedGrou
     case 'TAG':
       groupName = panelProps.button.text;
       break;
-
-    case 'PERSONAL_INFOMATION':
-    case 'ORDERS':
-      groupName = panelProps.sourceType;
-      break;
   }
 
   return groupName || 'Group Name';
@@ -382,11 +374,8 @@ function (_super) {
       onClick: this.onSecConfigBack,
       type: "icon"
     })), /*#__PURE__*/_react["default"].createElement("div", {
-      className: "title",
-      dangerouslySetInnerHTML: {
-        __html: getSecondConfigName(selectedNode, clickedGroup)
-      }
-    })), this.getSecondConfigInstance()));
+      className: "title"
+    }, getSecondConfigName(selectedNode, clickedGroup))), this.getSecondConfigInstance()));
   };
 
   return ConfigPanel;

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

@@ -11,165 +11,6 @@ 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',
@@ -192,7 +33,6 @@ function () {
     this.initParams = {}; // 建立连接
 
     this.initChatConnect = function () {
-      // return new Promise((resolve, reject) => {
       var _a = _this.initParams,
           onMessage = _a.onMessage,
           onEnd = _a.onEnd;
@@ -203,16 +43,14 @@ function () {
 
       eventSource.onopen = function (event) {
         console.log('onOpen');
-        sse = event.target; // resolve();
+        sse = event.target;
       };
 
       eventSource.onmessage = function (event) {
         if (event.data == '[DONE]') {
           _this.isGenerating = false;
 
-          _this.insertMessage2Context({
-            content: text
-          }, roleMap.ASSISTANT);
+          _this.insertMessage2Context(text, roleMap.ASSISTANT);
 
           text = '';
           onEnd();
@@ -239,80 +77,50 @@ 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 (messageObj, role) {
+    this.insertMessage2Context = function (message, role) {
       if (role === void 0) {
         role = roleMap.USER;
       }
 
       var messages = (0, _storeUtil.getSessionStore)(catchKey) || [];
-      messages.push(__assign({
+      messages.push({
+        content: message,
         role: role
-      }, messageObj));
+      });
       (0, _storeUtil.setSessionStore)(catchKey, messages);
     }; // 发送消息
 
 
-    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*/
-              ];
-          }
-        });
-      });
+    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);
     }; // 重新生成
 
 
@@ -331,8 +139,7 @@ function () {
 
       _this.initChatConnect();
 
-      var newMessages = _this.getSendContext();
-
+      var newMessages = messages.splice(messages.length - 5);
       setTimeout(function () {
         (0, _commonUtil.commonFetch)('/designer/v1/ai/stream-chat-completion', {
           clientId: _this.clientId,