m52mxtq3o
/
educoder
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

修改部分bug

Browse Source
forge
dingyongkang 5 years ago
parent 5f36f21e53 406f8f17f6
commit 094d71231e
41 changed files with 333983 additions and 22 deletions
Show Stats Download Patch File Download Diff File

6
app/controllers/issues_controller.rb
Unescape View File

@ -306,6 +306,7 @@ class IssuesController < ApplicationController
IssueTagsRelate.create!(issue_id: @new_issue.id, issue_tag_id: tag)
end
end
@new_issue.project_trends.create(user_id: current_user.id, project_id: @project.id, action_type: "create")
@status = 1
else
@status = -1
@ -323,9 +324,12 @@ class IssuesController < ApplicationController
end
if @issue.update_attribute(:status_id, type)
if type == 5
@issue.project_trends.create(user_id: current_user.id, project_id: @project.id, action_type: "close")
# @issue.project_trends.create(user_id: current_user.id, project_id: @project.id, action_type: "close")
@issue&.project_trends&.update_all(action_type: "close")
@issue.issue_times.update_all(end_time: Time.now)
else
@issue&.project_trends&.update_all(action_type: "create")
version = @issue&.version
if version.present?
percent = version.issues_count == 0 ? 0.0 : ((version.closed_issues_count - 1) / version.issues_count)

4
app/controllers/project_trends_controller.rb
Unescape View File

@ -19,11 +19,11 @@ class ProjectTrendsController < ApplicationController
end
if check_type.present?
project_trends = project_trends.where(trend_type: check_type.to_s.titleize)
project_trends = project_trends.where(trend_type: check_type.to_s.strip)
end
if check_status.present?
project_trends = project_trends.where(action_type: check_status.to_s)
project_trends = project_trends.where(action_type: check_status.to_s.strip)
end
project_trends = project_trends.order("created_at desc")

32
app/controllers/pull_requests_controller.rb
Unescape View File

@ -2,7 +2,7 @@ class PullRequestsController < ApplicationController
before_action :require_login
before_action :find_project
before_action :set_repository
before_action :find_pull_request, except: [:index, :new, :create]
before_action :find_pull_request, except: [:index, :new, :create, :check_can_merge]
include TagChosenHelper
include ApplicationHelper
@ -96,8 +96,8 @@ class PullRequestsController < ApplicationController
project_id: @project.id,
subject: params[:title],
description: params[:body],
assigned_to_id: params[:assigned_to_id].to_s,
fixed_version_id: params[:fixed_version_id].to_i,
assigned_to_id: params[:assigned_to_id],
fixed_version_id: params[:fixed_version_id],
issue_tags_value: params[:issue_tag_ids].present? ? params[:issue_tag_ids].join(",") : "",
issue_classify: "pull_request",
issue_type: params[:issue_type] || "1",
@ -278,7 +278,9 @@ class PullRequestsController < ApplicationController
}
merge_pr = Gitea::PullRequest::MergeService.new(current_user, @repository.try(:identifier), @pull_request.try(:gpid), requests_params).call
if @pull_request.update_attribute(:status, 1) && merge_pr
@pull_request.project_trends.create(user_id: current_user.id, project_id: @project.id, action_type: "merge")
# @pull_request.project_trends.create(user_id: current_user.id, project_id: @project.id, action_type: "merge")
@pull_request&.project_trends&.update_all(action_type: "close")
@issue.custom_journal_detail("merge", "", "该合并请求已被合并")
normal_status(1, "合并成功")
else
@ -343,7 +345,27 @@ class PullRequestsController < ApplicationController
end
end
def check_can_merge
target_head = params[:head] #源分支
target_base = params[:base] #目标分支
if target_head.blank? || target_base.blank?
normal_status(-1, "请选择分支。")
elsif target_head === target_base
normal_status(-1, "分支内容相同，无需创建合并请求。")
else
can_merge = @project&.pull_requests.where(user_id: current_user&.id, head: target_head, base: target_base, status: 0)
if can_merge.present?
render json: {
status: -2,
message: "在这些分支之间的合并请求已存在",
pull_request_id: can_merge.first.id,
pull_request_name: can_merge.first.try(:title)
}
else
normal_status(0, "可以合并")
end
end
end
private

2
app/views/users/get_navigation_info.json.jbuilder
Unescape View File

@ -41,7 +41,7 @@ json.top do
json.old_url @old_domain
# 云上实验室管理权限
json.laboratory_user current_laboratory&.laboratory_users.exists?(user_id: @user&.id) || @user&.admin_or_business?
json.laboratory_user @user&.admin_or_business? || current_laboratory&.laboratory_users.exists?(user_id: @user&.id)
end
json.down do

3
config/routes.rb
Unescape View File

@ -45,6 +45,9 @@ Rails.application.routes.draw do
post :pr_merge
post :check_merge
end
collection do
post :check_can_merge
end
end
resources :version_releases, only: [:index,:new, :create, :edit, :update, :destroy]
resources :project_trends, only: [:index, :create]

364
public/react/build/asset-manifest.json
Unescape View File

@ -1,4 +1,5 @@
{
<<<<<<< HEAD
"./static/js/0.fe96d2ba.chunk.js": "./static/js/0.fe96d2ba.chunk.js",
"./static/js/1.18dba0e3.chunk.js": "./static/js/1.18dba0e3.chunk.js",
"./static/js/10.5620e669.chunk.js": "./static/js/10.5620e669.chunk.js",
@ -360,4 +361,367 @@
"static\\media\\rc-tree.png": "static/media/rc-tree.776c7fe6.png",
"static\\media\\skzbdx.png": "static/media/skzbdx.01cb5862.png",
"static\\media\\teach_ex.jpg": "static/media/teach_ex.a415d7a9.jpg"
=======
"./static/js/0.3499dbdb.chunk.js": "./static/js/0.3499dbdb.chunk.js",
"./static/js/1.ba3dba4f.chunk.js": "./static/js/1.ba3dba4f.chunk.js",
"./static/js/10.c31bfdb0.chunk.js": "./static/js/10.c31bfdb0.chunk.js",
"./static/js/100.04603361.chunk.js": "./static/js/100.04603361.chunk.js",
"./static/js/101.f017f44e.chunk.js": "./static/js/101.f017f44e.chunk.js",
"./static/js/102.3fd09fe5.chunk.js": "./static/js/102.3fd09fe5.chunk.js",
"./static/js/103.7ac9c928.chunk.js": "./static/js/103.7ac9c928.chunk.js",
"./static/js/104.57b33ca6.chunk.js": "./static/js/104.57b33ca6.chunk.js",
"./static/js/105.425915af.chunk.js": "./static/js/105.425915af.chunk.js",
"./static/js/106.5a7f1794.chunk.js": "./static/js/106.5a7f1794.chunk.js",
"./static/js/107.e90e0fb8.chunk.js": "./static/js/107.e90e0fb8.chunk.js",
"./static/js/108.a761ed62.chunk.js": "./static/js/108.a761ed62.chunk.js",
"./static/js/109.7c4e13dd.chunk.js": "./static/js/109.7c4e13dd.chunk.js",
"./static/js/11.c18648a5.chunk.js": "./static/js/11.c18648a5.chunk.js",
"./static/js/110.cf85c660.chunk.js": "./static/js/110.cf85c660.chunk.js",
"./static/js/111.b123ff38.chunk.js": "./static/js/111.b123ff38.chunk.js",
"./static/js/112.7277a9f5.chunk.js": "./static/js/112.7277a9f5.chunk.js",
"./static/js/113.70b65335.chunk.js": "./static/js/113.70b65335.chunk.js",
"./static/js/114.8df5b49f.chunk.js": "./static/js/114.8df5b49f.chunk.js",
"./static/js/115.bf16e172.chunk.js": "./static/js/115.bf16e172.chunk.js",
"./static/js/116.baeee89f.chunk.js": "./static/js/116.baeee89f.chunk.js",
"./static/js/117.cc05f636.chunk.js": "./static/js/117.cc05f636.chunk.js",
"./static/js/118.857c2217.chunk.js": "./static/js/118.857c2217.chunk.js",
"./static/js/119.07904e71.chunk.js": "./static/js/119.07904e71.chunk.js",
"./static/js/12.6f96b71b.chunk.js": "./static/js/12.6f96b71b.chunk.js",
"./static/js/120.bf90dce4.chunk.js": "./static/js/120.bf90dce4.chunk.js",
"./static/js/121.a49174bd.chunk.js": "./static/js/121.a49174bd.chunk.js",
"./static/js/122.17b804b2.chunk.js": "./static/js/122.17b804b2.chunk.js",
"./static/js/123.995606e5.chunk.js": "./static/js/123.995606e5.chunk.js",
"./static/js/124.13b7722f.chunk.js": "./static/js/124.13b7722f.chunk.js",
"./static/js/125.cd60d55a.chunk.js": "./static/js/125.cd60d55a.chunk.js",
"./static/js/126.cdbe58e2.chunk.js": "./static/js/126.cdbe58e2.chunk.js",
"./static/js/127.88517989.chunk.js": "./static/js/127.88517989.chunk.js",
"./static/js/128.bde9db79.chunk.js": "./static/js/128.bde9db79.chunk.js",
"./static/js/129.1af889c1.chunk.js": "./static/js/129.1af889c1.chunk.js",
"./static/js/13.33b5f814.chunk.js": "./static/js/13.33b5f814.chunk.js",
"./static/js/130.dad6a32f.chunk.js": "./static/js/130.dad6a32f.chunk.js",
"./static/js/131.52e9efd9.chunk.js": "./static/js/131.52e9efd9.chunk.js",
"./static/js/132.6189ed52.chunk.js": "./static/js/132.6189ed52.chunk.js",
"./static/js/133.cd8230a4.chunk.js": "./static/js/133.cd8230a4.chunk.js",
"./static/js/134.d3ca6526.chunk.js": "./static/js/134.d3ca6526.chunk.js",
"./static/js/135.c7708f2c.chunk.js": "./static/js/135.c7708f2c.chunk.js",
"./static/js/136.1f0535b3.chunk.js": "./static/js/136.1f0535b3.chunk.js",
"./static/js/137.c2b3fdce.chunk.js": "./static/js/137.c2b3fdce.chunk.js",
"./static/js/138.714743e3.chunk.js": "./static/js/138.714743e3.chunk.js",
"./static/js/139.c9131191.chunk.js": "./static/js/139.c9131191.chunk.js",
"./static/js/14.3129051e.chunk.js": "./static/js/14.3129051e.chunk.js",
"./static/js/140.f300f141.chunk.js": "./static/js/140.f300f141.chunk.js",
"./static/js/141.148aa7ee.chunk.js": "./static/js/141.148aa7ee.chunk.js",
"./static/js/142.87d7a1ae.chunk.js": "./static/js/142.87d7a1ae.chunk.js",
"./static/js/143.c7359bf6.chunk.js": "./static/js/143.c7359bf6.chunk.js",
"./static/js/144.ab25100c.chunk.js": "./static/js/144.ab25100c.chunk.js",
"./static/js/145.9e977cc1.chunk.js": "./static/js/145.9e977cc1.chunk.js",
"./static/js/146.e623a54e.chunk.js": "./static/js/146.e623a54e.chunk.js",
"./static/js/147.114cf540.chunk.js": "./static/js/147.114cf540.chunk.js",
"./static/js/148.32825ae6.chunk.js": "./static/js/148.32825ae6.chunk.js",
"./static/js/149.8f818a63.chunk.js": "./static/js/149.8f818a63.chunk.js",
"./static/js/15.777d35a0.chunk.js": "./static/js/15.777d35a0.chunk.js",
"./static/js/150.2d8568a9.chunk.js": "./static/js/150.2d8568a9.chunk.js",
"./static/js/151.3cbd58d9.chunk.js": "./static/js/151.3cbd58d9.chunk.js",
"./static/js/152.25096064.chunk.js": "./static/js/152.25096064.chunk.js",
"./static/js/153.0579404a.chunk.js": "./static/js/153.0579404a.chunk.js",
"./static/js/154.6661c864.chunk.js": "./static/js/154.6661c864.chunk.js",
"./static/js/155.3185ccd2.chunk.js": "./static/js/155.3185ccd2.chunk.js",
"./static/js/156.114acd0e.chunk.js": "./static/js/156.114acd0e.chunk.js",
"./static/js/157.01fef202.chunk.js": "./static/js/157.01fef202.chunk.js",
"./static/js/158.bfe089a5.chunk.js": "./static/js/158.bfe089a5.chunk.js",
"./static/js/159.456c280b.chunk.js": "./static/js/159.456c280b.chunk.js",
"./static/js/16.ec4dcede.chunk.js": "./static/js/16.ec4dcede.chunk.js",
"./static/js/160.cf5a19f0.chunk.js": "./static/js/160.cf5a19f0.chunk.js",
"./static/js/161.1a1a88fa.chunk.js": "./static/js/161.1a1a88fa.chunk.js",
"./static/js/162.4a3db237.chunk.js": "./static/js/162.4a3db237.chunk.js",
"./static/js/163.3b0f2188.chunk.js": "./static/js/163.3b0f2188.chunk.js",
"./static/js/164.29b4fe7a.chunk.js": "./static/js/164.29b4fe7a.chunk.js",
"./static/js/165.13f04d92.chunk.js": "./static/js/165.13f04d92.chunk.js",
"./static/js/166.1b56ef09.chunk.js": "./static/js/166.1b56ef09.chunk.js",
"./static/js/167.a991482c.chunk.js": "./static/js/167.a991482c.chunk.js",
"./static/js/168.e890d0c2.chunk.js": "./static/js/168.e890d0c2.chunk.js",
"./static/js/169.04ceadc5.chunk.js": "./static/js/169.04ceadc5.chunk.js",
"./static/js/17.eaa7969b.chunk.js": "./static/js/17.eaa7969b.chunk.js",
"./static/js/170.f52e6f5d.chunk.js": "./static/js/170.f52e6f5d.chunk.js",
"./static/js/171.4b98ee6a.chunk.js": "./static/js/171.4b98ee6a.chunk.js",
"./static/js/172.6b0207aa.chunk.js": "./static/js/172.6b0207aa.chunk.js",
"./static/js/173.2709a7bb.chunk.js": "./static/js/173.2709a7bb.chunk.js",
"./static/js/174.9c9c4f81.chunk.js": "./static/js/174.9c9c4f81.chunk.js",
"./static/js/175.1c50cd8c.chunk.js": "./static/js/175.1c50cd8c.chunk.js",
"./static/js/176.6ccf4497.chunk.js": "./static/js/176.6ccf4497.chunk.js",
"./static/js/177.5c7bfa2d.chunk.js": "./static/js/177.5c7bfa2d.chunk.js",
"./static/js/178.7c69aa3a.chunk.js": "./static/js/178.7c69aa3a.chunk.js",
"./static/js/179.d9a714d5.chunk.js": "./static/js/179.d9a714d5.chunk.js",
"./static/js/18.7e6684c8.chunk.js": "./static/js/18.7e6684c8.chunk.js",
"./static/js/180.abba8537.chunk.js": "./static/js/180.abba8537.chunk.js",
"./static/js/181.b3f1bcbc.chunk.js": "./static/js/181.b3f1bcbc.chunk.js",
"./static/js/182.2ed4f280.chunk.js": "./static/js/182.2ed4f280.chunk.js",
"./static/js/183.b34ed057.chunk.js": "./static/js/183.b34ed057.chunk.js",
"./static/js/184.c7d63100.chunk.js": "./static/js/184.c7d63100.chunk.js",
"./static/js/185.9c6c47a4.chunk.js": "./static/js/185.9c6c47a4.chunk.js",
"./static/js/186.ddb826e1.chunk.js": "./static/js/186.ddb826e1.chunk.js",
"./static/js/187.24d4cbd0.chunk.js": "./static/js/187.24d4cbd0.chunk.js",
"./static/js/188.c0498792.chunk.js": "./static/js/188.c0498792.chunk.js",
"./static/js/189.8cfa165e.chunk.js": "./static/js/189.8cfa165e.chunk.js",
"./static/js/19.7c4f80e8.chunk.js": "./static/js/19.7c4f80e8.chunk.js",
"./static/js/190.ae0f7daa.chunk.js": "./static/js/190.ae0f7daa.chunk.js",
"./static/js/191.d911f73d.chunk.js": "./static/js/191.d911f73d.chunk.js",
"./static/js/192.14c7d860.chunk.js": "./static/js/192.14c7d860.chunk.js",
"./static/js/193.28c25d4a.chunk.js": "./static/js/193.28c25d4a.chunk.js",
"./static/js/194.996d34c8.chunk.js": "./static/js/194.996d34c8.chunk.js",
"./static/js/195.4ab7e4b1.chunk.js": "./static/js/195.4ab7e4b1.chunk.js",
"./static/js/196.589ce802.chunk.js": "./static/js/196.589ce802.chunk.js",
"./static/js/197.4459eb3a.chunk.js": "./static/js/197.4459eb3a.chunk.js",
"./static/js/198.3f1fe6b4.chunk.js": "./static/js/198.3f1fe6b4.chunk.js",
"./static/js/199.cdc117e7.chunk.js": "./static/js/199.cdc117e7.chunk.js",
"./static/js/2.e76a0be2.chunk.js": "./static/js/2.e76a0be2.chunk.js",
"./static/js/20.c414c0cd.chunk.js": "./static/js/20.c414c0cd.chunk.js",
"./static/js/200.aedf4681.chunk.js": "./static/js/200.aedf4681.chunk.js",
"./static/js/201.67de5466.chunk.js": "./static/js/201.67de5466.chunk.js",
"./static/js/202.8dd9f7bd.chunk.js": "./static/js/202.8dd9f7bd.chunk.js",
"./static/js/203.319c605d.chunk.js": "./static/js/203.319c605d.chunk.js",
"./static/js/204.2149b491.chunk.js": "./static/js/204.2149b491.chunk.js",
"./static/js/205.424a329b.chunk.js": "./static/js/205.424a329b.chunk.js",
"./static/js/206.547aeeb8.chunk.js": "./static/js/206.547aeeb8.chunk.js",
"./static/js/207.b05232b2.chunk.js": "./static/js/207.b05232b2.chunk.js",
"./static/js/208.0f479a47.chunk.js": "./static/js/208.0f479a47.chunk.js",
"./static/js/209.77c8bcf8.chunk.js": "./static/js/209.77c8bcf8.chunk.js",
"./static/js/21.2f814f4e.chunk.js": "./static/js/21.2f814f4e.chunk.js",
"./static/js/210.2fb25a6f.chunk.js": "./static/js/210.2fb25a6f.chunk.js",
"./static/js/211.d11d4a8e.chunk.js": "./static/js/211.d11d4a8e.chunk.js",
"./static/js/212.ad235f49.chunk.js": "./static/js/212.ad235f49.chunk.js",
"./static/js/213.e56234a5.chunk.js": "./static/js/213.e56234a5.chunk.js",
"./static/js/214.c24d9bbe.chunk.js": "./static/js/214.c24d9bbe.chunk.js",
"./static/js/215.3f681e33.chunk.js": "./static/js/215.3f681e33.chunk.js",
"./static/js/216.8e1da5ad.chunk.js": "./static/js/216.8e1da5ad.chunk.js",
"./static/js/217.3cf5ac1f.chunk.js": "./static/js/217.3cf5ac1f.chunk.js",
"./static/js/218.01790dac.chunk.js": "./static/js/218.01790dac.chunk.js",
"./static/js/219.8f881b85.chunk.js": "./static/js/219.8f881b85.chunk.js",
"./static/js/22.4c8bb333.chunk.js": "./static/js/22.4c8bb333.chunk.js",
"./static/js/220.476d3205.chunk.js": "./static/js/220.476d3205.chunk.js",
"./static/js/221.e07afe2c.chunk.js": "./static/js/221.e07afe2c.chunk.js",
"./static/js/222.2dd41e75.chunk.js": "./static/js/222.2dd41e75.chunk.js",
"./static/js/223.133697da.chunk.js": "./static/js/223.133697da.chunk.js",
"./static/js/224.87ac7213.chunk.js": "./static/js/224.87ac7213.chunk.js",
"./static/js/225.60513ed2.chunk.js": "./static/js/225.60513ed2.chunk.js",
"./static/js/226.f24ef2b5.chunk.js": "./static/js/226.f24ef2b5.chunk.js",
"./static/js/227.c95f4494.chunk.js": "./static/js/227.c95f4494.chunk.js",
"./static/js/228.a3590254.chunk.js": "./static/js/228.a3590254.chunk.js",
"./static/js/229.b06fc465.chunk.js": "./static/js/229.b06fc465.chunk.js",
"./static/js/23.aebb159d.chunk.js": "./static/js/23.aebb159d.chunk.js",
"./static/js/230.1466387c.chunk.js": "./static/js/230.1466387c.chunk.js",
"./static/js/231.e729eb6c.chunk.js": "./static/js/231.e729eb6c.chunk.js",
"./static/js/232.ada6d07a.chunk.js": "./static/js/232.ada6d07a.chunk.js",
"./static/js/233.53ed68fe.chunk.js": "./static/js/233.53ed68fe.chunk.js",
"./static/js/234.b7b097d6.chunk.js": "./static/js/234.b7b097d6.chunk.js",
"./static/js/235.5b4a016d.chunk.js": "./static/js/235.5b4a016d.chunk.js",
"./static/js/236.e66dee6e.chunk.js": "./static/js/236.e66dee6e.chunk.js",
"./static/js/237.5e3e8f76.chunk.js": "./static/js/237.5e3e8f76.chunk.js",
"./static/js/238.9ce1b135.chunk.js": "./static/js/238.9ce1b135.chunk.js",
"./static/js/239.d22322bb.chunk.js": "./static/js/239.d22322bb.chunk.js",
"./static/js/24.22ef380a.chunk.js": "./static/js/24.22ef380a.chunk.js",
"./static/js/240.035fb15e.chunk.js": "./static/js/240.035fb15e.chunk.js",
"./static/js/241.ec5be75d.chunk.js": "./static/js/241.ec5be75d.chunk.js",
"./static/js/242.3234f588.chunk.js": "./static/js/242.3234f588.chunk.js",
"./static/js/243.b191f470.chunk.js": "./static/js/243.b191f470.chunk.js",
"./static/js/244.f056cbd6.chunk.js": "./static/js/244.f056cbd6.chunk.js",
"./static/js/245.bd0e380e.chunk.js": "./static/js/245.bd0e380e.chunk.js",
"./static/js/246.d2f9e8b1.chunk.js": "./static/js/246.d2f9e8b1.chunk.js",
"./static/js/247.6987bd76.chunk.js": "./static/js/247.6987bd76.chunk.js",
"./static/js/248.24cc4b10.chunk.js": "./static/js/248.24cc4b10.chunk.js",
"./static/js/249.f79eeb77.chunk.js": "./static/js/249.f79eeb77.chunk.js",
"./static/js/25.77a31c58.chunk.js": "./static/js/25.77a31c58.chunk.js",
"./static/js/250.6645f8b5.chunk.js": "./static/js/250.6645f8b5.chunk.js",
"./static/js/251.419ffe18.chunk.js": "./static/js/251.419ffe18.chunk.js",
"./static/js/252.ffc4dcb6.chunk.js": "./static/js/252.ffc4dcb6.chunk.js",
"./static/js/253.ebbeb4bd.chunk.js": "./static/js/253.ebbeb4bd.chunk.js",
"./static/js/254.863c48fc.chunk.js": "./static/js/254.863c48fc.chunk.js",
"./static/js/255.7fee5b41.chunk.js": "./static/js/255.7fee5b41.chunk.js",
"./static/js/256.cf5ef9a6.chunk.js": "./static/js/256.cf5ef9a6.chunk.js",
"./static/js/257.d4fdfb46.chunk.js": "./static/js/257.d4fdfb46.chunk.js",
"./static/js/258.94dc05e4.chunk.js": "./static/js/258.94dc05e4.chunk.js",
"./static/js/259.cc34b705.chunk.js": "./static/js/259.cc34b705.chunk.js",
"./static/js/26.8629bf8a.chunk.js": "./static/js/26.8629bf8a.chunk.js",
"./static/js/260.a2449e25.chunk.js": "./static/js/260.a2449e25.chunk.js",
"./static/js/261.4869bc3c.chunk.js": "./static/js/261.4869bc3c.chunk.js",
"./static/js/262.b49c1dfe.chunk.js": "./static/js/262.b49c1dfe.chunk.js",
"./static/js/263.7754f522.chunk.js": "./static/js/263.7754f522.chunk.js",
"./static/js/264.cc552723.chunk.js": "./static/js/264.cc552723.chunk.js",
"./static/js/265.32511fba.chunk.js": "./static/js/265.32511fba.chunk.js",
"./static/js/266.0a917fe9.chunk.js": "./static/js/266.0a917fe9.chunk.js",
"./static/js/267.1810bd59.chunk.js": "./static/js/267.1810bd59.chunk.js",
"./static/js/268.ed711356.chunk.js": "./static/js/268.ed711356.chunk.js",
"./static/js/269.97095b2d.chunk.js": "./static/js/269.97095b2d.chunk.js",
"./static/js/27.d9b546ab.chunk.js": "./static/js/27.d9b546ab.chunk.js",
"./static/js/270.c5795190.chunk.js": "./static/js/270.c5795190.chunk.js",
"./static/js/271.b5f939a0.chunk.js": "./static/js/271.b5f939a0.chunk.js",
"./static/js/272.6cd7ccc1.chunk.js": "./static/js/272.6cd7ccc1.chunk.js",
"./static/js/28.d40ce852.chunk.js": "./static/js/28.d40ce852.chunk.js",
"./static/js/29.4131983c.chunk.js": "./static/js/29.4131983c.chunk.js",
"./static/js/3.de444263.chunk.js": "./static/js/3.de444263.chunk.js",
"./static/js/30.bc14daba.chunk.js": "./static/js/30.bc14daba.chunk.js",
"./static/js/31.42d39ddd.chunk.js": "./static/js/31.42d39ddd.chunk.js",
"./static/js/32.fedb209c.chunk.js": "./static/js/32.fedb209c.chunk.js",
"./static/js/33.100ad33d.chunk.js": "./static/js/33.100ad33d.chunk.js",
"./static/js/34.4291681f.chunk.js": "./static/js/34.4291681f.chunk.js",
"./static/js/35.32a9f338.chunk.js": "./static/js/35.32a9f338.chunk.js",
"./static/js/36.cc9fadd2.chunk.js": "./static/js/36.cc9fadd2.chunk.js",
"./static/js/37.f93f5966.chunk.js": "./static/js/37.f93f5966.chunk.js",
"./static/js/38.c76fe557.chunk.js": "./static/js/38.c76fe557.chunk.js",
"./static/js/39.a01f0a61.chunk.js": "./static/js/39.a01f0a61.chunk.js",
"./static/js/4.0958c04a.chunk.js": "./static/js/4.0958c04a.chunk.js",
"./static/js/40.c50d2381.chunk.js": "./static/js/40.c50d2381.chunk.js",
"./static/js/41.ec606539.chunk.js": "./static/js/41.ec606539.chunk.js",
"./static/js/42.7b2def1b.chunk.js": "./static/js/42.7b2def1b.chunk.js",
"./static/js/43.7976cb68.chunk.js": "./static/js/43.7976cb68.chunk.js",
"./static/js/44.78e0c1d6.chunk.js": "./static/js/44.78e0c1d6.chunk.js",
"./static/js/45.3436b289.chunk.js": "./static/js/45.3436b289.chunk.js",
"./static/js/46.c33d233d.chunk.js": "./static/js/46.c33d233d.chunk.js",
"./static/js/47.17d47062.chunk.js": "./static/js/47.17d47062.chunk.js",
"./static/js/48.24657b0c.chunk.js": "./static/js/48.24657b0c.chunk.js",
"./static/js/49.e46d5cc5.chunk.js": "./static/js/49.e46d5cc5.chunk.js",
"./static/js/5.cd01e110.chunk.js": "./static/js/5.cd01e110.chunk.js",
"./static/js/50.b8619ef3.chunk.js": "./static/js/50.b8619ef3.chunk.js",
"./static/js/51.4e4c388a.chunk.js": "./static/js/51.4e4c388a.chunk.js",
"./static/js/52.8b8e5e72.chunk.js": "./static/js/52.8b8e5e72.chunk.js",
"./static/js/53.91568a63.chunk.js": "./static/js/53.91568a63.chunk.js",
"./static/js/54.90cc8cd1.chunk.js": "./static/js/54.90cc8cd1.chunk.js",
"./static/js/55.b2b3350f.chunk.js": "./static/js/55.b2b3350f.chunk.js",
"./static/js/56.626808d5.chunk.js": "./static/js/56.626808d5.chunk.js",
"./static/js/57.02b743ad.chunk.js": "./static/js/57.02b743ad.chunk.js",
"./static/js/58.e28554c1.chunk.js": "./static/js/58.e28554c1.chunk.js",
"./static/js/59.efe01636.chunk.js": "./static/js/59.efe01636.chunk.js",
"./static/js/6.c1f79042.chunk.js": "./static/js/6.c1f79042.chunk.js",
"./static/js/60.d8f242f9.chunk.js": "./static/js/60.d8f242f9.chunk.js",
"./static/js/61.e224f9b4.chunk.js": "./static/js/61.e224f9b4.chunk.js",
"./static/js/62.6820bcac.chunk.js": "./static/js/62.6820bcac.chunk.js",
"./static/js/63.9173054f.chunk.js": "./static/js/63.9173054f.chunk.js",
"./static/js/64.13689266.chunk.js": "./static/js/64.13689266.chunk.js",
"./static/js/65.1d7f188b.chunk.js": "./static/js/65.1d7f188b.chunk.js",
"./static/js/66.be555ba2.chunk.js": "./static/js/66.be555ba2.chunk.js",
"./static/js/67.1a7c23f3.chunk.js": "./static/js/67.1a7c23f3.chunk.js",
"./static/js/68.8ee585ac.chunk.js": "./static/js/68.8ee585ac.chunk.js",
"./static/js/69.e2ef8b25.chunk.js": "./static/js/69.e2ef8b25.chunk.js",
"./static/js/7.770ff8da.chunk.js": "./static/js/7.770ff8da.chunk.js",
"./static/js/70.3383729d.chunk.js": "./static/js/70.3383729d.chunk.js",
"./static/js/71.79702eb4.chunk.js": "./static/js/71.79702eb4.chunk.js",
"./static/js/72.a6b7aea4.chunk.js": "./static/js/72.a6b7aea4.chunk.js",
"./static/js/73.d6726eb5.chunk.js": "./static/js/73.d6726eb5.chunk.js",
"./static/js/74.0c9dea9c.chunk.js": "./static/js/74.0c9dea9c.chunk.js",
"./static/js/75.df65888e.chunk.js": "./static/js/75.df65888e.chunk.js",
"./static/js/76.83b711d5.chunk.js": "./static/js/76.83b711d5.chunk.js",
"./static/js/77.f8e2311e.chunk.js": "./static/js/77.f8e2311e.chunk.js",
"./static/js/78.07c4d87a.chunk.js": "./static/js/78.07c4d87a.chunk.js",
"./static/js/79.71c1aaec.chunk.js": "./static/js/79.71c1aaec.chunk.js",
"./static/js/8.a7a7f0a8.chunk.js": "./static/js/8.a7a7f0a8.chunk.js",
"./static/js/80.ea6ef0c8.chunk.js": "./static/js/80.ea6ef0c8.chunk.js",
"./static/js/81.5ba1a813.chunk.js": "./static/js/81.5ba1a813.chunk.js",
"./static/js/82.3628e27a.chunk.js": "./static/js/82.3628e27a.chunk.js",
"./static/js/83.5140a660.chunk.js": "./static/js/83.5140a660.chunk.js",
"./static/js/84.72687a0e.chunk.js": "./static/js/84.72687a0e.chunk.js",
"./static/js/85.3a8dc8fb.chunk.js": "./static/js/85.3a8dc8fb.chunk.js",
"./static/js/86.00b6db75.chunk.js": "./static/js/86.00b6db75.chunk.js",
"./static/js/87.9a6684a6.chunk.js": "./static/js/87.9a6684a6.chunk.js",
"./static/js/88.d20bd270.chunk.js": "./static/js/88.d20bd270.chunk.js",
"./static/js/89.e8e3931d.chunk.js": "./static/js/89.e8e3931d.chunk.js",
"./static/js/9.a81e59fa.chunk.js": "./static/js/9.a81e59fa.chunk.js",
"./static/js/90.a33a0439.chunk.js": "./static/js/90.a33a0439.chunk.js",
"./static/js/91.35d08100.chunk.js": "./static/js/91.35d08100.chunk.js",
"./static/js/92.811d754b.chunk.js": "./static/js/92.811d754b.chunk.js",
"./static/js/93.9ca807cb.chunk.js": "./static/js/93.9ca807cb.chunk.js",
"./static/js/94.36dbd878.chunk.js": "./static/js/94.36dbd878.chunk.js",
"./static/js/95.0f6c972b.chunk.js": "./static/js/95.0f6c972b.chunk.js",
"./static/js/96.fe75753a.chunk.js": "./static/js/96.fe75753a.chunk.js",
"./static/js/97.3b4d4096.chunk.js": "./static/js/97.3b4d4096.chunk.js",
"./static/js/98.cc855f0c.chunk.js": "./static/js/98.cc855f0c.chunk.js",
"./static/js/99.a470bc24.chunk.js": "./static/js/99.a470bc24.chunk.js",
"main.css": "./static/css/main.c0718fb6.css",
"main.js": "./static/js/main.8a8db6c5.js",
"static/media/KaTeX_AMS-Regular.ttf": "static/media/KaTeX_AMS-Regular.aaf4eee9.ttf",
"static/media/KaTeX_AMS-Regular.woff": "static/media/KaTeX_AMS-Regular.7f06b4e3.woff",
"static/media/KaTeX_AMS-Regular.woff2": "static/media/KaTeX_AMS-Regular.e78e28b4.woff2",
"static/media/KaTeX_Caligraphic-Bold.ttf": "static/media/KaTeX_Caligraphic-Bold.021dd4dc.ttf",
"static/media/KaTeX_Caligraphic-Bold.woff": "static/media/KaTeX_Caligraphic-Bold.1e802ca9.woff",
"static/media/KaTeX_Caligraphic-Bold.woff2": "static/media/KaTeX_Caligraphic-Bold.4ec58bef.woff2",
"static/media/KaTeX_Caligraphic-Regular.ttf": "static/media/KaTeX_Caligraphic-Regular.d49f2d55.ttf",
"static/media/KaTeX_Caligraphic-Regular.woff": "static/media/KaTeX_Caligraphic-Regular.d3b46c3a.woff",
"static/media/KaTeX_Caligraphic-Regular.woff2": "static/media/KaTeX_Caligraphic-Regular.7edb53b6.woff2",
"static/media/KaTeX_Fraktur-Bold.ttf": "static/media/KaTeX_Fraktur-Bold.a31e7cba.ttf",
"static/media/KaTeX_Fraktur-Bold.woff": "static/media/KaTeX_Fraktur-Bold.c4c8cab7.woff",
"static/media/KaTeX_Fraktur-Bold.woff2": "static/media/KaTeX_Fraktur-Bold.d5b59ec9.woff2",
"static/media/KaTeX_Fraktur-Regular.ttf": "static/media/KaTeX_Fraktur-Regular.a48dad4f.ttf",
"static/media/KaTeX_Fraktur-Regular.woff": "static/media/KaTeX_Fraktur-Regular.b7d9c46b.woff",
"static/media/KaTeX_Fraktur-Regular.woff2": "static/media/KaTeX_Fraktur-Regular.32a5339e.woff2",
"static/media/KaTeX_Main-Bold.ttf": "static/media/KaTeX_Main-Bold.9ceff51b.ttf",
"static/media/KaTeX_Main-Bold.woff": "static/media/KaTeX_Main-Bold.22086eb5.woff",
"static/media/KaTeX_Main-Bold.woff2": "static/media/KaTeX_Main-Bold.8e1e01c4.woff2",
"static/media/KaTeX_Main-BoldItalic.ttf": "static/media/KaTeX_Main-BoldItalic.e8b44b99.ttf",
"static/media/KaTeX_Main-BoldItalic.woff": "static/media/KaTeX_Main-BoldItalic.4c57dbc4.woff",
"static/media/KaTeX_Main-BoldItalic.woff2": "static/media/KaTeX_Main-BoldItalic.284a17fe.woff2",
"static/media/KaTeX_Main-Italic.ttf": "static/media/KaTeX_Main-Italic.29c86397.ttf",
"static/media/KaTeX_Main-Italic.woff": "static/media/KaTeX_Main-Italic.99be0e10.woff",
"static/media/KaTeX_Main-Italic.woff2": "static/media/KaTeX_Main-Italic.e533d5a2.woff2",
"static/media/KaTeX_Main-Regular.ttf": "static/media/KaTeX_Main-Regular.5c94aef4.ttf",
"static/media/KaTeX_Main-Regular.woff": "static/media/KaTeX_Main-Regular.b741441f.woff",
"static/media/KaTeX_Main-Regular.woff2": "static/media/KaTeX_Main-Regular.5c734d78.woff2",
"static/media/KaTeX_Math-BoldItalic.ttf": "static/media/KaTeX_Math-BoldItalic.9a2834a9.ttf",
"static/media/KaTeX_Math-BoldItalic.woff": "static/media/KaTeX_Math-BoldItalic.b13731ef.woff",
"static/media/KaTeX_Math-BoldItalic.woff2": "static/media/KaTeX_Math-BoldItalic.d747bd1e.woff2",
"static/media/KaTeX_Math-Italic.ttf": "static/media/KaTeX_Math-Italic.291e76b8.ttf",
"static/media/KaTeX_Math-Italic.woff": "static/media/KaTeX_Math-Italic.f0303906.woff",
"static/media/KaTeX_Math-Italic.woff2": "static/media/KaTeX_Math-Italic.4ad08b82.woff2",
"static/media/KaTeX_SansSerif-Bold.ttf": "static/media/KaTeX_SansSerif-Bold.7dc027cb.ttf",
"static/media/KaTeX_SansSerif-Bold.woff": "static/media/KaTeX_SansSerif-Bold.3fb41955.woff",
"static/media/KaTeX_SansSerif-Bold.woff2": "static/media/KaTeX_SansSerif-Bold.6e0830be.woff2",
"static/media/KaTeX_SansSerif-Italic.ttf": "static/media/KaTeX_SansSerif-Italic.4059868e.ttf",
"static/media/KaTeX_SansSerif-Italic.woff": "static/media/KaTeX_SansSerif-Italic.727a9b0d.woff",
"static/media/KaTeX_SansSerif-Italic.woff2": "static/media/KaTeX_SansSerif-Italic.fba01c9c.woff2",
"static/media/KaTeX_SansSerif-Regular.ttf": "static/media/KaTeX_SansSerif-Regular.5c58d168.ttf",
"static/media/KaTeX_SansSerif-Regular.woff": "static/media/KaTeX_SansSerif-Regular.2555754a.woff",
"static/media/KaTeX_SansSerif-Regular.woff2": "static/media/KaTeX_SansSerif-Regular.d929cd67.woff2",
"static/media/KaTeX_Script-Regular.ttf": "static/media/KaTeX_Script-Regular.d12ea9ef.ttf",
"static/media/KaTeX_Script-Regular.woff": "static/media/KaTeX_Script-Regular.d524c9a5.woff",
"static/media/KaTeX_Script-Regular.woff2": "static/media/KaTeX_Script-Regular.755e2491.woff2",
"static/media/KaTeX_Size1-Regular.ttf": "static/media/KaTeX_Size1-Regular.7342d45b.ttf",
"static/media/KaTeX_Size1-Regular.woff": "static/media/KaTeX_Size1-Regular.08b5f00e.woff",
"static/media/KaTeX_Size1-Regular.woff2": "static/media/KaTeX_Size1-Regular.048c39cb.woff2",
"static/media/KaTeX_Size2-Regular.ttf": "static/media/KaTeX_Size2-Regular.eb130dcc.ttf",
"static/media/KaTeX_Size2-Regular.woff": "static/media/KaTeX_Size2-Regular.af24b0e4.woff",
"static/media/KaTeX_Size2-Regular.woff2": "static/media/KaTeX_Size2-Regular.81d6b8d5.woff2",
"static/media/KaTeX_Size3-Regular.ttf": "static/media/KaTeX_Size3-Regular.7e02a40c.ttf",
"static/media/KaTeX_Size3-Regular.woff": "static/media/KaTeX_Size3-Regular.0d892640.woff",
"static/media/KaTeX_Size3-Regular.woff2": "static/media/KaTeX_Size3-Regular.b311ca09.woff2",
"static/media/KaTeX_Size4-Regular.ttf": "static/media/KaTeX_Size4-Regular.ad767252.ttf",
"static/media/KaTeX_Size4-Regular.woff": "static/media/KaTeX_Size4-Regular.68895bb8.woff",
"static/media/KaTeX_Size4-Regular.woff2": "static/media/KaTeX_Size4-Regular.6a3255df.woff2",
"static/media/KaTeX_Typewriter-Regular.ttf": "static/media/KaTeX_Typewriter-Regular.25702356.ttf",
"static/media/KaTeX_Typewriter-Regular.woff": "static/media/KaTeX_Typewriter-Regular.3fe216d2.woff",
"static/media/KaTeX_Typewriter-Regular.woff2": "static/media/KaTeX_Typewriter-Regular.6cc31ea5.woff2",
"static/media/auth.png": "static/media/auth.43f1c749.png",
"static/media/banner_list.png": "static/media/banner_list.ad510bee.png",
"static/media/banner_sub.png": "static/media/banner_sub.c6034810.png",
"static/media/beian.png": "static/media/beian.d0289dc0.png",
"static/media/beijintulogontwo.png": "static/media/beijintulogontwo.245dc9e1.png",
"static/media/bg.jpg": "static/media/bg.88a774b5.jpg",
"static/media/firefox_icon.png": "static/media/firefox_icon.cfd87a8f.png",
"static/media/guihome1.png": "static/media/guihome1.eca5276e.png",
"static/media/guihome2.jpg": "static/media/guihome2.c65f40bf.jpg",
"static/media/guihome3.jpg": "static/media/guihome3.0e1dc34b.jpg",
"static/media/guihome4.jpg": "static/media/guihome4.6cc0d72b.jpg",
"static/media/guihome5.jpg": "static/media/guihome5.1ac2c872.jpg",
"static/media/guihome6.jpg": "static/media/guihome6.7fc4fe9d.jpg",
"static/media/internet-explorer@2x.png": "static/media/internet-explorer@2x.f122e0ab.png",
"static/media/job.png": "static/media/job.b2881c7d.png",
"static/media/logo.svg": "static/media/logo.c72d4a3b.svg",
"static/media/match_ad.jpg": "static/media/match_ad.4e957369.jpg",
"static/media/message.svg": "static/media/message.e7922cf2.svg",
"static/media/messagegrey.svg": "static/media/messagegrey.80d0b058.svg",
"static/media/mytc.png": "static/media/mytc.4ef5faf4.png",
"static/media/oj_banner.jpg": "static/media/oj_banner.25ca233e.jpg",
"static/media/passall.png": "static/media/passall.46817e26.png",
"static/media/passpart.png": "static/media/passpart.4aaf3e6b.png",
"static/media/rc-tree.png": "static/media/rc-tree.776c7fe6.png",
"static/media/skzbdx.png": "static/media/skzbdx.01cb5862.png",
"static/media/teach_ex.jpg": "static/media/teach_ex.a415d7a9.jpg"
>>>>>>> 406f8f17f6d8e53723c5921455fa4ef0715e3c50
}

4
public/react/build/index.html
Unescape View File

@ -24,7 +24,11 @@
_host = 'https://ali-cdn.educoder.net/react/build/'
}
document.write('<script type="text/javascript" src="' + _host + 'js/js_min_all.js"><\/script>');
<<<<<<< HEAD
document.write('<script type="text/javascript" src="' + _host + 'static/js/main.9229803d.js"><\/script>');
=======
document.write('<script type="text/javascript" src="' + _host + 'static/js/main.8a8db6c5.js"><\/script>');
>>>>>>> 406f8f17f6d8e53723c5921455fa4ef0715e3c50
})()
</script>
<script>!function(){var t=location.href;"3007"===window.location.port?-1!=t.indexOf("/tasks/")?(document.write('<script type="text/javascript" src="https://newweb.educoder.net/assets/kindeditor/kindeditor.js"><\/script>'),document.write('<script type="text/javascript" src="/react/build/js/create_kindeditor.js?v=1.1.1"><\/script>'),document.write('<script type="text/javascript" src="https://newweb.educoder.net/javascripts/educoder/edu_application.js"><\/script>')):-1!=t.indexOf("/paths/")&&document.write('<script type="text/javascript" src="https://newweb.educoder.net/javascripts/educoder/edu_application.js"><\/script>'):-1!=t.indexOf("/tasks/")?(document.write('<script type="text/javascript" src="/assets/kindeditor/kindeditor.js"><\/script>'),document.write('<script type="text/javascript" src="/react/build/js/create_kindeditor.js?v=1.1.1"><\/script>'),document.write('<script type="text/javascript" src="/javascripts/educoder/edu_application.js"><\/script>')):-1!=t.indexOf("/paths/")&&document.write('<script type="text/javascript" src="/javascripts/educoder/edu_application.js"><\/script>')}()</script><script type="text/javascript" src="https://cdn.bootcss.com/quill/1.3.7/quill.core.min.js"></script></body></html>

6
public/react/build/service-worker.js
View File

File diff suppressed because one or more lines are too long

5585
public/react/build/static/js/153.0579404a.chunk.js
View File

File diff suppressed because one or more lines are too long

3596
public/react/build/static/js/162.4a3db237.chunk.js
View File

File diff suppressed because one or more lines are too long

2
public/react/build/static/js/162.dd59a663.chunk.js
Unescape View File

@ -683,7 +683,7 @@ exports.push([module.i, ".trendsTop{padding-bottom:15px;border-bottom:1px solid
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__activity_css__ = __webpack_require__(3447);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__activity_css___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_2__activity_css__);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3_educoder__ = __webpack_require__(5);
var _createClass=function(){function defineProperties(target,props){for(var i=0;i<props.length;i++){var descriptor=props[i];descriptor.enumerable=descriptor.enumerable||false;descriptor.configurable=true;if("value"in descriptor)descriptor.writable=true;Object.defineProperty(target,descriptor.key,descriptor);}}return function(Constructor,protoProps,staticProps){if(protoProps)defineProperties(Constructor.prototype,protoProps);if(staticProps)defineProperties(Constructor,staticProps);return Constructor;};}();function _classCallCheck(instance,Constructor){if(!(instance instanceof Constructor)){throw new TypeError("Cannot call a class as a function");}}function _possibleConstructorReturn(self,call){if(!self){throw new ReferenceError("this hasn't been initialised - super() hasn't been called");}return call&&(typeof call==="object"||typeof call==="function")?call:self;}function _inherits(subClass,superClass){if(typeof superClass!=="function"&&superClass!==null){throw new TypeError("Super expression must either be null or a function, not "+typeof superClass);}subClass.prototype=Object.create(superClass&&superClass.prototype,{constructor:{value:subClass,enumerable:false,writable:true,configurable:true}});if(superClass)Object.setPrototypeOf?Object.setPrototypeOf(subClass,superClass):subClass.__proto__=superClass;}var ActivityItem=function(_Component){_inherits(ActivityItem,_Component);function ActivityItem(){_classCallCheck(this,ActivityItem);return _possibleConstructorReturn(this,(ActivityItem.__proto__||Object.getPrototypeOf(ActivityItem)).apply(this,arguments));}_createClass(ActivityItem,[{key:'render',value:function render(){var item=this.props.item;return __WEBPACK_IMPORTED_MODULE_0_react___default.a.createElement('div',{className:'activity_item'},__WEBPACK_IMPORTED_MODULE_0_react___default.a.createElement('div',{className:'flex1'},__WEBPACK_IMPORTED_MODULE_0_react___default.a.createElement('p',{className:'itemLine'},__WEBPACK_IMPORTED_MODULE_0_react___default.a.createElement(__WEBPACK_IMPORTED_MODULE_1_react_router_dom__["b" /* Link */],{to:'',className:'color-blue font-16'},item.name),__WEBPACK_IMPORTED_MODULE_0_react___default.a.createElement('span',{className:'activity_type'},item.trend_type)),__WEBPACK_IMPORTED_MODULE_0_react___default.a.createElement('p',{className:'itemLine mt15'},__WEBPACK_IMPORTED_MODULE_0_react___default.a.createElement('img',{alt:'',src:Object(__WEBPACK_IMPORTED_MODULE_3_educoder__["M" /* getImageUrl */])('images/'+item.user_avatar),className:'createImage'}),__WEBPACK_IMPORTED_MODULE_0_react___default.a.createElement('span',{className:'mr20'},item.user_name),__WEBPACK_IMPORTED_MODULE_0_react___default.a.createElement('span',{className:'color-grey-9'},'\u521B\u5EFA\u4E8E',__WEBPACK_IMPORTED_MODULE_0_react___default.a.createElement('span',{className:'ml2 color-grey-6'},item.created_at)))));}}]);return ActivityItem;}(__WEBPACK_IMPORTED_MODULE_0_react__["Component"]);/* harmony default export */ __webpack_exports__["a"] = (ActivityItem);
var _createClass=function(){function defineProperties(target,props){for(var i=0;i<props.length;i++){var descriptor=props[i];descriptor.enumerable=descriptor.enumerable||false;descriptor.configurable=true;if("value"in descriptor)descriptor.writable=true;Object.defineProperty(target,descriptor.key,descriptor);}}return function(Constructor,protoProps,staticProps){if(protoProps)defineProperties(Constructor.prototype,protoProps);if(staticProps)defineProperties(Constructor,staticProps);return Constructor;};}();function _classCallCheck(instance,Constructor){if(!(instance instanceof Constructor)){throw new TypeError("Cannot call a class as a function");}}function _possibleConstructorReturn(self,call){if(!self){throw new ReferenceError("this hasn't been initialised - super() hasn't been called");}return call&&(typeof call==="object"||typeof call==="function")?call:self;}function _inherits(subClass,superClass){if(typeof superClass!=="function"&&superClass!==null){throw new TypeError("Super expression must either be null or a function, not "+typeof superClass);}subClass.prototype=Object.create(superClass&&superClass.prototype,{constructor:{value:subClass,enumerable:false,writable:true,configurable:true}});if(superClass)Object.setPrototypeOf?Object.setPrototypeOf(subClass,superClass):subClass.__proto__=superClass;}var ActivityItem=function(_Component){_inherits(ActivityItem,_Component);function ActivityItem(){_classCallCheck(this,ActivityItem);return _possibleConstructorReturn(this,(ActivityItem.__proto__||Object.getPrototypeOf(ActivityItem)).apply(this,arguments));}_createClass(ActivityItem,[{key:'render',value:function render(){var item=this.props.item;return __WEBPACK_IMPORTED_MODULE_0_react___default.a.createElement('div',{className:'activity_item'},__WEBPACK_IMPORTED_MODULE_0_react___default.a.createElement('div',{className:'flex1'},__WEBPACK_IMPORTED_MODULE_0_react___default.a.createElement('p',{className:'itemLine'},__WEBPACK_IMPORTED_MODULE_0_react___default.a.createElement(__WEBPACK_IMPORTED_MODULE_1_react_router_dom__["b" /* Link */],{to:'',className:'color-blue font-16'},item.name),__WEBPACK_IMPORTED_MODULE_0_react___default.a.createElement('span',{className:'activity_type'},item.trend_type)),__WEBPACK_IMPORTED_MODULE_0_react___default.a.createElement('p',{className:'itemLine mt15'},__WEBPACK_IMPORTED_MODULE_0_react___default.a.createElement('img',{alt:'',src:Object(__WEBPACK_IMPORTED_MODULE_3_educoder__["M" /* getImageUrl */])('images/'+item.user_avatar),className:'createImage'}),__WEBPACK_IMPORTED_MODULE_0_react___default.a.createElement('span',{className:'mr20'},item.user_name),item.created_at&&__WEBPACK_IMPORTED_MODULE_0_react___default.a.createElement('span',{className:'color-grey-9'},'\u521B\u5EFA\u4E8E',__WEBPACK_IMPORTED_MODULE_0_react___default.a.createElement('span',{className:'ml2 color-grey-6'},item.created_at)))));}}]);return ActivityItem;}(__WEBPACK_IMPORTED_MODULE_0_react__["Component"]);/* harmony default export */ __webpack_exports__["a"] = (ActivityItem);
/***/ }),

3591
public/react/build/static/js/164.29b4fe7a.chunk.js
View File

File diff suppressed because one or more lines are too long

3573
public/react/build/static/js/166.1b56ef09.chunk.js
View File

File diff suppressed because one or more lines are too long

92745
public/react/build/static/js/53.91568a63.chunk.js
View File

File diff suppressed because one or more lines are too long

26268
public/react/build/static/js/59.efe01636.chunk.js
View File

File diff suppressed because one or more lines are too long

51
public/react/build/static/js/64.c89bfb86.chunk.js
View File

File diff suppressed because one or more lines are too long

53
public/react/build/static/js/65.0a148368.chunk.js
View File

File diff suppressed because one or more lines are too long

22614
public/react/build/static/js/66.be555ba2.chunk.js
View File

File diff suppressed because one or more lines are too long

14495
public/react/build/static/js/72.a6b7aea4.chunk.js
View File

File diff suppressed because one or more lines are too long

14495
public/react/build/static/js/73.d6726eb5.chunk.js
View File

File diff suppressed because one or more lines are too long

49
public/react/build/static/js/76.daabb3bd.chunk.js
View File

File diff suppressed because one or more lines are too long

49
public/react/build/static/js/77.fe2a7fea.chunk.js
View File

File diff suppressed because one or more lines are too long

55
public/react/build/static/js/83.40e40c65.chunk.js
View File

File diff suppressed because one or more lines are too long

15620
public/react/build/static/js/84.72687a0e.chunk.js
View File

File diff suppressed because one or more lines are too long

39
public/react/build/static/js/88.3f013859.chunk.js
View File

File diff suppressed because one or more lines are too long

38
public/react/build/static/js/89.d0d6e7b6.chunk.js
View File

File diff suppressed because one or more lines are too long

14215
public/react/build/static/js/89.e8e3931d.chunk.js
View File

File diff suppressed because one or more lines are too long

14213
public/react/build/static/js/90.a33a0439.chunk.js
View File

File diff suppressed because one or more lines are too long

39
public/react/build/static/js/90.e2c85912.chunk.js
View File

File diff suppressed because one or more lines are too long

14215
public/react/build/static/js/91.35d08100.chunk.js
View File

File diff suppressed because one or more lines are too long

33
public/react/build/static/js/93.84bb1d9c.chunk.js
View File

File diff suppressed because one or more lines are too long

13883
public/react/build/static/js/94.36dbd878.chunk.js
View File

File diff suppressed because one or more lines are too long

74031
public/react/build/static/js/main.8a8db6c5.js
View File

File diff suppressed because one or more lines are too long

4
public/react/build/static/js/main.9229803d.js
Unescape View File

@ -86,7 +86,11 @@
/******/ if (__webpack_require__.nc) {
/******/ script.setAttribute("nonce", __webpack_require__.nc);
/******/ }
<<<<<<< HEAD:public/react/build/static/js/main.9229803d.js
/******/ script.src = __webpack_require__.p + "./static/js/" + ({}[chunkId]||chunkId) + "." + {"0":"fe96d2ba","1":"18dba0e3","2":"0bacae5e","3":"6cbbae07","4":"c63d9965","5":"fd8b62d8","6":"98b5bf3e","7":"92d70e8b","8":"a013ea41","9":"eca44bd0","10":"5620e669","11":"6d39f416","12":"2f2d2efa","13":"8fdd8ac3","14":"07e1bb9f","15":"65fc5a9d","16":"7e47f63d","17":"e4ec8a64","18":"e319bff7","19":"edaa9bf6","20":"282e80b9","21":"5fbb861b","22":"3e803e38","23":"9df877a7","24":"4be424b7","25":"40f93d39","26":"c94a02c6","27":"9066d6d9","28":"82a28b14","29":"81749d5c","30":"5c4f7ef2","31":"91129c9c","32":"b083d9cf","33":"1970e5a8","34":"35f55fa0","35":"778c9ca8","36":"fcb86db7","37":"45bd01cf","38":"c9a7b857","39":"c70ae151","40":"f8d53d56","41":"f148efb7","42":"0580c6af","43":"76f2c7cd","44":"5c64b9e0","45":"7a672bb9","46":"15d7e405","47":"41c33243","48":"8da4a985","49":"360469e8","50":"2ea15a52","51":"90dfa00e","52":"c9a7bd2e","53":"c5122a73","54":"7a93f8a1","55":"e656715f","56":"3fb18218","57":"b79bda02","58":"7fd0b10e","59":"4608b56c","60":"67dc40c0","61":"bf6364eb","62":"0cf4cd6b","63":"c0c6f32b","64":"c89bfb86","65":"0a148368","66":"2497517d","67":"3c403cea","68":"2a563c48","69":"2d68b5da","70":"db49e412","71":"2be978cc","72":"a1d624d2","73":"4d9a87ca","74":"76cf8598","75":"6571f465","76":"daabb3bd","77":"fe2a7fea","78":"47889bfd","79":"8700d146","80":"f5bdf363","81":"62d2336f","82":"704595cb","83":"40e40c65","84":"a40e3cae","85":"8df73a88","86":"07df52b5","87":"96af8bb6","88":"3f013859","89":"d0d6e7b6","90":"e2c85912","91":"6d191050","92":"7ecc71e8","93":"84bb1d9c","94":"9c275f9f","95":"4e0a6a5d","96":"4e954198","97":"3f4a3ac2","98":"ce19ef5c","99":"8a33069b","100":"397f3c1f","101":"d20fff99","102":"1cf6c508","103":"1c5c76de","104":"0899fa22","105":"2613b794","106":"792f89d1","107":"d83f89a1","108":"4090d005","109":"b4809a70","110":"edac4366","111":"05507b63","112":"48b9c613","113":"5ac86d07","114":"206aafa7","115":"142a7902","116":"4512c6f8","117":"4a16405e","118":"5b34da4c","119":"597e8ff6","120":"6b9e6711","121":"32cc7fe4","122":"7b18f8ad","123":"857cdbd5","124":"58069318","125":"c1c272fb","126":"096a656c","127":"8ce22718","128":"d992f7f3","129":"2d6adb8f","130":"f5001e17","131":"8c129614","132":"37b34419","133":"31d8ba70","134":"f87725f7","135":"74c9da42","136":"c11c8b87","137":"d5c0220a","138":"cfb36c9e","139":"ecd0afe9","140":"bc28ff11","141":"5535733d","142":"5ef10fbb","143":"4441eef7","144":"ceba872c","145":"08663c0c","146":"7ddfff31","147":"23198e50","148":"f27bf3d5","149":"65d5e29d","150":"6a4d051b","151":"37a1af96","152":"e44869ce","153":"dbb14ee0","154":"4118bd8d","155":"2d919666","156":"c81257c5","157":"e28334c9","158":"906f8e09","159":"dbe5e664","160":"c66d73b4","161":"9fba7a73","162":"dd59a663","163":"dad72395","164":"4f4728ff","165":"3b858351","166":"5a53f08e","167":"f0a8b636","168":"2f73f0fe","169":"51dfb564","170":"6e2ede18","171":"cfc7ed1d","172":"b96546c7","173":"1f56b0ee","174":"6e1462a7","175":"57fa6fc1","176":"f2f455bf","177":"0153328d","178":"955414ee","179":"bbcf436f","180":"2add4a6c","181":"5e00a303","182":"d021ccd2","183":"a9d6fec5","184":"38516284","185":"e401b8db","186":"5409e676","187":"d4357bca","188":"9d548227","189":"6512b899","190":"f8f3ec81","191":"27f18663","192":"c4338349","193":"5e73c21f","194":"5ec60c8e","195":"86f358bc","196":"565fc59b","197":"554de9c7","198":"178cd18a","199":"ab9ec81c","200":"f9e29035","201":"23de2d3c","202":"edd35040","203":"dfd42cd0","204":"dab734c1","205":"b2043383","206":"23dfc300","207":"d485afc0","208":"bb1afd2b","209":"e3684a50","210":"e896c65f","211":"7bca57ed","212":"9f77e910","213":"a38eb664","214":"234e3abc","215":"65c6acbb","216":"d83f52fa","217":"6897b2cf","218":"c6478705","219":"d74a09ea","220":"16970110","221":"f26f739e","222":"682c3ae8","223":"43221007","224":"cc4687c9","225":"476b9589","226":"ab6a970d","227":"ba4f2440","228":"af0b74dd","229":"eba7145f","230":"a8e7ecec","231":"07a6735b","232":"406822ad","233":"6f5f9d35","234":"89475d4e","235":"ca78f7b4","236":"f43d44ba","237":"1dd6a30a","238":"9cf28b6d","239":"f20f95e6","240":"6a25c629","241":"aba5242a","242":"0c25c4d4","243":"6d3c4e31","244":"a941c661","245":"89ff82d3","246":"adc300bf","247":"622dcaa6","248":"4a3db9be","249":"0a96175d","250":"2b8cd1f3","251":"03b25839","252":"c73b5988","253":"6c8bd232","254":"810fd90c","255":"a99d9273","256":"cf64742e","257":"323d7878","258":"f0db7965","259":"8faf275e","260":"045a9e50","261":"c02f28b8","262":"396e2fa4","263":"649e6b7d","264":"28560f33","265":"08f9146d","266":"4c962784","267":"94337fb8","268":"c7392362","269":"b77d2e19","270":"d21d10ba","271":"601896c8","272":"4e805877"}[chunkId] + ".chunk.js";
=======
/******/ script.src = __webpack_require__.p + "./static/js/" + ({}[chunkId]||chunkId) + "." + {"0":"3499dbdb","1":"ba3dba4f","2":"e76a0be2","3":"de444263","4":"0958c04a","5":"cd01e110","6":"c1f79042","7":"770ff8da","8":"a7a7f0a8","9":"a81e59fa","10":"c31bfdb0","11":"c18648a5","12":"6f96b71b","13":"33b5f814","14":"3129051e","15":"777d35a0","16":"ec4dcede","17":"eaa7969b","18":"7e6684c8","19":"7c4f80e8","20":"c414c0cd","21":"2f814f4e","22":"4c8bb333","23":"aebb159d","24":"22ef380a","25":"77a31c58","26":"8629bf8a","27":"d9b546ab","28":"d40ce852","29":"4131983c","30":"bc14daba","31":"42d39ddd","32":"fedb209c","33":"100ad33d","34":"4291681f","35":"32a9f338","36":"cc9fadd2","37":"f93f5966","38":"c76fe557","39":"a01f0a61","40":"c50d2381","41":"ec606539","42":"7b2def1b","43":"7976cb68","44":"78e0c1d6","45":"3436b289","46":"c33d233d","47":"17d47062","48":"24657b0c","49":"e46d5cc5","50":"b8619ef3","51":"4e4c388a","52":"8b8e5e72","53":"91568a63","54":"90cc8cd1","55":"b2b3350f","56":"626808d5","57":"02b743ad","58":"e28554c1","59":"efe01636","60":"d8f242f9","61":"e224f9b4","62":"6820bcac","63":"9173054f","64":"13689266","65":"1d7f188b","66":"be555ba2","67":"1a7c23f3","68":"8ee585ac","69":"e2ef8b25","70":"3383729d","71":"79702eb4","72":"a6b7aea4","73":"d6726eb5","74":"0c9dea9c","75":"df65888e","76":"83b711d5","77":"f8e2311e","78":"07c4d87a","79":"71c1aaec","80":"ea6ef0c8","81":"5ba1a813","82":"3628e27a","83":"5140a660","84":"72687a0e","85":"3a8dc8fb","86":"00b6db75","87":"9a6684a6","88":"d20bd270","89":"e8e3931d","90":"a33a0439","91":"35d08100","92":"811d754b","93":"9ca807cb","94":"36dbd878","95":"0f6c972b","96":"fe75753a","97":"3b4d4096","98":"cc855f0c","99":"a470bc24","100":"04603361","101":"f017f44e","102":"3fd09fe5","103":"7ac9c928","104":"57b33ca6","105":"425915af","106":"5a7f1794","107":"e90e0fb8","108":"a761ed62","109":"7c4e13dd","110":"cf85c660","111":"b123ff38","112":"7277a9f5","113":"70b65335","114":"8df5b49f","115":"bf16e172","116":"baeee89f","117":"cc05f636","118":"857c2217","119":"07904e71","120":"bf90dce4","121":"a49174bd","122":"17b804b2","123":"995606e5","124":"13b7722f","125":"cd60d55a","126":"cdbe58e2","127":"88517989","128":"bde9db79","129":"1af889c1","130":"dad6a32f","131":"52e9efd9","132":"6189ed52","133":"cd8230a4","134":"d3ca6526","135":"c7708f2c","136":"1f0535b3","137":"c2b3fdce","138":"714743e3","139":"c9131191","140":"f300f141","141":"148aa7ee","142":"87d7a1ae","143":"c7359bf6","144":"ab25100c","145":"9e977cc1","146":"e623a54e","147":"114cf540","148":"32825ae6","149":"8f818a63","150":"2d8568a9","151":"3cbd58d9","152":"25096064","153":"0579404a","154":"6661c864","155":"3185ccd2","156":"114acd0e","157":"01fef202","158":"bfe089a5","159":"456c280b","160":"cf5a19f0","161":"1a1a88fa","162":"4a3db237","163":"3b0f2188","164":"29b4fe7a","165":"13f04d92","166":"1b56ef09","167":"a991482c","168":"e890d0c2","169":"04ceadc5","170":"f52e6f5d","171":"4b98ee6a","172":"6b0207aa","173":"2709a7bb","174":"9c9c4f81","175":"1c50cd8c","176":"6ccf4497","177":"5c7bfa2d","178":"7c69aa3a","179":"d9a714d5","180":"abba8537","181":"b3f1bcbc","182":"2ed4f280","183":"b34ed057","184":"c7d63100","185":"9c6c47a4","186":"ddb826e1","187":"24d4cbd0","188":"c0498792","189":"8cfa165e","190":"ae0f7daa","191":"d911f73d","192":"14c7d860","193":"28c25d4a","194":"996d34c8","195":"4ab7e4b1","196":"589ce802","197":"4459eb3a","198":"3f1fe6b4","199":"cdc117e7","200":"aedf4681","201":"67de5466","202":"8dd9f7bd","203":"319c605d","204":"2149b491","205":"424a329b","206":"547aeeb8","207":"b05232b2","208":"0f479a47","209":"77c8bcf8","210":"2fb25a6f","211":"d11d4a8e","212":"ad235f49","213":"e56234a5","214":"c24d9bbe","215":"3f681e33","216":"8e1da5ad","217":"3cf5ac1f","218":"01790dac","219":"8f881b85","220":"476d3205","221":"e07afe2c","222":"2dd41e75","223":"133697da","224":"87ac7213","225":"60513ed2","226":"f24ef2b5","227":"c95f4494","228":"a3590254","229":"b06fc465","230":"1466387c","231":"e729eb6c","232":"ada6d07a","233":"53ed68fe","234":"b7b097d6","235":"5b4a016d","236":"e66dee6e","237":"5e3e8f76","238":"9ce1b135","239":"d22322bb","240":"035fb15e","241":"ec5be75d","242":"3234f588","243":"b191f470","244":"f056cbd6","245":"bd0e380e","246":"d2f9e8b1","247":"6987bd76","248":"24cc4b10","249":"f79eeb77","250":"6645f8b5","251":"419ffe18","252":"ffc4dcb6","253":"ebbeb4bd","254":"863c48fc","255":"7fee5b41","256":"cf5ef9a6","257":"d4fdfb46","258":"94dc05e4","259":"cc34b705","260":"a2449e25","261":"4869bc3c","262":"b49c1dfe","263":"7754f522","264":"cc552723","265":"32511fba","266":"0a917fe9","267":"1810bd59","268":"ed711356","269":"97095b2d","270":"c5795190","271":"b5f939a0","272":"6cd7ccc1"}[chunkId] + ".chunk.js";
>>>>>>> 406f8f17f6d8e53723c5921455fa4ef0715e3c50:public/react/build/static/js/main.8a8db6c5.js
/******/ var timeout = setTimeout(onScriptComplete, 120000);
/******/ script.onerror = script.onload = onScriptComplete;
/******/ function onScriptComplete() {

17
public/react/src/forge/Merge/MergeDetail.js
Unescape View File

@ -25,7 +25,8 @@ class MergeDetail extends Component{
titledisplay:'none',
countvalue:'',
//是否需要编辑
isedit:'block'
isedit:'block',
showFiles: true
}
}
@ -76,6 +77,9 @@ class MergeDetail extends Component{
issue_id:data.id,
}).then(result=>{
if(result){
this.setState({
showFiles: false
})
this.getjournalslist();
}
}).catch(error=>{
@ -153,10 +157,15 @@ class MergeDetail extends Component{
})
}
// 判断是否重新上传文件
changeIsComplete=(flag)=>{
this.setState({
showFiles:flag
})
}
render(){
const { projectsId,mergeid} = this.props.match.params;
const { data,journalsdata } = this.state;
const { data,journalsdata, showFiles } = this.state;
const { getFieldDecorator } = this.props.form;
const url = this.props.history.location.pathname;
const renderList =()=>{
@ -272,7 +281,7 @@ class MergeDetail extends Component{
<TextArea placeholder="添加一个可选的扩展描述。。。" style={{height:"200px"}}/>
)}
</Form.Item>
<UploadComponent load={this.UploadFunc}></UploadComponent>
<UploadComponent load={this.UploadFunc} isComplete={showFiles} changeIsComplete={this.changeIsComplete}></UploadComponent>
<p className="clearfix mt15">
<a className="topWrapper_btn fr" type="submit" onClick={this.addjournals}>评论</a>
<a className="Closeor_btn fr" type="submit" onClick={()=>this.closedetail(data&&data.issue_status==="关闭"?2:5)}>{data&&data.issue_status==="关闭"?"开启":"关闭"}</a>

4
public/react/src/forge/Merge/MessageCount.js
Unescape View File

@ -308,7 +308,9 @@ class MessageCount extends Component{
getOption=(e)=>{
this.setState({
mergename:e.item.props.value,
mergekey:e.key
mergekey:e.key,
title:'',
body:''
})
}

4
public/react/src/forge/Merge/NewMerge.js
Unescape View File

@ -331,10 +331,10 @@ class NewMerge extends Component{
{getFieldDecorator('body', {
rules: [],
})(
<TextArea placeholder="添加一个可选的扩展描述。。。" style={{height:"300px"}}/>
<TextArea placeholder="合并请求的描述。。。" style={{height:"300px"}}/>
)}
</Form.Item>
<UploadComponent load={this.UploadFunc}></UploadComponent>
<UploadComponent load={this.UploadFunc} isComplete={true} ></UploadComponent>
<p className="clearfix mt15">
<a className="topWrapper_btn fr" type="submit" onClick={this.submit}>创建合并请求</a>
</p>

2
public/react/src/forge/Merge/UpdateMerge.js
Unescape View File

@ -201,7 +201,7 @@ class UpdateMerge extends Component{
<TextArea placeholder="请输入工单的描述..." style={{height:"300px"}} onChange={this.changmodelcount}/>
)}
</Form.Item>
<UploadComponent load={this.UploadFunc} showNotification={this.props.showNotification}></UploadComponent>
<UploadComponent load={this.UploadFunc} showNotification={this.props.showNotification} isComplete={true} ></UploadComponent>
{
get_attachments ?
<Attachments attachments={get_attachments} showNotification={this.props.showNotification} canDelete={true}/>

2
public/react/src/forge/Order/CopyDetail.js
Unescape View File

@ -213,7 +213,7 @@ class CopyDetail extends Component{
)}
</Form.Item>
<UploadComponent load={this.UploadFunc}
showNotification={this.props.showNotification}></UploadComponent>
showNotification={this.props.showNotification} isComplete={true} ></UploadComponent>
{
get_attachments ?
<Attachments attachments={get_attachments} showNotification={this.props.showNotification}

2
public/react/src/forge/Order/New.js
Unescape View File

@ -150,7 +150,7 @@ class New extends Component{
<TextArea placeholder="请输入工单的描述..." style={{height:"300px"}}/>
)}
</Form.Item>
<UploadComponent load={this.UploadFunc} showNotification={this.props.showNotification}></UploadComponent>
<UploadComponent load={this.UploadFunc} showNotification={this.props.showNotification} isComplete={true}></UploadComponent>
<p className="clearfix mt15">
<a className="topWrapper_btn fr" type="submit" onClick={this.handleSubmit}>创建Issue</a>
</p>

2
public/react/src/forge/Order/UpdateDetail.js
Unescape View File

@ -200,7 +200,7 @@ class UpdateDetail extends Component{
<TextArea placeholder="请输入工单的描述..." style={{height:"300px"}} onChange={this.changmodelcount}/>
)}
</Form.Item>
<UploadComponent load={this.UploadFunc} showNotification={this.props.showNotification}></UploadComponent>
<UploadComponent load={this.UploadFunc} showNotification={this.props.showNotification} isComplete={true}></UploadComponent>
{
get_attachments ?
<Attachments attachments={get_attachments} showNotification={this.props.showNotification} canDelete={true}/>

Write Preview
Loading…
Cancel
Save