'改进'

luckyray-fan · luckyray-fan · commit 111337c88c01 · 2020-02-21T00:05:40.000+08:00
diff --git a/README.md b/README.md
@@ -1,2 +1,22 @@
 # hexo-history
-文章历史对比, 显示每次更新差异的一个 hexo 插件
+
+文章历史对比, 显示每次更新差异的一个 hexo 插件, 关于如何开发的详细文章可见[]()
+
+## 使用方法
+
+- 本地执行测试, 更改 info-provider 即可
+
+| 参数名      | 含义                               |
+| ----------- | ---------------------------------- |
+| repo        | 用户名+仓库名                      |
+| path        | 文件路径                           |
+| anchorClass | 用于挂载和解析的文章节点           |
+| baseUrl     | 使用 iframe 渲染时设定的 base 标签 |
+
+- 正式使用, 设置 config, 名称为 hexoHistory, 参照下图操作即可
+
+## 后续改进
+
+- icon 引入 bug
+- diff 算法实现
+- hexo 只选择 post 进行处理
diff --git a/index.js b/index.js
@@ -1,6 +1,6 @@
 const fs = require('hexo-fs');
 
-var config = hexo.config.history || {};
+var config = hexo.config.hexoHistory || {};
 function buildGenerator(sourcePath, distPath) {
   return {
     data: () => fs.createReadStream(sourcePath),
@@ -19,9 +19,11 @@ hexo.extend.generator.register('hexo-history-file', () => {
 });
 //添加上script标签
 hexo.extend.filter.register('after_render:html', (htmlContent) => {
-  const scriptToInject = `HexoHistory(${JSON.stringify(config)});`; //把配置注册为全局变量好了
+  const scriptToInject = `<script>window.hexoHistoryConfig = JSON.parse(${JSON.stringify(
+    config
+  )});</script> `; //把配置注册为全局变量好了
   let vueInject = `<script src="https://cdn.bootcss.com/vue/2.6.10/vue.min.js"></script>`;
-  const contentToInject = `${vueInject}<script src="/hexo-history-main.js"></script><script>${scriptToInject}</script>`;
+  const contentToInject = `${vueInject} ${scriptToInject}<script src="/hexo-history-main.js"></script>`;
   let newHtmlContent = htmlContent;
   if (/([\n\r\s\t]*<\/body>)/i.test(htmlContent)) {
     const lastIndex = htmlContent.lastIndexOf('</body>');
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "hexo-history",
-  "version": "1.1.2",
+  "version": "1.1.4",
   "repository": {
     "type": "git",
     "url": "https://github.com/luckyray-fan/hexo-history.git"
diff --git a/src/ajax.js b/src/ajax.js
@@ -1,9 +1,5 @@
-import gitInfo from './git-provider';
+import gitInfo from './info-provider';
 var { repo, sha, path, token } = gitInfo;
-if (window.hexoHistoryConfig) {
-  ({ repo, sha, token } = window.hexoHistoryConfig.gitInfo);
-  path = location.pathname;
-}
 import { Base64, dateContract } from './util/index.js';
 //由提交中的信息获取内容
 function getFetch(url) {
diff --git a/src/dombuild.js b/src/dombuild.js
@@ -1,14 +1,8 @@
 const parser = require('./parser');
 import { diff, diffPage } from './diff';
 const ratio = 0.8;
-var anchorClass = 'article-container';
-if (window.hexoHistoryConfig) {
-  let themeToClass = {
-    melody: 'article-container',
-    next: 'post-body'
-  };
-  anchorClass = themeToClass[window.hexoHistoryConfig.theme];
-}
+import infoProvider from './info-provider.js';
+var anchorClass = infoProvider.anchorClass;
 const classes = {
   add: 'add',
   del: 'del',
@@ -121,10 +115,10 @@ class dombuild {
       iframe.setAttribute('id', 'hexo-history-iframe');
       document.body.appendChild(iframe);
     }
-    if (!window.hexoHistoryConfig) {
+    if (infoProvider.baseUrl) {
       item =
         item.slice(0, item.indexOf('<head>') + 6) +
-        '<base href="https://luckyray-fan.github.io/"/>' +
+        infoProvider.baseUrl +
         item.slice(item.indexOf('<head>') + 6);
     }
 
diff --git a/src/git-provider.js b/src/git-provider.js
diff --git a/src/index.js b/src/index.js
@@ -2,16 +2,14 @@
 import app from './index.vue';
 Vue.config.productionTip = false; //防止生成生产提示
 import 'iview/dist/styles/iview.css';
+import infoProvider from './info-provider.js';
 
 window.HexoHistory = (function() {
   Vue.component('app', app);
-  function start(config) {
-    if (config) {
-      let configJson = JSON.parse(config);
-      window.hexoHistoryConfig = configJson;
-    }
-
-    setTimeout(initPlugin, 1500); //和文档一块加载出来, TODO 加载动画
+  function start() {
+    document.addEventListener('DOMContentLoaded', function() {
+      setTimeout(initPlugin, 1000); //和文档一块加载出来, TODO 加载动画
+    });
   }
   // 将html格式字符串转化为dom的函数
   function htmlStrToDom(htmlstr, parentdata) {
@@ -27,7 +25,7 @@ window.HexoHistory = (function() {
   }
   function initPlugin() {
     var vue = new Vue({
-      el: '#post',
+      el: '.' + infoProvider.anchorClass,
       data: {
         dom: ''
       },
diff --git a/src/index.vue b/src/index.vue
@@ -132,7 +132,7 @@ export default {
     });
     //存储
     saveInfo.skeleton = new skeletonTem().$mount().$el;
-    saveInfo.origin = this.dom.children[0]; // element.children 是 live 的
+    saveInfo.origin = this.dom; // element.children 是 live 的
     saveInfo.infoAlert = new infoAlert().$mount().$el;
 
     this.domCompare = new dombuild();
diff --git a/src/info-provider.js b/src/info-provider.js
@@ -0,0 +1,25 @@
+//直接由配置给定即可, 注意, 这里仅用来测试本地的文件
+//对于 melody 的主题的话
+var Info = {
+  repo: 'luckyray-fan/luckyray-fan.github.io', //用户名+仓库名
+  sha: 'master',
+  path: '2019/10/20/promise-await-yield/',
+  token: '1d5107f3e8a6dd270b60bb70ffce79485b387e53', //提升每小时访问github api 的limit
+  anchorClass: 'article-container',
+  baseUrl: '<base href="https://luckyray-fan.github.io/"/>'
+};
+let themeToClass = {
+  melody: 'article-container',
+  next: 'post-body'
+};
+Info.path = location.pathname;
+if (window.hexoHistoryConfig) {
+  ({ repo: gitInfo.repo, token: gitInfo.token } = window.hexoHistoryConfig.gitInfo);
+  if (window.hexoHistoryConfig.theme) {
+    Info.anchorClass = themeToClass[window.hexoHistoryConfig.theme.toLowerCase()];
+  }
+  Info.baseUrl = false;
+}
+
+// gitInfo.path = location.pathname;
+export default Info;
diff --git a/src/test.js b/src/test.js
@@ -88,4 +88,7 @@ console.dir(c);
  *  - bug fix
  *    - 请求没有按照顺序返回
  *  - 兼容next主题
+ *  - **换主题的解决方案**
+ *  - 挂载点问题解决
+ *  - style icon bug 解决
  */

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "hexo-history",`
`3`		`- "version": "1.1.2",`
	`3`	`+ "version": "1.1.4",`
`4`	`4`	`"repository": {`
`5`	`5`	`"type": "git",`
`6`	`6`	`"url": "https://github.com/luckyray-fan/hexo-history.git"`