{"id":20049,"date":"2024-11-19T16:52:52","date_gmt":"2024-11-19T08:52:52","guid":{"rendered":"https:\/\/fwq.ai\/blog\/20049\/"},"modified":"2024-11-19T16:52:52","modified_gmt":"2024-11-19T08:52:52","slug":"js%e5%a6%82%e4%bd%95%e6%98%be%e7%a4%bagit%e7%9a%84%e5%b7%ae%e5%bc%82%e5%8c%96%e6%af%94%e8%be%83","status":"publish","type":"post","link":"https:\/\/fwq.ai\/blog\/20049\/","title":{"rendered":"js\u5982\u4f55\u663e\u793agit\u7684\u5dee\u5f02\u5316\u6bd4\u8f83"},"content":{"rendered":"

\u5728\u8f6f\u4ef6\u5f00\u53d1\u4e2d\uff0cgit\u662f\u4e00\u4e2a\u88ab\u5e7f\u6cdb\u4f7f\u7528\u7684\u7248\u672c\u63a7\u5236\u7cfb\u7edf\uff0c\u5b83\u53ef\u4ee5\u4f7f\u5f00\u53d1\u8005\u66f4\u597d\u5730\u7ba1\u7406\u4ee3\u7801\u5e93\uff0c\u8ddf\u8e2a\u4e0d\u540c\u4ee3\u7801\u7248\u672c\u95f4\u7684\u5dee\u5f02\uff0c\u534f\u52a9\u56e2\u961f\u534f\u4f5c\u7b49\u7b49\u3002\u4e0e\u6b64\u540c\u65f6\uff0cjavascript\u4e5f\u662f\u8d8a\u6765\u8d8a\u91cd\u8981\u7684\u8bed\u8a00\uff0c\u5b83\u53ef\u4ee5\u5728\u7f51\u9875\u7aef\uff0c\u79fb\u52a8\u7aef\u548c\u540e\u7aef\u5f00\u53d1\u4e2d\u90fd\u6709\u5e7f\u6cdb\u5e94\u7528\u3002\u5728\u5b9e\u9645\u5f00\u53d1\u4e2d\uff0c\u6211\u4eec\u5e38\u5e38\u9700\u8981\u5c06git\u4e2d\u7684\u4e0d\u540c\u4ee3\u7801\u7248\u672c\u8fdb\u884c\u6bd4\u8f83\uff0c\u5e76\u663e\u793a\u5b83\u4eec\u4e4b\u95f4\u7684\u5dee\u5f02\u5316\u3002<\/p>\n

\u672c\u6587\u5c06\u4ecb\u7ecd\u5982\u4f55\u4f7f\u7528JavaScript\u6765\u663e\u793aGit\u7684\u5dee\u5f02\u5316\u6bd4\u8f83\u3002<\/p>\n

\u4e00\u3001\u524d\u7f6e\u77e5\u8bc6<\/p>\n

\u5728\u5b66\u4e60\u5982\u4f55\u663e\u793aGit\u7684\u5dee\u5f02\u5316\u6bd4\u8f83\u524d\uff0c\u9700\u8981\u5177\u5907\u4ee5\u4e0b\u7684\u524d\u7f6e\u77e5\u8bc6\uff1a<\/p>\n

    \n
  1. Git\u7684\u57fa\u7840\u77e5\u8bc6<\/li>\n<\/ol>\n

    Git \u662f\u4e00\u79cd\u5206\u5e03\u5f0f\u7248\u672c\u63a7\u5236\u7cfb\u7edf\uff0c\u5b83\u53ef\u4ee5\u5b58\u50a8\u9879\u76ee\u7684\u5386\u53f2\u7248\u672c\uff0c\u5e76\u652f\u6301\u4ece\u4e00\u4e2a\u7248\u672c\u5230\u53e6\u4e00\u4e2a\u7248\u672c\u4e4b\u95f4\u7684\u6bd4\u8f83\u548c\u4fee\u6539\u3002Git\u5185\u90e8\u67093\u4e2a\u533a\u57df\uff1a\u672c\u5730\u5de5\u4f5c\u533a(Working Directory)\uff0c\u6682\u5b58\u533a(Stage)\uff0c\u672c\u5730\u4ed3\u5e93(Repository)\u3002<\/p>\n

      \n
    1. HTML\u548cCSS\u57fa\u7840\u77e5\u8bc6<\/li>\n<\/ol>\n

      HTML\u548cCSS\u662f\u7f51\u9875\u524d\u7aef\u5f00\u53d1\u4e2d\u7684\u57fa\u7840\u6280\u80fd\u3002HTML\u7528\u4e8e\u521b\u5efa\u7f51\u9875\u7684\u5185\u5bb9\uff0cCSS\u7528\u4e8e\u5b9a\u4e49\u7f51\u9875\u7684\u6837\u5f0f\u3002\u5728\u672c\u6587\u4e2d\uff0c\u6211\u4eec\u5c06\u4f7f\u7528HTML\u548cCSS\u6765\u521b\u5efa\u5e76\u683c\u5f0f\u5316\u5dee\u5f02\u5316\u6bd4\u8f83\u7684\u8f93\u51fa\u3002<\/p>\n

      \u4e8c\u3001\u4f7f\u7528JavaScript\u5b8c\u6210Git\u7684\u5dee\u5f02\u5316\u6bd4\u8f83<\/p>\n

      \u5728JavaScript\u4e2d\uff0c\u6709\u4e00\u4e2a\u5f3a\u5927\u7684\u5e93\u53eb\u505ajsdiff\uff0c\u5b83\u53ef\u4ee5\u7528\u4e8e\u5728\u7f51\u9875\u4e2d\u5c55\u793a\u4e24\u6bb5\u6587\u672c\u7684\u5dee\u5f02\u5316\u6bd4\u8f83\u3002jsdiff\u4f7f\u7528\u57fa\u4e8e\u8f85\u52a9\u5b57\u7b26\u4e32\u7684\u7b97\u6cd5\u6765\u8ba1\u7b97\u4e24\u4e2a\u5b57\u7b26\u4e32\u4e4b\u95f4\u7684\u5dee\u5f02\uff0c\u5e76\u4e14\u5728\u63a7\u5236\u53f0\u4e2d\u8f93\u51fa\u8fd9\u4e9b\u5dee\u5f02\u3002<\/p>\n

      \u4e0b\u9762\u662f\u4f7f\u7528jsdiff\u7684\u57fa\u7840\u4f7f\u7528\u65b9\u6cd5\uff1a<\/p>\n

      \nconst leftText = 'Hello world!';  \/\/ \u7b2c\u4e00\u4e2a\u5b57\u7b26\u4e32\nconst rightText = 'Hellp world.'; \/\/ \u7b2c\u4e8c\u4e2a\u5b57\u7b26\u4e32\n\n\/\/ \u4f7f\u7528 diffChars \u5bf9\u4e24\u4e2a\u5b57\u7b26\u4e32\u8fdb\u884c\u6bd4\u8f83\nconst diffResult = diffChars(leftText, rightText);\n\nconsole.log(diffResult); \/\/ \u8f93\u51fa\u7ed3\u679c\n<\/pre>\n
        \u767b\u5f55\u540e\u590d\u5236   <\/p>\n
      \u4e0a\u8ff0\u4ee3\u7801\u7247\u6bb5\u4f7f\u7528\u4e86diffChars\u65b9\u6cd5\u5bf9\u4e24\u4e2a\u5b57\u7b26\u4e32\u8fdb\u884c\u6bd4\u8f83\uff0c\u5e76\u5c06\u6bd4\u8f83\u7ed3\u679c\u5b58\u50a8\u5230diffResult\u53d8\u91cf\u4e2d\u3002\u6211\u4eec\u53ef\u4ee5\u5728\u63a7\u5236\u53f0\u4e2d\u770b\u5230\u8f93\u51fa\u7ed3\u679c\uff0c\u5b83\u5c06\u5c55\u793a\u6bcf\u4e2a\u5b57\u7b26\u4e4b\u95f4\u7684\u5dee\u5f02\u3002<\/p>\n
      \u63a5\u4e0b\u6765\uff0c\u6211\u4eec\u5c06\u5728HTML\u9875\u9762\u4e0a\u5c55\u793aGit\u7684\u5dee\u5f02\u5316\u6bd4\u8f83\u7ed3\u679c\u3002\u793a\u4f8b\u4ee3\u7801\u5982\u4e0b\uff1a<\/p>\n
      \n  \n    <title>Git\u5dee\u5f02\u5316\u6bd4\u8f83<\/title><h1>Git\u5dee\u5f02\u5316\u6bd4\u8f83<\/h1>\n    <div id=\"diffContainer\"><\/div>    \n    <script src=\"https:\/\/cdnjs.cloudflare.com\/ajax\/libs\/diff-dom\/4.0.1\/diffDOM.min.js\"><\/script><script src=\"https:\/\/cdnjs.cloudflare.com\/ajax\/libs\/jsdiff\/4.0.1\/diff.min.js\"><\/script><script>\n      function showDiff(left, right) {\n        const diff = new diffDOM();  \/\/ \u521b\u5efa diffDOM \u5b9e\u4f8b\n        const leftElem = document.createElement('div');  \/\/ \u521b\u5efa\u5de6\u4fa7\u6587\u672c\u7684 DOM \u5143\u7d20\n        const rightElem = document.createElement('div'); \/\/ \u521b\u5efa\u53f3\u4fa7\u6587\u672c\u7684 DOM \u5143\u7d20\n\n        leftElem.textContent = left;  \/\/ \u8bbe\u7f6e\u5de6\u4fa7\u6587\u672c\n        rightElem.textContent = right; \/\/ \u8bbe\u7f6e\u53f3\u4fa7\u6587\u672c\n\n        const diffResult = diff.diff(leftElem, rightElem); \/\/ \u8ba1\u7b97\u5dee\u5f02\n\n        \/\/ \u5c06\u7ed3\u679c\u6dfb\u52a0\u81f3\u9875\u9762\n        const diffContainer = document.getElementById('diffContainer');\n        diffContainer.appendChild(diffResult);\n      }\n\n      const leftText = 'hello world!';\n      const rightText = 'hello from the other side!';\n      showDiff(leftText, rightText);\n    <\/script><\/pre>\n
        \u767b\u5f55\u540e\u590d\u5236   <\/p>\n
      \u5728\u4e0a\u8ff0\u4ee3\u7801\u4e2d\uff0c\u6211\u4eec\u4f7f\u7528\u4e86diffDOM\u5e93\u6765\u6e32\u67d3\u5dee\u5f02\u5316\u6bd4\u8f83\u7684\u7ed3\u679c\uff0c\u5e76\u5728\u9875\u9762\u4e0a\u5c55\u793a\u5b83\u3002\u6211\u4eec\u901a\u8fc7showDiff\u51fd\u6570\u5bf9\u5de6\u4fa7\u548c\u53f3\u4fa7\u7684\u4e24\u4e2a\u5b57\u7b26\u4e32\u8fdb\u884c\u6bd4\u8f83\uff0c\u5e76\u5c06\u7ed3\u679c\u6dfb\u52a0\u81f3diffContainer\u5143\u7d20\u4e2d\u3002<\/p>\n
      \u6700\u540e\uff0c\u6211\u4eec\u53ef\u4ee5\u5728\u6d4f\u89c8\u5668\u4e2d\u67e5\u770b\u7ed3\u679c\uff0c\u4ece\u800c\u4e86\u89e3Git\u7684\u5dee\u5f02\u5316\u6bd4\u8f83\u7ed3\u679c\u3002<\/p>\n
      \u4e09\u3001\u603b\u7ed3<\/p>\n
      \u672c\u6587\u4ecb\u7ecd\u4e86\u5982\u4f55\u4f7f\u7528JavaScript\u6765\u663e\u793aGit\u7684\u5dee\u5f02\u5316\u6bd4\u8f83\u3002\u6211\u4eec\u5b66\u4e60\u4e86\u5982\u4f55\u4f7f\u7528jsdiff\u5e93\u5bf9\u4e24\u4e2a\u5b57\u7b26\u4e32\u8fdb\u884c\u6bd4\u8f83\uff0c\u5e76\u8f93\u51fa\u6bd4\u8f83\u7ed3\u679c\u3002\u540c\u65f6\uff0c\u6211\u4eec\u8fd8\u4f7f\u7528\u4e86diffDOM\u5e93\u6765\u6e32\u67d3\u5dee\u5f02\u5316\u6bd4\u8f83\u7ed3\u679c\uff0c\u5e76\u5728HTML\u9875\u9762\u4e2d\u5c55\u793a\u6bd4\u8f83\u7ed3\u679c\u3002<\/p>\n
      \u901a\u8fc7\u5b66\u4e60\u672c\u6587\uff0c\u60a8\u5e94\u8be5\u80fd\u591f\u6b63\u786e\u5730\u4f7f\u7528JavaScript\u6765\u6bd4\u8f83Git\u4e2d\u7684\u4e0d\u540c\u4ee3\u7801\u7248\u672c\uff0c\u5e76\u663e\u793a\u5b83\u4eec\u4e4b\u95f4\u7684\u5dee\u5f02\uff0c\u4ece\u800c\u66f4\u52a0\u9ad8\u6548\u5730\u8fdb\u884c\u8f6f\u4ef6\u5f00\u53d1\u3002<\/p>\n
      \u4ee5\u4e0a\u5c31\u662fjs\u5982\u4f55\u663e\u793agit\u7684\u5dee\u5f02\u5316\u6bd4\u8f83\u7684\u8be6\u7ec6\u5185\u5bb9\uff0c\u66f4\u591a\u8bf7\u5173\u6ce8\u7c73\u4e91\u5176\u5b83\u76f8\u5173\u6587\u7ae0\uff01<\/p>\n","protected":false},"excerpt":{"rendered":"
      \u5728\u8f6f\u4ef6\u5f00\u53d1\u4e2d\uff0cgit\u662f\u4e00\u4e2a\u88ab\u5e7f\u6cdb\u4f7f\u7528\u7684\u7248\u672c\u63a7\u5236\u7cfb\u7edf\uff0c\u5b83\u53ef\u4ee5\u4f7f\u5f00\u53d1\u8005\u66f4\u597d\u5730\u7ba1\u7406\u4ee3\u7801\u5e93\uff0c\u8ddf\u8e2a\u4e0d\u540c\u4ee3\u7801\u7248\u672c\u95f4\u7684\u5dee\u5f02\uff0c\u534f\u52a9\u56e2\u961f\u534f\u4f5c\u7b49\u7b49\u3002\u4e0e\u6b64\u540c\u65f6\uff0cjavascript\u4e5f\u662f\u8d8a\u6765\u8d8a\u91cd\u8981\u7684\u8bed\u8a00\uff0c\u5b83\u53ef\u4ee5\u5728\u7f51\u9875\u7aef\uff0c\u79fb\u52a8\u7aef\u548c\u540e\u7aef\u5f00\u53d1\u4e2d\u90fd\u6709\u5e7f\u6cdb\u5e94\u7528\u3002\u5728\u5b9e\u9645\u5f00\u53d1\u4e2d\uff0c\u6211\u4eec\u5e38\u5e38\u9700\u8981\u5c06git\u4e2d\u7684\u4e0d\u540c\u4ee3\u7801\u7248\u672c\u8fdb\u884c\u6bd4\u8f83\uff0c\u5e76\u663e\u793a\u5b83\u4eec\u4e4b\u95f4\u7684\u5dee\u5f02\u5316\u3002 \u672c\u6587\u5c06\u4ecb\u7ecd\u5982\u4f55\u4f7f\u7528JavaScript\u6765\u663e\u793aGit\u7684\u5dee\u5f02\u5316\u6bd4\u8f83\u3002 \u4e00\u3001\u524d\u7f6e\u77e5\u8bc6 \u5728\u5b66\u4e60\u5982\u4f55\u663e\u793aGit\u7684\u5dee\u5f02\u5316\u6bd4\u8f83\u524d\uff0c\u9700\u8981\u5177\u5907\u4ee5\u4e0b\u7684\u524d\u7f6e\u77e5\u8bc6\uff1a Git\u7684\u57fa\u7840\u77e5\u8bc6 Git \u662f\u4e00\u79cd\u5206\u5e03\u5f0f\u7248\u672c\u63a7\u5236\u7cfb\u7edf\uff0c\u5b83\u53ef\u4ee5\u5b58\u50a8\u9879\u76ee\u7684\u5386\u53f2\u7248\u672c\uff0c\u5e76\u652f\u6301\u4ece\u4e00\u4e2a\u7248\u672c\u5230\u53e6\u4e00\u4e2a\u7248\u672c\u4e4b\u95f4\u7684\u6bd4\u8f83\u548c\u4fee\u6539\u3002Git\u5185\u90e8\u67093\u4e2a\u533a\u57df\uff1a\u672c\u5730\u5de5\u4f5c\u533a(Working Directory)\uff0c\u6682\u5b58\u533a(Stage)\uff0c\u672c\u5730\u4ed3\u5e93(Repository)\u3002 HTML\u548cCSS\u57fa\u7840\u77e5\u8bc6 HTML\u548cCSS\u662f\u7f51\u9875\u524d\u7aef\u5f00\u53d1\u4e2d\u7684\u57fa\u7840\u6280\u80fd\u3002HTML\u7528\u4e8e\u521b\u5efa\u7f51\u9875\u7684\u5185\u5bb9\uff0cCSS\u7528\u4e8e\u5b9a\u4e49\u7f51\u9875\u7684\u6837\u5f0f\u3002\u5728\u672c\u6587\u4e2d\uff0c\u6211\u4eec\u5c06\u4f7f\u7528HTML\u548cCSS\u6765\u521b\u5efa\u5e76\u683c\u5f0f\u5316\u5dee\u5f02\u5316\u6bd4\u8f83\u7684\u8f93\u51fa\u3002 \u4e8c\u3001\u4f7f\u7528JavaScript\u5b8c\u6210Git\u7684\u5dee\u5f02\u5316\u6bd4\u8f83 \u5728JavaScript\u4e2d\uff0c\u6709\u4e00\u4e2a\u5f3a\u5927\u7684\u5e93\u53eb\u505ajsdiff\uff0c\u5b83\u53ef\u4ee5\u7528\u4e8e\u5728\u7f51\u9875\u4e2d\u5c55\u793a\u4e24\u6bb5\u6587\u672c\u7684\u5dee\u5f02\u5316\u6bd4\u8f83\u3002jsdiff\u4f7f\u7528\u57fa\u4e8e\u8f85\u52a9\u5b57\u7b26\u4e32\u7684\u7b97\u6cd5\u6765\u8ba1\u7b97\u4e24\u4e2a\u5b57\u7b26\u4e32\u4e4b\u95f4\u7684\u5dee\u5f02\uff0c\u5e76\u4e14\u5728\u63a7\u5236\u53f0\u4e2d\u8f93\u51fa\u8fd9\u4e9b\u5dee\u5f02\u3002 \u4e0b\u9762\u662f\u4f7f\u7528jsdiff\u7684\u57fa\u7840\u4f7f\u7528\u65b9\u6cd5\uff1a const leftText = ‘Hello world!’; \/\/ \u7b2c\u4e00\u4e2a\u5b57\u7b26\u4e32 const rightText = ‘Hellp world.’; \/\/ \u7b2c\u4e8c\u4e2a\u5b57\u7b26\u4e32 \/\/ \u4f7f\u7528 diffChars \u5bf9\u4e24\u4e2a\u5b57\u7b26\u4e32\u8fdb\u884c\u6bd4\u8f83 const diffResult = diffChars(leftText, rightText); console.log(diffResult); \/\/ \u8f93\u51fa\u7ed3\u679c \u767b\u5f55\u540e\u590d\u5236 \u4e0a\u8ff0\u4ee3\u7801\u7247\u6bb5\u4f7f\u7528\u4e86diffChars\u65b9\u6cd5\u5bf9\u4e24\u4e2a\u5b57\u7b26\u4e32\u8fdb\u884c\u6bd4\u8f83\uff0c\u5e76\u5c06\u6bd4\u8f83\u7ed3\u679c\u5b58\u50a8\u5230diffResult\u53d8\u91cf\u4e2d\u3002\u6211\u4eec\u53ef\u4ee5\u5728\u63a7\u5236\u53f0\u4e2d\u770b\u5230\u8f93\u51fa\u7ed3\u679c\uff0c\u5b83\u5c06\u5c55\u793a\u6bcf\u4e2a\u5b57\u7b26\u4e4b\u95f4\u7684\u5dee\u5f02\u3002 \u63a5\u4e0b\u6765\uff0c\u6211\u4eec\u5c06\u5728HTML\u9875\u9762\u4e0a\u5c55\u793aGit\u7684\u5dee\u5f02\u5316\u6bd4\u8f83\u7ed3\u679c\u3002\u793a\u4f8b\u4ee3\u7801\u5982\u4e0b\uff1a <title>Git\u5dee\u5f02\u5316\u6bd4\u8f83<\/title><h1>Git\u5dee\u5f02\u5316\u6bd4\u8f83<\/h1> <div id=”diffContainer”><\/div> <script src=”https:\/\/cdnjs.cloudflare.com\/ajax\/libs\/diff-dom\/4.0.1\/diffDOM.min.js”><\/script><script src=”https:\/\/cdnjs.cloudflare.com\/ajax\/libs\/jsdiff\/4.0.1\/diff.min.js”><\/script><script> function showDiff(left, right) { const diff = […]<\/p>\n","protected":false},"author":1,"featured_media":0,"comment_status":"closed","ping_status":"","sticky":false,"template":"","format":"standard","meta":{"footnotes":""},"categories":[16],"tags":[],"class_list":["post-20049","post","type-post","status-publish","format-standard","hentry","category-16"],"_links":{"self":[{"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/posts\/20049","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/comments?post=20049"}],"version-history":[{"count":0,"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/posts\/20049\/revisions"}],"wp:attachment":[{"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/media?parent=20049"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/categories?post=20049"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/tags?post=20049"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}