Browse Source

first update

zhuliang 7 years ago
parent
commit
9a84166182
100 changed files with 73 additions and 10 deletions
  1. 8 0
      .idea/DocSys.iml
  2. 8 0
      .idea/modules.xml
  3. 6 0
      .idea/vcs.xml
  4. 2 2
      Public/js/item/show.js
  5. 2 1
      Public/js/page/edit.js
  6. BIN
      favicon.ico
  7. 20 0
      npm-debug.log
  8. 1 1
      server/Application/Api/Controller/ItemController.class.php
  9. 2 2
      server/Application/Api/Lang/zh-cn.php
  10. 2 2
      web/index.html
  11. 20 0
      web/npm-debug.log
  12. 1 0
      web/static/css/app.0299a5709a341931cf642a6f5d9b17c3.css
  13. 0 1
      web/static/css/app.8a94a3ce0585f562823fdb1dbad67a4b.css
  14. 1 1
      web/static/css/common.css
  15. 0 0
      web/static/diff/difflib.js
  16. 0 0
      web/static/diff/diffview.css
  17. 0 0
      web/static/diff/diffview.js
  18. 0 0
      web/static/editor.md/Gulpfile.js
  19. 0 0
      web/static/editor.md/LICENSE
  20. 0 0
      web/static/editor.md/README.md
  21. 0 0
      web/static/editor.md/css/editormd.css
  22. 0 0
      web/static/editor.md/css/editormd.logo.css
  23. 0 0
      web/static/editor.md/css/editormd.logo.min.css
  24. 0 0
      web/static/editor.md/css/editormd.min.css
  25. 0 0
      web/static/editor.md/css/editormd.preview.css
  26. 0 0
      web/static/editor.md/css/editormd.preview.min.css
  27. 0 0
      web/static/editor.md/editormd.amd.js
  28. 0 0
      web/static/editor.md/editormd.amd.min.js
  29. 0 0
      web/static/editor.md/editormd.js
  30. 0 0
      web/static/editor.md/editormd.min.js
  31. 0 0
      web/static/editor.md/fonts/FontAwesome.otf
  32. 0 0
      web/static/editor.md/fonts/editormd-logo.eot
  33. 0 0
      web/static/editor.md/fonts/editormd-logo.svg
  34. 0 0
      web/static/editor.md/fonts/editormd-logo.ttf
  35. 0 0
      web/static/editor.md/fonts/editormd-logo.woff
  36. 0 0
      web/static/editor.md/fonts/fontawesome-webfont.eot
  37. 0 0
      web/static/editor.md/fonts/fontawesome-webfont.svg
  38. 0 0
      web/static/editor.md/fonts/fontawesome-webfont.ttf
  39. 0 0
      web/static/editor.md/fonts/fontawesome-webfont.woff
  40. 0 0
      web/static/editor.md/fonts/fontawesome-webfont.woff2
  41. 0 0
      web/static/editor.md/images/loading.gif
  42. 0 0
      web/static/editor.md/images/loading@2x.gif
  43. 0 0
      web/static/editor.md/images/loading@3x.gif
  44. 0 0
      web/static/editor.md/images/logos/editormd-favicon-16x16.ico
  45. 0 0
      web/static/editor.md/images/logos/editormd-favicon-24x24.ico
  46. 0 0
      web/static/editor.md/images/logos/editormd-favicon-32x32.ico
  47. 0 0
      web/static/editor.md/images/logos/editormd-favicon-48x48.ico
  48. 0 0
      web/static/editor.md/images/logos/editormd-favicon-64x64.ico
  49. 0 0
      web/static/editor.md/images/logos/editormd-logo-114x114.png
  50. 0 0
      web/static/editor.md/images/logos/editormd-logo-120x120.png
  51. 0 0
      web/static/editor.md/images/logos/editormd-logo-144x144.png
  52. 0 0
      web/static/editor.md/images/logos/editormd-logo-16x16.png
  53. 0 0
      web/static/editor.md/images/logos/editormd-logo-180x180.png
  54. 0 0
      web/static/editor.md/images/logos/editormd-logo-240x240.png
  55. 0 0
      web/static/editor.md/images/logos/editormd-logo-24x24.png
  56. 0 0
      web/static/editor.md/images/logos/editormd-logo-320x320.png
  57. 0 0
      web/static/editor.md/images/logos/editormd-logo-32x32.png
  58. 0 0
      web/static/editor.md/images/logos/editormd-logo-48x48.png
  59. 0 0
      web/static/editor.md/images/logos/editormd-logo-57x57.png
  60. 0 0
      web/static/editor.md/images/logos/editormd-logo-64x64.png
  61. 0 0
      web/static/editor.md/images/logos/editormd-logo-72x72.png
  62. 0 0
      web/static/editor.md/images/logos/editormd-logo-96x96.png
  63. 0 0
      web/static/editor.md/images/logos/vi.png
  64. 0 0
      web/static/editor.md/languages/en.js
  65. 0 0
      web/static/editor.md/languages/zh-tw.js
  66. 0 0
      web/static/editor.md/lib/codemirror/AUTHORS
  67. 0 0
      web/static/editor.md/lib/codemirror/LICENSE
  68. 0 0
      web/static/editor.md/lib/codemirror/README.md
  69. 0 0
      web/static/editor.md/lib/codemirror/addon/comment/comment.js
  70. 0 0
      web/static/editor.md/lib/codemirror/addon/comment/continuecomment.js
  71. 0 0
      web/static/editor.md/lib/codemirror/addon/dialog/dialog.css
  72. 0 0
      web/static/editor.md/lib/codemirror/addon/dialog/dialog.js
  73. 0 0
      web/static/editor.md/lib/codemirror/addon/display/fullscreen.css
  74. 0 0
      web/static/editor.md/lib/codemirror/addon/display/fullscreen.js
  75. 0 0
      web/static/editor.md/lib/codemirror/addon/display/panel.js
  76. 0 0
      web/static/editor.md/lib/codemirror/addon/display/placeholder.js
  77. 0 0
      web/static/editor.md/lib/codemirror/addon/display/rulers.js
  78. 0 0
      web/static/editor.md/lib/codemirror/addon/edit/closebrackets.js
  79. 0 0
      web/static/editor.md/lib/codemirror/addon/edit/closetag.js
  80. 0 0
      web/static/editor.md/lib/codemirror/addon/edit/continuelist.js
  81. 0 0
      web/static/editor.md/lib/codemirror/addon/edit/matchbrackets.js
  82. 0 0
      web/static/editor.md/lib/codemirror/addon/edit/matchtags.js
  83. 0 0
      web/static/editor.md/lib/codemirror/addon/edit/trailingspace.js
  84. 0 0
      web/static/editor.md/lib/codemirror/addon/fold/brace-fold.js
  85. 0 0
      web/static/editor.md/lib/codemirror/addon/fold/comment-fold.js
  86. 0 0
      web/static/editor.md/lib/codemirror/addon/fold/foldcode.js
  87. 0 0
      web/static/editor.md/lib/codemirror/addon/fold/foldgutter.css
  88. 0 0
      web/static/editor.md/lib/codemirror/addon/fold/foldgutter.js
  89. 0 0
      web/static/editor.md/lib/codemirror/addon/fold/indent-fold.js
  90. 0 0
      web/static/editor.md/lib/codemirror/addon/fold/markdown-fold.js
  91. 0 0
      web/static/editor.md/lib/codemirror/addon/fold/xml-fold.js
  92. 0 0
      web/static/editor.md/lib/codemirror/addon/hint/anyword-hint.js
  93. 0 0
      web/static/editor.md/lib/codemirror/addon/hint/css-hint.js
  94. 0 0
      web/static/editor.md/lib/codemirror/addon/hint/html-hint.js
  95. 0 0
      web/static/editor.md/lib/codemirror/addon/hint/javascript-hint.js
  96. 0 0
      web/static/editor.md/lib/codemirror/addon/hint/show-hint.css
  97. 0 0
      web/static/editor.md/lib/codemirror/addon/hint/show-hint.js
  98. 0 0
      web/static/editor.md/lib/codemirror/addon/hint/sql-hint.js
  99. 0 0
      web/static/editor.md/lib/codemirror/addon/hint/xml-hint.js
  100. 0 0
      web/static/editor.md/lib/codemirror/addon/lint/coffeescript-lint.js

+ 8 - 0
.idea/DocSys.iml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="WEB_MODULE" version="4">
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>

+ 8 - 0
.idea/modules.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/DocSys.iml" filepath="$PROJECT_DIR$/.idea/DocSys.iml" />
+    </modules>
+  </component>
+</project>

+ 6 - 0
.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>

+ 2 - 2
Public/js/item/show.js

@@ -25,7 +25,7 @@ $(function(){
             }
         };
         page_title = $(this).children("a")[0].innerText;
-        document.title = page_title + " - ShowDoc";
+        document.title = page_title;
         if (page_id != '' && page_id !='#') {
             change_page(page_id)
         };
@@ -123,7 +123,7 @@ $(function(){
     page_title = $(this).children("a")[0].innerText;
     if (page_id != '' && page_id != null  && page_id !='#') {
         if (page_title != '' && page_title != null) {
-            document.title = page_title + " - ShowDoc";
+            document.title = page_title;
         }
         change_page(page_id);
         //如果是移动设备的话,则滚动页面

+ 2 - 1
Public/js/page/edit.js

@@ -471,6 +471,7 @@ $(function() {
     $(this).attr("accept","image/png,image/jpg,image/jpeg,imge/bmp,image/gif")
   });
 
+  /*
   //定时保存文本内容到localStorage
   setInterval(function(){
       localStorage.page_content= $("#page_content").val() ;
@@ -492,7 +493,7 @@ $(function() {
 
     )
   };
-
+  */
   
 });
 

BIN
favicon.ico


+ 20 - 0
npm-debug.log

@@ -0,0 +1,20 @@
+0 info it worked if it ends with ok
+1 verbose cli [ '/usr/local/bin/node', '/usr/local/bin/npm', 'run', 'dev' ]
+2 info using npm@3.10.10
+3 info using node@v6.11.5
+4 verbose stack Error: ENOENT: no such file or directory, open '/Users/zhuliang/Desktop/工作/项目/我的项目/DocSys/package.json'
+4 verbose stack     at Error (native)
+5 verbose cwd /Users/zhuliang/Desktop/工作/项目/我的项目/DocSys
+6 error Darwin 17.4.0
+7 error argv "/usr/local/bin/node" "/usr/local/bin/npm" "run" "dev"
+8 error node v6.11.5
+9 error npm  v3.10.10
+10 error path /Users/zhuliang/Desktop/工作/项目/我的项目/DocSys/package.json
+11 error code ENOENT
+12 error errno -2
+13 error syscall open
+14 error enoent ENOENT: no such file or directory, open '/Users/zhuliang/Desktop/工作/项目/我的项目/DocSys/package.json'
+15 error enoent ENOENT: no such file or directory, open '/Users/zhuliang/Desktop/工作/项目/我的项目/DocSys/package.json'
+15 error enoent This is most likely not a problem with npm itself
+15 error enoent and is related to npm not being able to find a file.
+16 verbose exit [ -2, true ]

+ 1 - 1
server/Application/Api/Controller/ItemController.class.php

@@ -624,7 +624,7 @@ class ItemController extends BaseController {
                     "page_title" => $item_name ,
                     "item_id" => $item_id ,
                     "cat_id" => 0 ,
-                    "page_content" => '欢迎使用showdoc。点击右上方的编辑按钮进行编辑吧!' ,
+                    "page_content" => '点击右上方的编辑按钮进行编辑吧!' ,
                     "addtime" =>time()
                     );
                 $page_id = D("Page")->add($insert);

+ 2 - 2
server/Application/Api/Lang/zh-cn.php

@@ -135,8 +135,8 @@ return array(
     'history_version'=>'历史版本',
     'save'=>'保存',
     'cancel'=>'取消',
-    'inser_apidoc_template'=>'插入API接口模板',
-    'inser_database_doc_template'=>'插入数据字典模板',
+    'inser_apidoc_template'=>'插入Api接口模板',
+    'inser_database_doc_template'=>'插入数据库表模板',
     'json_tools'=>'JSON工具',
     'json_to_table'=>'JSON转参数表格',
     'beautify_json'=>'JSON格式化',

+ 2 - 2
web/index.html

@@ -1,7 +1,7 @@
-<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>ShowDoc</title><meta name=keywords content="在线API文档 技术文档 数据字典 在线手册"><meta name=description content=一个非常适合IT团队的在线API文档、技术文档工具。你可以使用Showdoc来编写在线API文档、技术文档、数据字典、在线手册><script type=text/javascript>//挂在window下的全局配置
+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>文档管理分享平台 | ZhuLiang's Shared</title><meta name=keywords content="在线Api接口文档 数据库文档 技术文档 说明文档"><meta name=description content="在线Api接口文档 数据库文档 技术文档 说明文档"><script type=text/javascript>//挂在window下的全局配置
     window.DocConfig = {
       //"server":'http://127.0.0.1/showdoc/server/index.php?s=',
       "server": window.location.protocol +'//'+ window.location.host + window.location.pathname+ '../server/index.php?s=',
       //"lang" :'en'
       "lang" :'zh-cn'
-  }</script><link href=./static/css/app.8a94a3ce0585f562823fdb1dbad67a4b.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.d0a4377ef1a585a89fd6.js></script><script type=text/javascript src=./static/js/vendor.6ec312a9f1e4bcc005ef.js></script><script type=text/javascript src=./static/js/app.c0cd9bc8fa285bd9c1b5.js></script></body></html>
+  }</script><link href=./static/css/app.0299a5709a341931cf642a6f5d9b17c3.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.c40e244d08e2558b4f27.js></script><script type=text/javascript src=./static/js/app.568a491d05c4d4f33e8e.js></script></body></html>

+ 20 - 0
web/npm-debug.log

@@ -0,0 +1,20 @@
+0 info it worked if it ends with ok
+1 verbose cli [ '/usr/local/bin/node', '/usr/local/bin/npm', 'run', 'dev' ]
+2 info using npm@3.10.10
+3 info using node@v6.11.5
+4 verbose stack Error: ENOENT: no such file or directory, open '/Users/zhuliang/Desktop/工作/项目/我的项目/DocSys/package.json'
+4 verbose stack     at Error (native)
+5 verbose cwd /Users/zhuliang/Desktop/工作/项目/我的项目/DocSys/web
+6 error Darwin 17.4.0
+7 error argv "/usr/local/bin/node" "/usr/local/bin/npm" "run" "dev"
+8 error node v6.11.5
+9 error npm  v3.10.10
+10 error path /Users/zhuliang/Desktop/工作/项目/我的项目/DocSys/package.json
+11 error code ENOENT
+12 error errno -2
+13 error syscall open
+14 error enoent ENOENT: no such file or directory, open '/Users/zhuliang/Desktop/工作/项目/我的项目/DocSys/package.json'
+15 error enoent ENOENT: no such file or directory, open '/Users/zhuliang/Desktop/工作/项目/我的项目/DocSys/package.json'
+15 error enoent This is most likely not a problem with npm itself
+15 error enoent and is related to npm not being able to find a file.
+16 verbose exit [ -2, true ]

File diff suppressed because it is too large
+ 1 - 0
web/static/css/app.0299a5709a341931cf642a6f5d9b17c3.css


File diff suppressed because it is too large
+ 0 - 1
web/static/css/app.8a94a3ce0585f562823fdb1dbad67a4b.css


+ 1 - 1
web/static/css/common.css

@@ -7,7 +7,7 @@ body{
   background-color: rgb(250, 250, 250);
 }
 #app {
-    font: 14px/1.5 "Microsoft Yahei", 微软雅黑, Tahoma, Arial, Helvetica, STHeiti;
+    font: 14px/1.5 "PingFang SC","Helvetica Neue","Hiragino Sans GB","Segoe UI","Microsoft YaHei","微软雅黑",sans-serif;
 }
 
 a {

+ 0 - 0
web/static/diff/difflib.js


+ 0 - 0
web/static/diff/diffview.css


+ 0 - 0
web/static/diff/diffview.js


+ 0 - 0
web/static/editor.md/Gulpfile.js


+ 0 - 0
web/static/editor.md/LICENSE


+ 0 - 0
web/static/editor.md/README.md


+ 0 - 0
web/static/editor.md/css/editormd.css


+ 0 - 0
web/static/editor.md/css/editormd.logo.css


+ 0 - 0
web/static/editor.md/css/editormd.logo.min.css


+ 0 - 0
web/static/editor.md/css/editormd.min.css


+ 0 - 0
web/static/editor.md/css/editormd.preview.css


+ 0 - 0
web/static/editor.md/css/editormd.preview.min.css


+ 0 - 0
web/static/editor.md/editormd.amd.js


+ 0 - 0
web/static/editor.md/editormd.amd.min.js


+ 0 - 0
web/static/editor.md/editormd.js


+ 0 - 0
web/static/editor.md/editormd.min.js


+ 0 - 0
web/static/editor.md/fonts/FontAwesome.otf


+ 0 - 0
web/static/editor.md/fonts/editormd-logo.eot


+ 0 - 0
web/static/editor.md/fonts/editormd-logo.svg


+ 0 - 0
web/static/editor.md/fonts/editormd-logo.ttf


+ 0 - 0
web/static/editor.md/fonts/editormd-logo.woff


+ 0 - 0
web/static/editor.md/fonts/fontawesome-webfont.eot


+ 0 - 0
web/static/editor.md/fonts/fontawesome-webfont.svg


+ 0 - 0
web/static/editor.md/fonts/fontawesome-webfont.ttf


+ 0 - 0
web/static/editor.md/fonts/fontawesome-webfont.woff


+ 0 - 0
web/static/editor.md/fonts/fontawesome-webfont.woff2


+ 0 - 0
web/static/editor.md/images/loading.gif


+ 0 - 0
web/static/editor.md/images/loading@2x.gif


+ 0 - 0
web/static/editor.md/images/loading@3x.gif


+ 0 - 0
web/static/editor.md/images/logos/editormd-favicon-16x16.ico


+ 0 - 0
web/static/editor.md/images/logos/editormd-favicon-24x24.ico


+ 0 - 0
web/static/editor.md/images/logos/editormd-favicon-32x32.ico


+ 0 - 0
web/static/editor.md/images/logos/editormd-favicon-48x48.ico


+ 0 - 0
web/static/editor.md/images/logos/editormd-favicon-64x64.ico


+ 0 - 0
web/static/editor.md/images/logos/editormd-logo-114x114.png


+ 0 - 0
web/static/editor.md/images/logos/editormd-logo-120x120.png


+ 0 - 0
web/static/editor.md/images/logos/editormd-logo-144x144.png


+ 0 - 0
web/static/editor.md/images/logos/editormd-logo-16x16.png


+ 0 - 0
web/static/editor.md/images/logos/editormd-logo-180x180.png


+ 0 - 0
web/static/editor.md/images/logos/editormd-logo-240x240.png


+ 0 - 0
web/static/editor.md/images/logos/editormd-logo-24x24.png


+ 0 - 0
web/static/editor.md/images/logos/editormd-logo-320x320.png


+ 0 - 0
web/static/editor.md/images/logos/editormd-logo-32x32.png


+ 0 - 0
web/static/editor.md/images/logos/editormd-logo-48x48.png


+ 0 - 0
web/static/editor.md/images/logos/editormd-logo-57x57.png


+ 0 - 0
web/static/editor.md/images/logos/editormd-logo-64x64.png


+ 0 - 0
web/static/editor.md/images/logos/editormd-logo-72x72.png


+ 0 - 0
web/static/editor.md/images/logos/editormd-logo-96x96.png


+ 0 - 0
web/static/editor.md/images/logos/vi.png


+ 0 - 0
web/static/editor.md/languages/en.js


+ 0 - 0
web/static/editor.md/languages/zh-tw.js


+ 0 - 0
web/static/editor.md/lib/codemirror/AUTHORS


+ 0 - 0
web/static/editor.md/lib/codemirror/LICENSE


+ 0 - 0
web/static/editor.md/lib/codemirror/README.md


+ 0 - 0
web/static/editor.md/lib/codemirror/addon/comment/comment.js


+ 0 - 0
web/static/editor.md/lib/codemirror/addon/comment/continuecomment.js


+ 0 - 0
web/static/editor.md/lib/codemirror/addon/dialog/dialog.css


+ 0 - 0
web/static/editor.md/lib/codemirror/addon/dialog/dialog.js


+ 0 - 0
web/static/editor.md/lib/codemirror/addon/display/fullscreen.css


+ 0 - 0
web/static/editor.md/lib/codemirror/addon/display/fullscreen.js


+ 0 - 0
web/static/editor.md/lib/codemirror/addon/display/panel.js


+ 0 - 0
web/static/editor.md/lib/codemirror/addon/display/placeholder.js


+ 0 - 0
web/static/editor.md/lib/codemirror/addon/display/rulers.js


+ 0 - 0
web/static/editor.md/lib/codemirror/addon/edit/closebrackets.js


+ 0 - 0
web/static/editor.md/lib/codemirror/addon/edit/closetag.js


+ 0 - 0
web/static/editor.md/lib/codemirror/addon/edit/continuelist.js


+ 0 - 0
web/static/editor.md/lib/codemirror/addon/edit/matchbrackets.js


+ 0 - 0
web/static/editor.md/lib/codemirror/addon/edit/matchtags.js


+ 0 - 0
web/static/editor.md/lib/codemirror/addon/edit/trailingspace.js


+ 0 - 0
web/static/editor.md/lib/codemirror/addon/fold/brace-fold.js


+ 0 - 0
web/static/editor.md/lib/codemirror/addon/fold/comment-fold.js


+ 0 - 0
web/static/editor.md/lib/codemirror/addon/fold/foldcode.js


+ 0 - 0
web/static/editor.md/lib/codemirror/addon/fold/foldgutter.css


+ 0 - 0
web/static/editor.md/lib/codemirror/addon/fold/foldgutter.js


+ 0 - 0
web/static/editor.md/lib/codemirror/addon/fold/indent-fold.js


+ 0 - 0
web/static/editor.md/lib/codemirror/addon/fold/markdown-fold.js


+ 0 - 0
web/static/editor.md/lib/codemirror/addon/fold/xml-fold.js


+ 0 - 0
web/static/editor.md/lib/codemirror/addon/hint/anyword-hint.js


+ 0 - 0
web/static/editor.md/lib/codemirror/addon/hint/css-hint.js


+ 0 - 0
web/static/editor.md/lib/codemirror/addon/hint/html-hint.js


+ 0 - 0
web/static/editor.md/lib/codemirror/addon/hint/javascript-hint.js


+ 0 - 0
web/static/editor.md/lib/codemirror/addon/hint/show-hint.css


+ 0 - 0
web/static/editor.md/lib/codemirror/addon/hint/show-hint.js


+ 0 - 0
web/static/editor.md/lib/codemirror/addon/hint/sql-hint.js


+ 0 - 0
web/static/editor.md/lib/codemirror/addon/hint/xml-hint.js


+ 0 - 0
web/static/editor.md/lib/codemirror/addon/lint/coffeescript-lint.js


Some files were not shown because too many files changed in this diff