修改部分前端bug和后端的bug

forge
sylor_huang@126.com 5 years ago
parent 2079ccceaf
commit 4e9af3751a

@ -324,17 +324,11 @@ class IssuesController < ApplicationController
end end
if @issue.update_attribute(:status_id, type) if @issue.update_attribute(:status_id, type)
if type == 5 if type == 5
# @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&.project_trends&.update_all(action_type: "close")
@issue.issue_times.update_all(end_time: Time.now) @issue.issue_times.update_all(end_time: Time.now)
else else
@issue&.project_trends&.update_all(action_type: "create") @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)
# version.update_attributes(closed_issues_count: (version.closed_issues_count - 1), percent: percent)
# end
end end
@issue.custom_journal_detail("close_issue",old_message, "#{message}") @issue.custom_journal_detail("close_issue",old_message, "#{message}")

@ -6,7 +6,7 @@ class Issue < ApplicationRecord
has_one :pull_request has_one :pull_request
# belongs_to :issue_tag,optional: true # belongs_to :issue_tag,optional: true
belongs_to :priority, :class_name => 'IssuePriority', foreign_key: :priority_id,optional: true belongs_to :priority, :class_name => 'IssuePriority', foreign_key: :priority_id,optional: true
belongs_to :version, foreign_key: :fixed_version_id,optional: true, counter_cache: :issues_count belongs_to :version, foreign_key: :fixed_version_id,optional: true, counter_cache: true
belongs_to :user,optional: true, foreign_key: :author_id belongs_to :user,optional: true, foreign_key: :author_id
belongs_to :issue_status, foreign_key: :status_id,optional: true belongs_to :issue_status, foreign_key: :status_id,optional: true
has_many :commit_issues has_many :commit_issues
@ -23,7 +23,7 @@ class Issue < ApplicationRecord
scope :issue_issue, ->{where(issue_classify: [nil,"issue"])} scope :issue_issue, ->{where(issue_classify: [nil,"issue"])}
scope :issue_pull_request, ->{where(issue_classify: "pull_request")} scope :issue_pull_request, ->{where(issue_classify: "pull_request")}
after_save :change_versions_count after_update :change_versions_count
def get_assign_user def get_assign_user

@ -8,7 +8,8 @@ json.user_login @version.version_user.try(:login)
json.created_at format_time(@version.created_on) json.created_at format_time(@version.created_on)
json.updated_at format_time(@version.updated_on) json.updated_at format_time(@version.updated_on)
json.search_count @version_issues_size json.search_count @version_issues_size
json.extract! @version, :id,:name,:project_id,:description, :effective_date, :status, :sharing,:wiki_page_title,:percent json.percent @version.percent*100
json.extract! @version, :id,:name,:project_id,:description, :effective_date, :status, :sharing,:wiki_page_title
json.issues do json.issues do
json.array! @version_issues.each.to_a do |issue| json.array! @version_issues.each.to_a do |issue|

@ -29,7 +29,7 @@
"./static/js/122.186f854f.chunk.js": "./static/js/122.186f854f.chunk.js", "./static/js/122.186f854f.chunk.js": "./static/js/122.186f854f.chunk.js",
"./static/js/123.8c68d28a.chunk.js": "./static/js/123.8c68d28a.chunk.js", "./static/js/123.8c68d28a.chunk.js": "./static/js/123.8c68d28a.chunk.js",
"./static/js/124.408ebb33.chunk.js": "./static/js/124.408ebb33.chunk.js", "./static/js/124.408ebb33.chunk.js": "./static/js/124.408ebb33.chunk.js",
"./static/js/125.12bc75c5.chunk.js": "./static/js/125.12bc75c5.chunk.js", "./static/js/125.2e783f68.chunk.js": "./static/js/125.2e783f68.chunk.js",
"./static/js/126.7167d483.chunk.js": "./static/js/126.7167d483.chunk.js", "./static/js/126.7167d483.chunk.js": "./static/js/126.7167d483.chunk.js",
"./static/js/127.cd709423.chunk.js": "./static/js/127.cd709423.chunk.js", "./static/js/127.cd709423.chunk.js": "./static/js/127.cd709423.chunk.js",
"./static/js/128.0f3f6907.chunk.js": "./static/js/128.0f3f6907.chunk.js", "./static/js/128.0f3f6907.chunk.js": "./static/js/128.0f3f6907.chunk.js",
@ -60,21 +60,21 @@
"./static/js/150.2d8568a9.chunk.js": "./static/js/150.2d8568a9.chunk.js", "./static/js/150.2d8568a9.chunk.js": "./static/js/150.2d8568a9.chunk.js",
"./static/js/151.9b55bafe.chunk.js": "./static/js/151.9b55bafe.chunk.js", "./static/js/151.9b55bafe.chunk.js": "./static/js/151.9b55bafe.chunk.js",
"./static/js/152.235dc8d0.chunk.js": "./static/js/152.235dc8d0.chunk.js", "./static/js/152.235dc8d0.chunk.js": "./static/js/152.235dc8d0.chunk.js",
"./static/js/153.c66c3a72.chunk.js": "./static/js/153.c66c3a72.chunk.js", "./static/js/153.29c7fa4c.chunk.js": "./static/js/153.29c7fa4c.chunk.js",
"./static/js/154.6661c864.chunk.js": "./static/js/154.6661c864.chunk.js", "./static/js/154.6661c864.chunk.js": "./static/js/154.6661c864.chunk.js",
"./static/js/155.ed22d6b2.chunk.js": "./static/js/155.ed22d6b2.chunk.js", "./static/js/155.ed22d6b2.chunk.js": "./static/js/155.ed22d6b2.chunk.js",
"./static/js/156.a71c0de3.chunk.js": "./static/js/156.a71c0de3.chunk.js", "./static/js/156.a71c0de3.chunk.js": "./static/js/156.a71c0de3.chunk.js",
"./static/js/157.01fef202.chunk.js": "./static/js/157.01fef202.chunk.js", "./static/js/157.01fef202.chunk.js": "./static/js/157.01fef202.chunk.js",
"./static/js/158.b8182b3b.chunk.js": "./static/js/158.b8182b3b.chunk.js", "./static/js/158.b8182b3b.chunk.js": "./static/js/158.b8182b3b.chunk.js",
"./static/js/159.eb18a707.chunk.js": "./static/js/159.eb18a707.chunk.js", "./static/js/159.b2ac2c9d.chunk.js": "./static/js/159.b2ac2c9d.chunk.js",
"./static/js/16.ec4dcede.chunk.js": "./static/js/16.ec4dcede.chunk.js", "./static/js/16.ec4dcede.chunk.js": "./static/js/16.ec4dcede.chunk.js",
"./static/js/160.f28de0eb.chunk.js": "./static/js/160.f28de0eb.chunk.js", "./static/js/160.2ce62b5e.chunk.js": "./static/js/160.2ce62b5e.chunk.js",
"./static/js/161.1289bb4c.chunk.js": "./static/js/161.1289bb4c.chunk.js", "./static/js/161.1289bb4c.chunk.js": "./static/js/161.1289bb4c.chunk.js",
"./static/js/162.15c1b2d7.chunk.js": "./static/js/162.15c1b2d7.chunk.js", "./static/js/162.15c1b2d7.chunk.js": "./static/js/162.15c1b2d7.chunk.js",
"./static/js/163.c711c38f.chunk.js": "./static/js/163.c711c38f.chunk.js", "./static/js/163.c711c38f.chunk.js": "./static/js/163.c711c38f.chunk.js",
"./static/js/164.4b22c987.chunk.js": "./static/js/164.4b22c987.chunk.js", "./static/js/164.a2076de0.chunk.js": "./static/js/164.a2076de0.chunk.js",
"./static/js/165.dec54504.chunk.js": "./static/js/165.dec54504.chunk.js", "./static/js/165.dec54504.chunk.js": "./static/js/165.dec54504.chunk.js",
"./static/js/166.686b2b4d.chunk.js": "./static/js/166.686b2b4d.chunk.js", "./static/js/166.251b058d.chunk.js": "./static/js/166.251b058d.chunk.js",
"./static/js/167.7a30e1c2.chunk.js": "./static/js/167.7a30e1c2.chunk.js", "./static/js/167.7a30e1c2.chunk.js": "./static/js/167.7a30e1c2.chunk.js",
"./static/js/168.471f4346.chunk.js": "./static/js/168.471f4346.chunk.js", "./static/js/168.471f4346.chunk.js": "./static/js/168.471f4346.chunk.js",
"./static/js/169.2649e466.chunk.js": "./static/js/169.2649e466.chunk.js", "./static/js/169.2649e466.chunk.js": "./static/js/169.2649e466.chunk.js",
@ -92,7 +92,7 @@
"./static/js/18.105e1eb7.chunk.js": "./static/js/18.105e1eb7.chunk.js", "./static/js/18.105e1eb7.chunk.js": "./static/js/18.105e1eb7.chunk.js",
"./static/js/180.abba8537.chunk.js": "./static/js/180.abba8537.chunk.js", "./static/js/180.abba8537.chunk.js": "./static/js/180.abba8537.chunk.js",
"./static/js/181.b42edfcd.chunk.js": "./static/js/181.b42edfcd.chunk.js", "./static/js/181.b42edfcd.chunk.js": "./static/js/181.b42edfcd.chunk.js",
"./static/js/182.80f583b4.chunk.js": "./static/js/182.80f583b4.chunk.js", "./static/js/182.52e50bd4.chunk.js": "./static/js/182.52e50bd4.chunk.js",
"./static/js/183.b34ed057.chunk.js": "./static/js/183.b34ed057.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/184.c7d63100.chunk.js": "./static/js/184.c7d63100.chunk.js",
"./static/js/185.9c6c47a4.chunk.js": "./static/js/185.9c6c47a4.chunk.js", "./static/js/185.9c6c47a4.chunk.js": "./static/js/185.9c6c47a4.chunk.js",
@ -110,7 +110,7 @@
"./static/js/196.c1938f28.chunk.js": "./static/js/196.c1938f28.chunk.js", "./static/js/196.c1938f28.chunk.js": "./static/js/196.c1938f28.chunk.js",
"./static/js/197.f187b9d8.chunk.js": "./static/js/197.f187b9d8.chunk.js", "./static/js/197.f187b9d8.chunk.js": "./static/js/197.f187b9d8.chunk.js",
"./static/js/198.3f1fe6b4.chunk.js": "./static/js/198.3f1fe6b4.chunk.js", "./static/js/198.3f1fe6b4.chunk.js": "./static/js/198.3f1fe6b4.chunk.js",
"./static/js/199.45694800.chunk.js": "./static/js/199.45694800.chunk.js", "./static/js/199.ed77f6d9.chunk.js": "./static/js/199.ed77f6d9.chunk.js",
"./static/js/2.bc3d8cf1.chunk.js": "./static/js/2.bc3d8cf1.chunk.js", "./static/js/2.bc3d8cf1.chunk.js": "./static/js/2.bc3d8cf1.chunk.js",
"./static/js/20.f22140b1.chunk.js": "./static/js/20.f22140b1.chunk.js", "./static/js/20.f22140b1.chunk.js": "./static/js/20.f22140b1.chunk.js",
"./static/js/200.263ef8f9.chunk.js": "./static/js/200.263ef8f9.chunk.js", "./static/js/200.263ef8f9.chunk.js": "./static/js/200.263ef8f9.chunk.js",
@ -221,7 +221,7 @@
"./static/js/50.49a23628.chunk.js": "./static/js/50.49a23628.chunk.js", "./static/js/50.49a23628.chunk.js": "./static/js/50.49a23628.chunk.js",
"./static/js/51.4eb1ce58.chunk.js": "./static/js/51.4eb1ce58.chunk.js", "./static/js/51.4eb1ce58.chunk.js": "./static/js/51.4eb1ce58.chunk.js",
"./static/js/52.f17e0e11.chunk.js": "./static/js/52.f17e0e11.chunk.js", "./static/js/52.f17e0e11.chunk.js": "./static/js/52.f17e0e11.chunk.js",
"./static/js/53.abef9d53.chunk.js": "./static/js/53.abef9d53.chunk.js", "./static/js/53.e60d46bb.chunk.js": "./static/js/53.e60d46bb.chunk.js",
"./static/js/54.74e62ba5.chunk.js": "./static/js/54.74e62ba5.chunk.js", "./static/js/54.74e62ba5.chunk.js": "./static/js/54.74e62ba5.chunk.js",
"./static/js/55.abe23415.chunk.js": "./static/js/55.abe23415.chunk.js", "./static/js/55.abe23415.chunk.js": "./static/js/55.abe23415.chunk.js",
"./static/js/56.31429d59.chunk.js": "./static/js/56.31429d59.chunk.js", "./static/js/56.31429d59.chunk.js": "./static/js/56.31429d59.chunk.js",
@ -233,21 +233,21 @@
"./static/js/61.42df9549.chunk.js": "./static/js/61.42df9549.chunk.js", "./static/js/61.42df9549.chunk.js": "./static/js/61.42df9549.chunk.js",
"./static/js/62.88296aa0.chunk.js": "./static/js/62.88296aa0.chunk.js", "./static/js/62.88296aa0.chunk.js": "./static/js/62.88296aa0.chunk.js",
"./static/js/63.3bac03de.chunk.js": "./static/js/63.3bac03de.chunk.js", "./static/js/63.3bac03de.chunk.js": "./static/js/63.3bac03de.chunk.js",
"./static/js/64.dfd848c1.chunk.js": "./static/js/64.dfd848c1.chunk.js", "./static/js/64.48e9b5d8.chunk.js": "./static/js/64.48e9b5d8.chunk.js",
"./static/js/65.88707d5e.chunk.js": "./static/js/65.88707d5e.chunk.js", "./static/js/65.88707d5e.chunk.js": "./static/js/65.88707d5e.chunk.js",
"./static/js/66.7a7f45dc.chunk.js": "./static/js/66.7a7f45dc.chunk.js", "./static/js/66.dc4e725c.chunk.js": "./static/js/66.dc4e725c.chunk.js",
"./static/js/67.0f65cd89.chunk.js": "./static/js/67.0f65cd89.chunk.js", "./static/js/67.0f65cd89.chunk.js": "./static/js/67.0f65cd89.chunk.js",
"./static/js/68.792bbdc2.chunk.js": "./static/js/68.792bbdc2.chunk.js", "./static/js/68.792bbdc2.chunk.js": "./static/js/68.792bbdc2.chunk.js",
"./static/js/69.ad66f4c7.chunk.js": "./static/js/69.ad66f4c7.chunk.js", "./static/js/69.ad66f4c7.chunk.js": "./static/js/69.ad66f4c7.chunk.js",
"./static/js/7.231bff40.chunk.js": "./static/js/7.231bff40.chunk.js", "./static/js/7.231bff40.chunk.js": "./static/js/7.231bff40.chunk.js",
"./static/js/70.adb8d0da.chunk.js": "./static/js/70.adb8d0da.chunk.js", "./static/js/70.adb8d0da.chunk.js": "./static/js/70.adb8d0da.chunk.js",
"./static/js/71.7a76b045.chunk.js": "./static/js/71.7a76b045.chunk.js", "./static/js/71.7a76b045.chunk.js": "./static/js/71.7a76b045.chunk.js",
"./static/js/72.89e36d50.chunk.js": "./static/js/72.89e36d50.chunk.js", "./static/js/72.fa0e7247.chunk.js": "./static/js/72.fa0e7247.chunk.js",
"./static/js/73.6f7ce494.chunk.js": "./static/js/73.6f7ce494.chunk.js", "./static/js/73.3b15d4d7.chunk.js": "./static/js/73.3b15d4d7.chunk.js",
"./static/js/74.cfa0f703.chunk.js": "./static/js/74.cfa0f703.chunk.js", "./static/js/74.cfa0f703.chunk.js": "./static/js/74.cfa0f703.chunk.js",
"./static/js/75.385cc133.chunk.js": "./static/js/75.385cc133.chunk.js", "./static/js/75.385cc133.chunk.js": "./static/js/75.385cc133.chunk.js",
"./static/js/76.5a64bd52.chunk.js": "./static/js/76.5a64bd52.chunk.js", "./static/js/76.5a64bd52.chunk.js": "./static/js/76.5a64bd52.chunk.js",
"./static/js/77.12cf88d2.chunk.js": "./static/js/77.12cf88d2.chunk.js", "./static/js/77.6e6cf319.chunk.js": "./static/js/77.6e6cf319.chunk.js",
"./static/js/78.2a0a496c.chunk.js": "./static/js/78.2a0a496c.chunk.js", "./static/js/78.2a0a496c.chunk.js": "./static/js/78.2a0a496c.chunk.js",
"./static/js/79.de080f3a.chunk.js": "./static/js/79.de080f3a.chunk.js", "./static/js/79.de080f3a.chunk.js": "./static/js/79.de080f3a.chunk.js",
"./static/js/8.e2184916.chunk.js": "./static/js/8.e2184916.chunk.js", "./static/js/8.e2184916.chunk.js": "./static/js/8.e2184916.chunk.js",
@ -255,25 +255,25 @@
"./static/js/81.c2fc7f34.chunk.js": "./static/js/81.c2fc7f34.chunk.js", "./static/js/81.c2fc7f34.chunk.js": "./static/js/81.c2fc7f34.chunk.js",
"./static/js/82.3f3fb911.chunk.js": "./static/js/82.3f3fb911.chunk.js", "./static/js/82.3f3fb911.chunk.js": "./static/js/82.3f3fb911.chunk.js",
"./static/js/83.b75fac03.chunk.js": "./static/js/83.b75fac03.chunk.js", "./static/js/83.b75fac03.chunk.js": "./static/js/83.b75fac03.chunk.js",
"./static/js/84.d8ec6b74.chunk.js": "./static/js/84.d8ec6b74.chunk.js", "./static/js/84.8fbe53ba.chunk.js": "./static/js/84.8fbe53ba.chunk.js",
"./static/js/85.9202ffba.chunk.js": "./static/js/85.9202ffba.chunk.js", "./static/js/85.c3e5f813.chunk.js": "./static/js/85.c3e5f813.chunk.js",
"./static/js/86.c4fa328e.chunk.js": "./static/js/86.c4fa328e.chunk.js", "./static/js/86.c4fa328e.chunk.js": "./static/js/86.c4fa328e.chunk.js",
"./static/js/87.3c551684.chunk.js": "./static/js/87.3c551684.chunk.js", "./static/js/87.3c551684.chunk.js": "./static/js/87.3c551684.chunk.js",
"./static/js/88.4e63f179.chunk.js": "./static/js/88.4e63f179.chunk.js", "./static/js/88.4e63f179.chunk.js": "./static/js/88.4e63f179.chunk.js",
"./static/js/89.5520ee99.chunk.js": "./static/js/89.5520ee99.chunk.js", "./static/js/89.693c6b3e.chunk.js": "./static/js/89.693c6b3e.chunk.js",
"./static/js/9.6f9ef4ac.chunk.js": "./static/js/9.6f9ef4ac.chunk.js", "./static/js/9.6f9ef4ac.chunk.js": "./static/js/9.6f9ef4ac.chunk.js",
"./static/js/90.c9591325.chunk.js": "./static/js/90.c9591325.chunk.js", "./static/js/90.88cf203c.chunk.js": "./static/js/90.88cf203c.chunk.js",
"./static/js/91.920ffa5a.chunk.js": "./static/js/91.920ffa5a.chunk.js", "./static/js/91.a6f23b34.chunk.js": "./static/js/91.a6f23b34.chunk.js",
"./static/js/92.9e9e70b1.chunk.js": "./static/js/92.9e9e70b1.chunk.js", "./static/js/92.9e9e70b1.chunk.js": "./static/js/92.9e9e70b1.chunk.js",
"./static/js/93.8a6c50b0.chunk.js": "./static/js/93.8a6c50b0.chunk.js", "./static/js/93.8a6c50b0.chunk.js": "./static/js/93.8a6c50b0.chunk.js",
"./static/js/94.8e4cf365.chunk.js": "./static/js/94.8e4cf365.chunk.js", "./static/js/94.e00976e5.chunk.js": "./static/js/94.e00976e5.chunk.js",
"./static/js/95.f1ba604f.chunk.js": "./static/js/95.f1ba604f.chunk.js", "./static/js/95.f1ba604f.chunk.js": "./static/js/95.f1ba604f.chunk.js",
"./static/js/96.46e744a4.chunk.js": "./static/js/96.46e744a4.chunk.js", "./static/js/96.46e744a4.chunk.js": "./static/js/96.46e744a4.chunk.js",
"./static/js/97.eb363f34.chunk.js": "./static/js/97.eb363f34.chunk.js", "./static/js/97.eb363f34.chunk.js": "./static/js/97.eb363f34.chunk.js",
"./static/js/98.88d3b919.chunk.js": "./static/js/98.88d3b919.chunk.js", "./static/js/98.88d3b919.chunk.js": "./static/js/98.88d3b919.chunk.js",
"./static/js/99.bb3d2c54.chunk.js": "./static/js/99.bb3d2c54.chunk.js", "./static/js/99.bb3d2c54.chunk.js": "./static/js/99.bb3d2c54.chunk.js",
"main.css": "./static/css/main.c0718fb6.css", "main.css": "./static/css/main.c0718fb6.css",
"main.js": "./static/js/main.1f0e4c92.js", "main.js": "./static/js/main.bcb3d45e.js",
"static/media/KaTeX_AMS-Regular.ttf": "static/media/KaTeX_AMS-Regular.aaf4eee9.ttf", "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.woff": "static/media/KaTeX_AMS-Regular.7f06b4e3.woff",
"static/media/KaTeX_AMS-Regular.woff2": "static/media/KaTeX_AMS-Regular.e78e28b4.woff2", "static/media/KaTeX_AMS-Regular.woff2": "static/media/KaTeX_AMS-Regular.e78e28b4.woff2",

@ -24,7 +24,7 @@
_host = 'https://ali-cdn.educoder.net/react/build/' _host = 'https://ali-cdn.educoder.net/react/build/'
} }
document.write('<script type="text/javascript" src="' + _host + 'js/js_min_all.js"><\/script>'); document.write('<script type="text/javascript" src="' + _host + 'js/js_min_all.js"><\/script>');
document.write('<script type="text/javascript" src="' + _host + 'static/js/main.1f0e4c92.js"><\/script>'); document.write('<script type="text/javascript" src="' + _host + 'static/js/main.bcb3d45e.js"><\/script>');
})() })()
</script> </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> <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>

File diff suppressed because one or more lines are too long

@ -934,7 +934,11 @@ _createClass(Index,[{key:'render',value:function render(){var menu=__WEBPACK_IMP
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__list_css___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_4__list_css__); /* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__list_css___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_4__list_css__);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__Images_parise_png__ = __webpack_require__(3306); /* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__Images_parise_png__ = __webpack_require__(3306);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__Images_parise_png___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_5__Images_parise_png__); /* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__Images_parise_png___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_5__Images_parise_png__);
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 IndexItem=function(_Component){_inherits(IndexItem,_Component);function IndexItem(){_classCallCheck(this,IndexItem);return _possibleConstructorReturn(this,(IndexItem.__proto__||Object.getPrototypeOf(IndexItem)).apply(this,arguments));}_createClass(IndexItem,[{key:'render',value:function render(){var projects=this.props.projects;var renderList=projects&&projects.length>0?projects.map(function(item,key){return __WEBPACK_IMPORTED_MODULE_0_react___default.a.createElement('div',{className:'p-r-Item'},__WEBPACK_IMPORTED_MODULE_0_react___default.a.createElement('img',{className:'p-r-photo',alt:'',src:Object(__WEBPACK_IMPORTED_MODULE_1_educoder__["M" /* getImageUrl */])('images/'+(item.author&&item.author.image_url))}),__WEBPACK_IMPORTED_MODULE_0_react___default.a.createElement('div',{className:'p-r-Infos'},__WEBPACK_IMPORTED_MODULE_0_react___default.a.createElement('div',{className:'p-r-name'},__WEBPACK_IMPORTED_MODULE_0_react___default.a.createElement(__WEBPACK_IMPORTED_MODULE_2_react_router_dom__["b" /* Link */],{to:{pathname:'/projects/'+item.identifier+'/coder',state:''+(item.author&&item.author.login)},className:'hide-1 font-16 color-grey-3',style:{whiteSpace:"wrap"}},item.name)),__WEBPACK_IMPORTED_MODULE_0_react___default.a.createElement('div',{className:'p-r-content'},__WEBPACK_IMPORTED_MODULE_0_react___default.a.createElement('p',{className:'break_word task-hide flex1',style:{maxHeight:"40px"}},item.description),__WEBPACK_IMPORTED_MODULE_0_react___default.a.createElement('span',{className:'p-r-tags'},__WEBPACK_IMPORTED_MODULE_0_react___default.a.createElement('span',{className:'pariseTag'},__WEBPACK_IMPORTED_MODULE_0_react___default.a.createElement('img',{src:__WEBPACK_IMPORTED_MODULE_5__Images_parise_png___default.a,alt:'',className:'pariseImg'}),'\u70B9\u8D5E (',item.praises_count,')'),item.language&&item.language.id?__WEBPACK_IMPORTED_MODULE_0_react___default.a.createElement('span',null,__WEBPACK_IMPORTED_MODULE_0_react___default.a.createElement('label',null,item.language.name)):"")),__WEBPACK_IMPORTED_MODULE_0_react___default.a.createElement('div',{className:'p-r-about'},__WEBPACK_IMPORTED_MODULE_0_react___default.a.createElement('span',{className:'p-r-detail'},__WEBPACK_IMPORTED_MODULE_0_react___default.a.createElement('span',null,__WEBPACK_IMPORTED_MODULE_0_react___default.a.createElement('label',null,'\u6D4F\u89C8\u91CF\uFF1A'),item.visits),item.category&&item.category.id&&__WEBPACK_IMPORTED_MODULE_0_react___default.a.createElement('span',null,__WEBPACK_IMPORTED_MODULE_0_react___default.a.createElement('label',null,'\u9879\u76EE\u7C7B\u522B\uFF1A'),item.category.name),item.last_update_time?__WEBPACK_IMPORTED_MODULE_0_react___default.a.createElement('span',null,__WEBPACK_IMPORTED_MODULE_0_react___default.a.createElement('label',null,'\u66F4\u65B0\u4E8E'),item.time_ago):""))));}):"";return __WEBPACK_IMPORTED_MODULE_0_react___default.a.createElement('div',{className:'project-list'},renderList);}}]);return IndexItem;}(__WEBPACK_IMPORTED_MODULE_0_react__["Component"]);/* harmony default export */ __webpack_exports__["a"] = (IndexItem); 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 IndexItem=function(_Component){_inherits(IndexItem,_Component);function IndexItem(){var _ref;var _temp,_this,_ret;_classCallCheck(this,IndexItem);for(var _len=arguments.length,args=Array(_len),_key=0;_key<_len;_key++){args[_key]=arguments[_key];}return _ret=(_temp=(_this=_possibleConstructorReturn(this,(_ref=IndexItem.__proto__||Object.getPrototypeOf(IndexItem)).call.apply(_ref,[this].concat(args))),_this),_this.TurnToDetail=function(login,url){_this.props.history.push({pathname:url,state:login});},_temp),_possibleConstructorReturn(_this,_ret);}// constructor(props){
// super(props);
// }
_createClass(IndexItem,[{key:'render',value:function render(){var _this2=this;var projects=this.props.projects;// item.author.login
var renderList=projects&&projects.length>0?projects.map(function(item,key){return __WEBPACK_IMPORTED_MODULE_0_react___default.a.createElement('div',{className:'p-r-Item'},__WEBPACK_IMPORTED_MODULE_0_react___default.a.createElement('img',{className:'p-r-photo',alt:'',src:Object(__WEBPACK_IMPORTED_MODULE_1_educoder__["M" /* getImageUrl */])('images/'+(item.author&&item.author.image_url))}),__WEBPACK_IMPORTED_MODULE_0_react___default.a.createElement('div',{className:'p-r-Infos'},__WEBPACK_IMPORTED_MODULE_0_react___default.a.createElement('div',{className:'p-r-name'},__WEBPACK_IMPORTED_MODULE_0_react___default.a.createElement('a',{onClick:function onClick(){return _this2.TurnToDetail(''+(item.author&&item.author.login),'/projects/'+item.identifier+'/coder');},className:'hide-1 font-16 color-grey-3',style:{whiteSpace:"wrap"}},item.name)),__WEBPACK_IMPORTED_MODULE_0_react___default.a.createElement('div',{className:'p-r-content'},__WEBPACK_IMPORTED_MODULE_0_react___default.a.createElement('p',{className:'break_word task-hide flex1',style:{maxHeight:"40px"}},item.description),__WEBPACK_IMPORTED_MODULE_0_react___default.a.createElement('span',{className:'p-r-tags'},__WEBPACK_IMPORTED_MODULE_0_react___default.a.createElement('span',{className:'pariseTag'},__WEBPACK_IMPORTED_MODULE_0_react___default.a.createElement('img',{src:__WEBPACK_IMPORTED_MODULE_5__Images_parise_png___default.a,alt:'',className:'pariseImg'}),'\u70B9\u8D5E (',item.praises_count,')'),item.language&&item.language.id?__WEBPACK_IMPORTED_MODULE_0_react___default.a.createElement('span',null,__WEBPACK_IMPORTED_MODULE_0_react___default.a.createElement('label',null,item.language.name)):"")),__WEBPACK_IMPORTED_MODULE_0_react___default.a.createElement('div',{className:'p-r-about'},__WEBPACK_IMPORTED_MODULE_0_react___default.a.createElement('span',{className:'p-r-detail'},__WEBPACK_IMPORTED_MODULE_0_react___default.a.createElement('span',null,__WEBPACK_IMPORTED_MODULE_0_react___default.a.createElement('label',null,'\u6D4F\u89C8\u91CF\uFF1A'),item.visits),item.category&&item.category.id&&__WEBPACK_IMPORTED_MODULE_0_react___default.a.createElement('span',null,__WEBPACK_IMPORTED_MODULE_0_react___default.a.createElement('label',null,'\u9879\u76EE\u7C7B\u522B\uFF1A'),item.category.name),item.last_update_time?__WEBPACK_IMPORTED_MODULE_0_react___default.a.createElement('span',null,__WEBPACK_IMPORTED_MODULE_0_react___default.a.createElement('label',null,'\u66F4\u65B0\u4E8E'),item.time_ago):""))));}):"";return __WEBPACK_IMPORTED_MODULE_0_react___default.a.createElement('div',{className:'project-list'},renderList);}}]);return IndexItem;}(__WEBPACK_IMPORTED_MODULE_0_react__["Component"]);/* harmony default export */ __webpack_exports__["a"] = (IndexItem);
/***/ }), /***/ }),

@ -86755,7 +86755,7 @@ var _createClass=function(){function defineProperties(target,props){for(var i=0;
* filePath:点击目录时当前目录的路径 * filePath:点击目录时当前目录的路径
* subfileType:保存当前点击目录的文件类型显示目录列表时才显示新建文件如果点击的是文件就不显示新建文件按钮 * subfileType:保存当前点击目录的文件类型显示目录列表时才显示新建文件如果点击的是文件就不显示新建文件按钮
* readMeContent:根目录下面的readme文件内容 * readMeContent:根目录下面的readme文件内容
*/var CoderRootDirectory=function(_Component){_inherits(CoderRootDirectory,_Component);function CoderRootDirectory(props){_classCallCheck(this,CoderRootDirectory);var _this=_possibleConstructorReturn(this,(CoderRootDirectory.__proto__||Object.getPrototypeOf(CoderRootDirectory)).call(this,props));_this.changeAddress=function(address){_this.setState({address:address});};_this.componentDidMount=function(){var search=_this.props.history.location.search;var branchName=undefined;if(search&&search.indexOf("branch")>-1){branchName=search.split("=")[1];_this.setState({branch:branchName});}var branch=_this.state.branch;_this.getProjectRoot(branchName||branch);};_this.getProjectRoot=function(branch){var current_user=_this.props.current_user;var projectsId=_this.props.match.params.projectsId;var state=_this.props.history.location.state;var url='/'+state+'/'+projectsId+'/entries.json';__WEBPACK_IMPORTED_MODULE_14_axios___default.a.get(url,{params:{branch:branch}}).then(function(result){if(result){if(result&&result.data&&result.data.length>0){_this.setState({filePath:[],fileDetail:undefined,isSpin:false});_this.renderData(result.data);}_this.setState({rootData:result.data});}}).catch(function(error){});};_this.ChangeFile=function(arr,index){_this.renderUrl(arr.name,arr.path,arr.type);_this.getFileDetail(arr);_this.setState({subFileType:arr.type});};_this.renderUrl=function(name,path,type){var list=[];var filePath=_this.state.filePath;if(path.indexOf("/")){var array=path.split("/");var str="";array.map(function(i,k){str+='/'+i;return list.push({index:k,name:i,path:str.substr(1),type:filePath&&filePath.length>0?filePath[k]?filePath[k].type:type:type});});}else{list.push({index:0,name:name,path:path,type:type});}_this.setState({filePath:list});};_this.getFileDetail=function(arr){var current_user=_this.props.current_user;var projectsId=_this.props.match.params.projectsId;var branch=_this.state.branch;var state=_this.props.history.location.state;var url='/'+state+'/'+projectsId+'/sub_entries.json';__WEBPACK_IMPORTED_MODULE_14_axios___default.a.get(url,{params:{filepath:arr.path,ref:branch}}).then(function(result){if(result&&result.data&&result.data.length>0){if(arr.type==="file"){_this.setState({fileDetail:result.data[0],rootList:undefined});}else{_this.setState({fileDetail:undefined});_this.renderData(result.data);}}}).catch(function(error){console.log(error);});};_this.renderData=function(data){var rootList=[];var readMeContent=[];data&&data.map(function(item,key){rootList.push(Object.assign({key:key},item));if(item.name==='README.md'){readMeContent.push(Object.assign({},item));}});_this.setState({rootList:rootList,readMeContent:readMeContent});};_this.renderReadMeContent=function(readMeContent){var fileDetail=_this.state.fileDetail;if(fileDetail){return;}if(readMeContent&&readMeContent.length>0){return __WEBPACK_IMPORTED_MODULE_4_react___default.a.createElement('div',{className:'commonBox'},__WEBPACK_IMPORTED_MODULE_4_react___default.a.createElement('div',{className:'commonBox-title'},readMeContent[0].name),__WEBPACK_IMPORTED_MODULE_4_react___default.a.createElement('div',{className:'commonBox-info'},readMeContent[0].content?__WEBPACK_IMPORTED_MODULE_4_react___default.a.createElement('div',{className:"markdown-body",dangerouslySetInnerHTML:{__html:Object(__WEBPACK_IMPORTED_MODULE_5_educoder__["X" /* markdownToHTML */])(readMeContent[0].content).replace(/▁/g,"▁▁▁")}}):__WEBPACK_IMPORTED_MODULE_4_react___default.a.createElement('span',null,'\u6682\u65E0~')));}};_this.changeBranch=function(value){var branchList=_this.props.branchList;var branchLastCommit=branchList&&branchList.length>0&&branchList[parseInt(value.key)];_this.setState({branch:branchLastCommit.name,branchLastCommit:branchLastCommit,http_url:branchLastCommit.http_url,isSpin:true});_this.getProjectRoot(branchLastCommit.name);};_this.state={address:"http",branch:"master",filePath:[],http_url:undefined,subFileType:"",readMeContent:undefined,isSpin:true,branchList:undefined,fileDetail:undefined,branchLastCommit:undefined,current_user:undefined,rootData:undefined};return _this;}// 获取根目录 */var CoderRootDirectory=function(_Component){_inherits(CoderRootDirectory,_Component);function CoderRootDirectory(props){_classCallCheck(this,CoderRootDirectory);var _this=_possibleConstructorReturn(this,(CoderRootDirectory.__proto__||Object.getPrototypeOf(CoderRootDirectory)).call(this,props));_this.changeAddress=function(address){_this.setState({address:address});};_this.componentDidMount=function(){var search=_this.props.history.location.search;var branchName=undefined;if(search&&search.indexOf("branch")>-1){branchName=search.split("=")[1];_this.setState({branch:branchName});}var branch=_this.state.branch;_this.getProjectRoot(branchName||branch);};_this.getProjectRoot=function(branch){var current_user=_this.props.current_user;var projectsId=_this.props.match.params.projectsId;var state=_this.props.history.location.state;console.log(_this.props);var url='/'+state+'/'+projectsId+'/entries.json';__WEBPACK_IMPORTED_MODULE_14_axios___default.a.get(url,{params:{branch:branch}}).then(function(result){if(result){if(result&&result.data&&result.data.length>0){_this.setState({filePath:[],fileDetail:undefined,isSpin:false});_this.renderData(result.data);}_this.setState({rootData:result.data});}}).catch(function(error){});};_this.ChangeFile=function(arr,index){_this.renderUrl(arr.name,arr.path,arr.type);_this.getFileDetail(arr);_this.setState({subFileType:arr.type});};_this.renderUrl=function(name,path,type){var list=[];var filePath=_this.state.filePath;if(path.indexOf("/")){var array=path.split("/");var str="";array.map(function(i,k){str+='/'+i;return list.push({index:k,name:i,path:str.substr(1),type:filePath&&filePath.length>0?filePath[k]?filePath[k].type:type:type});});}else{list.push({index:0,name:name,path:path,type:type});}_this.setState({filePath:list});};_this.getFileDetail=function(arr){var current_user=_this.props.current_user;var projectsId=_this.props.match.params.projectsId;var branch=_this.state.branch;var state=_this.props.history.location.state;var url='/'+state+'/'+projectsId+'/sub_entries.json';__WEBPACK_IMPORTED_MODULE_14_axios___default.a.get(url,{params:{filepath:arr.path,ref:branch}}).then(function(result){if(result&&result.data&&result.data.length>0){if(arr.type==="file"){_this.setState({fileDetail:result.data[0],rootList:undefined});}else{_this.setState({fileDetail:undefined});_this.renderData(result.data);}}}).catch(function(error){console.log(error);});};_this.renderData=function(data){var rootList=[];var readMeContent=[];data&&data.map(function(item,key){rootList.push(Object.assign({key:key},item));if(item.name==='README.md'){readMeContent.push(Object.assign({},item));}});_this.setState({rootList:rootList,readMeContent:readMeContent});};_this.renderReadMeContent=function(readMeContent){var fileDetail=_this.state.fileDetail;if(fileDetail){return;}if(readMeContent&&readMeContent.length>0){return __WEBPACK_IMPORTED_MODULE_4_react___default.a.createElement('div',{className:'commonBox'},__WEBPACK_IMPORTED_MODULE_4_react___default.a.createElement('div',{className:'commonBox-title'},readMeContent[0].name),__WEBPACK_IMPORTED_MODULE_4_react___default.a.createElement('div',{className:'commonBox-info'},readMeContent[0].content?__WEBPACK_IMPORTED_MODULE_4_react___default.a.createElement('div',{className:"markdown-body",dangerouslySetInnerHTML:{__html:Object(__WEBPACK_IMPORTED_MODULE_5_educoder__["X" /* markdownToHTML */])(readMeContent[0].content).replace(/▁/g,"▁▁▁")}}):__WEBPACK_IMPORTED_MODULE_4_react___default.a.createElement('span',null,'\u6682\u65E0~')));}};_this.changeBranch=function(value){var branchList=_this.props.branchList;var branchLastCommit=branchList&&branchList.length>0&&branchList[parseInt(value.key)];_this.setState({branch:branchLastCommit.name,branchLastCommit:branchLastCommit,http_url:branchLastCommit.http_url,isSpin:true});_this.getProjectRoot(branchLastCommit.name);};_this.state={address:"http",branch:"master",filePath:[],http_url:undefined,subFileType:"",readMeContent:undefined,isSpin:true,branchList:undefined,fileDetail:undefined,branchLastCommit:undefined,current_user:undefined,rootData:undefined};return _this;}// 获取根目录
// 获取子目录 // 获取子目录
// readme文件内容 // readme文件内容
// 选择分支 // 选择分支

@ -86,7 +86,7 @@
/******/ if (__webpack_require__.nc) { /******/ if (__webpack_require__.nc) {
/******/ script.setAttribute("nonce", __webpack_require__.nc); /******/ script.setAttribute("nonce", __webpack_require__.nc);
/******/ } /******/ }
/******/ script.src = __webpack_require__.p + "./static/js/" + ({}[chunkId]||chunkId) + "." + {"0":"1bc3d7df","1":"976094c3","2":"bc3d8cf1","3":"87056bcb","4":"baba45fe","5":"7c4b83e5","6":"bb495cba","7":"231bff40","8":"e2184916","9":"6f9ef4ac","10":"e6f0d5df","11":"d878a337","12":"fb20694d","13":"891a29d9","14":"3129051e","15":"044bdca2","16":"ec4dcede","17":"3fcd4df4","18":"105e1eb7","19":"4d5ee4fc","20":"f22140b1","21":"397df705","22":"4c8bb333","23":"aebb159d","24":"22ef380a","25":"77a31c58","26":"4a47b24f","27":"0f0040a9","28":"d40ce852","29":"4131983c","30":"54f7104f","31":"6880ce04","32":"fedb209c","33":"100ad33d","34":"4291681f","35":"32a9f338","36":"cc9fadd2","37":"f93f5966","38":"7efa37da","39":"e36275c9","40":"a2782e03","41":"ec116e1a","42":"dbcf1df2","43":"4cdbff5f","44":"9be18220","45":"7b58fdd3","46":"c1e7062a","47":"9301a210","48":"5417c295","49":"a66e9054","50":"49a23628","51":"4eb1ce58","52":"f17e0e11","53":"abef9d53","54":"74e62ba5","55":"abe23415","56":"31429d59","57":"d2da64a0","58":"2165cb51","59":"c483fe76","60":"d0d3ef52","61":"42df9549","62":"88296aa0","63":"3bac03de","64":"dfd848c1","65":"88707d5e","66":"7a7f45dc","67":"0f65cd89","68":"792bbdc2","69":"ad66f4c7","70":"adb8d0da","71":"7a76b045","72":"89e36d50","73":"6f7ce494","74":"cfa0f703","75":"385cc133","76":"5a64bd52","77":"12cf88d2","78":"2a0a496c","79":"de080f3a","80":"625007b9","81":"c2fc7f34","82":"3f3fb911","83":"b75fac03","84":"d8ec6b74","85":"9202ffba","86":"c4fa328e","87":"3c551684","88":"4e63f179","89":"5520ee99","90":"c9591325","91":"920ffa5a","92":"9e9e70b1","93":"8a6c50b0","94":"8e4cf365","95":"f1ba604f","96":"46e744a4","97":"eb363f34","98":"88d3b919","99":"bb3d2c54","100":"83f3df30","101":"0c87bf65","102":"0ce6fecf","103":"cedaeca4","104":"2169c06b","105":"929a96f0","106":"d798b463","107":"b0d826f1","108":"ec1d356b","109":"41a33a1a","110":"057de435","111":"48228f82","112":"ffd52d92","113":"dcb2ee6d","114":"c6a6e101","115":"f156a00f","116":"a317fe46","117":"ead206c4","118":"d552e90d","119":"e184d9db","120":"384d526a","121":"3b8227c6","122":"186f854f","123":"8c68d28a","124":"408ebb33","125":"12bc75c5","126":"7167d483","127":"cd709423","128":"0f3f6907","129":"6615f7e4","130":"9bf98449","131":"255c7c43","132":"36844213","133":"9f06d0a5","134":"b8a3ed43","135":"a5093954","136":"9cd53ce0","137":"689cbd5d","138":"e8e1273e","139":"80419667","140":"7c2e7a32","141":"09f4d1b2","142":"0d52a9f3","143":"cb69da0b","144":"34ac3654","145":"f92c8ac0","146":"25c24567","147":"b1b48fca","148":"8847fe03","149":"96790f46","150":"2d8568a9","151":"9b55bafe","152":"235dc8d0","153":"c66c3a72","154":"6661c864","155":"ed22d6b2","156":"a71c0de3","157":"01fef202","158":"b8182b3b","159":"eb18a707","160":"f28de0eb","161":"1289bb4c","162":"15c1b2d7","163":"c711c38f","164":"4b22c987","165":"dec54504","166":"686b2b4d","167":"7a30e1c2","168":"471f4346","169":"2649e466","170":"2de996df","171":"51f475db","172":"4764b871","173":"2709a7bb","174":"9c9c4f81","175":"1c50cd8c","176":"6ccf4497","177":"916a43d7","178":"e41d6fc9","179":"d9a714d5","180":"abba8537","181":"b42edfcd","182":"80f583b4","183":"b34ed057","184":"c7d63100","185":"9c6c47a4","186":"ddb826e1","187":"5bb529c2","188":"c0498792","189":"8748b741","190":"b38f13e9","191":"23a85f14","192":"0f28a588","193":"4d2aadc1","194":"996d34c8","195":"f5b10b42","196":"c1938f28","197":"f187b9d8","198":"3f1fe6b4","199":"45694800","200":"263ef8f9","201":"67de5466","202":"8dd9f7bd","203":"319c605d","204":"7dd26258","205":"e7b43efe","206":"0f428fc7","207":"b05232b2","208":"0f479a47","209":"45fb7894","210":"f9ead356","211":"dec10650","212":"1489d5e6","213":"41b93d37","214":"8b4e638e","215":"3f681e33","216":"1c11ff4a","217":"331d5d41","218":"d4e6c6c8","219":"8f881b85","220":"476d3205","221":"70a965d5","222":"6ff7c3b7","223":"da42fdf1","224":"8708dc05","225":"9d766db6","226":"c94ba386","227":"8318eb70","228":"be14e4ee","229":"d874d46d","230":"bacab125","231":"6bd1e3d6","232":"fab381d0","233":"4ca8923d","234":"da34a632","235":"ab39b18d","236":"4dc0b9dd","237":"c530e223","238":"fb04bcb0","239":"b524e5cf","240":"3b04fce4","241":"354099b6","242":"998125ba","243":"e1cdabfb","244":"141ea9dc","245":"66f26241","246":"e601a6c2","247":"7f43425c","248":"01a6e2ea","249":"1e8c844a","250":"27527155","251":"0b6b226f","252":"7bad99e9","253":"d9a942c0","254":"ca00cced","255":"5b01c41a","256":"6270e17d","257":"019f789a","258":"d512f87d","259":"c0a0fa96","260":"6f4efb64","261":"33c50e68","262":"e53199b9","263":"593b6526","264":"676040ff","265":"36b21858","266":"1c5a5491","267":"49d847d6","268":"ed711356","269":"97095b2d","270":"e1428571","271":"398770f4","272":"f6c4eaad"}[chunkId] + ".chunk.js"; /******/ script.src = __webpack_require__.p + "./static/js/" + ({}[chunkId]||chunkId) + "." + {"0":"1bc3d7df","1":"976094c3","2":"bc3d8cf1","3":"87056bcb","4":"baba45fe","5":"7c4b83e5","6":"bb495cba","7":"231bff40","8":"e2184916","9":"6f9ef4ac","10":"e6f0d5df","11":"d878a337","12":"fb20694d","13":"891a29d9","14":"3129051e","15":"044bdca2","16":"ec4dcede","17":"3fcd4df4","18":"105e1eb7","19":"4d5ee4fc","20":"f22140b1","21":"397df705","22":"4c8bb333","23":"aebb159d","24":"22ef380a","25":"77a31c58","26":"4a47b24f","27":"0f0040a9","28":"d40ce852","29":"4131983c","30":"54f7104f","31":"6880ce04","32":"fedb209c","33":"100ad33d","34":"4291681f","35":"32a9f338","36":"cc9fadd2","37":"f93f5966","38":"7efa37da","39":"e36275c9","40":"a2782e03","41":"ec116e1a","42":"dbcf1df2","43":"4cdbff5f","44":"9be18220","45":"7b58fdd3","46":"c1e7062a","47":"9301a210","48":"5417c295","49":"a66e9054","50":"49a23628","51":"4eb1ce58","52":"f17e0e11","53":"e60d46bb","54":"74e62ba5","55":"abe23415","56":"31429d59","57":"d2da64a0","58":"2165cb51","59":"c483fe76","60":"d0d3ef52","61":"42df9549","62":"88296aa0","63":"3bac03de","64":"48e9b5d8","65":"88707d5e","66":"dc4e725c","67":"0f65cd89","68":"792bbdc2","69":"ad66f4c7","70":"adb8d0da","71":"7a76b045","72":"fa0e7247","73":"3b15d4d7","74":"cfa0f703","75":"385cc133","76":"5a64bd52","77":"6e6cf319","78":"2a0a496c","79":"de080f3a","80":"625007b9","81":"c2fc7f34","82":"3f3fb911","83":"b75fac03","84":"8fbe53ba","85":"c3e5f813","86":"c4fa328e","87":"3c551684","88":"4e63f179","89":"693c6b3e","90":"88cf203c","91":"a6f23b34","92":"9e9e70b1","93":"8a6c50b0","94":"e00976e5","95":"f1ba604f","96":"46e744a4","97":"eb363f34","98":"88d3b919","99":"bb3d2c54","100":"83f3df30","101":"0c87bf65","102":"0ce6fecf","103":"cedaeca4","104":"2169c06b","105":"929a96f0","106":"d798b463","107":"b0d826f1","108":"ec1d356b","109":"41a33a1a","110":"057de435","111":"48228f82","112":"ffd52d92","113":"dcb2ee6d","114":"c6a6e101","115":"f156a00f","116":"a317fe46","117":"ead206c4","118":"d552e90d","119":"e184d9db","120":"384d526a","121":"3b8227c6","122":"186f854f","123":"8c68d28a","124":"408ebb33","125":"2e783f68","126":"7167d483","127":"cd709423","128":"0f3f6907","129":"6615f7e4","130":"9bf98449","131":"255c7c43","132":"36844213","133":"9f06d0a5","134":"b8a3ed43","135":"a5093954","136":"9cd53ce0","137":"689cbd5d","138":"e8e1273e","139":"80419667","140":"7c2e7a32","141":"09f4d1b2","142":"0d52a9f3","143":"cb69da0b","144":"34ac3654","145":"f92c8ac0","146":"25c24567","147":"b1b48fca","148":"8847fe03","149":"96790f46","150":"2d8568a9","151":"9b55bafe","152":"235dc8d0","153":"29c7fa4c","154":"6661c864","155":"ed22d6b2","156":"a71c0de3","157":"01fef202","158":"b8182b3b","159":"b2ac2c9d","160":"2ce62b5e","161":"1289bb4c","162":"15c1b2d7","163":"c711c38f","164":"a2076de0","165":"dec54504","166":"251b058d","167":"7a30e1c2","168":"471f4346","169":"2649e466","170":"2de996df","171":"51f475db","172":"4764b871","173":"2709a7bb","174":"9c9c4f81","175":"1c50cd8c","176":"6ccf4497","177":"916a43d7","178":"e41d6fc9","179":"d9a714d5","180":"abba8537","181":"b42edfcd","182":"52e50bd4","183":"b34ed057","184":"c7d63100","185":"9c6c47a4","186":"ddb826e1","187":"5bb529c2","188":"c0498792","189":"8748b741","190":"b38f13e9","191":"23a85f14","192":"0f28a588","193":"4d2aadc1","194":"996d34c8","195":"f5b10b42","196":"c1938f28","197":"f187b9d8","198":"3f1fe6b4","199":"ed77f6d9","200":"263ef8f9","201":"67de5466","202":"8dd9f7bd","203":"319c605d","204":"7dd26258","205":"e7b43efe","206":"0f428fc7","207":"b05232b2","208":"0f479a47","209":"45fb7894","210":"f9ead356","211":"dec10650","212":"1489d5e6","213":"41b93d37","214":"8b4e638e","215":"3f681e33","216":"1c11ff4a","217":"331d5d41","218":"d4e6c6c8","219":"8f881b85","220":"476d3205","221":"70a965d5","222":"6ff7c3b7","223":"da42fdf1","224":"8708dc05","225":"9d766db6","226":"c94ba386","227":"8318eb70","228":"be14e4ee","229":"d874d46d","230":"bacab125","231":"6bd1e3d6","232":"fab381d0","233":"4ca8923d","234":"da34a632","235":"ab39b18d","236":"4dc0b9dd","237":"c530e223","238":"fb04bcb0","239":"b524e5cf","240":"3b04fce4","241":"354099b6","242":"998125ba","243":"e1cdabfb","244":"141ea9dc","245":"66f26241","246":"e601a6c2","247":"7f43425c","248":"01a6e2ea","249":"1e8c844a","250":"27527155","251":"0b6b226f","252":"7bad99e9","253":"d9a942c0","254":"ca00cced","255":"5b01c41a","256":"6270e17d","257":"019f789a","258":"d512f87d","259":"c0a0fa96","260":"6f4efb64","261":"33c50e68","262":"e53199b9","263":"593b6526","264":"676040ff","265":"36b21858","266":"1c5a5491","267":"49d847d6","268":"ed711356","269":"97095b2d","270":"e1428571","271":"398770f4","272":"f6c4eaad"}[chunkId] + ".chunk.js";
/******/ var timeout = setTimeout(onScriptComplete, 120000); /******/ var timeout = setTimeout(onScriptComplete, 120000);
/******/ script.onerror = script.onload = onScriptComplete; /******/ script.onerror = script.onload = onScriptComplete;
/******/ function onScriptComplete() { /******/ function onScriptComplete() {
@ -74678,8 +74678,8 @@ window._debugType=debugType;function initAxiosInterceptors(props){initOnlineOffl
// https://github.com/axios/axios/issues/1497 // https://github.com/axios/axios/issues/1497
// TODO 读取到package.json中的配置 // TODO 读取到package.json中的配置
var//proxy = "http://localhost:3000" var//proxy = "http://localhost:3000"
proxy="http://123.59.135.93:56666";//proxy="http://localhost:3000" // proxy="http://123.59.135.93:56666"
// 在这里使用requestMap控制避免用户通过双击等操作发出重复的请求 proxy="http://localhost:3000";// 在这里使用requestMap控制避免用户通过双击等操作发出重复的请求
// 如果需要支持重复的请求考虑config里面自定义一个allowRepeat参考来控制 // 如果需要支持重复的请求考虑config里面自定义一个allowRepeat参考来控制
var requestMap={};window.setfalseInRequestMap=function(keyName){requestMap[keyName]=false;};__WEBPACK_IMPORTED_MODULE_3_axios___default.a.interceptors.request.use(function(config){// if (token) { // 每次发送请求之前判断是否存在token如果存在则统一在http请求的header都加上token不用每次请求都手动添加了 var requestMap={};window.setfalseInRequestMap=function(keyName){requestMap[keyName]=false;};__WEBPACK_IMPORTED_MODULE_3_axios___default.a.interceptors.request.use(function(config){// if (token) { // 每次发送请求之前判断是否存在token如果存在则统一在http请求的header都加上token不用每次请求都手动添加了
// config.headers.Authorization = token; // config.headers.Authorization = token;

@ -47,8 +47,8 @@ export function initAxiosInterceptors(props) {
// TODO 读取到package.json中的配置 // TODO 读取到package.json中的配置
var //proxy = "http://localhost:3000" var //proxy = "http://localhost:3000"
proxy="http://123.59.135.93:56666" // proxy="http://123.59.135.93:56666"
//proxy="http://localhost:3000" proxy="http://localhost:3000"
// 在这里使用requestMap控制避免用户通过双击等操作发出重复的请求 // 在这里使用requestMap控制避免用户通过双击等操作发出重复的请求
// 如果需要支持重复的请求考虑config里面自定义一个allowRepeat参考来控制 // 如果需要支持重复的请求考虑config里面自定义一个allowRepeat参考来控制

@ -278,7 +278,7 @@ class MergeDetail extends Component{
required: true, message: '请输入内容' required: true, message: '请输入内容'
}], }],
})( })(
<TextArea placeholder="添加一个可选的扩展描述。。。" style={{height:"200px"}}/> <TextArea placeholder="请输入描述内容..." style={{height:"200px"}}/>
)} )}
</Form.Item> </Form.Item>
<UploadComponent load={this.UploadFunc} isComplete={showFiles} changeIsComplete={this.changeIsComplete}></UploadComponent> <UploadComponent load={this.UploadFunc} isComplete={showFiles} changeIsComplete={this.changeIsComplete}></UploadComponent>

@ -167,7 +167,11 @@ class merge extends Component{
this.setState({ this.setState({
status_type:'1', status_type:'1',
openselect:current_user.user_id, openselect:current_user.user_id,
closeselect:undefined closeselect:undefined,
issue_tag_ids:'标签筛选',
fixed_version_ids:'里程碑筛选',
assigned_to_ids:'指派人筛选',
paix:'排序'
}) })
this.getIssueList("","","","","","","",1); this.getIssueList("","","","","","","",1);
@ -175,7 +179,11 @@ class merge extends Component{
this.setState({ this.setState({
status_type:'2', status_type:'2',
openselect:undefined, openselect:undefined,
closeselect:current_user.user_id closeselect:current_user.user_id,
issue_tag_ids:'标签筛选',
fixed_version_ids:'里程碑筛选',
assigned_to_ids:'指派人筛选',
paix:'排序'
}) })
this.getIssueList("","","","","","","",2); this.getIssueList("","","","","","","",2);
} }

@ -153,8 +153,8 @@ class Milepost extends Component{
<Menu.Item key={'created_on'} value="asc">到期日从远到近</Menu.Item> <Menu.Item key={'created_on'} value="asc">到期日从远到近</Menu.Item>
<Menu.Item key={'percent'} value="desc">完成度从低到高</Menu.Item> <Menu.Item key={'percent'} value="desc">完成度从低到高</Menu.Item>
<Menu.Item key={'percent'} value="asc">完成度从高到低</Menu.Item> <Menu.Item key={'percent'} value="asc">完成度从高到低</Menu.Item>
<Menu.Item key={'issues_count'} value="asc">工单从多到少</Menu.Item> <Menu.Item key={'issues_count'} value="desc">工单从多到少</Menu.Item>
<Menu.Item key={'issues_count'} value="desc">工单从少到多</Menu.Item> <Menu.Item key={'issues_count'} value="asc">工单从少到多</Menu.Item>
</Menu> </Menu>
) )

@ -75,12 +75,12 @@ class MilepostDetail extends Component{
} }
// 获取列表数据 // 获取列表数据
getIssueList=(page,limit,search,author_id,assigned_to_id,id,value,status_type,order_name, order_type)=>{ getIssueList=(page,limit,search,author_id,assigned_to_id,id,value,status_type, order_name, order_type)=>{
const { projectsId,meilid} = this.props.match.params; const { projectsId,meilid} = this.props.match.params;
const url = `/projects/${projectsId}/versions/${meilid}.json`; const url = `/projects/${projectsId}/versions/${meilid}.json`;
axios.get(url,{ axios.get(url,{
params:{ params:{
page,limit,search,author_id,assigned_to_id,status_type,order_name, order_type, page,limit,search,author_id,assigned_to_id,status_type,order_name,order_type,
[id]:value [id]:value
} }
}).then((result)=>{ }).then((result)=>{
@ -169,9 +169,16 @@ class MilepostDetail extends Component{
const { page,limit,search,author_id,assigned_to_id } = this.state; const { page,limit,search,author_id,assigned_to_id } = this.state;
if(e.key==="all"){ if(e.key==="all"){
this.getIssueList(page,limit,search,author_id,assigned_to_id,id); this.getIssueList(page,limit,search,author_id,assigned_to_id,id);
}else{ }else if (e.key==="created_on" || e.key==="updated_on"){
this.setState({
order_name:e.key,
order_type:e.item.props.value
})
this.getIssueList(page,limit,search,author_id,assigned_to_id,id,undefined,undefined,e.key, e.item.props.value); this.getIssueList(page,limit,search,author_id,assigned_to_id,id,undefined,undefined,e.key, e.item.props.value);
} }
else{
this.getIssueList(page,limit,search,author_id,assigned_to_id,id,e.key);
}
} }
renderMenu =(array,name,id)=>{ renderMenu =(array,name,id)=>{
@ -217,7 +224,14 @@ class MilepostDetail extends Component{
this.setState({ this.setState({
status_type:'1', status_type:'1',
openselect:current_user.user_id, openselect:current_user.user_id,
closeselect:undefined closeselect:undefined,
issue_tag_ids:'标签',
tracker_ids:'所有分类',
author_ids:'发布人',
assigned_to_ids:'指派人',
priority_ids:'优先度',
done_ratios:'完成度',
paix:'排序'
}) })
this.getIssueList("","","","","","","",1); this.getIssueList("","","","","","","",1);
@ -225,7 +239,14 @@ class MilepostDetail extends Component{
this.setState({ this.setState({
status_type:'2', status_type:'2',
openselect:undefined, openselect:undefined,
closeselect:current_user.user_id closeselect:current_user.user_id,
issue_tag_ids:'标签',
tracker_ids:'所有分类',
author_ids:'发布人',
assigned_to_ids:'指派人',
priority_ids:'优先度',
done_ratios:'完成度',
paix:'排序'
}) })
this.getIssueList("","","","","","","",2); this.getIssueList("","","","","","","",2);
} }
@ -270,15 +291,20 @@ class MilepostDetail extends Component{
</div> </div>
</div> </div>
<div className="grid-item mr10"> <div className="grid-item mr10">
<span className="mr10">
<i className="iconfont icon-rili font-14 mr5"> <i className="iconfont icon-rili font-14 mr5">
</i> </i>
{ {
data&&data.effective_date ? data&&data.effective_date ?
<span >{data&&data.effective_date} {data&&data.percent.toFixed(2)}%完成</span> <span >{data&&data.effective_date}</span>
: :
<span >暂无截止时间 {data&&data.percent.toFixed(2)}%完成</span> <span >暂无截止时间</span>
} }
</div> </span>
<span className="font-weight-bold">
{data&&data.percent.toFixed(2)}%完成
</span>
</div>
</div> </div>
<div className="topWrapper" style={{borderBottom:"none"}}> <div className="topWrapper" style={{borderBottom:"none"}}>
{/* <p className="topWrapper_type"> {/* <p className="topWrapper_type">

@ -490,4 +490,5 @@ a.issue-type-button.active:hover{background: #f4f4f4; color: #4CACFF;}
.attachment-list-div:hover .attachment-list-delete{display: block !important;} .attachment-list-div:hover .attachment-list-delete{display: block !important;}
.attachment-list-a{color: rgba(0, 0, 0, 0.65) !important;} .attachment-list-a{color: rgba(0, 0, 0, 0.65) !important;}
.btp1{border-top: 1px solid #f4f4f4;} .btp1{border-top: 1px solid #f4f4f4;}
.grid-item{display: grid; align-items: center; grid-template-columns: max-content 1fr;} .grid-item{display: grid; align-items: center; grid-template-columns: max-content 1fr;}
.fwb{font-weight: bold;}

@ -224,7 +224,14 @@ class order extends Component{
this.setState({ this.setState({
status_type:'1', status_type:'1',
openselect:current_user.user_id, openselect:current_user.user_id,
closeselect:undefined closeselect:undefined,
issue_tag_ids:'标签',
tracker_ids:'所有分类',
author_ids:'发布人',
assigned_to_ids:'指派人',
priority_ids:'优先度',
done_ratios:'完成度',
paix:'排序'
}) })
this.getIssueList("","","","","","","",1); this.getIssueList("","","","","","","",1);
@ -232,7 +239,14 @@ class order extends Component{
this.setState({ this.setState({
status_type:'2', status_type:'2',
openselect:undefined, openselect:undefined,
closeselect:current_user.user_id closeselect:current_user.user_id,
issue_tag_ids:'标签',
tracker_ids:'所有分类',
author_ids:'发布人',
assigned_to_ids:'指派人',
priority_ids:'优先度',
done_ratios:'完成度',
paix:'排序'
}) })
this.getIssueList("","","","","","","",2); this.getIssueList("","","","","","","",2);
} }
@ -253,7 +267,14 @@ class order extends Component{
this.setState({ this.setState({
page:1, page:1,
author_id:undefined, author_id:undefined,
assigned_to_id:current_user.user_id assigned_to_id:current_user.user_id,
issue_tag_ids:'标签',
tracker_ids:'所有分类',
author_ids:'发布人',
assigned_to_ids:'指派人',
priority_ids:'优先度',
done_ratios:'完成度',
paix:'排序'
}) })
this.getIssueList(1,limit,search,undefined,current_user.user_id); this.getIssueList(1,limit,search,undefined,current_user.user_id);
@ -261,7 +282,14 @@ class order extends Component{
this.setState({ this.setState({
page:1, page:1,
author_id:current_user.user_id, author_id:current_user.user_id,
assigned_to_id:undefined assigned_to_id:undefined,
issue_tag_ids:'标签',
tracker_ids:'所有分类',
author_ids:'发布人',
assigned_to_ids:'指派人',
priority_ids:'优先度',
done_ratios:'完成度',
paix:'排序'
}) })
this.getIssueList(1,limit,search,current_user.user_id,undefined); this.getIssueList(1,limit,search,current_user.user_id,undefined);
} }
@ -269,7 +297,14 @@ class order extends Component{
this.setState({ this.setState({
page:1, page:1,
author_id:undefined, author_id:undefined,
assigned_to_id:undefined assigned_to_id:undefined,
issue_tag_ids:'标签',
tracker_ids:'所有分类',
author_ids:'发布人',
assigned_to_ids:'指派人',
priority_ids:'优先度',
done_ratios:'完成度',
paix:'排序'
}) })
this.getIssueList(1,limit,search,undefined,undefined); this.getIssueList(1,limit,search,undefined,undefined);
} }

Loading…
Cancel
Save