@lingxiteam/lcdp-ueditor-react 1.0.2 → 1.0.3-alpha.10

package/es/LcdpUeditor.d.ts

@@ -41,6 +41,10 @@ declare class LcdpUeditor extends React.Component<ILcdpUeditorProps, {}> {
      * 是否加载完成
      */
     private isReady;
+    /**
+     * 保存 compositionend 事件处理器引用
+     */
+    private compositionEndHandler?;
     /**
      * 初始加载失败
      */

package/es/LcdpUeditor.js

@@ -60,6 +60,10 @@ var LcdpUeditor = /*#__PURE__*/function (_React$Component) {
      * 是否加载完成
      */
     _defineProperty(_assertThisInitialized(_this), "isReady", false);
+    /**
+     * 保存 compositionend 事件处理器引用
+     */
+    _defineProperty(_assertThisInitialized(_this), "compositionEndHandler", void 0);
     /**
      * 初始加载失败
      */
@@ -139,8 +143,14 @@ var LcdpUeditor = /*#__PURE__*/function (_React$Component) {
     key: "componentWillUnmount",
     value: function componentWillUnmount() {
       if (this.isReady) {
-        var _this$ueditorInst, _this$ueditorInst$des;
-        (_this$ueditorInst = this.ueditorInst) === null || _this$ueditorInst === void 0 || (_this$ueditorInst$des = _this$ueditorInst.destroy) === null || _this$ueditorInst$des === void 0 || _this$ueditorInst$des.call(_this$ueditorInst);
+        var _this$ueditorInst, _this$ueditorInst2, _this$ueditorInst2$de;
+        var editorBody = (_this$ueditorInst = this.ueditorInst) === null || _this$ueditorInst === void 0 ? void 0 : _this$ueditorInst.body;
+        if (editorBody && this.compositionEndHandler) {
+          // 销毁时移除监听
+          editorBody.removeEventListener('compositionend', this.compositionEndHandler);
+          this.compositionEndHandler = undefined;
+        }
+        (_this$ueditorInst2 = this.ueditorInst) === null || _this$ueditorInst2 === void 0 || (_this$ueditorInst2$de = _this$ueditorInst2.destroy) === null || _this$ueditorInst2$de === void 0 || _this$ueditorInst2$de.call(_this$ueditorInst2);
       }
     }
   }, {
@@ -302,14 +312,30 @@ var LcdpUeditor = /*#__PURE__*/function (_React$Component) {
     value: (function () {
       var _initUeditor = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
         var _this3 = this;
-        var jsList;
+        var timer, readyFunc, jsList;
         return _regeneratorRuntime().wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
-              UeditorResourceLoader.onReady(function () {
+              // 在弹窗页面中反复开关，会导致 dom 丢失
+              readyFunc = function readyFunc() {
                 _this3.initConfig();
+                var target = document.getElementById(_this3.containerId);
+                if (!window.UE || !target) {
+                  timer = setInterval(function () {
+                    target = document.getElementById(_this3.containerId);
+                    if (target) {
+                      clearInterval(timer);
+                      readyFunc();
+                    }
+                  }, 50);
+                  return;
+                }
                 _this3.ueditorInst = window.UE.getEditor(_this3.containerId, _this3.editorConfig);
                 _this3.ueditorInst.ready(function () {
+                  var nextValue = filterHtmlNode(_this3.props.value || '').str;
+                  if (nextValue) {
+                    _this3.ueditorInst.setContent(nextValue);
+                  }
                   _this3.isReady = true;
                   // 禁用状态设置
                   if (_this3.props.disabled) {
@@ -320,18 +346,29 @@ var LcdpUeditor = /*#__PURE__*/function (_React$Component) {
                   _this3.ueditorInst.addListener('contentChange', function () {
                     _this3.debounceContentChange();
                   });
+
+                  // 处理微软拼音输入法输入中文时，内容不会触发contentChange事件
+                  var editorBody = _this3.ueditorInst.body;
+                  if (editorBody) {
+                    _this3.compositionEndHandler = function () {
+                      _this3.debounceContentChange();
+                    };
+                    editorBody.addEventListener('compositionend', _this3.compositionEndHandler);
+                  }
                   _this3.initStyle();
+                  _this3.mountRef();
                 });
-                _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'))];
+              };
+              UeditorResourceLoader.onReady(readyFunc);
+              // 默认配置 语言包 统一打包到 ueditor-all.js中
+              jsList = ["".concat(this.ueditorPath, "/").concat(DEFAULT_UEDITOR_CONFIG.UEDITOR_ALL)];
               UeditorResourceLoader.onLoadError(function () {
                 _this3.setState({
                   initError: true
                 });
               });
               UeditorResourceLoader.startLoad(jsList);
-            case 4:
+            case 5:
             case "end":
               return _context3.stop();
           }

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/es/tools/filterHtmlNode.js

@@ -1,4 +1,5 @@
 export var filterHtmlNode = function filterHtmlNode(str) {
+  var _doc$body;
   var flag = false;
   if (typeof str !== 'string') return str || '';
   var blacklist = ['script', 'style', 'iframe'];
@@ -11,6 +12,9 @@ export var filterHtmlNode = function filterHtmlNode(str) {
 
   // 遍历 DOM 树并删除恶意节点
   function cleanNode(node) {
+    if (!node) {
+      return;
+    }
     if (node.nodeType === 1) {
       // 元素节点
       if (blacklist.indexOf(node.nodeName.toLowerCase()) !== -1) {
@@ -28,13 +32,14 @@ export var filterHtmlNode = function filterHtmlNode(str) {
         }
       }
     }
-    for (var _i = 0; _i < node.childNodes.length; _i += 1) {
+    for (var _i = 0; _i < (node === null || node === void 0 || (_node$childNodes = node.childNodes) === null || _node$childNodes === void 0 ? void 0 : _node$childNodes.length); _i += 1) {
+      var _node$childNodes;
       cleanNode(node.childNodes[_i]);
     }
   }
   cleanNode(doc.body);
   return {
-    str: doc.body.innerHTML,
+    str: ((_doc$body = doc.body) === null || _doc$body === void 0 ? void 0 : _doc$body.innerHTML) || '',
     flag: flag,
     source: str
   };

package/lib/LcdpUeditor.d.ts

@@ -41,6 +41,10 @@ declare class LcdpUeditor extends React.Component<ILcdpUeditorProps, {}> {
      * 是否加载完成
      */
     private isReady;
+    /**
+     * 保存 compositionend 事件处理器引用
+     */
+    private compositionEndHandler?;
     /**
      * 初始加载失败
      */

package/lib/LcdpUeditor.js

@@ -136,9 +136,14 @@ var LcdpUeditor = class extends import_react.default.Component {
     }
   }
   componentWillUnmount() {
-    var _a, _b;
+    var _a, _b, _c;
     if (this.isReady) {
-      (_b = (_a = this.ueditorInst) == null ? void 0 : _a.destroy) == null ? void 0 : _b.call(_a);
+      const editorBody = (_a = this.ueditorInst) == null ? void 0 : _a.body;
+      if (editorBody && this.compositionEndHandler) {
+        editorBody.removeEventListener("compositionend", this.compositionEndHandler);
+        this.compositionEndHandler = void 0;
+      }
+      (_c = (_b = this.ueditorInst) == null ? void 0 : _b.destroy) == null ? void 0 : _c.call(_b);
     }
   }
   onContentChange() {
@@ -234,10 +239,26 @@ var LcdpUeditor = class extends import_react.default.Component {
    * 初始化编辑器实例
    */
   async initUeditor() {
-    import_UeditorResourceLoader.default.onReady(() => {
+    let timer;
+    const readyFunc = () => {
       this.initConfig();
+      let target = document.getElementById(this.containerId);
+      if (!window.UE || !target) {
+        timer = setInterval(() => {
+          target = document.getElementById(this.containerId);
+          if (target) {
+            clearInterval(timer);
+            readyFunc();
+          }
+        }, 50);
+        return;
+      }
       this.ueditorInst = window.UE.getEditor(this.containerId, this.editorConfig);
       this.ueditorInst.ready(() => {
+        const nextValue = (0, import_filterHtmlNode.filterHtmlNode)(this.props.value || "").str;
+        if (nextValue) {
+          this.ueditorInst.setContent(nextValue);
+        }
         this.isReady = true;
         if (this.props.disabled) {
           this.ueditorInst.setDisabled();
@@ -247,15 +268,19 @@ var LcdpUeditor = class extends import_react.default.Component {
         this.ueditorInst.addListener("contentChange", () => {
           this.debounceContentChange();
         });
+        const editorBody = this.ueditorInst.body;
+        if (editorBody) {
+          this.compositionEndHandler = () => {
+            this.debounceContentChange();
+          };
+          editorBody.addEventListener("compositionend", this.compositionEndHandler);
+        }
         this.initStyle();
+        this.mountRef();
       });
-      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")}`
-    ];
+    };
+    import_UeditorResourceLoader.default.onReady(readyFunc);
+    const jsList = [`${this.ueditorPath}/${import_const.DEFAULT_UEDITOR_CONFIG.UEDITOR_ALL}`];
     import_UeditorResourceLoader.default.onLoadError(() => {
       this.setState({
         initError: true

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/lib/tools/filterHtmlNode.js

@@ -23,6 +23,7 @@ __export(filterHtmlNode_exports, {
 });
 module.exports = __toCommonJS(filterHtmlNode_exports);
 var filterHtmlNode = (str) => {
+  var _a;
   let flag = false;
   if (typeof str !== "string")
     return str || "";
@@ -30,10 +31,13 @@ var filterHtmlNode = (str) => {
   const parser = new DOMParser();
   const doc = parser.parseFromString(str, "text/html");
   function cleanNode(node) {
-    var _a;
+    var _a2, _b;
+    if (!node) {
+      return;
+    }
     if (node.nodeType === 1) {
       if (blacklist.indexOf(node.nodeName.toLowerCase()) !== -1) {
-        (_a = node.parentNode) == null ? void 0 : _a.removeChild(node);
+        (_a2 = node.parentNode) == null ? void 0 : _a2.removeChild(node);
         return;
       }
       for (let i = node.attributes.length - 1; i >= 0; i -= 1) {
@@ -44,13 +48,13 @@ var filterHtmlNode = (str) => {
         }
       }
     }
-    for (let i = 0; i < node.childNodes.length; i += 1) {
+    for (let i = 0; i < ((_b = node == null ? void 0 : node.childNodes) == null ? void 0 : _b.length); i += 1) {
       cleanNode(node.childNodes[i]);
     }
   }
   cleanNode(doc.body);
   return {
-    str: doc.body.innerHTML,
+    str: ((_a = doc.body) == null ? void 0 : _a.innerHTML) || "",
     flag,
     source: str
   };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lingxiteam/lcdp-ueditor-react",
-  "version": "1.0.2",
+  "version": "1.0.3-alpha.10",
   "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?b983a808"></script>
 <script type="text/javascript">
     var anchorInput = $G('anchorName'),
         node = editor.selection.getRange().getClosedNode();