Skip to content

A
app-manage-console
提交 0b5f3875 authored 作者: vipcxj's avatar vipcxj
浏览文件
操作

fix git ignore file

上级 7b746a06
显示空白字符变更
内嵌 并排
正在显示 包含 17 行增加 和 143 行删除
.gitignore
浏览文件 @ 0b5f3875
......@@ -7,6 +7,7 @@
# production
/dist
/.idea
# misc
.DS_Store
......
.idea/workspace.xml
浏览文件 @ 0b5f3875
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ChangeListManager">
<list default="true" id="f3473cde-6bad-431d-8195-0b704f7cfba4" name="Default" comment="Merge remote-tracking branch 'scaffold/master'&#10;&#10;# Conflicts:&#10;#&#9;.roadhogrc.js&#10;#&#9;package.json&#10;#&#9;src/models/domain.js&#10;#&#9;src/models/main/index.js&#10;#&#9;src/router.js&#10;#&#9;src/routes/domain/index.js&#10;#&#9;src/routes/main/header.js&#10;&#10;更新到最新的脚手架">
<change afterPath="$PROJECT_DIR$/.babelrc" afterDir="false" />
<change afterPath="$PROJECT_DIR$/.idea/inspectionProfiles/Project_Default.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/config.js" afterDir="false" />
<change afterPath="$PROJECT_DIR$/package-lock.json" afterDir="false" />
<change afterPath="$PROJECT_DIR$/postcss.config.js" afterDir="false" />
<change afterPath="$PROJECT_DIR$/proxy.js" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/components/hoc/size.js" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/components/table/dstable2/index.js" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/models/main/modules/api-doc/index.js" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/polyfill.js" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/routes/main/modules/api-doc/auth.md" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/routes/main/modules/api-doc/code.js" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/routes/main/modules/api-doc/domain.md" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/routes/main/modules/api-doc/dynamic-interface/addFamily.md" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/routes/main/modules/api-doc/dynamic-interface/addHouse.md" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/routes/main/modules/api-doc/dynamic-interface/addPeople.md" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/routes/main/modules/api-doc/dynamic-interface/approveXieYi.md" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/routes/main/modules/api-doc/dynamic-interface/getClerks.md" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/routes/main/modules/api-doc/dynamic-interface/getXieYiPdf.md" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/routes/main/modules/api-doc/dynamic-interface/importFangYuan.md" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/routes/main/modules/api-doc/dynamic-interface/index.js" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/routes/main/modules/api-doc/dynamic-interface/index.md" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/routes/main/modules/api-doc/dynamic-interface/isLiangQingLocked.md" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/routes/main/modules/api-doc/dynamic-interface/isXieYiApproved.md" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/routes/main/modules/api-doc/dynamic-interface/isXieYiLocked.md" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/routes/main/modules/api-doc/dynamic-interface/lockLiangQing.md" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/routes/main/modules/api-doc/dynamic-interface/lockXieYi.md" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/routes/main/modules/api-doc/dynamic-interface/removeFamily.md" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/routes/main/modules/api-doc/dynamic-interface/removeFangYuan.md" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/routes/main/modules/api-doc/dynamic-interface/removeHouse.md" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/routes/main/modules/api-doc/dynamic-interface/removePeople.md" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/routes/main/modules/api-doc/dynamic-interface/requestCancelXieYi.md" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/routes/main/modules/api-doc/dynamic-interface/requestUnLockLiangQing.md" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/routes/main/modules/api-doc/dynamic-interface/updateFamily.md" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/routes/main/modules/api-doc/dynamic-interface/updateHouse.md" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/routes/main/modules/api-doc/dynamic-interface/updatePeople.md" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/routes/main/modules/api-doc/dynamic-interface/updateXieYi.md" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/routes/main/modules/api-doc/dynamic-interface/whetherCancelXieYi.md" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/routes/main/modules/api-doc/dynamic-interface/whetherUnLockLiangQing.md" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/routes/main/modules/api-doc/error.md" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/routes/main/modules/api-doc/file.md" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/routes/main/modules/api-doc/index.js" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/routes/main/modules/api-doc/index.less" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/routes/main/modules/api-doc/index.md" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/routes/main/modules/api-doc/main.js" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/routes/main/modules/api-doc/markdown.js" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/routes/main/modules/api-doc/markdown.less" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/services/tools/envers.js" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/utils/async.js" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/utils/datasource.js" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/utils/layout.js" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/utils/meta.js" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/utils/model.js" afterDir="false" />
<change afterPath="$PROJECT_DIR$/stories/lib/dva.js" afterDir="false" />
<change afterPath="$PROJECT_DIR$/stories/lib/lazy.js" afterDir="false" />
<change afterPath="$PROJECT_DIR$/stories/lib/login.js" afterDir="false" />
<change afterPath="$PROJECT_DIR$/stories/test.md" afterDir="false" />
<change afterPath="$PROJECT_DIR$/theme.js" afterDir="false" />
<change afterPath="$PROJECT_DIR$/tools/applyMock.js" afterDir="false" />
<change afterPath="$PROJECT_DIR$/tools/babel-preset.js" afterDir="false" />
<change afterPath="$PROJECT_DIR$/webpack.common.js" afterDir="false" />
<change afterPath="$PROJECT_DIR$/webpack.dev.js" afterDir="false" />
<change afterPath="$PROJECT_DIR$/webpack.prod.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.eslintrc" beforeDir="false" afterPath="$PROJECT_DIR$/.eslintrc" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gitignore" beforeDir="false" afterPath="$PROJECT_DIR$/.gitignore" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.roadhogrc.js" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.roadhogrc.mock.js" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.storybook/.babelrc" beforeDir="false" afterPath="$PROJECT_DIR$/.storybook/.babelrc" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.storybook/config.js" beforeDir="false" afterPath="$PROJECT_DIR$/.storybook/config.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.storybook/middleware.js" beforeDir="false" afterPath="$PROJECT_DIR$/.storybook/middleware.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.storybook/webpack.config.js" beforeDir="false" afterPath="$PROJECT_DIR$/.storybook/webpack.config.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/babel-register.js" beforeDir="false" afterPath="$PROJECT_DIR$/babel-register.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cache.js" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/mock.js" beforeDir="false" afterPath="$PROJECT_DIR$/mock/index.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/my-babel-register.js" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/package.json" beforeDir="false" afterPath="$PROJECT_DIR$/package.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/components/hoc/routes.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/components/hoc/routes.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/components/hoc/stateful.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/components/hoc/stateful.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/components/table/dstable/index.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/components/table/dstable/index.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/components/table/dstable/model.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/components/table/dstable/model.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/components/table/index.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/components/table/index.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/components/table/input-table/index.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/components/table/input-table/index.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/components/table/search/enum.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/components/table/search/enum.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/data/app.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/data/app.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/data/modules.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/data/modules.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/index.css" beforeDir="false" afterPath="$PROJECT_DIR$/src/index.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/index.ejs" beforeDir="false" afterPath="$PROJECT_DIR$/src/index.ejs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/index.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/index.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/mock/tasks.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/mock/tasks.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/models/login.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/models/login.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/models/main/index.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/models/main/index.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/models/main/modules/appManagement/index.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/models/main/modules/appManagement/index.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/models/main/modules/task/index.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/models/main/modules/task/index.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/register/modules/empty.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/register/modules/empty.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/router.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/router.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/routes/app.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/routes/app.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/routes/login/index.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/routes/login/index.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/routes/main/header.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/routes/main/header.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/routes/main/header.less" beforeDir="false" afterPath="$PROJECT_DIR$/src/routes/main/header.less" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/routes/main/index.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/routes/main/index.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/routes/main/modules/appManagement/add.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/routes/main/modules/appManagement/add.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/routes/main/modules/appManagement/addDeploy.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/routes/main/modules/appManagement/addDeploy.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/routes/main/modules/appManagement/deploy.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/routes/main/modules/appManagement/deploy.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/routes/main/modules/appManagement/edit.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/routes/main/modules/appManagement/edit.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/routes/main/modules/appManagement/editDeploy.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/routes/main/modules/appManagement/editDeploy.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/routes/main/modules/appManagement/index.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/routes/main/modules/appManagement/index.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/routes/main/modules/appManagement/list.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/routes/main/modules/appManagement/list.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/routes/main/modules/task/index.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/routes/main/modules/task/index.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/routes/main/modules/task/list.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/routes/main/modules/task/list.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/routes/main/monk.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/routes/main/monk.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/services/app.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/services/app.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/services/datasource.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/services/datasource.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/services/domain.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/services/domain.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/services/interfaces.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/services/interfaces.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/services/modules.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/services/modules.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/services/resource.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/services/resource.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/services/route.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/services/route.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/services/template.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/services/template.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/services/user.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/services/user.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/utils/auth.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/utils/auth.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/utils/config.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/utils/config.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/utils/db.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/utils/db.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/utils/delete.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/utils/delete.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/utils/error.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/utils/error.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/utils/helper.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/utils/helper.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/utils/http-helper.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/utils/http-helper.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/utils/math.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/utils/math.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/utils/middleware.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/utils/middleware.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/utils/polyfill.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/utils/polyfill.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/utils/post.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/utils/post.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/utils/request.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/utils/request.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/stories/index.js" beforeDir="false" afterPath="$PROJECT_DIR$/stories/index.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/test_setup.js" beforeDir="false" afterPath="$PROJECT_DIR$/test_setup.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/webpack.config.js" beforeDir="false" />
</list>
<list default="true" id="f3473cde-6bad-431d-8195-0b704f7cfba4" name="Default" comment="" />
<ignored path="$PROJECT_DIR$/.tmp/" />
<ignored path="$PROJECT_DIR$/temp/" />
<ignored path="$PROJECT_DIR$/tmp/" />
......@@ -453,26 +318,34 @@
<option name="presentableId" value="Default" />
<updated>1544071389238</updated>
<workItem from="1544071391093" duration="3544000" />
<workItem from="1544074982030" duration="1028000" />
<workItem from="1544074982030" duration="1269000" />
</task>
<task id="LOCAL-00001" summary="Merge remote-tracking branch 'scaffold/master'&#10;&#10;# Conflicts:&#10;#&#9;.roadhogrc.js&#10;#&#9;package.json&#10;#&#9;src/models/domain.js&#10;#&#9;src/models/main/index.js&#10;#&#9;src/router.js&#10;#&#9;src/routes/domain/index.js&#10;#&#9;src/routes/main/header.js&#10;&#10;更新到最新的脚手架">
<created>1544076221219</created>
<option name="number" value="00001" />
<option name="presentableId" value="LOCAL-00001" />
<option name="project" value="LOCAL" />
<updated>1544076221219</updated>
</task>
<option name="localTasksCounter" value="2" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="4572000" />
<option name="totallyTimeSpent" value="4813000" />
</component>
<component name="ToolWindowManager">
<frame x="-16" y="26" width="1440" height="806" extended-state="0" />
<layout>
<window_info anchor="right" id="GfmBrowser" order="3" />
<window_info anchor="bottom" id="TODO" order="6" />
<window_info active="true" anchor="bottom" id="Messages" visible="true" weight="0.32900432" />
<window_info anchor="bottom" id="Event Log" order="7" side_tool="true" />
<window_info anchor="bottom" id="Messages" weight="0.32900432" />
<window_info anchor="bottom" id="Event Log" order="7" sideWeight="0.5007153" side_tool="true" weight="0.32756132" />
<window_info anchor="bottom" id="Version Control" order="7" weight="0.2496474" />
<window_info id="npm" order="2" sideWeight="0.5032258" side_tool="true" visible="true" weight="0.24964234" />
<window_info id="npm" order="2" sideWeight="0.50429183" side_tool="true" visible="true" weight="0.24964234" />
<window_info anchor="bottom" id="Run" order="2" weight="0.32756132" />
<window_info anchor="bottom" id="Terminal" order="7" weight="0.32756132" />
<window_info active="true" anchor="bottom" id="Terminal" order="7" sideWeight="0.49928468" visible="true" weight="0.32756132" />
<window_info anchor="bottom" id="RNConsole" order="7" />
<window_info content_ui="combo" id="Project" order="0" sideWeight="0.4967742" visible="true" weight="0.24964234" />
<window_info content_ui="combo" id="Project" order="0" sideWeight="0.49570817" visible="true" weight="0.24964234" />
<window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
<window_info id="Favorites" order="2" side_tool="true" />
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论