@lingxiteam/lcdp-ueditor-react 1.0.1 → 1.0.3-alpha.1

package/es/LcdpUeditor.d.ts

@@ -57,6 +57,7 @@ declare class LcdpUeditor extends React.Component<ILcdpUeditorProps, {}> {
     componentWillUnmount(): void;
     private onContentChange;
     private getExtString;
+    private initConfig;
     /**
      * 文件选择
      * @param cb 回调给编辑器

package/es/LcdpUeditor.js

@@ -75,8 +75,6 @@ var LcdpUeditor = /*#__PURE__*/function (_React$Component) {
     if (_this.props.ueditorPath) {
       _this.ueditorPath = _this.props.ueditorPath;
     }
-    var nextValue = filterHtmlNode(_this.props.value || '').str;
-    _this.currentContent = nextValue;
     _this.uploadFunction = function (file, type) {
       var _this$props$config;
       // TODO 内置上传 图片base64
@@ -108,7 +106,7 @@ var LcdpUeditor = /*#__PURE__*/function (_React$Component) {
         _this.fileSelect(cb, type);
       },
       uploadFunction: _this.uploadFunction,
-      initialContent: nextValue || '',
+      initialContent: '',
       pasteplain: (config === null || config === void 0 ? void 0 : config.pasteplain) === true
     });
     _this.debounceContentChange = debounce(_this.onContentChange.bind(_assertThisInitialized(_this)), 300);
@@ -167,6 +165,18 @@ var LcdpUeditor = /*#__PURE__*/function (_React$Component) {
       }
       return str || '';
     }
+  }, {
+    key: "initConfig",
+    value: function initConfig() {
+      if (this.props.toolbars) {
+        this.editorConfig.toolbars = this.props.toolbars;
+      }
+      var nextValue = filterHtmlNode(this.props.value || '').str;
+      this.currentContent = nextValue;
+      if (nextValue) {
+        this.editorConfig.initialContent = nextValue;
+      }
+    }
 
     /**
      * 文件选择
@@ -297,9 +307,7 @@ var LcdpUeditor = /*#__PURE__*/function (_React$Component) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
               UeditorResourceLoader.onReady(function () {
-                if (_this3.props.toolbars) {
-                  _this3.editorConfig.toolbars = _this3.props.toolbars;
-                }
+                _this3.initConfig();
                 _this3.ueditorInst = window.UE.getEditor(_this3.containerId, _this3.editorConfig);
                 _this3.ueditorInst.ready(function () {
                   _this3.isReady = true;
@@ -316,7 +324,9 @@ var LcdpUeditor = /*#__PURE__*/function (_React$Component) {
                 });
                 _this3.mountRef();
               });
-              jsList = ["".concat(this.ueditorPath, "/").concat(DEFAULT_UEDITOR_CONFIG.UEDITOR_CONFIG), "".concat(this.ueditorPath, "/").concat(DEFAULT_UEDITOR_CONFIG.UEDITOR_ALL), "".concat(this.ueditorPath, "/").concat(DEFAULT_UEDITOR_CONFIG.GET_UEDITOR_LANG(this.props.lang || 'zh-cn'))];
+
+              // 默认配置 语言包 统一打包到 ueditor-all.js中
+              jsList = ["".concat(this.ueditorPath, "/").concat(DEFAULT_UEDITOR_CONFIG.UEDITOR_ALL)];
               UeditorResourceLoader.onLoadError(function () {
                 _this3.setState({
                   initError: true

package/es/tools/UeditorResourceLoader.d.ts

@@ -1,9 +1,9 @@
 declare class UeditorResourceLoader {
     private static instance;
+    private static ueditorIsLoad;
     private callbackList;
     private errorCallbackList;
     private isReady;
-    private loading;
     private initError;
     static startLoad(jsList: string[]): Promise<void>;
     static getInstance(): UeditorResourceLoader;

package/es/tools/UeditorResourceLoader.js

@@ -10,10 +10,17 @@ var UeditorResourceLoader = /*#__PURE__*/function () {
     _defineProperty(this, "callbackList", []);
     _defineProperty(this, "errorCallbackList", []);
     _defineProperty(this, "isReady", false);
-    _defineProperty(this, "loading", false);
     _defineProperty(this, "initError", false);
   }
   _createClass(UeditorResourceLoader, null, [{
+    key: "ueditorIsLoad",
+    value:
+    // 编辑器已经加载
+    function ueditorIsLoad() {
+      var _window;
+      return !!((_window = window) !== null && _window !== void 0 && (_window = _window.UE) !== null && _window !== void 0 && _window.getEditor);
+    }
+  }, {
     key: "startLoad",
     value: function () {
       var _startLoad = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(jsList) {
@@ -22,19 +29,19 @@ var UeditorResourceLoader = /*#__PURE__*/function () {
           while (1) switch (_context.prev = _context.next) {
             case 0:
               inst = this.getInstance();
-              if (!(!inst.loading && !inst.isReady || inst.initError)) {
+              if (!(!window.loadingUE && !inst.isReady || inst.initError)) {
                 _context.next = 14;
                 break;
               }
-              inst.loading = true;
+              window.loadingUE = true;
               inst.initError = false;
               _context.prev = 4;
               _context.next = 7;
               return loadScriptSync(jsList);
             case 7:
-              if (window.UE) {
+              if (UeditorResourceLoader.ueditorIsLoad()) {
                 inst.isReady = true;
-                inst.loading = false;
+                window.loadingUE = false;
 
                 // 执行callback中的回调函数
                 while (inst.callbackList.length) {
@@ -42,7 +49,7 @@ var UeditorResourceLoader = /*#__PURE__*/function () {
                   cb && cb();
                 }
               } else {
-                inst.loading = false;
+                window.loadingUE = false;
                 inst.isReady = false;
                 inst.initError = true;
                 while (inst.errorCallbackList.length) {
@@ -55,7 +62,7 @@ var UeditorResourceLoader = /*#__PURE__*/function () {
             case 10:
               _context.prev = 10;
               _context.t0 = _context["catch"](4);
-              inst.loading = false;
+              window.loadingUE = false;
               inst.isReady = false;
             case 14:
             case "end":
@@ -74,6 +81,10 @@ var UeditorResourceLoader = /*#__PURE__*/function () {
       if (!this.instance) {
         this.instance = new UeditorResourceLoader();
       }
+      if (UeditorResourceLoader.ueditorIsLoad()) {
+        this.instance.isReady = true;
+        window.loadingUE = false;
+      }
       return this.instance;
     }
 

package/lib/LcdpUeditor.d.ts

@@ -57,6 +57,7 @@ declare class LcdpUeditor extends React.Component<ILcdpUeditorProps, {}> {
     componentWillUnmount(): void;
     private onContentChange;
     private getExtString;
+    private initConfig;
     /**
      * 文件选择
      * @param cb 回调给编辑器

package/lib/LcdpUeditor.js

@@ -84,8 +84,6 @@ var LcdpUeditor = class extends import_react.default.Component {
     if (this.props.ueditorPath) {
       this.ueditorPath = this.props.ueditorPath;
     }
-    const nextValue = (0, import_filterHtmlNode.filterHtmlNode)(this.props.value || "").str;
-    this.currentContent = nextValue;
     this.uploadFunction = (file, type) => {
       var _a;
       if (type === "image" && ((_a = this.props.config) == null ? void 0 : _a.imageType) === "base64") {
@@ -114,7 +112,7 @@ var LcdpUeditor = class extends import_react.default.Component {
         this.fileSelect(cb, type);
       },
       uploadFunction: this.uploadFunction,
-      initialContent: nextValue || "",
+      initialContent: "",
       pasteplain: (config == null ? void 0 : config.pasteplain) === true
     };
     this.debounceContentChange = (0, import_debounce.default)(this.onContentChange.bind(this), 300);
@@ -158,6 +156,16 @@ var LcdpUeditor = class extends import_react.default.Component {
     }
     return str || "";
   }
+  initConfig() {
+    if (this.props.toolbars) {
+      this.editorConfig.toolbars = this.props.toolbars;
+    }
+    const nextValue = (0, import_filterHtmlNode.filterHtmlNode)(this.props.value || "").str;
+    this.currentContent = nextValue;
+    if (nextValue) {
+      this.editorConfig.initialContent = nextValue;
+    }
+  }
   /**
    * 文件选择
    * @param cb 回调给编辑器
@@ -227,9 +235,7 @@ var LcdpUeditor = class extends import_react.default.Component {
    */
   async initUeditor() {
     import_UeditorResourceLoader.default.onReady(() => {
-      if (this.props.toolbars) {
-        this.editorConfig.toolbars = this.props.toolbars;
-      }
+      this.initConfig();
       this.ueditorInst = window.UE.getEditor(this.containerId, this.editorConfig);
       this.ueditorInst.ready(() => {
         this.isReady = true;
@@ -246,9 +252,7 @@ var LcdpUeditor = class extends import_react.default.Component {
       this.mountRef();
     });
     const jsList = [
-      `${this.ueditorPath}/${import_const.DEFAULT_UEDITOR_CONFIG.UEDITOR_CONFIG}`,
-      `${this.ueditorPath}/${import_const.DEFAULT_UEDITOR_CONFIG.UEDITOR_ALL}`,
-      `${this.ueditorPath}/${import_const.DEFAULT_UEDITOR_CONFIG.GET_UEDITOR_LANG(this.props.lang || "zh-cn")}`
+      `${this.ueditorPath}/${import_const.DEFAULT_UEDITOR_CONFIG.UEDITOR_ALL}`
     ];
     import_UeditorResourceLoader.default.onLoadError(() => {
       this.setState({

package/lib/tools/UeditorResourceLoader.d.ts

@@ -1,9 +1,9 @@
 declare class UeditorResourceLoader {
     private static instance;
+    private static ueditorIsLoad;
     private callbackList;
     private errorCallbackList;
     private isReady;
-    private loading;
     private initError;
     static startLoad(jsList: string[]): Promise<void>;
     static getInstance(): UeditorResourceLoader;

package/lib/tools/UeditorResourceLoader.js

@@ -28,25 +28,29 @@ var UeditorResourceLoader = class {
     this.callbackList = [];
     this.errorCallbackList = [];
     this.isReady = false;
-    this.loading = false;
     this.initError = false;
   }
+  // 编辑器已经加载
+  static ueditorIsLoad() {
+    var _a;
+    return !!((_a = window == null ? void 0 : window.UE) == null ? void 0 : _a.getEditor);
+  }
   static async startLoad(jsList) {
     const inst = this.getInstance();
-    if (!inst.loading && !inst.isReady || inst.initError) {
-      inst.loading = true;
+    if (!window.loadingUE && !inst.isReady || inst.initError) {
+      window.loadingUE = true;
       inst.initError = false;
       try {
         await (0, import_loadScript.loadScriptSync)(jsList);
-        if (window.UE) {
+        if (UeditorResourceLoader.ueditorIsLoad()) {
           inst.isReady = true;
-          inst.loading = false;
+          window.loadingUE = false;
           while (inst.callbackList.length) {
             const cb = inst.callbackList.pop();
             cb && cb();
           }
         } else {
-          inst.loading = false;
+          window.loadingUE = false;
           inst.isReady = false;
           inst.initError = true;
           while (inst.errorCallbackList.length) {
@@ -55,7 +59,7 @@ var UeditorResourceLoader = class {
           }
         }
       } catch (error) {
-        inst.loading = false;
+        window.loadingUE = false;
         inst.isReady = false;
       }
     }
@@ -64,6 +68,10 @@ var UeditorResourceLoader = class {
     if (!this.instance) {
       this.instance = new UeditorResourceLoader();
     }
+    if (UeditorResourceLoader.ueditorIsLoad()) {
+      this.instance.isReady = true;
+      window.loadingUE = false;
+    }
     return this.instance;
   }
   /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lingxiteam/lcdp-ueditor-react",
-  "version": "1.0.1",
+  "version": "1.0.3-alpha.1",
   "license": "MIT",
   "main": "lib/index.js",
   "module": "es/index.js",

package/ueditor-resource/dialogs/anchor/anchor.html

@@ -37,7 +37,7 @@
 <div class="content">
     <span><var id="lang_input_anchorName"></var></span><input id="anchorName" value=""/>
 </div>
-<script type="text/javascript" src="../internal.js?aea0c61c"></script>
+<script type="text/javascript" src="../internal.js?04dbe7f0"></script>
 <script type="text/javascript">
     var anchorInput = $G('anchorName'),
         node = editor.selection.getRange().getClosedNode();