fix: 修复参数合并问题.

Jesonhu · Mar 26, 2020 · 3925dd8 · 3925dd8
1 parent 32c0fb2
commit 3925dd8
Show file tree

Hide file tree

Showing 7 changed files with 83 additions and 11 deletions.
diff --git a/dist/cMdEditor.css b/dist/cMdEditor.css
diff --git a/dist/cMdEditor.js b/dist/cMdEditor.js
diff --git a/dist/index.html b/dist/index.html
@@ -0,0 +1,47 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <meta http-equiv="X-UA-Compatible" content="ie=edge">
+  <title>Cool-MD-Editor</title>
+  <style>
+    html,
+    body {
+      width:100%;
+      height:100%;
+    }
+    .wrap {
+      width: 80%;
+      height: 600px;
+      padding: 50px;
+      margin: 0 auto;
+    }
+  </style>
+<link href="cMdEditor.css" rel="stylesheet"><link href="cMdEditor.css" rel="stylesheet"></head>
+<body>
+  <div class="wrap">
+    <div class="cool-md-editor-wrap editor-theme-dark" id="editor-wrap"></div>
+  </div>
+
+<!-- qiniu h5 upload -->
+<script src="https://unpkg.com/qiniu-js@2.5.5/dist/qiniu.min.js"></script>
+<script type="text/javascript" src="cMdEditor.js"></script>
+<script>
+  const cMdEditor = new CMdEditor({
+    el: document.getElementById('editor-wrap'),
+    // lang: 'zh',
+    // shortcuts: {
+    //   isOpen: false,
+    // },
+    qiniu: {
+      tokenApiUrl: 'http://121.42.230.245:9001/api/qiniu/test/get_token',
+    //   region: 'z1',
+    //   config: {},
+    //   putExtra: {}
+    }
+  });
+  console.log(cMdEditor);
+</script>
+</body>
+</html>
diff --git a/package.json b/package.json
@@ -1,9 +1,9 @@
 {
   "name": "cool-md-editor",
-  "version": "1.2.1",
+  "version": "1.3.0",
   "description": "a markedown editor width webpack & codemirror & marked & highlight",
-  "main": "dist/CMDEditor.js",
-  "unpkg": "dist/CMDEditor.js",
+  "main": "dist/cMDEditor.js",
+  "unpkg": "dist/cMDEditor.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
     "dev": "webpack-dev-server --open --progress --colors",

diff --git a/src/index.html b/src/index.html
@@ -34,12 +34,12 @@
     // shortcuts: {
     //   isOpen: false,
     // },
-    // qiniu: {
-    //   tokenApiUrl: 'http://127.0.0.1:3001/api/qiniu/blog/get_token',
+    qiniu: {
+      tokenApiUrl: 'http://121.42.230.245:9001/api/qiniu/test/get_token',
     //   region: 'z1',
     //   config: {},
     //   putExtra: {}
-    // }
+    }
   });
   console.log(cMdEditor);
 </script>

diff --git a/src/index.js b/src/index.js
@@ -241,16 +241,18 @@ class CMdEditor {
       lang: 'zh',
       // ========== 七牛 ==========
       qiniu: {
-        tokenApiUrl: 'http://127.0.0.1:3001/api/qiniu/blog/get_token',
+        tokenApiUrl: 'http://127.0.0.1:3001/api/qiniu/test/get_token',
         region: 'z1',
         config: {},
         putExtra: {}
       }
     }
-    Object.assign(defaultOptions, options);
-    this._options = defaultOptions;
+    // Object.assign(defaultOptions, options);
+    // this._options = defaultOptions;
+    this._options = UTIL.extend({}, defaultOptions, options);
     this._options.$tools = $tools;
     const _options = this._options;
+    console.log(this._options);
 
     // 默认语言处理.
     if (typeof _options.lang === 'string') {

diff --git a/src/util/Util.js b/src/util/Util.js
@@ -2,19 +2,21 @@ const Util = {
   /**
    * Merge the properties of one object into another.
    * 将一个对象的属性合并到另一个对象上. 
+   * Object.assign({}, {person: {name: 1, age: 16}}, {person: {name:1}})
+   * 使用 Object.assign 需要处理多层数据前台的问题，这里就自行封装了.
    */
   _mergeProperties(target, source) {
     for (let property in source) {
       if (source.hasOwnProperty(property)) {
-        if (souce[property] instanceof Array) {
+        if (source[property] instanceof Array) {
           const value = target[property] instanceof Array ? target[property] : [];
           target[property] = source[property].concat(value);
         } else if (
           source[property] != null &&
           typeof source[property] === 'object' &&
           source[property].constructor === Object ) 
         {
-          target[property] = this._mergeProperties(target[property] || {}, souce[property]);
+          target[property] = this._mergeProperties(target[property] || {}, source[property]);
         } else {
           target[property] = source[property];
         }