Zgna
/
forgeplus-react
forked from Gitlink/forgeplus-react
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

change appearance in blockchain functions

This commit is contained in:
nigel007 2021-05-12 15:45:02 +08:00
parent c7da648ae8
commit c52fa2e79f
9 changed files with 344 additions and 266 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

439
.idea/workspace.xml
View File

@ -2,53 +2,14 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="9830c5da-176a-4c72-a301-9f6ce98c82fe" name="Default Changelist" comment="">
<change afterPath="$PROJECT_DIR$/src/forge/Divert/DivertModal.jsx" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/forge/Divert/Index.scss" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/forge/Notice/Index.jsx" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/forge/Notice/Index.scss" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/forge/Notice/Notify.jsx" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/forge/Notice/UndoEvent.jsx" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/package-lock.json" beforeDir="false" afterPath="$PROJECT_DIR$/package-lock.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/css/editormd.min.css" beforeDir="false" afterPath="$PROJECT_DIR$/public/css/editormd.min.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/css/edu-purge.css" beforeDir="false" afterPath="$PROJECT_DIR$/public/css/edu-purge.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/AppConfig.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/AppConfig.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/About/Index.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/About/Index.jsx" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/Component/Cards.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Component/Cards.jsx" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/Component/EAccount.scss" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Component/EAccount.scss" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/Component/Releases.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Component/Releases.jsx" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/Component/SearchUser.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Component/SearchUser.jsx" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/Head/Header.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Head/Header.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/Head/header.scss" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Head/header.scss" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/Main/CoderDepot.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Main/CoderDepot.jsx" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/Main/CoderRootCommit.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Main/CoderRootCommit.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/Main/Index.scss" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Main/Index.scss" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/Main/IndexItem.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Main/IndexItem.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/Main/sub/UpdateDescModal.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Main/sub/UpdateDescModal.jsx" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/Merge/MergeItem.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Merge/MergeItem.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/Merge/NewMerge.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Merge/NewMerge.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/Merge/merge.css" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Merge/merge.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/Merge/merge_form.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Merge/merge_form.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/New/Index.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/New/Index.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/Order/MilepostDetail.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Order/MilepostDetail.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/Order/order.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Order/order.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/Order/order_form.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Order/order_form.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/Settings/Setting.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Settings/Setting.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/Team/Group/GroupDetails.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Team/Group/GroupDetails.jsx" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/Team/Group/GroupForm.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Team/Group/GroupForm.jsx" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/Team/Index.scss" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Team/Index.scss" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/Team/ListItem.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Team/ListItem.jsx" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/Team/New.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Team/New.jsx" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/Team/Setting/TeamSettingCommon.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Team/Setting/TeamSettingCommon.jsx" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/Team/Sub/Detail.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Team/Sub/Detail.jsx" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/Team/TeamGroupItems.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Team/TeamGroupItems.jsx" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/Version/version.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Version/version.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/New/new.css" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/New/new.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/users/BlockchainExCre.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/users/BlockchainExCre.jsx" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/users/BlockchainExHistory.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/users/BlockchainExHistory.jsx" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/users/BlockchainExList.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/users/BlockchainExList.jsx" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/users/BlockchainExVerify.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/users/BlockchainExVerify.jsx" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/users/BlockchainTransfer.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/users/BlockchainTransfer.jsx" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/users/Index.scss" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/users/Index.scss" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/users/Infos.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/users/Infos.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/users/Team-item.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/users/Team-item.jsx" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/users/undo_events.js" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/index.css" beforeDir="false" afterPath="$PROJECT_DIR$/src/index.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/modules/tpm/TPMBanner.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/modules/tpm/TPMBanner.js" afterDir="false" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" />
@ -72,23 +33,56 @@
</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/New/Index.js">
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/forge/users/BlockchainTransfer.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="205">
<caret line="263" column="2" selection-start-line="263" selection-start-column="2" selection-end-line="263" selection-end-column="2" />
<state relative-caret-position="146">
<caret line="90" column="47" selection-start-line="90" selection-start-column="47" selection-end-line="90" selection-end-column="47" />
<folding>
<element signature="e#0#41#0" expanded="true" />
<element signature="e#0#80#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/forge/Merge/MessageCount.js">
<entry file="file://$PROJECT_DIR$/src/forge/users/BlockchainExMenu.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="8160">
<caret line="501" column="35" selection-start-line="501" selection-start-column="35" selection-end-line="501" selection-end-column="35" />
<state relative-caret-position="337">
<caret line="20" column="60" lean-forward="true" selection-start-line="20" selection-start-column="60" selection-end-line="20" selection-end-column="60" />
<folding>
<element signature="e#0#53#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/forge/users/Index.scss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="196">
<caret line="138" column="11" selection-start-line="138" selection-start-column="11" selection-end-line="138" selection-end-column="11" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/forge/New/new.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="372">
<caret line="58" column="13" selection-start-line="58" selection-start-column="1" selection-end-line="58" selection-end-column="13" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/forge/New/Index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="306">
<caret line="18" column="25" lean-forward="true" selection-start-line="18" selection-start-column="25" selection-end-line="18" selection-end-column="25" />
<folding>
<element signature="e#0#41#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
@ -105,37 +99,11 @@
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/forge/users/Infos.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="179">
<caret line="321" column="15" selection-start-line="321" selection-start-column="15" selection-end-line="321" selection-end-column="15" />
<folding>
<element signature="e#0#41#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/package.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="3094">
<caret line="182" column="28" selection-start-line="182" selection-start-column="28" selection-end-line="182" selection-end-column="28" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/package-lock.json">
<provider selected="true" editor-type-id="text-editor" />
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/forge/users/BlockchainExHistory.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="255">
<caret line="20" column="4" selection-start-line="20" selection-start-column="4" selection-end-line="30" selection-end-column="6" />
<state relative-caret-position="122">
<caret line="41" column="54" selection-start-line="41" selection-start-column="35" selection-end-line="41" selection-end-column="54" />
<folding>
<element signature="e#0#53#0" expanded="true" />
</folding>
@ -144,28 +112,37 @@
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/forge/Order/order.js">
<entry file="file://$PROJECT_DIR$/src/forge/users/BlockchainExCre.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="5814">
<caret line="352" column="13" selection-start-line="352" selection-start-column="13" selection-end-line="352" selection-end-column="13" />
<state relative-caret-position="278">
<caret line="150" column="1" lean-forward="true" selection-start-line="150" selection-start-column="1" selection-end-line="150" selection-end-column="1" />
<folding>
<element signature="e#0#53#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/forge/Order/order_form.js">
<entry file="file://$PROJECT_DIR$/src/forge/users/BlockchainExVerify.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2839">
<caret line="176" column="27" selection-start-line="176" selection-start-column="27" selection-end-line="176" selection-end-column="27" />
<state relative-caret-position="253">
<caret line="94" column="7" lean-forward="true" selection-start-line="94" selection-start-column="7" selection-end-line="94" selection-end-column="7" />
<folding>
<element signature="e#0#53#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/forge/Order/Detail.js">
<entry file="file://$PROJECT_DIR$/src/forge/users/BlockchainExList.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="6018">
<caret line="363" column="18" selection-start-line="363" selection-start-column="18" selection-end-line="363" selection-end-column="18" />
<state relative-caret-position="197">
<caret line="59" column="17" lean-forward="true" selection-start-line="59" selection-start-column="17" selection-end-line="59" selection-end-column="17" />
<folding>
<element signature="e#0#53#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
@ -181,36 +158,36 @@
</component>
<component name="FindInProjectRecents">
<findStrings>
<find>changeStatus</find>
<find>adjustTokenNum</find>
<find>id</find>
<find>console.log</find>
<find>onInput</find>
<find>issue_token_num</find>
<find>setAttribute</find>
<find>创建</find>
<find>完成度:</find>
<find>data</find>
<find>blockchain</find>
<find>setList(result.data.results);</find>
<find>componentDidMount</find>
<find>getBlockchainTokenNum</find>
<find>start_date</find>
<find>项目简介</find>
<find>blockchain_token_num</find>
<find>该合并请求可以进行自动合并操作</find>
<find>变基并合并</find>
<find>合并请求</find>
<find>menu</find>
<find>fix_issue_id</find>
<find>initOnlineOfflineListener</find>
<find>10.13.102.14</find>
<find>transfer_login</find>
<find>合并描述</find>
<find>localhost:3001</find>
<find>proxy</find>
<find>3007</find>
<find>HEAD</find>
<find>changeDesc</find>
<find>请填写项目token总数</find>
<find>type</find>
<find>type=</find>
<find>getElementB</find>
<find>setS</find>
<find>setState</find>
<find>getElementsBy</find>
<find>getElement</find>
<find>state</find>
<find>hidden</find>
<find>show_div</find>
<find>this.state</find>
<find>handleBlockchainChange</find>
<find>&lt;Table</find>
<find>请输入转给</find>
<find>历史交易</find>
<find>交易</find>
<find>?</find>
<find>售卖token数量</find>
<find>输入售卖金额</find>
<find>selectProjectChange</find>
<find>auth</find>
<find>确认收货</find>
<find>token_num</find>
<find>请输入转账token</find>
<find>token数量</find>
</findStrings>
<replaceStrings>
<replace>任务</replace>
@ -232,8 +209,6 @@
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/src/modules/tpm/NewHeader.js" />
<option value="$PROJECT_DIR$/src/modules/login/LoginDialog.js" />
<option value="$PROJECT_DIR$/src/modules/login/EducoderLogin.js" />
<option value="$PROJECT_DIR$/src/modules/user/LoginRegisterComponent.js" />
<option value="$PROJECT_DIR$/src/modules/login/EducoderInteresse.js" />
@ -269,12 +244,7 @@
<option value="$PROJECT_DIR$/src/forge/BlockchainExchangeNew.jsx" />
<option value="$PROJECT_DIR$/src/forge/users/BlockchainEx.jsx" />
<option value="$PROJECT_DIR$/src/forge/Merge/NewMerge.js" />
<option value="$PROJECT_DIR$/src/forge/users/BlockchainTransfer.jsx" />
<option value="$PROJECT_DIR$/src/forge/users/BlockchainExMenu.jsx" />
<option value="$PROJECT_DIR$/src/forge/users/BlockchainExCre.jsx" />
<option value="$PROJECT_DIR$/src/forge/users/BlockchainExHistory.jsx" />
<option value="$PROJECT_DIR$/src/forge/users/BlockchainExList.jsx" />
<option value="$PROJECT_DIR$/src/forge/users/BlockchainExVerify.jsx" />
<option value="$PROJECT_DIR$/src/forge/Main/Detail.js" />
<option value="$PROJECT_DIR$/src/forge/Order/order_form.js" />
<option value="$PROJECT_DIR$/src/forge/Order/Detail.js" />
@ -282,7 +252,14 @@
<option value="$PROJECT_DIR$/package.json" />
<option value="$PROJECT_DIR$/src/AppConfig.js" />
<option value="$PROJECT_DIR$/src/forge/users/Infos.js" />
<option value="$PROJECT_DIR$/src/forge/New/new.css" />
<option value="$PROJECT_DIR$/src/forge/New/Index.js" />
<option value="$PROJECT_DIR$/src/forge/users/BlockchainExList.jsx" />
<option value="$PROJECT_DIR$/src/forge/users/BlockchainExHistory.jsx" />
<option value="$PROJECT_DIR$/src/forge/users/BlockchainExCre.jsx" />
<option value="$PROJECT_DIR$/src/forge/users/BlockchainExVerify.jsx" />
<option value="$PROJECT_DIR$/src/forge/users/BlockchainTransfer.jsx" />
<option value="$PROJECT_DIR$/src/forge/users/Index.scss" />
</list>
</option>
</component>
@ -465,12 +442,12 @@
<workItem from="1618381961400" duration="14929000" />
<workItem from="1618715059222" duration="64287000" />
<workItem from="1619410770871" duration="5988000" />
<workItem from="1620741829434" duration="202000" />
<workItem from="1620741829434" duration="9981000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="308361000" />
<option name="totallyTimeSpent" value="318140000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
@ -485,7 +462,7 @@
<frame x="0" y="0" width="1280" height="800" extended-state="6" />
<editor active="true" />
<layout>
<window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.49747476" visible="true" weight="0.22001588" />
<window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.49747476" visible="true" weight="0.1683876" />
<window_info id="Structure" order="1" sideWeight="0.50252527" side_tool="true" weight="0.24702145" />
<window_info id="Favorites" order="2" side_tool="true" />
<window_info id="npm" order="3" side_tool="true" />
@ -675,24 +652,6 @@
</expressions>
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/src/modules/login/LoginDialog.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="205">
<caret line="580" column="27" lean-forward="true" selection-start-line="580" selection-start-column="27" selection-end-line="580" selection-end-column="27" />
<folding>
<element signature="n#style#0;n#a#0;n#font#0;n#!!top" expanded="true" />
<element signature="n#!!block;n#constructor#0;n#LoginDialog#0" />
<element signature="e#3478#3553#0" />
<element signature="e#3577#3653#0" />
<element signature="e#3681#3744#0" />
<element signature="e#3779#4223#0" />
<element signature="e#4285#5109#0" />
<element signature="e#5137#5494#0" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/forge/Main/CoderRootDirectory.js" />
<entry file="file://$PROJECT_DIR$/src/forge/users/devOpsCD.jsx">
<provider selected="true" editor-type-id="text-editor" />
</entry>
@ -753,13 +712,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/forge/users/Index.scss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="199">
<caret line="111" column="3" selection-start-line="111" selection-start-column="1" selection-end-line="111" selection-end-column="3" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/forge/Component/PasswordAuthority.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="85">
@ -902,23 +854,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/forge/users/BlockchainExList.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="34">
<caret line="2" column="40" lean-forward="true" selection-start-line="2" selection-start-column="40" selection-end-line="2" selection-end-column="40" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/forge/users/BlockchainExVerify.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="119">
<caret line="7" column="35" lean-forward="true" selection-start-line="7" selection-start-column="35" selection-end-line="7" selection-end-column="35" />
<folding>
<element signature="e#0#53#0" expanded="true" />
</folding>
</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="227">
@ -929,33 +864,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/forge/users/BlockchainExCre.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="124">
<caret line="90" column="57" selection-start-line="90" selection-start-column="57" selection-end-line="91" selection-end-column="24" />
<folding>
<element signature="e#0#53#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/node_modules/@types/react/index.d.ts">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="156">
<caret line="498" column="8" selection-start-line="498" selection-start-column="8" selection-end-line="498" selection-end-column="8" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/forge/users/BlockchainExMenu.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="381">
<caret line="33" column="7" selection-start-line="33" selection-start-column="7" selection-end-line="33" selection-end-column="7" />
<folding>
<element signature="e#0#53#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="http://localhost:3007/Users/Nigel/Documents/Trustie_on_Blockchain/back_work/Trustie/test/forgeplus-react/webpack/bootstrap">
<provider selected="true" editor-type-id="httpFileEditor" />
</entry>
@ -966,16 +874,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/forge/users/BlockchainTransfer.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1496">
<caret line="94" column="46" selection-start-line="94" selection-start-column="20" selection-end-line="94" selection-end-column="46" />
<folding>
<element signature="e#0#80#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="8160">
@ -993,16 +891,6 @@
<entry file="file://$PROJECT_DIR$/package-lock.json">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/src/forge/users/BlockchainExHistory.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="255">
<caret line="20" column="4" selection-start-line="20" selection-start-column="4" selection-end-line="30" selection-end-column="6" />
<folding>
<element signature="e#0#53#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/forge/Order/order.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="5814">
@ -1024,16 +912,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/AppConfig.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="120">
<caret line="35" column="31" selection-start-line="35" selection-start-column="22" selection-end-line="35" selection-end-column="31" />
<folding>
<element signature="e#0#26#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/forge/users/Infos.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="179">
@ -1044,15 +922,120 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/node_modules/@types/react/index.d.ts">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="256">
<caret line="498" column="8" selection-start-line="498" selection-start-column="8" selection-end-line="498" selection-end-column="8" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/build/css/edu-purge.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="154">
<caret line="1850" column="1" selection-start-line="1850" selection-start-column="1" selection-end-line="1850" selection-end-column="1" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/react/build/static/css/51.57607036.chunk.css">
<provider selected="true" editor-type-id="text-editor">
<state>
<caret column="6533" selection-start-column="6533" selection-end-column="6533" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/forge/New/new.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="372">
<caret line="58" column="13" selection-start-line="58" selection-start-column="1" selection-end-line="58" selection-end-column="13" />
</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="205">
<caret line="263" column="2" selection-start-line="263" selection-start-column="2" selection-end-line="263" selection-end-column="2" />
<state relative-caret-position="306">
<caret line="18" column="25" lean-forward="true" selection-start-line="18" selection-start-column="25" selection-end-line="18" selection-end-column="25" />
<folding>
<element signature="e#0#41#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/AppConfig.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="120">
<caret line="35" column="31" selection-start-line="35" selection-start-column="22" selection-end-line="35" selection-end-column="31" />
<folding>
<element signature="e#0#26#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/forge/users/BlockchainExList.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="197">
<caret line="59" column="17" lean-forward="true" selection-start-line="59" selection-start-column="17" selection-end-line="59" selection-end-column="17" />
<folding>
<element signature="e#0#53#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/forge/users/BlockchainExMenu.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="337">
<caret line="20" column="60" lean-forward="true" selection-start-line="20" selection-start-column="60" selection-end-line="20" selection-end-column="60" />
<folding>
<element signature="e#0#53#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/forge/users/BlockchainExCre.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="278">
<caret line="150" column="1" lean-forward="true" selection-start-line="150" selection-start-column="1" selection-end-line="150" selection-end-column="1" />
<folding>
<element signature="e#0#53#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/forge/users/BlockchainExHistory.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="122">
<caret line="41" column="54" selection-start-line="41" selection-start-column="35" selection-end-line="41" selection-end-column="54" />
<folding>
<element signature="e#0#53#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/forge/users/BlockchainExVerify.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="253">
<caret line="94" column="7" lean-forward="true" selection-start-line="94" selection-start-column="7" selection-end-line="94" selection-end-column="7" />
<folding>
<element signature="e#0#53#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/forge/users/BlockchainTransfer.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="146">
<caret line="90" column="47" selection-start-line="90" selection-start-column="47" selection-end-line="90" selection-end-column="47" />
<folding>
<element signature="e#0#80#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/forge/users/Index.scss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="196">
<caret line="138" column="11" selection-start-line="138" selection-start-column="11" selection-end-line="138" selection-end-column="11" />
</state>
</provider>
</entry>
</component>
</project>

19
src/forge/New/Index.js
View File

@ -46,7 +46,8 @@ class Index extends Component {
project_category_name: undefined,
license_name: undefined,
ignore_name: undefined,
descNum:0
descNum:0,
show_div:"hidden",
}
}
componentDidMount = () => {
@ -259,7 +260,15 @@ class Index extends Component {
// add by zxh: handleBlockchainChange
handleBlockchainChange = (event) => {
console.log("here need the change of display")
if (this.state.show_div == 'hidden') {
this.setState({
show_div: "visible"
});
} else {
this.setState({
show_div: "hidden"
});
}
}
changeDesc=(e)=>{
@ -516,12 +525,13 @@ class Index extends Component {
className="privatePart"
ref={(blockchain_item => {this.blockchain_item = blockchain_item})}
>
<div class="div_flex_row" style={{visibility: this.state.show_div == "visible" ? "visible": "hidden"}}>
{getFieldDecorator('blockchain_token_all', {
rules: [{
required: false, message: '请填写项目token总数(单位:枚)'
}],
})(
<Input placeholder="请填写项目token总数(单位:枚)" />
<Input type={'number'} min={0} step={1} placeholder="请填写项目token总数(单位:枚)" />
)}
{getFieldDecorator('blockchain_init_token', {
@ -529,8 +539,9 @@ class Index extends Component {
required: false, message: '请填写项目创始人获取token总数(单位：枚)'
}],
})(
<Input placeholder="请填写项目创始人获去总token的百分比(%)" />
<Input type={'number'} min={0} max={100} step={1} placeholder="请填写项目创始人获去总token的百分比(%)" />
)}
</div>
</Form.Item>
{

5
src/forge/New/new.css
View File

@ -54,4 +54,9 @@
.newContent_inline > .ant-form-item:nth-child(2){
margin-left:0px
}
}
.div_flex_row {
display: flex;
flex-direction: row;
}

20
src/forge/users/BlockchainExCre.jsx
View File

@ -100,7 +100,7 @@ function BlockchainExCreate(props){
return(
<div style={{minHeight:"400px"}}>
<span className="authTag">
<span className="blockchain_proj_select ml20">
<Select
id = {'select_project'}
style={{width: "220px"}}
@ -111,29 +111,21 @@ function BlockchainExCreate(props){
</Select>
</span>
<span className="authTag">
<span>
<Input
id={"input_project"}
hidden={true}
/>
</span>
<span className="authTag">
<span>
<Input
id={"input_project"}
hidden={true}
/>
</span>
{/*<span className="authTag">*/}
{/*<Input*/}
{/* id={"input_description"}*/}
{/* placeholder={"输入交易描述"}*/}
{/* hidden={true}*/}
{/*/>*/}
{/*</span>*/}
<span className="authTag">
<span className="blockchain_input_num ml20">
<Input
type={'number'}
id={"token_num"}
@ -144,7 +136,7 @@ function BlockchainExCreate(props){
/>
</span>
<span className="authTag">
<span className="blockchain_input_num ml20">
<Input
id={"money"}
placeholder={"输入售卖金额"}
@ -152,7 +144,7 @@ function BlockchainExCreate(props){
/>
</span>
<Button hidden={true} id='submit_btn' className="primary" onClick={() => {createTrade(user.user_id)}}>确认</Button>
<Button hidden={true} id='submit_btn' className="primary ml20" onClick={() => {createTrade(user.user_id)}}>确认</Button>
</div>
)

23
src/forge/users/BlockchainExHistory.jsx
View File

@ -36,17 +36,28 @@ function BlockchainExHistory(props){
{
list && list.length > 0 ?
<ul className="CIList">
<li>
<span>
<span hidden={true}></span>
<span className="blockchain_username ml20">{"卖家名"}</span>
<span className="blockchain_proj ml20">{"项目创建者/项目名"}</span>
<span className="blockchain_proj ml20">{"token数量:价值"}</span>
<span className="blockchain_username ml20">{"买家名"}</span>
<span className="blockchain_time ml20">{"交易创建时间"}</span>
<span className="blockchain_time ml20">{"交易截止时间"}</span>
</span>
</li>
{list.map((item,key)=>{
return(
<li key={key}>
<span>
<span id={key} hidden={true}>{item[3].id}</span>
<span className="authTag green ml20">{item[0].login}</span>
<span className="authTag green ml20">{item[1].login + "/" + item[2].name}</span>
<span className="authTag green ml20">{item[3].token_num + ":" + item[3].money}</span>
<span className="authTag red ml20">{item[4].login}</span>
<span className="authTag red ml20">{moment(item[3].created_at).format('YYYY-MM-DD HH:mm:ss')}</span>
<span className="authTag red ml20">{moment(item[3].updated_at).format('YYYY-MM-DD HH:mm:ss')}</span>
<span className="blockchain_username ml20">{item[0].login}</span>
<span className="blockchain_proj ml20">{item[1].login + "/" + item[2].name}</span>
<span className="blockchain_proj ml20">{item[3].token_num + ":" + item[3].money}</span>
<span className="blockchain_username ml20">{item[4].login}</span>
<span className="blockchain_time ml20">{moment(item[3].created_at).format('YYYY-MM-DD HH:mm:ss')}</span>
<span className="blockchain_time ml20">{moment(item[3].updated_at).format('YYYY-MM-DD HH:mm:ss')}</span>
</span>
</li>
)

20
src/forge/users/BlockchainExList.jsx
View File

@ -49,15 +49,27 @@ function BlockchainExList(props){
{
list && list.length > 0 ?
<ul className="CIList">
<li>
<span>
<span hidden={true}></span>
<span className="blockchain_username ml20">卖家名</span>
<span className="blockchain_proj ml20">项目创建者/项目名</span>
<span className="blockchain_balance ml20">token数</span>
<span className="blockchain_balance ml20">售价</span>
</span>
{
<Button hidden={true}>交易</Button>
}
</li>
{list.map((item,key)=>{
return(
<li key={key}>
<span>
<span id={key} hidden={true}>{item[3].id}</span>
<span className="authTag green ml20">{item[0].login}</span>
<span className="authTag green ml20">{item[1].login + "/" + item[2].name}</span>
<span className="authTag green ml20">{item[3].token_num}</span>
<span className="authTag red ml20">{item[3].money}</span>
<span className="blockchain_username ml20">{item[0].login}</span>
<span className="blockchain_proj ml20">{item[1].login + "/" + item[2].name}</span>
<span className="blockchain_balance ml20">{item[3].token_num}</span>
<span className="blockchain_balance ml20">{item[3].money}</span>
</span>
{
<Popconfirm

25
src/forge/users/BlockchainExVerify.jsx
View File

@ -51,16 +51,31 @@ function BlockchainExVerify(props){
{
list && list.length > 0 ?
<ul className="CIList">
<li>
<span>
<span hidden={true}></span>
<span className="blockchain_username ml20">卖家名</span>
<span className="blockchain_proj ml20">项目创建者/项目名</span>
<span className="blockchain_proj ml20">token数量:价值</span>
<span className="blockchain_username ml20">买家名</span>
<span className="blockchain_time ml20">交易时间</span>
</span>
{
<Button hidden={true}></Button>
}
</li>
{list.map((item,key)=>{
return(
<li key={key}>
<span>
<span id={key} hidden={true}>{item[3].id}</span>
<span className="authTag green ml20">{item[0].login}</span>
<span className="authTag green ml20">{item[1].login + "/" + item[2].name}</span>
<span className="authTag green ml20">{item[3].token_num + ":" + item[3].token_num}</span>
<span className="authTag red ml20">{item[4].login}</span>
<span className="authTag red ml20">{moment(item[3].created_at).format('YYYY-MM-DD HH:mm:ss')}</span>
<span className="blockchain_username ml20">{item[0].login}</span>
<span className="blockchain_proj ml20">{item[1].login + "/" + item[2].name}</span>
<span className="blockchain_proj ml20">{item[3].token_num + ":" + item[3].money}</span>
<span className="blockchain_username ml20">{item[4].login}</span>
<span className="blockchain_time ml20">{moment(item[3].created_at).format('YYYY-MM-DD HH:mm:ss')}</span>
</span>
{
<Popconfirm

17
src/forge/users/BlockchainTransfer.jsx
View File

@ -86,15 +86,22 @@ function BlockchainTransfer(props){
{
status == 0 && list && list.length > 0 ?
<ul className="BalanceList">
<li>
<span className="blockchain_proj green ml20">项目创建者/项目名</span>
<span className="blockchain_balance green ml20">token总量</span>
<span className="blockchain_input_to ml20">目标转账用户</span>
<span className="blockchain_input_num ml20">转账token数量</span>
<Button hidden={true}></Button>
</li>
{list.map((item,index)=>{
return(
<li key={index}>
<Form>
<span className="authTag green ml20">{item[0].login + "/" + item[1].name}</span>
<span className="authTag green ml20">{item[2]}</span>
<span className="authTag"><Input type="text" placeholder={"请输入转给哪个用户(login)"} name={"transfer_login"} id={"login_"+index} /></span>
<span className="authTag"><Input type="text" placeholder={"请输入转账token数量"} name={"transfer_amount"} id={"amount_"+index} /></span>
<Button className="primary" onClick={() => {submit(item[0], item[1], item[2], index)}}>确认</Button>
<span className="blockchain_proj green ml20">{item[0].login + "/" + item[1].name}</span>
<span className="blockchain_balance green ml20">{item[2]}</span>
<span className="blockchain_input_to ml20"><Input type="text" placeholder={"请输入转给哪个用户(login)"} name={"transfer_login"} id={"login_"+index} /></span>
<span className="blockchain_input_num ml20"><Input type="text" placeholder={"请输入转账token数量"} name={"transfer_amount"} id={"amount_"+index} /></span>
<Button className="primary ml20" onClick={() => {submit(item[0], item[1], item[2], index)}}>确认</Button>
</Form>
</li>
)

42
src/forge/users/Index.scss
View File

@ -126,6 +126,48 @@ ul.ant-menu.menuStyle{
color: #28BD6C;
}
}
.blockchain_proj{
display: inline-block;
font-size: 12px;
height: 22px;
width: 150px;
}
.blockchain_balance{
display: inline-block;
font-size: 12px;
height: 22px;
width: 60px;
}
.blockchain_input_to{
display: inline-block;
font-size: 12px;
height: 40px;
width: 150px;
}
.blockchain_input_num{
display: inline-block;
font-size: 12px;
height: 40px;
width: 150px;
}
.blockchain_proj_select{
display: inline-block;
font-size: 12px;
height: 40px;
width: 220px;
}
.blockchain_username{
display: inline-block;
font-size: 12px;
height: 40px;
width: 60px;
}
.blockchain_time{
display: inline-block;
font-size: 12px;
height: 40px;
width: 130px;
}
.CIList{
padding:0px 30px;
min-height: 400px;