修改部分问题
This commit is contained in:
parent
e4313d30eb
commit
dce5404850
|
|
@ -3,7 +3,12 @@
|
|||
<component name="ChangeListManager">
|
||||
<list default="true" id="9830c5da-176a-4c72-a301-9f6ce98c82fe" name="Default Changelist" comment="">
|
||||
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/forge/Main/Index.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Main/Index.js" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/forge/Main/CoderRootDirectory.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Main/CoderRootDirectory.js" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/forge/Main/CoderRootFileDetail.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Main/CoderRootFileDetail.js" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/forge/Main/Detail.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Main/Detail.js" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/forge/Main/list.css" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Main/list.css" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/forge/Merge/MessageCount.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Merge/MessageCount.js" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/forge/Merge/merge.css" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Merge/merge.css" afterDir="false" />
|
||||
</list>
|
||||
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
||||
<option name="SHOW_DIALOG" value="false" />
|
||||
|
|
@ -27,13 +32,85 @@
|
|||
</component>
|
||||
<component name="FileEditorManager">
|
||||
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
|
||||
<file pinned="false" current-in-tab="true">
|
||||
<entry file="file://$PROJECT_DIR$/src/forge/Main/Index.js">
|
||||
<file pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/src/forge/Merge/MergeDetail.js">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="115">
|
||||
<caret line="160" column="24" selection-start-line="160" selection-start-column="24" selection-end-line="160" selection-end-column="24" />
|
||||
<state relative-caret-position="101">
|
||||
<caret line="304" column="20" lean-forward="true" selection-start-line="304" selection-start-column="20" selection-end-line="304" selection-end-column="20" />
|
||||
<folding>
|
||||
<element signature="e#0#42#0" expanded="true" />
|
||||
<element signature="e#0#40#0" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file pinned="false" current-in-tab="true">
|
||||
<entry file="file://$PROJECT_DIR$/src/forge/Merge/MessageCount.js">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="120">
|
||||
<caret line="331" lean-forward="true" selection-start-line="331" selection-end-line="331" />
|
||||
<folding>
|
||||
<element signature="e#0#40#0" expanded="true" />
|
||||
<element signature="e#1369#1443#0" />
|
||||
<element signature="e#1832#1892#0" />
|
||||
<element signature="e#1915#1975#0" />
|
||||
<element signature="e#1993#2053#0" />
|
||||
<element signature="e#3244#3799#0" />
|
||||
<element signature="e#3835#4233#0" />
|
||||
<element signature="e#4262#4764#0" />
|
||||
<element signature="e#4718#4755#0" />
|
||||
<element signature="e#4800#5362#0" />
|
||||
<element signature="e#5406#5453#0" />
|
||||
<element signature="e#5488#5923#0" />
|
||||
<element signature="e#5957#6020#0" />
|
||||
<element signature="e#6043#6112#0" />
|
||||
<element signature="e#6135#6201#0" />
|
||||
<element signature="e#6233#6321#0" />
|
||||
<element signature="e#6342#6601#0" />
|
||||
<element signature="e#6622#6711#0" />
|
||||
<element signature="e#6741#7622#0" />
|
||||
<element signature="e#11406#11819#0" />
|
||||
<element signature="e#11500#11606#0" />
|
||||
<element signature="e#11623#11781#0" />
|
||||
<element signature="e#11830#12256#0" />
|
||||
<element signature="e#12268#12661#0" />
|
||||
<element signature="e#8906#9244#0" />
|
||||
<element signature="e#9748#13588#0" />
|
||||
<element signature="e#21123#24189#0" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/src/forge/Merge/merge.css">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="318">
|
||||
<caret line="26" column="11" selection-start-line="26" selection-start-column="3" selection-end-line="26" selection-end-column="11" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/src/forge/Order/order.css">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="552">
|
||||
<caret line="527" column="24" selection-start-line="527" selection-start-column="24" selection-end-line="527" selection-end-column="24" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/src/forge/Merge/UpdateMerge.js">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="263">
|
||||
<caret line="239" column="77" selection-start-line="239" selection-start-column="61" selection-end-line="239" selection-end-column="77" />
|
||||
<folding>
|
||||
<element signature="e#0#40#0" expanded="true" />
|
||||
<element signature="e#1564#2480#0" />
|
||||
<element signature="e#3799#4743#0" />
|
||||
<element signature="e#8046#8546#0" />
|
||||
<element signature="e#8575#9036#0" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
|
|
@ -43,45 +120,45 @@
|
|||
</component>
|
||||
<component name="FindInProjectRecents">
|
||||
<findStrings>
|
||||
<find>topWrapper_btn</find>
|
||||
<find>renderJournalList</find>
|
||||
<find>代码库</find>
|
||||
<find>href=</find>
|
||||
<find>img_fork</find>
|
||||
<find>.color-white</find>
|
||||
<find>color-white</find>
|
||||
<find>posi</find>
|
||||
<find>pository</find>
|
||||
<find>projectDe</find>
|
||||
<find>fork</find>
|
||||
<find>仓库名称</find>
|
||||
<find>branchDropdown</find>
|
||||
<find>subFileName</find>
|
||||
<find>shu</find>
|
||||
<find>nonemerge</find>
|
||||
<find>isedit</find>
|
||||
<find>getFieldDecorator</find>
|
||||
<find>issue_chosen</find>
|
||||
<find>renderMergeEdit</find>
|
||||
<find>renderSelect</find>
|
||||
<find>menu</find>
|
||||
<find>renderList</find>
|
||||
<find>Paginations</find>
|
||||
<find>Forked from</find>
|
||||
<find>.detailHeader-wrapper</find>
|
||||
<find>工单</find>
|
||||
<find>已合并请求</find>
|
||||
<find>f-wrap-alignCenter</find>
|
||||
<find>commitKey</find>
|
||||
<find>请在下拉选项中选择正确的gitignore</find>
|
||||
<find>里程碑</find>
|
||||
<find>img_m</find>
|
||||
<find>collaborator</find>
|
||||
<find>setting/collaborator</find>
|
||||
<find>.topWrapper_select</find>
|
||||
<find>topWrapper_select</find>
|
||||
<find>Issue</find>
|
||||
<find>NaV</find>
|
||||
<find>创建</find>
|
||||
<find>search</find>
|
||||
<find>changeSearchValue</find>
|
||||
<find>editMergeForm</find>
|
||||
<find>order_line</find>
|
||||
<find>Form</find>
|
||||
<find>Form.I</find>
|
||||
<find>item-list-right</find>
|
||||
<find>form .ant-select</find>
|
||||
<find>form .ant-cascader-picker, form .ant-select</find>
|
||||
<find>.detailContent</find>
|
||||
<find>.ant-spin-nested-loading</find>
|
||||
<find>该合并请求可以进行自动合并操作</find>
|
||||
<find>.newFooter</find>
|
||||
<find>topmerge_btn</find>
|
||||
<find>mergediv</find>
|
||||
<find>index</find>
|
||||
<find>prdetail</find>
|
||||
<find>showNotification</find>
|
||||
</findStrings>
|
||||
<replaceStrings>
|
||||
<replace>任务</replace>
|
||||
</replaceStrings>
|
||||
<dirStrings>
|
||||
<dir>$PROJECT_DIR$</dir>
|
||||
<dir>$PROJECT_DIR$/src</dir>
|
||||
<dir>$PROJECT_DIR$/src/forge/Merge</dir>
|
||||
<dir>$PROJECT_DIR$/src/forge</dir>
|
||||
<dir>$PROJECT_DIR$/src</dir>
|
||||
</dirStrings>
|
||||
</component>
|
||||
<component name="Git.Settings">
|
||||
|
|
@ -99,27 +176,21 @@
|
|||
<option value="$PROJECT_DIR$/src/forge/Settings/Setting.js" />
|
||||
<option value="$PROJECT_DIR$/.gitignore" />
|
||||
<option value="$PROJECT_DIR$/src/forge/Newfile/UserSubmitComponent.js" />
|
||||
<option value="$PROJECT_DIR$/src/forge/Merge/merge.css" />
|
||||
<option value="$PROJECT_DIR$/src/forge/Main/CoderRootFileDetail.js" />
|
||||
<option value="$PROJECT_DIR$/src/forge/Settings/Collaborator.js" />
|
||||
<option value="$PROJECT_DIR$/src/forge/Settings/setting.css" />
|
||||
<option value="$PROJECT_DIR$/src/forge/Order/order.css" />
|
||||
<option value="$PROJECT_DIR$/src/forge/Branch/branch.css" />
|
||||
<option value="$PROJECT_DIR$/src/forge/Main/CoderRootDirectorytext.js" />
|
||||
<option value="$PROJECT_DIR$/src/forge/Version/version.css" />
|
||||
<option value="$PROJECT_DIR$/src/forge/Main/IndexItem.js" />
|
||||
<option value="$PROJECT_DIR$/src/forge/Order/OrderItem.js" />
|
||||
<option value="$PROJECT_DIR$/src/forge/Merge/MergeItem.js" />
|
||||
<option value="$PROJECT_DIR$/src/forge/Main/list.css" />
|
||||
<option value="$PROJECT_DIR$/src/forge/Activity/Activity.js" />
|
||||
<option value="$PROJECT_DIR$/src/forge/Version/NewVersion.js" />
|
||||
<option value="$PROJECT_DIR$/src/forge/Version/UpdateVersion.js" />
|
||||
<option value="$PROJECT_DIR$/src/forge/New/Index.js" />
|
||||
<option value="$PROJECT_DIR$/src/forge/Main/CoderRootDirectory.js" />
|
||||
<option value="$PROJECT_DIR$/src/forge/Order/UpdateMilepost.js" />
|
||||
<option value="$PROJECT_DIR$/src/forge/Order/newMilepost.js" />
|
||||
<option value="$PROJECT_DIR$/src/forge/Order/Milepost.js" />
|
||||
<option value="$PROJECT_DIR$/src/forge/Main/Detail.js" />
|
||||
<option value="$PROJECT_DIR$/src/forge/Settings/Index.js" />
|
||||
<option value="$PROJECT_DIR$/src/forge/Order/Tags.js" />
|
||||
<option value="$PROJECT_DIR$/src/forge/Settings/new_tags.js" />
|
||||
|
|
@ -129,10 +200,16 @@
|
|||
<option value="$PROJECT_DIR$/src/forge/Order/UpdateDetail.js" />
|
||||
<option value="$PROJECT_DIR$/src/forge/Merge/UpdateMerge.js" />
|
||||
<option value="$PROJECT_DIR$/src/forge/Merge/MergeDetail.js" />
|
||||
<option value="$PROJECT_DIR$/src/forge/Merge/MessageCount.js" />
|
||||
<option value="$PROJECT_DIR$/src/forge/Merge/merge.js" />
|
||||
<option value="$PROJECT_DIR$/src/forge/Version/version.js" />
|
||||
<option value="$PROJECT_DIR$/src/forge/Main/Index.js" />
|
||||
<option value="$PROJECT_DIR$/src/forge/Main/list.css" />
|
||||
<option value="$PROJECT_DIR$/src/forge/Main/CoderRootDirectory.js" />
|
||||
<option value="$PROJECT_DIR$/src/forge/Main/CoderRootFileDetail.js" />
|
||||
<option value="$PROJECT_DIR$/src/forge/Main/Detail.js" />
|
||||
<option value="$PROJECT_DIR$/src/forge/Order/order.css" />
|
||||
<option value="$PROJECT_DIR$/src/forge/Merge/merge.css" />
|
||||
<option value="$PROJECT_DIR$/src/forge/Merge/MessageCount.js" />
|
||||
</list>
|
||||
</option>
|
||||
</component>
|
||||
|
|
@ -165,13 +242,6 @@
|
|||
<item name="src" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="forge" type="462c0819:PsiDirectoryNode" />
|
||||
</path>
|
||||
<path>
|
||||
<item name="forgeplus-react" type="b2602c69:ProjectViewProjectNode" />
|
||||
<item name="forgeplus-react" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="src" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="forge" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="Main" type="462c0819:PsiDirectoryNode" />
|
||||
</path>
|
||||
<path>
|
||||
<item name="forgeplus-react" type="b2602c69:ProjectViewProjectNode" />
|
||||
<item name="forgeplus-react" type="462c0819:PsiDirectoryNode" />
|
||||
|
|
@ -179,20 +249,6 @@
|
|||
<item name="forge" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="Merge" type="462c0819:PsiDirectoryNode" />
|
||||
</path>
|
||||
<path>
|
||||
<item name="forgeplus-react" type="b2602c69:ProjectViewProjectNode" />
|
||||
<item name="forgeplus-react" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="src" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="forge" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="Order" type="462c0819:PsiDirectoryNode" />
|
||||
</path>
|
||||
<path>
|
||||
<item name="forgeplus-react" type="b2602c69:ProjectViewProjectNode" />
|
||||
<item name="forgeplus-react" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="src" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="forge" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="Settings" type="462c0819:PsiDirectoryNode" />
|
||||
</path>
|
||||
</expand>
|
||||
<select />
|
||||
</subPane>
|
||||
|
|
@ -207,6 +263,7 @@
|
|||
<property name="node.js.selected.package.eslint" value="$PROJECT_DIR$/node_modules/eslint" />
|
||||
<property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
|
||||
<property name="nodejs_npm_path_reset_for_default_project" value="true" />
|
||||
<property name="ts.external.directory.path" value="$APPLICATION_HOME_DIR$/plugins/JavaScriptLanguage/jsLanguageServicesImpl/external" />
|
||||
</component>
|
||||
<component name="RecentsManager">
|
||||
<key name="MoveFile.RECENT_KEYS">
|
||||
|
|
@ -259,19 +316,21 @@
|
|||
<workItem from="1586245827209" duration="1692000" />
|
||||
<workItem from="1586330226261" duration="658000" />
|
||||
<workItem from="1586400014081" duration="18358000" />
|
||||
<workItem from="1586517058808" duration="958000" />
|
||||
<workItem from="1586517058808" duration="1607000" />
|
||||
<workItem from="1586741565210" duration="15365000" />
|
||||
</task>
|
||||
<servers />
|
||||
</component>
|
||||
<component name="TimeTrackingManager">
|
||||
<option name="totallyTimeSpent" value="100096000" />
|
||||
<option name="totallyTimeSpent" value="116110000" />
|
||||
</component>
|
||||
<component name="ToolWindowManager">
|
||||
<frame x="0" y="0" width="1440" height="900" extended-state="0" />
|
||||
<layout>
|
||||
<window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.18240343" />
|
||||
<window_info content_ui="combo" id="Project" order="0" weight="0.18454936" />
|
||||
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
|
||||
<window_info id="Favorites" order="2" side_tool="true" />
|
||||
<window_info anchor="bottom" id="TypeScript" />
|
||||
<window_info anchor="bottom" id="Message" order="0" />
|
||||
<window_info anchor="bottom" id="Find" order="1" />
|
||||
<window_info anchor="bottom" id="Run" order="2" />
|
||||
|
|
@ -282,7 +341,7 @@
|
|||
<window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
|
||||
<window_info anchor="bottom" id="Database Changes" order="8" />
|
||||
<window_info anchor="bottom" id="Version Control" order="9" weight="0.20722891" />
|
||||
<window_info active="true" anchor="bottom" id="Terminal" order="10" visible="true" weight="0.43373495" />
|
||||
<window_info active="true" anchor="bottom" id="Terminal" order="10" visible="true" weight="0.7493976" />
|
||||
<window_info anchor="bottom" id="Event Log" order="11" side_tool="true" />
|
||||
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
|
||||
<window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
|
||||
|
|
@ -344,55 +403,6 @@
|
|||
</option>
|
||||
</component>
|
||||
<component name="editorHistoryManager">
|
||||
<entry file="file://$PROJECT_DIR$/build/index.html">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="-462">
|
||||
<caret column="512" selection-start-column="512" selection-end-column="512" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/public/index.html">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="233">
|
||||
<caret line="25" column="20" selection-start-line="25" selection-start-column="20" selection-end-line="25" selection-end-column="20" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/modules/tpm/NewHeader.js">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="334">
|
||||
<caret line="111" column="9" lean-forward="true" selection-start-line="111" selection-start-column="9" selection-end-line="111" selection-end-column="9" />
|
||||
<folding>
|
||||
<element signature="e#0#41#0" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/index.js">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="221">
|
||||
<caret line="13" selection-start-line="13" selection-end-line="13" />
|
||||
<folding>
|
||||
<element signature="e#0#26#0" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/forge/Merge/MergeSubmit.js">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="255">
|
||||
<caret line="176" column="43" selection-start-line="176" selection-start-column="43" selection-end-line="176" selection-end-column="43" />
|
||||
<folding>
|
||||
<element signature="e#0#40#0" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/.idea/workspace.xml">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="-9766" />
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/forge/Newfile/Index.js">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="884">
|
||||
|
|
@ -423,13 +433,6 @@
|
|||
<entry file="file://$PROJECT_DIR$/src/index.css">
|
||||
<provider selected="true" editor-type-id="text-editor" />
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/forge/Merge/merge.css">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="454">
|
||||
<caret line="31" column="23" selection-start-line="31" selection-start-column="23" selection-end-line="31" selection-end-column="23" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/forge/Main/DetailTop.js">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="306">
|
||||
|
|
@ -454,13 +457,6 @@
|
|||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/forge/Main/CoderRootFileDetail.js">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="252">
|
||||
<caret line="91" column="17" lean-forward="true" selection-start-line="91" selection-start-column="17" selection-end-line="91" selection-end-column="17" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/build/asset-manifest.json">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="187">
|
||||
|
|
@ -468,13 +464,6 @@
|
|||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/forge/Main/CoderRootDirectorytext.js">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="505">
|
||||
<caret line="237" column="13" selection-start-line="237" selection-start-column="13" selection-end-line="237" selection-end-column="13" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/forge/Version/version.css">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="442">
|
||||
|
|
@ -519,13 +508,6 @@
|
|||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/forge/Main/list.css">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="234">
|
||||
<caret line="239" lean-forward="true" selection-start-line="239" selection-end-line="239" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/forge/Version/UpdateVersion.js">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="494">
|
||||
|
|
@ -543,16 +525,6 @@
|
|||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/forge/Main/CoderRootDirectory.js">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="166">
|
||||
<caret line="234" column="32" lean-forward="true" selection-start-line="234" selection-start-column="32" selection-end-line="234" selection-end-column="32" />
|
||||
<folding>
|
||||
<element signature="e#0#42#0" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/forge/New/Index.js">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="412">
|
||||
|
|
@ -651,13 +623,6 @@
|
|||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/forge/Order/order.css">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="-4004">
|
||||
<caret line="130" selection-start-line="130" selection-end-line="138" selection-end-column="1" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/forge/Settings/new_tags.js">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="154">
|
||||
|
|
@ -670,16 +635,6 @@
|
|||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/forge/Main/Detail.js">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="3863">
|
||||
<caret line="366" column="34" lean-forward="true" selection-start-line="366" selection-start-column="34" selection-end-line="366" selection-end-column="34" />
|
||||
<folding>
|
||||
<element signature="e#0#42#0" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/forge/Order/Detail.js">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="170">
|
||||
|
|
@ -692,16 +647,6 @@
|
|||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/forge/Version/version.js">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="240">
|
||||
<caret line="143" column="11" lean-forward="true" selection-start-line="143" selection-start-column="11" selection-end-line="143" selection-end-column="11" />
|
||||
<folding>
|
||||
<element signature="e#0#42#0" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/forge/Activity/Activity.js">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="500">
|
||||
|
|
@ -756,45 +701,181 @@
|
|||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/forge/Merge/UpdateMerge.js">
|
||||
<entry file="file://$PROJECT_DIR$/src/forge/Version/version.js">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="323">
|
||||
<caret line="195" column="11" selection-start-line="195" selection-start-column="11" selection-end-line="195" selection-end-column="11" />
|
||||
<folding>
|
||||
<element signature="e#0#40#0" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/forge/Merge/MergeDetail.js">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="291">
|
||||
<caret line="232" selection-start-line="232" selection-end-line="232" />
|
||||
<folding>
|
||||
<element signature="e#0#40#0" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/forge/Merge/MessageCount.js">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="333">
|
||||
<caret line="483" selection-start-line="483" selection-end-line="483" />
|
||||
<folding>
|
||||
<element signature="e#0#40#0" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/forge/Main/Index.js">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="115">
|
||||
<caret line="160" column="24" selection-start-line="160" selection-start-column="24" selection-end-line="160" selection-end-column="24" />
|
||||
<state relative-caret-position="804">
|
||||
<caret line="143" column="11" selection-start-line="143" selection-start-column="11" selection-end-line="143" selection-end-column="11" />
|
||||
<folding>
|
||||
<element signature="e#0#42#0" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/forge/Main/Index.js">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="205">
|
||||
<caret line="175" column="51" selection-start-line="175" selection-start-column="51" selection-end-line="175" selection-end-column="51" />
|
||||
<folding>
|
||||
<element signature="e#0#42#0" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/forge/Images/fork.png">
|
||||
<provider selected="true" editor-type-id="images" />
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/forge/Main/CoderRootFileDetail.js">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="110">
|
||||
<caret line="126" column="20" lean-forward="true" selection-start-line="126" selection-start-column="20" selection-end-line="126" selection-end-column="20" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/forge/Branch/SelectBranch.js">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="335">
|
||||
<caret line="83" column="17" selection-start-line="83" selection-start-column="17" selection-end-line="83" selection-end-column="17" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/forge/Main/CoderRootDirectorytext.js">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="109">
|
||||
<caret line="223" column="10" lean-forward="true" selection-start-line="223" selection-start-column="10" selection-end-line="223" selection-end-column="10" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/forge/Main/Detail.js">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="112">
|
||||
<caret line="323" column="46" lean-forward="true" selection-start-line="323" selection-start-column="46" selection-end-line="323" selection-end-column="46" />
|
||||
<folding>
|
||||
<element signature="e#0#42#0" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/forge/Main/list.css">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="181">
|
||||
<caret line="493" column="28" lean-forward="true" selection-start-line="493" selection-start-column="28" selection-end-line="493" selection-end-column="28" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/forge/Main/CoderRootDirectory.js">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="324">
|
||||
<caret line="79" column="33" lean-forward="true" selection-start-line="79" selection-start-column="33" selection-end-line="79" selection-end-column="33" />
|
||||
<folding>
|
||||
<element signature="e#0#42#0" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/forge/Main/RootTable.js">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="102">
|
||||
<caret line="6" column="12" lean-forward="true" selection-start-line="6" selection-start-column="12" selection-end-line="6" selection-end-column="12" />
|
||||
<folding>
|
||||
<element signature="e#0#42#0" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/modules/home/shixunsHome.js">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="190">
|
||||
<caret line="289" column="78" lean-forward="true" selection-start-line="289" selection-start-column="78" selection-end-line="289" selection-end-column="78" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/build/css/iconfont.css">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="173">
|
||||
<caret line="369" column="9" selection-start-line="369" selection-start-column="6" selection-end-line="369" selection-end-column="9" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/node_modules/antd/lib/dropdown/dropdown.d.ts">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="361">
|
||||
<caret line="37" column="21" selection-start-line="37" selection-start-column="21" selection-end-line="37" selection-end-column="21" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/forge/Order/order.css">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="552">
|
||||
<caret line="527" column="24" selection-start-line="527" selection-start-column="24" selection-end-line="527" selection-end-column="24" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/forge/Merge/MergeDetail.js">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="101">
|
||||
<caret line="304" column="20" lean-forward="true" selection-start-line="304" selection-start-column="20" selection-end-line="304" selection-end-column="20" />
|
||||
<folding>
|
||||
<element signature="e#0#40#0" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/forge/Merge/merge.css">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="318">
|
||||
<caret line="26" column="11" selection-start-line="26" selection-start-column="3" selection-end-line="26" selection-end-column="11" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/forge/Merge/UpdateMerge.js">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="263">
|
||||
<caret line="239" column="77" selection-start-line="239" selection-start-column="61" selection-end-line="239" selection-end-column="77" />
|
||||
<folding>
|
||||
<element signature="e#0#40#0" expanded="true" />
|
||||
<element signature="e#1564#2480#0" />
|
||||
<element signature="e#3799#4743#0" />
|
||||
<element signature="e#8046#8546#0" />
|
||||
<element signature="e#8575#9036#0" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/forge/Merge/MessageCount.js">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="120">
|
||||
<caret line="331" lean-forward="true" selection-start-line="331" selection-end-line="331" />
|
||||
<folding>
|
||||
<element signature="e#0#40#0" expanded="true" />
|
||||
<element signature="e#1369#1443#0" />
|
||||
<element signature="e#1832#1892#0" />
|
||||
<element signature="e#1915#1975#0" />
|
||||
<element signature="e#1993#2053#0" />
|
||||
<element signature="e#3244#3799#0" />
|
||||
<element signature="e#3835#4233#0" />
|
||||
<element signature="e#4262#4764#0" />
|
||||
<element signature="e#4718#4755#0" />
|
||||
<element signature="e#4800#5362#0" />
|
||||
<element signature="e#5406#5453#0" />
|
||||
<element signature="e#5488#5923#0" />
|
||||
<element signature="e#5957#6020#0" />
|
||||
<element signature="e#6043#6112#0" />
|
||||
<element signature="e#6135#6201#0" />
|
||||
<element signature="e#6233#6321#0" />
|
||||
<element signature="e#6342#6601#0" />
|
||||
<element signature="e#6622#6711#0" />
|
||||
<element signature="e#6741#7622#0" />
|
||||
<element signature="e#11406#11819#0" />
|
||||
<element signature="e#11500#11606#0" />
|
||||
<element signature="e#11623#11781#0" />
|
||||
<element signature="e#11830#12256#0" />
|
||||
<element signature="e#12268#12661#0" />
|
||||
<element signature="e#8906#9244#0" />
|
||||
<element signature="e#9748#13588#0" />
|
||||
<element signature="e#21123#24189#0" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</component>
|
||||
</project>
|
||||
|
|
@ -0,0 +1 @@
|
|||
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1586744176993" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2609" xmlns:xlink="http://www.w3.org/1999/xlink" width="48" height="48"><defs><style type="text/css"></style></defs><path d="M926.82752 115.18464h-248.59392c-69.7472 0-130.89792 36.32384-165.1968 90.87232-34.29888-54.54848-95.44704-90.87232-165.2224-90.87232H97.19552C43.49696 115.18464-0.00256 158.1824-0.00256 211.23328v543.91296c0 53.04832 43.49952 96.04864 97.19808 96.04864h303.1424c24.59904 34.82368 65.42336 57.62304 111.67232 57.62304 46.22336 0 87.07328-22.79936 111.64672-57.62304h303.17056c53.64736 0 97.16992-43.00032 97.16992-96.04864V211.23328c0-53.04832-43.52256-96.04864-97.16992-96.04864z m38.848 639.9616c0 21.19936-17.40032 38.39744-38.848 38.39744H587.31008c-8.62464 33.14944-39.07584 57.6512-75.29984 57.6512s-66.67264-24.4992-75.32288-57.6512H97.19552c-21.44768 0-38.8736-17.19808-38.8736-38.39744V211.23328c0-21.22496 17.42592-38.4256 38.8736-38.4256h250.61888c75.1488 0 136.07168 60.20096 136.07168 134.44864v315.76832h0.09984c1.14944 14.87616 13.69856 26.57536 29.04832 26.57536 15.32416 0 27.89888-11.6992 29.04832-26.57536h0.09984V307.25376c0-74.24768 60.89984-134.44864 136.04864-134.44864h248.59392c21.44768 0 38.848 17.20064 38.848 38.4256v543.91552zM357.9904 355.02848H203.29472c-13.39904 0-24.29952 10.74944-24.29952 24s10.89792 23.9744 24.29952 23.9744h154.69568c13.42464 0 24.29952-10.74944 24.29952-23.9744 0-13.25056-10.87488-24-24.29952-24z m0 209.87136H203.29472c-13.39904 0-24.29952 10.74688-24.29952 23.97184 0 13.25056 10.89792 24 24.29952 24h154.69568c13.42464 0 24.29952-10.74944 24.29952-24 0-13.22496-10.87488-23.97184-24.29952-23.97184z m464.18688 0h-154.72128c-13.39904 0-24.27392 10.74688-24.27392 23.97184 0 13.25056 10.87488 24 24.27392 24h154.72128c13.39904 0 24.27392-10.74944 24.27392-24 0-13.22496-10.87488-23.97184-24.27392-23.97184z m0-209.87136h-154.72128c-13.39904 0-24.27392 10.74944-24.27392 24s10.87488 23.9744 24.27392 23.9744h154.72128c13.39904 0 24.27392-10.74944 24.27392-23.9744 0-13.25056-10.87488-24-24.27392-24z" p-id="2610" fill="#515151"></path></svg>
|
||||
|
After Width: | Height: | Size: 2.2 KiB |
|
|
@ -5,7 +5,7 @@ import { Router , Route , Link } from 'react-router-dom';
|
|||
import Top from './DetailTop';
|
||||
|
||||
import './list.css';
|
||||
|
||||
import readme_img from '../Images/book.svg';
|
||||
import SelectBranch from '../Branch/SelectBranch';
|
||||
import CloneAddress from '../Branch/CloneAddress';
|
||||
import RootTable from './RootTable';
|
||||
|
|
@ -14,6 +14,7 @@ import NullData from './NullData';
|
|||
import { truncateCommitId } from '../common/util';
|
||||
|
||||
import axios from 'axios';
|
||||
import img_fork from "../Images/fork.png";
|
||||
/**
|
||||
* address:http和SSH，http_url(对应git地址)
|
||||
* branch:当前分支
|
||||
|
|
@ -31,6 +32,7 @@ class CoderRootDirectory extends Component{
|
|||
http_url:undefined,
|
||||
subFileType:"",
|
||||
readMeContent:undefined,
|
||||
readMeFile: undefined,
|
||||
|
||||
isSpin:true,
|
||||
|
||||
|
|
@ -38,7 +40,8 @@ class CoderRootDirectory extends Component{
|
|||
fileDetail:undefined,
|
||||
branchLastCommit:undefined,
|
||||
|
||||
rootData:undefined
|
||||
rootData:undefined,
|
||||
readOnly: true
|
||||
}
|
||||
}
|
||||
changeAddress=(address)=>{
|
||||
|
|
@ -87,13 +90,14 @@ class CoderRootDirectory extends Component{
|
|||
}).catch((error)=>{})
|
||||
}
|
||||
|
||||
ChangeFile=(arr,index)=>{
|
||||
ChangeFile=(arr,readOnly)=>{
|
||||
this.renderUrl(arr.name,arr.path,arr.type);
|
||||
//点击直接跳转页面 加载一次路由
|
||||
|
||||
this.getFileDetail(arr);
|
||||
this.setState({
|
||||
subFileType:arr.type
|
||||
subFileType:arr.type,
|
||||
readOnly: readOnly
|
||||
})
|
||||
}
|
||||
|
||||
|
|
@ -160,6 +164,7 @@ class CoderRootDirectory extends Component{
|
|||
renderData=(data)=>{
|
||||
const rootList = [];
|
||||
const readMeContent = [];
|
||||
const readMeFile = [];
|
||||
data && data.map((item,key)=>{
|
||||
rootList.push({
|
||||
key,
|
||||
|
|
@ -167,22 +172,32 @@ class CoderRootDirectory extends Component{
|
|||
})
|
||||
if(item.name === 'README.md'){
|
||||
readMeContent.push({...item})
|
||||
readMeFile.push({...item})
|
||||
}
|
||||
})
|
||||
this.setState({
|
||||
rootList:rootList,
|
||||
readMeContent
|
||||
readMeContent,
|
||||
readMeFile
|
||||
})
|
||||
}
|
||||
|
||||
// readme文件内容
|
||||
renderReadMeContent=(readMeContent)=>{
|
||||
const { fileDetail } = this.state;
|
||||
renderReadMeContent=(readMeContent, permission)=>{
|
||||
const { fileDetail,readMeFile } = this.state;
|
||||
if(fileDetail){return;}
|
||||
if(readMeContent && readMeContent.length > 0){
|
||||
return(
|
||||
<div className="commonBox">
|
||||
<div className="commonBox-title">{readMeContent[0].name}</div>
|
||||
<div className="commonBox-title">
|
||||
<span className="mr5"><img src={readme_img} alt="" width="16px"/></span>
|
||||
<span className="commonBox-title-read">{readMeContent[0].name}</span>
|
||||
{
|
||||
permission ?
|
||||
<a onClick={()=>this.ChangeFile(readMeFile[0],false)} className="ml20 pull-right"><i className="iconfont icon-bianji font-15 color-grey-6"></i></a>
|
||||
: ""
|
||||
}
|
||||
</div>
|
||||
<div className="commonBox-info">
|
||||
{
|
||||
readMeContent[0].content ?
|
||||
|
|
@ -220,7 +235,7 @@ class CoderRootDirectory extends Component{
|
|||
dataIndex: 'name',
|
||||
width:"100%",
|
||||
render: (text,item) => (
|
||||
<a onClick={()=>this.ChangeFile(item)}>
|
||||
<a onClick={()=>this.ChangeFile(item,true)}>
|
||||
<i className={ item.type === "file" ? "iconfont icon-zuoye font-15 color-blue mr5":"iconfont icon-wenjian font-15 color-blue mr5"}></i>{text}
|
||||
</a>
|
||||
),
|
||||
|
|
@ -287,7 +302,7 @@ class CoderRootDirectory extends Component{
|
|||
key === filePath.length-1 ?
|
||||
<span className="color-grey-6 subFileName" key={key}>{item.name}</span>
|
||||
:
|
||||
<a onClick={()=>this.ChangeFile(item,key)} className="color-blue subFileName" key={key}>{item.name}</a>
|
||||
<a onClick={()=>this.ChangeFile(item,true)} className="color-blue subFileName" key={key}>{item.name}</a>
|
||||
}
|
||||
</React.Fragment>
|
||||
)
|
||||
|
|
@ -319,11 +334,11 @@ class CoderRootDirectory extends Component{
|
|||
|
||||
{
|
||||
fileDetail &&
|
||||
<CoderRootFileDetail detail = {fileDetail} {...this.props} {...this.state}></CoderRootFileDetail>
|
||||
<CoderRootFileDetail detail = {fileDetail} {...this.props} {...this.state} readOnly={this.state.readOnly}></CoderRootFileDetail>
|
||||
}
|
||||
|
||||
{/* readme.txt */}
|
||||
{ this.renderReadMeContent(readMeContent) }
|
||||
{ this.renderReadMeContent(readMeContent,(isManager || isDeveloper)) }
|
||||
</Spin>
|
||||
</div>
|
||||
:
|
||||
|
|
|
|||
|
|
@ -27,10 +27,11 @@ class CoderRootFileDetail extends Component{
|
|||
}
|
||||
|
||||
componentDidMount=()=>{
|
||||
const { detail } = this.props;
|
||||
const { detail, readOnly } = this.props;
|
||||
|
||||
this.setState({
|
||||
value: detail.content
|
||||
value: detail.content,
|
||||
readOnly: readOnly
|
||||
})
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -295,13 +295,6 @@ class Detail extends Component{
|
|||
<div className="normal">
|
||||
<div className="f-wrap-between mb30" style={{position:"relative"}}>
|
||||
<p className="font-18 color-white df flex-1 lineH2 mt15" style={{alignItems:"center"}}>
|
||||
{
|
||||
projectDetail && projectDetail.forked_from_project_id ?
|
||||
<span className="mr10">
|
||||
<img src={img_fork} alt="" width="16px"/>
|
||||
</span>
|
||||
: ""
|
||||
}
|
||||
{projectDetail && projectDetail.author && projectDetail.author.name}
|
||||
<span className="ml5 mr5">/</span>
|
||||
<span className="hide-1 flex-1">
|
||||
|
|
@ -312,6 +305,9 @@ class Detail extends Component{
|
|||
{
|
||||
projectDetail && projectDetail.forked_from_project_id && projectDetail.fork_info ?
|
||||
<div className="fork-css font-14 color-grey-ccc df flex-1 lineH2" style={{alignItems:"center"}}>
|
||||
<span className="mr10">
|
||||
<img src={img_fork} alt="" width="13px"/>
|
||||
</span>
|
||||
<span className="mr10">forked from</span>
|
||||
|
||||
{projectDetail.fork_info.fork_project_user_name}
|
||||
|
|
@ -327,7 +323,9 @@ class Detail extends Component{
|
|||
</div>
|
||||
<div className="f-wrap-between">
|
||||
<ul className="headerMenu-wrapper">
|
||||
<li className={(url.indexOf("coders")>-1 || urlFlag) ? "active" : ""}><Link to={{pathname:`/projects/${projectsId}/coders`,state}}><img alt="" src={img_1} width="18" />代码库</Link></li>
|
||||
<li className={(url.indexOf("coders")>-1 || urlFlag) ? "active" : ""}>
|
||||
<Link to={{pathname:`/projects/${projectsId}/coders`,state}}><img alt="" src={img_1} width="18" />代码库</Link>
|
||||
</li>
|
||||
<li className={(url.indexOf("orders")>-1 && !(url.indexOf("Milepost")>0 || url.indexOf("meilpost")>0 || url.indexOf("tags")>0))? "active" : ""}><Link to={{pathname:`/projects/${projectsId}/orders`,state}}><img alt="" src={img_2} width="12" />任务{projectDetail&&projectDetail.issues_count===0?"":projectDetail&&projectDetail.issues_count===0?projectDetail.issues_count:""}</Link></li>
|
||||
<li className={url.indexOf("merge")>-1 ? "active" : ""}><Link to={{pathname:`/projects/${projectsId}/merge`,state}}><img alt="" src={img_3} width="13" />合并请求{projectDetail&&projectDetail.pull_requests_count===0?"":projectDetail&&projectDetail.pull_requests_count===0?projectDetail.pull_requests_count:""}</Link></li>
|
||||
<li className={url.indexOf("version")>-1 ? "active" : ""}><Link to={{pathname:`/projects/${projectsId}/version`,state}}><img alt="" src={img_4} width="16" />版本发布</Link></li>
|
||||
|
|
|
|||
|
|
@ -492,14 +492,16 @@ body,#root{
|
|||
margin-top: 25px;
|
||||
}
|
||||
.commonBox .commonBox-title{
|
||||
padding:10px 15px;
|
||||
padding:3px 15px;
|
||||
box-sizing: border-box;
|
||||
font-size: 18px;
|
||||
font-size: 15px;
|
||||
background: #f0f0f0;
|
||||
font-weight: bold;
|
||||
}
|
||||
.commonBox .commonBox-info{
|
||||
padding:20px 15px;
|
||||
}
|
||||
.commonBox-title-read{vertical-align: middle;}
|
||||
|
||||
@media screen and (max-width: 370px){
|
||||
.p-r-tags,.p-r-btn{
|
||||
|
|
|
|||
|
|
@ -5,12 +5,12 @@ import axios from 'axios';
|
|||
import Nav from '../Order/Nav';
|
||||
import UploadComponent from '../Upload/Index';
|
||||
import { getImageUrl } from 'educoder';
|
||||
import {Modal, Form, Input, Tooltip, Popconfirm, Pagination , Spin,Dropdown,Icon,Menu} from 'antd'
|
||||
import {Modal, Form, Input, Tooltip, Popconfirm, Pagination, Spin, Dropdown, Icon, Menu, Select} from 'antd'
|
||||
import Attachments from '../Upload/attachment'
|
||||
import './merge.css';
|
||||
import QuillForEditor from '../quillForEditor';
|
||||
import MergeSubmit from './MergeSubmit';
|
||||
|
||||
const Option = Select.Option;
|
||||
const TextArea = Input.TextArea;
|
||||
|
||||
const options = [
|
||||
|
|
@ -49,7 +49,12 @@ class MessageCount extends Component{
|
|||
body:'',
|
||||
commentsContent:undefined,
|
||||
quillFlag:false,
|
||||
SpinFlag:true
|
||||
SpinFlag:true,
|
||||
editMerge: false,
|
||||
issue_tag_ids: undefined,
|
||||
issue_chosen: undefined,
|
||||
fixed_version_id: undefined,
|
||||
assigned_to_id: undefined
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -318,6 +323,52 @@ class MessageCount extends Component{
|
|||
}
|
||||
}
|
||||
|
||||
handleSubmit=()=>{
|
||||
const { fileList } = this.state;
|
||||
this.props.form.validateFieldsAndScroll((err, values) => {
|
||||
if(!err){
|
||||
const { projectsId , mergeId } = this.props.match.params;
|
||||
const url = `/projects/${projectsId}/pull_requests/${mergeId}/simple_update.json`;
|
||||
|
||||
if(values.issue_tag_ids===''){
|
||||
values.issue_tag_ids = []
|
||||
}else{
|
||||
|
||||
}
|
||||
|
||||
if(values.assigned_to_id===0){
|
||||
values.assigned_to_id = ""
|
||||
}
|
||||
axios.post(url,{
|
||||
...values
|
||||
}).then(result=>{
|
||||
if(result){
|
||||
this.setState({
|
||||
editMerge:false
|
||||
})
|
||||
this.props.showNotification(result.data.message);
|
||||
}
|
||||
|
||||
}).catch(error=>{
|
||||
console.log(error);
|
||||
})
|
||||
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
renderSelect=(list)=>{
|
||||
if(list && list.length >0){
|
||||
return(
|
||||
list.map((item,key)=>{
|
||||
return(
|
||||
<Option key={key+1} value={item.id}>{item.name}</Option>
|
||||
)
|
||||
})
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// 翻页
|
||||
ChangePage=(page)=>{
|
||||
|
|
@ -329,12 +380,25 @@ class MessageCount extends Component{
|
|||
this.getjournalslist(page,limit);
|
||||
}
|
||||
getOption=(e)=>{
|
||||
this.setState({
|
||||
mergename:e.item.props.value,
|
||||
mergekey:e.key,
|
||||
title:'',
|
||||
body:''
|
||||
})
|
||||
if(e.key === "rebase"){
|
||||
this.setState({
|
||||
mergename:e.item.props.value,
|
||||
mergekey:e.key,
|
||||
title:'',
|
||||
body:'',
|
||||
buttonshow:'block'
|
||||
})
|
||||
}else{
|
||||
this.setState({
|
||||
mergename:e.item.props.value,
|
||||
mergekey:e.key,
|
||||
title:'',
|
||||
body:'',
|
||||
ismesrge:'block',
|
||||
buttonshow:'block'
|
||||
})
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
changeComments=(value)=>{
|
||||
|
|
@ -347,6 +411,29 @@ class MessageCount extends Component{
|
|||
})
|
||||
}
|
||||
}
|
||||
cancelSubmit=()=>{
|
||||
this.setState({
|
||||
editMerge: false
|
||||
})
|
||||
}
|
||||
|
||||
change_to_edit=()=>{
|
||||
const { projectsId , mergeId} = this.props.match.params;
|
||||
const url = `/projects/${projectsId}/pull_requests/${mergeId}/edit.json`;
|
||||
axios.get(url).then((result)=>{
|
||||
if(result){
|
||||
this.setState({
|
||||
issue_chosen:result.data.issue.issue_chosen,
|
||||
issue_tag_ids: result.data.issue.issue_tags && result.data.issue.issue_tags[0].id,
|
||||
fixed_version_id: result.data.issue.fixed_version_id,
|
||||
assigned_to_id: result.data.issue.assigned_to_id,
|
||||
editMerge: true
|
||||
})
|
||||
}
|
||||
}).catch((error)=>{
|
||||
console.log(error);
|
||||
})
|
||||
}
|
||||
|
||||
stringJson=(value) =>{
|
||||
let _value = null;
|
||||
|
|
@ -378,12 +465,65 @@ class MessageCount extends Component{
|
|||
|
||||
render(){
|
||||
const { projectsId,mergeId } = this.props.match.params;
|
||||
const { data,journalsdata, page, limit, search_count, isSpin, isedit, showFiles , commentsContent , quillFlag } = this.state;
|
||||
const { data,journalsdata, page, limit, search_count, isSpin, isedit, showFiles , commentsContent , quillFlag, editMerge, issue_tag_ids, issue_chosen,fixed_version_id,assigned_to_id } = this.state;
|
||||
const { getFieldDecorator } = this.props.form;
|
||||
const { current_user } = this.props;
|
||||
const url = this.props.history.location.pathname;
|
||||
|
||||
|
||||
const editMergeForm =()=>{
|
||||
return(
|
||||
<div className="list-l-panel">
|
||||
<Form>
|
||||
<Form.Item
|
||||
label="标签"
|
||||
>
|
||||
{getFieldDecorator('issue_tag_ids', {
|
||||
initialValue: issue_tag_ids ? [issue_tag_ids] : '',
|
||||
rules: [],
|
||||
})(
|
||||
<Select>
|
||||
<Option value={''}>未选择标签</Option>
|
||||
{this.renderSelect(issue_chosen && issue_chosen.issue_tag)}
|
||||
</Select>
|
||||
)}
|
||||
</Form.Item>
|
||||
<Form.Item
|
||||
label="里程碑"
|
||||
>
|
||||
{getFieldDecorator('fixed_version_id', {
|
||||
initialValue: fixed_version_id ? fixed_version_id : "",
|
||||
rules: [],
|
||||
})(
|
||||
<Select>
|
||||
<Option value={''}>未选择里程碑</Option>
|
||||
{this.renderSelect(issue_chosen && issue_chosen.issue_version)}
|
||||
</Select>
|
||||
)}
|
||||
</Form.Item>
|
||||
|
||||
<Form.Item
|
||||
label="指派成员"
|
||||
>
|
||||
{getFieldDecorator('assigned_to_id', {
|
||||
initialValue: assigned_to_id ? assigned_to_id : "",
|
||||
})(
|
||||
<Select>
|
||||
<Option value={''}>未指派成员</Option>
|
||||
{this.renderSelect(issue_chosen && issue_chosen.assign_user)}
|
||||
</Select>
|
||||
)}
|
||||
</Form.Item>
|
||||
<p className="clearfix mt15 text-right">
|
||||
<a className="topWrapper_btn fr" type="submit" style={{marginLeft: 5}} onClick={this.handleSubmit}>保存</a>
|
||||
<a className="a_btn cancel_btn fr" onClick={this.cancelSubmit}>取消</a>
|
||||
</p>
|
||||
</Form>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
||||
|
||||
const menu = (
|
||||
<Menu onClick={(e)=>this.getOption(e)}>
|
||||
<Menu.Item key={'merge'} value="合并请求">合并请求</Menu.Item>
|
||||
|
|
@ -511,11 +651,16 @@ class MessageCount extends Component{
|
|||
请求从<strong> {data && data.pull_request.head} </strong>分支合并到<strong> {data && data.pull_request.base} </strong>分支
|
||||
</span>
|
||||
<span className="pull-right lineH32">
|
||||
{
|
||||
data && data.issue.user_permission ?
|
||||
<Link to={`/projects/${projectsId}/merge/${mergeId}/UpdateMerge`} className="color-blue fr">编辑</Link>
|
||||
: ''
|
||||
}
|
||||
{/*{*/}
|
||||
{/*data && data.issue.user_permission ?*/}
|
||||
{/*<Link to={`/projects/${projectsId}/merge/${mergeId}/UpdateMerge`} className="color-blue fr">编辑</Link>*/}
|
||||
{/*: ''*/}
|
||||
{/*}*/}
|
||||
{
|
||||
data && data.issue.user_permission ?
|
||||
<a onClick={this.change_to_edit} className="color-blue fr">编辑</a>
|
||||
: ''
|
||||
}
|
||||
</span>
|
||||
</p>
|
||||
<div className="df mt20">
|
||||
|
|
@ -541,6 +686,65 @@ class MessageCount extends Component{
|
|||
<Spin spinning={this.state.SpinFlag}>
|
||||
<div className="f-wrap-between mt5" style={{alignItems:"flex-start"}}>
|
||||
<div className="item-list-right" >
|
||||
{
|
||||
data && data.issue.user_permission ?
|
||||
<div>
|
||||
<div className="df" style={{display:this.state.data&&this.state.data.pull_request.status===1?'none':'flex'}}>
|
||||
<img className="user_img" src={getImageUrl(`images/${current_user && current_user.image_url}`)} alt=""/>
|
||||
<div className="new_context" >
|
||||
<p>该合并请求可以进行自动合并操作</p>
|
||||
<p style={{marginTop:15,display:this.state.mergekey==='rebase'?this.state.buttonshow==='none'?"block":"none":this.state.ismesrge==='none'?"block":"none"}}>
|
||||
{/* <button className="topmerge_btn" onClick={this.submitmerge} >{this.state.mergename}</button> */}
|
||||
{/* <Dropdown style={{marginBottom:5}} overlay={menu} trigger={['click']} > */}
|
||||
<Dropdown.Button overlay={menu} type="primary" onClick={this.submitmerge} icon={<Icon type="caret-down"/>}>
|
||||
{this.state.mergename}
|
||||
</Dropdown.Button>
|
||||
{
|
||||
data&&data.pull_request.status===0 ?
|
||||
<div className="pull-right">
|
||||
<a className="Closeor_btn fr" type="submit"
|
||||
onClick={() => this.closedetail(data && data.issue.issue_status === "关闭" ? 2 : 5)}>{data && data.issue.issue_status === "关闭" ? "点击开启" : "已关闭"}</a>
|
||||
{/*<a className="cancel_btn fr" type="submit"*/}
|
||||
{/*onClick={() => this.closedetail(data && data.issue.issue_status === "关闭" ? 2 : 5)}>{data && data.issue.issue_status === "关闭" ? "开启" : "关闭"}</a>*/}
|
||||
</div>
|
||||
: ""
|
||||
|
||||
}
|
||||
|
||||
{/* </Dropdown> */}
|
||||
</p>
|
||||
|
||||
<div style={{display:this.state.ismesrge,marginTop:15}}>
|
||||
<Input placeholder="标题" value={this.state.title} onChange={this.changtitlepr}/>
|
||||
{/*<div className="quillContent" style={{marginTop:"20px"}}>*/}
|
||||
{/*<QuillForEditor*/}
|
||||
{/*value = {this.state.body}*/}
|
||||
{/*wrapStyle={{*/}
|
||||
{/*height: '220px',*/}
|
||||
{/*opacity:1,*/}
|
||||
{/*}}*/}
|
||||
{/*// autoFocus={true}*/}
|
||||
{/*style={{ height: '170px' }}*/}
|
||||
{/*placeholder="请输入合并请求描述..."*/}
|
||||
{/*options={options}*/}
|
||||
{/*onContentChange={this.changbodypr}*/}
|
||||
{/*/>*/}
|
||||
{/*</div>*/}
|
||||
<TextArea placeholder="请输入合并描述..." style={{height:"170px",marginTop:20}} value={this.state.body} onChange={this.changbodypr} />
|
||||
</div>
|
||||
<p className="clearfix mt15" style={{display:this.state.buttonshow}}>
|
||||
<a className="topWrapper_btn " type="submit" onClick={()=>this.prmerge()}>合并请求</a>
|
||||
<a className="a_btn cancel_btn " type="submit" style={{marginLeft:15}} onClick={this.nonemerge}>取消</a>
|
||||
</p>
|
||||
</div>
|
||||
<div className="order_line" style={{marginLeft:80}}></div>
|
||||
</div>
|
||||
|
||||
|
||||
</div>
|
||||
: ''
|
||||
}
|
||||
|
||||
<Spin spinning={isSpin}>
|
||||
<ul className="ul_width">
|
||||
{renderList()}
|
||||
|
|
@ -549,51 +753,6 @@ class MessageCount extends Component{
|
|||
|
||||
{ Paginations }
|
||||
|
||||
{
|
||||
data && data.issue.user_permission ?
|
||||
<div className="df" style={{display:this.state.data&&this.state.data.pull_request.status===1?'none':'flex'}}>
|
||||
<img className="user_img" src={getImageUrl(`images/${current_user && current_user.image_url}`)} alt=""/>
|
||||
<div className="new_context" >
|
||||
<p>该合并请求可以进行自动合并操作</p>
|
||||
<p style={{marginTop:15,display:this.state.mergekey==='rebase'?this.state.buttonshow==='none'?"block":"none":this.state.ismesrge==='none'?"block":"none"}}>
|
||||
{/* <button className="topmerge_btn" onClick={this.submitmerge} >{this.state.mergename}</button> */}
|
||||
{/* <Dropdown style={{marginBottom:5}} overlay={menu} trigger={['click']} > */}
|
||||
<Dropdown.Button overlay={menu} type="primary" onClick={this.submitmerge} icon={<Icon type="caret-down"/>}>
|
||||
{this.state.mergename}
|
||||
</Dropdown.Button>
|
||||
|
||||
{/* </Dropdown> */}
|
||||
</p>
|
||||
|
||||
<div style={{display:this.state.ismesrge,marginTop:15}}>
|
||||
<Input placeholder="标题" value={this.state.title} onChange={this.changtitlepr}/>
|
||||
{/*<div className="quillContent" style={{marginTop:"20px"}}>*/}
|
||||
{/*<QuillForEditor*/}
|
||||
{/*value = {this.state.body}*/}
|
||||
{/*wrapStyle={{*/}
|
||||
{/*height: '220px',*/}
|
||||
{/*opacity:1,*/}
|
||||
{/*}}*/}
|
||||
{/*// autoFocus={true}*/}
|
||||
{/*style={{ height: '170px' }}*/}
|
||||
{/*placeholder="请输入合并请求描述..."*/}
|
||||
{/*options={options}*/}
|
||||
{/*onContentChange={this.changbodypr}*/}
|
||||
{/*/>*/}
|
||||
{/*</div>*/}
|
||||
<TextArea placeholder="请输入合并描述..." style={{height:"170px",marginTop:20}} value={this.state.body} onChange={this.changbodypr} />
|
||||
</div>
|
||||
<p className="clearfix mt15" style={{display:this.state.buttonshow}}>
|
||||
<a className="topWrapper_btn " type="submit" onClick={()=>this.prmerge()}>合并请求</a>
|
||||
<a className="a_btn cancel_btn " type="submit" style={{marginLeft:15}} onClick={this.nonemerge}>取消</a>
|
||||
</p>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
: ''
|
||||
}
|
||||
|
||||
<div className="order_line" style={{marginLeft:80}}></div>
|
||||
<div className="df">
|
||||
<img className="user_img" src={getImageUrl(`images/${current_user && current_user.image_url}`)} alt=""/>
|
||||
<div className="new_context">
|
||||
|
|
@ -626,31 +785,40 @@ class MessageCount extends Component{
|
|||
<UploadComponent load={this.UploadFunc} isComplete={showFiles}></UploadComponent>
|
||||
<p className="clearfix mt15">
|
||||
<a className="topWrapper_btn fr" type="submit" onClick={this.addjournals}>评论</a>
|
||||
<a className="Closeor_btn fr" type="submit" style={{display:data&&data.pull_request.status===0?'block':'none'}}
|
||||
onClick={() => this.closedetail(data && data.issue.issue_status === "关闭" ? 2 : 5)}>{data && data.issue.issue_status === "关闭" ? "开启" : "关闭"}</a>
|
||||
{/*<a className="Closeor_btn fr" type="submit" style={{display:data&&data.pull_request.status===0?'block':'none'}}*/}
|
||||
{/*onClick={() => this.closedetail(data && data.issue.issue_status === "关闭" ? 2 : 5)}>{data && data.issue.issue_status === "关闭" ? "开启" : "关闭"}</a>*/}
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div className="list-left DetailRight mt10">
|
||||
<p>
|
||||
<span className="span_title">标签</span>
|
||||
<span>{
|
||||
data && data.issue.issue_tags ? <span className="issue-tag-show" style={{background: data.issue.issue_tags[0].color}}>{data.issue.issue_tags[0].name}</span> : "--"
|
||||
}</span>
|
||||
</p>
|
||||
<p style={{display: "inline-block",'white-space': "nowrap" }}>
|
||||
<span className="span_title">里程碑</span>
|
||||
<span className="title_overflow">{
|
||||
data && data.issue.version ? data.issue.version : "--"
|
||||
}</span>
|
||||
</p>
|
||||
<p>
|
||||
<span className="span_title">指派给</span>
|
||||
<span>{data && data.issue.assign_user_name ? data.issue.assign_user_name : "--"}</span>
|
||||
</p>
|
||||
{
|
||||
editMerge ?
|
||||
<div className="list-left DetailRight mt10">
|
||||
{ editMergeForm() }
|
||||
</div>
|
||||
|
||||
:
|
||||
<div className="list-left DetailRight mt10">
|
||||
<p>
|
||||
<span className="span_title">标签</span>
|
||||
<span>{
|
||||
data && data.issue.issue_tags ? <span className="issue-tag-show" style={{background: data.issue.issue_tags[0].color}}>{data.issue.issue_tags[0].name}</span> : "--"
|
||||
}</span>
|
||||
</p>
|
||||
<p style={{display: "inline-block",'white-space': "nowrap" }}>
|
||||
<span className="span_title">里程碑</span>
|
||||
<span className="title_overflow">{
|
||||
data && data.issue.version ? data.issue.version : "--"
|
||||
}</span>
|
||||
</p>
|
||||
<p>
|
||||
<span className="span_title">指派给</span>
|
||||
<span>{data && data.issue.assign_user_name ? data.issue.assign_user_name : "--"}</span>
|
||||
</p>
|
||||
|
||||
</div>
|
||||
}
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</Spin>
|
||||
:
|
||||
|
|
|
|||
|
|
@ -34,4 +34,7 @@
|
|||
/*width: 110px;*/
|
||||
border-radius: 4px;
|
||||
line-height: 32px;
|
||||
}
|
||||
}
|
||||
form .ant-cascader-picker, form .ant-select {
|
||||
width: 100%;
|
||||
}
|
||||
Loading…
Reference in New Issue