@fonixtree/magic-design 0.1.74 → 0.1.76

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

@@ -11,6 +11,149 @@ var _commonUtil = require("../../../utils/commonUtil");
 
 var _storeUtil = require("../../../utils/storeUtil");
 
+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',
@@ -30,9 +173,9 @@ function () {
 
     this.isGenerating = false; // 初始化参数
 
-    this.initParams = {}; // 建立连接
+    this.initParams = {}; // 初始化
 
-    this.initChatConnect = function () {
+    this.initChatGpt = function () {
       var _a = _this.initParams,
           onMessage = _a.onMessage,
           onEnd = _a.onEnd;
@@ -42,7 +185,6 @@ function () {
       var eventSource = new EventSource("/designer/v1/ai/sse/create?clientId=" + _this.clientId);
 
       eventSource.onopen = function (event) {
-        console.log('onOpen');
         sse = event.target;
       };
 
@@ -74,9 +216,6 @@ function () {
 
       eventSource.onerror = function (event) {
         console.log('onerror', event);
-        _this.isGenerating = false;
-
-        _this.regenerate();
       };
     }; // 获取chat上下文
 
@@ -102,25 +241,28 @@ function () {
 
 
     this.sendMessage = function (message) {
-      if (!message) {
-        return;
-      }
-
-      _this.isGenerating = true;
-
-      _this.insertMessage2Context(message);
-
-      var messages = _this.getContext();
-
-      _this.initChatConnect();
+      return __awaiter(_this, void 0, void 0, function () {
+        var messages;
+        return __generator(this, function (_a) {
+          if (!message) {
+            return [2
+            /*return*/
+            ];
+          }
 
-      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.isGenerating = true;
+          this.insertMessage2Context(message);
+          messages = this.getContext();
+          (0, _commonUtil.commonFetch)('/designer/v1/ai/stream-chat-completion', {
+            clientId: this.clientId,
+            messages: messages
+          }, 'POST');
+          this.initChatGpt();
+          return [2
+          /*return*/
+          ];
+        });
+      });
     }; // 重新生成
 
 
@@ -137,15 +279,12 @@ function () {
         (0, _storeUtil.setSessionStore)(catchKey, messages);
       }
 
-      _this.initChatConnect();
+      (0, _commonUtil.commonFetch)('/designer/v1/ai/stream-chat-completion', {
+        clientId: _this.clientId,
+        messages: messages
+      }, 'POST');
 
-      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.initChatGpt();
     }; // setSessionStore(catchKey, []);
 
 

package/lib/core/Designer/index.js

@@ -35,6 +35,8 @@ var _LeftTitle = _interopRequireDefault(require("./LeftTitle"));
 
 var _RenderHtml = _interopRequireDefault(require("./RenderHtml"));
 
+var _AiImageGenerator = _interopRequireDefault(require("./AiImageGenerator"));
+
 var _componentTypes = require("../../constants/component-types");
 
 var _mobx = require("../../mobx");
@@ -775,7 +777,7 @@ function (_super) {
       },
       onConfirm: this.onAppointmentConfirm,
       visible: appointmentVisible
-    })), /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement(_common.SystemNotification, null))), /*#__PURE__*/_react["default"].createElement(_RenderHtml["default"], {
+    }), /*#__PURE__*/_react["default"].createElement(_AiImageGenerator["default"], null)), /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement(_common.SystemNotification, null))), /*#__PURE__*/_react["default"].createElement(_RenderHtml["default"], {
       ref: this.renderHtmlRef
     }));
   };

package/lib/utils/commonUtil.js

@@ -748,8 +748,11 @@ var convertToRem = function convertToRem(value) {
     return value + "px";
   }
 
+  var baseFont = ensure(function () {
+    return window.getComputedStyle(document.getElementsByTagName('html')[0]).fontSize.replace('px');
+  }, 50);
   var pxValue = parseFloat(value);
-  var remValue = pxValue / 50; // 假设1rem = 50px
+  var remValue = pxValue / baseFont; // 假设1rem = 50px
 
   return remValue + "rem";
 };

package/package.json

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

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

@@ -1,141 +0,0 @@
-"use strict";
-
-function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports["default"] = void 0;
-
-var _react = _interopRequireWildcard(require("react"));
-
-var _classnames = _interopRequireDefault(require("classnames"));
-
-var _common = require("../../../../common");
-
-require("./index.less");
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
-
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
-var __spreadArrays = void 0 && (void 0).__spreadArrays || function () {
-  for (var s = 0, i = 0, il = arguments.length; i < il; i++) {
-    s += arguments[i].length;
-  }
-
-  for (var r = Array(s), k = 0, i = 0; i < il; i++) {
-    for (var a = arguments[i], j = 0, jl = a.length; j < jl; j++, k++) {
-      r[k] = a[j];
-    }
-  }
-
-  return r;
-};
-
-function History(_a) {
-  var source = _a.source,
-      onClick = _a.onClick,
-      onChange = _a.onChange,
-      selectIndex = _a.selectIndex;
-
-  var _b = (0, _react.useState)(false),
-      isEdit = _b[0],
-      setIsEdit = _b[1];
-
-  var _c = (0, _react.useState)([]),
-      selected = _c[0],
-      setSelected = _c[1];
-
-  var historyConfig = function historyConfig() {
-    if (isEdit) {
-      setSelected([]);
-    }
-
-    setIsEdit(!isEdit);
-  };
-
-  var onDeleteHistory = function onDeleteHistory() {
-    if (!selected.length) {
-      return;
-    }
-
-    var newSource = source.filter(function (src, index) {
-      return !selected.includes(index);
-    });
-    onChange(newSource.length ? newSource : []);
-    setIsEdit(false);
-  };
-
-  var onHisItemClick = function onHisItemClick(index) {
-    if (!isEdit) {
-      onClick(index);
-      return;
-    }
-
-    if (selected.includes(index)) {
-      var newSelecetd = selected.filter(function (sel) {
-        return sel !== index;
-      });
-      setSelected(newSelecetd);
-    } else {
-      setSelected(__spreadArrays(selected, [index]));
-    }
-  };
-
-  return /*#__PURE__*/_react["default"].createElement("div", {
-    className: "history_wrap"
-  }, /*#__PURE__*/_react["default"].createElement("div", {
-    className: "history_header"
-  }, /*#__PURE__*/_react["default"].createElement("div", {
-    className: "title"
-  }, "History"), /*#__PURE__*/_react["default"].createElement(_common.Iconfont, {
-    color: "#2F54EB",
-    onClick: historyConfig,
-    size: 20,
-    style: {
-      cursor: 'pointer'
-    },
-    type: isEdit ? 'icon-close' : 'icon-setting1'
-  })), /*#__PURE__*/_react["default"].createElement("div", {
-    className: "history_list"
-  }, source.length > 0 && source.map(function (his, index) {
-    return /*#__PURE__*/_react["default"].createElement("div", {
-      className: (0, _classnames["default"])('historyNode', {
-        active: selectIndex === index
-      }),
-      onClick: function onClick() {
-        return onHisItemClick(index);
-      }
-    }, isEdit && /*#__PURE__*/_react["default"].createElement("div", {
-      className: "hisSelectIcon"
-    }, /*#__PURE__*/_react["default"].createElement(_common.Iconfont, {
-      color: "#2F54EB",
-      size: 20,
-      style: {
-        cursor: 'pointer'
-      },
-      type: selected.includes(index) ? 'icon-select1' : 'icon-uncheck'
-    })), /*#__PURE__*/_react["default"].createElement("img", {
-      alt: "",
-      src: his.images[0]
-    }), his.images.length > 1 && /*#__PURE__*/_react["default"].createElement("span", {
-      className: "hisImgNum"
-    }, his.images.length));
-  })), isEdit && /*#__PURE__*/_react["default"].createElement("div", {
-    className: "historyBottom",
-    onClick: onDeleteHistory
-  }, /*#__PURE__*/_react["default"].createElement(_common.Iconfont, {
-    color: "#FF4141",
-    size: 16,
-    style: {
-      cursor: 'pointer'
-    },
-    type: "icon-delete1"
-  }), /*#__PURE__*/_react["default"].createElement("span", null, "Delete"), " "));
-}
-
-var _default = History;
-exports["default"] = _default;

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

@@ -1,69 +0,0 @@
-.history_wrap {
-  position: relative;
-  height: calc(100vh - 100px);
-  overflow: scroll;
-  width: 132px;
-  min-height: 100%;
-  background-color: #FFF;
-  border-radius: 4px;
-  .history_header {
-    display: flex;
-    justify-content: space-between;
-    padding: 16px;
-  }
-  .history_list {
-    padding: 0 16px;
-    max-height: calc(100vh - 200px);
-    overflow: scroll;
-    .historyNode {
-      cursor: pointer;
-      border: 2px solid transparent;
-      border-radius: 6px;
-      position: relative;
-      margin-bottom: 12px;
-      .hisSelectIcon {
-        position: absolute;
-        right: 6px;
-        top: 6px;
-        background-color: #FFF;
-        border-radius: 50%;
-        display: flex;
-        align-items: center;
-        justify-content: center;
-      }
-      img {
-        border-radius: 4px;
-        width: 96px;
-        height: 96px;
-      }
-      .hisImgNum {
-        width: 18px;
-        height: 18px;
-        position: absolute;
-        bottom: 6px;
-        right: 6px;
-        background: #2F54EBCC;
-        color: #FFF;
-        font-family: 'Open Sans';
-        font-size: 12px;
-        font-weight: 400;
-        display: flex;
-        align-items: center;
-        justify-content: center;
-      }
-    }
-    .active {
-      border: 2px solid #2F54EB;
-    }
-  }
-  .historyBottom {
-    cursor: pointer;
-    position: absolute;
-    bottom: 16px;
-    left: 0;
-    right: 0;
-    margin-top: 10px;
-    color: #FF4141;
-    text-align: center;
-  }
-}

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

@@ -1,141 +0,0 @@
-"use strict";
-
-function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports["default"] = void 0;
-
-var _react = _interopRequireWildcard(require("react"));
-
-var _classnames = _interopRequireDefault(require("classnames"));
-
-var _common = require("../../../../common");
-
-require("./index.less");
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
-
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
-var __spreadArrays = void 0 && (void 0).__spreadArrays || function () {
-  for (var s = 0, i = 0, il = arguments.length; i < il; i++) {
-    s += arguments[i].length;
-  }
-
-  for (var r = Array(s), k = 0, i = 0; i < il; i++) {
-    for (var a = arguments[i], j = 0, jl = a.length; j < jl; j++, k++) {
-      r[k] = a[j];
-    }
-  }
-
-  return r;
-};
-
-function History(_a) {
-  var source = _a.source,
-      onClick = _a.onClick,
-      onChange = _a.onChange,
-      selectIndex = _a.selectIndex;
-
-  var _b = (0, _react.useState)(false),
-      isEdit = _b[0],
-      setIsEdit = _b[1];
-
-  var _c = (0, _react.useState)([]),
-      selected = _c[0],
-      setSelected = _c[1];
-
-  var historyConfig = function historyConfig() {
-    if (isEdit) {
-      setSelected([]);
-    }
-
-    setIsEdit(!isEdit);
-  };
-
-  var onDeleteHistory = function onDeleteHistory() {
-    if (!selected.length) {
-      return;
-    }
-
-    var newSource = source.filter(function (src, index) {
-      return !selected.includes(index);
-    });
-    onChange(newSource.length ? newSource : []);
-    setIsEdit(false);
-  };
-
-  var onHisItemClick = function onHisItemClick(index) {
-    if (!isEdit) {
-      onClick(index);
-      return;
-    }
-
-    if (selected.includes(index)) {
-      var newSelecetd = selected.filter(function (sel) {
-        return sel !== index;
-      });
-      setSelected(newSelecetd);
-    } else {
-      setSelected(__spreadArrays(selected, [index]));
-    }
-  };
-
-  return /*#__PURE__*/_react["default"].createElement("div", {
-    className: "history_wrap"
-  }, /*#__PURE__*/_react["default"].createElement("div", {
-    className: "history_header"
-  }, /*#__PURE__*/_react["default"].createElement("div", {
-    className: "title"
-  }, "History"), /*#__PURE__*/_react["default"].createElement(_common.Iconfont, {
-    color: "#2F54EB",
-    onClick: historyConfig,
-    size: 20,
-    style: {
-      cursor: 'pointer'
-    },
-    type: isEdit ? 'icon-close' : 'icon-setting1'
-  })), /*#__PURE__*/_react["default"].createElement("div", {
-    className: "history_list"
-  }, source.length > 0 && source.map(function (his, index) {
-    return /*#__PURE__*/_react["default"].createElement("div", {
-      className: (0, _classnames["default"])('historyNode', {
-        active: selectIndex === index
-      }),
-      onClick: function onClick() {
-        return onHisItemClick(index);
-      }
-    }, isEdit && /*#__PURE__*/_react["default"].createElement("div", {
-      className: "hisSelectIcon"
-    }, /*#__PURE__*/_react["default"].createElement(_common.Iconfont, {
-      color: "#2F54EB",
-      size: 20,
-      style: {
-        cursor: 'pointer'
-      },
-      type: selected.includes(index) ? 'icon-select1' : 'icon-uncheck'
-    })), /*#__PURE__*/_react["default"].createElement("img", {
-      alt: "",
-      src: his.images[0]
-    }), his.images.length > 1 && /*#__PURE__*/_react["default"].createElement("span", {
-      className: "hisImgNum"
-    }, his.images.length));
-  })), isEdit && /*#__PURE__*/_react["default"].createElement("div", {
-    className: "historyBottom",
-    onClick: onDeleteHistory
-  }, /*#__PURE__*/_react["default"].createElement(_common.Iconfont, {
-    color: "#FF4141",
-    size: 16,
-    style: {
-      cursor: 'pointer'
-    },
-    type: "icon-delete1"
-  }), /*#__PURE__*/_react["default"].createElement("span", null, "Delete"), " "));
-}
-
-var _default = History;
-exports["default"] = _default;