From 30d16031764ea5bfce1a469893c444f937cafb16 Mon Sep 17 00:00:00 2001
From: chenyifan01 <cyf_uestc@outlook.com>
Date: Mon, 26 Sep 2022 14:09:37 +0800
Subject: [PATCH 001/187] #2943 add specification api

---
 models/resource_specification.go              | 26 ++++++++++++++
 routers/admin/resources.go                    |  2 +-
 routers/api/v1/api.go                         |  4 +++
 routers/api/v1/repo/spec.go                   | 36 +++++++++++++++++++
 routers/response/response.go                  |  6 +++-
 routers/response/response_list.go             |  2 ++
 .../resource/resource_specification.go        | 12 +++++++
 7 files changed, 86 insertions(+), 2 deletions(-)
 create mode 100644 routers/api/v1/repo/spec.go

diff --git a/models/resource_specification.go b/models/resource_specification.go
index 2da8d015d..f7a7dccbd 100644
--- a/models/resource_specification.go
+++ b/models/resource_specification.go
@@ -194,6 +194,32 @@ func (Specification) TableName() string {
 	return "resource_specification"
 }
 
+func (s *Specification) ToShow() *SpecificationShow {
+	return &SpecificationShow{
+		ID:              s.ID,
+		AccCardsNum:     s.AccCardsNum,
+		AccCardType:     s.AccCardType,
+		CpuCores:        s.CpuCores,
+		MemGiB:          s.MemGiB,
+		GPUMemGiB:       s.GPUMemGiB,
+		ShareMemGiB:     s.ShareMemGiB,
+		ComputeResource: s.ComputeResource,
+		UnitPrice:       s.UnitPrice,
+	}
+}
+
+type SpecificationShow struct {
+	ID              int64
+	AccCardsNum     int
+	AccCardType     string
+	CpuCores        int
+	MemGiB          float32
+	GPUMemGiB       float32
+	ShareMemGiB     float32
+	ComputeResource string
+	UnitPrice       int
+}
+
 func InsertResourceSpecification(r ResourceSpecification) (int64, error) {
 	return x.Insert(&r)
 }
diff --git a/routers/admin/resources.go b/routers/admin/resources.go
index 8a8c55f86..bbdae2609 100644
--- a/routers/admin/resources.go
+++ b/routers/admin/resources.go
@@ -182,7 +182,7 @@ func UpdateResourceSpecification(ctx *context.Context, req models.ResourceSpecif
 
 	if err != nil {
 		log.Error("UpdateResourceSpecification error. %v", err)
-		ctx.JSON(http.StatusOK, response.ResponseError(err))
+		ctx.JSON(http.StatusOK, response.ResponseBizError(err))
 		return
 	}
 	ctx.JSON(http.StatusOK, response.Success())
diff --git a/routers/api/v1/api.go b/routers/api/v1/api.go
index 0b941b400..30ca7751b 100755
--- a/routers/api/v1/api.go
+++ b/routers/api/v1/api.go
@@ -689,6 +689,10 @@ func RegisterRoutes(m *macaron.Macaron) {
 
 			m.Post("/migrate", reqToken(), bind(auth.MigrateRepoForm{}), repo.Migrate)
 
+			m.Group("/specification", func() {
+				m.Get("", repo.GetResourceSpec)
+			}, reqToken())
+
 			m.Group("/:username/:reponame", func() {
 				m.Combo("").Get(reqAnyRepoReader(), repo.Get).
 					Delete(reqToken(), reqOwner(), repo.Delete).
diff --git a/routers/api/v1/repo/spec.go b/routers/api/v1/repo/spec.go
new file mode 100644
index 000000000..1fac207c9
--- /dev/null
+++ b/routers/api/v1/repo/spec.go
@@ -0,0 +1,36 @@
+package repo
+
+import (
+	"code.gitea.io/gitea/models"
+	"code.gitea.io/gitea/modules/context"
+	"code.gitea.io/gitea/modules/log"
+	"code.gitea.io/gitea/routers/response"
+	"code.gitea.io/gitea/services/cloudbrain/resource"
+)
+
+func GetResourceSpec(ctx *context.APIContext) {
+	jobType := ctx.Query("jobType")
+	computeResource := ctx.Query("compute")
+	cluster := ctx.Query("cluster")
+	aiCenterCode := ctx.Query("center")
+	if jobType == "" || computeResource == "" || cluster == "" {
+		log.Info("GetResourceSpec api.param error")
+		ctx.JSON(200, response.ResponseBizError(response.PARAM_ERROR))
+		return
+	}
+	specs, err := resource.FindAvailableSpecs4Show(ctx.User.ID, models.FindSpecsOptions{
+		JobType:         models.JobType(jobType),
+		ComputeResource: computeResource,
+		Cluster:         cluster,
+		AiCenterCode:    aiCenterCode,
+	})
+	if err != nil {
+		log.Error("GetResourceSpec api error. %v", err)
+		ctx.JSON(200, response.ResponseError(err))
+		return
+	}
+
+	specMap := make(map[string]interface{}, 0)
+	specMap["Specs"] = specs
+	ctx.JSON(200, response.SuccessWithData(specMap))
+}
diff --git a/routers/response/response.go b/routers/response/response.go
index ccd6be445..ff654e5dc 100644
--- a/routers/response/response.go
+++ b/routers/response/response.go
@@ -24,10 +24,14 @@ func ServerError(msg string) *AiforgeResponse {
 	return &AiforgeResponse{Code: RESPONSE_CODE_ERROR_DEFAULT, Msg: msg}
 }
 
-func ResponseError(err *BizError) *AiforgeResponse {
+func ResponseBizError(err *BizError) *AiforgeResponse {
 	return &AiforgeResponse{Code: err.Code, Msg: err.Err}
 }
 
+func ResponseError(err error) *AiforgeResponse {
+	return &AiforgeResponse{Code: RESPONSE_CODE_ERROR_DEFAULT, Msg: err.Error()}
+}
+
 func SuccessWithData(data interface{}) *AiforgeResponse {
 	return &AiforgeResponse{Code: RESPONSE_CODE_SUCCESS, Msg: RESPONSE_MSG_SUCCESS, Data: data}
 }
diff --git a/routers/response/response_list.go b/routers/response/response_list.go
index 6514f3edd..7807813c6 100644
--- a/routers/response/response_list.go
+++ b/routers/response/response_list.go
@@ -1,5 +1,7 @@
 package response
 
+var PARAM_ERROR = &BizError{Code: 9001, Err: "param error"}
+
 var RESOURCE_QUEUE_NOT_AVAILABLE = &BizError{Code: 1001, Err: "resource queue not available"}
 var SPECIFICATION_NOT_EXIST = &BizError{Code: 1002, Err: "specification not exist"}
 var SPECIFICATION_NOT_AVAILABLE = &BizError{Code: 1003, Err: "specification not available"}
diff --git a/services/cloudbrain/resource/resource_specification.go b/services/cloudbrain/resource/resource_specification.go
index b68abbb88..c0b20b21a 100644
--- a/services/cloudbrain/resource/resource_specification.go
+++ b/services/cloudbrain/resource/resource_specification.go
@@ -210,6 +210,18 @@ func FindAvailableSpecs(userId int64, opts models.FindSpecsOptions) ([]*models.S
 	return specs, err
 }
 
+func FindAvailableSpecs4Show(userId int64, opts models.FindSpecsOptions) ([]*models.SpecificationShow, error) {
+	specs, err := FindAvailableSpecs(userId, opts)
+	if err != nil {
+		return nil, err
+	}
+	result := make([]*models.SpecificationShow, len(specs))
+	for i, v := range specs {
+		result[i] = v.ToShow()
+	}
+	return result, nil
+}
+
 func filterExclusiveSpecs(r []*models.Specification, userId int64) []*models.Specification {
 	specs := make([]*models.Specification, 0, len(r))
 	specMap := make(map[int64]string, 0)

From 5455a2b277119d25c487d49cf825a7c84d860189 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Mon, 24 Oct 2022 17:00:14 +0800
Subject: [PATCH 002/187] =?UTF-8?q?=E9=80=82=E9=85=8Drestful=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=EF=BC=8C=E5=B0=86=E4=BA=A4=E4=BA=92=E7=9A=84=E5=B1=9E?=
 =?UTF-8?q?=E6=80=A7=E5=85=A8=E9=83=A8=E6=9B=B4=E6=94=B9=E4=B8=BA=E5=B0=8F?=
 =?UTF-8?q?=E5=86=99=E5=BC=80=E5=A4=B4=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 models/ai_model_manage.go                    | 116 +++++++-------
 routers/api/v1/api.go                        |   3 +
 routers/api/v1/repo/modelmanage.go           |  30 ++++
 routers/repo/ai_model_convert.go             |  32 ++--
 routers/repo/ai_model_manage.go              |  54 ++++---
 templates/repo/modelmanage/convertIndex.tmpl |  22 +--
 templates/repo/modelmanage/index.tmpl        |  54 +++----
 templates/repo/modelmanage/showinfo.tmpl     | 106 ++++++-------
 web_src/js/components/Model.vue              | 156 +++++++++----------
 9 files changed, 311 insertions(+), 262 deletions(-)
 create mode 100644 routers/api/v1/repo/modelmanage.go

diff --git a/models/ai_model_manage.go b/models/ai_model_manage.go
index a88da8fe5..7005b7923 100644
--- a/models/ai_model_manage.go
+++ b/models/ai_model_manage.go
@@ -12,67 +12,67 @@ import (
 )
 
 type AiModelManage struct {
-	ID                string `xorm:"pk"`
-	Name              string `xorm:"INDEX NOT NULL"`
-	Version           string `xorm:"NOT NULL"`
-	VersionCount      int    `xorm:"NOT NULL DEFAULT 0"`
-	New               int    `xorm:"NOT NULL"`
-	Type              int    `xorm:"NOT NULL"`
-	Size              int64  `xorm:"NOT NULL"`
-	Description       string `xorm:"varchar(2000)"`
-	Label             string `xorm:"varchar(1000)"`
-	Path              string `xorm:"varchar(400) NOT NULL"`
-	DownloadCount     int    `xorm:"NOT NULL DEFAULT 0"`
-	Engine            int64  `xorm:"NOT NULL DEFAULT 0"`
-	Status            int    `xorm:"NOT NULL DEFAULT 0"`
-	StatusDesc        string `xorm:"varchar(500)"`
-	Accuracy          string `xorm:"varchar(1000)"`
-	AttachmentId      string `xorm:"NULL"`
-	RepoId            int64  `xorm:"INDEX NULL"`
-	CodeBranch        string `xorm:"varchar(400) NULL"`
-	CodeCommitID      string `xorm:"NULL"`
-	UserId            int64  `xorm:"NOT NULL"`
-	UserName          string
-	UserRelAvatarLink string
-	TrainTaskInfo     string             `xorm:"text NULL"`
-	CreatedUnix       timeutil.TimeStamp `xorm:"created"`
-	UpdatedUnix       timeutil.TimeStamp `xorm:"updated"`
-	IsCanOper         bool
-	IsCanDelete       bool
+	ID                string             `xorm:"pk" json:"id"`
+	Name              string             `xorm:"INDEX NOT NULL" json:"name"`
+	Version           string             `xorm:"NOT NULL" json:"version"`
+	VersionCount      int                `xorm:"NOT NULL DEFAULT 0" json:"versionCount"`
+	New               int                `xorm:"NOT NULL" json:"new"`
+	Type              int                `xorm:"NOT NULL" json:"type"`
+	Size              int64              `xorm:"NOT NULL" json:"size"`
+	Description       string             `xorm:"varchar(2000)" json:"description"`
+	Label             string             `xorm:"varchar(1000)" json:"label"`
+	Path              string             `xorm:"varchar(400) NOT NULL" json:"path"`
+	DownloadCount     int                `xorm:"NOT NULL DEFAULT 0" json:"downloadCount"`
+	Engine            int64              `xorm:"NOT NULL DEFAULT 0" json:"engine"`
+	Status            int                `xorm:"NOT NULL DEFAULT 0" json:"status"`
+	StatusDesc        string             `xorm:"varchar(500)" json:"statusDesc"`
+	Accuracy          string             `xorm:"varchar(1000)" json:"accuracy"`
+	AttachmentId      string             `xorm:"NULL" json:"attachmentId"`
+	RepoId            int64              `xorm:"INDEX NULL" json:"repoId"`
+	CodeBranch        string             `xorm:"varchar(400) NULL" json:"codeBranch"`
+	CodeCommitID      string             `xorm:"NULL" json:"codeCommitID"`
+	UserId            int64              `xorm:"NOT NULL" json:"userId"`
+	UserName          string             `json:"userName"`
+	UserRelAvatarLink string             `json:"userRelAvatarLink"`
+	TrainTaskInfo     string             `xorm:"text NULL" json:"trainTaskInfo"`
+	CreatedUnix       timeutil.TimeStamp `xorm:"created" json:"createdUnix"`
+	UpdatedUnix       timeutil.TimeStamp `xorm:"updated" json:"updatedUnix"`
+	IsCanOper         bool               `json:"isCanOper"`
+	IsCanDelete       bool               `json:"isCanDelete"`
 }
 
 type AiModelConvert struct {
-	ID                 string `xorm:"pk"`
-	Name               string `xorm:"INDEX NOT NULL"`
-	Status             string `xorm:"NULL"`
-	StatusResult       string `xorm:"NULL"`
-	SrcEngine          int    `xorm:"NOT NULL DEFAULT 0"`
-	RepoId             int64  `xorm:"INDEX NULL"`
-	ModelId            string `xorm:"NOT NULL"`
-	ModelName          string `xorm:"NULL"`
-	ModelVersion       string `xorm:"NOT NULL"`
-	ModelPath          string `xorm:"NULL"`
-	DestFormat         int    `xorm:"NOT NULL DEFAULT 0"`
-	NetOutputFormat    int    `xorm:"NULL"`
-	UserId             int64  `xorm:"NOT NULL"`
-	CloudBrainTaskId   string `xorm:"NULL"`
-	ModelArtsVersionId string `xorm:"NULL"`
-	ContainerID        string
-	ContainerIp        string
-	RunTime            int64 `xorm:"NULL"`
-	TrainJobDuration   string
-	InputShape         string             `xorm:"varchar(2000)"`
-	InputDataFormat    string             `xorm:"NOT NULL"`
-	Description        string             `xorm:"varchar(2000)"`
-	Path               string             `xorm:"varchar(400) NOT NULL"`
-	CreatedUnix        timeutil.TimeStamp `xorm:"created"`
-	UpdatedUnix        timeutil.TimeStamp `xorm:"updated"`
-	StartTime          timeutil.TimeStamp
-	EndTime            timeutil.TimeStamp
-	UserName           string
-	UserRelAvatarLink  string
-	IsCanOper          bool
-	IsCanDelete        bool
+	ID                 string             `xorm:"pk" json:"id"`
+	Name               string             `xorm:"INDEX NOT NULL" json:"name"`
+	Status             string             `xorm:"NULL" json:"status"`
+	StatusResult       string             `xorm:"NULL" json:"statusResult"`
+	SrcEngine          int                `xorm:"NOT NULL DEFAULT 0" json:"srcEngine"`
+	RepoId             int64              `xorm:"INDEX NULL" json:"repoId"`
+	ModelId            string             `xorm:"NOT NULL" json:"modelId"`
+	ModelName          string             `xorm:"NULL" json:"modelName"`
+	ModelVersion       string             `xorm:"NOT NULL" json:"modelVersion"`
+	ModelPath          string             `xorm:"NULL" json:"modelPath"`
+	DestFormat         int                `xorm:"NOT NULL DEFAULT 0" json:"destFormat"`
+	NetOutputFormat    int                `xorm:"NULL" json:"netOutputFormat"`
+	UserId             int64              `xorm:"NOT NULL" json:"userId"`
+	CloudBrainTaskId   string             `xorm:"NULL" json:"cloudBrainTaskId"`
+	ModelArtsVersionId string             `xorm:"NULL" json:"modelArtsVersionId"`
+	ContainerID        string             `json:"containerID"`
+	ContainerIp        string             `json:"containerIp"`
+	RunTime            int64              `xorm:"NULL" json:"runTime"`
+	TrainJobDuration   string             `json:"trainJobDuration"`
+	InputShape         string             `xorm:"varchar(2000)" json:"inputShape"`
+	InputDataFormat    string             `xorm:"NOT NULL" json:"inputDataFormat"`
+	Description        string             `xorm:"varchar(2000)" json:"description"`
+	Path               string             `xorm:"varchar(400) NOT NULL" json:"path"`
+	CreatedUnix        timeutil.TimeStamp `xorm:"created" json:"createdUnix"`
+	UpdatedUnix        timeutil.TimeStamp `xorm:"updated" json:"updatedUnix"`
+	StartTime          timeutil.TimeStamp `json:"startTime"`
+	EndTime            timeutil.TimeStamp `json:"endTime"`
+	UserName           string             `json:"userName"`
+	UserRelAvatarLink  string             `json:"userRelAvatarLink"`
+	IsCanOper          bool               `json:"isCanOper"`
+	IsCanDelete        bool               `json:"isCanDelete"`
 }
 
 type AiModelQueryOptions struct {
diff --git a/routers/api/v1/api.go b/routers/api/v1/api.go
index 8e1d725ed..7667cfcfa 100755
--- a/routers/api/v1/api.go
+++ b/routers/api/v1/api.go
@@ -947,6 +947,9 @@ func RegisterRoutes(m *macaron.Macaron) {
 					})
 				}, reqRepoReader(models.UnitTypeCloudBrain))
 				m.Group("/modelmanage", func() {
+					m.Post("/create_new_model", repo.CreateNewModel)
+					m.Get("/show_model_api", repo.ShowModelManageApi)
+					m.Delete("/delete_model", repo.DeleteModel)
 					m.Get("/:id", repo.GetCloudbrainModelConvertTask)
 					m.Get("/:id/log", repo.CloudbrainForModelConvertGetLog)
 					m.Get("/:id/modelartlog", repo.TrainJobForModelConvertGetLog)
diff --git a/routers/api/v1/repo/modelmanage.go b/routers/api/v1/repo/modelmanage.go
new file mode 100644
index 000000000..fce7cd886
--- /dev/null
+++ b/routers/api/v1/repo/modelmanage.go
@@ -0,0 +1,30 @@
+package repo
+
+import (
+	"code.gitea.io/gitea/modules/context"
+	"code.gitea.io/gitea/modules/log"
+	routerRepo "code.gitea.io/gitea/routers/repo"
+)
+
+func CreateNewModel(ctx *context.APIContext) {
+	log.Info("create new model by api.")
+	ctx.Context.SetParams("JobId", ctx.Query("jobId"))
+	ctx.Context.SetParams("VersionName", ctx.Query("versionName"))
+	ctx.Context.SetParams("Name", ctx.Query("name"))
+	ctx.Context.SetParams("Version", ctx.Query("version"))
+	ctx.Context.SetParams("Engine", ctx.Query("engine"))
+	ctx.Context.SetParams("modelSelectedFile", ctx.Query("modelSelectedFile"))
+	ctx.Context.SetParams("Label", ctx.Query("label"))
+	ctx.Context.SetParams("Description", ctx.Query("description"))
+
+	routerRepo.SaveModel(ctx.Context)
+
+}
+
+func ShowModelManageApi(ctx *context.APIContext) {
+	routerRepo.ShowModelPageInfo(ctx.Context)
+}
+
+func DeleteModel(ctx *context.APIContext) {
+	routerRepo.DeleteModel(ctx.Context)
+}
diff --git a/routers/repo/ai_model_convert.go b/routers/repo/ai_model_convert.go
index 9a5874956..27ff0091f 100644
--- a/routers/repo/ai_model_convert.go
+++ b/routers/repo/ai_model_convert.go
@@ -72,27 +72,27 @@ func SaveModelConvert(ctx *context.Context) {
 	log.Info("save model convert start.")
 	if !ctx.Repo.CanWrite(models.UnitTypeModelManage) {
 		ctx.JSON(200, map[string]string{
-			"result_code": "1",
-			"message":     ctx.Tr("repo.modelconvert.manage.no_operate_right"),
+			"code": "1",
+			"msg":  ctx.Tr("repo.modelconvert.manage.no_operate_right"),
 		})
 		return
 	}
 	name := ctx.Query("name")
 	desc := ctx.Query("desc")
 	modelId := ctx.Query("modelId")
-	modelPath := ctx.Query("ModelFile")
-	SrcEngine := ctx.QueryInt("SrcEngine")
+	modelPath := ctx.Query("modelFile")
+	SrcEngine := ctx.QueryInt("srcEngine")
 	InputShape := ctx.Query("inputshape")
 	InputDataFormat := ctx.Query("inputdataformat")
-	DestFormat := ctx.QueryInt("DestFormat")
-	NetOutputFormat := ctx.QueryInt("NetOutputFormat")
+	DestFormat := ctx.QueryInt("destFormat")
+	NetOutputFormat := ctx.QueryInt("netOutputFormat")
 
 	task, err := models.QueryModelById(modelId)
 	if err != nil {
 		log.Error("no such model!", err.Error())
 		ctx.JSON(200, map[string]string{
-			"result_code": "1",
-			"message":     ctx.Tr("repo.modelconvert.manage.model_not_exist"),
+			"code": "1",
+			"msg":  ctx.Tr("repo.modelconvert.manage.model_not_exist"),
 		})
 		return
 	}
@@ -103,8 +103,8 @@ func SaveModelConvert(ctx *context.Context) {
 			if convert.Name == name {
 				log.Info("convert.Name=" + name + " convert.id=" + convert.ID)
 				ctx.JSON(200, map[string]string{
-					"result_code": "1",
-					"message":     ctx.Tr("repo.modelconvert.manage.create_error1"),
+					"code": "1",
+					"msg":  ctx.Tr("repo.modelconvert.manage.create_error1"),
 				})
 				return
 			}
@@ -117,8 +117,8 @@ func SaveModelConvert(ctx *context.Context) {
 			if isRunningTask(convert.Status) {
 				log.Info("convert.Status=" + convert.Status + " convert.id=" + convert.ID)
 				ctx.JSON(200, map[string]string{
-					"result_code": "1",
-					"message":     ctx.Tr("repo.modelconvert.manage.create_error2"),
+					"code": "1",
+					"msg":  ctx.Tr("repo.modelconvert.manage.create_error2"),
 				})
 				return
 			}
@@ -148,7 +148,7 @@ func SaveModelConvert(ctx *context.Context) {
 	go goCreateTask(modelConvert, ctx, task)
 
 	ctx.JSON(200, map[string]string{
-		"result_code": "0",
+		"code": "0",
 	})
 }
 
@@ -588,11 +588,11 @@ func StopModelConvert(ctx *context.Context) {
 }
 
 func ShowModelConvertInfo(ctx *context.Context) {
-	ctx.Data["ID"] = ctx.Query("ID")
+	ctx.Data["ID"] = ctx.Query("id")
 	ctx.Data["isModelManage"] = true
 	ctx.Data["ModelManageAccess"] = ctx.Repo.CanWrite(models.UnitTypeModelManage)
 
-	job, err := models.QueryModelConvertById(ctx.Query("ID"))
+	job, err := models.QueryModelConvertById(ctx.Query("id"))
 	if err == nil {
 		if job.TrainJobDuration == "" {
 			job.TrainJobDuration = "00:00:00"
@@ -741,7 +741,7 @@ func ModelConvertDownloadModel(ctx *context.Context) {
 		ctx.ServerError("Not found task.", err)
 		return
 	}
-	AllDownload := ctx.QueryBool("AllDownload")
+	AllDownload := ctx.QueryBool("allDownload")
 	if AllDownload {
 		if job.IsGpuTrainTask() {
 			path := setting.CBCodePathPrefix + job.ID + "/model/"
diff --git a/routers/repo/ai_model_manage.go b/routers/repo/ai_model_manage.go
index 5b358b83b..6385cc674 100644
--- a/routers/repo/ai_model_manage.go
+++ b/routers/repo/ai_model_manage.go
@@ -175,7 +175,7 @@ func SaveNewNameModel(ctx *context.Context) {
 		ctx.Error(403, ctx.Tr("repo.model_noright"))
 		return
 	}
-	name := ctx.Query("Name")
+	name := ctx.Query("name")
 	if name == "" {
 		ctx.Error(500, fmt.Sprintf("name or version is null."))
 		return
@@ -197,13 +197,13 @@ func SaveModel(ctx *context.Context) {
 		return
 	}
 	log.Info("save model start.")
-	JobId := ctx.Query("JobId")
-	VersionName := ctx.Query("VersionName")
-	name := ctx.Query("Name")
-	version := ctx.Query("Version")
-	label := ctx.Query("Label")
-	description := ctx.Query("Description")
-	engine := ctx.QueryInt("Engine")
+	JobId := ctx.Query("jobId")
+	VersionName := ctx.Query("versionName")
+	name := ctx.Query("name")
+	version := ctx.Query("version")
+	label := ctx.Query("label")
+	description := ctx.Query("description")
+	engine := ctx.QueryInt("engine")
 	modelSelectedFile := ctx.Query("modelSelectedFile")
 	log.Info("engine=" + fmt.Sprint(engine) + " modelSelectedFile=" + modelSelectedFile)
 
@@ -293,13 +293,17 @@ func downloadModelFromCloudBrainOne(modelUUID string, jobName string, parentDir
 
 func DeleteModel(ctx *context.Context) {
 	log.Info("delete model start.")
-	id := ctx.Query("ID")
+	id := ctx.Query("id")
 	err := deleteModelByID(ctx, id)
 	if err != nil {
-		ctx.JSON(500, err.Error())
+		re := map[string]string{
+			"code": "-1",
+		}
+		re["msg"] = err.Error()
+		ctx.JSON(200, re)
 	} else {
 		ctx.JSON(200, map[string]string{
-			"result_code": "0",
+			"code": "0",
 		})
 	}
 }
@@ -356,7 +360,7 @@ func QueryModelByParameters(repoId int64, page int) ([]*models.AiModelManage, in
 
 func DownloadMultiModelFile(ctx *context.Context) {
 	log.Info("DownloadMultiModelFile start.")
-	id := ctx.Query("ID")
+	id := ctx.Query("id")
 	log.Info("id=" + id)
 	task, err := models.QueryModelById(id)
 	if err != nil {
@@ -489,7 +493,10 @@ func downloadFromCloudBrainTwo(path string, task *models.AiModelManage, ctx *con
 
 func QueryTrainJobVersionList(ctx *context.Context) {
 	log.Info("query train job version list. start.")
-	JobID := ctx.Query("JobID")
+	JobID := ctx.Query("jobId")
+	if JobID == "" {
+		JobID = ctx.Query("JobId")
+	}
 
 	VersionListTasks, count, err := models.QueryModelTrainJobVersionList(JobID)
 
@@ -521,7 +528,10 @@ func QueryTrainModelList(ctx *context.Context) {
 	log.Info("query train job list. start.")
 	jobName := ctx.Query("jobName")
 	taskType := ctx.QueryInt("type")
-	VersionName := ctx.Query("VersionName")
+	VersionName := ctx.Query("versionName")
+	if VersionName == "" {
+		VersionName = ctx.Query("VersionName")
+	}
 	if taskType == models.TypeCloudBrainTwo {
 		objectkey := path.Join(setting.TrainJobModelPath, jobName, setting.OutPutPath, VersionName) + "/"
 		modelDbResult, err := storage.GetAllObjectByBucketAndPrefix(setting.Bucket, objectkey)
@@ -614,7 +624,7 @@ func DownloadSingleModelFile(ctx *context.Context) {
 }
 
 func ShowModelInfo(ctx *context.Context) {
-	ctx.Data["ID"] = ctx.Query("ID")
+	ctx.Data["ID"] = ctx.Query("id")
 	ctx.Data["name"] = ctx.Query("name")
 	ctx.Data["isModelManage"] = true
 	ctx.Data["ModelManageAccess"] = ctx.Repo.CanWrite(models.UnitTypeModelManage)
@@ -830,8 +840,8 @@ func ModifyModel(id string, description string) error {
 
 func ModifyModelInfo(ctx *context.Context) {
 	log.Info("modify model start.")
-	id := ctx.Query("ID")
-	description := ctx.Query("Description")
+	id := ctx.Query("id")
+	description := ctx.Query("description")
 
 	task, err := models.QueryModelById(id)
 	if err != nil {
@@ -896,7 +906,10 @@ func QueryModelListForPredict(ctx *context.Context) {
 }
 
 func QueryModelFileForPredict(ctx *context.Context) {
-	id := ctx.Query("ID")
+	id := ctx.Query("id")
+	if id == "" {
+		id = ctx.Query("ID")
+	}
 	model, err := models.QueryModelById(id)
 	if err == nil {
 		if model.Type == models.TypeCloudBrainTwo {
@@ -917,7 +930,10 @@ func QueryModelFileForPredict(ctx *context.Context) {
 }
 
 func QueryOneLevelModelFile(ctx *context.Context) {
-	id := ctx.Query("ID")
+	id := ctx.Query("id")
+	if id == "" {
+		id = ctx.Query("ID")
+	}
 	parentDir := ctx.Query("parentDir")
 	model, err := models.QueryModelById(id)
 	if err != nil {
diff --git a/templates/repo/modelmanage/convertIndex.tmpl b/templates/repo/modelmanage/convertIndex.tmpl
index 92eefca2e..36b763174 100644
--- a/templates/repo/modelmanage/convertIndex.tmpl
+++ b/templates/repo/modelmanage/convertIndex.tmpl
@@ -366,7 +366,7 @@
 
         data['desc']= $('#Description').val()
         data['modelId'] = $('#ModelVersion').val()
-        data['SrcEngine'] = $('#SrcEngine').val();
+        data['srcEngine'] = $('#SrcEngine').val();
         data['inputshape']= $('#inputshape').val();
 
         if(inputshapeNotValid(data['inputshape'])){
@@ -379,10 +379,10 @@
         }
 
         data['inputdataformat']= $('#inputdataformat').val();
-        data['DestFormat'] = $('#DestFormat').val();
-        data['NetOutputFormat']= $('#NetOutputFormat').val();
-        data['ModelFile'] = $('#ModelFile').val();
-        if(data['ModelFile']==""){
+        data['destFormat'] = $('#DestFormat').val();
+        data['netOutputFormat']= $('#NetOutputFormat').val();
+        data['modelFile'] = $('#ModelFile').val();
+        if(data['modelFile']==""){
             $('.ui.error.message').text("{{.i18n.Tr "repo.modelconvert.modelfileempty"}}")
             $('.ui.error.message').css('display','block')
             $("#ModelFile_Div").addClass("error")
@@ -392,11 +392,11 @@
         }
         $.post(`${repolink}/modelmanage/create_model_convert`,data,(result) => {
             console.log("result=" + result);
-            if(result.result_code ==0){
+            if(result.code ==0){
                 $('.ui.modal.second').modal('hide');
                 window.location.reload();
             }else{
-                $('.ui.error.message').text(result.message)
+                $('.ui.error.message').text(result.msg)
                 $('.ui.error.message').css('display','block')
             }
         })
@@ -509,7 +509,7 @@
         if(modelId ==null || modelId ==""){
              console.log("modelId is null");
         }else{
-            $.get(`${repolink}/modelmanage/query_modelfile_for_predict?ID=${modelId}`, (data) => {
+            $.get(`${repolink}/modelmanage/query_modelfile_for_predict?id=${modelId}`, (data) => {
                 const n_length = data.length
                 let file_html=''
                 let firstFileName =''
@@ -578,13 +578,13 @@
         let nameMap = modelData.nameMap
         let versionList = nameMap[modelName]
         if(versionList != null && versionList.length >0){
-            if(versionList[0].Engine == engineOption){
+            if(versionList[0].engine == engineOption){
                 return "selected=\"selected\"";
             }else{
-                if((versionList[0].Engine==122 || versionList[0].Engine==37) && engineOption==2){
+                if((versionList[0].engine==122 || versionList[0].engine==37) && engineOption==2){
                     return "selected=\"selected\"";
                 }
-                if((versionList[0].Engine==121 || versionList[0].Engine==38) && engineOption==1){
+                if((versionList[0].engine==121 || versionList[0].engine==38) && engineOption==1){
                     return "selected=\"selected\"";
                 }
             }
diff --git a/templates/repo/modelmanage/index.tmpl b/templates/repo/modelmanage/index.tmpl
index b2994f0c2..9716637ed 100644
--- a/templates/repo/modelmanage/index.tmpl
+++ b/templates/repo/modelmanage/index.tmpl
@@ -138,20 +138,20 @@
                 <input type="hidden" name="_csrf" value="">
                 <div class="inline fields">
                     <div class="required two wide field right aligned">
-                        <label for="JobId">{{.i18n.Tr "repo.model.manage.select.trainjob"}}</label>
+                        <label for="jobId">{{.i18n.Tr "repo.model.manage.select.trainjob"}}</label>
                     </div>
                     <div class="required thirteen wide inline field">
                         <div class="ui dropdown selection search loading" id="choice_model">
-                            <input type="hidden" id="JobId" name="JobId" required>
+                            <input type="hidden" id="jobId" name="jobId" required>
                             <div class="default text">{{.i18n.Tr "repo.model.manage.select.trainjob"}}</div>
                             <i class="dropdown icon"></i>
                             <div class="menu" id="job-name">
                             </div>
                         </div>
-                        <label for="VersionName">{{.i18n.Tr "repo.model.manage.version"}}</label>
+                        <label for="versionName">{{.i18n.Tr "repo.model.manage.version"}}</label>
                         <span>&nbsp;</span>
                         <div class="ui dropdown selection search" id="choice_version">
-                            <input type="hidden" id="VersionName" name="VersionName" required>
+                            <input type="hidden" id="versionName" name="versionName" required>
                             <div class="default text">{{.i18n.Tr "repo.model.manage.select.version"}}</div>
                             <i class="dropdown icon"></i>
                             <div class="menu" id="job-version">
@@ -162,18 +162,18 @@
                 </div>
                 <div class="required inline fields" id="modelname">
                     <div class="two wide field right aligned">
-                        <label for="Name">{{.i18n.Tr "repo.model.manage.model_name"}}</label>
+                        <label for="name">{{.i18n.Tr "repo.model.manage.model_name"}}</label>
                     </div>
                     <div class="eight wide field">
-                        <input id="name" name="Name" required maxlength="25" onkeyup="this.value=this.value.replace(/[, ]/g,'')">
+                        <input id="name" name="name" required maxlength="25" onkeyup="this.value=this.value.replace(/[, ]/g,'')">
                     </div>
                 </div>
-                <div class="required inline fields" id="verionname">
+                <div class="required inline fields" id="verionName">
                     <div class="two wide field right aligned">
-                        <label for="Version">{{.i18n.Tr "repo.model.manage.version"}}</label>
+                        <label for="version">{{.i18n.Tr "repo.model.manage.version"}}</label>
                     </div>
                     <div class="eight wide field">
-                        <input id="version" name="Version" value="" readonly required maxlength="255">
+                        <input id="version" name="version" value="" readonly required maxlength="255">
                     </div>
                 </div>
 
@@ -182,7 +182,7 @@
                         <label for="Engine">{{.i18n.Tr "repo.model.manage.engine"}}</label>
                     </div>
                     <div class="ui ten wide field dropdown selection search" id="choice_Engine">
-                        <input type="hidden" id="Engine" name="Engine" required>
+                        <input type="hidden" id="engine" name="engine" required>
                         <div class="default text newtext">{{.i18n.Tr "repo.model.manage.select.engine"}}</div>
                         <i class="dropdown icon"></i>
                         <div class="menu" id="job-Engine">
@@ -209,7 +209,7 @@
                         <label for="Label">{{.i18n.Tr "repo.model.manage.modellabel"}} &nbsp</label>
                     </div>
                     <div class="thirteen wide field">
-                        <input id="label" name="Label" maxlength="255" placeholder='{{.i18n.Tr "repo.modelarts.train_job.label_place"}}'>
+                        <input id="label" name="label" maxlength="255" placeholder='{{.i18n.Tr "repo.modelarts.train_job.label_place"}}'>
                     </div>    
                 </div>
                 <div class="inline fields">
@@ -217,7 +217,7 @@
                         <label for="description">{{.i18n.Tr "repo.model.manage.modeldesc"}} &nbsp</label>
                     </div>
                     <div class="thirteen wide field">
-                        <textarea id="Description" name="Description" rows="3"
+                        <textarea id="description" name="description" rows="3"
                             maxlength="255" placeholder='{{.i18n.Tr "repo.modelarts.train_job.new_place"}}'
                             onchange="this.value=this.value.substring(0, 255)"
                             onkeydown="this.value=this.value.substring(0, 255)"
@@ -331,7 +331,7 @@
                     centered: false,
                     onShow: function () {
                         $('#model_header').text({{.i18n.Tr "repo.model.manage.import_new_model"}})
-                        $('input[name="Version"]').addClass('model_disabled')
+                        $('input[name="version"]').addClass('model_disabled')
                         $('.ui.dimmer').css({ "background-color": "rgb(136, 136, 136,0.7)" })
                         $("#job-name").empty()
                         createModelName()
@@ -368,7 +368,7 @@
                     console.log("model version:" + value);
                     if (modelData != null) {
                         for (var i = 0; i < modelData.length; i++) {
-                            if (modelData[i].VersionName == value) {
+                            if (modelData[i].versionName == value) {
                                 setEngine(modelData[i])
                                 loadModelFile(modelData[i])
                                 break;
@@ -400,13 +400,13 @@
                 if(n_length > 0){
                     let train_html = ''
                     for (let i = 0; i < n_length; i++) {
-                        train_html += `<div class="item" data-value="${data[i].JobID}">${data[i].DisplayJobName}</div>`
+                        train_html += `<div class="item" data-value="${data[i].jobId}">${data[i].displayJobName}</div>`
                         train_html += '</div>'
                     }
                     $("#job-name").append(train_html)
                     $("#choice_model").removeClass("loading")
-                    $('#choice_model .default.text').text(data[0].DisplayJobName)
-                    $('#choice_model input[name="JobId"]').val(data[0].JobID)
+                    $('#choice_model .default.text').text(data[0].displayJobName)
+                    $('#choice_model input[name="jobId"]').val(data[0].jobId)
                     loadTrainVersion()
                 }else{
                     $("#choice_model").removeClass("loading")
@@ -414,24 +414,24 @@
             })
         }
         function loadTrainVersion(value) {
-            let JobID = !value ? $('#choice_model input[name="JobId"]').val() : value
-            $.get(`${repolink}/modelmanage/query_train_job_version?JobID=${JobID}`, (data) => {
+            let jobId = !value ? $('#choice_model input[name="jobId"]').val() : value
+            $.get(`${repolink}/modelmanage/query_train_job_version?jobId=${jobId}`, (data) => {
                 const n_length = data.length
                 let train_html = '';
                 modelData = data;
                 for (let i = 0; i < n_length; i++) {
-                    train_html += `<div class="item" data-value="${data[i].VersionName}">${data[i].VersionName}</div>`
+                    train_html += `<div class="item" data-value="${data[i].versionName}">${data[i].versionName}</div>`
                     train_html += '</div>'
                 }
                 if (data.length) {
                     $("#job-version").append(train_html)
                     $("#choice_version").removeClass("loading")
-                    var versionName = data[0].VersionName;
+                    var versionName = data[0].versionName;
                     if (versionName == null || versionName == "") {
                         versionName = "V0001";
                     }
                     $('#choice_version .default.text').text(versionName)
-                    $('#choice_version input[name="VersionName"]').val(versionName)
+                    $('#choice_version input[name="versionName"]').val(versionName)
                     setEngine(data[0])
                     loadModelFile(data[0])
                 }
@@ -453,7 +453,7 @@
                         type=0;
                     }
                 }
-                $.get(`${repolink}/modelmanage/query_train_model?jobName=${trainJob.JobName}&type=${type}&VersionName=${trainJob.VersionName}`, (data) => {
+                $.get(`${repolink}/modelmanage/query_train_model?jobName=${trainJob.JobName}&type=${type}&versionName=${trainJob.versionName}`, (data) => {
                     const n_length = data.length
                     let file_html=''
                     let firstFileName =''
@@ -522,8 +522,8 @@
             console.log("modelVersion=" + modelVersion);
             $('#choice_Engine').dropdown('clear')
             $("#job-Engine").empty()
-            if (modelVersion.EngineName != null && modelVersion.EngineName != "") {
-                srcEngine = modelVersion.EngineName.split('-')[0]
+            if (modelVersion.engineName != null && modelVersion.engineName != "") {
+                srcEngine = modelVersion.engineName.split('-')[0]
                 srcEngine = srcEngine.trim().toLowerCase();
                 let selectedText = "PyTorch";
                 let selectedValue = 0;
@@ -548,7 +548,7 @@
                 itemHtml += "<option class=\"item\" data-value=\"3\">Other</option>"
 
                 $('#choice_Engine .default.text').text(selectedText)
-                $('#choice_Engine input[name="Engine"]').val(selectedValue)
+                $('#choice_Engine input[name="engine"]').val(selectedValue)
                 $("#job-Engine").append(itemHtml);
                 $("#choice_Engine").removeClass('disabled');
             } else {
@@ -560,7 +560,7 @@
                 itemHtml += "<option class=\"item\" data-value=\"6\">MXNet</option>"
                 itemHtml += "<option class=\"item\" data-value=\"3\">Other</option>"
                 $('#choice_Engine .default.text').text("PyTorch");
-                $('#choice_Engine input[name="Engine"]').val(0)
+                $('#choice_Engine input[name="engine"]').val(0)
                 $("#job-Engine").append(itemHtml);
                 $("#choice_Engine").removeClass('disabled');
             }
diff --git a/templates/repo/modelmanage/showinfo.tmpl b/templates/repo/modelmanage/showinfo.tmpl
index 4cc0305ed..8341363f6 100644
--- a/templates/repo/modelmanage/showinfo.tmpl
+++ b/templates/repo/modelmanage/showinfo.tmpl
@@ -221,40 +221,40 @@ function changeInfo(version){
         let [initObj,initModelAcc,id] = returnArray
         editorCancel('','')
         renderInfo(initObj,initModelAcc,id)
-        loadModelFile(versionData[0].ID,versionData[0].Version,'','','init')
+        loadModelFile(versionData[0].id,versionData[0].version,'','','init')
     })
 }
 function loadInfo(){
     $.get(`${url}show_model_info_api?name=${ID}`,(data)=>{
         let html = ''
         for (let i=0;i<data.length;i++){
-            if(!data[i].IsCanOper){
+            if(!data[i].isCanOper){
                 $("#edit-pencil").css("display","none")
             }
-            html += `<option value="${data[i].Version}">${data[i].Version}</option>`
+            html += `<option value="${data[i].version}">${data[i].version}</option>`
         }
         $('#dropdown').append(html)
         let returnArray = []
         returnArray = transObj(data)
         let [initObj,initModelAcc,id] = returnArray
         renderInfo(initObj,initModelAcc,id)
-        loadModelFile(data[0].ID,data[0].Version,'','','init')
+        loadModelFile(data[0].id,data[0].version,'','','init')
     })
 }
  function getEngineName(model){
-        if(model.Engine == 0){
+        if(model.engine == 0){
             return "PyTorch";
-        }else  if(model.Engine == 1 || model.Engine == 121 || model.Engine == 38){
+        }else  if(model.engine == 1 || model.engine == 121 || model.engine == 38){
             return "TensorFlow";
-        }else  if(model.Engine == 2 || model.Engine == 122 || model.Engine == 35 || model.Engine == 37){
+        }else  if(model.engine == 2 || model.engine == 122 || model.engine == 35 || model.engine == 37){
             return "MindSpore";
-        }else  if(model.Engine == 3){
+        }else  if(model.engine == 3){
             return "Other";
-        }else  if(model.Engine == 4){
+        }else  if(model.engine == 4){
             return "PaddlePaddle";
-        }else  if(model.Engine == 5){
+        }else  if(model.engine == 5){
             return "OneFlow";
-        }else  if(model.Engine == 6){
+        }else  if(model.engine == 6){
             return "MXNet";
         }
         else{
@@ -262,36 +262,36 @@ function loadInfo(){
         }
 }
 function transObj(data){
-    let {ID,Name,Version,Label,Size,Description,CreatedUnix,Accuracy,CodeBranch,CodeCommitID,TrainTaskInfo} = data[0]
-    let modelAcc = JSON.parse(Accuracy)
-    TrainTaskInfo = JSON.parse(TrainTaskInfo)
+    let {id,name,version,label,size,description,createdUnix,accuracy,codeBranch,codeCommitID,trainTaskInfo} = data[0]
+    let modelAcc = JSON.parse(accuracy)
+    trainTaskInfo = JSON.parse(trainTaskInfo)
     // Parameters = JSON.parse(Parameters)
-    let {Parameters} = TrainTaskInfo
-    let EngineName = getEngineName(data[0])
-    Parameters = JSON.parse(Parameters)
-    Parameters = Parameters.parameter.length === 0 ? '--':Parameters.parameter
-    let size = tranSize(Size) 
-    let time = transTime(CreatedUnix)
+    let {parameters} = trainTaskInfo
+    let engineName = getEngineName(data[0])
+    parameters = JSON.parse(parameters)
+    parameters = parameters.parameter.length === 0 ? '--':parameters.parameter
+    size = tranSize(size) 
+    let time = transTime(createdUnix)
     let initObj = {
-        ModelName:Name || '--',
-        Version:Version,
-        Label:Label || '--',
-        Size:size,
-        CreateTime:time,
-        Description:Description || '--',
-        CodeBranch:CodeBranch || '--',
-        CodeCommitID:CodeCommitID || '--',
-        BootFile:TrainTaskInfo.BootFile || '--',
-        DatasetName:TrainTaskInfo.DatasetName || '--',
-        Parameters:TrainTaskInfo.Parameters || '--',
-        FlavorName:TrainTaskInfo.FlavorName || '--',
-        WorkServerNumber:TrainTaskInfo.WorkServerNumber || '--',
-        Parameters:Parameters,
-        EngineName:EngineName,
-        DisplayJobName:TrainTaskInfo.DisplayJobName || '--',
-        TrainJobVersionName:TrainTaskInfo.VersionName || '',
-        CloudBrainJobID:TrainTaskInfo.JobID|| '',
-        CloudBrainType:TrainTaskInfo.Type,
+        modelName:name || '--',
+        version:version,
+        label:label || '--',
+        size:size,
+        createTime:time,
+        description:description || '--',
+        codeBranch:codeBranch || '--',
+        codeCommitID:codeCommitID || '--',
+        bootFile:trainTaskInfo.BootFile || '--',
+        datasetName:trainTaskInfo.DatasetName || '--',
+        parameters:trainTaskInfo.Parameters || '--',
+        flavorName:trainTaskInfo.FlavorName || '--',
+        workServerNumber:trainTaskInfo.WorkServerNumber || '--',
+        parameters:parameters,
+        engineName:engineName,
+        displayJobName:trainTaskInfo.DisplayJobName || '--',
+        trainJobVersionName:trainTaskInfo.VersionName || '',
+        cloudBrainJobID:trainTaskInfo.JobID|| '',
+        cloudBrainType:trainTaskInfo.Type,
     }
     let initModelAcc = {
         Accuracy: modelAcc.Accuracy || '--',
@@ -338,8 +338,8 @@ function editorSure(text,id){
     let description=$('#textarea-value').val()
     let sourcetext = $('#textarea-value').val().replace(/\n/g,'enter;')
     let data = {
-        ID:id,
-        Description:description
+        id:id,
+        description:description
     }
     $.ajax({
         url:`${url}modify_model`,
@@ -351,14 +351,14 @@ function editorSure(text,id){
 }
 function renderInfo(obj,accObj,id){
     for(let key in obj){
-        if(key==="Description"){
+        if(key==="description"){
             let descriptionText=obj[key].replace(/\r\n|\n/g,'enter;')
             $(`#${key}`).text(obj[key])
             $(`#${key}`).attr("title",obj[key])
             $('#edit-pencil').attr("data-id",id)
             $('#edit-pencil').attr("data-desc",descriptionText)
         }
-        else if(key==="Label"){
+        else if(key==="label"){
             $('#Label').empty()
             if(obj[key]==='--'){
                 $('#Label').text(obj[key])
@@ -372,33 +372,33 @@ function renderInfo(obj,accObj,id){
                 $('#Label').append(html)
             }
         }
-        else if(key==="CodeCommitID"){
+        else if(key==="codeCommitID"){
             let codeCommit = obj[key].slice(0,10)
             let html = `<a style="margin-left:1rem" class="ui label" title="${codeCommit}">${codeCommit}</a>`
             $('#CodeBranch').append(html)
 
         }
-         else if(key==="DisplayJobName"){
-           let type=obj["CloudBrainType"]
+         else if(key==="displayJobName"){
+           let type=obj["cloudBrainType"]
            let href=""
            if(type==1){
-                href=trainJobUrl + "modelarts/train-job/" + obj["CloudBrainJobID"]
+                href=trainJobUrl + "modelarts/train-job/" + obj["cloudBrainJobID"]
            }else if(type==0){
-                href=trainJobUrl + "cloudbrain/train-job/" + obj["CloudBrainJobID"]
+                href=trainJobUrl + "cloudbrain/train-job/" + obj["cloudBrainJobID"]
            }else if(type==2){
                 href=trainJobUrl + "grampus/train-job/" + obj["CloudBrainJobID"]
            }
-           $(`#DisplayJobNameHref`).attr("href",href)
-           $(`#DisplayJobNameHref`).attr("title",obj[key])
+           $(`#displayJobNameHref`).attr("href",href)
+           $(`#displayJobNameHref`).attr("title",obj[key])
            $(`#${key}`).text(obj[key])
 
-           let versionName = obj["TrainJobVersionName"]
+           let versionName = obj["trainJobVersionName"]
            if(versionName!=""){
                 let html = `<span style="margin-left:1rem" class="ui label">${versionName}</span>`
-                $('#DisplayJobName').append(html)
+                $('#displayJobName').append(html)
            }
         }
-        else if(key==="Parameters"){
+        else if(key==="parameters"){
             if(obj[key]==='--'){
                 $(`#${key}`).text(obj[key])
             }else{
diff --git a/web_src/js/components/Model.vue b/web_src/js/components/Model.vue
index 053d20329..7362246c4 100644
--- a/web_src/js/components/Model.vue
+++ b/web_src/js/components/Model.vue
@@ -13,7 +13,7 @@
           :header-cell-style="tableHeaderStyle"
         >
           <el-table-column
-            prop="Name"
+            prop="name"
             :label="i18n.model_name"
             align="left"
             min-width="17%"
@@ -25,105 +25,105 @@
               <!-- <i class="el-icon-time"></i> -->
               <a
                 class="text-over"
-                :href="showinfoHref + scope.row.Name"
-                :title="scope.row.Name"
-                >{{ scope.row.Name }}</a
+                :href="showinfoHref + scope.row.name"
+                :title="scope.row.name"
+                >{{ scope.row.name }}</a
               >
             </template>
           </el-table-column>
           <el-table-column
-            prop="Status"
+            prop="status"
             :label="i18n.model_status"
             align="center"
             min-width="6.5%"
           >
             <template slot-scope="scope">
-              <span class="text-over" :title="scope.row.Status_title">
-                <i style="vertical-align: middle" :class="scope.row.Status"></i
+              <span class="text-over" :title="scope.row.status_title">
+                <i style="vertical-align: middle" :class="scope.row.status"></i
               ></span>
             </template>
           </el-table-column>
           <el-table-column
-            prop="Version"
+            prop="version"
             :label="i18n.model_version"
             align="center"
             min-width="6%"
           >
             <template slot-scope="scope">
-              <span class="text-over" :title="scope.row.Version">{{
-                scope.row.Version
+              <span class="text-over" :title="scope.row.version">{{
+                scope.row.version
               }}</span>
             </template>
           </el-table-column>
           <el-table-column
-            prop="VersionCount"
+            prop="versionCount"
             :label="i18n.model_version_num"
             align="center"
             min-width="7%"
           >
             <template slot-scope="scope">
-              <span class="text-over" :title="scope.row.VersionCount">{{
-                scope.row.VersionCount
+              <span class="text-over" :title="scope.row.versionCount">{{
+                scope.row.versionCount
               }}</span>
             </template>
           </el-table-column>
 
           <el-table-column
-            prop="Size"
+            prop="size"
             :label="i18n.model_size"
             align="center"
             min-width="10%"
           >
             <template slot-scope="scope">
-              <span class="text-over">{{ renderSize(scope.row.Size) }}</span>
+              <span class="text-over">{{ renderSize(scope.row.size) }}</span>
             </template>
           </el-table-column>
           <el-table-column
-            prop="EngineName"
+            prop="engineName"
             :label="i18n.model_egine"
             align="center"
             min-width="8%"
           >
             <template slot-scope="scope">
-              <span class="text-over" :title="scope.row.EngineName">{{
-                scope.row.EngineName
+              <span class="text-over" :title="scope.row.engineName">{{
+                scope.row.engineName
               }}</span>
             </template>
           </el-table-column>
           <el-table-column
-            prop="ComputeResource"
+            prop="computeResource"
             :label="i18n.model_compute_resource"
             align="center"
             min-width="8%"
           >
             <template slot-scope="scope">
-              <span class="text-over">{{ scope.row.ComputeResource }}</span>
+              <span class="text-over">{{ scope.row.computeResource }}</span>
             </template>
           </el-table-column>
           <el-table-column
-            prop="CreatedUnix"
+            prop="createdUnix"
             :label="i18n.model_create_time"
             align="center"
             min-width="13.75%"
           >
             <template slot-scope="scope">
-              {{ transTime(scope.row.CreatedUnix) }}
+              {{ transTime(scope.row.createdUnix) }}
             </template>
           </el-table-column>
           <el-table-column
-            prop="UserName"
+            prop="userName"
             :label="i18n.model_creator"
             align="center"
             min-width="6.75%"
           >
             <template slot-scope="scope">
               <a
-                :href="!scope.row.UserName ? '#' : '/' + scope.row.UserName"
-                :title="scope.row.UserName || defaultAvatarName"
+                :href="!scope.row.userName ? '#' : '/' + scope.row.userName"
+                :title="scope.row.userName || defaultAvatarName"
               >
                 <img
                   class="ui avatar image"
-                  :src="scope.row.UserRelAvatarLink || defaultAvatar"
+                  :src="scope.row.userRelAvatarLink || defaultAvatar"
                 />
               </a>
             </template>
@@ -140,25 +140,25 @@
                   :style="{
                     visibility: !scope.row.Children ? 'visible' : 'hidden',
                   }"
-                  :class="{ disabled: !scope.row.IsCanOper }"
+                  :class="{ disabled: !scope.row.isCanOper }"
                   @click="
                     showcreateVue(
-                      scope.row.Name,
-                      scope.row.Version,
-                      scope.row.Label
+                      scope.row.name,
+                      scope.row.version,
+                      scope.row.label
                     )
                   "
                   >{{ i18n.model_create_new_ver }}</a
                 >
                 <a
-                  :href="loadhref + scope.row.ID"
-                  :class="{ disabled: !scope.row.IsCanOper }"
+                  :href="loadhref + scope.row.id"
+                  :class="{ disabled: !scope.row.isCanOper }"
                   >{{ i18n.model_download }}</a
                 >
                 <a
-                  :class="{ disabled: !scope.row.IsCanDelete }"
+                  :class="{ disabled: !scope.row.isCanDelete }"
                   @click="
-                    deleteModel(scope.row.ID, scope.row.cName, scope.row.rowKey)
+                    deleteModel(scope.row.id, scope.row.cName, scope.row.rowKey)
                   "
                   >{{ i18n.model_delete }}</a
                 >
@@ -219,17 +219,17 @@ export default {
             },
           })
           .then((res) => {
-            let TrainTaskInfo;
+            let trainTaskInfo;
             let tableData;
             tableData = res.data;
             for (let i = 0; i < tableData.length; i++) {
-              TrainTaskInfo = JSON.parse(tableData[i].TrainTaskInfo);
-              tableData[i].EngineName = this.getEngineName(tableData[i]);
-              tableData[i].ComputeResource = TrainTaskInfo.ComputeResource;
-              tableData[i].cName = tableData[i].Name;
-              tableData[i].rowKey = tableData[i].ID + Math.random();
-              tableData[i].Name = "";
-              tableData[i].VersionCount = "";
+              trainTaskInfo = JSON.parse(tableData[i].trainTaskInfo);
+              tableData[i].engineName = this.getEngineName(tableData[i]);
+              tableData[i].computeResource = trainTaskInfo.ComputeResource;
+              tableData[i].cName = tableData[i].name;
+              tableData[i].rowKey = tableData[i].id + Math.random();
+              tableData[i].name = "";
+              tableData[i].versionCount = "";
               tableData[i].Children = true;
             }
             resolve(tableData || []);
@@ -258,10 +258,10 @@ export default {
           centered: false,
           onShow: function () {
             $("#model_header").text(title);
-            $('input[name="Name"]').addClass("model_disabled");
-            $('input[name="Name"]').attr("readonly", "readonly");
+            $('input[name="name"]').addClass("model_disabled");
+            $('input[name="name"]').attr("readonly", "readonly");
             $('input[name="modelSelectedFile"]').attr("readonly", "readonly");
-            $('input[name="Version"]').addClass("model_disabled");
+            $('input[name="version"]').addClass("model_disabled");
             $(".ui.dimmer").css({
               "background-color": "rgb(136, 136, 136,0.7)",
             });
@@ -274,8 +274,8 @@ export default {
           },
           onHide: function () {
             document.getElementById("formId").reset();
-            $('input[name="Name"]').removeClass("model_disabled");
-            $('input[name="Name"]').removeAttr("readonly");
+            $('input[name="name"]').removeClass("model_disabled");
+            $('input[name="name"]').removeAttr("readonly");
             $('input[name="modelSelectedFile"]').removeAttr("readonly");
             var cityObj = $("#modelSelectedFile");
             cityObj.attr("value", "");
@@ -290,8 +290,8 @@ export default {
         .modal("show");
     },
     check() {
-      let jobid = document.getElementById("JobId").value;
-      let versionname = document.getElementById("VersionName").value;
+      let jobid = document.getElementById("jobId").value;
+      let versionname = document.getElementById("versionName").value;
       let name = document.getElementById("name").value;
       let version = document.getElementById("version").value;
       let modelSelectedFile =
@@ -333,8 +333,8 @@ export default {
       let context = this;
       let flag = this.check();
       if (flag) {
-        let cName = $("input[name='Name']").val();
-        let version = $("input[name='Version']").val();
+        let cName = $("input[name='name']").val();
+        let version = $("input[name='version']").val();
         let data = $("#formId").serialize();
         const initModel = $("input[name='initModel']").val();
         let url_href =
@@ -387,7 +387,7 @@ export default {
           let childrenIndex = store.states.lazyTreeNodeMap[
             parentRow.rowKey
           ].findIndex((child) => child.rowKey == row.rowKey);
-          parentRow.VersionCount = parentRow.VersionCount - 1;
+          parentRow.versionCount = parentRow.versionCount - 1;
           const parent = store.states.lazyTreeNodeMap[parentRow.rowKey];
           if (parent.length === 1) {
             this.getModelList();
@@ -398,7 +398,7 @@ export default {
       }
     },
     deleteModel(id, name, rowKey) {
-      let row = { cName: name, ID: id, rowKey: rowKey };
+      let row = { cName: name, id: id, rowKey: rowKey };
       let _this = this;
       let flag = 1;
       $(".ui.basic.modal.first")
@@ -410,7 +410,7 @@ export default {
             _this.$axios
               .delete(_this.url + "delete_model", {
                 params: {
-                  ID: id,
+                  id: id,
                 },
               })
               .then((res) => {
@@ -442,21 +442,21 @@ export default {
         .modal("show");
     },
     getEngineName(model) {
-      if (model.Engine == 0) {
+      if (model.engine == 0) {
         return "PyTorch";
-      } else if (model.Engine == 1 || model.Engine == 121) {
+      } else if (model.engine == 1 || model.engine == 121) {
         return "TensorFlow";
       } else if (
-        model.Engine == 2 ||
-        model.Engine == 122 ||
-        model.Engine == 35
+        model.engine == 2 ||
+        model.engine == 122 ||
+        model.engine == 35
       ) {
         return "MindSpore";
-      } else if (model.Engine == 4) {
+      } else if (model.engine == 4) {
         return "PaddlePaddle";
-      } else if (model.Engine == 5) {
+      } else if (model.engine == 5) {
         return "OneFlow";
-      } else if (model.Engine == 6) {
+      } else if (model.engine == 6) {
         return "MXNet";
       } else {
         return "Other";
@@ -480,34 +480,34 @@ export default {
           .then((res) => {
             $(".ui.grid").removeAttr("style");
             $("#loadContainer").removeClass("loader");
-            let TrainTaskInfo;
+            let trainTaskInfo;
             this.tableData = res.data.data;
             for (let i = 0; i < this.tableData.length; i++) {
-              TrainTaskInfo = JSON.parse(this.tableData[i].TrainTaskInfo);
-              this.tableData[i].cName = this.tableData[i].Name;
-              this.tableData[i].rowKey = this.tableData[i].ID + Math.random();
-              this.tableData[i].EngineName = this.getEngineName(
+              trainTaskInfo = JSON.parse(this.tableData[i].trainTaskInfo);
+              this.tableData[i].cName = this.tableData[i].name;
+              this.tableData[i].rowKey = this.tableData[i].id + Math.random();
+              this.tableData[i].engineName = this.getEngineName(
                 this.tableData[i]
               );
-              this.tableData[i].ComputeResource = TrainTaskInfo.ComputeResource;
+              this.tableData[i].computeResource = trainTaskInfo.ComputeResource;
               this.tableData[i].hasChildren =
-                res.data.data[i].VersionCount === 1 ? false : true;
-              if (this.tableData[i].Status !== 1) {
+                res.data.data[i].versionCount === 1 ? false : true;
+              if (this.tableData[i].status !== 1) {
                 countStatus++;
               }
 
-              switch (this.tableData[i].Status) {
+              switch (this.tableData[i].status) {
                 case 1:
-                  this.tableData[i].Status = "WAITING";
-                  this.tableData[i].Status_title = this.i18n.model_wait;
+                  this.tableData[i].status = "WAITING";
+                  this.tableData[i].status_title = this.i18n.model_wait;
                   break;
                 case 2:
-                  this.tableData[i].Status = "FAILED";
-                  this.tableData[i].Status_title = this.tableData[i].StatusDesc;
+                  this.tableData[i].status = "FAILED";
+                  this.tableData[i].status_title = this.tableData[i].statusDesc;
                   break;
                 default:
-                  this.tableData[i].Status = "SUCCEEDED";
-                  this.tableData[i].Status_title = this.i18n.model_success;
+                  this.tableData[i].status = "SUCCEEDED";
+                  this.tableData[i].status_title = this.i18n.model_success;
                   break;
               }
             }
@@ -531,7 +531,7 @@ export default {
   },
   computed: {
     loadhref() {
-      return this.url + "downloadall?ID=";
+      return this.url + "downloadall?id=";
     },
     showinfoHref() {
       return this.url + "show_model_info?name=";

From 001f5fb6a5d0633c3a572d6fbbdb073648ebd45d Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Mon, 24 Oct 2022 17:10:40 +0800
Subject: [PATCH 003/187] =?UTF-8?q?=E9=80=82=E9=85=8Drestful=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=EF=BC=8C=E5=B0=86=E4=BA=A4=E4=BA=92=E7=9A=84=E5=B1=9E?=
 =?UTF-8?q?=E6=80=A7=E5=85=A8=E9=83=A8=E6=9B=B4=E6=94=B9=E4=B8=BA=E5=B0=8F?=
 =?UTF-8?q?=E5=86=99=E5=BC=80=E5=A4=B4=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 templates/repo/modelmanage/index.tmpl | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/templates/repo/modelmanage/index.tmpl b/templates/repo/modelmanage/index.tmpl
index 9716637ed..75c0935ec 100644
--- a/templates/repo/modelmanage/index.tmpl
+++ b/templates/repo/modelmanage/index.tmpl
@@ -400,13 +400,13 @@
                 if(n_length > 0){
                     let train_html = ''
                     for (let i = 0; i < n_length; i++) {
-                        train_html += `<div class="item" data-value="${data[i].jobId}">${data[i].displayJobName}</div>`
+                        train_html += `<div class="item" data-value="${data[i].JobId}">${data[i].DisplayJobName}</div>`
                         train_html += '</div>'
                     }
                     $("#job-name").append(train_html)
                     $("#choice_model").removeClass("loading")
                     $('#choice_model .default.text').text(data[0].displayJobName)
-                    $('#choice_model input[name="jobId"]').val(data[0].jobId)
+                    $('#choice_model input[name="jobId"]').val(data[0].JobId)
                     loadTrainVersion()
                 }else{
                     $("#choice_model").removeClass("loading")
@@ -420,13 +420,13 @@
                 let train_html = '';
                 modelData = data;
                 for (let i = 0; i < n_length; i++) {
-                    train_html += `<div class="item" data-value="${data[i].versionName}">${data[i].versionName}</div>`
+                    train_html += `<div class="item" data-value="${data[i].VersionName}">${data[i].VersionName}</div>`
                     train_html += '</div>'
                 }
                 if (data.length) {
                     $("#job-version").append(train_html)
                     $("#choice_version").removeClass("loading")
-                    var versionName = data[0].versionName;
+                    var versionName = data[0].VersionName;
                     if (versionName == null || versionName == "") {
                         versionName = "V0001";
                     }

From a30b9acc6df78627cd1ab57b3ddf0ecfda71e62b Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Mon, 24 Oct 2022 17:15:57 +0800
Subject: [PATCH 004/187] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 templates/repo/modelmanage/showinfo.tmpl | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/templates/repo/modelmanage/showinfo.tmpl b/templates/repo/modelmanage/showinfo.tmpl
index 8341363f6..7b176169f 100644
--- a/templates/repo/modelmanage/showinfo.tmpl
+++ b/templates/repo/modelmanage/showinfo.tmpl
@@ -265,10 +265,8 @@ function transObj(data){
     let {id,name,version,label,size,description,createdUnix,accuracy,codeBranch,codeCommitID,trainTaskInfo} = data[0]
     let modelAcc = JSON.parse(accuracy)
     trainTaskInfo = JSON.parse(trainTaskInfo)
-    // Parameters = JSON.parse(Parameters)
-    let {parameters} = trainTaskInfo
     let engineName = getEngineName(data[0])
-    parameters = JSON.parse(parameters)
+    parameters = JSON.parse(trainTaskInfo.Parameters)
     parameters = parameters.parameter.length === 0 ? '--':parameters.parameter
     size = tranSize(size) 
     let time = transTime(createdUnix)

From 6cd498b0aad2a19cd7f89771d16c6796fad108f1 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Mon, 24 Oct 2022 17:23:26 +0800
Subject: [PATCH 005/187] =?UTF-8?q?=E9=80=82=E9=85=8Drestful=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=EF=BC=8C=E5=B0=86=E4=BA=A4=E4=BA=92=E7=9A=84=E5=B1=9E?=
 =?UTF-8?q?=E6=80=A7=E5=85=A8=E9=83=A8=E6=9B=B4=E6=94=B9=E4=B8=BA=E5=B0=8F?=
 =?UTF-8?q?=E5=86=99=E5=BC=80=E5=A4=B4=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 templates/repo/modelmanage/index.tmpl    |  2 +-
 templates/repo/modelmanage/showinfo.tmpl | 28 ++++++++++++------------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/templates/repo/modelmanage/index.tmpl b/templates/repo/modelmanage/index.tmpl
index 75c0935ec..ffe8770a7 100644
--- a/templates/repo/modelmanage/index.tmpl
+++ b/templates/repo/modelmanage/index.tmpl
@@ -405,7 +405,7 @@
                     }
                     $("#job-name").append(train_html)
                     $("#choice_model").removeClass("loading")
-                    $('#choice_model .default.text').text(data[0].displayJobName)
+                    $('#choice_model .default.text').text(data[0].DisplayJobName)
                     $('#choice_model input[name="jobId"]').val(data[0].JobId)
                     loadTrainVersion()
                 }else{
diff --git a/templates/repo/modelmanage/showinfo.tmpl b/templates/repo/modelmanage/showinfo.tmpl
index 7b176169f..958032620 100644
--- a/templates/repo/modelmanage/showinfo.tmpl
+++ b/templates/repo/modelmanage/showinfo.tmpl
@@ -91,16 +91,16 @@
                         <tbody>
                             <tr>
                                 <td class="ti-text-form-label text-width80">{{$.i18n.Tr "repo.model.manage.model_name"}}</td>
-                                <td class="ti-text-form-content word-elipsis"><span id="ModelName" title=""></span></td>
+                                <td class="ti-text-form-content word-elipsis"><span id="modelName" title=""></span></td>
                             </tr>
                             <tr>
                                 <td class="ti-text-form-label text-width80">{{$.i18n.Tr "repo.model.manage.version"}}</td>
-                                <td class="ti-text-form-content word-elipsis"><span id="Version" title=""></span></td>
+                                <td class="ti-text-form-content word-elipsis"><span id="version" title=""></span></td>
                             </tr>
                             <tr>
                                 <td class="ti-text-form-label text-width80">{{$.i18n.Tr "repo.migrate_items_labels"}}</td>
                                 <td class="ti-text-form-content">
-                                    <div id="Label" style="overflow: hidden;width: 95%;">
+                                    <div id="label" style="overflow: hidden;width: 95%;">
                                         
                                     </div>
                                     
@@ -109,17 +109,17 @@
                             </tr>
                             <tr>
                                 <td class="ti-text-form-label text-width80">{{$.i18n.Tr "repo.modelarts.model_size"}}</td>
-                                <td class="ti-text-form-content word-elipsis"><span id="Size" title=""></span></td>
+                                <td class="ti-text-form-content word-elipsis"><span id="size" title=""></span></td>
                             </tr>
                             <tr>
                                 <td class="ti-text-form-label text-width80">{{$.i18n.Tr "repo.modelarts.createtime"}}</td>
-                                <td class="ti-text-form-content word-elipsis"><span id="CreateTime" title=""></span></td>
+                                <td class="ti-text-form-content word-elipsis"><span id="createTime" title=""></span></td>
                             </tr>
                             <tr>
                                 <td class="ti-text-form-label text-width80">{{$.i18n.Tr "repo.model.manage.description"}}</td>
                                 <td class="ti-text-form-content" >
                                     <div id="edit-td" style="display:flex">
-                                        <span id="Description" title="" class="iword-elipsis"></span>
+                                        <span id="description" title="" class="iword-elipsis"></span>
                                         <i id="edit-pencil" data-id="" data-desc="" class="pencil alternate icon" style="cursor:pointer;vertical-align: top;" id="editor" onclick="editorFn(this)"></i>
                                     </div>
                                 </td>
@@ -128,37 +128,37 @@
                                 <td class="ti-text-form-label text-width80">{{$.i18n.Tr "repo.modelarts.train_job"}}</td>
                                 <td class="ti-text-form-content word-elipsis">
                                   <a id="DisplayJobNameHref" class="title" style="font-size: 14px;" target="_blank">
-                                        <span id="DisplayJobName" class="fitted" style="width: 90%;vertical-align: middle;"></span>
+                                        <span id="displayJobName" class="fitted" style="width: 90%;vertical-align: middle;"></span>
                                   </a>
                                 </td>
                             </tr>
                             <tr>
                                 <td class="ti-text-form-label text-width80">{{$.i18n.Tr "repo.modelarts.code_version"}}</td>
-                                <td class="ti-text-form-content word-elipsis"><span id="CodeBranch" title=""></span></td>
+                                <td class="ti-text-form-content word-elipsis"><span id="codeBranch" title=""></span></td>
                             </tr>
                             <tr>
                                 <td class="ti-text-form-label text-width80">{{$.i18n.Tr "repo.modelarts.train_job.start_file"}}</td>
-                                <td class="ti-text-form-content word-elipsis"><span id="BootFile" title=""></span></td>
+                                <td class="ti-text-form-content word-elipsis"><span id="bootFile" title=""></span></td>
                             </tr>
                             <tr>
                                 <td class="ti-text-form-label text-width80">{{$.i18n.Tr "repo.modelarts.train_job.train_dataset"}}</td>
-                                <td class="ti-text-form-content word-elipsis"><span id="DatasetName" title=""></span></td>
+                                <td class="ti-text-form-content word-elipsis"><span id="datasetName" title=""></span></td>
                             </tr>
                             <tr>
                                 <td class="ti-text-form-label text-width80">{{$.i18n.Tr "repo.modelarts.train_job.run_parameter"}}</td>
-                                <td class="ti-text-form-content word-elipsis"><span id="Parameters" title=""></span></td>
+                                <td class="ti-text-form-content word-elipsis"><span id="parameters" title=""></span></td>
                             </tr>
                             <tr>
                                 <td class="ti-text-form-label text-width80">{{$.i18n.Tr "repo.modelarts.train_job.AI_Engine"}}</td>
-                                <td class="ti-text-form-content word-elipsis"><span id="EngineName" title=""></span></td>
+                                <td class="ti-text-form-content word-elipsis"><span id="engineName" title=""></span></td>
                             </tr>
                             <tr>
                                 <td class="ti-text-form-label text-width80">{{$.i18n.Tr "repo.modelarts.train_job.standard"}}</td>
-                                <td class="ti-text-form-content word-elipsis"><span id="FlavorName" title=""></span></td>
+                                <td class="ti-text-form-content word-elipsis"><span id="flavorName" title=""></span></td>
                             </tr>
                             <tr>
                                 <td class="ti-text-form-label text-width80">{{$.i18n.Tr "repo.modelarts.train_job.compute_node"}}</td>
-                                <td class="ti-text-form-content word-elipsis"><span id="WorkServerNumber" title=""></span></td>
+                                <td class="ti-text-form-content word-elipsis"><span id="workServerNumber" title=""></span></td>
                             </tr>
                         </tbody>
                     </table>

From 8bd5a7cb32feb2f984477814d8868006ddae5973 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Mon, 24 Oct 2022 17:37:18 +0800
Subject: [PATCH 006/187] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 templates/repo/modelmanage/index.tmpl    | 1 +
 templates/repo/modelmanage/showinfo.tmpl | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/templates/repo/modelmanage/index.tmpl b/templates/repo/modelmanage/index.tmpl
index ffe8770a7..e414dbcd9 100644
--- a/templates/repo/modelmanage/index.tmpl
+++ b/templates/repo/modelmanage/index.tmpl
@@ -414,6 +414,7 @@
             })
         }
         function loadTrainVersion(value) {
+            let tmp = $('#choice_model input[name="jobId"]').val();
             let jobId = !value ? $('#choice_model input[name="jobId"]').val() : value
             $.get(`${repolink}/modelmanage/query_train_job_version?jobId=${jobId}`, (data) => {
                 const n_length = data.length
diff --git a/templates/repo/modelmanage/showinfo.tmpl b/templates/repo/modelmanage/showinfo.tmpl
index 958032620..70e354dd4 100644
--- a/templates/repo/modelmanage/showinfo.tmpl
+++ b/templates/repo/modelmanage/showinfo.tmpl
@@ -297,7 +297,7 @@ function transObj(data){
         Precision:modelAcc.Precision || '--',
         Recall: modelAcc.Recall || '--'
     }
-    return [initObj,initModelAcc,ID]
+    return [initObj,initModelAcc,id]
         
 }
 function transTime(time){

From 10b4028aff1a8351d5635779bbe0960a6fd544c3 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Mon, 24 Oct 2022 17:43:49 +0800
Subject: [PATCH 007/187] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 templates/repo/modelmanage/index.tmpl | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/templates/repo/modelmanage/index.tmpl b/templates/repo/modelmanage/index.tmpl
index e414dbcd9..6db6cc49b 100644
--- a/templates/repo/modelmanage/index.tmpl
+++ b/templates/repo/modelmanage/index.tmpl
@@ -406,7 +406,7 @@
                     $("#job-name").append(train_html)
                     $("#choice_model").removeClass("loading")
                     $('#choice_model .default.text').text(data[0].DisplayJobName)
-                    $('#choice_model input[name="jobId"]').val(data[0].JobId)
+                    $('#jobId').val(data[0].JobId)
                     loadTrainVersion()
                 }else{
                     $("#choice_model").removeClass("loading")
@@ -414,8 +414,8 @@
             })
         }
         function loadTrainVersion(value) {
-            let tmp = $('#choice_model input[name="jobId"]').val();
-            let jobId = !value ? $('#choice_model input[name="jobId"]').val() : value
+            let tmp = $('jobId').val();
+            let jobId = !value ? $('#jobId').val() : value
             $.get(`${repolink}/modelmanage/query_train_job_version?jobId=${jobId}`, (data) => {
                 const n_length = data.length
                 let train_html = '';

From 4b18b4d17a0d901174b1750f2ffdb59bc8f80c45 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Mon, 24 Oct 2022 17:45:51 +0800
Subject: [PATCH 008/187] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 templates/repo/modelmanage/index.tmpl | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/templates/repo/modelmanage/index.tmpl b/templates/repo/modelmanage/index.tmpl
index 6db6cc49b..ed1163cb1 100644
--- a/templates/repo/modelmanage/index.tmpl
+++ b/templates/repo/modelmanage/index.tmpl
@@ -406,7 +406,7 @@
                     $("#job-name").append(train_html)
                     $("#choice_model").removeClass("loading")
                     $('#choice_model .default.text').text(data[0].DisplayJobName)
-                    $('#jobId').val(data[0].JobId)
+                    $('#choice_model input[name="jobId"]').val(data[0].JobID)
                     loadTrainVersion()
                 }else{
                     $("#choice_model").removeClass("loading")
@@ -414,8 +414,8 @@
             })
         }
         function loadTrainVersion(value) {
-            let tmp = $('jobId').val();
-            let jobId = !value ? $('#jobId').val() : value
+            let tmp = $('#choice_model input[name="jobId"]').val();
+            let jobId = !value ? $('#choice_model input[name="jobId"]').val() : value
             $.get(`${repolink}/modelmanage/query_train_job_version?jobId=${jobId}`, (data) => {
                 const n_length = data.length
                 let train_html = '';

From f42b1843febc6084555faba534f3c2fcdb50c066 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Mon, 24 Oct 2022 17:51:15 +0800
Subject: [PATCH 009/187] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 templates/repo/modelmanage/index.tmpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/repo/modelmanage/index.tmpl b/templates/repo/modelmanage/index.tmpl
index ed1163cb1..d5f282f2f 100644
--- a/templates/repo/modelmanage/index.tmpl
+++ b/templates/repo/modelmanage/index.tmpl
@@ -400,7 +400,7 @@
                 if(n_length > 0){
                     let train_html = ''
                     for (let i = 0; i < n_length; i++) {
-                        train_html += `<div class="item" data-value="${data[i].JobId}">${data[i].DisplayJobName}</div>`
+                        train_html += `<div class="item" data-value="${data[i].JobID}">${data[i].DisplayJobName}</div>`
                         train_html += '</div>'
                     }
                     $("#job-name").append(train_html)

From f724b57d84ba3c052a26c32291283babf117d034 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Tue, 25 Oct 2022 08:40:16 +0800
Subject: [PATCH 010/187] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 templates/repo/modelmanage/index.tmpl | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/templates/repo/modelmanage/index.tmpl b/templates/repo/modelmanage/index.tmpl
index d5f282f2f..c3902a967 100644
--- a/templates/repo/modelmanage/index.tmpl
+++ b/templates/repo/modelmanage/index.tmpl
@@ -519,12 +519,12 @@
                 }
             }
         }
-        function setEngine(modelVersion) {
-            console.log("modelVersion=" + modelVersion);
+        function setEngine(trainJob) {
+            console.log("trainJob=" + trainJob);
             $('#choice_Engine').dropdown('clear')
             $("#job-Engine").empty()
-            if (modelVersion.engineName != null && modelVersion.engineName != "") {
-                srcEngine = modelVersion.engineName.split('-')[0]
+            if (trainJob.EngineName != null && trainJob.EngineName != "") {
+                srcEngine = trainJob.EngineName.split('-')[0]
                 srcEngine = srcEngine.trim().toLowerCase();
                 let selectedText = "PyTorch";
                 let selectedValue = 0;

From 6e679a14ba06452d0a62bc88e21b2d1cf333ffea Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Tue, 25 Oct 2022 08:43:58 +0800
Subject: [PATCH 011/187] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=EF=BC=8C=E8=A7=A3=E5=86=B3=E5=A4=A7=E5=B0=8F=E5=86=99=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 templates/repo/modelmanage/index.tmpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/repo/modelmanage/index.tmpl b/templates/repo/modelmanage/index.tmpl
index c3902a967..addb44948 100644
--- a/templates/repo/modelmanage/index.tmpl
+++ b/templates/repo/modelmanage/index.tmpl
@@ -454,7 +454,7 @@
                         type=0;
                     }
                 }
-                $.get(`${repolink}/modelmanage/query_train_model?jobName=${trainJob.JobName}&type=${type}&versionName=${trainJob.versionName}`, (data) => {
+                $.get(`${repolink}/modelmanage/query_train_model?jobName=${trainJob.JobName}&type=${type}&versionName=${trainJob.VersionName}`, (data) => {
                     const n_length = data.length
                     let file_html=''
                     let firstFileName =''

From 938c7783aa93958065e68f6e487df35bf8de0e82 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Tue, 25 Oct 2022 08:52:39 +0800
Subject: [PATCH 012/187] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 templates/repo/modelmanage/index.tmpl | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/templates/repo/modelmanage/index.tmpl b/templates/repo/modelmanage/index.tmpl
index addb44948..2699bed01 100644
--- a/templates/repo/modelmanage/index.tmpl
+++ b/templates/repo/modelmanage/index.tmpl
@@ -455,6 +455,8 @@
                     }
                 }
                 $.get(`${repolink}/modelmanage/query_train_model?jobName=${trainJob.JobName}&type=${type}&versionName=${trainJob.VersionName}`, (data) => {
+                    var cityObj = $("#modelSelectedFile");
+			        cityObj.attr("value", "");
                     const n_length = data.length
                     let file_html=''
                     let firstFileName =''

From f44d67cf7ba9ab2d309863e0254f2c360ef4bdf4 Mon Sep 17 00:00:00 2001
From: ychao_1983 <ychao_1983@sina.com>
Date: Tue, 25 Oct 2022 09:26:29 +0800
Subject: [PATCH 013/187] =?UTF-8?q?api=20=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 models/attachment.go                          | 180 +----
 models/base_message.go                        |   4 +-
 models/dataset.go                             |  40 +-
 models/repo.go                                | 120 ++--
 modules/auth/modelarts.go                     |  43 +-
 modules/cloudbrain/cloudbrain.go              |  12 +-
 modules/grampus/grampus.go                    |   8 +-
 modules/modelarts/modelarts.go                |  10 +-
 routers/api/v1/api.go                         |  27 +
 routers/api/v1/repo/cloudbrain.go             |  26 +
 routers/api/v1/repo/datasets.go               | 114 +++
 routers/api/v1/repo/images.go                 | 141 ++++
 .../cloudbrain/cloudbrainTask/inference.go    | 631 ++++++++++++++++
 services/cloudbrain/cloudbrainTask/train.go   | 678 ++++++++++++++++++
 14 files changed, 1755 insertions(+), 279 deletions(-)
 create mode 100644 routers/api/v1/repo/datasets.go
 create mode 100644 routers/api/v1/repo/images.go
 create mode 100644 services/cloudbrain/cloudbrainTask/inference.go
 create mode 100644 services/cloudbrain/cloudbrainTask/train.go

diff --git a/models/attachment.go b/models/attachment.go
index 55c6dbad3..5ebb6f0f3 100755
--- a/models/attachment.go
+++ b/models/attachment.go
@@ -33,27 +33,27 @@ const (
 
 // Attachment represent a attachment of issue/comment/release.
 type Attachment struct {
-	ID              int64  `xorm:"pk autoincr"`
-	UUID            string `xorm:"uuid UNIQUE"`
-	IssueID         int64  `xorm:"INDEX"`
-	DatasetID       int64  `xorm:"INDEX DEFAULT 0"`
-	ReleaseID       int64  `xorm:"INDEX"`
-	UploaderID      int64  `xorm:"INDEX DEFAULT 0"` // Notice: will be zero before this column added
-	CommentID       int64
-	Name            string
-	Description     string             `xorm:"TEXT"`
-	DownloadCount   int64              `xorm:"DEFAULT 0"`
-	UseNumber       int64              `xorm:"DEFAULT 0"`
-	Size            int64              `xorm:"DEFAULT 0"`
-	IsPrivate       bool               `xorm:"DEFAULT false"`
-	DecompressState int32              `xorm:"DEFAULT 0"`
-	Type            int                `xorm:"DEFAULT 0"`
-	CreatedUnix     timeutil.TimeStamp `xorm:"created"`
-
-	FileChunk *FileChunk `xorm:"-"`
-	CanDel    bool       `xorm:"-"`
-	Uploader  *User      `xorm:"-"`
-	Md5       string     `xorm:"-"`
+	ID              int64              `xorm:"pk autoincr" json:"id"`
+	UUID            string             `xorm:"uuid UNIQUE" json:"uuid"`
+	IssueID         int64              `xorm:"INDEX" json:"issueId"`
+	DatasetID       int64              `xorm:"INDEX DEFAULT 0" json:"datasetId"`
+	ReleaseID       int64              `xorm:"INDEX" json:"releaseId"`
+	UploaderID      int64              `xorm:"INDEX DEFAULT 0" json:"uploaderId"` // Notice: will be zero before this column added
+	CommentID       int64              `json:"commentId"`
+	Name            string             `json:"name"`
+	Description     string             `xorm:"TEXT" json:"description"`
+	DownloadCount   int64              `xorm:"DEFAULT 0" json:"downloadCount"`
+	UseNumber       int64              `xorm:"DEFAULT 0" json:"useNumber"`
+	Size            int64              `xorm:"DEFAULT 0" json:"size"`
+	IsPrivate       bool               `xorm:"DEFAULT false" json:"isPrivate"`
+	DecompressState int32              `xorm:"DEFAULT 0" json:"decompressState"`
+	Type            int                `xorm:"DEFAULT 0" json:"type"`
+	CreatedUnix     timeutil.TimeStamp `xorm:"created" json:"createdUnix"`
+
+	FileChunk *FileChunk `xorm:"-" json:"fileChunk"`
+	CanDel    bool       `xorm:"-" json:"canDel"`
+	Uploader  *User      `xorm:"-" json:"uploader"`
+	Md5       string     `xorm:"-" json:"md5"`
 }
 
 type AttachmentUsername struct {
@@ -61,30 +61,6 @@ type AttachmentUsername struct {
 	Name       string
 }
 
-type AttachmentInfo struct {
-	Attachment    `xorm:"extends"`
-	Repo          *Repository `xorm:"extends"`
-	RelAvatarLink string      `xorm:"extends"`
-	UserName      string      `xorm:"extends"`
-	Recommend     bool        `xorm:"-"`
-}
-
-type AttachmentsOptions struct {
-	ListOptions
-	DatasetIDs      []int64
-	DecompressState int
-	Type            int
-	UploaderID      int64
-	NeedDatasetIDs  bool
-	NeedIsPrivate   bool
-	IsPrivate       bool
-	JustNeedZipFile bool
-	NeedRepoInfo    bool
-	Keyword         string
-	RecommendOnly   bool
-	UserId          int64
-}
-
 func (a *Attachment) AfterUpdate() {
 	if a.DatasetID > 0 {
 		datasetIsPublicCount, err := x.Where("dataset_id = ? AND is_private = ?", a.DatasetID, false).Count(new(Attachment))
@@ -493,19 +469,6 @@ func getPrivateAttachments(e Engine, userID int64) ([]*AttachmentUsername, error
 	return attachments, nil
 }
 
-func getAllUserAttachments(e Engine, userID int64) ([]*AttachmentUsername, error) {
-	attachments := make([]*AttachmentUsername, 0, 10)
-	if err := e.Table("attachment").Join("LEFT", "`user`", "attachment.uploader_id "+
-		"= `user`.id").Where("decompress_state= ? and attachment.type = ? and (uploader_id= ? or is_private = ?)", DecompressStateDone, TypeCloudBrainOne, userID, false).Find(&attachments); err != nil {
-		return nil, err
-	}
-	return attachments, nil
-}
-
-func GetAllUserAttachments(userID int64) ([]*AttachmentUsername, error) {
-	return getAllUserAttachments(x, userID)
-}
-
 func getModelArtsUserAttachments(e Engine, userID int64) ([]*AttachmentUsername, error) {
 	attachments := make([]*AttachmentUsername, 0, 10)
 	if err := e.Table("attachment").Join("LEFT", "`user`", "attachment.uploader_id "+
@@ -601,107 +564,6 @@ func GetAllAttachmentSize() (int64, error) {
 	return x.SumInt(&Attachment{}, "size")
 }
 
-func Attachments(opts *AttachmentsOptions) ([]*AttachmentInfo, int64, error) {
-	sess := x.NewSession()
-	defer sess.Close()
-
-	var cond = builder.NewCond()
-	if opts.NeedDatasetIDs {
-		cond = cond.And(
-			builder.In("attachment.dataset_id", opts.DatasetIDs),
-		)
-	}
-
-	if opts.UploaderID > 0 {
-		cond = cond.And(
-			builder.Eq{"attachment.uploader_id": opts.UploaderID},
-		)
-	}
-
-	if (opts.Type) >= 0 {
-		cond = cond.And(
-			builder.Eq{"attachment.type": opts.Type},
-		)
-	}
-
-	if opts.NeedIsPrivate {
-		cond = cond.And(
-			builder.Eq{"attachment.is_private": opts.IsPrivate},
-		)
-	}
-	if opts.RecommendOnly {
-		cond = cond.And(builder.In("attachment.id", builder.Select("attachment.id").
-			From("attachment").
-			Join("INNER", "dataset", "attachment.dataset_id = dataset.id and dataset.recommend=true")))
-	}
-
-	if opts.JustNeedZipFile {
-		var DecompressState []int32
-		DecompressState = append(DecompressState, DecompressStateDone, DecompressStateIng, DecompressStateFailed)
-		cond = cond.And(
-			builder.In("attachment.decompress_state", DecompressState),
-		)
-	}
-
-	var count int64
-	var err error
-	if len(opts.Keyword) == 0 {
-		count, err = sess.Where(cond).Count(new(Attachment))
-	} else {
-		lowerKeyWord := strings.ToLower(opts.Keyword)
-
-		cond = cond.And(builder.Or(builder.Like{"LOWER(attachment.name)", lowerKeyWord}, builder.Like{"LOWER(attachment.description)", lowerKeyWord}))
-		count, err = sess.Table(&Attachment{}).Where(cond).Count(new(AttachmentInfo))
-
-	}
-
-	if err != nil {
-		return nil, 0, fmt.Errorf("Count: %v", err)
-	}
-
-	if opts.Page >= 0 && opts.PageSize > 0 {
-		var start int
-		if opts.Page == 0 {
-			start = 0
-		} else {
-			start = (opts.Page - 1) * opts.PageSize
-		}
-		sess.Limit(opts.PageSize, start)
-	}
-
-	sess.OrderBy("attachment.created_unix DESC")
-	attachments := make([]*AttachmentInfo, 0, setting.UI.DatasetPagingNum)
-	if err := sess.Table(&Attachment{}).Where(cond).
-		Find(&attachments); err != nil {
-		return nil, 0, fmt.Errorf("Find: %v", err)
-	}
-
-	if opts.NeedRepoInfo {
-		for _, attachment := range attachments {
-			dataset, err := GetDatasetByID(attachment.DatasetID)
-			if err != nil {
-				return nil, 0, fmt.Errorf("GetDatasetByID failed error: %v", err)
-			}
-			attachment.Recommend = dataset.Recommend
-			repo, err := GetRepositoryByID(dataset.RepoID)
-			if err == nil {
-				attachment.Repo = repo
-			} else {
-				return nil, 0, fmt.Errorf("GetRepositoryByID failed error: %v", err)
-			}
-			user, err := GetUserByID(attachment.UploaderID)
-			if err == nil {
-				attachment.RelAvatarLink = user.RelAvatarLink()
-				attachment.UserName = user.Name
-			} else {
-				return nil, 0, fmt.Errorf("GetUserByID failed error: %v", err)
-			}
-		}
-	}
-
-	return attachments, count, nil
-}
-
 func GetAllDatasetContributorByDatasetId(datasetId int64) ([]*User, error) {
 	r := make([]*User, 0)
 	if err := x.Select("distinct(public.user.*)").Table("attachment").Join("LEFT", "user", "public.user.ID = attachment.uploader_id").Where("attachment.dataset_id = ?", datasetId).Find(&r); err != nil {
diff --git a/models/base_message.go b/models/base_message.go
index 37f7668ad..31103d795 100644
--- a/models/base_message.go
+++ b/models/base_message.go
@@ -1,8 +1,8 @@
 package models
 
 type BaseMessage struct {
-	Code    int
-	Message string
+	Code    int    `json:"code"`
+	Message string `json:"message"`
 }
 
 var BaseOKMessage = BaseMessage{
diff --git a/models/dataset.go b/models/dataset.go
index 720850ed9..f3c2adbd5 100755
--- a/models/dataset.go
+++ b/models/dataset.go
@@ -21,26 +21,26 @@ const (
 )
 
 type Dataset struct {
-	ID            int64  `xorm:"pk autoincr"`
-	Title         string `xorm:"INDEX NOT NULL"`
-	Status        int32  `xorm:"INDEX"` // normal_private: 0, pulbic: 1, is_delete: 2
-	Category      string
-	Description   string `xorm:"TEXT"`
-	DownloadTimes int64
-	UseCount      int64 `xorm:"DEFAULT 0"`
-	NumStars      int   `xorm:"INDEX NOT NULL DEFAULT 0"`
-	Recommend     bool  `xorm:"INDEX NOT NULL DEFAULT false"`
-	License       string
-	Task          string
-	ReleaseID     int64              `xorm:"INDEX"`
-	UserID        int64              `xorm:"INDEX"`
-	RepoID        int64              `xorm:"INDEX"`
-	Repo          *Repository        `xorm:"-"`
-	CreatedUnix   timeutil.TimeStamp `xorm:"INDEX created"`
-	UpdatedUnix   timeutil.TimeStamp `xorm:"INDEX updated"`
-
-	User        *User         `xorm:"-"`
-	Attachments []*Attachment `xorm:"-"`
+	ID            int64              `xorm:"pk autoincr" json:"id"`
+	Title         string             `xorm:"INDEX NOT NULL" json:"title"`
+	Status        int32              `xorm:"INDEX" json:"status"` // normal_private: 0, pulbic: 1, is_delete: 2
+	Category      string             `json:"category"`
+	Description   string             `xorm:"TEXT" json:"description"`
+	DownloadTimes int64              `json:"downloadTimes"`
+	UseCount      int64              `xorm:"DEFAULT 0" json:"useCount"`
+	NumStars      int                `xorm:"INDEX NOT NULL DEFAULT 0" json:"numStars"`
+	Recommend     bool               `xorm:"INDEX NOT NULL DEFAULT false" json:"recommend"`
+	License       string             `json:"license"`
+	Task          string             `json:"task"`
+	ReleaseID     int64              `xorm:"INDEX" json:"releaseId"`
+	UserID        int64              `xorm:"INDEX" json:"userId"`
+	RepoID        int64              `xorm:"INDEX" json:"repoId"`
+	Repo          *Repository        `xorm:"-" json:"repo"`
+	CreatedUnix   timeutil.TimeStamp `xorm:"INDEX created" json:"createdUnix"`
+	UpdatedUnix   timeutil.TimeStamp `xorm:"INDEX updated" json:"updatedUnix"`
+
+	User        *User         `xorm:"-" json:"user"`
+	Attachments []*Attachment `xorm:"-" json:"attachments"`
 }
 
 type DatasetWithStar struct {
diff --git a/models/repo.go b/models/repo.go
index 2c4fda39b..ccb0d680c 100755
--- a/models/repo.go
+++ b/models/repo.go
@@ -162,79 +162,79 @@ const (
 
 // Repository represents a git repository.
 type Repository struct {
-	ID                  int64 `xorm:"pk autoincr"`
-	OwnerID             int64 `xorm:"UNIQUE(s) index"`
-	OwnerName           string
-	Owner               *User              `xorm:"-"`
-	LowerName           string             `xorm:"UNIQUE(s) INDEX NOT NULL"`
-	Name                string             `xorm:"INDEX NOT NULL"`
-	Description         string             `xorm:"TEXT"`
-	Website             string             `xorm:"VARCHAR(2048)"`
-	OriginalServiceType api.GitServiceType `xorm:"index"`
-	OriginalURL         string             `xorm:"VARCHAR(2048)"`
-	DefaultBranch       string
-	CreatorID           int64 `xorm:"INDEX NOT NULL  DEFAULT 0"`
-	Creator             *User `xorm:"-"`
-	NumWatches          int
-	NumStars            int
-	NumForks            int
-	NumIssues           int
-	NumClosedIssues     int
-	NumOpenIssues       int `xorm:"-"`
-	NumPulls            int
-	NumClosedPulls      int
-	NumOpenPulls        int      `xorm:"-"`
-	NumMilestones       int      `xorm:"NOT NULL DEFAULT 0"`
-	NumClosedMilestones int      `xorm:"NOT NULL DEFAULT 0"`
-	NumOpenMilestones   int      `xorm:"-"`
-	NumCommit           int64    `xorm:"NOT NULL DEFAULT 0"`
-	RepoType            RepoType `xorm:"NOT NULL DEFAULT 0"`
-
-	IsPrivate  bool `xorm:"INDEX"`
-	IsEmpty    bool `xorm:"INDEX"`
-	IsArchived bool `xorm:"INDEX"`
-	IsMirror   bool `xorm:"INDEX"`
+	ID                  int64              `xorm:"pk autoincr" json:"id"`
+	OwnerID             int64              `xorm:"UNIQUE(s) index" json:"ownerId"`
+	OwnerName           string             `json:"ownerName"`
+	Owner               *User              `xorm:"-" json:"owner"`
+	LowerName           string             `xorm:"UNIQUE(s) INDEX NOT NULL" json:"lowerName"`
+	Name                string             `xorm:"INDEX NOT NULL" json:"name"`
+	Description         string             `xorm:"TEXT" json:"description"`
+	Website             string             `xorm:"VARCHAR(2048)" json:"website"`
+	OriginalServiceType api.GitServiceType `xorm:"index" json:"originalServiceType"`
+	OriginalURL         string             `xorm:"VARCHAR(2048)" json:"originalUrl"`
+	DefaultBranch       string             `json:"defaultBranch"`
+	CreatorID           int64              `xorm:"INDEX NOT NULL  DEFAULT 0" json:"creatorId"`
+	Creator             *User              `xorm:"-" json:"creator"`
+	NumWatches          int                `json:"numWatches"`
+	NumStars            int                `json:"numStars"`
+	NumForks            int                `json:"numForks"`
+	NumIssues           int                `json:"numIssues"`
+	NumClosedIssues     int                `json:"numClosedIssues"`
+	NumOpenIssues       int                `xorm:"-" json:"numOpenIssues"`
+	NumPulls            int                `json:"numPulls"`
+	NumClosedPulls      int                `json:"numClosedPulls"`
+	NumOpenPulls        int                `xorm:"-" json:"numOpenPulls"`
+	NumMilestones       int                `xorm:"NOT NULL DEFAULT 0" json:"numMilestones"`
+	NumClosedMilestones int                `xorm:"NOT NULL DEFAULT 0" json:"numClosedMilestones"`
+	NumOpenMilestones   int                `xorm:"-" json:"numOpenMilestones"`
+	NumCommit           int64              `xorm:"NOT NULL DEFAULT 0" json:"numCommit"`
+	RepoType            RepoType           `xorm:"NOT NULL DEFAULT 0" json:"repoType"`
+
+	IsPrivate  bool `xorm:"INDEX" json:"isPrivate"`
+	IsEmpty    bool `xorm:"INDEX" json:"isEmpty"`
+	IsArchived bool `xorm:"INDEX" json:"isArchived"`
+	IsMirror   bool `xorm:"INDEX" json:"isMirror"`
 	*Mirror    `xorm:"-"`
-	Status     RepositoryStatus `xorm:"NOT NULL DEFAULT 0"`
+	Status     RepositoryStatus `xorm:"NOT NULL DEFAULT 0" json:"status"`
 
 	RenderingMetas  map[string]string `xorm:"-"`
-	Units           []*RepoUnit       `xorm:"-"`
-	PrimaryLanguage *LanguageStat     `xorm:"-"`
-
-	IsFork                          bool               `xorm:"INDEX NOT NULL DEFAULT false"`
-	ForkID                          int64              `xorm:"INDEX"`
-	BaseRepo                        *Repository        `xorm:"-"`
-	IsTemplate                      bool               `xorm:"INDEX NOT NULL DEFAULT false"`
-	TemplateID                      int64              `xorm:"INDEX"`
-	TemplateRepo                    *Repository        `xorm:"-"`
-	Size                            int64              `xorm:"NOT NULL DEFAULT 0"`
-	CodeIndexerStatus               *RepoIndexerStatus `xorm:"-"`
-	StatsIndexerStatus              *RepoIndexerStatus `xorm:"-"`
-	IsFsckEnabled                   bool               `xorm:"NOT NULL DEFAULT true"`
-	CloseIssuesViaCommitInAnyBranch bool               `xorm:"NOT NULL DEFAULT false"`
-	Topics                          []string           `xorm:"TEXT JSON"`
+	Units           []*RepoUnit       `xorm:"-" json:"units"`
+	PrimaryLanguage *LanguageStat     `xorm:"-" json:"primaryLanguage"`
+
+	IsFork                          bool               `xorm:"INDEX NOT NULL DEFAULT false" json:"isFork"`
+	ForkID                          int64              `xorm:"INDEX" json:"forkId"`
+	BaseRepo                        *Repository        `xorm:"-" json:"baseRepo"`
+	IsTemplate                      bool               `xorm:"INDEX NOT NULL DEFAULT false" json:"isTemplate"`
+	TemplateID                      int64              `xorm:"INDEX" json:"templateId"`
+	TemplateRepo                    *Repository        `xorm:"-" json:"templateRepo"`
+	Size                            int64              `xorm:"NOT NULL DEFAULT 0" json:"size"`
+	CodeIndexerStatus               *RepoIndexerStatus `xorm:"-" json:"codeIndexerStatus"`
+	StatsIndexerStatus              *RepoIndexerStatus `xorm:"-" json:"statsIndexerStatus"`
+	IsFsckEnabled                   bool               `xorm:"NOT NULL DEFAULT true" json:"isFsckEnabled"`
+	CloseIssuesViaCommitInAnyBranch bool               `xorm:"NOT NULL DEFAULT false" json:"closeIssuesViaCommitInAnyBranch"`
+	Topics                          []string           `xorm:"TEXT JSON" json:"topics"`
 
 	// Avatar: ID(10-20)-md5(32) - must fit into 64 symbols
-	Avatar string `xorm:"VARCHAR(64)"`
+	Avatar string `xorm:"VARCHAR(64)" json:"avatar"`
 
 	//blockchain
-	ContractAddress  string               `xorm:"INDEX"`
-	Balance          string               `xorm:"NOT NULL DEFAULT '0'"`
-	BlockChainStatus RepoBlockChainStatus `xorm:"NOT NULL DEFAULT 0"`
+	ContractAddress  string               `xorm:"INDEX" json:"contractAddress"`
+	Balance          string               `xorm:"NOT NULL DEFAULT '0'" json:"balance"`
+	BlockChainStatus RepoBlockChainStatus `xorm:"NOT NULL DEFAULT 0" json:"blockChainStatus"`
 
 	// git clone and git pull total count
-	CloneCnt int64 `xorm:"NOT NULL DEFAULT 0"`
+	CloneCnt int64 `xorm:"NOT NULL DEFAULT 0" json:"clone_cnt" json:"cloneCnt"`
 
 	// only git clone  total count
-	GitCloneCnt int64 `xorm:"NOT NULL DEFAULT 0"`
+	GitCloneCnt int64 `xorm:"NOT NULL DEFAULT 0" json:"git_clone_cnt" json:"gitCloneCnt"`
 
-	CreatedUnix timeutil.TimeStamp `xorm:"INDEX created"`
-	UpdatedUnix timeutil.TimeStamp `xorm:"INDEX updated"`
+	CreatedUnix timeutil.TimeStamp `xorm:"INDEX created" json:"createdUnix"`
+	UpdatedUnix timeutil.TimeStamp `xorm:"INDEX updated" json:"updatedUnix"`
 
-	Hot        int64  `xorm:"-"`
-	Active     int64  `xorm:"-"`
-	Alias      string `xorm:"INDEX"`
-	LowerAlias string `xorm:"INDEX"`
+	Hot        int64  `xorm:"-" json:"hot"`
+	Active     int64  `xorm:"-" json:"active"`
+	Alias      string `xorm:"INDEX" json:"alias"`
+	LowerAlias string `xorm:"INDEX" json:"lowerAlias"`
 }
 
 type RepositoryShow struct {
diff --git a/modules/auth/modelarts.go b/modules/auth/modelarts.go
index 9744bc387..0221c51d8 100755
--- a/modules/auth/modelarts.go
+++ b/modules/auth/modelarts.go
@@ -57,29 +57,26 @@ type CreateModelArtsTrainJobForm struct {
 }
 
 type CreateModelArtsInferenceJobForm struct {
-	DisplayJobName        string `form:"display_job_name" binding:"Required"`
-	JobName               string `form:"job_name" binding:"Required"`
-	Attachment            string `form:"attachment" binding:"Required"`
-	BootFile              string `form:"boot_file" binding:"Required"`
-	WorkServerNumber      int    `form:"work_server_number" binding:"Required"`
-	EngineID              int    `form:"engine_id" binding:"Required"`
-	PoolID                string `form:"pool_id" binding:"Required"`
-	Flavor                string `form:"flavor" binding:"Required"`
-	Params                string `form:"run_para_list" binding:"Required"`
-	Description           string `form:"description"`
-	IsSaveParam           string `form:"is_save_para"`
-	ParameterTemplateName string `form:"parameter_template_name"`
-	PrameterDescription   string `form:"parameter_description"`
-	BranchName            string `form:"branch_name" binding:"Required"`
-	VersionName           string `form:"version_name" binding:"Required"`
-	FlavorName            string `form:"flaver_names" binding:"Required"`
-	EngineName            string `form:"engine_names" binding:"Required"`
-	LabelName             string `form:"label_names" binding:"Required"`
-	TrainUrl              string `form:"train_url" binding:"Required"`
-	ModelName             string `form:"model_name" binding:"Required"`
-	ModelVersion          string `form:"model_version" binding:"Required"`
-	CkptName              string `form:"ckpt_name" binding:"Required"`
-	SpecId                int64  `form:"spec_id" binding:"Required"`
+	DisplayJobName   string `form:"display_job_name" binding:"Required"`
+	JobName          string `form:"job_name" binding:"Required"`
+	Attachment       string `form:"attachment" binding:"Required"`
+	BootFile         string `form:"boot_file" binding:"Required"`
+	WorkServerNumber int    `form:"work_server_number" binding:"Required"`
+	EngineID         int    `form:"engine_id" binding:"Required"`
+	PoolID           string `form:"pool_id" binding:"Required"`
+	Flavor           string `form:"flavor" binding:"Required"`
+	Params           string `form:"run_para_list" binding:"Required"`
+	Description      string `form:"description"`
+	BranchName       string `form:"branch_name" binding:"Required"`
+	VersionName      string `form:"version_name" binding:"Required"`
+	FlavorName       string `form:"flaver_names" binding:"Required"`
+	EngineName       string `form:"engine_names" binding:"Required"`
+	LabelName        string `form:"label_names" binding:"Required"`
+	TrainUrl         string `form:"train_url" binding:"Required"`
+	ModelName        string `form:"model_name" binding:"Required"`
+	ModelVersion     string `form:"model_version" binding:"Required"`
+	CkptName         string `form:"ckpt_name" binding:"Required"`
+	SpecId           int64  `form:"spec_id" binding:"Required"`
 }
 
 func (f *CreateModelArtsTrainJobForm) Validate(ctx *macaron.Context, errs binding.Errors) binding.Errors {
diff --git a/modules/cloudbrain/cloudbrain.go b/modules/cloudbrain/cloudbrain.go
index e57bd8d7e..8d4e57670 100755
--- a/modules/cloudbrain/cloudbrain.go
+++ b/modules/cloudbrain/cloudbrain.go
@@ -228,7 +228,7 @@ func AdminOrImageCreaterRight(ctx *context.Context) {
 
 }
 
-func GenerateTask(req GenerateCloudBrainTaskReq) error {
+func GenerateTask(req GenerateCloudBrainTaskReq) (string, error) {
 	var versionCount int
 	if req.JobType == string(models.JobTypeTrain) {
 		versionCount = 1
@@ -335,11 +335,11 @@ func GenerateTask(req GenerateCloudBrainTaskReq) error {
 	})
 	if err != nil {
 		log.Error("CreateJob failed:", err.Error(), req.Ctx.Data["MsgID"])
-		return err
+		return "", err
 	}
 	if jobResult.Code != Success {
 		log.Error("CreateJob(%s) failed:%s", req.JobName, jobResult.Msg, req.Ctx.Data["MsgID"])
-		return errors.New(jobResult.Msg)
+		return "", errors.New(jobResult.Msg)
 	}
 
 	var jobID = jobResult.Payload["jobId"].(string)
@@ -380,13 +380,13 @@ func GenerateTask(req GenerateCloudBrainTaskReq) error {
 	})
 
 	if err != nil {
-		return err
+		return "", err
 	}
 
 	task, err := models.GetCloudbrainByJobID(jobID)
 	if err != nil {
 		log.Error("GetCloudbrainByJobID failed: %v", err.Error())
-		return err
+		return "", err
 	}
 
 	stringId := strconv.FormatInt(task.ID, 10)
@@ -401,7 +401,7 @@ func GenerateTask(req GenerateCloudBrainTaskReq) error {
 		notification.NotifyOtherTask(req.Ctx.User, req.Ctx.Repo.Repository, stringId, req.DisplayJobName, models.ActionCreateDebugGPUTask)
 	}
 
-	return nil
+	return jobID, nil
 }
 
 func IsBenchmarkJob(jobType string) bool {
diff --git a/modules/grampus/grampus.go b/modules/grampus/grampus.go
index 7bacb46d3..a827b408f 100755
--- a/modules/grampus/grampus.go
+++ b/modules/grampus/grampus.go
@@ -98,7 +98,7 @@ func getDatasetGrampus(datasetInfos map[string]models.DatasetInfo) []models.Gram
 	return datasetGrampus
 }
 
-func GenerateTrainJob(ctx *context.Context, req *GenerateTrainJobReq) (err error) {
+func GenerateTrainJob(ctx *context.Context, req *GenerateTrainJobReq) (jobId string, err error) {
 	createTime := timeutil.TimeStampNow()
 
 	centerID, centerName := getCentersParamter(ctx, req)
@@ -146,7 +146,7 @@ func GenerateTrainJob(ctx *context.Context, req *GenerateTrainJobReq) (err error
 	})
 	if err != nil {
 		log.Error("createJob failed: %v", err.Error())
-		return err
+		return "", err
 	}
 
 	jobID := jobResult.JobInfo.JobID
@@ -187,7 +187,7 @@ func GenerateTrainJob(ctx *context.Context, req *GenerateTrainJobReq) (err error
 
 	if err != nil {
 		log.Error("CreateCloudbrain(%s) failed:%v", req.DisplayJobName, err.Error())
-		return err
+		return "", err
 	}
 
 	var actionType models.ActionType
@@ -198,7 +198,7 @@ func GenerateTrainJob(ctx *context.Context, req *GenerateTrainJobReq) (err error
 	}
 	notification.NotifyOtherTask(ctx.User, ctx.Repo.Repository, jobID, req.DisplayJobName, actionType)
 
-	return nil
+	return jobID, nil
 }
 
 func getCentersParamter(ctx *context.Context, req *GenerateTrainJobReq) ([]string, []string) {
diff --git a/modules/modelarts/modelarts.go b/modules/modelarts/modelarts.go
index 06521993e..4158174cb 100755
--- a/modules/modelarts/modelarts.go
+++ b/modules/modelarts/modelarts.go
@@ -680,7 +680,7 @@ func GetOutputPathByCount(TotalVersionCount int) (VersionOutputPath string) {
 	return VersionOutputPath
 }
 
-func GenerateInferenceJob(ctx *context.Context, req *GenerateInferenceJobReq) (err error) {
+func GenerateInferenceJob(ctx *context.Context, req *GenerateInferenceJobReq) (jobId string, err error) {
 	createTime := timeutil.TimeStampNow()
 	jobResult, err := createInferenceJob(models.CreateInferenceJobParams{
 		JobName:     req.JobName,
@@ -715,10 +715,10 @@ func GenerateInferenceJob(ctx *context.Context, req *GenerateInferenceJobReq) (e
 			})
 			if err != nil {
 				log.Error("InsertCloudbrainTemp failed: %v", err.Error())
-				return err
+				return "", err
 			}
 		}
-		return err
+		return "", err
 	}
 
 	// attach, err := models.GetAttachmentByUUID(req.Uuid)
@@ -769,7 +769,7 @@ func GenerateInferenceJob(ctx *context.Context, req *GenerateInferenceJobReq) (e
 
 	if err != nil {
 		log.Error("CreateCloudbrain(%s) failed:%v", req.JobName, err.Error())
-		return err
+		return "", err
 	}
 	if req.JobType == string(models.JobTypeModelSafety) {
 		task, err := models.GetCloudbrainByJobID(jobID)
@@ -780,7 +780,7 @@ func GenerateInferenceJob(ctx *context.Context, req *GenerateInferenceJobReq) (e
 		notification.NotifyOtherTask(ctx.User, ctx.Repo.Repository, jobID, req.DisplayJobName, models.ActionCreateInferenceTask)
 	}
 
-	return nil
+	return jobID, nil
 }
 
 func GetNotebookImageName(imageId string) (string, error) {
diff --git a/routers/api/v1/api.go b/routers/api/v1/api.go
index 7667cfcfa..b3694ced9 100755
--- a/routers/api/v1/api.go
+++ b/routers/api/v1/api.go
@@ -517,6 +517,15 @@ func RegisterRoutes(m *macaron.Macaron) {
 		m.Post("/markdown", bind(api.MarkdownOption{}), misc.Markdown)
 		m.Post("/markdown/raw", misc.MarkdownRaw)
 
+		m.Group("/images", func() {
+
+			m.Get("public", repo.GetPublicImages)
+			m.Get("custom", repo.GetCustomImages)
+			m.Get("star", repo.GetStarImages)
+			m.Get("npu", repo.GetNpuImages)
+
+		}, reqToken())
+
 		// Notifications
 		m.Group("/notifications", func() {
 			m.Combo("").
@@ -696,6 +705,13 @@ func RegisterRoutes(m *macaron.Macaron) {
 
 		m.Combo("/repositories/:id", reqToken()).Get(repo.GetByID)
 
+		m.Group("/:username/:reponame/datasets", func() {
+			m.Get("/current_repo", repo.CurrentRepoDatasetMultiple)
+			m.Get("/my_datasets", repo.MyDatasetsMultiple)
+			m.Get("/public_datasets", repo.PublicDatasetMultiple)
+			m.Get("/my_favorite", repo.MyFavoriteDatasetMultiple)
+		}, reqToken())
+
 		m.Group("/repos", func() {
 			m.Get("/search", repo.Search)
 
@@ -955,6 +971,17 @@ func RegisterRoutes(m *macaron.Macaron) {
 					m.Get("/:id/modelartlog", repo.TrainJobForModelConvertGetLog)
 					m.Get("/:id/model_list", repo.CloudBrainModelConvertList)
 				}, reqRepoReader(models.UnitTypeModelManage))
+				m.Group("/cloudbrain", func() {
+					m.Group("/train-job", func() {
+						m.Post("/create", bind(api.CreateTrainJobOption{}), repo.CreateCloudBrain)
+
+					})
+					m.Group("/inference-job", func() {
+						m.Post("/create", bind(api.CreateTrainJobOption{}), repo.CreateCloudBrainInferenceTask)
+
+					})
+
+				}, reqRepoReader(models.UnitTypeCloudBrain))
 				m.Group("/modelarts", func() {
 					m.Group("/notebook", func() {
 						//m.Get("/:jobid", repo.GetModelArtsNotebook)
diff --git a/routers/api/v1/repo/cloudbrain.go b/routers/api/v1/repo/cloudbrain.go
index ba46ab58c..58dd5b801 100755
--- a/routers/api/v1/repo/cloudbrain.go
+++ b/routers/api/v1/repo/cloudbrain.go
@@ -16,6 +16,10 @@ import (
 	"strings"
 	"time"
 
+	"code.gitea.io/gitea/services/cloudbrain/cloudbrainTask"
+
+	api "code.gitea.io/gitea/modules/structs"
+
 	"code.gitea.io/gitea/modules/notification"
 
 	"code.gitea.io/gitea/modules/setting"
@@ -29,6 +33,28 @@ import (
 	routerRepo "code.gitea.io/gitea/routers/repo"
 )
 
+func CreateCloudBrain(ctx *context.APIContext, option api.CreateTrainJobOption) {
+
+	if option.Type == 2 {
+		cloudbrainTask.GrampusTrainJobGpuCreate(ctx.Context, option)
+	}
+	if option.Type == 3 {
+		cloudbrainTask.GrampusTrainJobNpuCreate(ctx.Context, option)
+	}
+
+}
+
+func CreateCloudBrainInferenceTask(ctx *context.APIContext, option api.CreateTrainJobOption) {
+
+	if option.Type == 0 {
+		cloudbrainTask.GrampusTrainJobGpuCreate(ctx.Context, option)
+	}
+	if option.Type == 1 {
+		cloudbrainTask.GrampusTrainJobNpuCreate(ctx.Context, option)
+	}
+
+}
+
 // cloudbrain get job task by jobid
 func GetCloudbrainTask(ctx *context.APIContext) {
 	// swagger:operation GET /repos/{owner}/{repo}/cloudbrain/{jobid} cloudbrain jobTask
diff --git a/routers/api/v1/repo/datasets.go b/routers/api/v1/repo/datasets.go
new file mode 100644
index 000000000..0539a22e9
--- /dev/null
+++ b/routers/api/v1/repo/datasets.go
@@ -0,0 +1,114 @@
+package repo
+
+import (
+	"fmt"
+	"strings"
+
+	"code.gitea.io/gitea/models"
+	"code.gitea.io/gitea/modules/context"
+	"code.gitea.io/gitea/modules/log"
+	"code.gitea.io/gitea/modules/setting"
+)
+
+func PublicDatasetMultiple(ctx *context.APIContext) {
+
+	opts := &models.SearchDatasetOptions{
+		PublicOnly:     true,
+		NeedAttachment: true,
+		CloudBrainType: ctx.QueryInt("type"),
+	}
+	datasetMultiple(ctx, opts)
+
+}
+
+func MyFavoriteDatasetMultiple(ctx *context.APIContext) {
+
+	opts := &models.SearchDatasetOptions{
+		StarByMe:       true,
+		DatasetIDs:     models.GetDatasetIdsStarByUser(ctx.User.ID),
+		NeedAttachment: true,
+		CloudBrainType: ctx.QueryInt("type"),
+	}
+	datasetMultiple(ctx, opts)
+}
+
+func CurrentRepoDatasetMultiple(ctx *context.APIContext) {
+	datasetIds := models.GetDatasetIdsByRepoID(ctx.Repo.Repository.ID)
+	searchOrderBy := getSearchOrderByInValues(datasetIds)
+	opts := &models.SearchDatasetOptions{
+		RepoID:         ctx.Repo.Repository.ID,
+		NeedAttachment: true,
+		CloudBrainType: ctx.QueryInt("type"),
+		DatasetIDs:     datasetIds,
+		SearchOrderBy:  searchOrderBy,
+	}
+
+	datasetMultiple(ctx, opts)
+
+}
+
+func MyDatasetsMultiple(ctx *context.APIContext) {
+
+	opts := &models.SearchDatasetOptions{
+		UploadAttachmentByMe: true,
+		NeedAttachment:       true,
+		CloudBrainType:       ctx.QueryInt("type"),
+	}
+	datasetMultiple(ctx, opts)
+
+}
+func datasetMultiple(ctx *context.APIContext, opts *models.SearchDatasetOptions) {
+	page := ctx.QueryInt("page")
+	if page < 1 {
+		page = 1
+	}
+	pageSize := ctx.QueryInt("pageSize")
+	if pageSize < 1 {
+		pageSize = setting.UI.DatasetPagingNum
+	}
+
+	keyword := strings.Trim(ctx.Query("q"), " ")
+	opts.Keyword = keyword
+	if opts.SearchOrderBy.String() == "" {
+		opts.SearchOrderBy = models.SearchOrderByRecentUpdated
+	}
+
+	opts.RecommendOnly = ctx.QueryBool("recommend")
+	opts.ListOptions = models.ListOptions{
+		Page:     page,
+		PageSize: pageSize,
+	}
+	opts.JustNeedZipFile = true
+	opts.User = ctx.User
+
+	datasets, count, err := models.SearchDataset(opts)
+
+	if err != nil {
+		log.Error("json.Marshal failed:", err.Error())
+		ctx.JSON(200, map[string]interface{}{
+			"code":    1,
+			"message": err.Error(),
+			"data":    []*models.Dataset{},
+			"count":   0,
+		})
+		return
+	}
+	ctx.JSON(200, map[string]interface{}{
+		"code":    0,
+		"message": "",
+		"data":    datasets,
+		"count":   count,
+	})
+}
+
+func getSearchOrderByInValues(datasetIds []int64) models.SearchOrderBy {
+	if len(datasetIds) == 0 {
+		return ""
+	}
+	searchOrderBy := "CASE id "
+	for i, id := range datasetIds {
+		searchOrderBy += fmt.Sprintf(" WHEN %d THEN %d", id, i+1)
+	}
+	searchOrderBy += " ELSE 0 END"
+	return models.SearchOrderBy(searchOrderBy)
+}
diff --git a/routers/api/v1/repo/images.go b/routers/api/v1/repo/images.go
new file mode 100644
index 000000000..f0cb62980
--- /dev/null
+++ b/routers/api/v1/repo/images.go
@@ -0,0 +1,141 @@
+package repo
+
+import (
+	"encoding/json"
+	"net/http"
+	"strconv"
+
+	"code.gitea.io/gitea/models"
+	"code.gitea.io/gitea/modules/context"
+	"code.gitea.io/gitea/modules/grampus"
+	"code.gitea.io/gitea/modules/log"
+	"code.gitea.io/gitea/modules/modelarts"
+	"code.gitea.io/gitea/modules/setting"
+)
+
+type NPUImageINFO struct {
+	ID    string `json:"id"`
+	Value string `json:"value"`
+}
+
+func GetPublicImages(ctx *context.APIContext) {
+	uid := getUID(ctx)
+	opts := models.SearchImageOptions{
+		IncludePublicOnly:   true,
+		UID:                 uid,
+		Keyword:             ctx.Query("q"),
+		Topics:              ctx.Query("topic"),
+		IncludeOfficialOnly: ctx.QueryBool("recommend"),
+		SearchOrderBy:       "type desc, num_stars desc,id desc",
+		Status:              models.IMAGE_STATUS_SUCCESS,
+		CloudbrainType:      ctx.QueryInt("cloudbrainType"),
+	}
+
+	getImages(ctx, &opts)
+
+}
+
+func GetCustomImages(ctx *context.APIContext) {
+	uid := getUID(ctx)
+	opts := models.SearchImageOptions{
+		UID:              uid,
+		IncludeOwnerOnly: true,
+		Keyword:          ctx.Query("q"),
+		Topics:           ctx.Query("topic"),
+		Status:           -1,
+		SearchOrderBy:    "id desc",
+	}
+	getImages(ctx, &opts)
+
+}
+func GetStarImages(ctx *context.APIContext) {
+
+	uid := getUID(ctx)
+	opts := models.SearchImageOptions{
+		UID:             uid,
+		IncludeStarByMe: true,
+		Keyword:         ctx.Query("q"),
+		Topics:          ctx.Query("topic"),
+		Status:          models.IMAGE_STATUS_SUCCESS,
+		SearchOrderBy:   "id desc",
+	}
+	getImages(ctx, &opts)
+
+}
+
+func GetNpuImages(ctx *context.APIContext) {
+	cloudbrainType := ctx.QueryInt("type")
+	if cloudbrainType == 0 { //modelarts
+		getModelArtsImages(ctx)
+	} else { //c2net
+		getC2netNpuImages(ctx)
+	}
+}
+
+func getModelArtsImages(ctx *context.APIContext) {
+
+	var versionInfos modelarts.VersionInfo
+	_ = json.Unmarshal([]byte(setting.EngineVersions), &versionInfos)
+	var npuImageInfos []NPUImageINFO
+	for _, info := range versionInfos.Version {
+		npuImageInfos = append(npuImageInfos, NPUImageINFO{
+			ID:    strconv.Itoa(info.ID),
+			Value: info.Value,
+		})
+	}
+	ctx.JSON(http.StatusOK, npuImageInfos)
+
+}
+
+func getC2netNpuImages(ctx *context.APIContext) {
+	images, err := grampus.GetImages(grampus.ProcessorTypeNPU)
+	var npuImageInfos []NPUImageINFO
+	if err != nil {
+		log.Error("GetImages failed:", err.Error())
+		ctx.JSON(http.StatusOK, []NPUImageINFO{})
+	} else {
+		for _, info := range images.Infos {
+			npuImageInfos = append(npuImageInfos, NPUImageINFO{
+				ID:    info.ID,
+				Value: info.Name,
+			})
+		}
+		ctx.JSON(http.StatusOK, npuImageInfos)
+	}
+}
+func getImages(ctx *context.APIContext, opts *models.SearchImageOptions) {
+	page := ctx.QueryInt("page")
+	if page <= 0 {
+		page = 1
+	}
+
+	pageSize := ctx.QueryInt("pageSize")
+	if pageSize <= 0 {
+		pageSize = 15
+	}
+	opts.ListOptions = models.ListOptions{
+		Page:     page,
+		PageSize: pageSize,
+	}
+	imageList, total, err := models.SearchImage(opts)
+	if err != nil {
+		log.Error("Can not get images:%v", err)
+		ctx.JSON(http.StatusOK, models.ImagesPageResult{
+			Count:  0,
+			Images: []*models.Image{},
+		})
+	} else {
+		ctx.JSON(http.StatusOK, models.ImagesPageResult{
+			Count:  total,
+			Images: imageList,
+		})
+	}
+}
+
+func getUID(ctx *context.APIContext) int64 {
+	var uid int64 = -1
+	if ctx.IsSigned {
+		uid = ctx.User.ID
+	}
+	return uid
+}
diff --git a/services/cloudbrain/cloudbrainTask/inference.go b/services/cloudbrain/cloudbrainTask/inference.go
new file mode 100644
index 000000000..ba5ba7cf1
--- /dev/null
+++ b/services/cloudbrain/cloudbrainTask/inference.go
@@ -0,0 +1,631 @@
+package cloudbrainTask
+
+import (
+	"bufio"
+	"encoding/json"
+	"errors"
+	"fmt"
+	"io"
+	"io/ioutil"
+	"net/http"
+	"os"
+	"path"
+	"strconv"
+	"strings"
+	"unicode/utf8"
+
+	"code.gitea.io/gitea/modules/modelarts"
+
+	"code.gitea.io/gitea/modules/git"
+
+	api "code.gitea.io/gitea/modules/structs"
+
+	"code.gitea.io/gitea/models"
+	"code.gitea.io/gitea/modules/cloudbrain"
+	"code.gitea.io/gitea/modules/context"
+	"code.gitea.io/gitea/modules/log"
+	"code.gitea.io/gitea/modules/redis/redis_key"
+	"code.gitea.io/gitea/modules/redis/redis_lock"
+	"code.gitea.io/gitea/modules/setting"
+	"code.gitea.io/gitea/modules/storage"
+	"code.gitea.io/gitea/modules/util"
+	"code.gitea.io/gitea/services/cloudbrain/resource"
+	"code.gitea.io/gitea/services/reward/point/account"
+)
+
+const CLONE_FILE_PREFIX = "file:///"
+
+func CloudBrainInferenceJobCreate(ctx *context.Context, option api.CreateTrainJobOption) {
+
+	displayJobName := option.DisplayJobName
+	jobName := util.ConvertDisplayJobNameToJobName(displayJobName)
+	image := strings.TrimSpace(option.Image)
+	uuid := option.Attachment
+	jobType := string(models.JobTypeInference)
+	codePath := setting.JobPath + jobName + cloudbrain.CodeMountPath
+	branchName := option.BranchName
+	bootFile := strings.TrimSpace(option.BootFile)
+	labelName := option.LabelName
+	repo := ctx.Repo.Repository
+
+	lock := redis_lock.NewDistributeLock(redis_key.CloudbrainBindingJobNameKey(fmt.Sprint(repo.ID), jobType, displayJobName))
+	defer lock.UnLock()
+	isOk, err := lock.Lock(models.CloudbrainKeyDuration)
+	if !isOk {
+		log.Error("lock processed failed:%v", err, ctx.Data["MsgID"])
+
+		ctx.JSON(http.StatusOK, models.BaseErrorMessage(ctx.Tr("repo.cloudbrain_samejob_err")))
+		return
+	}
+
+	ckptUrl := setting.Attachment.Minio.RealPath + option.PreTrainModelUrl + option.CkptName
+	log.Info("ckpt url:" + ckptUrl)
+	command, err := getInferenceJobCommand(option)
+	if err != nil {
+		log.Error("getTrainJobCommand failed: %v", err)
+		ctx.JSON(http.StatusOK, models.BaseErrorMessage(err.Error()))
+		return
+	}
+
+	tasks, err := models.GetCloudbrainsByDisplayJobName(repo.ID, jobType, displayJobName)
+	if err == nil {
+		if len(tasks) != 0 {
+			log.Error("the job name did already exist", ctx.Data["MsgID"])
+			ctx.JSON(http.StatusOK, models.BaseErrorMessage("the job name did already exist"))
+			return
+		}
+	} else {
+		if !models.IsErrJobNotExist(err) {
+			log.Error("system error, %v", err, ctx.Data["MsgID"])
+
+			ctx.JSON(http.StatusOK, models.BaseErrorMessage("system error"))
+			return
+		}
+	}
+
+	if !jobNamePattern.MatchString(displayJobName) {
+
+		ctx.JSON(http.StatusOK, models.BaseErrorMessage(ctx.Tr("repo.cloudbrain_jobname_err")))
+		return
+	}
+
+	bootFileExist, err := ctx.Repo.FileExists(bootFile, branchName)
+	if err != nil || !bootFileExist {
+		log.Error("Get bootfile error:", err, ctx.Data["MsgID"])
+		ctx.JSON(http.StatusOK, models.BaseErrorMessage(ctx.Tr("repo.cloudbrain_bootfile_err")))
+		return
+	}
+
+	count, err := models.GetCloudbrainCountByUserID(ctx.User.ID, jobType)
+	if err != nil {
+		log.Error("GetCloudbrainCountByUserID failed:%v", err, ctx.Data["MsgID"])
+		ctx.JSON(http.StatusOK, models.BaseErrorMessage("system error"))
+		return
+	} else {
+		if count >= 1 {
+			log.Error("the user already has running or waiting task", ctx.Data["MsgID"])
+			ctx.JSON(http.StatusOK, models.BaseErrorMessage(ctx.Tr("repo.cloudbrain.morethanonejob")))
+			return
+		}
+	}
+
+	if branchName == "" {
+		branchName = cloudbrain.DefaultBranchName
+	}
+	errStr := loadCodeAndMakeModelPath(repo, codePath, branchName, jobName, cloudbrain.ResultPath)
+	if errStr != "" {
+
+		ctx.JSON(http.StatusOK, models.BaseErrorMessage(ctx.Tr(errStr)))
+		return
+	}
+
+	commitID, _ := ctx.Repo.GitRepo.GetBranchCommitID(branchName)
+
+	datasetInfos, datasetNames, err := models.GetDatasetInfo(uuid)
+	if err != nil {
+		log.Error("GetDatasetInfo failed: %v", err, ctx.Data["MsgID"])
+
+		ctx.JSON(http.StatusOK, models.BaseErrorMessage(ctx.Tr("cloudbrain.error.dataset_select")))
+		return
+	}
+	spec, err := resource.GetAndCheckSpec(ctx.User.ID, option.SpecId, models.FindSpecsOptions{
+		JobType:         models.JobTypeInference,
+		ComputeResource: models.GPU,
+		Cluster:         models.OpenICluster,
+		AiCenterCode:    models.AICenterOfCloudBrainOne})
+	if err != nil || spec == nil {
+
+		ctx.JSON(http.StatusOK, models.BaseErrorMessage("Resource specification is not available"))
+		return
+	}
+	if !account.IsPointBalanceEnough(ctx.User.ID, spec.UnitPrice) {
+		log.Error("point balance is not enough,userId=%d specId=%d", ctx.User.ID, spec.ID)
+		ctx.JSON(http.StatusOK, models.BaseErrorMessage(ctx.Tr("points.insufficient_points_balance")))
+		return
+	}
+	req := cloudbrain.GenerateCloudBrainTaskReq{
+		Ctx:              ctx,
+		DisplayJobName:   displayJobName,
+		JobName:          jobName,
+		Image:            image,
+		Command:          command,
+		Uuids:            uuid,
+		DatasetNames:     datasetNames,
+		DatasetInfos:     datasetInfos,
+		CodePath:         storage.GetMinioPath(jobName, cloudbrain.CodeMountPath+"/"),
+		ModelPath:        setting.Attachment.Minio.RealPath + option.PreTrainModelUrl,
+		BenchmarkPath:    storage.GetMinioPath(jobName, cloudbrain.BenchMarkMountPath+"/"),
+		Snn4ImageNetPath: storage.GetMinioPath(jobName, cloudbrain.Snn4imagenetMountPath+"/"),
+		BrainScorePath:   storage.GetMinioPath(jobName, cloudbrain.BrainScoreMountPath+"/"),
+		JobType:          jobType,
+		Description:      option.Description,
+		BranchName:       branchName,
+		BootFile:         option.BootFile,
+		Params:           option.Params,
+		CommitID:         commitID,
+		ResultPath:       storage.GetMinioPath(jobName, cloudbrain.ResultPath+"/"),
+		ModelName:        option.ModelName,
+		ModelVersion:     option.ModelVersion,
+		CkptName:         option.CkptName,
+		TrainUrl:         option.PreTrainModelUrl,
+		LabelName:        labelName,
+		Spec:             spec,
+	}
+
+	jobId, err := cloudbrain.GenerateTask(req)
+	if err != nil {
+
+		ctx.JSON(http.StatusOK, models.BaseErrorMessage(err.Error()))
+		return
+	}
+	ctx.JSON(http.StatusOK, models.BaseMessage{Code: 0, Message: jobId})
+}
+
+func ModelArtsInferenceJobCreate(ctx *context.Context, option api.CreateTrainJobOption) {
+	ctx.Data["PageIsTrainJob"] = true
+	VersionOutputPath := modelarts.GetOutputPathByCount(modelarts.TotalVersionCount)
+	displayJobName := option.DisplayJobName
+	jobName := util.ConvertDisplayJobNameToJobName(displayJobName)
+	uuid := option.Attachment
+	description := option.Description
+	workServerNumber := option.WorkServerNumber
+	engineID, _ := strconv.Atoi(option.ImageID)
+	bootFile := strings.TrimSpace(option.BootFile)
+	params := option.Params
+	repo := ctx.Repo.Repository
+	codeLocalPath := setting.JobPath + jobName + modelarts.CodePath
+	codeObsPath := "/" + setting.Bucket + modelarts.JobPath + jobName + modelarts.CodePath
+	resultObsPath := "/" + setting.Bucket + modelarts.JobPath + jobName + modelarts.ResultPath + VersionOutputPath + "/"
+	logObsPath := "/" + setting.Bucket + modelarts.JobPath + jobName + modelarts.LogPath + VersionOutputPath + "/"
+	//dataPath := "/" + setting.Bucket + "/" + setting.BasePath + path.Join(uuid[0:1], uuid[1:2]) + "/" + uuid + uuid + "/"
+	branchName := option.BranchName
+	EngineName := option.Image
+	LabelName := option.LabelName
+	isLatestVersion := modelarts.IsLatestVersion
+	VersionCount := modelarts.VersionCountOne
+	trainUrl := option.PreTrainModelUrl
+	modelName := option.ModelName
+	modelVersion := option.ModelVersion
+	ckptName := option.CkptName
+	ckptUrl := "/" + option.PreTrainModelUrl + option.CkptName
+
+	errStr := checkInferenceJobMultiNode(ctx.User.ID, option.WorkServerNumber)
+	if errStr != "" {
+
+		ctx.JSON(http.StatusOK, models.BaseErrorMessage(ctx.Tr(errStr)))
+		return
+	}
+
+	lock := redis_lock.NewDistributeLock(redis_key.CloudbrainBindingJobNameKey(fmt.Sprint(repo.ID), string(models.JobTypeInference), displayJobName))
+	isOk, err := lock.Lock(models.CloudbrainKeyDuration)
+	if !isOk {
+		log.Error("lock processed failed:%v", err, ctx.Data["MsgID"])
+
+		ctx.JSON(http.StatusOK, models.BaseErrorMessage(ctx.Tr("repo.cloudbrain_samejob_err")))
+		return
+	}
+	defer lock.UnLock()
+
+	count, err := models.GetCloudbrainInferenceJobCountByUserID(ctx.User.ID)
+	if err != nil {
+		log.Error("GetCloudbrainInferenceJobCountByUserID failed:%v", err, ctx.Data["MsgID"])
+
+		ctx.JSON(http.StatusOK, models.BaseErrorMessage("system error"))
+		return
+	} else {
+		if count >= 1 {
+			log.Error("the user already has running or waiting inference task", ctx.Data["MsgID"])
+
+			ctx.JSON(http.StatusOK, models.BaseErrorMessage("you have already a running or waiting inference task, can not create more"))
+			return
+		}
+	}
+
+	if err := paramCheckCreateInferenceJob(option); err != nil {
+		log.Error("paramCheckCreateInferenceJob failed:(%v)", err)
+
+		ctx.JSON(http.StatusOK, models.BaseErrorMessage(err.Error()))
+		return
+	}
+
+	bootFileExist, err := ctx.Repo.FileExists(bootFile, branchName)
+	if err != nil || !bootFileExist {
+		log.Error("Get bootfile error:", err)
+		ctx.JSON(http.StatusOK, models.BaseErrorMessage(ctx.Tr("repo.cloudbrain_bootfile_err")))
+		return
+	}
+
+	//Determine whether the task name of the task in the project is duplicated
+	tasks, err := models.GetCloudbrainsByDisplayJobName(repo.ID, string(models.JobTypeInference), displayJobName)
+	if err == nil {
+		if len(tasks) != 0 {
+			log.Error("the job name did already exist", ctx.Data["MsgID"])
+
+			ctx.JSON(http.StatusOK, models.BaseErrorMessage("the job name did already exist"))
+			return
+		}
+	} else {
+		if !models.IsErrJobNotExist(err) {
+			log.Error("system error, %v", err, ctx.Data["MsgID"])
+
+			ctx.JSON(http.StatusOK, models.BaseErrorMessage("system error"))
+			return
+		}
+	}
+
+	spec, err := resource.GetAndCheckSpec(ctx.User.ID, option.SpecId, models.FindSpecsOptions{
+		JobType:         models.JobTypeInference,
+		ComputeResource: models.NPU,
+		Cluster:         models.OpenICluster,
+		AiCenterCode:    models.AICenterOfCloudBrainTwo})
+	if err != nil || spec == nil {
+
+		ctx.JSON(http.StatusOK, models.BaseErrorMessage("Resource specification not available"))
+		return
+	}
+	if !account.IsPointBalanceEnough(ctx.User.ID, spec.UnitPrice) {
+		log.Error("point balance is not enough,userId=%d specId=%d ", ctx.User.ID, spec.ID)
+		ctx.JSON(http.StatusOK, models.BaseErrorMessage(ctx.Tr("points.insufficient_points_balance")))
+		return
+	}
+
+	//todo: del the codeLocalPath
+	_, err = ioutil.ReadDir(codeLocalPath)
+	if err == nil {
+		os.RemoveAll(codeLocalPath)
+	}
+
+	gitRepo, _ := git.OpenRepository(repo.RepoPath())
+	commitID, _ := gitRepo.GetBranchCommitID(branchName)
+
+	if err := downloadCode(repo, codeLocalPath, branchName); err != nil {
+		log.Error("Create task failed, server timed out: %s (%v)", repo.FullName(), err)
+
+		ctx.JSON(http.StatusOK, models.BaseErrorMessage(ctx.Tr("cloudbrain.load_code_failed")))
+		return
+	}
+
+	//todo: upload code (send to file_server todo this work?)
+	if err := obsMkdir(setting.CodePathPrefix + jobName + modelarts.ResultPath + VersionOutputPath + "/"); err != nil {
+		log.Error("Failed to obsMkdir_result: %s (%v)", repo.FullName(), err)
+
+		ctx.JSON(http.StatusOK, models.BaseErrorMessage("Failed to obsMkdir_result"))
+		return
+	}
+
+	if err := obsMkdir(setting.CodePathPrefix + jobName + modelarts.LogPath + VersionOutputPath + "/"); err != nil {
+		log.Error("Failed to obsMkdir_log: %s (%v)", repo.FullName(), err)
+		ctx.JSON(http.StatusOK, models.BaseErrorMessage("Failed to obsMkdir_log"))
+		return
+	}
+
+	if err := uploadCodeToObs(codeLocalPath, jobName, ""); err != nil {
+		log.Error("Failed to uploadCodeToObs: %s (%v)", repo.FullName(), err)
+		ctx.JSON(http.StatusOK, models.BaseErrorMessage(ctx.Tr("cloudbrain.load_code_failed")))
+		return
+	}
+
+	var parameters models.Parameters
+	param := make([]models.Parameter, 0)
+	param = append(param, models.Parameter{
+		Label: modelarts.ResultUrl,
+		Value: "s3:/" + resultObsPath,
+	}, models.Parameter{
+		Label: modelarts.CkptUrl,
+		Value: "s3:/" + ckptUrl,
+	})
+
+	datasUrlList, dataUrl, datasetNames, isMultiDataset, err := getDatasUrlListByUUIDS(uuid)
+	if err != nil {
+
+		ctx.JSON(http.StatusOK, models.BaseErrorMessage(err.Error()))
+		return
+	}
+	dataPath := dataUrl
+	jsondatas, err := json.Marshal(datasUrlList)
+	if err != nil {
+		log.Error("Failed to Marshal: %v", err)
+
+		ctx.JSON(http.StatusOK, models.BaseErrorMessage("json error:"+err.Error()))
+		return
+	}
+	if isMultiDataset {
+		param = append(param, models.Parameter{
+			Label: modelarts.MultiDataUrl,
+			Value: string(jsondatas),
+		})
+	}
+
+	existDeviceTarget := false
+	if len(params) != 0 {
+		err := json.Unmarshal([]byte(params), &parameters)
+		if err != nil {
+			log.Error("Failed to Unmarshal params: %s (%v)", params, err)
+
+			ctx.JSON(http.StatusOK, models.BaseErrorMessage("运行参数错误"))
+			return
+		}
+
+		for _, parameter := range parameters.Parameter {
+			if parameter.Label == modelarts.DeviceTarget {
+				existDeviceTarget = true
+			}
+			if parameter.Label != modelarts.TrainUrl && parameter.Label != modelarts.DataUrl {
+				param = append(param, models.Parameter{
+					Label: parameter.Label,
+					Value: parameter.Value,
+				})
+			}
+		}
+	}
+	if !existDeviceTarget {
+		param = append(param, models.Parameter{
+			Label: modelarts.DeviceTarget,
+			Value: modelarts.Ascend,
+		})
+	}
+
+	req := &modelarts.GenerateInferenceJobReq{
+		JobName:           jobName,
+		DisplayJobName:    displayJobName,
+		DataUrl:           dataPath,
+		Description:       description,
+		CodeObsPath:       codeObsPath,
+		BootFileUrl:       codeObsPath + bootFile,
+		BootFile:          bootFile,
+		TrainUrl:          trainUrl,
+		WorkServerNumber:  workServerNumber,
+		EngineID:          int64(engineID),
+		LogUrl:            logObsPath,
+		PoolID:            getPoolId(),
+		Uuid:              uuid,
+		Parameters:        param, //modelarts train parameters
+		CommitID:          commitID,
+		BranchName:        branchName,
+		Params:            option.Params,
+		EngineName:        EngineName,
+		LabelName:         LabelName,
+		IsLatestVersion:   isLatestVersion,
+		VersionCount:      VersionCount,
+		TotalVersionCount: modelarts.TotalVersionCount,
+		ModelName:         modelName,
+		ModelVersion:      modelVersion,
+		CkptName:          ckptName,
+		ResultUrl:         resultObsPath,
+		Spec:              spec,
+		DatasetName:       datasetNames,
+		JobType:           string(models.JobTypeInference),
+	}
+
+	jobId, err := modelarts.GenerateInferenceJob(ctx, req)
+	if err != nil {
+		log.Error("GenerateTrainJob failed:%v", err.Error())
+
+		ctx.JSON(http.StatusOK, models.BaseErrorMessage(err.Error()))
+		return
+	}
+	ctx.JSON(http.StatusOK, models.BaseMessage{Code: 0, Message: jobId})
+}
+
+func getDatasUrlListByUUIDS(uuidStr string) ([]models.Datasurl, string, string, bool, error) {
+	var isMultiDataset bool
+	var dataUrl string
+	var datasetNames string
+	var datasUrlList []models.Datasurl
+	uuids := strings.Split(uuidStr, ";")
+	if len(uuids) > setting.MaxDatasetNum {
+		log.Error("the dataset count(%d) exceed the limit", len(uuids))
+		return datasUrlList, dataUrl, datasetNames, isMultiDataset, errors.New("the dataset count exceed the limit")
+	}
+
+	datasetInfos := make(map[string]models.DatasetInfo)
+	attachs, err := models.GetAttachmentsByUUIDs(uuids)
+	if err != nil || len(attachs) != len(uuids) {
+		log.Error("GetAttachmentsByUUIDs failed: %v", err)
+		return datasUrlList, dataUrl, datasetNames, isMultiDataset, errors.New("GetAttachmentsByUUIDs failed")
+	}
+
+	for i, tmpUuid := range uuids {
+		var attach *models.Attachment
+		for _, tmpAttach := range attachs {
+			if tmpAttach.UUID == tmpUuid {
+				attach = tmpAttach
+				break
+			}
+		}
+		if attach == nil {
+			log.Error("GetAttachmentsByUUIDs failed: %v", err)
+			return datasUrlList, dataUrl, datasetNames, isMultiDataset, errors.New("GetAttachmentsByUUIDs failed")
+		}
+		fileName := strings.TrimSuffix(strings.TrimSuffix(strings.TrimSuffix(attach.Name, ".zip"), ".tar.gz"), ".tgz")
+		for _, datasetInfo := range datasetInfos {
+			if fileName == datasetInfo.Name {
+				log.Error("the dataset name is same: %v", attach.Name)
+				return datasUrlList, dataUrl, datasetNames, isMultiDataset, errors.New("the dataset name is same")
+			}
+		}
+		if len(attachs) <= 1 {
+			dataUrl = "/" + setting.Bucket + "/" + setting.BasePath + path.Join(attach.UUID[0:1], attach.UUID[1:2]) + "/" + attach.UUID + attach.UUID + "/"
+			isMultiDataset = false
+		} else {
+			dataUrl = "/" + setting.Bucket + "/" + setting.BasePath + path.Join(attachs[0].UUID[0:1], attachs[0].UUID[1:2]) + "/" + attachs[0].UUID + attachs[0].UUID + "/"
+			datasetUrl := "s3://" + setting.Bucket + "/" + setting.BasePath + path.Join(attach.UUID[0:1], attach.UUID[1:2]) + "/" + attach.UUID + attach.UUID + "/"
+			datasUrlList = append(datasUrlList, models.Datasurl{
+				DatasetUrl:  datasetUrl,
+				DatasetName: fileName,
+			})
+			isMultiDataset = true
+		}
+
+		if i == 0 {
+			datasetNames = attach.Name
+		} else {
+			datasetNames += ";" + attach.Name
+		}
+	}
+
+	return datasUrlList, dataUrl, datasetNames, isMultiDataset, nil
+}
+func checkInferenceJobMultiNode(userId int64, serverNum int) string {
+	if serverNum == 1 {
+		return ""
+	}
+
+	return "repo.modelarts.no_node_right"
+
+}
+
+func paramCheckCreateInferenceJob(option api.CreateTrainJobOption) error {
+	if !strings.HasSuffix(strings.TrimSpace(option.BootFile), ".py") {
+		log.Error("the boot file(%s) must be a python file", strings.TrimSpace(option.BootFile))
+		return errors.New("启动文件必须是python文件")
+	}
+
+	if option.ModelName == "" {
+		log.Error("the ModelName(%d) must not be nil", option.ModelName)
+		return errors.New("模型名称不能为空")
+	}
+	if option.ModelVersion == "" {
+		log.Error("the ModelVersion(%d) must not be nil", option.ModelVersion)
+		return errors.New("模型版本不能为空")
+	}
+	if option.CkptName == "" {
+		log.Error("the CkptName(%d) must not be nil", option.CkptName)
+		return errors.New("权重文件不能为空")
+	}
+	if option.BranchName == "" {
+		log.Error("the Branch(%d) must not be nil", option.BranchName)
+		return errors.New("分支名不能为空")
+	}
+
+	if utf8.RuneCountInString(option.Description) > 255 {
+		log.Error("the Description length(%d) must not more than 255", option.Description)
+		return errors.New("描述字符不能超过255个字符")
+	}
+
+	return nil
+}
+
+func loadCodeAndMakeModelPath(repo *models.Repository, codePath string, branchName string, jobName string, resultPath string) string {
+	err := downloadCode(repo, codePath, branchName)
+	if err != nil {
+		return "cloudbrain.load_code_failed"
+	}
+
+	err = uploadCodeToMinio(codePath+"/", jobName, cloudbrain.CodeMountPath+"/")
+	if err != nil {
+		return "cloudbrain.load_code_failed"
+	}
+
+	modelPath := setting.JobPath + jobName + resultPath + "/"
+	err = mkModelPath(modelPath)
+	if err != nil {
+		return "cloudbrain.load_code_failed"
+	}
+	err = uploadCodeToMinio(modelPath, jobName, resultPath+"/")
+	if err != nil {
+		return "cloudbrain.load_code_failed"
+	}
+
+	return ""
+}
+
+func downloadCode(repo *models.Repository, codePath, branchName string) error {
+	//add "file:///" prefix to make the depth valid
+	if err := git.Clone(CLONE_FILE_PREFIX+repo.RepoPath(), codePath, git.CloneRepoOptions{Branch: branchName, Depth: 1}); err != nil {
+		log.Error("Failed to clone repository: %s (%v)", repo.FullName(), err)
+		return err
+	}
+
+	configFile, err := os.OpenFile(codePath+"/.git/config", os.O_RDWR, 0666)
+	if err != nil {
+		log.Error("open file(%s) failed:%v", codePath+"/,git/config", err)
+		return err
+	}
+
+	defer configFile.Close()
+
+	pos := int64(0)
+	reader := bufio.NewReader(configFile)
+	for {
+		line, err := reader.ReadString('\n')
+		if err != nil {
+			if err == io.EOF {
+				log.Error("not find the remote-url")
+				return nil
+			} else {
+				log.Error("read error: %v", err)
+				return err
+			}
+		}
+
+		if strings.Contains(line, "url") && strings.Contains(line, ".git") {
+			originUrl := "\turl = " + repo.CloneLink().HTTPS + "\n"
+			if len(line) > len(originUrl) {
+				originUrl += strings.Repeat(" ", len(line)-len(originUrl))
+			}
+			bytes := []byte(originUrl)
+			_, err := configFile.WriteAt(bytes, pos)
+			if err != nil {
+				log.Error("WriteAt failed:%v", err)
+				return err
+			}
+			break
+		}
+
+		pos += int64(len(line))
+	}
+
+	return nil
+}
+
+func getInferenceJobCommand(option api.CreateTrainJobOption) (string, error) {
+	var command string
+	bootFile := strings.TrimSpace(option.BootFile)
+	params := option.Params
+
+	if !strings.HasSuffix(bootFile, ".py") {
+		log.Error("bootFile(%s) format error", bootFile)
+		return command, errors.New("bootFile format error")
+	}
+
+	var parameters models.Parameters
+	var param string
+	if len(params) != 0 {
+		err := json.Unmarshal([]byte(params), &parameters)
+		if err != nil {
+			log.Error("Failed to Unmarshal params: %s (%v)", params, err)
+			return command, err
+		}
+
+		for _, parameter := range parameters.Parameter {
+			param += " --" + parameter.Label + "=" + parameter.Value
+		}
+	}
+
+	param += " --modelname" + "=" + option.CkptName
+
+	command += "python /code/" + bootFile + param + " > " + cloudbrain.ResultPath + "/" + option.DisplayJobName + "-" + cloudbrain.LogFile
+
+	return command, nil
+}
diff --git a/services/cloudbrain/cloudbrainTask/train.go b/services/cloudbrain/cloudbrainTask/train.go
new file mode 100644
index 000000000..28d5038bf
--- /dev/null
+++ b/services/cloudbrain/cloudbrainTask/train.go
@@ -0,0 +1,678 @@
+package cloudbrainTask
+
+import (
+	"encoding/json"
+	"errors"
+	"fmt"
+	"io"
+	"io/ioutil"
+	"net/http"
+	"os"
+	"path"
+	"regexp"
+	"strings"
+
+	"code.gitea.io/gitea/modules/obs"
+
+	"code.gitea.io/gitea/modules/git"
+	"code.gitea.io/gitea/modules/storage"
+	"github.com/unknwon/com"
+
+	"code.gitea.io/gitea/models"
+	"code.gitea.io/gitea/modules/cloudbrain"
+	"code.gitea.io/gitea/modules/context"
+	"code.gitea.io/gitea/modules/grampus"
+	"code.gitea.io/gitea/modules/log"
+	"code.gitea.io/gitea/modules/modelarts"
+	"code.gitea.io/gitea/modules/redis/redis_key"
+	"code.gitea.io/gitea/modules/redis/redis_lock"
+	"code.gitea.io/gitea/modules/setting"
+	api "code.gitea.io/gitea/modules/structs"
+	"code.gitea.io/gitea/modules/util"
+	"code.gitea.io/gitea/services/cloudbrain/resource"
+	"code.gitea.io/gitea/services/reward/point/account"
+)
+
+var jobNamePattern = regexp.MustCompile(`^[a-z0-9][a-z0-9-_]{1,34}[a-z0-9-]$`)
+
+func GrampusTrainJobGpuCreate(ctx *context.Context, option api.CreateTrainJobOption) {
+
+	displayJobName := option.DisplayJobName
+	jobName := util.ConvertDisplayJobNameToJobName(displayJobName)
+	uuid := option.Attachment
+	description := option.Description
+	bootFile := strings.TrimSpace(option.BootFile)
+	params := option.Params
+	repo := ctx.Repo.Repository
+	codeLocalPath := setting.JobPath + jobName + cloudbrain.CodeMountPath + "/"
+	codeMinioPath := setting.CBCodePathPrefix + jobName + cloudbrain.CodeMountPath + "/"
+	branchName := option.BranchName
+	image := strings.TrimSpace(option.Image)
+
+	lock := redis_lock.NewDistributeLock(redis_key.CloudbrainBindingJobNameKey(fmt.Sprint(repo.ID), string(models.JobTypeTrain), displayJobName))
+	defer lock.UnLock()
+	spec, datasetInfos, datasetNames, err := checkParameters(ctx, option, lock, repo)
+	if err != nil {
+		ctx.JSON(http.StatusOK, models.BaseErrorMessage(err.Error()))
+		return
+	}
+
+	//prepare code and out path
+	_, err = ioutil.ReadDir(codeLocalPath)
+	if err == nil {
+		os.RemoveAll(codeLocalPath)
+	}
+
+	if err := downloadZipCode(ctx, codeLocalPath, branchName); err != nil {
+		log.Error("downloadZipCode failed, server timed out: %s (%v)", repo.FullName(), err, ctx.Data["MsgID"])
+		ctx.JSON(http.StatusOK, models.BaseErrorMessage(ctx.Tr("cloudbrain.load_code_failed")))
+
+	}
+
+	//todo: upload code (send to file_server todo this work?)
+	//upload code
+	if err := uploadCodeToMinio(codeLocalPath+"/", jobName, cloudbrain.CodeMountPath+"/"); err != nil {
+		log.Error("Failed to uploadCodeToMinio: %s (%v)", repo.FullName(), err, ctx.Data["MsgID"])
+		ctx.JSON(http.StatusOK, models.BaseErrorMessage(ctx.Tr("cloudbrain.load_code_failed")))
+		return
+	}
+
+	modelPath := setting.JobPath + jobName + cloudbrain.ModelMountPath + "/"
+	if err := mkModelPath(modelPath); err != nil {
+		log.Error("Failed to mkModelPath: %s (%v)", repo.FullName(), err, ctx.Data["MsgID"])
+		ctx.JSON(http.StatusOK, models.BaseErrorMessage(ctx.Tr("cloudbrain.load_code_failed")))
+		return
+	}
+
+	//init model readme
+	if err := uploadCodeToMinio(modelPath, jobName, cloudbrain.ModelMountPath+"/"); err != nil {
+		log.Error("Failed to uploadCodeToMinio: %s (%v)", repo.FullName(), err, ctx.Data["MsgID"])
+		ctx.JSON(http.StatusOK, models.BaseErrorMessage(ctx.Tr("cloudbrain.load_code_failed")))
+		return
+	}
+
+	var datasetRemotePath, allFileName string
+	for _, datasetInfo := range datasetInfos {
+		if datasetRemotePath == "" {
+			datasetRemotePath = datasetInfo.DataLocalPath
+			allFileName = datasetInfo.FullName
+		} else {
+			datasetRemotePath = datasetRemotePath + ";" + datasetInfo.DataLocalPath
+			allFileName = allFileName + ";" + datasetInfo.FullName
+		}
+
+	}
+
+	//prepare command
+	preTrainModelPath := getPreTrainModelPath(option.PreTrainModelUrl, option.CkptName)
+
+	command, err := generateCommand(repo.Name, grampus.ProcessorTypeGPU, codeMinioPath+cloudbrain.DefaultBranchName+".zip", datasetRemotePath, bootFile, params, setting.CBCodePathPrefix+jobName+cloudbrain.ModelMountPath+"/", allFileName, preTrainModelPath, option.CkptName)
+	if err != nil {
+		log.Error("Failed to generateCommand: %s (%v)", displayJobName, err, ctx.Data["MsgID"])
+		ctx.JSON(http.StatusOK, models.BaseErrorMessage("Create task failed, internal error"))
+		return
+	}
+
+	commitID, _ := ctx.Repo.GitRepo.GetBranchCommitID(branchName)
+
+	req := &grampus.GenerateTrainJobReq{
+		JobName:         jobName,
+		DisplayJobName:  displayJobName,
+		ComputeResource: models.GPUResource,
+		ProcessType:     grampus.ProcessorTypeGPU,
+		Command:         command,
+		ImageUrl:        image,
+		Description:     description,
+		BootFile:        bootFile,
+		Uuid:            uuid,
+		CommitID:        commitID,
+		BranchName:      branchName,
+		Params:          option.Params,
+		EngineName:      image,
+		DatasetNames:    datasetNames,
+		DatasetInfos:    datasetInfos,
+
+		IsLatestVersion:  modelarts.IsLatestVersion,
+		VersionCount:     modelarts.VersionCountOne,
+		WorkServerNumber: 1,
+		Spec:             spec,
+	}
+
+	if option.ModelName != "" { //使用预训练模型训练
+		req.ModelName = option.ModelName
+		req.LabelName = option.LabelName
+		req.CkptName = option.CkptName
+		req.ModelVersion = option.ModelVersion
+		req.PreTrainModelUrl = option.PreTrainModelUrl
+
+	}
+
+	jobId, err := grampus.GenerateTrainJob(ctx, req)
+	if err != nil {
+		log.Error("GenerateTrainJob failed:%v", err.Error(), ctx.Data["MsgID"])
+		ctx.JSON(http.StatusOK, models.BaseErrorMessage(err.Error()))
+		return
+	}
+	ctx.JSON(http.StatusOK, models.BaseMessage{Code: 0, Message: jobId})
+}
+
+func checkParameters(ctx *context.Context, option api.CreateTrainJobOption, lock *redis_lock.DistributeLock, repo *models.Repository) (*models.Specification, map[string]models.DatasetInfo, string, error) {
+	isOk, err := lock.Lock(models.CloudbrainKeyDuration)
+	if !isOk {
+		log.Error("lock processed failed:%v", err, ctx.Data["MsgID"])
+
+		return nil, nil, "", fmt.Errorf(ctx.Tr("repo.cloudbrain_samejob_err"))
+	}
+
+	if !jobNamePattern.MatchString(option.DisplayJobName) {
+		return nil, nil, "", fmt.Errorf(ctx.Tr("repo.cloudbrain_jobname_err"))
+	}
+
+	bootFileExist, err := ctx.Repo.FileExists(option.BootFile, option.BranchName)
+	if err != nil || !bootFileExist {
+		log.Error("Get bootfile error:", err, ctx.Data["MsgID"])
+		return nil, nil, "", fmt.Errorf(ctx.Tr("repo.cloudbrain_bootfile_err"))
+	}
+
+	//check count limit
+	count, err := models.GetGrampusCountByUserID(ctx.User.ID, string(models.JobTypeTrain), models.GPUResource)
+	if err != nil {
+		log.Error("GetGrampusCountByUserID failed:%v", err, ctx.Data["MsgID"])
+		return nil, nil, "", fmt.Errorf("system error")
+	} else {
+		if count >= 1 {
+			log.Error("the user already has running or waiting task", ctx.Data["MsgID"])
+			return nil, nil, "", fmt.Errorf("you have already a running or waiting task, can not create more.")
+		}
+	}
+
+	//check param
+	if err := grampusParamCheckCreateTrainJob(option.BootFile, option.BranchName); err != nil {
+		log.Error("paramCheckCreateTrainJob failed:(%v)", err, ctx.Data["MsgID"])
+		return nil, nil, "", err
+	}
+
+	//check whether the task name in the project is duplicated
+	tasks, err := models.GetCloudbrainsByDisplayJobName(repo.ID, string(models.JobTypeTrain), option.DisplayJobName)
+	if err == nil {
+		if len(tasks) != 0 {
+			log.Error("the job name did already exist", ctx.Data["MsgID"])
+			return nil, nil, "", fmt.Errorf("The job name did already exist.")
+		}
+	} else {
+		if !models.IsErrJobNotExist(err) {
+			log.Error("system error, %v", err, ctx.Data["MsgID"])
+			return nil, nil, "", fmt.Errorf("system error")
+		}
+	}
+
+	//check specification
+	computeResource := models.GPU
+	if option.Type == 3 {
+		computeResource = models.NPU
+	}
+	spec, err := resource.GetAndCheckSpec(ctx.User.ID, option.SpecId, models.FindSpecsOptions{
+		JobType:         models.JobTypeTrain,
+		ComputeResource: computeResource,
+		Cluster:         models.C2NetCluster,
+	})
+	if err != nil || spec == nil {
+		return nil, nil, "", fmt.Errorf("Resource specification is not available.")
+	}
+
+	if !account.IsPointBalanceEnough(ctx.User.ID, spec.UnitPrice) {
+		log.Error("point balance is not enough,userId=%d specId=%d", ctx.User.ID, spec.ID)
+		return nil, nil, "", fmt.Errorf(ctx.Tr("points.insufficient_points_balance"))
+	}
+
+	//check dataset
+	datasetInfos, datasetNames, err := models.GetDatasetInfo(option.Attachment, computeResource)
+	if err != nil {
+		log.Error("GetDatasetInfo failed: %v", err, ctx.Data["MsgID"])
+		return nil, nil, "", fmt.Errorf(ctx.Tr("cloudbrain.error.dataset_select"))
+	}
+	return spec, datasetInfos, datasetNames, err
+}
+
+func GrampusTrainJobNpuCreate(ctx *context.Context, option api.CreateTrainJobOption) {
+
+	displayJobName := option.DisplayJobName
+	jobName := util.ConvertDisplayJobNameToJobName(displayJobName)
+	uuid := option.Attachment
+	description := option.Description
+	bootFile := strings.TrimSpace(option.BootFile)
+	params := option.Params
+	repo := ctx.Repo.Repository
+	codeLocalPath := setting.JobPath + jobName + modelarts.CodePath
+	codeObsPath := grampus.JobPath + jobName + modelarts.CodePath
+	branchName := option.BranchName
+	isLatestVersion := modelarts.IsLatestVersion
+	versionCount := modelarts.VersionCountOne
+	engineName := option.Image
+
+	lock := redis_lock.NewDistributeLock(redis_key.CloudbrainBindingJobNameKey(fmt.Sprint(repo.ID), string(models.JobTypeTrain), displayJobName))
+	defer lock.UnLock()
+	spec, datasetInfos, datasetNames, err := checkParameters(ctx, option, lock, repo)
+	if err != nil {
+		ctx.JSON(http.StatusOK, models.BaseErrorMessage(err.Error()))
+		return
+	}
+
+	//prepare code and out path
+	_, err = ioutil.ReadDir(codeLocalPath)
+	if err == nil {
+		os.RemoveAll(codeLocalPath)
+	}
+
+	if err := downloadZipCode(ctx, codeLocalPath, branchName); err != nil {
+		log.Error("downloadZipCode failed, server timed out: %s (%v)", repo.FullName(), err)
+
+		ctx.JSON(http.StatusOK, models.BaseErrorMessage(ctx.Tr("cloudbrain.load_code_failed")))
+		return
+	}
+
+	//todo: upload code (send to file_server todo this work?)
+	if err := obsMkdir(setting.CodePathPrefix + jobName + modelarts.OutputPath); err != nil {
+		log.Error("Failed to obsMkdir_output: %s (%v)", repo.FullName(), err)
+
+		ctx.JSON(http.StatusOK, models.BaseErrorMessage(ctx.Tr("cloudbrain.load_code_failed")))
+		return
+	}
+
+	if err := uploadCodeToObs(codeLocalPath, jobName, ""); err != nil {
+		log.Error("Failed to uploadCodeToObs: %s (%v)", repo.FullName(), err)
+
+		ctx.JSON(http.StatusOK, models.BaseErrorMessage(ctx.Tr("cloudbrain.load_code_failed")))
+		return
+	}
+
+	var datasetRemotePath, allFileName string
+	for _, datasetInfo := range datasetInfos {
+		if datasetRemotePath == "" {
+			datasetRemotePath = datasetInfo.DataLocalPath + "'" + datasetInfo.FullName + "'"
+			allFileName = datasetInfo.FullName
+		} else {
+			datasetRemotePath = datasetRemotePath + ";" + datasetInfo.DataLocalPath + "'" + datasetInfo.FullName + "'"
+			allFileName = allFileName + ";" + datasetInfo.FullName
+		}
+
+	}
+
+	//prepare command
+	preTrainModelPath := getPreTrainModelPath(option.PreTrainModelUrl, option.CkptName)
+	command, err := generateCommand(repo.Name, grampus.ProcessorTypeNPU, codeObsPath+cloudbrain.DefaultBranchName+".zip", datasetRemotePath, bootFile, params, setting.CodePathPrefix+jobName+modelarts.OutputPath, allFileName, preTrainModelPath, option.CkptName)
+	if err != nil {
+		log.Error("Failed to generateCommand: %s (%v)", displayJobName, err, ctx.Data["MsgID"])
+
+		ctx.JSON(http.StatusOK, models.BaseErrorMessage("Create task failed, internal error"))
+		return
+	}
+
+	commitID, _ := ctx.Repo.GitRepo.GetBranchCommitID(branchName)
+
+	req := &grampus.GenerateTrainJobReq{
+		JobName:           jobName,
+		DisplayJobName:    displayJobName,
+		ComputeResource:   models.NPUResource,
+		ProcessType:       grampus.ProcessorTypeNPU,
+		Command:           command,
+		ImageId:           option.ImageID,
+		Description:       description,
+		CodeObsPath:       codeObsPath,
+		BootFileUrl:       codeObsPath + bootFile,
+		BootFile:          bootFile,
+		WorkServerNumber:  option.WorkServerNumber,
+		Uuid:              uuid,
+		CommitID:          commitID,
+		IsLatestVersion:   isLatestVersion,
+		BranchName:        branchName,
+		Params:            option.Params,
+		EngineName:        engineName,
+		VersionCount:      versionCount,
+		TotalVersionCount: modelarts.TotalVersionCount,
+		DatasetNames:      datasetNames,
+		DatasetInfos:      datasetInfos,
+		Spec:              spec,
+		CodeName:          strings.ToLower(repo.Name),
+	}
+	if option.ModelName != "" { //使用预训练模型训练
+		req.ModelName = option.ModelName
+		req.LabelName = option.LabelName
+		req.CkptName = option.CkptName
+		req.ModelVersion = option.ModelVersion
+		req.PreTrainModelUrl = option.PreTrainModelUrl
+		req.PreTrainModelPath = preTrainModelPath
+	}
+
+	jobId, err := grampus.GenerateTrainJob(ctx, req)
+	if err != nil {
+		log.Error("GenerateTrainJob failed:%v", err.Error())
+
+		ctx.JSON(http.StatusOK, models.BaseErrorMessage(err.Error()))
+		return
+	}
+	ctx.JSON(http.StatusOK, models.BaseMessage{Code: 0, Message: jobId})
+}
+
+func obsMkdir(dir string) error {
+	input := &obs.PutObjectInput{}
+	input.Bucket = setting.Bucket
+	input.Key = dir
+	_, err := storage.ObsCli.PutObject(input)
+	if err != nil {
+		log.Error("PutObject(%s) failed: %s", input.Key, err.Error())
+		return err
+	}
+
+	return nil
+}
+func uploadCodeToObs(codePath, jobName, parentDir string) error {
+	files, err := readDir(codePath)
+	if err != nil {
+		log.Error("readDir(%s) failed: %s", codePath, err.Error())
+		return err
+	}
+
+	for _, file := range files {
+		if file.IsDir() {
+			input := &obs.PutObjectInput{}
+			input.Bucket = setting.Bucket
+			input.Key = parentDir + file.Name() + "/"
+			_, err = storage.ObsCli.PutObject(input)
+			if err != nil {
+				log.Error("PutObject(%s) failed: %s", input.Key, err.Error())
+				return err
+			}
+
+			if err = uploadCodeToObs(codePath+file.Name()+"/", jobName, parentDir+file.Name()+"/"); err != nil {
+				log.Error("uploadCodeToObs(%s) failed: %s", file.Name(), err.Error())
+				return err
+			}
+		} else {
+			input := &obs.PutFileInput{}
+			input.Bucket = setting.Bucket
+			input.Key = setting.CodePathPrefix + jobName + "/code/" + parentDir + file.Name()
+			input.SourceFile = codePath + file.Name()
+			_, err = storage.ObsCli.PutFile(input)
+			if err != nil {
+				log.Error("PutFile(%s) failed: %s", input.SourceFile, err.Error())
+				return err
+			}
+		}
+	}
+
+	return nil
+}
+
+func grampusParamCheckCreateTrainJob(bootFile string, branchName string) error {
+	if !strings.HasSuffix(strings.TrimSpace(bootFile), ".py") {
+		log.Error("the boot file(%s) must be a python file", bootFile)
+		return errors.New("启动文件必须是python文件")
+	}
+
+	if branchName == "" {
+		log.Error("the branch must not be null!", branchName)
+		return errors.New("代码分支不能为空！")
+	}
+
+	return nil
+}
+func downloadZipCode(ctx *context.Context, codePath, branchName string) error {
+	archiveType := git.ZIP
+	archivePath := codePath
+
+	if !com.IsDir(archivePath) {
+		if err := os.MkdirAll(archivePath, os.ModePerm); err != nil {
+			log.Error("MkdirAll failed:" + err.Error())
+			return err
+		}
+	}
+
+	// Get corresponding commit.
+	var (
+		commit *git.Commit
+		err    error
+	)
+
+	gitRepo := ctx.Repo.GitRepo
+	if err != nil {
+		log.Error("OpenRepository failed:" + err.Error())
+		return err
+	}
+
+	if gitRepo.IsBranchExist(branchName) {
+		commit, err = gitRepo.GetBranchCommit(branchName)
+		if err != nil {
+			log.Error("GetBranchCommit failed:" + err.Error())
+			return err
+		}
+	} else {
+		log.Error("the branch is not exist: " + branchName)
+		return fmt.Errorf("The branch does not exist.")
+	}
+
+	archivePath = path.Join(archivePath, grampus.CodeArchiveName)
+	if !com.IsFile(archivePath) {
+		if err := commit.CreateArchive(archivePath, git.CreateArchiveOpts{
+			Format: archiveType,
+			Prefix: setting.Repository.PrefixArchiveFiles,
+		}); err != nil {
+			log.Error("CreateArchive failed:" + err.Error())
+			return err
+		}
+	}
+
+	return nil
+}
+
+func uploadCodeToMinio(codePath, jobName, parentDir string) error {
+	files, err := readDir(codePath)
+	if err != nil {
+		log.Error("readDir(%s) failed: %s", codePath, err.Error())
+		return err
+	}
+
+	for _, file := range files {
+		if file.IsDir() {
+			if err = uploadCodeToMinio(codePath+file.Name()+"/", jobName, parentDir+file.Name()+"/"); err != nil {
+				log.Error("uploadCodeToMinio(%s) failed: %s", file.Name(), err.Error())
+				return err
+			}
+		} else {
+			destObject := setting.CBCodePathPrefix + jobName + parentDir + file.Name()
+			sourceFile := codePath + file.Name()
+			err = storage.Attachments.UploadObject(destObject, sourceFile)
+			if err != nil {
+				log.Error("UploadObject(%s) failed: %s", file.Name(), err.Error())
+				return err
+			}
+		}
+	}
+
+	return nil
+}
+
+func readDir(dirname string) ([]os.FileInfo, error) {
+	f, err := os.Open(dirname)
+	if err != nil {
+		return nil, err
+	}
+
+	list, err := f.Readdir(0)
+	f.Close()
+	if err != nil {
+		//todo: can not upload empty folder
+		if err == io.EOF {
+			return nil, nil
+		}
+		return nil, err
+	}
+
+	//sort.Slice(list, func(i, j int) bool { return list[i].Name() < list[j].Name() })
+	return list, nil
+}
+func mkModelPath(modelPath string) error {
+	return mkPathAndReadMeFile(modelPath, "You can put the files into this directory and download the files by the web page.")
+}
+
+func mkPathAndReadMeFile(path string, text string) error {
+	err := os.MkdirAll(path, os.ModePerm)
+	if err != nil {
+		log.Error("MkdirAll(%s) failed:%v", path, err)
+		return err
+	}
+
+	fileName := path + "README"
+	f, err := os.OpenFile(fileName, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, os.ModePerm)
+	if err != nil {
+		log.Error("OpenFile failed", err.Error())
+		return err
+	}
+
+	defer f.Close()
+
+	_, err = f.WriteString(text)
+	if err != nil {
+		log.Error("WriteString failed", err.Error())
+		return err
+	}
+
+	return nil
+}
+
+func getPreTrainModelPath(pretrainModelDir string, fileName string) string {
+	index := strings.Index(pretrainModelDir, "/")
+	if index > 0 {
+		filterBucket := pretrainModelDir[index+1:]
+		return filterBucket + fileName
+	} else {
+		return ""
+	}
+
+}
+
+func generateCommand(repoName, processorType, codeRemotePath, dataRemotePath, bootFile, paramSrc, outputRemotePath, datasetName, pretrainModelPath, pretrainModelFileName string) (string, error) {
+	var command string
+
+	workDir := grampus.NpuWorkDir
+	if processorType == grampus.ProcessorTypeGPU {
+		workDir = grampus.GpuWorkDir
+	}
+
+	command += "pwd;cd " + workDir + fmt.Sprintf(grampus.CommandPrepareScript, setting.Grampus.SyncScriptProject, setting.Grampus.SyncScriptProject)
+	//download code & dataset
+	if processorType == grampus.ProcessorTypeNPU {
+		//no need to download code & dataset by internet
+	} else if processorType == grampus.ProcessorTypeGPU {
+		commandDownload := "./downloader_for_minio " + setting.Grampus.Env + " " + codeRemotePath + " " + grampus.CodeArchiveName + " '" + dataRemotePath + "' '" + datasetName + "'"
+		commandDownload = processPretrainModelParameter(pretrainModelPath, pretrainModelFileName, commandDownload)
+		command += commandDownload
+	}
+
+	//unzip code & dataset
+	if processorType == grampus.ProcessorTypeNPU {
+		//no need to process
+	} else if processorType == grampus.ProcessorTypeGPU {
+		unZipDatasetCommand := generateDatasetUnzipCommand(datasetName)
+		commandUnzip := "cd " + workDir + "code;unzip -q master.zip;echo \"start to unzip dataset\";cd " + workDir + "dataset;" + unZipDatasetCommand
+		command += commandUnzip
+	}
+
+	command += "echo \"unzip finished;start to exec code;\";"
+
+	// set export
+	var commandExport string
+	if processorType == grampus.ProcessorTypeNPU {
+		commandExport = "export bucket=" + setting.Bucket + " && export remote_path=" + outputRemotePath + ";"
+	} else if processorType == grampus.ProcessorTypeGPU {
+		commandExport = "export env=" + setting.Grampus.Env + " && export remote_path=" + outputRemotePath + ";"
+	}
+
+	command += commandExport
+
+	//exec code
+	var parameters models.Parameters
+	var paramCode string
+
+	if len(paramSrc) != 0 {
+		err := json.Unmarshal([]byte(paramSrc), &parameters)
+		if err != nil {
+			log.Error("Failed to Unmarshal params: %s (%v)", paramSrc, err)
+			return command, err
+		}
+
+		for _, parameter := range parameters.Parameter {
+			paramCode += " --" + parameter.Label + "=" + parameter.Value
+		}
+	}
+
+	var commandCode string
+	if processorType == grampus.ProcessorTypeNPU {
+		commandCode = "/bin/bash /home/work/run_train_for_openi.sh /home/work/openi.py /tmp/log/train.log" + paramCode + ";"
+	} else if processorType == grampus.ProcessorTypeGPU {
+		if pretrainModelFileName != "" {
+			paramCode += " --ckpt_url" + "=" + workDir + "pretrainmodel/" + pretrainModelFileName
+		}
+		commandCode = "cd " + workDir + "code/" + strings.ToLower(repoName) + ";python " + bootFile + paramCode + ";"
+	}
+
+	command += commandCode
+
+	//get exec result
+	commandGetRes := "result=$?;"
+	command += commandGetRes
+
+	//upload models
+	if processorType == grampus.ProcessorTypeNPU {
+		commandUpload := "cd " + workDir + setting.Grampus.SyncScriptProject + "/;./uploader_for_npu " + setting.Bucket + " " + outputRemotePath + " " + workDir + "output/;"
+		command += commandUpload
+	} else if processorType == grampus.ProcessorTypeGPU {
+		commandUpload := "cd " + workDir + setting.Grampus.SyncScriptProject + "/;./uploader_for_gpu " + setting.Grampus.Env + " " + outputRemotePath + " " + workDir + "output/;"
+		command += commandUpload
+	}
+
+	//check exec result
+	commandCheckRes := "bash -c \"[[ $result -eq 0 ]] && exit 0 || exit -1\""
+	command += commandCheckRes
+
+	return command, nil
+}
+
+func processPretrainModelParameter(pretrainModelPath string, pretrainModelFileName string, commandDownload string) string {
+	commandDownloadTemp := commandDownload
+	if pretrainModelPath != "" {
+		commandDownloadTemp += " '" + pretrainModelPath + "' '" + pretrainModelFileName + "'"
+	}
+	commandDownloadTemp += ";"
+	return commandDownloadTemp
+}
+
+func generateDatasetUnzipCommand(datasetName string) string {
+	var unZipDatasetCommand string
+
+	datasetNameArray := strings.Split(datasetName, ";")
+	if len(datasetNameArray) == 1 { //单数据集
+		unZipDatasetCommand = "unzip -q '" + datasetName + "';"
+		if strings.HasSuffix(datasetNameArray[0], ".tar.gz") {
+			unZipDatasetCommand = "tar --strip-components=1 -zxvf '" + datasetName + "';"
+		}
+
+	} else { //多数据集
+		for _, datasetNameTemp := range datasetNameArray {
+			if strings.HasSuffix(datasetNameTemp, ".tar.gz") {
+				unZipDatasetCommand = unZipDatasetCommand + "tar -zxvf '" + datasetNameTemp + "';"
+			} else {
+				unZipDatasetCommand = unZipDatasetCommand + "unzip -q '" + datasetNameTemp + "' -d './" + strings.TrimSuffix(datasetNameTemp, ".zip") + "';"
+			}
+		}
+
+	}
+	return unZipDatasetCommand
+}
+
+func getPoolId() string {
+	var resourcePools modelarts.ResourcePool
+	json.Unmarshal([]byte(setting.ResourcePools), &resourcePools)
+
+	return resourcePools.Info[0].ID
+}

From af2855ae39a140bbd454664c598e5c88e0bc12fb Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Tue, 25 Oct 2022 09:57:58 +0800
Subject: [PATCH 014/187] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 templates/repo/modelmanage/showinfo.tmpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/repo/modelmanage/showinfo.tmpl b/templates/repo/modelmanage/showinfo.tmpl
index 70e354dd4..31a9e33bf 100644
--- a/templates/repo/modelmanage/showinfo.tmpl
+++ b/templates/repo/modelmanage/showinfo.tmpl
@@ -214,7 +214,7 @@ $(document).ready(loadInfo);
 function changeInfo(version){
     $.get(`${url}show_model_info_api?name=${ID}`,(data)=>{
         let versionData = data.filter((item)=>{
-            return item.Version === version
+            return item.version === version
         })
         let returnArray = []
         returnArray = transObj(versionData)

From b5ac11d533e357848e125cee6240d2524ba9d85f Mon Sep 17 00:00:00 2001
From: ychao_1983 <ychao_1983@sina.com>
Date: Tue, 25 Oct 2022 10:34:02 +0800
Subject: [PATCH 015/187] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/structs/cloudbrain.go |  42 +++++
 routers/repo/aisafety.go      |   4 +-
 routers/repo/cloudbrain.go    |   8 +-
 routers/repo/dataset.go       | 320 +---------------------------------
 routers/repo/grampus.go       |   4 +-
 routers/repo/modelarts.go     |   2 +-
 routers/routes/routes.go      |   4 -
 7 files changed, 53 insertions(+), 331 deletions(-)
 create mode 100644 modules/structs/cloudbrain.go

diff --git a/modules/structs/cloudbrain.go b/modules/structs/cloudbrain.go
new file mode 100644
index 000000000..0d2576e7e
--- /dev/null
+++ b/modules/structs/cloudbrain.go
@@ -0,0 +1,42 @@
+package structs
+
+type CreateGrampusTrainJobOption struct {
+	DisplayJobName   string `json:"display_job_name" binding:"Required"`
+	JobName          string `json:"job_name" binding:"Required" `
+	Attachment       string `json:"attachment" binding:"Required"`
+	BootFile         string `json:"boot_file" binding:"Required"`
+	ImageID          string `json:"image_id" binding:"Required"`
+	Params           string `json:"run_para_list" binding:"Required"`
+	Description      string `json:"description"`
+	BranchName       string `json:"branch_name" binding:"Required"`
+	EngineName       string `json:"engine_name" binding:"Required"`
+	WorkServerNumber int    `json:"work_server_number" binding:"Required"`
+	Image            string `json:"image" binding:"Required"`
+	DatasetName      string `json:"dataset_name" binding:"Required"`
+	ModelName        string `json:"model_name"`
+	ModelVersion     string `json:"model_version"`
+	CkptName         string `json:"ckpt_name"`
+	LabelName        string `json:"label_names"`
+	PreTrainModelUrl string `json:"pre_train_model_url"`
+	SpecId           int64  `json:"spec_id" binding:"Required"`
+}
+
+type CreateTrainJobOption struct {
+	Type             int    `json:"type" binding:"Required"`
+	DisplayJobName   string `json:"display_job_name" binding:"Required"`
+	ImageID          string `json:"image_id"`
+	Image            string `json:"image" binding:"Required"`
+	Attachment       string `json:"attachment" binding:"Required"`
+	DatasetName      string `json:"dataset_name" binding:"Required"`
+	Description      string `json:"description" `
+	BootFile         string `json:"boot_file" binding:"Required"`
+	BranchName       string `json:"branch_name" binding:"Required"`
+	Params           string `json:"run_para_list" binding:"Required"`
+	WorkServerNumber int    `json:"work_server_number" binding:"Required"`
+	ModelName        string `json:"model_name"`
+	ModelVersion     string `json:"model_version"`
+	CkptName         string `json:"ckpt_name"`
+	LabelName        string `json:"label_names"`
+	PreTrainModelUrl string `json:"pre_train_model_url"`
+	SpecId           int64  `json:"spec_id" binding:"Required"`
+}
diff --git a/routers/repo/aisafety.go b/routers/repo/aisafety.go
index 5102a6722..4203ff9be 100644
--- a/routers/repo/aisafety.go
+++ b/routers/repo/aisafety.go
@@ -827,7 +827,7 @@ func createForNPU(ctx *context.Context, jobName string) error {
 		JobType:           string(models.JobTypeModelSafety),
 	}
 
-	err = modelarts.GenerateInferenceJob(ctx, req)
+	_, err = modelarts.GenerateInferenceJob(ctx, req)
 	if err != nil {
 		log.Error("GenerateTrainJob failed:%v", err.Error())
 		return err
@@ -924,7 +924,7 @@ func createForGPU(ctx *context.Context, jobName string) error {
 		LabelName:        evaluationIndex,
 	}
 
-	err = cloudbrain.GenerateTask(req)
+	_, err = cloudbrain.GenerateTask(req)
 	if err != nil {
 		return err
 	}
diff --git a/routers/repo/cloudbrain.go b/routers/repo/cloudbrain.go
index a2ea7d51b..d310c52f9 100755
--- a/routers/repo/cloudbrain.go
+++ b/routers/repo/cloudbrain.go
@@ -394,7 +394,7 @@ func cloudBrainCreate(ctx *context.Context, form auth.CreateCloudBrainForm) {
 
 	}
 
-	err = cloudbrain.GenerateTask(req)
+	_, err = cloudbrain.GenerateTask(req)
 	if err != nil {
 		cloudBrainNewDataPrepare(ctx)
 		ctx.RenderWithErr(err.Error(), tpl, &form)
@@ -580,7 +580,7 @@ func CloudBrainInferenceJobCreate(ctx *context.Context, form auth.CreateCloudBra
 		Spec:             spec,
 	}
 
-	err = cloudbrain.GenerateTask(req)
+	_, err = cloudbrain.GenerateTask(req)
 	if err != nil {
 		cloudBrainNewDataPrepare(ctx)
 		ctx.RenderWithErr(err.Error(), tpl, &form)
@@ -2498,7 +2498,7 @@ func BenchMarkAlgorithmCreate(ctx *context.Context, form auth.CreateCloudBrainFo
 		Spec:                 spec,
 	}
 
-	err = cloudbrain.GenerateTask(req)
+	_, err = cloudbrain.GenerateTask(req)
 	if err != nil {
 		cloudBrainNewDataPrepare(ctx)
 		ctx.RenderWithErr(err.Error(), tplCloudBrainBenchmarkNew, &form)
@@ -2652,7 +2652,7 @@ func ModelBenchmarkCreate(ctx *context.Context, form auth.CreateCloudBrainForm)
 		Spec:                 spec,
 	}
 
-	err = cloudbrain.GenerateTask(req)
+	_, err = cloudbrain.GenerateTask(req)
 	if err != nil {
 		cloudBrainNewDataPrepare(ctx)
 		ctx.RenderWithErr(err.Error(), tpl, &form)
diff --git a/routers/repo/dataset.go b/routers/repo/dataset.go
index f0e41024b..2b3814b6a 100755
--- a/routers/repo/dataset.go
+++ b/routers/repo/dataset.go
@@ -47,8 +47,8 @@ func newFilterPrivateAttachments(ctx *context.Context, list []*models.Attachment
 		permission := false
 		if !permission && ctx.User != nil {
 			isCollaborator, _ := repo.IsCollaborator(ctx.User.ID)
-			isInRepoTeam,_:=repo.IsInRepoTeam(ctx.User.ID)
-			if isCollaborator ||isInRepoTeam {
+			isInRepoTeam, _ := repo.IsInRepoTeam(ctx.User.ID)
+			if isCollaborator || isInRepoTeam {
 				log.Info("Collaborator user may visit the attach.")
 				permission = true
 			}
@@ -349,96 +349,6 @@ func DatasetAction(ctx *context.Context) {
 
 }
 
-func CurrentRepoDataset(ctx *context.Context) {
-	page := ctx.QueryInt("page")
-	cloudbrainType := ctx.QueryInt("type")
-	keyword := strings.Trim(ctx.Query("q"), " ")
-
-	repo := ctx.Repo.Repository
-	var datasetIDs []int64
-	dataset, err := models.GetDatasetByRepo(repo)
-	if err != nil {
-		ctx.JSON(http.StatusOK, models.BaseErrorMessage(ctx.Tr("GetDatasetByRepo failed", err)))
-		return
-	}
-	datasetIDs = append(datasetIDs, dataset.ID)
-	datasets, count, err := models.Attachments(&models.AttachmentsOptions{
-		ListOptions: models.ListOptions{
-			Page:     page,
-			PageSize: setting.UI.DatasetPagingNum,
-		},
-		Keyword:         keyword,
-		NeedDatasetIDs:  true,
-		DatasetIDs:      datasetIDs,
-		Type:            cloudbrainType,
-		NeedIsPrivate:   false,
-		JustNeedZipFile: true,
-		NeedRepoInfo:    true,
-	})
-	if err != nil {
-		ctx.ServerError("datasets", err)
-		return
-	}
-
-	data, err := json.Marshal(datasets)
-	if err != nil {
-		log.Error("json.Marshal failed:", err.Error())
-		ctx.JSON(200, map[string]string{
-			"result_code": "-1",
-			"error_msg":   err.Error(),
-			"data":        "",
-		})
-		return
-	}
-	ctx.JSON(200, map[string]string{
-		"result_code": "0",
-		"data":        string(data),
-		"count":       strconv.FormatInt(count, 10),
-	})
-}
-
-func MyDatasets(ctx *context.Context) {
-	page := ctx.QueryInt("page")
-	cloudbrainType := ctx.QueryInt("type")
-	keyword := strings.Trim(ctx.Query("q"), " ")
-
-	uploaderID := ctx.User.ID
-	datasets, count, err := models.Attachments(&models.AttachmentsOptions{
-		ListOptions: models.ListOptions{
-			Page:     page,
-			PageSize: setting.UI.DatasetPagingNum,
-		},
-		Keyword:         keyword,
-		NeedDatasetIDs:  false,
-		UploaderID:      uploaderID,
-		Type:            cloudbrainType,
-		NeedIsPrivate:   false,
-		JustNeedZipFile: true,
-		NeedRepoInfo:    true,
-		RecommendOnly:   ctx.QueryBool("recommend"),
-	})
-	if err != nil {
-		ctx.ServerError("datasets", err)
-		return
-	}
-
-	data, err := json.Marshal(datasets)
-	if err != nil {
-		log.Error("json.Marshal failed:", err.Error())
-		ctx.JSON(200, map[string]string{
-			"result_code": "-1",
-			"error_msg":   err.Error(),
-			"data":        "",
-		})
-		return
-	}
-	ctx.JSON(200, map[string]string{
-		"result_code": "0",
-		"data":        string(data),
-		"count":       strconv.FormatInt(count, 10),
-	})
-}
-
 func datasetMultiple(ctx *context.Context, opts *models.SearchDatasetOptions) {
 	page := ctx.QueryInt("page")
 	keyword := strings.Trim(ctx.Query("q"), " ")
@@ -591,180 +501,6 @@ func ReferenceDatasetData(ctx *context.Context) {
 
 }
 
-func PublicDataset(ctx *context.Context) {
-	page := ctx.QueryInt("page")
-	cloudbrainType := ctx.QueryInt("type")
-	keyword := strings.Trim(ctx.Query("q"), " ")
-
-	datasets, count, err := models.Attachments(&models.AttachmentsOptions{
-		ListOptions: models.ListOptions{
-			Page:     page,
-			PageSize: setting.UI.DatasetPagingNum,
-		},
-		Keyword:         keyword,
-		NeedDatasetIDs:  false,
-		NeedIsPrivate:   true,
-		IsPrivate:       false,
-		Type:            cloudbrainType,
-		JustNeedZipFile: true,
-		NeedRepoInfo:    true,
-		RecommendOnly:   ctx.QueryBool("recommend"),
-	})
-	if err != nil {
-		ctx.ServerError("datasets", err)
-		return
-	}
-
-	data, err := json.Marshal(datasets)
-	if err != nil {
-		log.Error("json.Marshal failed:", err.Error())
-		ctx.JSON(200, map[string]string{
-			"result_code": "-1",
-			"error_msg":   err.Error(),
-			"data":        "",
-		})
-		return
-	}
-	ctx.JSON(200, map[string]string{
-		"result_code": "0",
-		"data":        string(data),
-		"count":       strconv.FormatInt(count, 10),
-	})
-}
-
-func MyFavoriteDataset(ctx *context.Context) {
-	UserId := ctx.User.ID
-	cloudbrainType := ctx.QueryInt("type")
-	keyword := strings.Trim(ctx.Query("q"), " ")
-	var NotColDatasetIDs []int64
-	var IsColDatasetIDs []int64
-	datasetStars, err := models.GetDatasetStarByUser(ctx.User)
-	if err != nil {
-		ctx.JSON(http.StatusOK, models.BaseErrorMessage(ctx.Tr("GetDatasetStarByUser failed", err)))
-		log.Error("GetDatasetStarByUser failed:", err.Error())
-		ctx.JSON(200, map[string]string{
-			"result_code": "-1",
-			"error_msg":   err.Error(),
-			"data":        "",
-		})
-		return
-	}
-	//If the dataset has been deleted, it will not be counted
-	for _, datasetStar := range datasetStars {
-		IsExist, repo, dataset, err := IsDatasetStarExist(datasetStar)
-		if err != nil {
-			log.Error("IsDatasetStarExist error:", err.Error())
-		}
-		if IsExist {
-			DatasetIsCollaborator := DatasetIsCollaborator(ctx, dataset)
-			if repo.OwnerID == ctx.User.ID || DatasetIsCollaborator {
-				IsColDatasetIDs = append(IsColDatasetIDs, datasetStar.DatasetID)
-			} else {
-				NotColDatasetIDs = append(NotColDatasetIDs, datasetStar.DatasetID)
-			}
-		}
-	}
-
-	NotColDatasets, NotColcount, err := models.Attachments(&models.AttachmentsOptions{
-		Keyword:         keyword,
-		NeedDatasetIDs:  true,
-		DatasetIDs:      NotColDatasetIDs,
-		NeedIsPrivate:   true,
-		IsPrivate:       false,
-		Type:            cloudbrainType,
-		JustNeedZipFile: true,
-		NeedRepoInfo:    true,
-		RecommendOnly:   ctx.QueryBool("recommend"),
-		UserId:          UserId,
-	})
-	if err != nil {
-		ctx.ServerError("datasets", err)
-		return
-	}
-	//If is collaborator, there is no need to determine whether the dataset is private or public
-	IsColDatasets, IsColcount, err := models.Attachments(&models.AttachmentsOptions{
-		Keyword:         keyword,
-		NeedDatasetIDs:  true,
-		DatasetIDs:      IsColDatasetIDs,
-		NeedIsPrivate:   false,
-		Type:            cloudbrainType,
-		JustNeedZipFile: true,
-		NeedRepoInfo:    true,
-		RecommendOnly:   ctx.QueryBool("recommend"),
-		UserId:          UserId,
-	})
-	if err != nil {
-		ctx.ServerError("datasets", err)
-		return
-	}
-	for _, NotColDataset := range NotColDatasets {
-		IsColDatasets = append(IsColDatasets, NotColDataset)
-	}
-	datasets := IsColDatasets
-	count := NotColcount + IsColcount
-	sort.Slice(datasets, func(i, j int) bool {
-		return datasets[i].Attachment.CreatedUnix > datasets[j].Attachment.CreatedUnix
-	})
-
-	page := ctx.QueryInt("page")
-	if page <= 0 {
-		page = 1
-	}
-	pagesize := ctx.QueryInt("pagesize")
-	if pagesize <= 0 {
-		pagesize = 5
-	}
-	pageDatasetsInfo := getPageDatasets(datasets, page, pagesize)
-	if pageDatasetsInfo == nil {
-		ctx.JSON(200, map[string]string{
-			"result_code": "0",
-			"data":        "[]",
-			"count":       strconv.FormatInt(count, 10),
-		})
-		return
-	}
-	data, err := json.Marshal(pageDatasetsInfo)
-	log.Info("data:", data)
-	if err != nil {
-		log.Error("json.Marshal failed:", err.Error())
-		ctx.JSON(200, map[string]string{
-			"result_code": "-1",
-			"error_msg":   err.Error(),
-			"data":        "",
-		})
-		return
-	}
-	ctx.JSON(200, map[string]string{
-		"result_code": "0",
-		"data":        string(data),
-		"count":       strconv.FormatInt(count, 10),
-	})
-
-}
-func getPageDatasets(AttachmentInfos []*models.AttachmentInfo, page int, pagesize int) []*models.AttachmentInfo {
-	begin := (page - 1) * pagesize
-	end := (page) * pagesize
-
-	if begin > len(AttachmentInfos)-1 {
-		return nil
-	}
-	if end > len(AttachmentInfos)-1 {
-		return AttachmentInfos[begin:]
-	} else {
-		return AttachmentInfos[begin:end]
-	}
-
-}
-func getTotalPage(total int64, pageSize int) int {
-
-	another := 0
-	if int(total)%pageSize != 0 {
-		another = 1
-	}
-	return int(total)/pageSize + another
-
-}
-
 func GetDatasetStatus(ctx *context.Context) {
 
 	var (
@@ -789,55 +525,3 @@ func GetDatasetStatus(ctx *context.Context) {
 		"AttachmentStatus": fmt.Sprint(attachment.DecompressState),
 	})
 }
-func DatasetIsCollaborator(ctx *context.Context, dataset *models.Dataset) bool {
-	repo, err := models.GetRepositoryByID(dataset.RepoID)
-	if err != nil {
-		log.Error("query repo error:", err.Error())
-	} else {
-		repo.GetOwner()
-		if ctx.User != nil {
-			if repo.Owner.IsOrganization() {
-				org := repo.Owner
-				org.Teams, err = org.GetUserTeams(ctx.User.ID)
-				if err != nil {
-					log.Error("GetUserTeams error:", err.Error())
-					return false
-				}
-				if org.IsUserPartOfOrg(ctx.User.ID) {
-					for _, t := range org.Teams {
-						if t.IsMember(ctx.User.ID) && t.HasRepository(repo.ID) {
-							return true
-						}
-					}
-					isOwner, _ := models.IsOrganizationOwner(repo.OwnerID, ctx.User.ID)
-					if isOwner {
-						return isOwner
-					}
-					return false
-				}
-			}
-
-			isCollaborator, _ := repo.IsCollaborator(ctx.User.ID)
-			if isCollaborator {
-				return true
-			}
-		}
-	}
-
-	return false
-}
-func IsDatasetStarExist(datasetStar *models.DatasetStar) (bool, *models.Repository, *models.Dataset, error) {
-	dataset, err := models.GetDatasetByID(datasetStar.DatasetID)
-	if err != nil {
-		log.Error("query dataset error:", err.Error())
-		return false, nil, nil, err
-	} else {
-		repo, err := models.GetRepositoryByID(dataset.RepoID)
-		if err != nil {
-			log.Error("GetRepositoryByID error:", err.Error())
-			return false, nil, nil, err
-		}
-		return true, repo, dataset, nil
-	}
-
-}
diff --git a/routers/repo/grampus.go b/routers/repo/grampus.go
index b78bdebd3..592188feb 100755
--- a/routers/repo/grampus.go
+++ b/routers/repo/grampus.go
@@ -465,7 +465,7 @@ func grampusTrainJobGpuCreate(ctx *context.Context, form auth.CreateGrampusTrain
 
 	}
 
-	err = grampus.GenerateTrainJob(ctx, req)
+	_, err = grampus.GenerateTrainJob(ctx, req)
 	if err != nil {
 		log.Error("GenerateTrainJob failed:%v", err.Error(), ctx.Data["MsgID"])
 		grampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeGPU)
@@ -724,7 +724,7 @@ func grampusTrainJobNpuCreate(ctx *context.Context, form auth.CreateGrampusTrain
 		req.PreTrainModelPath = preTrainModelPath
 	}
 
-	err = grampus.GenerateTrainJob(ctx, req)
+	_, err = grampus.GenerateTrainJob(ctx, req)
 	if err != nil {
 		log.Error("GenerateTrainJob failed:%v", err.Error())
 		grampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeNPU)
diff --git a/routers/repo/modelarts.go b/routers/repo/modelarts.go
index 6e44b3cd2..50e12c774 100755
--- a/routers/repo/modelarts.go
+++ b/routers/repo/modelarts.go
@@ -2203,7 +2203,7 @@ func InferenceJobCreate(ctx *context.Context, form auth.CreateModelArtsInference
 		JobType:           string(models.JobTypeInference),
 	}
 
-	err = modelarts.GenerateInferenceJob(ctx, req)
+	_, err = modelarts.GenerateInferenceJob(ctx, req)
 	if err != nil {
 		log.Error("GenerateTrainJob failed:%v", err.Error())
 		inferenceJobErrorNewDataPrepare(ctx, form)
diff --git a/routers/routes/routes.go b/routers/routes/routes.go
index 9a523ea48..1270c2e5b 100755
--- a/routers/routes/routes.go
+++ b/routers/routes/routes.go
@@ -1096,10 +1096,6 @@ func RegisterRoutes(m *macaron.Macaron) {
 			m.Get("/edit/:id", reqRepoDatasetWriter, repo.EditDataset)
 			m.Post("/reference_datasets", reqRepoDatasetWriterJson, bindIgnErr(auth.ReferenceDatasetForm{}), repo.ReferenceDatasetPost)
 			m.Post("/edit", reqRepoDatasetWriter, bindIgnErr(auth.EditDatasetForm{}), repo.EditDatasetPost)
-			m.Get("/current_repo", repo.CurrentRepoDataset)
-			m.Get("/my_datasets", repo.MyDatasets)
-			m.Get("/public_datasets", repo.PublicDataset)
-			m.Get("/my_favorite", repo.MyFavoriteDataset)
 
 			m.Get("/current_repo_m", repo.CurrentRepoDatasetMultiple)
 			m.Get("/my_datasets_m", repo.MyDatasetsMultiple)

From 61c71eef98f4f15ebed96cbe1981030439821b52 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Tue, 25 Oct 2022 10:45:17 +0800
Subject: [PATCH 016/187] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=EF=BC=8C=E8=A7=A3=E5=86=B3=E5=A4=A7=E5=B0=8F=E5=86=99=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 templates/repo/modelmanage/showinfo.tmpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/repo/modelmanage/showinfo.tmpl b/templates/repo/modelmanage/showinfo.tmpl
index 31a9e33bf..0a29375f1 100644
--- a/templates/repo/modelmanage/showinfo.tmpl
+++ b/templates/repo/modelmanage/showinfo.tmpl
@@ -127,7 +127,7 @@
                             <tr>
                                 <td class="ti-text-form-label text-width80">{{$.i18n.Tr "repo.modelarts.train_job"}}</td>
                                 <td class="ti-text-form-content word-elipsis">
-                                  <a id="DisplayJobNameHref" class="title" style="font-size: 14px;" target="_blank">
+                                  <a id="displayJobNameHref" class="title" style="font-size: 14px;" target="_blank">
                                         <span id="displayJobName" class="fitted" style="width: 90%;vertical-align: middle;"></span>
                                   </a>
                                 </td>

From b4432669892f3a5d81e0df39c199d2161614b092 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Tue, 25 Oct 2022 11:14:19 +0800
Subject: [PATCH 017/187] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=EF=BC=8C=E8=A7=A3=E5=86=B3=E6=8E=A5=E5=8F=A3=E5=A4=A7=E5=B0=8F?=
 =?UTF-8?q?=E5=86=99=E4=B8=8D=E7=BB=9F=E4=B8=80=E9=97=AE=E9=A2=98=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 templates/repo/cloudbrain/trainjob/show.tmpl | 27 ++++++++-------
 templates/repo/grampus/trainjob/show.tmpl    | 32 +++++++++---------
 templates/repo/modelarts/trainjob/show.tmpl  | 35 ++++++++++----------
 3 files changed, 45 insertions(+), 49 deletions(-)

diff --git a/templates/repo/cloudbrain/trainjob/show.tmpl b/templates/repo/cloudbrain/trainjob/show.tmpl
index a54989df4..eb3d33eac 100644
--- a/templates/repo/cloudbrain/trainjob/show.tmpl
+++ b/templates/repo/cloudbrain/trainjob/show.tmpl
@@ -622,24 +622,24 @@
 
                     <div class="required inline field">
                         <label>{{.i18n.Tr "repo.modelarts.train_job"}}</label>
-                        <input type="hidden"  class="width83" id="JobId" name="JobId" readonly required>
-                        <input type="hidden" id="VersionName" name="VersionName" value="V0001">
+                        <input type="hidden"  class="width83" id="jobId" name="jobId" readonly required>
+                        <input type="hidden" id="versionName" name="versionName" value="V0001">
                         <input style="width: 45%;" id="JobName" readonly required>
                     </div>
 
                     <div class="required inline field" id="modelname">
                         <label>{{.i18n.Tr "repo.model.manage.model_name"}}</label>
-                        <input style="width: 45%;" id="name" name="Name" required maxlength="25"
+                        <input style="width: 45%;" id="name" name="name" required maxlength="25"
                             onkeyup="this.value=this.value.replace(/[, ]/g,'')">
                     </div>
                     <div class="required inline field" id="verionname">
                         <label>{{.i18n.Tr "repo.modelconvert.modelversion"}}</label>
-                        <input style="width: 45%;" id="version" name="Version" value="" readonly required maxlength="255">
+                        <input style="width: 45%;" id="version" name="version" value="" readonly required maxlength="255">
                     </div>
                     <div class="unite min_title inline field required">
                         <label>{{.i18n.Tr "repo.model.manage.engine"}}</label>
                         <div class="ui dropdown selection search width70" id="choice_Engine">
-                            <input type="hidden" id="Engine" name="Engine" required>
+                            <input type="hidden" id="engine" name="engine" required>
                             <div class="default text">{{.i18n.Tr "repo.model.manage.select.engine"}}</div>
                             <i class="dropdown icon"></i>
                             <div class="menu" id="job-Engine">
@@ -666,12 +666,12 @@
                     </div>
                     <div class="inline field">
                         <label>{{.i18n.Tr "repo.model.manage.modellabel"}}</label>
-                        <input style="width: 83%;margin-left: 7px;" id="label" name="Label" maxlength="255"
+                        <input style="width: 83%;margin-left: 7px;" id="label" name="label" maxlength="255"
                             placeholder='{{.i18n.Tr "repo.modelarts.train_job.label_place"}}'>
                     </div>
                     <div class="inline field">
                         <label for="description">{{.i18n.Tr "repo.model.manage.modeldesc"}}</label>
-                        <textarea style="width: 83%;margin-left: 7px;" id="Description" name="Description" rows="3"
+                        <textarea style="width: 83%;margin-left: 7px;" id="description" name="description" rows="3"
                             maxlength="255" placeholder='{{.i18n.Tr "repo.modelarts.train_job.new_place"}}'
                             onchange="this.value=this.value.substring(0, 255)"
                             onkeydown="this.value=this.value.substring(0, 255)"
@@ -839,14 +839,13 @@
             .modal({
                 centered: false,
                 onShow: function () {
-                    $('input[name="Version"]').addClass('model_disabled')
-                    // $('input[name="JobId"]').text(obj.JobName)
+                    $('input[name="version"]').addClass('model_disabled')
                     $('#JobName').val(obj.DisplayJobName).addClass('model_disabled')
-                    $('input[name="JobId"]').val(obj.JobID)
-                    $('input[name="VersionName"]').val("V0001")
+                    $('input[name="jobId"]').val(obj.JobID)
+                    $('input[name="versionName"]').val("V0001")
                    
                     $('#choice_Engine .default.text').text("PyTorch");
-                    $('#choice_Engine input[name="Engine"]').val(0)
+                    $('#choice_Engine input[name="engine"]').val(0)
                     $('#choice_Engine .default.text').css({ "color": "rgb(0, 0, 0,0.87)" })
                     $('.ui.dimmer').css({ "background-color": "rgb(136, 136, 136,0.7)" })
                     createModelName();
@@ -876,8 +875,8 @@
             type: 'POST',
             data: data,
             success: function (res) {
-                $('input[name="Engine_name"]').val("");
-                $('input[name="Engine"]').val("");
+                $('input[name="engine_name"]').val("");
+                $('input[name="engine"]').val("");
                 location.href = `/${userName}/${repoPath}/modelmanage/show_model`
                 $('.ui.modal.second').modal('hide')
             },
diff --git a/templates/repo/grampus/trainjob/show.tmpl b/templates/repo/grampus/trainjob/show.tmpl
index 67548696f..02fa6e49e 100755
--- a/templates/repo/grampus/trainjob/show.tmpl
+++ b/templates/repo/grampus/trainjob/show.tmpl
@@ -592,24 +592,24 @@
 
                     <div class="required inline field">
                         <label>{{.i18n.Tr "repo.modelarts.train_job"}}</label>
-                        <input type="hidden"  class="width83" id="JobId" name="JobId" readonly required>
-                        <input type="hidden" id="VersionName" name="VersionName" value="V0001">
+                        <input type="hidden"  class="width83" id="jobId" name="jobId" readonly required>
+                        <input type="hidden" id="versionName" name="versionName" value="V0001">
                         <input style="width: 45%;" id="JobName" readonly required>
                     </div>
 
                     <div class="required inline field" id="modelname">
                         <label>{{.i18n.Tr "repo.model.manage.model_name"}}</label>
-                        <input style="width: 45%;" id="name" name="Name" required maxlength="25"
+                        <input style="width: 45%;" id="name" name="name" required maxlength="25"
                             onkeyup="this.value=this.value.replace(/[, ]/g,'')">
                     </div>
                     <div class="required inline field" id="verionname">
                         <label>{{.i18n.Tr "repo.modelconvert.modelversion"}}</label>
-                        <input style="width: 45%;" id="version" name="Version" value="" readonly required maxlength="255">
+                        <input style="width: 45%;" id="version" name="version" value="" readonly required maxlength="255">
                     </div>
                     <div class="unite min_title inline field required">
                         <label>{{.i18n.Tr "repo.model.manage.engine"}}</label>
                         <div class="ui dropdown selection search width70" id="choice_Engine">
-                            <input type="hidden" id="Engine" name="Engine" required>
+                            <input type="hidden" id="engine" name="engine" required>
                             <div class="default text">{{.i18n.Tr "repo.model.manage.select.engine"}}</div>
                             <i class="dropdown icon"></i>
                             <div class="menu" id="job-Engine">
@@ -637,12 +637,12 @@
                     </div>
                     <div class="inline field">
                         <label>{{.i18n.Tr "repo.model.manage.modellabel"}}</label>
-                        <input style="width: 83%;margin-left: 7px;" id="label" name="Label" maxlength="255"
+                        <input style="width: 83%;margin-left: 7px;" id="label" name="label" maxlength="255"
                             placeholder='{{.i18n.Tr "repo.modelarts.train_job.label_place"}}'>
                     </div>
                     <div class="inline field">
                         <label for="description">{{.i18n.Tr "repo.model.manage.modeldesc"}}</label>
-                        <textarea style="width: 83%;margin-left: 7px;" id="Description" name="Description" rows="3"
+                        <textarea style="width: 83%;margin-left: 7px;" id="description" name="description" rows="3"
                             maxlength="255" placeholder='{{.i18n.Tr "repo.modelarts.train_job.new_place"}}'
                             onchange="this.value=this.value.substring(0, 255)"
                             onkeydown="this.value=this.value.substring(0, 255)"
@@ -730,7 +730,6 @@
 	function showMenu() {
 			var cityObj = $("#modelSelectedFile");
 			var cityOffset = $("#modelSelectedFile").offset();
-			//$("#menuContent").css({left:cityOffset.left + "px", top:cityOffset.top + cityObj.outerHeight() + "px"}).slideDown("fast");
             $("#menuContent").slideDown("fast");
 			$("body").bind("mousedown", onBodyDown);
 	}
@@ -829,11 +828,10 @@
             .modal({
                 centered: false,
                 onShow: function () {
-                    $('input[name="Version"]').addClass('model_disabled')
-                    // $('input[name="JobId"]').text(obj.JobName)
+                    $('input[name="version"]').addClass('model_disabled')
                     $('#JobName').val(obj.DisplayJobName).addClass('model_disabled')
-                    $('input[name="JobId"]').val(obj.JobID)
-                    $('input[name="VersionName"]').val("V0001")
+                    $('input[name="jobId"]').val(obj.JobID)
+                    $('input[name="versionName"]').val("V0001")
                    
                    if(obj.ComputeResource=="NPU"){
                          if (obj.EngineName != null && obj.EngineName != "") {
@@ -841,16 +839,16 @@
                             srcEngine = srcEngine.trim().toLowerCase();
                              if (srcEngine == 'tensorflow') {
                                 $('#choice_Engine .default.text').text("TensorFlow");
-                                $('#choice_Engine input[name="Engine"]').val(1)
+                                $('#choice_Engine input[name="engine"]').val(1)
                              }
                               if (srcEngine == 'mindspore') {
                                 $('#choice_Engine .default.text').text("MindSpore");
-                                $('#choice_Engine input[name="Engine"]').val(2)
+                                $('#choice_Engine input[name="engine"]').val(2)
                               }
                         }
                    }else{
                         $('#choice_Engine .default.text').text("PyTorch");
-                        $('#choice_Engine input[name="Engine"]').val(0)
+                        $('#choice_Engine input[name="engine"]').val(0)
                     }
                    $('#choice_Engine .default.text').css({ "color": "rgb(0, 0, 0,0.87)" })
                    $('.ui.dimmer').css({ "background-color": "rgb(136, 136, 136,0.7)" })
@@ -882,8 +880,8 @@
             type: 'POST',
             data: data,
             success: function (res) {
-                $('input[name="Engine_name"]').val("");
-                $('input[name="Engine"]').val("");
+                $('input[name="engine_name"]').val("");
+                $('input[name="engine"]').val("");
                 location.href = `/${userName}/${repoPath}/modelmanage/show_model`
                 $('.ui.modal.second').modal('hide')
             },
diff --git a/templates/repo/modelarts/trainjob/show.tmpl b/templates/repo/modelarts/trainjob/show.tmpl
index e95a1233d..74a325af7 100755
--- a/templates/repo/modelarts/trainjob/show.tmpl
+++ b/templates/repo/modelarts/trainjob/show.tmpl
@@ -651,29 +651,29 @@
                     <div class="two inline fields ">
                         <div class="required ten wide field">
                             <label>{{.i18n.Tr "repo.modelarts.train_job"}}</label>&nbsp;
-                            <input type="hidden" class="width83" id="JobId" name="JobId" readonly required>
+                            <input type="hidden" class="width83" id="jobId" name="jobId" readonly required>
                             <input class="width83" id="JobName" readonly required>
 
                         </div>
                         <div class="required six widde field">
                             <label>{{.i18n.Tr "repo.model.manage.version"}}</label>
-                            <input class="width70" id="VersionName" name="VersionName" readonly required>
+                            <input class="width70" id="versionName" name="versionName" readonly required>
                         </div>
                     </div>
 
                     <div class="required inline field" id="modelname">
                         <label>{{.i18n.Tr "repo.model.manage.model_name"}}</label>
-                        <input style="width: 45%;" id="name" name="Name" required maxlength="25"
+                        <input style="width: 45%;" id="name" name="name" required maxlength="25"
                             onkeyup="this.value=this.value.replace(/[, ]/g,'')">
                     </div>
                     <div class="required inline field" id="verionname">
                         <label>{{.i18n.Tr "repo.modelconvert.modelversion"}}</label>
-                        <input style="width: 45%;" id="version" name="Version" value="" readonly required maxlength="255">
+                        <input style="width: 45%;" id="version" name="version" value="" readonly required maxlength="255">
                     </div>
                      <div class="unite min_title inline field required">
                         <label>{{.i18n.Tr "repo.model.manage.engine"}}</label>
-                        <input type="hidden" id="Engine" name="Engine" required>
-                        <input style="width: 45%;" id="Engine_name" name="Engine_name" readonly required maxlength="255">
+                        <input type="hidden" id="engine" name="engine" required>
+                        <input style="width: 45%;" id="engine_name" name="engine_name" readonly required maxlength="255">
                     </div>
                     <div class="unite min_title inline fields required">
                         <div class="field required">
@@ -688,12 +688,12 @@
                     </div>
                     <div class="inline field">
                         <label>{{.i18n.Tr "repo.model.manage.modellabel"}}</label>
-                        <input style="width: 83%;margin-left: 7px;" id="label" name="Label" maxlength="255"
+                        <input style="width: 83%;margin-left: 7px;" id="label" name="label" maxlength="255"
                             placeholder='{{.i18n.Tr "repo.modelarts.train_job.label_place"}}'>
                     </div>
                     <div class="inline field">
                         <label for="description">{{.i18n.Tr "repo.model.manage.modeldesc"}}</label>
-                        <textarea style="width: 83%;margin-left: 7px;" id="Description" name="Description" rows="3"
+                        <textarea style="width: 83%;margin-left: 7px;" id="description" name="description" rows="3"
                             maxlength="255" placeholder='{{.i18n.Tr "repo.modelarts.train_job.new_place"}}'
                             onchange="this.value=this.value.substring(0, 255)"
                             onkeydown="this.value=this.value.substring(0, 255)"
@@ -887,18 +887,17 @@
             .modal({
                 centered: false,
                 onShow: function () {
-                    $('input[name="Version"]').addClass('model_disabled')
-                    // $('input[name="JobId"]').text(obj.JobName)
+                    $('input[name="version"]').addClass('model_disabled')
                     $('#JobName').val(obj.DisplayJobName).addClass('model_disabled')
-                    $('input[name="JobId"]').val(obj.JobID)
-                    $('input[name="VersionName"]').val(obj.VersionName).addClass('model_disabled')
+                    $('input[name="jobId"]').val(obj.JobID)
+                    $('input[name="versionName"]').val(obj.VersionName).addClass('model_disabled')
                     if(obj.EngineID ==122 || obj.EngineID ==35 || obj.EngineID ==-1 || obj.EngineID ==37){
-                        $('input[name="Engine_name"]').val("MindSpore").addClass('model_disabled');
-                        $('input[name="Engine"]').val(2);
+                        $('input[name="engine_name"]').val("MindSpore").addClass('model_disabled');
+                        $('input[name="engine"]').val(2);
                     }
                     if(obj.EngineID ==121 || obj.EngineID ==38){
-                        $('input[name="Engine_name"]').val("TensorFlow").addClass('model_disabled');
-                        $('input[name="Engine"]').val(1);
+                        $('input[name="engine_name"]').val("TensorFlow").addClass('model_disabled');
+                        $('input[name="engine"]').val(1);
                     }
                     $('.ui.dimmer').css({ "background-color": "rgb(136, 136, 136,0.7)" })
                     createModelName();
@@ -928,8 +927,8 @@
             type: 'POST',
             data: data,
             success: function (res) {
-                $('input[name="Engine_name"]').val("");
-                $('input[name="Engine"]').val("");
+                $('input[name="engine_name"]').val("");
+                $('input[name="engine"]').val("");
                 location.href = `/${userName}/${repoPath}/modelmanage/show_model`
                 $('.ui.modal.second').modal('hide')
             },

From 7d09e324b7062cc7a7da0b06be19ac6a5c5bafbc Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Tue, 25 Oct 2022 11:23:49 +0800
Subject: [PATCH 018/187] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=EF=BC=8C=E8=A7=A3=E5=86=B3=E6=8E=A5=E5=8F=A3=E5=A4=A7=E5=B0=8F?=
 =?UTF-8?q?=E5=86=99=E4=B8=8D=E7=BB=9F=E4=B8=80=E9=97=AE=E9=A2=98=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 templates/repo/cloudbrain/trainjob/show.tmpl | 2 ++
 templates/repo/grampus/trainjob/show.tmpl    | 2 ++
 templates/repo/modelarts/trainjob/show.tmpl  | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/templates/repo/cloudbrain/trainjob/show.tmpl b/templates/repo/cloudbrain/trainjob/show.tmpl
index eb3d33eac..42045c24b 100644
--- a/templates/repo/cloudbrain/trainjob/show.tmpl
+++ b/templates/repo/cloudbrain/trainjob/show.tmpl
@@ -877,6 +877,8 @@
             success: function (res) {
                 $('input[name="engine_name"]').val("");
                 $('input[name="engine"]').val("");
+                $('input[name="label"]').val("");
+                $('input[name="description"]').val("");
                 location.href = `/${userName}/${repoPath}/modelmanage/show_model`
                 $('.ui.modal.second').modal('hide')
             },
diff --git a/templates/repo/grampus/trainjob/show.tmpl b/templates/repo/grampus/trainjob/show.tmpl
index 02fa6e49e..bc13ec444 100755
--- a/templates/repo/grampus/trainjob/show.tmpl
+++ b/templates/repo/grampus/trainjob/show.tmpl
@@ -882,6 +882,8 @@
             success: function (res) {
                 $('input[name="engine_name"]').val("");
                 $('input[name="engine"]').val("");
+                $('input[name="label"]').val("");
+                $('input[name="description"]').val("");
                 location.href = `/${userName}/${repoPath}/modelmanage/show_model`
                 $('.ui.modal.second').modal('hide')
             },
diff --git a/templates/repo/modelarts/trainjob/show.tmpl b/templates/repo/modelarts/trainjob/show.tmpl
index 74a325af7..37661cc8a 100755
--- a/templates/repo/modelarts/trainjob/show.tmpl
+++ b/templates/repo/modelarts/trainjob/show.tmpl
@@ -929,6 +929,8 @@
             success: function (res) {
                 $('input[name="engine_name"]').val("");
                 $('input[name="engine"]').val("");
+                $('input[name="label"]').val("");
+                $('input[name="description"]').val("");
                 location.href = `/${userName}/${repoPath}/modelmanage/show_model`
                 $('.ui.modal.second').modal('hide')
             },

From a0242ffb4baed2c233190b6f079b45c3263ce7d3 Mon Sep 17 00:00:00 2001
From: ychao_1983 <ychao_1983@sina.com>
Date: Tue, 25 Oct 2022 11:33:58 +0800
Subject: [PATCH 019/187] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 services/cloudbrain/cloudbrainTask/inference.go |  4 ++--
 services/cloudbrain/cloudbrainTask/train.go     | 14 +++++++++-----
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/services/cloudbrain/cloudbrainTask/inference.go b/services/cloudbrain/cloudbrainTask/inference.go
index ba5ba7cf1..5481a8b4c 100644
--- a/services/cloudbrain/cloudbrainTask/inference.go
+++ b/services/cloudbrain/cloudbrainTask/inference.go
@@ -96,7 +96,7 @@ func CloudBrainInferenceJobCreate(ctx *context.Context, option api.CreateTrainJo
 		return
 	}
 
-	count, err := models.GetCloudbrainCountByUserID(ctx.User.ID, jobType)
+	count, err := GetNotFinalStatusTaskCount(ctx.User.ID, models.TypeCloudBrainOne, jobType)
 	if err != nil {
 		log.Error("GetCloudbrainCountByUserID failed:%v", err, ctx.Data["MsgID"])
 		ctx.JSON(http.StatusOK, models.BaseErrorMessage("system error"))
@@ -226,7 +226,7 @@ func ModelArtsInferenceJobCreate(ctx *context.Context, option api.CreateTrainJob
 	}
 	defer lock.UnLock()
 
-	count, err := models.GetCloudbrainInferenceJobCountByUserID(ctx.User.ID)
+	count, err := GetNotFinalStatusTaskCount(ctx.User.ID, models.TypeCloudBrainTwo, string(models.JobTypeInference))
 	if err != nil {
 		log.Error("GetCloudbrainInferenceJobCountByUserID failed:%v", err, ctx.Data["MsgID"])
 
diff --git a/services/cloudbrain/cloudbrainTask/train.go b/services/cloudbrain/cloudbrainTask/train.go
index 28d5038bf..5af9a1181 100644
--- a/services/cloudbrain/cloudbrainTask/train.go
+++ b/services/cloudbrain/cloudbrainTask/train.go
@@ -174,8 +174,12 @@ func checkParameters(ctx *context.Context, option api.CreateTrainJobOption, lock
 		return nil, nil, "", fmt.Errorf(ctx.Tr("repo.cloudbrain_bootfile_err"))
 	}
 
+	computeResource := models.GPUResource
+	if option.Type == 3 {
+		computeResource = models.NPUResource
+	}
 	//check count limit
-	count, err := models.GetGrampusCountByUserID(ctx.User.ID, string(models.JobTypeTrain), models.GPUResource)
+	count, err := GetNotFinalStatusTaskCount(ctx.User.ID, models.TypeC2Net, string(models.JobTypeTrain), computeResource)
 	if err != nil {
 		log.Error("GetGrampusCountByUserID failed:%v", err, ctx.Data["MsgID"])
 		return nil, nil, "", fmt.Errorf("system error")
@@ -207,13 +211,13 @@ func checkParameters(ctx *context.Context, option api.CreateTrainJobOption, lock
 	}
 
 	//check specification
-	computeResource := models.GPU
+	computeType := models.GPU
 	if option.Type == 3 {
-		computeResource = models.NPU
+		computeType = models.NPU
 	}
 	spec, err := resource.GetAndCheckSpec(ctx.User.ID, option.SpecId, models.FindSpecsOptions{
 		JobType:         models.JobTypeTrain,
-		ComputeResource: computeResource,
+		ComputeResource: computeType,
 		Cluster:         models.C2NetCluster,
 	})
 	if err != nil || spec == nil {
@@ -226,7 +230,7 @@ func checkParameters(ctx *context.Context, option api.CreateTrainJobOption, lock
 	}
 
 	//check dataset
-	datasetInfos, datasetNames, err := models.GetDatasetInfo(option.Attachment, computeResource)
+	datasetInfos, datasetNames, err := models.GetDatasetInfo(option.Attachment, computeType)
 	if err != nil {
 		log.Error("GetDatasetInfo failed: %v", err, ctx.Data["MsgID"])
 		return nil, nil, "", fmt.Errorf(ctx.Tr("cloudbrain.error.dataset_select"))

From f676bbb94396a047e85ff067a433042c856c2d69 Mon Sep 17 00:00:00 2001
From: ychao_1983 <ychao_1983@sina.com>
Date: Tue, 25 Oct 2022 11:46:53 +0800
Subject: [PATCH 020/187] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 models/base_message.go                        | 19 +++++-
 .../cloudbrain/cloudbrainTask/inference.go    | 66 +++++++++----------
 services/cloudbrain/cloudbrainTask/train.go   | 30 ++++-----
 3 files changed, 65 insertions(+), 50 deletions(-)

diff --git a/models/base_message.go b/models/base_message.go
index 31103d795..f0fa19bf2 100644
--- a/models/base_message.go
+++ b/models/base_message.go
@@ -1,8 +1,8 @@
 package models
 
 type BaseMessage struct {
-	Code    int    `json:"code"`
-	Message string `json:"message"`
+	Code    int
+	Message string
 }
 
 var BaseOKMessage = BaseMessage{
@@ -14,3 +14,18 @@ func BaseErrorMessage(message string) BaseMessage {
 		1, message,
 	}
 }
+
+type BaseMessageApi struct {
+	Code    int    `json:"code"`
+	Message string `json:"message"`
+}
+
+var BaseOKMessageApi = BaseMessageApi{
+	0, "",
+}
+
+func BaseErrorMessageApi(message string) BaseMessageApi {
+	return BaseMessageApi{
+		1, message,
+	}
+}
diff --git a/services/cloudbrain/cloudbrainTask/inference.go b/services/cloudbrain/cloudbrainTask/inference.go
index 5481a8b4c..21b271e63 100644
--- a/services/cloudbrain/cloudbrainTask/inference.go
+++ b/services/cloudbrain/cloudbrainTask/inference.go
@@ -54,7 +54,7 @@ func CloudBrainInferenceJobCreate(ctx *context.Context, option api.CreateTrainJo
 	if !isOk {
 		log.Error("lock processed failed:%v", err, ctx.Data["MsgID"])
 
-		ctx.JSON(http.StatusOK, models.BaseErrorMessage(ctx.Tr("repo.cloudbrain_samejob_err")))
+		ctx.JSON(http.StatusOK, models.BaseErrorMessageApi(ctx.Tr("repo.cloudbrain_samejob_err")))
 		return
 	}
 
@@ -63,7 +63,7 @@ func CloudBrainInferenceJobCreate(ctx *context.Context, option api.CreateTrainJo
 	command, err := getInferenceJobCommand(option)
 	if err != nil {
 		log.Error("getTrainJobCommand failed: %v", err)
-		ctx.JSON(http.StatusOK, models.BaseErrorMessage(err.Error()))
+		ctx.JSON(http.StatusOK, models.BaseErrorMessageApi(err.Error()))
 		return
 	}
 
@@ -71,40 +71,40 @@ func CloudBrainInferenceJobCreate(ctx *context.Context, option api.CreateTrainJo
 	if err == nil {
 		if len(tasks) != 0 {
 			log.Error("the job name did already exist", ctx.Data["MsgID"])
-			ctx.JSON(http.StatusOK, models.BaseErrorMessage("the job name did already exist"))
+			ctx.JSON(http.StatusOK, models.BaseErrorMessageApi("the job name did already exist"))
 			return
 		}
 	} else {
 		if !models.IsErrJobNotExist(err) {
 			log.Error("system error, %v", err, ctx.Data["MsgID"])
 
-			ctx.JSON(http.StatusOK, models.BaseErrorMessage("system error"))
+			ctx.JSON(http.StatusOK, models.BaseErrorMessageApi("system error"))
 			return
 		}
 	}
 
 	if !jobNamePattern.MatchString(displayJobName) {
 
-		ctx.JSON(http.StatusOK, models.BaseErrorMessage(ctx.Tr("repo.cloudbrain_jobname_err")))
+		ctx.JSON(http.StatusOK, models.BaseErrorMessageApi(ctx.Tr("repo.cloudbrain_jobname_err")))
 		return
 	}
 
 	bootFileExist, err := ctx.Repo.FileExists(bootFile, branchName)
 	if err != nil || !bootFileExist {
 		log.Error("Get bootfile error:", err, ctx.Data["MsgID"])
-		ctx.JSON(http.StatusOK, models.BaseErrorMessage(ctx.Tr("repo.cloudbrain_bootfile_err")))
+		ctx.JSON(http.StatusOK, models.BaseErrorMessageApi(ctx.Tr("repo.cloudbrain_bootfile_err")))
 		return
 	}
 
 	count, err := GetNotFinalStatusTaskCount(ctx.User.ID, models.TypeCloudBrainOne, jobType)
 	if err != nil {
 		log.Error("GetCloudbrainCountByUserID failed:%v", err, ctx.Data["MsgID"])
-		ctx.JSON(http.StatusOK, models.BaseErrorMessage("system error"))
+		ctx.JSON(http.StatusOK, models.BaseErrorMessageApi("system error"))
 		return
 	} else {
 		if count >= 1 {
 			log.Error("the user already has running or waiting task", ctx.Data["MsgID"])
-			ctx.JSON(http.StatusOK, models.BaseErrorMessage(ctx.Tr("repo.cloudbrain.morethanonejob")))
+			ctx.JSON(http.StatusOK, models.BaseErrorMessageApi(ctx.Tr("repo.cloudbrain.morethanonejob")))
 			return
 		}
 	}
@@ -115,7 +115,7 @@ func CloudBrainInferenceJobCreate(ctx *context.Context, option api.CreateTrainJo
 	errStr := loadCodeAndMakeModelPath(repo, codePath, branchName, jobName, cloudbrain.ResultPath)
 	if errStr != "" {
 
-		ctx.JSON(http.StatusOK, models.BaseErrorMessage(ctx.Tr(errStr)))
+		ctx.JSON(http.StatusOK, models.BaseErrorMessageApi(ctx.Tr(errStr)))
 		return
 	}
 
@@ -125,7 +125,7 @@ func CloudBrainInferenceJobCreate(ctx *context.Context, option api.CreateTrainJo
 	if err != nil {
 		log.Error("GetDatasetInfo failed: %v", err, ctx.Data["MsgID"])
 
-		ctx.JSON(http.StatusOK, models.BaseErrorMessage(ctx.Tr("cloudbrain.error.dataset_select")))
+		ctx.JSON(http.StatusOK, models.BaseErrorMessageApi(ctx.Tr("cloudbrain.error.dataset_select")))
 		return
 	}
 	spec, err := resource.GetAndCheckSpec(ctx.User.ID, option.SpecId, models.FindSpecsOptions{
@@ -135,12 +135,12 @@ func CloudBrainInferenceJobCreate(ctx *context.Context, option api.CreateTrainJo
 		AiCenterCode:    models.AICenterOfCloudBrainOne})
 	if err != nil || spec == nil {
 
-		ctx.JSON(http.StatusOK, models.BaseErrorMessage("Resource specification is not available"))
+		ctx.JSON(http.StatusOK, models.BaseErrorMessageApi("Resource specification is not available"))
 		return
 	}
 	if !account.IsPointBalanceEnough(ctx.User.ID, spec.UnitPrice) {
 		log.Error("point balance is not enough,userId=%d specId=%d", ctx.User.ID, spec.ID)
-		ctx.JSON(http.StatusOK, models.BaseErrorMessage(ctx.Tr("points.insufficient_points_balance")))
+		ctx.JSON(http.StatusOK, models.BaseErrorMessageApi(ctx.Tr("points.insufficient_points_balance")))
 		return
 	}
 	req := cloudbrain.GenerateCloudBrainTaskReq{
@@ -175,10 +175,10 @@ func CloudBrainInferenceJobCreate(ctx *context.Context, option api.CreateTrainJo
 	jobId, err := cloudbrain.GenerateTask(req)
 	if err != nil {
 
-		ctx.JSON(http.StatusOK, models.BaseErrorMessage(err.Error()))
+		ctx.JSON(http.StatusOK, models.BaseErrorMessageApi(err.Error()))
 		return
 	}
-	ctx.JSON(http.StatusOK, models.BaseMessage{Code: 0, Message: jobId})
+	ctx.JSON(http.StatusOK, models.BaseMessageApi{Code: 0, Message: jobId})
 }
 
 func ModelArtsInferenceJobCreate(ctx *context.Context, option api.CreateTrainJobOption) {
@@ -212,7 +212,7 @@ func ModelArtsInferenceJobCreate(ctx *context.Context, option api.CreateTrainJob
 	errStr := checkInferenceJobMultiNode(ctx.User.ID, option.WorkServerNumber)
 	if errStr != "" {
 
-		ctx.JSON(http.StatusOK, models.BaseErrorMessage(ctx.Tr(errStr)))
+		ctx.JSON(http.StatusOK, models.BaseErrorMessageApi(ctx.Tr(errStr)))
 		return
 	}
 
@@ -221,7 +221,7 @@ func ModelArtsInferenceJobCreate(ctx *context.Context, option api.CreateTrainJob
 	if !isOk {
 		log.Error("lock processed failed:%v", err, ctx.Data["MsgID"])
 
-		ctx.JSON(http.StatusOK, models.BaseErrorMessage(ctx.Tr("repo.cloudbrain_samejob_err")))
+		ctx.JSON(http.StatusOK, models.BaseErrorMessageApi(ctx.Tr("repo.cloudbrain_samejob_err")))
 		return
 	}
 	defer lock.UnLock()
@@ -230,13 +230,13 @@ func ModelArtsInferenceJobCreate(ctx *context.Context, option api.CreateTrainJob
 	if err != nil {
 		log.Error("GetCloudbrainInferenceJobCountByUserID failed:%v", err, ctx.Data["MsgID"])
 
-		ctx.JSON(http.StatusOK, models.BaseErrorMessage("system error"))
+		ctx.JSON(http.StatusOK, models.BaseErrorMessageApi("system error"))
 		return
 	} else {
 		if count >= 1 {
 			log.Error("the user already has running or waiting inference task", ctx.Data["MsgID"])
 
-			ctx.JSON(http.StatusOK, models.BaseErrorMessage("you have already a running or waiting inference task, can not create more"))
+			ctx.JSON(http.StatusOK, models.BaseErrorMessageApi("you have already a running or waiting inference task, can not create more"))
 			return
 		}
 	}
@@ -244,14 +244,14 @@ func ModelArtsInferenceJobCreate(ctx *context.Context, option api.CreateTrainJob
 	if err := paramCheckCreateInferenceJob(option); err != nil {
 		log.Error("paramCheckCreateInferenceJob failed:(%v)", err)
 
-		ctx.JSON(http.StatusOK, models.BaseErrorMessage(err.Error()))
+		ctx.JSON(http.StatusOK, models.BaseErrorMessageApi(err.Error()))
 		return
 	}
 
 	bootFileExist, err := ctx.Repo.FileExists(bootFile, branchName)
 	if err != nil || !bootFileExist {
 		log.Error("Get bootfile error:", err)
-		ctx.JSON(http.StatusOK, models.BaseErrorMessage(ctx.Tr("repo.cloudbrain_bootfile_err")))
+		ctx.JSON(http.StatusOK, models.BaseErrorMessageApi(ctx.Tr("repo.cloudbrain_bootfile_err")))
 		return
 	}
 
@@ -261,14 +261,14 @@ func ModelArtsInferenceJobCreate(ctx *context.Context, option api.CreateTrainJob
 		if len(tasks) != 0 {
 			log.Error("the job name did already exist", ctx.Data["MsgID"])
 
-			ctx.JSON(http.StatusOK, models.BaseErrorMessage("the job name did already exist"))
+			ctx.JSON(http.StatusOK, models.BaseErrorMessageApi("the job name did already exist"))
 			return
 		}
 	} else {
 		if !models.IsErrJobNotExist(err) {
 			log.Error("system error, %v", err, ctx.Data["MsgID"])
 
-			ctx.JSON(http.StatusOK, models.BaseErrorMessage("system error"))
+			ctx.JSON(http.StatusOK, models.BaseErrorMessageApi("system error"))
 			return
 		}
 	}
@@ -280,12 +280,12 @@ func ModelArtsInferenceJobCreate(ctx *context.Context, option api.CreateTrainJob
 		AiCenterCode:    models.AICenterOfCloudBrainTwo})
 	if err != nil || spec == nil {
 
-		ctx.JSON(http.StatusOK, models.BaseErrorMessage("Resource specification not available"))
+		ctx.JSON(http.StatusOK, models.BaseErrorMessageApi("Resource specification not available"))
 		return
 	}
 	if !account.IsPointBalanceEnough(ctx.User.ID, spec.UnitPrice) {
 		log.Error("point balance is not enough,userId=%d specId=%d ", ctx.User.ID, spec.ID)
-		ctx.JSON(http.StatusOK, models.BaseErrorMessage(ctx.Tr("points.insufficient_points_balance")))
+		ctx.JSON(http.StatusOK, models.BaseErrorMessageApi(ctx.Tr("points.insufficient_points_balance")))
 		return
 	}
 
@@ -301,7 +301,7 @@ func ModelArtsInferenceJobCreate(ctx *context.Context, option api.CreateTrainJob
 	if err := downloadCode(repo, codeLocalPath, branchName); err != nil {
 		log.Error("Create task failed, server timed out: %s (%v)", repo.FullName(), err)
 
-		ctx.JSON(http.StatusOK, models.BaseErrorMessage(ctx.Tr("cloudbrain.load_code_failed")))
+		ctx.JSON(http.StatusOK, models.BaseErrorMessageApi(ctx.Tr("cloudbrain.load_code_failed")))
 		return
 	}
 
@@ -309,19 +309,19 @@ func ModelArtsInferenceJobCreate(ctx *context.Context, option api.CreateTrainJob
 	if err := obsMkdir(setting.CodePathPrefix + jobName + modelarts.ResultPath + VersionOutputPath + "/"); err != nil {
 		log.Error("Failed to obsMkdir_result: %s (%v)", repo.FullName(), err)
 
-		ctx.JSON(http.StatusOK, models.BaseErrorMessage("Failed to obsMkdir_result"))
+		ctx.JSON(http.StatusOK, models.BaseErrorMessageApi("Failed to obsMkdir_result"))
 		return
 	}
 
 	if err := obsMkdir(setting.CodePathPrefix + jobName + modelarts.LogPath + VersionOutputPath + "/"); err != nil {
 		log.Error("Failed to obsMkdir_log: %s (%v)", repo.FullName(), err)
-		ctx.JSON(http.StatusOK, models.BaseErrorMessage("Failed to obsMkdir_log"))
+		ctx.JSON(http.StatusOK, models.BaseErrorMessageApi("Failed to obsMkdir_log"))
 		return
 	}
 
 	if err := uploadCodeToObs(codeLocalPath, jobName, ""); err != nil {
 		log.Error("Failed to uploadCodeToObs: %s (%v)", repo.FullName(), err)
-		ctx.JSON(http.StatusOK, models.BaseErrorMessage(ctx.Tr("cloudbrain.load_code_failed")))
+		ctx.JSON(http.StatusOK, models.BaseErrorMessageApi(ctx.Tr("cloudbrain.load_code_failed")))
 		return
 	}
 
@@ -338,7 +338,7 @@ func ModelArtsInferenceJobCreate(ctx *context.Context, option api.CreateTrainJob
 	datasUrlList, dataUrl, datasetNames, isMultiDataset, err := getDatasUrlListByUUIDS(uuid)
 	if err != nil {
 
-		ctx.JSON(http.StatusOK, models.BaseErrorMessage(err.Error()))
+		ctx.JSON(http.StatusOK, models.BaseErrorMessageApi(err.Error()))
 		return
 	}
 	dataPath := dataUrl
@@ -346,7 +346,7 @@ func ModelArtsInferenceJobCreate(ctx *context.Context, option api.CreateTrainJob
 	if err != nil {
 		log.Error("Failed to Marshal: %v", err)
 
-		ctx.JSON(http.StatusOK, models.BaseErrorMessage("json error:"+err.Error()))
+		ctx.JSON(http.StatusOK, models.BaseErrorMessageApi("json error:"+err.Error()))
 		return
 	}
 	if isMultiDataset {
@@ -362,7 +362,7 @@ func ModelArtsInferenceJobCreate(ctx *context.Context, option api.CreateTrainJob
 		if err != nil {
 			log.Error("Failed to Unmarshal params: %s (%v)", params, err)
 
-			ctx.JSON(http.StatusOK, models.BaseErrorMessage("运行参数错误"))
+			ctx.JSON(http.StatusOK, models.BaseErrorMessageApi("运行参数错误"))
 			return
 		}
 
@@ -421,10 +421,10 @@ func ModelArtsInferenceJobCreate(ctx *context.Context, option api.CreateTrainJob
 	if err != nil {
 		log.Error("GenerateTrainJob failed:%v", err.Error())
 
-		ctx.JSON(http.StatusOK, models.BaseErrorMessage(err.Error()))
+		ctx.JSON(http.StatusOK, models.BaseErrorMessageApi(err.Error()))
 		return
 	}
-	ctx.JSON(http.StatusOK, models.BaseMessage{Code: 0, Message: jobId})
+	ctx.JSON(http.StatusOK, models.BaseMessageApi{Code: 0, Message: jobId})
 }
 
 func getDatasUrlListByUUIDS(uuidStr string) ([]models.Datasurl, string, string, bool, error) {
diff --git a/services/cloudbrain/cloudbrainTask/train.go b/services/cloudbrain/cloudbrainTask/train.go
index 5af9a1181..d31038536 100644
--- a/services/cloudbrain/cloudbrainTask/train.go
+++ b/services/cloudbrain/cloudbrainTask/train.go
@@ -53,7 +53,7 @@ func GrampusTrainJobGpuCreate(ctx *context.Context, option api.CreateTrainJobOpt
 	defer lock.UnLock()
 	spec, datasetInfos, datasetNames, err := checkParameters(ctx, option, lock, repo)
 	if err != nil {
-		ctx.JSON(http.StatusOK, models.BaseErrorMessage(err.Error()))
+		ctx.JSON(http.StatusOK, models.BaseErrorMessageApi(err.Error()))
 		return
 	}
 
@@ -65,7 +65,7 @@ func GrampusTrainJobGpuCreate(ctx *context.Context, option api.CreateTrainJobOpt
 
 	if err := downloadZipCode(ctx, codeLocalPath, branchName); err != nil {
 		log.Error("downloadZipCode failed, server timed out: %s (%v)", repo.FullName(), err, ctx.Data["MsgID"])
-		ctx.JSON(http.StatusOK, models.BaseErrorMessage(ctx.Tr("cloudbrain.load_code_failed")))
+		ctx.JSON(http.StatusOK, models.BaseErrorMessageApi(ctx.Tr("cloudbrain.load_code_failed")))
 
 	}
 
@@ -73,21 +73,21 @@ func GrampusTrainJobGpuCreate(ctx *context.Context, option api.CreateTrainJobOpt
 	//upload code
 	if err := uploadCodeToMinio(codeLocalPath+"/", jobName, cloudbrain.CodeMountPath+"/"); err != nil {
 		log.Error("Failed to uploadCodeToMinio: %s (%v)", repo.FullName(), err, ctx.Data["MsgID"])
-		ctx.JSON(http.StatusOK, models.BaseErrorMessage(ctx.Tr("cloudbrain.load_code_failed")))
+		ctx.JSON(http.StatusOK, models.BaseErrorMessageApi(ctx.Tr("cloudbrain.load_code_failed")))
 		return
 	}
 
 	modelPath := setting.JobPath + jobName + cloudbrain.ModelMountPath + "/"
 	if err := mkModelPath(modelPath); err != nil {
 		log.Error("Failed to mkModelPath: %s (%v)", repo.FullName(), err, ctx.Data["MsgID"])
-		ctx.JSON(http.StatusOK, models.BaseErrorMessage(ctx.Tr("cloudbrain.load_code_failed")))
+		ctx.JSON(http.StatusOK, models.BaseErrorMessageApi(ctx.Tr("cloudbrain.load_code_failed")))
 		return
 	}
 
 	//init model readme
 	if err := uploadCodeToMinio(modelPath, jobName, cloudbrain.ModelMountPath+"/"); err != nil {
 		log.Error("Failed to uploadCodeToMinio: %s (%v)", repo.FullName(), err, ctx.Data["MsgID"])
-		ctx.JSON(http.StatusOK, models.BaseErrorMessage(ctx.Tr("cloudbrain.load_code_failed")))
+		ctx.JSON(http.StatusOK, models.BaseErrorMessageApi(ctx.Tr("cloudbrain.load_code_failed")))
 		return
 	}
 
@@ -109,7 +109,7 @@ func GrampusTrainJobGpuCreate(ctx *context.Context, option api.CreateTrainJobOpt
 	command, err := generateCommand(repo.Name, grampus.ProcessorTypeGPU, codeMinioPath+cloudbrain.DefaultBranchName+".zip", datasetRemotePath, bootFile, params, setting.CBCodePathPrefix+jobName+cloudbrain.ModelMountPath+"/", allFileName, preTrainModelPath, option.CkptName)
 	if err != nil {
 		log.Error("Failed to generateCommand: %s (%v)", displayJobName, err, ctx.Data["MsgID"])
-		ctx.JSON(http.StatusOK, models.BaseErrorMessage("Create task failed, internal error"))
+		ctx.JSON(http.StatusOK, models.BaseErrorMessageApi("Create task failed, internal error"))
 		return
 	}
 
@@ -150,10 +150,10 @@ func GrampusTrainJobGpuCreate(ctx *context.Context, option api.CreateTrainJobOpt
 	jobId, err := grampus.GenerateTrainJob(ctx, req)
 	if err != nil {
 		log.Error("GenerateTrainJob failed:%v", err.Error(), ctx.Data["MsgID"])
-		ctx.JSON(http.StatusOK, models.BaseErrorMessage(err.Error()))
+		ctx.JSON(http.StatusOK, models.BaseErrorMessageApi(err.Error()))
 		return
 	}
-	ctx.JSON(http.StatusOK, models.BaseMessage{Code: 0, Message: jobId})
+	ctx.JSON(http.StatusOK, models.BaseMessageApi{Code: 0, Message: jobId})
 }
 
 func checkParameters(ctx *context.Context, option api.CreateTrainJobOption, lock *redis_lock.DistributeLock, repo *models.Repository) (*models.Specification, map[string]models.DatasetInfo, string, error) {
@@ -258,7 +258,7 @@ func GrampusTrainJobNpuCreate(ctx *context.Context, option api.CreateTrainJobOpt
 	defer lock.UnLock()
 	spec, datasetInfos, datasetNames, err := checkParameters(ctx, option, lock, repo)
 	if err != nil {
-		ctx.JSON(http.StatusOK, models.BaseErrorMessage(err.Error()))
+		ctx.JSON(http.StatusOK, models.BaseErrorMessageApi(err.Error()))
 		return
 	}
 
@@ -271,7 +271,7 @@ func GrampusTrainJobNpuCreate(ctx *context.Context, option api.CreateTrainJobOpt
 	if err := downloadZipCode(ctx, codeLocalPath, branchName); err != nil {
 		log.Error("downloadZipCode failed, server timed out: %s (%v)", repo.FullName(), err)
 
-		ctx.JSON(http.StatusOK, models.BaseErrorMessage(ctx.Tr("cloudbrain.load_code_failed")))
+		ctx.JSON(http.StatusOK, models.BaseErrorMessageApi(ctx.Tr("cloudbrain.load_code_failed")))
 		return
 	}
 
@@ -279,14 +279,14 @@ func GrampusTrainJobNpuCreate(ctx *context.Context, option api.CreateTrainJobOpt
 	if err := obsMkdir(setting.CodePathPrefix + jobName + modelarts.OutputPath); err != nil {
 		log.Error("Failed to obsMkdir_output: %s (%v)", repo.FullName(), err)
 
-		ctx.JSON(http.StatusOK, models.BaseErrorMessage(ctx.Tr("cloudbrain.load_code_failed")))
+		ctx.JSON(http.StatusOK, models.BaseErrorMessageApi(ctx.Tr("cloudbrain.load_code_failed")))
 		return
 	}
 
 	if err := uploadCodeToObs(codeLocalPath, jobName, ""); err != nil {
 		log.Error("Failed to uploadCodeToObs: %s (%v)", repo.FullName(), err)
 
-		ctx.JSON(http.StatusOK, models.BaseErrorMessage(ctx.Tr("cloudbrain.load_code_failed")))
+		ctx.JSON(http.StatusOK, models.BaseErrorMessageApi(ctx.Tr("cloudbrain.load_code_failed")))
 		return
 	}
 
@@ -308,7 +308,7 @@ func GrampusTrainJobNpuCreate(ctx *context.Context, option api.CreateTrainJobOpt
 	if err != nil {
 		log.Error("Failed to generateCommand: %s (%v)", displayJobName, err, ctx.Data["MsgID"])
 
-		ctx.JSON(http.StatusOK, models.BaseErrorMessage("Create task failed, internal error"))
+		ctx.JSON(http.StatusOK, models.BaseErrorMessageApi("Create task failed, internal error"))
 		return
 	}
 
@@ -352,10 +352,10 @@ func GrampusTrainJobNpuCreate(ctx *context.Context, option api.CreateTrainJobOpt
 	if err != nil {
 		log.Error("GenerateTrainJob failed:%v", err.Error())
 
-		ctx.JSON(http.StatusOK, models.BaseErrorMessage(err.Error()))
+		ctx.JSON(http.StatusOK, models.BaseErrorMessageApi(err.Error()))
 		return
 	}
-	ctx.JSON(http.StatusOK, models.BaseMessage{Code: 0, Message: jobId})
+	ctx.JSON(http.StatusOK, models.BaseMessageApi{Code: 0, Message: jobId})
 }
 
 func obsMkdir(dir string) error {

From 957ca5ecc415cd5eedc9d23dcb1ff9e7b9d53afc Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Tue, 25 Oct 2022 14:12:57 +0800
Subject: [PATCH 021/187] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 templates/repo/modelarts/trainjob/show.tmpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/repo/modelarts/trainjob/show.tmpl b/templates/repo/modelarts/trainjob/show.tmpl
index 37661cc8a..bdddbe195 100755
--- a/templates/repo/modelarts/trainjob/show.tmpl
+++ b/templates/repo/modelarts/trainjob/show.tmpl
@@ -931,7 +931,7 @@
                 $('input[name="engine"]').val("");
                 $('input[name="label"]').val("");
                 $('input[name="description"]').val("");
-                location.href = `/${userName}/${repoPath}/modelmanage/show_model`
+                //location.href = `/${userName}/${repoPath}/modelmanage/show_model`
                 $('.ui.modal.second').modal('hide')
             },
             error: function (xhr) {

From e18ccb7cb24b059214307331a2be656df600f8c7 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Tue, 25 Oct 2022 14:21:14 +0800
Subject: [PATCH 022/187] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 templates/repo/modelarts/trainjob/show.tmpl | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/templates/repo/modelarts/trainjob/show.tmpl b/templates/repo/modelarts/trainjob/show.tmpl
index bdddbe195..a526e6b99 100755
--- a/templates/repo/modelarts/trainjob/show.tmpl
+++ b/templates/repo/modelarts/trainjob/show.tmpl
@@ -929,9 +929,10 @@
             success: function (res) {
                 $('input[name="engine_name"]').val("");
                 $('input[name="engine"]').val("");
+                $('input[name="jobId"]').val("");
                 $('input[name="label"]').val("");
                 $('input[name="description"]').val("");
-                //location.href = `/${userName}/${repoPath}/modelmanage/show_model`
+                location.href = `/${userName}/${repoPath}/modelmanage/show_model`
                 $('.ui.modal.second').modal('hide')
             },
             error: function (xhr) {

From cbf14adab37040a595028ca5db494c229a0f69cb Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Tue, 25 Oct 2022 14:25:15 +0800
Subject: [PATCH 023/187] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 templates/repo/modelarts/trainjob/show.tmpl | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/templates/repo/modelarts/trainjob/show.tmpl b/templates/repo/modelarts/trainjob/show.tmpl
index a526e6b99..eedd4c245 100755
--- a/templates/repo/modelarts/trainjob/show.tmpl
+++ b/templates/repo/modelarts/trainjob/show.tmpl
@@ -904,9 +904,6 @@
                     loadSelectedModelFile(obj);
                 },
                 onHide: function () {
-                    var cityObj = $("#modelSelectedFile");
-			        cityObj.attr("value", "");
-                    document.getElementById("formId").reset();
                     $('.ui.dimmer').css({ "background-color": "" })
                     $('.ui.error.message').text()
                     $('.ui.error.message').css('display', 'none')
@@ -932,6 +929,9 @@
                 $('input[name="jobId"]').val("");
                 $('input[name="label"]').val("");
                 $('input[name="description"]').val("");
+                var cityObj = $("#modelSelectedFile");
+			    cityObj.attr("value", "");
+                document.getElementById("formId").reset();
                 location.href = `/${userName}/${repoPath}/modelmanage/show_model`
                 $('.ui.modal.second').modal('hide')
             },

From e59af761839c18270461166f153df1391f6fcaea Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Tue, 25 Oct 2022 14:31:15 +0800
Subject: [PATCH 024/187] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 templates/repo/cloudbrain/trainjob/show.tmpl | 7 ++++---
 templates/repo/grampus/trainjob/show.tmpl    | 7 ++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/templates/repo/cloudbrain/trainjob/show.tmpl b/templates/repo/cloudbrain/trainjob/show.tmpl
index 42045c24b..a5ecc297c 100644
--- a/templates/repo/cloudbrain/trainjob/show.tmpl
+++ b/templates/repo/cloudbrain/trainjob/show.tmpl
@@ -852,9 +852,6 @@
                     loadSelectedModelFile(obj);
                 },
                 onHide: function () {
-                    var cityObj = $("#modelSelectedFile");
-			        cityObj.attr("value", "");
-                    document.getElementById("formId").reset();
                     $('.ui.dimmer').css({ "background-color": "" })
                     $('.ui.error.message').text()
                     $('.ui.error.message').css('display', 'none')
@@ -877,8 +874,12 @@
             success: function (res) {
                 $('input[name="engine_name"]').val("");
                 $('input[name="engine"]').val("");
+                $('input[name="jobId"]').val("");
                 $('input[name="label"]').val("");
                 $('input[name="description"]').val("");
+                var cityObj = $("#modelSelectedFile");
+			    cityObj.attr("value", "");
+                document.getElementById("formId").reset();
                 location.href = `/${userName}/${repoPath}/modelmanage/show_model`
                 $('.ui.modal.second').modal('hide')
             },
diff --git a/templates/repo/grampus/trainjob/show.tmpl b/templates/repo/grampus/trainjob/show.tmpl
index 04f059736..6e1009b6e 100755
--- a/templates/repo/grampus/trainjob/show.tmpl
+++ b/templates/repo/grampus/trainjob/show.tmpl
@@ -877,9 +877,6 @@
                    loadSelectedModelFile(obj);
                 },
                 onHide: function () {
-                    var cityObj = $("#modelSelectedFile");
-			        cityObj.attr("value", "");
-                    document.getElementById("formId").reset();
                     $('.ui.dimmer').css({ "background-color": "" })
                     $('.ui.error.message').text()
                     $('.ui.error.message').css('display', 'none')
@@ -903,8 +900,12 @@
             success: function (res) {
                 $('input[name="engine_name"]').val("");
                 $('input[name="engine"]').val("");
+                $('input[name="jobId"]').val("");
                 $('input[name="label"]').val("");
                 $('input[name="description"]').val("");
+                var cityObj = $("#modelSelectedFile");
+			    cityObj.attr("value", "");
+                document.getElementById("formId").reset();
                 location.href = `/${userName}/${repoPath}/modelmanage/show_model`
                 $('.ui.modal.second').modal('hide')
             },

From a82bacd4008c0c7a67162afb26fc19307f06badd Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Tue, 25 Oct 2022 14:35:22 +0800
Subject: [PATCH 025/187] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 web_src/js/features/cloudbrainShow.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/web_src/js/features/cloudbrainShow.js b/web_src/js/features/cloudbrainShow.js
index 3aafcc1a6..938dc8309 100644
--- a/web_src/js/features/cloudbrainShow.js
+++ b/web_src/js/features/cloudbrainShow.js
@@ -513,9 +513,9 @@ export default async function initCloudrainSow() {
         if (value) {
           let html = "";
           nameMap[value].forEach((element) => {
-            let { TrainTaskInfo } = element;
-            TrainTaskInfo = JSON.parse(TrainTaskInfo);
-            html += `<div class="item" data-label="${element.Label}" data-id="${element.ID}" data-value="${element.Path}">${element.Version}</div>`;
+            //let { trainTaskInfo } = element;
+            //trainTaskInfo = JSON.parse(trainTaskInfo);
+            html += `<div class="item" data-label="${element.label}" data-id="${element.id}" data-value="${element.path}">${element.version}</div>`;
           });
           $("#model_name_version").append(html);
           const initVersionText = $(

From 742be5d17ea4b409ad4b34a17ddfda52064f95d4 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Tue, 25 Oct 2022 14:46:33 +0800
Subject: [PATCH 026/187] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 templates/repo/cloudbrain/inference/new.tmpl   | 6 ++----
 templates/repo/modelarts/inferencejob/new.tmpl | 6 ++----
 web_src/js/features/cloudbrainShow.js          | 2 +-
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/templates/repo/cloudbrain/inference/new.tmpl b/templates/repo/cloudbrain/inference/new.tmpl
index 0d5a5005a..92ec303e2 100644
--- a/templates/repo/cloudbrain/inference/new.tmpl
+++ b/templates/repo/cloudbrain/inference/new.tmpl
@@ -327,9 +327,7 @@
                 $('#model_name_version').empty()
                 let html = ''
                 nameMap[value].forEach(element => {
-                    let {TrainTaskInfo} = element
-                    TrainTaskInfo = JSON.parse(TrainTaskInfo)
-                    html += `<div class="item" data-label="${element.Label}" data-id="${element.ID}" data-value="${element.Path}">${element.Version}</div>`
+                    html += `<div class="item" data-label="${element.label}" data-id="${element.id}" data-value="${element.path}">${element.version}</div>`
                 });
                 $('#model_name_version').append(html)
                 $("#select_model_version").removeClass("loading")
@@ -383,7 +381,7 @@
     }
     function loadCheckpointList(value){
         return new Promise((resolve,reject)=>{
-            $.get(`${RepoLink}/modelmanage/query_modelfile_for_predict`,{ID:value}, (data) => {
+            $.get(`${RepoLink}/modelmanage/query_modelfile_for_predict`,{id:value}, (data) => {
                 resolve(data)
             })
         })
diff --git a/templates/repo/modelarts/inferencejob/new.tmpl b/templates/repo/modelarts/inferencejob/new.tmpl
index 2ffb16c57..33b38d678 100644
--- a/templates/repo/modelarts/inferencejob/new.tmpl
+++ b/templates/repo/modelarts/inferencejob/new.tmpl
@@ -358,9 +358,7 @@
                 $('#model_name_version').empty()
                 let html = ''
                 nameMap[value].forEach(element => {
-                    let {TrainTaskInfo} = element
-                    TrainTaskInfo = JSON.parse(TrainTaskInfo)
-                    html += `<div class="item" data-label="${element.Label}" data-id="${element.ID}" data-value="${element.Path}">${element.Version}</div>`
+                    html += `<div class="item" data-label="${element.label}" data-id="${element.id}" data-value="${element.path}">${element.version}</div>`
                 });
                 $('#model_name_version').append(html)
                 $("#select_model_version").removeClass("loading")
@@ -414,7 +412,7 @@
     }
     function loadCheckpointList(value){
         return new Promise((resolve,reject)=>{
-            $.get(`${RepoLink}/modelmanage/query_modelfile_for_predict`,{ID:value}, (data) => {
+            $.get(`${RepoLink}/modelmanage/query_modelfile_for_predict`,{id:value}, (data) => {
                 resolve(data)
             })
         })
diff --git a/web_src/js/features/cloudbrainShow.js b/web_src/js/features/cloudbrainShow.js
index 938dc8309..5ef06dbd7 100644
--- a/web_src/js/features/cloudbrainShow.js
+++ b/web_src/js/features/cloudbrainShow.js
@@ -651,7 +651,7 @@ export default async function initCloudrainSow() {
     return new Promise((resolve, reject) => {
       $.get(
         `${RepoLink}/modelmanage/query_modelfile_for_predict`,
-        { ID: value },
+        { id: value },
         (data) => {
           resolve(data);
         }

From 88fe80456aa2d8ec6b56842c0d3a842b9f83622f Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Tue, 25 Oct 2022 15:03:09 +0800
Subject: [PATCH 027/187] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=A7=E5=B0=8F?=
 =?UTF-8?q?=E5=86=99=E9=97=AE=E9=A2=98=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 templates/repo/modelmanage/convertIndex.tmpl | 56 ++++++++++----------
 1 file changed, 28 insertions(+), 28 deletions(-)

diff --git a/templates/repo/modelmanage/convertIndex.tmpl b/templates/repo/modelmanage/convertIndex.tmpl
index 36b763174..cc334707e 100644
--- a/templates/repo/modelmanage/convertIndex.tmpl
+++ b/templates/repo/modelmanage/convertIndex.tmpl
@@ -233,7 +233,7 @@
                     </div>
                     
                     <div class="ui dropdown selection search eight wide field" id="choice_version">
-                            <input type="hidden" id="ModelVersion" name="ModelVersion" required>
+                            <input type="hidden" id="modelVersion" name="modelVersion" required>
                             <div class="default text">{{$.i18n.Tr "repo.modelconvert.selectversion"}}</div>
                             <i class="dropdown icon"></i>
                             <div class="menu" id="model-version">
@@ -246,7 +246,7 @@
                         <label for="choice_file">{{$.i18n.Tr "repo.model.manage.modelfile"}}</label>
                     </div>
                     <div class="ui dropdown selection search eight wide field" id="choice_file">
-                            <input type="hidden" id="ModelFile" name="ModelFile" required>
+                            <input type="hidden" id="modelFile" name="modelFile" required>
                             <div class="default text">{{$.i18n.Tr "repo.modelconvert.selectmodelfile"}}</div>
                             <i class="dropdown icon"></i>
                             <div class="menu" id="model-file">
@@ -260,10 +260,10 @@
                 </div>
                 <div class="unite min_title inline fields required">
                     <div class="three wide field right aligned">
-                        <label for="SrcEngine">{{$.i18n.Tr "repo.modelconvert.srcengine"}}</label>
+                        <label for="srcEngine">{{$.i18n.Tr "repo.modelconvert.srcengine"}}</label>
                     </div>
                     
-                    <select id="SrcEngine" class="ui search dropdown eight wide field" placeholder="" style='color:#000000;' name="SrcEngine" onchange="javascript:srcEngineChanged()">
+                    <select id="srcEngine" class="ui search dropdown eight wide field" placeholder="" style='color:#000000;' name="srcEngine" onchange="javascript:srcEngineChanged()">
                         
                     </select>
                 </div>
@@ -289,30 +289,30 @@
                 
                 <div class="unite min_title inline fields required">
                     <div class="three wide field right aligned">
-                        <label for="DestFormat">{{$.i18n.Tr "repo.modelconvert.outputformat"}}</label>
+                        <label for="destFormat">{{$.i18n.Tr "repo.modelconvert.outputformat"}}</label>
                     </div>
        
-                    <select id="DestFormat" class="ui search dropdown eight wide field" placeholder="" style='width:50%' name="DestFormat">
+                    <select id="destFormat" class="ui search dropdown eight wide field" placeholder="" style='width:50%' name="destFormat">
  
                     </select>
                     
                 </div>
                 <div class="unite min_title inline fields">
                     <div class="three wide field right aligned">
-                        <label for="NetOutputFormat">{{$.i18n.Tr "repo.modelconvert.netoutputdata"}}&nbsp;&nbsp;</label>
+                        <label for="netOutputFormat">{{$.i18n.Tr "repo.modelconvert.netoutputdata"}}&nbsp;&nbsp;</label>
                     </div>
    
-                    <select id="NetOutputFormat" class="ui search dropdown eight wide field" placeholder="" style='width:50%' name="NetOutputFormat">
+                    <select id="netOutputFormat" class="ui search dropdown eight wide field" placeholder="" style='width:50%' name="netOutputFormat">
 
                     </select>
                     
                 </div>
                 <div class="unite min_title inline fields">
                     <div class="three wide field right aligned">
-                        <label for="Description">{{$.i18n.Tr "repo.modelconvert.taskdesc"}}&nbsp;&nbsp;</label>
+                        <label for="description">{{$.i18n.Tr "repo.modelconvert.taskdesc"}}&nbsp;&nbsp;</label>
                     </div>
                     <div class="twelve wide field">
-                        <textarea  id="Description" name="Description" rows="1" maxlength="255" placeholder='{{.i18n.Tr "repo.modelarts.train_job.new_place"}}' onchange="this.value=this.value.substring(0, 255)" onkeydown="this.value=this.value.substring(0, 255)" onkeyup="this.value=this.value.substring(0, 256)"></textarea>
+                        <textarea  id="description" name="description" rows="1" maxlength="255" placeholder='{{.i18n.Tr "repo.modelarts.train_job.new_place"}}' onchange="this.value=this.value.substring(0, 255)" onkeydown="this.value=this.value.substring(0, 255)" onkeyup="this.value=this.value.substring(0, 256)"></textarea>
                     </div>
                 </div>
                 <div class="unite min_title inline field">
@@ -364,9 +364,9 @@
             $("#task_name").removeClass("error")
         }
 
-        data['desc']= $('#Description').val()
-        data['modelId'] = $('#ModelVersion').val()
-        data['srcEngine'] = $('#SrcEngine').val();
+        data['desc']= $('#description').val()
+        data['modelId'] = $('#modelVersion').val()
+        data['srcEngine'] = $('#srcEngine').val();
         data['inputshape']= $('#inputshape').val();
 
         if(inputshapeNotValid(data['inputshape'])){
@@ -379,9 +379,9 @@
         }
 
         data['inputdataformat']= $('#inputdataformat').val();
-        data['destFormat'] = $('#DestFormat').val();
-        data['netOutputFormat']= $('#NetOutputFormat').val();
-        data['modelFile'] = $('#ModelFile').val();
+        data['destFormat'] = $('#destFormat').val();
+        data['netOutputFormat']= $('#netOutputFormat').val();
+        data['modelFile'] = $('#modelFile').val();
         if(data['modelFile']==""){
             $('.ui.error.message').text("{{.i18n.Tr "repo.modelconvert.modelfileempty"}}")
             $('.ui.error.message').css('display','block')
@@ -456,7 +456,7 @@
         $('#choice_version').dropdown({
         onChange:function(value){
                 console.log("model version:" + value);
-                $('#choice_version input[name="ModelVersion"]').val(value)
+                $('#choice_version input[name="modelVersion"]').val(value)
                 loadModelFile(value);
             }
         })
@@ -464,26 +464,26 @@
          $('#choice_file').dropdown({
         onChange:function(value){
             console.log("model file:" + value);
-            $('#choice_file input[name="ModelFile"]').val(value)
+            $('#choice_file input[name="modelFile"]').val(value)
             }
         })
 
     })
 
     function srcEngineChanged(){
-        var ele = window.document.getElementById("SrcEngine");
+        var ele = window.document.getElementById("srcEngine");
         var index=ele.selectedIndex;
         var options=ele.options;
         var option = options[index];
-        console.log("SrcEngine value=" + option);
+        console.log("srcEngine value=" + option);
         let destFormatHtml = "<option name=\"ONNX\" value=\"0\">ONNX</option>";
         let netOutputFormatHtml = "<option name=\"FP32\" value=\"0\">FP32</option>";
         if(option==null || option =="undefined" || option.value == 0){
              destFormatHtml += "<option name=\"TensorRT\" value=\"1\">TensorRT</option>"
              netOutputFormatHtml += "<option name=\"FP16\" value=\"1\">FP16</option>";
         }
-        $('#DestFormat').html(destFormatHtml);
-        $('#NetOutputFormat').html(netOutputFormatHtml);
+        $('#destFormat').html(destFormatHtml);
+        $('#netOutputFormat').html(netOutputFormatHtml);
     }
    
     function loadModelList(){
@@ -550,25 +550,25 @@
             n_length = versionList.length
             let train_html=''
             for (let i=0;i<n_length;i++){
-                    train_html += `<div class="item" data-value="${versionList[i].ID}">${versionList[i].Version}</div>`
+                    train_html += `<div class="item" data-value="${versionList[i].id}">${versionList[i].version}</div>`
                     train_html += '</div>'
             }
             $("#model-version").append(train_html)
             
-            $('#choice_version .default.text').text(versionList[0].Version)
-            $('#choice_version input[name="ModelVersion"]').val(versionList[0].ID)
-            loadModelFile(versionList[0].ID);
+            $('#choice_version .default.text').text(versionList[0].version)
+            $('#choice_version input[name="modelVersion"]').val(versionList[0].id)
+            loadModelFile(versionList[0].id);
         }
         setEngineValue(value);
     }
     function setEngineValue(value){
-        $('#SrcEngine').dropdown('clear');
+        $('#srcEngine').dropdown('clear');
         console.log("setEngineValue value=" + value);
         let html = ""
         html +="<option name=\"PyTorch\" " + getSelected(0,value) +  " value=\"0\">PyTorch</option>";
         html +="<option name=\"TensorFlow\" " + getSelected(1,value) +  " value=\"1\">TensorFlow</option>";
         html +="<option name=\"MindSpore\" " + getSelected(2,value) +  " value=\"2\">MindSpore</option>";
-        $('#SrcEngine').html(html);
+        $('#srcEngine').html(html);
         srcEngineChanged();
     }
     function getSelected(engineOption, modelName){

From ae1cf98f7713aa8f33a2a2271994ef0f5c3b87d5 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Tue, 25 Oct 2022 15:08:28 +0800
Subject: [PATCH 028/187] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=A7=E5=B0=8F?=
 =?UTF-8?q?=E5=86=99=E9=97=AE=E9=A2=98=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 templates/repo/modelmanage/convertIndex.tmpl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/repo/modelmanage/convertIndex.tmpl b/templates/repo/modelmanage/convertIndex.tmpl
index cc334707e..25891dbda 100644
--- a/templates/repo/modelmanage/convertIndex.tmpl
+++ b/templates/repo/modelmanage/convertIndex.tmpl
@@ -93,7 +93,7 @@
                         <div class="ui grid stackable item">
                             <div class="row">
                                   <div class="three wide column padding0">
-                                    <a class="title" href="{{$.RepoLink}}/modelmanage/show_model_convert_info?ID={{.ID}}" title="{{.Name}}" style="font-size: 14px;">
+                                    <a class="title" href="{{$.RepoLink}}/modelmanage/show_model_convert_info?id={{.ID}}" title="{{.Name}}" style="font-size: 14px;">
                                         <span class="fitted" style="width: 90%;vertical-align: middle;">{{.Name}}</span>
                                     </a>
                                   </div>
@@ -141,7 +141,7 @@
                                        </form>
 
                                          {{if .IsCanOper}}
-                                            <a id="ai-download-{{.ID}}"  href="{{$.Repository.HTMLURL}}/modelmanage/download_model_convert/{{.ID}}?AllDownload=true&a=1" class='ui basic {{if eq .Status "SUCCEEDED" "COMPLETED"}}blue {{else}}disabled {{end}}button'  style="border-radius: .28571429rem;">
+                                            <a id="ai-download-{{.ID}}"  href="{{$.Repository.HTMLURL}}/modelmanage/download_model_convert/{{.ID}}?allDownload=true&a=1" class='ui basic {{if eq .Status "SUCCEEDED" "COMPLETED"}}blue {{else}}disabled {{end}}button'  style="border-radius: .28571429rem;">
                                                 {{$.i18n.Tr "repo.modelconvert.download"}}
                                             </a>
                                         {{else}}

From 26d8cae2622e041242f58efc3c1519b08446a546 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Tue, 25 Oct 2022 17:17:38 +0800
Subject: [PATCH 029/187] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=A7=E5=B0=8F?=
 =?UTF-8?q?=E5=86=99=E9=97=AE=E9=A2=98=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 templates/repo/modelmanage/convertIndex.tmpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/repo/modelmanage/convertIndex.tmpl b/templates/repo/modelmanage/convertIndex.tmpl
index 25891dbda..d21cd0abf 100644
--- a/templates/repo/modelmanage/convertIndex.tmpl
+++ b/templates/repo/modelmanage/convertIndex.tmpl
@@ -526,7 +526,7 @@
                 }
                 $("#model-file").append(file_html)
                 $('#choice_file .default.text').text(firstFileName)
-                $('#choice_file input[name="ModelFile"]').val(firstFileName)
+                $('#choice_file input[name="modelFile"]').val(firstFileName)
             })
 
         }

From f453610611c17722b13d731105d055d9134cc9a4 Mon Sep 17 00:00:00 2001
From: ychao_1983 <ychao_1983@sina.com>
Date: Tue, 25 Oct 2022 17:53:51 +0800
Subject: [PATCH 030/187] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 models/base_message.go                      |   6 ++
 options/locale/locale_en-US.ini             |   1 +
 options/locale/locale_zh-CN.ini             |   1 +
 routers/api/v1/repo/cloudbrain.go           |  46 +++++++-
 services/cloudbrain/cloudbrainTask/count.go |  22 ++--
 services/cloudbrain/cloudbrainTask/train.go | 112 ++++++++++++++++++++
 6 files changed, 175 insertions(+), 13 deletions(-)

diff --git a/models/base_message.go b/models/base_message.go
index f0fa19bf2..f76e18175 100644
--- a/models/base_message.go
+++ b/models/base_message.go
@@ -29,3 +29,9 @@ func BaseErrorMessageApi(message string) BaseMessageApi {
 		1, message,
 	}
 }
+
+type BaseMessageWithDataApi struct {
+	Code    int         `json:"code"`
+	Message string      `json:"message"`
+	Data    interface{} `json:"data"`
+}
diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index 324930544..ce80a31fe 100755
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -616,6 +616,7 @@ organization = Organizations
 uid = Uid
 u2f = Security Keys
 bind_wechat = Bind WeChat
+no_wechat_bind = Can not do the operation, please bind WeChat first.
 wechat_bind = WeChat Binding
 bind_account_information = Bind account information
 bind_time = Bind Time
diff --git a/options/locale/locale_zh-CN.ini b/options/locale/locale_zh-CN.ini
index fd5596a2e..fdbafd814 100755
--- a/options/locale/locale_zh-CN.ini
+++ b/options/locale/locale_zh-CN.ini
@@ -621,6 +621,7 @@ organization=组织
 uid=用户 ID
 u2f=安全密钥
 wechat_bind = 微信绑定
+no_wechat_bind = 不能创建任务，请先绑定微信。
 bind_wechat = 绑定微信
 bind_account_information = 绑定账号信息
 bind_time = 绑定时间
diff --git a/routers/api/v1/repo/cloudbrain.go b/routers/api/v1/repo/cloudbrain.go
index 58dd5b801..380de0ddb 100755
--- a/routers/api/v1/repo/cloudbrain.go
+++ b/routers/api/v1/repo/cloudbrain.go
@@ -33,6 +33,48 @@ import (
 	routerRepo "code.gitea.io/gitea/routers/repo"
 )
 
+func CloudBrainShow(ctx *context.APIContext) {
+
+	task, err := models.GetCloudbrainByJobID(ctx.Params(":jobid"))
+
+	if err != nil {
+		log.Info("error:" + err.Error())
+		ctx.JSON(http.StatusOK, models.BaseErrorMessageApi("repo.cloudbrain_query_fail"))
+		return
+	}
+	cloudbrainTask.PrepareSpec4Show(task)
+	task.ContainerIp = ""
+	if cloudbrainTask.IsTaskNotStop(task) {
+		cloudbrainTask.SyncTaskStatus(task)
+	}
+
+	if task.TrainJobDuration == "" {
+		if task.Duration == 0 {
+			var duration int64
+			if task.Status == string(models.JobWaiting) {
+				duration = 0
+			} else if task.Status == string(models.JobRunning) {
+				duration = time.Now().Unix() - int64(task.CreatedUnix)
+			} else {
+				duration = int64(task.UpdatedUnix) - int64(task.CreatedUnix)
+			}
+			task.Duration = duration
+		}
+		task.TrainJobDuration = models.ConvertDurationToStr(task.Duration)
+	}
+	//to unify  image output
+	if task.Type == models.TypeCloudBrainTwo || task.Type == models.TypeCDCenter {
+		task.ImageID = strconv.FormatInt(task.EngineID, 10)
+		task.Image = task.EngineName
+
+	} else if task.Type == models.TypeC2Net {
+		task.Image = task.EngineName
+	}
+
+	ctx.JSON(http.StatusOK, models.BaseMessageWithDataApi{Code: 0, Message: "", Data: task})
+
+}
+
 func CreateCloudBrain(ctx *context.APIContext, option api.CreateTrainJobOption) {
 
 	if option.Type == 2 {
@@ -47,10 +89,10 @@ func CreateCloudBrain(ctx *context.APIContext, option api.CreateTrainJobOption)
 func CreateCloudBrainInferenceTask(ctx *context.APIContext, option api.CreateTrainJobOption) {
 
 	if option.Type == 0 {
-		cloudbrainTask.GrampusTrainJobGpuCreate(ctx.Context, option)
+		cloudbrainTask.CloudBrainInferenceJobCreate(ctx.Context, option)
 	}
 	if option.Type == 1 {
-		cloudbrainTask.GrampusTrainJobNpuCreate(ctx.Context, option)
+		cloudbrainTask.ModelArtsInferenceJobCreate(ctx.Context, option)
 	}
 
 }
diff --git a/services/cloudbrain/cloudbrainTask/count.go b/services/cloudbrain/cloudbrainTask/count.go
index a9b254618..34b334445 100644
--- a/services/cloudbrain/cloudbrainTask/count.go
+++ b/services/cloudbrain/cloudbrainTask/count.go
@@ -14,28 +14,28 @@ type StatusInfo struct {
 	ComputeResource  string
 }
 
-var cloudbrainOneNotFinalStatuses = []string{string(models.JobWaiting), string(models.JobRunning)}
-var cloudbrainTwoNotFinalStatuses = []string{string(models.ModelArtsTrainJobInit), string(models.ModelArtsTrainJobImageCreating), string(models.ModelArtsTrainJobSubmitTrying), string(models.ModelArtsTrainJobWaiting), string(models.ModelArtsTrainJobRunning), string(models.ModelArtsTrainJobScaling), string(models.ModelArtsTrainJobCheckInit), string(models.ModelArtsTrainJobCheckRunning), string(models.ModelArtsTrainJobCheckRunningCompleted)}
-var grampusTwoNotFinalStatuses = []string{models.GrampusStatusWaiting, models.GrampusStatusRunning}
+var CloudbrainOneNotFinalStatuses = []string{string(models.JobWaiting), string(models.JobRunning)}
+var CloudbrainTwoNotFinalStatuses = []string{string(models.ModelArtsTrainJobInit), string(models.ModelArtsTrainJobImageCreating), string(models.ModelArtsTrainJobSubmitTrying), string(models.ModelArtsTrainJobWaiting), string(models.ModelArtsTrainJobRunning), string(models.ModelArtsTrainJobScaling), string(models.ModelArtsTrainJobCheckInit), string(models.ModelArtsTrainJobCheckRunning), string(models.ModelArtsTrainJobCheckRunningCompleted)}
+var GrampusNotFinalStatuses = []string{models.GrampusStatusWaiting, models.GrampusStatusRunning}
 var StatusInfoDict = map[string]StatusInfo{string(models.JobTypeDebug) + "-" + strconv.Itoa(models.TypeCloudBrainOne): {
 	CloudBrainTypes:  []int{models.TypeCloudBrainOne},
 	JobType:          []models.JobType{models.JobTypeDebug},
-	NotFinalStatuses: cloudbrainOneNotFinalStatuses,
+	NotFinalStatuses: CloudbrainOneNotFinalStatuses,
 	ComputeResource:  models.GPUResource,
 }, string(models.JobTypeTrain) + "-" + strconv.Itoa(models.TypeCloudBrainOne): {
 	CloudBrainTypes:  []int{models.TypeCloudBrainOne},
 	JobType:          []models.JobType{models.JobTypeTrain},
-	NotFinalStatuses: cloudbrainOneNotFinalStatuses,
+	NotFinalStatuses: CloudbrainOneNotFinalStatuses,
 	ComputeResource:  models.GPUResource,
 }, string(models.JobTypeInference) + "-" + strconv.Itoa(models.TypeCloudBrainOne): {
 	CloudBrainTypes:  []int{models.TypeCloudBrainOne},
 	JobType:          []models.JobType{models.JobTypeInference},
-	NotFinalStatuses: cloudbrainOneNotFinalStatuses,
+	NotFinalStatuses: CloudbrainOneNotFinalStatuses,
 	ComputeResource:  models.GPUResource,
 }, string(models.JobTypeBenchmark) + "-" + strconv.Itoa(models.TypeCloudBrainOne): {
 	CloudBrainTypes:  []int{models.TypeCloudBrainOne},
 	JobType:          []models.JobType{models.JobTypeBenchmark, models.JobTypeBrainScore, models.JobTypeSnn4imagenet},
-	NotFinalStatuses: cloudbrainOneNotFinalStatuses,
+	NotFinalStatuses: CloudbrainOneNotFinalStatuses,
 	ComputeResource:  models.GPUResource,
 }, string(models.JobTypeDebug) + "-" + strconv.Itoa(models.TypeCloudBrainTwo): {
 	CloudBrainTypes:  []int{models.TypeCloudBrainTwo, models.TypeCDCenter},
@@ -45,22 +45,22 @@ var StatusInfoDict = map[string]StatusInfo{string(models.JobTypeDebug) + "-" + s
 }, string(models.JobTypeTrain) + "-" + strconv.Itoa(models.TypeCloudBrainTwo): {
 	CloudBrainTypes:  []int{models.TypeCloudBrainTwo},
 	JobType:          []models.JobType{models.JobTypeTrain},
-	NotFinalStatuses: cloudbrainTwoNotFinalStatuses,
+	NotFinalStatuses: CloudbrainTwoNotFinalStatuses,
 	ComputeResource:  models.NPUResource,
 }, string(models.JobTypeInference) + "-" + strconv.Itoa(models.TypeCloudBrainTwo): {
 	CloudBrainTypes:  []int{models.TypeCloudBrainTwo},
 	JobType:          []models.JobType{models.JobTypeInference},
-	NotFinalStatuses: cloudbrainTwoNotFinalStatuses,
+	NotFinalStatuses: CloudbrainTwoNotFinalStatuses,
 	ComputeResource:  models.NPUResource,
 }, string(models.JobTypeTrain) + "-" + strconv.Itoa(models.TypeC2Net) + "-" + models.GPUResource: {
 	CloudBrainTypes:  []int{models.TypeC2Net},
 	JobType:          []models.JobType{models.JobTypeTrain},
-	NotFinalStatuses: grampusTwoNotFinalStatuses,
+	NotFinalStatuses: GrampusNotFinalStatuses,
 	ComputeResource:  models.GPUResource,
 }, string(models.JobTypeTrain) + "-" + strconv.Itoa(models.TypeC2Net) + "-" + models.NPUResource: {
 	CloudBrainTypes:  []int{models.TypeC2Net},
 	JobType:          []models.JobType{models.JobTypeTrain},
-	NotFinalStatuses: grampusTwoNotFinalStatuses,
+	NotFinalStatuses: GrampusNotFinalStatuses,
 	ComputeResource:  models.NPUResource,
 }}
 
diff --git a/services/cloudbrain/cloudbrainTask/train.go b/services/cloudbrain/cloudbrainTask/train.go
index d31038536..6f836557c 100644
--- a/services/cloudbrain/cloudbrainTask/train.go
+++ b/services/cloudbrain/cloudbrainTask/train.go
@@ -12,6 +12,10 @@ import (
 	"regexp"
 	"strings"
 
+	"code.gitea.io/gitea/modules/timeutil"
+
+	"code.gitea.io/gitea/modules/notification"
+
 	"code.gitea.io/gitea/modules/obs"
 
 	"code.gitea.io/gitea/modules/git"
@@ -680,3 +684,111 @@ func getPoolId() string {
 
 	return resourcePools.Info[0].ID
 }
+
+func PrepareSpec4Show(task *models.Cloudbrain) {
+	s, err := resource.GetCloudbrainSpec(task.ID)
+	if err != nil {
+		log.Info("error:" + err.Error())
+		return
+	}
+	task.Spec = s
+}
+
+func IsTaskNotStop(task *models.Cloudbrain) bool {
+	statuses := CloudbrainOneNotFinalStatuses
+	if task.Type == models.TypeCloudBrainTwo || task.Type == models.TypeCDCenter {
+		statuses = CloudbrainTwoNotFinalStatuses
+	} else {
+		statuses = GrampusNotFinalStatuses
+	}
+
+	for _, status := range statuses {
+		if task.Status == status {
+			return true
+		}
+	}
+	return false
+
+}
+
+func SyncTaskStatus(task *models.Cloudbrain) error {
+	if task.Type == models.TypeCloudBrainOne {
+		result, err := cloudbrain.GetJob(task.JobID)
+		if err != nil {
+			log.Info("error:" + err.Error())
+			return fmt.Errorf("repo.cloudbrain_query_fail")
+		}
+
+		if result != nil {
+			jobRes, _ := models.ConvertToJobResultPayload(result.Payload)
+			taskRoles := jobRes.TaskRoles
+			taskRes, _ := models.ConvertToTaskPod(taskRoles[cloudbrain.SubTaskName].(map[string]interface{}))
+
+			oldStatus := task.Status
+			task.Status = taskRes.TaskStatuses[0].State
+
+			task.ContainerID = taskRes.TaskStatuses[0].ContainerID
+			models.ParseAndSetDurationFromCloudBrainOne(jobRes, task)
+
+			if task.DeletedAt.IsZero() { //normal record
+				if oldStatus != task.Status {
+					notification.NotifyChangeCloudbrainStatus(task, oldStatus)
+				}
+				err = models.UpdateJob(task)
+				if err != nil {
+					return fmt.Errorf("repo.cloudbrain_query_fail")
+
+				}
+			}
+
+		} else {
+			log.Info("error:" + err.Error())
+			return fmt.Errorf("repo.cloudbrain_query_fail")
+		}
+	} else if task.Type == models.TypeCloudBrainTwo || task.Type == models.TypeCDCenter {
+		err := modelarts.HandleTrainJobInfo(task)
+		if err != nil {
+			return fmt.Errorf("repo.cloudbrain_query_fail")
+		}
+
+	} else if task.Type == models.TypeC2Net {
+		result, err := grampus.GetJob(task.JobID)
+		if err != nil {
+			log.Error("GetJob failed:" + err.Error())
+			return fmt.Errorf("repo.cloudbrain_query_fail")
+		}
+
+		if result != nil {
+			if len(result.JobInfo.Tasks[0].CenterID) == 1 && len(result.JobInfo.Tasks[0].CenterName) == 1 {
+				task.AiCenter = result.JobInfo.Tasks[0].CenterID[0] + "+" + result.JobInfo.Tasks[0].CenterName[0]
+			}
+			oldStatus := task.Status
+			task.Status = grampus.TransTrainJobStatus(result.JobInfo.Status)
+			if task.Status != result.JobInfo.Status || result.JobInfo.Status == models.GrampusStatusRunning {
+				task.Duration = result.JobInfo.RunSec
+				if task.Duration < 0 {
+					task.Duration = 0
+				}
+				task.TrainJobDuration = models.ConvertDurationToStr(task.Duration)
+
+				if task.StartTime == 0 && result.JobInfo.StartedAt > 0 {
+					task.StartTime = timeutil.TimeStamp(result.JobInfo.StartedAt)
+				}
+				if task.EndTime == 0 && models.IsTrainJobTerminal(task.Status) && task.StartTime > 0 {
+					task.EndTime = task.StartTime.Add(task.Duration)
+				}
+				task.CorrectCreateUnix()
+				if oldStatus != task.Status {
+					notification.NotifyChangeCloudbrainStatus(task, oldStatus)
+				}
+				err = models.UpdateJob(task)
+				if err != nil {
+					log.Error("UpdateJob failed:" + err.Error())
+					return fmt.Errorf("repo.cloudbrain_query_fail")
+				}
+			}
+		}
+	}
+	return nil
+
+}

From 9e513d2ad79dd33ddb030ee5d44e9242df976453 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Wed, 26 Oct 2022 10:59:25 +0800
Subject: [PATCH 031/187] =?UTF-8?q?=E6=8F=90=E4=BA=A4API=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/api/v1/api.go              |  5 +++
 routers/api/v1/repo/modelmanage.go | 53 +++++++++++++++++++++++-------
 routers/repo/ai_model_convert.go   | 29 ++++++++++++----
 3 files changed, 69 insertions(+), 18 deletions(-)

diff --git a/routers/api/v1/api.go b/routers/api/v1/api.go
index b3694ced9..b03db6327 100755
--- a/routers/api/v1/api.go
+++ b/routers/api/v1/api.go
@@ -966,6 +966,11 @@ func RegisterRoutes(m *macaron.Macaron) {
 					m.Post("/create_new_model", repo.CreateNewModel)
 					m.Get("/show_model_api", repo.ShowModelManageApi)
 					m.Delete("/delete_model", repo.DeleteModel)
+					m.Get("/downloadall", repo.DownloadModel)
+					m.Get("/query_model_for_predict", repo.QueryModelListForPredict)
+					m.Get("/query_modelfile_for_predict", repo.QueryModelFileForPredict)
+					m.Post("/create_model_convert", repo.CreateModelConvert)
+					m.Get("/show_model_convert_page")
 					m.Get("/:id", repo.GetCloudbrainModelConvertTask)
 					m.Get("/:id/log", repo.CloudbrainForModelConvertGetLog)
 					m.Get("/:id/modelartlog", repo.TrainJobForModelConvertGetLog)
diff --git a/routers/api/v1/repo/modelmanage.go b/routers/api/v1/repo/modelmanage.go
index fce7cd886..b32726997 100644
--- a/routers/api/v1/repo/modelmanage.go
+++ b/routers/api/v1/repo/modelmanage.go
@@ -1,30 +1,61 @@
 package repo
 
 import (
+	"net/http"
+
 	"code.gitea.io/gitea/modules/context"
 	"code.gitea.io/gitea/modules/log"
 	routerRepo "code.gitea.io/gitea/routers/repo"
 )
 
 func CreateNewModel(ctx *context.APIContext) {
-	log.Info("create new model by api.")
-	ctx.Context.SetParams("JobId", ctx.Query("jobId"))
-	ctx.Context.SetParams("VersionName", ctx.Query("versionName"))
-	ctx.Context.SetParams("Name", ctx.Query("name"))
-	ctx.Context.SetParams("Version", ctx.Query("version"))
-	ctx.Context.SetParams("Engine", ctx.Query("engine"))
-	ctx.Context.SetParams("modelSelectedFile", ctx.Query("modelSelectedFile"))
-	ctx.Context.SetParams("Label", ctx.Query("label"))
-	ctx.Context.SetParams("Description", ctx.Query("description"))
-
+	log.Info("CreateNewModel by api.")
 	routerRepo.SaveModel(ctx.Context)
-
 }
 
 func ShowModelManageApi(ctx *context.APIContext) {
+	log.Info("ShowModelManageApi by api.")
 	routerRepo.ShowModelPageInfo(ctx.Context)
 }
 
 func DeleteModel(ctx *context.APIContext) {
+	log.Info("DeleteModel by api.")
 	routerRepo.DeleteModel(ctx.Context)
 }
+
+func DownloadModel(ctx *context.APIContext) {
+	log.Info("DownloadModel by api.")
+	routerRepo.DownloadMultiModelFile(ctx.Context)
+}
+
+func QueryModelListForPredict(ctx *context.APIContext) {
+	log.Info("QueryModelListForPredict by api.")
+	routerRepo.QueryModelListForPredict(ctx.Context)
+}
+
+func QueryModelFileForPredict(ctx *context.APIContext) {
+	log.Info("QueryModelFileForPredict by api.")
+	routerRepo.QueryModelFileForPredict(ctx.Context)
+}
+
+func CreateModelConvert(ctx *context.APIContext) {
+	log.Info("CreateModelConvert by api.")
+	routerRepo.SaveModelConvert(ctx.Context)
+}
+
+func ShowModelConvertPage(ctx *context.APIContext) {
+	log.Info("ShowModelConvertPage by api.")
+	modelResult, count, err := routerRepo.GetModelConvertPageData(ctx.Context)
+	if err == nil {
+		mapInterface := make(map[string]interface{})
+		mapInterface["data"] = modelResult
+		mapInterface["count"] = count
+		ctx.JSON(http.StatusOK, mapInterface)
+	} else {
+		mapInterface := make(map[string]interface{})
+		mapInterface["data"] = nil
+		mapInterface["count"] = 0
+		ctx.JSON(http.StatusOK, mapInterface)
+	}
+
+}
diff --git a/routers/repo/ai_model_convert.go b/routers/repo/ai_model_convert.go
index 27ff0091f..959f4bc50 100644
--- a/routers/repo/ai_model_convert.go
+++ b/routers/repo/ai_model_convert.go
@@ -691,6 +691,26 @@ func ShowModelConvertPageInfo(ctx *context.Context) {
 		ctx.NotFound(ctx.Req.URL.RequestURI(), nil)
 		return
 	}
+	page := ctx.QueryInt("page")
+	if page <= 0 {
+		page = 1
+	}
+	pageSize := ctx.QueryInt("pageSize")
+	if pageSize <= 0 {
+		pageSize = setting.UI.IssuePagingNum
+	}
+	modelResult, count, err := GetModelConvertPageData(ctx)
+	if err == nil {
+		pager := context.NewPagination(int(count), page, pageSize, 5)
+		ctx.Data["Page"] = pager
+		ctx.Data["Tasks"] = modelResult
+		ctx.Data["MODEL_CONVERT_COUNT"] = count
+	} else {
+		ctx.ServerError("Query data error.", err)
+	}
+}
+
+func GetModelConvertPageData(ctx *context.Context) ([]*models.AiModelConvert, int64, error) {
 	page := ctx.QueryInt("page")
 	if page <= 0 {
 		page = 1
@@ -709,10 +729,8 @@ func ShowModelConvertPageInfo(ctx *context.Context) {
 	})
 	if err != nil {
 		log.Info("query db error." + err.Error())
-		ctx.ServerError("Cloudbrain", err)
-		return
+		return nil, 0, err
 	}
-	ctx.Data["MODEL_CONVERT_COUNT"] = count
 	userIds := make([]int64, len(modelResult))
 	for i, model := range modelResult {
 		model.IsCanOper = isOper(ctx, model.UserId)
@@ -727,10 +745,7 @@ func ShowModelConvertPageInfo(ctx *context.Context) {
 			model.UserRelAvatarLink = value.RelAvatarLink()
 		}
 	}
-	pager := context.NewPagination(int(count), page, pageSize, 5)
-	ctx.Data["Page"] = pager
-	ctx.Data["Tasks"] = modelResult
-
+	return modelResult, count, nil
 }
 
 func ModelConvertDownloadModel(ctx *context.Context) {

From ea48719bd528c978f14a5f984789f7974fa4f115 Mon Sep 17 00:00:00 2001
From: chenyifan01 <cyf_uestc@outlook.com>
Date: Wed, 26 Oct 2022 15:22:34 +0800
Subject: [PATCH 032/187] #3032 update specification query api

---
 models/resource_specification.go | 18 +++++++++---------
 routers/api/v1/repo/spec.go      |  8 ++++----
 routers/response/api_response.go | 30 ++++++++++++++++++++++++++++++
 3 files changed, 43 insertions(+), 13 deletions(-)
 create mode 100644 routers/response/api_response.go

diff --git a/models/resource_specification.go b/models/resource_specification.go
index f7a7dccbd..d69cd7208 100644
--- a/models/resource_specification.go
+++ b/models/resource_specification.go
@@ -209,15 +209,15 @@ func (s *Specification) ToShow() *SpecificationShow {
 }
 
 type SpecificationShow struct {
-	ID              int64
-	AccCardsNum     int
-	AccCardType     string
-	CpuCores        int
-	MemGiB          float32
-	GPUMemGiB       float32
-	ShareMemGiB     float32
-	ComputeResource string
-	UnitPrice       int
+	ID              int64   `json:"id"`
+	AccCardsNum     int     `json:"acc_cards_num"`
+	AccCardType     string  `json:"acc_card_type"`
+	CpuCores        int     `json:"cpu_cores"`
+	MemGiB          float32 `json:"mem_gi_b"`
+	GPUMemGiB       float32 `json:"gpu_mem_gi_b"`
+	ShareMemGiB     float32 `json:"share_mem_gi_b"`
+	ComputeResource string  `json:"compute_resource"`
+	UnitPrice       int     `json:"unit_price"`
 }
 
 func InsertResourceSpecification(r ResourceSpecification) (int64, error) {
diff --git a/routers/api/v1/repo/spec.go b/routers/api/v1/repo/spec.go
index 1fac207c9..a8aa28d98 100644
--- a/routers/api/v1/repo/spec.go
+++ b/routers/api/v1/repo/spec.go
@@ -15,7 +15,7 @@ func GetResourceSpec(ctx *context.APIContext) {
 	aiCenterCode := ctx.Query("center")
 	if jobType == "" || computeResource == "" || cluster == "" {
 		log.Info("GetResourceSpec api.param error")
-		ctx.JSON(200, response.ResponseBizError(response.PARAM_ERROR))
+		ctx.JSON(200, response.OuterBizError(response.PARAM_ERROR))
 		return
 	}
 	specs, err := resource.FindAvailableSpecs4Show(ctx.User.ID, models.FindSpecsOptions{
@@ -26,11 +26,11 @@ func GetResourceSpec(ctx *context.APIContext) {
 	})
 	if err != nil {
 		log.Error("GetResourceSpec api error. %v", err)
-		ctx.JSON(200, response.ResponseError(err))
+		ctx.JSON(200, response.OuterServerError(err.Error()))
 		return
 	}
 
 	specMap := make(map[string]interface{}, 0)
-	specMap["Specs"] = specs
-	ctx.JSON(200, response.SuccessWithData(specMap))
+	specMap["specs"] = specs
+	ctx.JSON(200, response.OuterSuccessWithData(specMap))
 }
diff --git a/routers/response/api_response.go b/routers/response/api_response.go
new file mode 100644
index 000000000..5cc6ff78e
--- /dev/null
+++ b/routers/response/api_response.go
@@ -0,0 +1,30 @@
+package response
+
+type AiforgeOuterResponse struct {
+	Code int         `json:"code"`
+	Msg  string      `json:"msg"`
+	Data interface{} `json:"data"`
+}
+
+func OuterSuccess() *AiforgeOuterResponse {
+	return &AiforgeOuterResponse{Code: RESPONSE_CODE_SUCCESS, Msg: RESPONSE_MSG_SUCCESS}
+}
+
+func OuterError(code int, msg string) *AiforgeOuterResponse {
+	return &AiforgeOuterResponse{Code: code, Msg: msg}
+}
+
+func OuterServerError(msg string) *AiforgeOuterResponse {
+	return &AiforgeOuterResponse{Code: RESPONSE_CODE_ERROR_DEFAULT, Msg: msg}
+}
+
+func OuterBizError(err *BizError) *AiforgeOuterResponse {
+	return &AiforgeOuterResponse{Code: err.Code, Msg: err.Err}
+}
+
+func OuterSuccessWithData(data interface{}) *AiforgeOuterResponse {
+	return &AiforgeOuterResponse{Code: RESPONSE_CODE_SUCCESS, Msg: RESPONSE_MSG_SUCCESS, Data: data}
+}
+func OuterErrorWithData(code int, msg string, data interface{}) *AiforgeOuterResponse {
+	return &AiforgeOuterResponse{Code: code, Msg: msg, Data: data}
+}

From 331d615412e4a2c63b00eea8054b5a7897eb3981 Mon Sep 17 00:00:00 2001
From: ychao_1983 <ychao_1983@sina.com>
Date: Wed, 26 Oct 2022 16:19:41 +0800
Subject: [PATCH 033/187] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 models/attachment.go          |  42 ++++++------
 models/dataset.go             |  40 ++++++------
 models/repo.go                | 120 +++++++++++++++++-----------------
 modules/structs/attachment.go |  47 +++++++++++++
 modules/structs/cloudbrain.go |  40 ++++++++++++
 5 files changed, 188 insertions(+), 101 deletions(-)

diff --git a/models/attachment.go b/models/attachment.go
index 5ebb6f0f3..2b5fa8efc 100755
--- a/models/attachment.go
+++ b/models/attachment.go
@@ -33,27 +33,27 @@ const (
 
 // Attachment represent a attachment of issue/comment/release.
 type Attachment struct {
-	ID              int64              `xorm:"pk autoincr" json:"id"`
-	UUID            string             `xorm:"uuid UNIQUE" json:"uuid"`
-	IssueID         int64              `xorm:"INDEX" json:"issueId"`
-	DatasetID       int64              `xorm:"INDEX DEFAULT 0" json:"datasetId"`
-	ReleaseID       int64              `xorm:"INDEX" json:"releaseId"`
-	UploaderID      int64              `xorm:"INDEX DEFAULT 0" json:"uploaderId"` // Notice: will be zero before this column added
-	CommentID       int64              `json:"commentId"`
-	Name            string             `json:"name"`
-	Description     string             `xorm:"TEXT" json:"description"`
-	DownloadCount   int64              `xorm:"DEFAULT 0" json:"downloadCount"`
-	UseNumber       int64              `xorm:"DEFAULT 0" json:"useNumber"`
-	Size            int64              `xorm:"DEFAULT 0" json:"size"`
-	IsPrivate       bool               `xorm:"DEFAULT false" json:"isPrivate"`
-	DecompressState int32              `xorm:"DEFAULT 0" json:"decompressState"`
-	Type            int                `xorm:"DEFAULT 0" json:"type"`
-	CreatedUnix     timeutil.TimeStamp `xorm:"created" json:"createdUnix"`
-
-	FileChunk *FileChunk `xorm:"-" json:"fileChunk"`
-	CanDel    bool       `xorm:"-" json:"canDel"`
-	Uploader  *User      `xorm:"-" json:"uploader"`
-	Md5       string     `xorm:"-" json:"md5"`
+	ID              int64  `xorm:"pk autoincr"`
+	UUID            string `xorm:"uuid UNIQUE"`
+	IssueID         int64  `xorm:"INDEX"`
+	DatasetID       int64  `xorm:"INDEX DEFAULT 0"`
+	ReleaseID       int64  `xorm:"INDEX"`
+	UploaderID      int64  `xorm:"INDEX DEFAULT 0"` // Notice: will be zero before this column added
+	CommentID       int64
+	Name            string
+	Description     string             `xorm:"TEXT"`
+	DownloadCount   int64              `xorm:"DEFAULT 0"`
+	UseNumber       int64              `xorm:"DEFAULT 0"`
+	Size            int64              `xorm:"DEFAULT 0"`
+	IsPrivate       bool               `xorm:"DEFAULT false"`
+	DecompressState int32              `xorm:"DEFAULT 0"`
+	Type            int                `xorm:"DEFAULT 0"`
+	CreatedUnix     timeutil.TimeStamp `xorm:"created"`
+
+	FileChunk *FileChunk `xorm:"-"`
+	CanDel    bool       `xorm:"-"`
+	Uploader  *User      `xorm:"-"`
+	Md5       string     `xorm:"-"`
 }
 
 type AttachmentUsername struct {
diff --git a/models/dataset.go b/models/dataset.go
index f3c2adbd5..972503641 100755
--- a/models/dataset.go
+++ b/models/dataset.go
@@ -21,26 +21,26 @@ const (
 )
 
 type Dataset struct {
-	ID            int64              `xorm:"pk autoincr" json:"id"`
-	Title         string             `xorm:"INDEX NOT NULL" json:"title"`
-	Status        int32              `xorm:"INDEX" json:"status"` // normal_private: 0, pulbic: 1, is_delete: 2
-	Category      string             `json:"category"`
-	Description   string             `xorm:"TEXT" json:"description"`
-	DownloadTimes int64              `json:"downloadTimes"`
-	UseCount      int64              `xorm:"DEFAULT 0" json:"useCount"`
-	NumStars      int                `xorm:"INDEX NOT NULL DEFAULT 0" json:"numStars"`
-	Recommend     bool               `xorm:"INDEX NOT NULL DEFAULT false" json:"recommend"`
-	License       string             `json:"license"`
-	Task          string             `json:"task"`
-	ReleaseID     int64              `xorm:"INDEX" json:"releaseId"`
-	UserID        int64              `xorm:"INDEX" json:"userId"`
-	RepoID        int64              `xorm:"INDEX" json:"repoId"`
-	Repo          *Repository        `xorm:"-" json:"repo"`
-	CreatedUnix   timeutil.TimeStamp `xorm:"INDEX created" json:"createdUnix"`
-	UpdatedUnix   timeutil.TimeStamp `xorm:"INDEX updated" json:"updatedUnix"`
-
-	User        *User         `xorm:"-" json:"user"`
-	Attachments []*Attachment `xorm:"-" json:"attachments"`
+	ID            int64  `xorm:"pk autoincr"`
+	Title         string `xorm:"INDEX NOT NULL""`
+	Status        int32  `xorm:"INDEX""` // normal_private: 0, pulbic: 1, is_delete: 2
+	Category      string
+	Description   string `xorm:"TEXT"`
+	DownloadTimes int64
+	UseCount      int64 `xorm:"DEFAULT 0"`
+	NumStars      int   `xorm:"INDEX NOT NULL DEFAULT 0"`
+	Recommend     bool  `xorm:"INDEX NOT NULL DEFAULT false"`
+	License       string
+	Task          string
+	ReleaseID     int64              `xorm:"INDEX"`
+	UserID        int64              `xorm:"INDEX"`
+	RepoID        int64              `xorm:"INDEX"`
+	Repo          *Repository        `xorm:"-"`
+	CreatedUnix   timeutil.TimeStamp `xorm:"INDEX created"`
+	UpdatedUnix   timeutil.TimeStamp `xorm:"INDEX updated"`
+
+	User        *User         `xorm:"-"`
+	Attachments []*Attachment `xorm:"-"`
 }
 
 type DatasetWithStar struct {
diff --git a/models/repo.go b/models/repo.go
index ccb0d680c..333492cee 100755
--- a/models/repo.go
+++ b/models/repo.go
@@ -162,79 +162,79 @@ const (
 
 // Repository represents a git repository.
 type Repository struct {
-	ID                  int64              `xorm:"pk autoincr" json:"id"`
-	OwnerID             int64              `xorm:"UNIQUE(s) index" json:"ownerId"`
-	OwnerName           string             `json:"ownerName"`
-	Owner               *User              `xorm:"-" json:"owner"`
-	LowerName           string             `xorm:"UNIQUE(s) INDEX NOT NULL" json:"lowerName"`
-	Name                string             `xorm:"INDEX NOT NULL" json:"name"`
-	Description         string             `xorm:"TEXT" json:"description"`
-	Website             string             `xorm:"VARCHAR(2048)" json:"website"`
-	OriginalServiceType api.GitServiceType `xorm:"index" json:"originalServiceType"`
-	OriginalURL         string             `xorm:"VARCHAR(2048)" json:"originalUrl"`
-	DefaultBranch       string             `json:"defaultBranch"`
-	CreatorID           int64              `xorm:"INDEX NOT NULL  DEFAULT 0" json:"creatorId"`
-	Creator             *User              `xorm:"-" json:"creator"`
-	NumWatches          int                `json:"numWatches"`
-	NumStars            int                `json:"numStars"`
-	NumForks            int                `json:"numForks"`
-	NumIssues           int                `json:"numIssues"`
-	NumClosedIssues     int                `json:"numClosedIssues"`
-	NumOpenIssues       int                `xorm:"-" json:"numOpenIssues"`
-	NumPulls            int                `json:"numPulls"`
-	NumClosedPulls      int                `json:"numClosedPulls"`
-	NumOpenPulls        int                `xorm:"-" json:"numOpenPulls"`
-	NumMilestones       int                `xorm:"NOT NULL DEFAULT 0" json:"numMilestones"`
-	NumClosedMilestones int                `xorm:"NOT NULL DEFAULT 0" json:"numClosedMilestones"`
-	NumOpenMilestones   int                `xorm:"-" json:"numOpenMilestones"`
-	NumCommit           int64              `xorm:"NOT NULL DEFAULT 0" json:"numCommit"`
-	RepoType            RepoType           `xorm:"NOT NULL DEFAULT 0" json:"repoType"`
-
-	IsPrivate  bool `xorm:"INDEX" json:"isPrivate"`
-	IsEmpty    bool `xorm:"INDEX" json:"isEmpty"`
-	IsArchived bool `xorm:"INDEX" json:"isArchived"`
-	IsMirror   bool `xorm:"INDEX" json:"isMirror"`
+	ID                  int64 `xorm:"pk autoincr"`
+	OwnerID             int64 `xorm:"UNIQUE(s) index"`
+	OwnerName           string
+	Owner               *User              `xorm:"-"`
+	LowerName           string             `xorm:"UNIQUE(s) INDEX NOT NULL"`
+	Name                string             `xorm:"INDEX NOT NULL"`
+	Description         string             `xorm:"TEXT"`
+	Website             string             `xorm:"VARCHAR(2048)"`
+	OriginalServiceType api.GitServiceType `xorm:"index"`
+	OriginalURL         string             `xorm:"VARCHAR(2048)"`
+	DefaultBranch       string
+	CreatorID           int64 `xorm:"INDEX NOT NULL  DEFAULT 0"`
+	Creator             *User `xorm:"-"`
+	NumWatches          int
+	NumStars            int
+	NumForks            int
+	NumIssues           int
+	NumClosedIssues     int
+	NumOpenIssues       int `xorm:"-"`
+	NumPulls            int
+	NumClosedPulls      int
+	NumOpenPulls        int      `xorm:"-"`
+	NumMilestones       int      `xorm:"NOT NULL DEFAULT 0"`
+	NumClosedMilestones int      `xorm:"NOT NULL DEFAULT 0"`
+	NumOpenMilestones   int      `xorm:"-"`
+	NumCommit           int64    `xorm:"NOT NULL DEFAULT 0"`
+	RepoType            RepoType `xorm:"NOT NULL DEFAULT 0"`
+
+	IsPrivate  bool `xorm:"INDEX"`
+	IsEmpty    bool `xorm:"INDEX"`
+	IsArchived bool `xorm:"INDEX"`
+	IsMirror   bool `xorm:"INDEX"`
 	*Mirror    `xorm:"-"`
-	Status     RepositoryStatus `xorm:"NOT NULL DEFAULT 0" json:"status"`
+	Status     RepositoryStatus `xorm:"NOT NULL DEFAULT 0"`
 
 	RenderingMetas  map[string]string `xorm:"-"`
-	Units           []*RepoUnit       `xorm:"-" json:"units"`
-	PrimaryLanguage *LanguageStat     `xorm:"-" json:"primaryLanguage"`
-
-	IsFork                          bool               `xorm:"INDEX NOT NULL DEFAULT false" json:"isFork"`
-	ForkID                          int64              `xorm:"INDEX" json:"forkId"`
-	BaseRepo                        *Repository        `xorm:"-" json:"baseRepo"`
-	IsTemplate                      bool               `xorm:"INDEX NOT NULL DEFAULT false" json:"isTemplate"`
-	TemplateID                      int64              `xorm:"INDEX" json:"templateId"`
-	TemplateRepo                    *Repository        `xorm:"-" json:"templateRepo"`
-	Size                            int64              `xorm:"NOT NULL DEFAULT 0" json:"size"`
-	CodeIndexerStatus               *RepoIndexerStatus `xorm:"-" json:"codeIndexerStatus"`
-	StatsIndexerStatus              *RepoIndexerStatus `xorm:"-" json:"statsIndexerStatus"`
-	IsFsckEnabled                   bool               `xorm:"NOT NULL DEFAULT true" json:"isFsckEnabled"`
-	CloseIssuesViaCommitInAnyBranch bool               `xorm:"NOT NULL DEFAULT false" json:"closeIssuesViaCommitInAnyBranch"`
-	Topics                          []string           `xorm:"TEXT JSON" json:"topics"`
+	Units           []*RepoUnit       `xorm:"-"`
+	PrimaryLanguage *LanguageStat     `xorm:"-"`
+
+	IsFork                          bool               `xorm:"INDEX NOT NULL DEFAULT false"`
+	ForkID                          int64              `xorm:"INDEX"`
+	BaseRepo                        *Repository        `xorm:"-"`
+	IsTemplate                      bool               `xorm:"INDEX NOT NULL DEFAULT false"`
+	TemplateID                      int64              `xorm:"INDEX"`
+	TemplateRepo                    *Repository        `xorm:"-"`
+	Size                            int64              `xorm:"NOT NULL DEFAULT 0"`
+	CodeIndexerStatus               *RepoIndexerStatus `xorm:"-"`
+	StatsIndexerStatus              *RepoIndexerStatus `xorm:"-"`
+	IsFsckEnabled                   bool               `xorm:"NOT NULL DEFAULT true"`
+	CloseIssuesViaCommitInAnyBranch bool               `xorm:"NOT NULL DEFAULT false"`
+	Topics                          []string           `xorm:"TEXT JSON"`
 
 	// Avatar: ID(10-20)-md5(32) - must fit into 64 symbols
-	Avatar string `xorm:"VARCHAR(64)" json:"avatar"`
+	Avatar string `xorm:"VARCHAR(64)"`
 
 	//blockchain
-	ContractAddress  string               `xorm:"INDEX" json:"contractAddress"`
-	Balance          string               `xorm:"NOT NULL DEFAULT '0'" json:"balance"`
-	BlockChainStatus RepoBlockChainStatus `xorm:"NOT NULL DEFAULT 0" json:"blockChainStatus"`
+	ContractAddress  string               `xorm:"INDEX"`
+	Balance          string               `xorm:"NOT NULL DEFAULT '0'"`
+	BlockChainStatus RepoBlockChainStatus `xorm:"NOT NULL DEFAULT 0"`
 
 	// git clone and git pull total count
-	CloneCnt int64 `xorm:"NOT NULL DEFAULT 0" json:"clone_cnt" json:"cloneCnt"`
+	CloneCnt int64 `xorm:"NOT NULL DEFAULT 0" json:"clone_cnt"`
 
 	// only git clone  total count
-	GitCloneCnt int64 `xorm:"NOT NULL DEFAULT 0" json:"git_clone_cnt" json:"gitCloneCnt"`
+	GitCloneCnt int64 `xorm:"NOT NULL DEFAULT 0" json:"git_clone_cnt"`
 
-	CreatedUnix timeutil.TimeStamp `xorm:"INDEX created" json:"createdUnix"`
-	UpdatedUnix timeutil.TimeStamp `xorm:"INDEX updated" json:"updatedUnix"`
+	CreatedUnix timeutil.TimeStamp `xorm:"INDEX created"`
+	UpdatedUnix timeutil.TimeStamp `xorm:"INDEX updated"`
 
-	Hot        int64  `xorm:"-" json:"hot"`
-	Active     int64  `xorm:"-" json:"active"`
-	Alias      string `xorm:"INDEX" json:"alias"`
-	LowerAlias string `xorm:"INDEX" json:"lowerAlias"`
+	Hot        int64  `xorm:"-"`
+	Active     int64  `xorm:"-"`
+	Alias      string `xorm:"INDEX"`
+	LowerAlias string `xorm:"INDEX"`
 }
 
 type RepositoryShow struct {
diff --git a/modules/structs/attachment.go b/modules/structs/attachment.go
index 0f3c2ed6a..3ccc2742a 100755
--- a/modules/structs/attachment.go
+++ b/modules/structs/attachment.go
@@ -6,6 +6,8 @@ package structs // import "code.gitea.io/gitea/modules/structs"
 
 import (
 	"time"
+
+	"code.gitea.io/gitea/modules/timeutil"
 )
 
 // Attachment a generic attachment
@@ -27,3 +29,48 @@ type Attachment struct {
 type EditAttachmentOptions struct {
 	Name string `json:"name"`
 }
+
+type Dataset struct {
+	ID            int64              `json:"id"`
+	Title         string             `json:"title"`
+	Status        int32              `json:"status"`
+	Category      string             `json:"category"`
+	Description   string             `json:"description"`
+	DownloadTimes int64              `json:"downloadTimes"`
+	UseCount      int64              `json:"useCount"`
+	NumStars      int                `json:"numStars"`
+	Recommend     bool               `json:"recommend"`
+	License       string             `json:"license"`
+	Task          string             `json:"task"`
+	ReleaseID     int64              `json:"releaseId"`
+	UserID        int64              `json:"userId"`
+	RepoID        int64              `json:"repoId"`
+	Repo          *RepositoryShow    `json:"repo"`
+	CreatedUnix   timeutil.TimeStamp `json:"createdUnix"`
+	UpdatedUnix   timeutil.TimeStamp `json:"updatedUnix"`
+
+	Attachments []*AttachmentShow `json:"attachments"`
+}
+
+type RepositoryShow struct {
+	OwnerName string `json:"ownerName"`
+	Name      string `json:"name"`
+}
+
+type AttachmentShow struct {
+	ID              int64              `json:"id"`
+	UUID            string             `json:"uuid"`
+	DatasetID       int64              `json:"datasetId"`
+	ReleaseID       int64              `json:"releaseId"`
+	UploaderID      int64              `json:"uploaderId"`
+	CommentID       int64              `json:"commentId"`
+	Name            string             `json:"name"`
+	Description     string             `json:"description"`
+	DownloadCount   int64              `json:"downloadCount"`
+	UseNumber       int64              `json:"useNumber"`
+	Size            int64              `json:"size"`
+	IsPrivate       bool               `json:"isPrivate"`
+	DecompressState int32              `json:"decompressState"`
+	Type            int                `json:"type"`
+	CreatedUnix     timeutil.TimeStamp `json:"createdUnix"`
+}
diff --git a/modules/structs/cloudbrain.go b/modules/structs/cloudbrain.go
index 0d2576e7e..e0409b340 100644
--- a/modules/structs/cloudbrain.go
+++ b/modules/structs/cloudbrain.go
@@ -1,5 +1,10 @@
 package structs
 
+import (
+	"code.gitea.io/gitea/models"
+	"code.gitea.io/gitea/modules/timeutil"
+)
+
 type CreateGrampusTrainJobOption struct {
 	DisplayJobName   string `json:"display_job_name" binding:"Required"`
 	JobName          string `json:"job_name" binding:"Required" `
@@ -40,3 +45,38 @@ type CreateTrainJobOption struct {
 	PreTrainModelUrl string `json:"pre_train_model_url"`
 	SpecId           int64  `json:"spec_id" binding:"Required"`
 }
+
+type Cloudbrain struct {
+	ID               int64              `json:"id"`
+	JobID            string             `json:"job_id"`
+	JobType          string             `json:"job_type"`
+	Type             int                `json:"type"`
+	DisplayJobName   string             `json:"display_job_name"`
+	Status           string             `json:"status"`
+	CreatedUnix      timeutil.TimeStamp `json:"created_unix"`
+	RepoID           int64              `json:"repo_id"`
+	Duration         int64              `json:"duration"` //运行时长 单位秒
+	TrainJobDuration string             `json:"train_job_duration"`
+	ImageID          string             `json:"image_id"` //grampus image_id
+	Image            string             `json:"image"`
+	Uuid             string             `json:"uuid"` //数据集id
+	DatasetName      string             `json:"dataset_name"`
+	ComputeResource  string             `json:"compute_resource"` //计算资源，例如npu
+	AiCenter         string             `json:"ai_center"`        //grampus ai center: center_id+center_name
+	BranchName       string             `json:"branch_name"`      //分支名称
+	Parameters       string             `json:"parameters"`       //传给modelarts的param参数
+	BootFile         string             `json:"boot_file"`        //启动文件
+	Description      string             `json:"description"`      //描述
+	ModelName        string             `json:"model_name"`       //模型名称
+	ModelVersion     string             `json:"model_version"`    //模型版本
+	CkptName         string             `json:"ckpt_name"`        //权重文件名称
+
+	VersionCount    int                `json:"-"` //任务的当前版本数量，不包括删除的
+	IsLatestVersion string             `json:"-"` //是否是最新版本，1是，0否
+	CommitID        string             `json:"-"` //提交的仓库代码id
+	PreVersionName  string             `json:"-"` //父版本名称
+	StartTime       timeutil.TimeStamp `json:"start_time"`
+	EndTime         timeutil.TimeStamp `json:"end_time"`
+
+	Spec *models.Specification `json:"spec"`
+}

From a2332f6219487b2f7908d9c9cf8b06cb3893f637 Mon Sep 17 00:00:00 2001
From: ychao_1983 <ychao_1983@sina.com>
Date: Thu, 27 Oct 2022 09:19:54 +0800
Subject: [PATCH 034/187] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 models/resource_specification.go              |  26 -----
 modules/convert/cloudbrain.go                 | 103 ++++++++++++++++++
 modules/structs/attachment.go                 |  66 ++++++-----
 modules/structs/cloudbrain.go                 |  72 ++++++------
 routers/api/v1/api.go                         |  29 ++++-
 routers/api/v1/repo/attachments.go            |  25 +++++
 routers/api/v1/repo/cloudbrain.go             |   4 +-
 routers/api/v1/repo/datasets.go               |  13 ++-
 .../resource/resource_specification.go        |  21 ++--
 9 files changed, 248 insertions(+), 111 deletions(-)
 create mode 100644 modules/convert/cloudbrain.go
 create mode 100644 routers/api/v1/repo/attachments.go

diff --git a/models/resource_specification.go b/models/resource_specification.go
index d69cd7208..2da8d015d 100644
--- a/models/resource_specification.go
+++ b/models/resource_specification.go
@@ -194,32 +194,6 @@ func (Specification) TableName() string {
 	return "resource_specification"
 }
 
-func (s *Specification) ToShow() *SpecificationShow {
-	return &SpecificationShow{
-		ID:              s.ID,
-		AccCardsNum:     s.AccCardsNum,
-		AccCardType:     s.AccCardType,
-		CpuCores:        s.CpuCores,
-		MemGiB:          s.MemGiB,
-		GPUMemGiB:       s.GPUMemGiB,
-		ShareMemGiB:     s.ShareMemGiB,
-		ComputeResource: s.ComputeResource,
-		UnitPrice:       s.UnitPrice,
-	}
-}
-
-type SpecificationShow struct {
-	ID              int64   `json:"id"`
-	AccCardsNum     int     `json:"acc_cards_num"`
-	AccCardType     string  `json:"acc_card_type"`
-	CpuCores        int     `json:"cpu_cores"`
-	MemGiB          float32 `json:"mem_gi_b"`
-	GPUMemGiB       float32 `json:"gpu_mem_gi_b"`
-	ShareMemGiB     float32 `json:"share_mem_gi_b"`
-	ComputeResource string  `json:"compute_resource"`
-	UnitPrice       int     `json:"unit_price"`
-}
-
 func InsertResourceSpecification(r ResourceSpecification) (int64, error) {
 	return x.Insert(&r)
 }
diff --git a/modules/convert/cloudbrain.go b/modules/convert/cloudbrain.go
new file mode 100644
index 000000000..7df38ee05
--- /dev/null
+++ b/modules/convert/cloudbrain.go
@@ -0,0 +1,103 @@
+package convert
+
+import (
+	"code.gitea.io/gitea/models"
+	api "code.gitea.io/gitea/modules/structs"
+)
+
+func ToCloudBrain(task *models.Cloudbrain) *api.Cloudbrain {
+	return &api.Cloudbrain{
+		ID:               task.ID,
+		JobID:            task.JobID,
+		JobType:          task.JobType,
+		Type:             task.Type,
+		DisplayJobName:   task.DisplayJobName,
+		Status:           task.Status,
+		CreatedUnix:      int64(task.CreatedUnix),
+		RepoID:           task.RepoID,
+		Duration:         task.Duration,
+		TrainJobDuration: task.TrainJobDuration,
+		ImageID:          task.ImageID,
+		Image:            task.Image,
+		Uuid:             task.Uuid,
+		DatasetName:      task.DatasetName,
+		ComputeResource:  task.ComputeResource,
+		AiCenter:         task.AiCenter,
+		BranchName:       task.BranchName,
+		Parameters:       task.Parameters,
+		BootFile:         task.BootFile,
+		Description:      task.Description,
+		ModelName:        task.ModelName,
+
+		ModelVersion: task.ModelVersion,
+		CkptName:     task.CkptName,
+
+		StartTime: int64(task.StartTime),
+		EndTime:   int64(task.EndTime),
+
+		Spec: ToSpecification(task.Spec),
+	}
+}
+func ToAttachment(attachment *models.Attachment) *api.AttachmentShow {
+	return &api.AttachmentShow{
+		ID:              attachment.ID,
+		UUID:            attachment.UUID,
+		DatasetID:       attachment.DatasetID,
+		ReleaseID:       attachment.ReleaseID,
+		UploaderID:      attachment.UploaderID,
+		CommentID:       attachment.CommentID,
+		Name:            attachment.Name,
+		Description:     attachment.Description,
+		DownloadCount:   attachment.DownloadCount,
+		UseNumber:       attachment.UseNumber,
+		Size:            attachment.Size,
+		IsPrivate:       attachment.IsPrivate,
+		DecompressState: attachment.DecompressState,
+		Type:            attachment.Type,
+		CreatedUnix:     int64(attachment.CreatedUnix),
+	}
+}
+
+func ToDataset(dataset *models.Dataset) *api.Dataset {
+	var convertAttachments []*api.AttachmentShow
+	for _, attachment := range dataset.Attachments {
+		convertAttachments = append(convertAttachments, ToAttachment(attachment))
+	}
+	return &api.Dataset{
+		ID:            dataset.ID,
+		Title:         dataset.Title,
+		Status:        dataset.Status,
+		Category:      dataset.Category,
+		Description:   dataset.Description,
+		DownloadTimes: dataset.DownloadTimes,
+		UseCount:      dataset.UseCount,
+		NumStars:      dataset.NumStars,
+		Recommend:     dataset.Recommend,
+		License:       dataset.License,
+		Task:          dataset.Task,
+		ReleaseID:     dataset.ReleaseID,
+		UserID:        dataset.UserID,
+		RepoID:        dataset.RepoID,
+		Repo: &api.RepositoryShow{
+			OwnerName: dataset.Repo.OwnerName,
+			Name:      dataset.Repo.Name,
+		},
+		CreatedUnix: int64(dataset.CreatedUnix),
+		UpdatedUnix: int64(dataset.UpdatedUnix),
+		Attachments: convertAttachments,
+	}
+}
+
+func ToSpecification(s *models.Specification) *api.SpecificationShow {
+	return &api.SpecificationShow{
+		ID:              s.ID,
+		AccCardsNum:     s.AccCardsNum,
+		AccCardType:     s.AccCardType,
+		CpuCores:        s.CpuCores,
+		MemGiB:          s.MemGiB,
+		GPUMemGiB:       s.GPUMemGiB,
+		ShareMemGiB:     s.ShareMemGiB,
+		ComputeResource: s.ComputeResource,
+		UnitPrice:       s.UnitPrice,
+	}
+}
diff --git a/modules/structs/attachment.go b/modules/structs/attachment.go
index 3ccc2742a..4a0f8feec 100755
--- a/modules/structs/attachment.go
+++ b/modules/structs/attachment.go
@@ -6,8 +6,6 @@ package structs // import "code.gitea.io/gitea/modules/structs"
 
 import (
 	"time"
-
-	"code.gitea.io/gitea/modules/timeutil"
 )
 
 // Attachment a generic attachment
@@ -31,23 +29,23 @@ type EditAttachmentOptions struct {
 }
 
 type Dataset struct {
-	ID            int64              `json:"id"`
-	Title         string             `json:"title"`
-	Status        int32              `json:"status"`
-	Category      string             `json:"category"`
-	Description   string             `json:"description"`
-	DownloadTimes int64              `json:"downloadTimes"`
-	UseCount      int64              `json:"useCount"`
-	NumStars      int                `json:"numStars"`
-	Recommend     bool               `json:"recommend"`
-	License       string             `json:"license"`
-	Task          string             `json:"task"`
-	ReleaseID     int64              `json:"releaseId"`
-	UserID        int64              `json:"userId"`
-	RepoID        int64              `json:"repoId"`
-	Repo          *RepositoryShow    `json:"repo"`
-	CreatedUnix   timeutil.TimeStamp `json:"createdUnix"`
-	UpdatedUnix   timeutil.TimeStamp `json:"updatedUnix"`
+	ID            int64           `json:"id"`
+	Title         string          `json:"title"`
+	Status        int32           `json:"status"`
+	Category      string          `json:"category"`
+	Description   string          `json:"description"`
+	DownloadTimes int64           `json:"downloadTimes"`
+	UseCount      int64           `json:"useCount"`
+	NumStars      int             `json:"numStars"`
+	Recommend     bool            `json:"recommend"`
+	License       string          `json:"license"`
+	Task          string          `json:"task"`
+	ReleaseID     int64           `json:"releaseId"`
+	UserID        int64           `json:"userId"`
+	RepoID        int64           `json:"repoId"`
+	Repo          *RepositoryShow `json:"repo"`
+	CreatedUnix   int64           `json:"createdUnix"`
+	UpdatedUnix   int64           `json:"updatedUnix"`
 
 	Attachments []*AttachmentShow `json:"attachments"`
 }
@@ -58,19 +56,19 @@ type RepositoryShow struct {
 }
 
 type AttachmentShow struct {
-	ID              int64              `json:"id"`
-	UUID            string             `json:"uuid"`
-	DatasetID       int64              `json:"datasetId"`
-	ReleaseID       int64              `json:"releaseId"`
-	UploaderID      int64              `json:"uploaderId"`
-	CommentID       int64              `json:"commentId"`
-	Name            string             `json:"name"`
-	Description     string             `json:"description"`
-	DownloadCount   int64              `json:"downloadCount"`
-	UseNumber       int64              `json:"useNumber"`
-	Size            int64              `json:"size"`
-	IsPrivate       bool               `json:"isPrivate"`
-	DecompressState int32              `json:"decompressState"`
-	Type            int                `json:"type"`
-	CreatedUnix     timeutil.TimeStamp `json:"createdUnix"`
+	ID              int64  `json:"id"`
+	UUID            string `json:"uuid"`
+	DatasetID       int64  `json:"datasetId"`
+	ReleaseID       int64  `json:"releaseId"`
+	UploaderID      int64  `json:"uploaderId"`
+	CommentID       int64  `json:"commentId"`
+	Name            string `json:"name"`
+	Description     string `json:"description"`
+	DownloadCount   int64  `json:"downloadCount"`
+	UseNumber       int64  `json:"useNumber"`
+	Size            int64  `json:"size"`
+	IsPrivate       bool   `json:"isPrivate"`
+	DecompressState int32  `json:"decompressState"`
+	Type            int    `json:"type"`
+	CreatedUnix     int64  `json:"createdUnix"`
 }
diff --git a/modules/structs/cloudbrain.go b/modules/structs/cloudbrain.go
index e0409b340..b29d7e722 100644
--- a/modules/structs/cloudbrain.go
+++ b/modules/structs/cloudbrain.go
@@ -1,10 +1,5 @@
 package structs
 
-import (
-	"code.gitea.io/gitea/models"
-	"code.gitea.io/gitea/modules/timeutil"
-)
-
 type CreateGrampusTrainJobOption struct {
 	DisplayJobName   string `json:"display_job_name" binding:"Required"`
 	JobName          string `json:"job_name" binding:"Required" `
@@ -47,36 +42,43 @@ type CreateTrainJobOption struct {
 }
 
 type Cloudbrain struct {
-	ID               int64              `json:"id"`
-	JobID            string             `json:"job_id"`
-	JobType          string             `json:"job_type"`
-	Type             int                `json:"type"`
-	DisplayJobName   string             `json:"display_job_name"`
-	Status           string             `json:"status"`
-	CreatedUnix      timeutil.TimeStamp `json:"created_unix"`
-	RepoID           int64              `json:"repo_id"`
-	Duration         int64              `json:"duration"` //运行时长 单位秒
-	TrainJobDuration string             `json:"train_job_duration"`
-	ImageID          string             `json:"image_id"` //grampus image_id
-	Image            string             `json:"image"`
-	Uuid             string             `json:"uuid"` //数据集id
-	DatasetName      string             `json:"dataset_name"`
-	ComputeResource  string             `json:"compute_resource"` //计算资源，例如npu
-	AiCenter         string             `json:"ai_center"`        //grampus ai center: center_id+center_name
-	BranchName       string             `json:"branch_name"`      //分支名称
-	Parameters       string             `json:"parameters"`       //传给modelarts的param参数
-	BootFile         string             `json:"boot_file"`        //启动文件
-	Description      string             `json:"description"`      //描述
-	ModelName        string             `json:"model_name"`       //模型名称
-	ModelVersion     string             `json:"model_version"`    //模型版本
-	CkptName         string             `json:"ckpt_name"`        //权重文件名称
+	ID               int64  `json:"id"`
+	JobID            string `json:"job_id"`
+	JobType          string `json:"job_type"`
+	Type             int    `json:"type"`
+	DisplayJobName   string `json:"display_job_name"`
+	Status           string `json:"status"`
+	CreatedUnix      int64  `json:"created_unix"`
+	RepoID           int64  `json:"repo_id"`
+	Duration         int64  `json:"duration"` //运行时长 单位秒
+	TrainJobDuration string `json:"train_job_duration"`
+	ImageID          string `json:"image_id"` //grampus image_id
+	Image            string `json:"image"`
+	Uuid             string `json:"uuid"` //数据集id
+	DatasetName      string `json:"dataset_name"`
+	ComputeResource  string `json:"compute_resource"` //计算资源，例如npu
+	AiCenter         string `json:"ai_center"`        //grampus ai center: center_id+center_name
+	BranchName       string `json:"branch_name"`      //分支名称
+	Parameters       string `json:"parameters"`       //传给modelarts的param参数
+	BootFile         string `json:"boot_file"`        //启动文件
+	Description      string `json:"description"`      //描述
+	ModelName        string `json:"model_name"`       //模型名称
+	ModelVersion     string `json:"model_version"`    //模型版本
+	CkptName         string `json:"ckpt_name"`        //权重文件名称
+	StartTime        int64  `json:"start_time"`
+	EndTime          int64  `json:"end_time"`
 
-	VersionCount    int                `json:"-"` //任务的当前版本数量，不包括删除的
-	IsLatestVersion string             `json:"-"` //是否是最新版本，1是，0否
-	CommitID        string             `json:"-"` //提交的仓库代码id
-	PreVersionName  string             `json:"-"` //父版本名称
-	StartTime       timeutil.TimeStamp `json:"start_time"`
-	EndTime         timeutil.TimeStamp `json:"end_time"`
+	Spec *SpecificationShow `json:"spec"`
+}
 
-	Spec *models.Specification `json:"spec"`
+type SpecificationShow struct {
+	ID              int64   `json:"id"`
+	AccCardsNum     int     `json:"acc_cards_num"`
+	AccCardType     string  `json:"acc_card_type"`
+	CpuCores        int     `json:"cpu_cores"`
+	MemGiB          float32 `json:"mem_gi_b"`
+	GPUMemGiB       float32 `json:"gpu_mem_gi_b"`
+	ShareMemGiB     float32 `json:"share_mem_gi_b"`
+	ComputeResource string  `json:"compute_resource"`
+	UnitPrice       int     `json:"unit_price"`
 }
diff --git a/routers/api/v1/api.go b/routers/api/v1/api.go
index 857d810f8..9f8ddd5b5 100755
--- a/routers/api/v1/api.go
+++ b/routers/api/v1/api.go
@@ -242,6 +242,15 @@ func reqRepoWriter(unitTypes ...models.UnitType) macaron.Handler {
 	}
 }
 
+func reqWeChat() macaron.Handler {
+	return func(ctx *context.Context) {
+		if setting.WechatAuthSwitch && ctx.User.WechatOpenId == "" {
+			ctx.JSON(http.StatusForbidden, models.BaseErrorMessageApi("settings.no_wechat_bind"))
+			return
+		}
+	}
+}
+
 // reqRepoReader user should have specific read permission or be a repo admin or a site admin
 func reqRepoReader(unitType models.UnitType) macaron.Handler {
 	return func(ctx *context.Context) {
@@ -526,6 +535,16 @@ func RegisterRoutes(m *macaron.Macaron) {
 
 		}, reqToken())
 
+		m.Group("/attachments", func() {
+
+			m.Get("/:uuid", repo.GetAttachment)
+			m.Get("/get_chunks", repo.GetSuccessChunks)
+			m.Get("/new_multipart", repo.NewMultipart)
+			m.Get("/get_multipart_url", repo.GetMultipartUploadUrl)
+			m.Post("/complete_multipart", repo.CompleteMultipart)
+
+		}, reqToken())
+
 		// Notifications
 		m.Group("/notifications", func() {
 			m.Combo("").
@@ -982,15 +1001,17 @@ func RegisterRoutes(m *macaron.Macaron) {
 				}, reqRepoReader(models.UnitTypeModelManage))
 				m.Group("/cloudbrain", func() {
 					m.Group("/train-job", func() {
-						m.Post("/create", bind(api.CreateTrainJobOption{}), repo.CreateCloudBrain)
+						m.Get("/:jobid", reqRepoReader(models.UnitTypeCloudBrain), repo.CloudBrainShow)
+
+						m.Post("/create", reqRepoWriter(models.UnitTypeCloudBrain), reqWeChat, bind(api.CreateTrainJobOption{}), repo.CreateCloudBrain)
 
 					})
 					m.Group("/inference-job", func() {
-						m.Post("/create", bind(api.CreateTrainJobOption{}), repo.CreateCloudBrainInferenceTask)
-
+						m.Post("/create", reqRepoWriter(models.UnitTypeCloudBrain), reqWeChat, bind(api.CreateTrainJobOption{}), repo.CreateCloudBrainInferenceTask)
+						m.Get("/:jobid", reqRepoReader(models.UnitTypeCloudBrain), repo.CloudBrainShow)
 					})
 
-				}, reqRepoReader(models.UnitTypeCloudBrain))
+				}, reqToken())
 				m.Group("/modelarts", func() {
 					m.Group("/notebook", func() {
 						//m.Get("/:jobid", repo.GetModelArtsNotebook)
diff --git a/routers/api/v1/repo/attachments.go b/routers/api/v1/repo/attachments.go
new file mode 100644
index 000000000..cb36ba2ee
--- /dev/null
+++ b/routers/api/v1/repo/attachments.go
@@ -0,0 +1,25 @@
+package repo
+
+import (
+	"code.gitea.io/gitea/modules/context"
+	routeRepo "code.gitea.io/gitea/routers/repo"
+)
+
+func GetSuccessChunks(ctx *context.APIContext) {
+	routeRepo.GetSuccessChunks(ctx.Context)
+}
+
+func NewMultipart(ctx *context.APIContext) {
+	routeRepo.NewMultipart(ctx.Context)
+}
+func GetMultipartUploadUrl(ctx *context.APIContext) {
+	routeRepo.GetMultipartUploadUrl(ctx.Context)
+}
+
+func CompleteMultipart(ctx *context.APIContext) {
+	routeRepo.CompleteMultipart(ctx.Context)
+
+}
+func GetAttachment(ctx *context.APIContext) {
+	routeRepo.GetAttachment(ctx.Context)
+}
diff --git a/routers/api/v1/repo/cloudbrain.go b/routers/api/v1/repo/cloudbrain.go
index 380de0ddb..7092a1f02 100755
--- a/routers/api/v1/repo/cloudbrain.go
+++ b/routers/api/v1/repo/cloudbrain.go
@@ -16,6 +16,8 @@ import (
 	"strings"
 	"time"
 
+	"code.gitea.io/gitea/modules/convert"
+
 	"code.gitea.io/gitea/services/cloudbrain/cloudbrainTask"
 
 	api "code.gitea.io/gitea/modules/structs"
@@ -71,7 +73,7 @@ func CloudBrainShow(ctx *context.APIContext) {
 		task.Image = task.EngineName
 	}
 
-	ctx.JSON(http.StatusOK, models.BaseMessageWithDataApi{Code: 0, Message: "", Data: task})
+	ctx.JSON(http.StatusOK, models.BaseMessageWithDataApi{Code: 0, Message: "", Data: convert.ToCloudBrain(task)})
 
 }
 
diff --git a/routers/api/v1/repo/datasets.go b/routers/api/v1/repo/datasets.go
index 0539a22e9..0223cf740 100644
--- a/routers/api/v1/repo/datasets.go
+++ b/routers/api/v1/repo/datasets.go
@@ -4,6 +4,10 @@ import (
 	"fmt"
 	"strings"
 
+	"code.gitea.io/gitea/modules/convert"
+
+	api "code.gitea.io/gitea/modules/structs"
+
 	"code.gitea.io/gitea/models"
 	"code.gitea.io/gitea/modules/context"
 	"code.gitea.io/gitea/modules/log"
@@ -88,15 +92,20 @@ func datasetMultiple(ctx *context.APIContext, opts *models.SearchDatasetOptions)
 		ctx.JSON(200, map[string]interface{}{
 			"code":    1,
 			"message": err.Error(),
-			"data":    []*models.Dataset{},
+			"data":    []*api.Dataset{},
 			"count":   0,
 		})
 		return
 	}
+	var convertDatasets []*api.Dataset
+	for _, dataset := range datasets {
+		convertDatasets = append(convertDatasets, convert.ToDataset(dataset))
+	}
+
 	ctx.JSON(200, map[string]interface{}{
 		"code":    0,
 		"message": "",
-		"data":    datasets,
+		"data":    convertDatasets,
 		"count":   count,
 	})
 }
diff --git a/services/cloudbrain/resource/resource_specification.go b/services/cloudbrain/resource/resource_specification.go
index c0b20b21a..93abb2923 100644
--- a/services/cloudbrain/resource/resource_specification.go
+++ b/services/cloudbrain/resource/resource_specification.go
@@ -1,20 +1,23 @@
 package resource
 
 import (
+	"encoding/json"
+	"errors"
+	"fmt"
+	"strconv"
+	"strings"
+	"time"
+
 	"code.gitea.io/gitea/models"
 	"code.gitea.io/gitea/modules/cloudbrain"
+	"code.gitea.io/gitea/modules/convert"
 	"code.gitea.io/gitea/modules/grampus"
 	"code.gitea.io/gitea/modules/log"
 	"code.gitea.io/gitea/modules/modelarts"
 	"code.gitea.io/gitea/modules/setting"
+	api "code.gitea.io/gitea/modules/structs"
 	"code.gitea.io/gitea/routers/response"
 	"code.gitea.io/gitea/services/admin/operate_log"
-	"encoding/json"
-	"errors"
-	"fmt"
-	"strconv"
-	"strings"
-	"time"
 )
 
 func AddResourceSpecification(doerId int64, req models.ResourceSpecificationReq) error {
@@ -210,14 +213,14 @@ func FindAvailableSpecs(userId int64, opts models.FindSpecsOptions) ([]*models.S
 	return specs, err
 }
 
-func FindAvailableSpecs4Show(userId int64, opts models.FindSpecsOptions) ([]*models.SpecificationShow, error) {
+func FindAvailableSpecs4Show(userId int64, opts models.FindSpecsOptions) ([]*api.SpecificationShow, error) {
 	specs, err := FindAvailableSpecs(userId, opts)
 	if err != nil {
 		return nil, err
 	}
-	result := make([]*models.SpecificationShow, len(specs))
+	result := make([]*api.SpecificationShow, len(specs))
 	for i, v := range specs {
-		result[i] = v.ToShow()
+		result[i] = convert.ToSpecification(v)
 	}
 	return result, nil
 }

From 6cea45e40a7fc9cf3aad5c57d2120d4e40982f25 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Fri, 28 Oct 2022 09:17:03 +0800
Subject: [PATCH 035/187] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=A8=A1=E5=9E=8B?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9=E6=88=90=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E6=96=87=E6=A1=A3=E7=9A=84=E6=96=B9=E5=BC=8F=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/api/v1/repo/modelmanage.go | 25 ++++++++++++++++++++++++-
 routers/repo/ai_model_manage.go    | 12 +++++++-----
 2 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/routers/api/v1/repo/modelmanage.go b/routers/api/v1/repo/modelmanage.go
index b32726997..b404558a1 100644
--- a/routers/api/v1/repo/modelmanage.go
+++ b/routers/api/v1/repo/modelmanage.go
@@ -8,6 +8,15 @@ import (
 	routerRepo "code.gitea.io/gitea/routers/repo"
 )
 
+type FileInfo struct {
+	FileName string `json:"fileName"`
+	ModTime  string `json:"modTime"`
+	IsDir    bool   `json:"isDir"`
+	Size     int64  `json:"size"`
+	ParenDir string `json:"parenDir"`
+	UUID     string `json:"uuid"`
+}
+
 func CreateNewModel(ctx *context.APIContext) {
 	log.Info("CreateNewModel by api.")
 	routerRepo.SaveModel(ctx.Context)
@@ -35,7 +44,21 @@ func QueryModelListForPredict(ctx *context.APIContext) {
 
 func QueryModelFileForPredict(ctx *context.APIContext) {
 	log.Info("QueryModelFileForPredict by api.")
-	routerRepo.QueryModelFileForPredict(ctx.Context)
+	id := ctx.Query("id")
+	result := routerRepo.QueryModelFileByID(id)
+	re := make([]FileInfo, len(result))
+	for _, file := range result {
+		tmpFile := FileInfo{
+			FileName: file.FileName,
+			ModTime:  file.ModTime,
+			IsDir:    file.IsDir,
+			Size:     file.Size,
+			ParenDir: file.ParenDir,
+			UUID:     file.UUID,
+		}
+		re = append(re, tmpFile)
+	}
+	ctx.JSON(http.StatusOK, re)
 }
 
 func CreateModelConvert(ctx *context.APIContext) {
diff --git a/routers/repo/ai_model_manage.go b/routers/repo/ai_model_manage.go
index 6385cc674..45c21d719 100644
--- a/routers/repo/ai_model_manage.go
+++ b/routers/repo/ai_model_manage.go
@@ -910,23 +910,25 @@ func QueryModelFileForPredict(ctx *context.Context) {
 	if id == "" {
 		id = ctx.Query("ID")
 	}
+	ctx.JSON(http.StatusOK, QueryModelFileByID(id))
+}
+
+func QueryModelFileByID(id string) []storage.FileInfo {
 	model, err := models.QueryModelById(id)
 	if err == nil {
 		if model.Type == models.TypeCloudBrainTwo {
 			prefix := model.Path[len(setting.Bucket)+1:]
 			fileinfos, _ := storage.GetAllObjectByBucketAndPrefix(setting.Bucket, prefix)
-			ctx.JSON(http.StatusOK, fileinfos)
+			return fileinfos
 		} else if model.Type == models.TypeCloudBrainOne {
 			prefix := model.Path[len(setting.Attachment.Minio.Bucket)+1:]
 			fileinfos, _ := storage.GetAllObjectByBucketAndPrefixMinio(setting.Attachment.Minio.Bucket, prefix)
-			ctx.JSON(http.StatusOK, fileinfos)
+			return fileinfos
 		}
 	} else {
 		log.Error("no such model!", err.Error())
-		ctx.ServerError("no such model:", err)
-		return
 	}
-
+	return nil
 }
 
 func QueryOneLevelModelFile(ctx *context.Context) {

From 187eec79b2f8cdc961944f1fb20f0b405832f510 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Mon, 31 Oct 2022 09:45:41 +0800
Subject: [PATCH 036/187] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/api/v1/api.go              |  1 +
 routers/api/v1/repo/modelmanage.go |  5 +++
 routers/repo/ai_model_manage.go    | 49 ++++++++++++++++++++----------
 3 files changed, 39 insertions(+), 16 deletions(-)

diff --git a/routers/api/v1/api.go b/routers/api/v1/api.go
index 9f8ddd5b5..5ecbf3a5f 100755
--- a/routers/api/v1/api.go
+++ b/routers/api/v1/api.go
@@ -990,6 +990,7 @@ func RegisterRoutes(m *macaron.Macaron) {
 					m.Get("/show_model_api", repo.ShowModelManageApi)
 					m.Delete("/delete_model", repo.DeleteModel)
 					m.Get("/downloadall", repo.DownloadModel)
+					m.Get("/query_model_byId", repo.QueryModelById)
 					m.Get("/query_model_for_predict", repo.QueryModelListForPredict)
 					m.Get("/query_modelfile_for_predict", repo.QueryModelFileForPredict)
 					m.Post("/create_model_convert", repo.CreateModelConvert)
diff --git a/routers/api/v1/repo/modelmanage.go b/routers/api/v1/repo/modelmanage.go
index b404558a1..253d51e00 100644
--- a/routers/api/v1/repo/modelmanage.go
+++ b/routers/api/v1/repo/modelmanage.go
@@ -37,6 +37,11 @@ func DownloadModel(ctx *context.APIContext) {
 	routerRepo.DownloadMultiModelFile(ctx.Context)
 }
 
+func QueryModelById(ctx *context.APIContext) {
+	log.Info("QueryModelById by api.")
+	routerRepo.QueryModelById(ctx.Context)
+}
+
 func QueryModelListForPredict(ctx *context.APIContext) {
 	log.Info("QueryModelListForPredict by api.")
 	routerRepo.QueryModelListForPredict(ctx.Context)
diff --git a/routers/repo/ai_model_manage.go b/routers/repo/ai_model_manage.go
index 45c21d719..ca90ff432 100644
--- a/routers/repo/ai_model_manage.go
+++ b/routers/repo/ai_model_manage.go
@@ -33,13 +33,13 @@ const (
 	STATUS_ERROR           = 2
 )
 
-func saveModelByParameters(jobId string, versionName string, name string, version string, label string, description string, engine int, ctx *context.Context) error {
+func saveModelByParameters(jobId string, versionName string, name string, version string, label string, description string, engine int, ctx *context.Context) (string, error) {
 	aiTask, err := models.GetCloudbrainByJobIDAndVersionName(jobId, versionName)
 	if err != nil {
 		aiTask, err = models.GetRepoCloudBrainByJobID(ctx.Repo.Repository.ID, jobId)
 		if err != nil {
 			log.Info("query task error." + err.Error())
-			return err
+			return "", err
 		} else {
 			log.Info("query gpu train task.")
 		}
@@ -55,7 +55,7 @@ func saveModelByParameters(jobId string, versionName string, name string, versio
 	if len(aimodels) > 0 {
 		for _, model := range aimodels {
 			if model.Version == version {
-				return errors.New(ctx.Tr("repo.model.manage.create_error"))
+				return "", errors.New(ctx.Tr("repo.model.manage.create_error"))
 			}
 			if model.New == MODEL_LATEST {
 				lastNewModelId = model.ID
@@ -113,7 +113,7 @@ func saveModelByParameters(jobId string, versionName string, name string, versio
 
 	err = models.SaveModelToDb(model)
 	if err != nil {
-		return err
+		return "", err
 	}
 	if len(lastNewModelId) > 0 {
 		//udpate status and version count
@@ -136,7 +136,7 @@ func saveModelByParameters(jobId string, versionName string, name string, versio
 
 	log.Info("save model end.")
 	notification.NotifyOtherTask(ctx.User, ctx.Repo.Repository, id, name, models.ActionCreateNewModelTask)
-	return nil
+	return id, nil
 }
 
 func asyncToCopyModel(aiTask *models.Cloudbrain, id string, modelSelectedFile string) {
@@ -206,29 +206,33 @@ func SaveModel(ctx *context.Context) {
 	engine := ctx.QueryInt("engine")
 	modelSelectedFile := ctx.Query("modelSelectedFile")
 	log.Info("engine=" + fmt.Sprint(engine) + " modelSelectedFile=" + modelSelectedFile)
-
+	re := map[string]string{
+		"code": "-1",
+	}
 	if JobId == "" || VersionName == "" {
-		ctx.Error(500, fmt.Sprintf("JobId or VersionName is null."))
+		re["msg"] = "JobId or VersionName is null."
+		ctx.JSON(200, re)
 		return
 	}
 	if modelSelectedFile == "" {
-		ctx.Error(500, fmt.Sprintf("Not selected model file."))
+		re["msg"] = "Not selected model file."
+		ctx.JSON(200, re)
 		return
 	}
-
 	if name == "" || version == "" {
-		ctx.Error(500, fmt.Sprintf("name or version is null."))
+		re["msg"] = "name or version is null."
+		ctx.JSON(200, re)
 		return
 	}
-
-	err := saveModelByParameters(JobId, VersionName, name, version, label, description, engine, ctx)
-
+	id, err := saveModelByParameters(JobId, VersionName, name, version, label, description, engine, ctx)
 	if err != nil {
 		log.Info("save model error." + err.Error())
-		ctx.Error(500, fmt.Sprintf("save model error. %v", err))
-		return
+		re["msg"] = err.Error()
+	} else {
+		re["code"] = "0"
+		re["id"] = id
 	}
-	ctx.Status(200)
+	ctx.JSON(200, re)
 	log.Info("save model end.")
 }
 
@@ -632,6 +636,19 @@ func ShowModelInfo(ctx *context.Context) {
 	ctx.HTML(200, tplModelInfo)
 }
 
+func QueryModelById(ctx *context.Context) {
+	id := ctx.Query("id")
+	model, err := models.QueryModelById(id)
+	if err == nil {
+		model.IsCanOper = isOper(ctx, model.UserId)
+		model.IsCanDelete = isCanDelete(ctx, model.UserId)
+		removeIpInfo(model)
+		ctx.JSON(http.StatusOK, model)
+	} else {
+		ctx.JSON(http.StatusNotFound, nil)
+	}
+}
+
 func ShowSingleModel(ctx *context.Context) {
 	name := ctx.Query("name")
 

From a4873ff88a40081e6fc3ec20d9cf1e589ad28104 Mon Sep 17 00:00:00 2001
From: ychao_1983 <ychao_1983@sina.com>
Date: Mon, 31 Oct 2022 15:30:05 +0800
Subject: [PATCH 037/187] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/modelarts/modelarts.go              |  16 +-
 routers/api/v1/repo/cloudbrain.go           |  10 +-
 routers/repo/modelarts.go                   |   2 +-
 services/cloudbrain/cloudbrainTask/train.go | 421 +++++++++++++++++++-
 4 files changed, 427 insertions(+), 22 deletions(-)

diff --git a/modules/modelarts/modelarts.go b/modules/modelarts/modelarts.go
index 4158174cb..e94dd4ad9 100755
--- a/modules/modelarts/modelarts.go
+++ b/modules/modelarts/modelarts.go
@@ -348,7 +348,7 @@ func GenerateNotebook2(ctx *context.Context, displayJobName, jobName, uuid, desc
 	return nil
 }
 
-func GenerateTrainJob(ctx *context.Context, req *GenerateTrainJobReq) (err error) {
+func GenerateTrainJob(ctx *context.Context, req *GenerateTrainJobReq) (jobId string, err error) {
 	createTime := timeutil.TimeStampNow()
 	var jobResult *models.CreateTrainJobResult
 	var createErr error
@@ -408,17 +408,17 @@ func GenerateTrainJob(ctx *context.Context, req *GenerateTrainJobReq) (err error
 			})
 			if errTemp != nil {
 				log.Error("InsertCloudbrainTemp failed: %v", errTemp.Error())
-				return errTemp
+				return "", errTemp
 			}
 		}
-		return createErr
+		return "", createErr
 	}
-	jobId := strconv.FormatInt(jobResult.JobID, 10)
+	jobID := strconv.FormatInt(jobResult.JobID, 10)
 	createErr = models.CreateCloudbrain(&models.Cloudbrain{
 		Status:            TransTrainJobStatus(jobResult.Status),
 		UserID:            ctx.User.ID,
 		RepoID:            ctx.Repo.Repository.ID,
-		JobID:             jobId,
+		JobID:             jobID,
 		JobName:           req.JobName,
 		DisplayJobName:    req.DisplayJobName,
 		JobType:           string(models.JobTypeTrain),
@@ -456,10 +456,10 @@ func GenerateTrainJob(ctx *context.Context, req *GenerateTrainJobReq) (err error
 
 	if createErr != nil {
 		log.Error("CreateCloudbrain(%s) failed:%v", req.DisplayJobName, createErr.Error())
-		return createErr
+		return "", createErr
 	}
-	notification.NotifyOtherTask(ctx.User, ctx.Repo.Repository, jobId, req.DisplayJobName, models.ActionCreateTrainTask)
-	return nil
+	notification.NotifyOtherTask(ctx.User, ctx.Repo.Repository, jobID, req.DisplayJobName, models.ActionCreateTrainTask)
+	return jobID, nil
 }
 
 func GenerateModelConvertTrainJob(req *GenerateTrainJobReq) (*models.CreateTrainJobResult, error) {
diff --git a/routers/api/v1/repo/cloudbrain.go b/routers/api/v1/repo/cloudbrain.go
index 7092a1f02..649e33956 100755
--- a/routers/api/v1/repo/cloudbrain.go
+++ b/routers/api/v1/repo/cloudbrain.go
@@ -78,11 +78,17 @@ func CloudBrainShow(ctx *context.APIContext) {
 }
 
 func CreateCloudBrain(ctx *context.APIContext, option api.CreateTrainJobOption) {
+	if option.Type == cloudbrainTask.TaskTypeCloudbrainOne {
+		cloudbrainTask.CloudbrainOneTrainJobCreate(ctx.Context, option)
+	}
+	if option.Type == cloudbrainTask.TaskTypeModelArts {
+		cloudbrainTask.ModelArtsTrainJobNpuCreate(ctx.Context, option)
+	}
 
-	if option.Type == 2 {
+	if option.Type == cloudbrainTask.TaskTypeGrampusGPU {
 		cloudbrainTask.GrampusTrainJobGpuCreate(ctx.Context, option)
 	}
-	if option.Type == 3 {
+	if option.Type == cloudbrainTask.TaskTypeGrampusNPU {
 		cloudbrainTask.GrampusTrainJobNpuCreate(ctx.Context, option)
 	}
 
diff --git a/routers/repo/modelarts.go b/routers/repo/modelarts.go
index d187b211a..e4e73f716 100755
--- a/routers/repo/modelarts.go
+++ b/routers/repo/modelarts.go
@@ -1230,7 +1230,7 @@ func TrainJobCreate(ctx *context.Context, form auth.CreateModelArtsTrainJobForm)
 		return
 	}
 
-	err = modelarts.GenerateTrainJob(ctx, req)
+	_, err = modelarts.GenerateTrainJob(ctx, req)
 	if err != nil {
 		log.Error("GenerateTrainJob failed:%v", err.Error())
 		trainJobNewDataPrepare(ctx)
diff --git a/services/cloudbrain/cloudbrainTask/train.go b/services/cloudbrain/cloudbrainTask/train.go
index 6f836557c..5e2cce1ff 100644
--- a/services/cloudbrain/cloudbrainTask/train.go
+++ b/services/cloudbrain/cloudbrainTask/train.go
@@ -10,6 +10,7 @@ import (
 	"os"
 	"path"
 	"regexp"
+	"strconv"
 	"strings"
 
 	"code.gitea.io/gitea/modules/timeutil"
@@ -39,6 +40,277 @@ import (
 
 var jobNamePattern = regexp.MustCompile(`^[a-z0-9][a-z0-9-_]{1,34}[a-z0-9-]$`)
 
+const TaskTypeCloudbrainOne = 0
+const TaskTypeModelArts = 1
+const TaskTypeGrampusGPU = 2
+const TaskTypeGrampusNPU = 3
+
+func CloudbrainOneTrainJobCreate(ctx *context.Context, option api.CreateTrainJobOption) {
+
+	displayJobName := option.DisplayJobName
+	jobName := util.ConvertDisplayJobNameToJobName(displayJobName)
+	image := strings.TrimSpace(option.Image)
+	uuids := option.Attachment
+	jobType := string(models.JobTypeTrain)
+
+	codePath := setting.JobPath + jobName + cloudbrain.CodeMountPath
+	branchName := option.BranchName
+	repo := ctx.Repo.Repository
+
+	lock := redis_lock.NewDistributeLock(redis_key.CloudbrainBindingJobNameKey(fmt.Sprint(repo.ID), jobType, displayJobName))
+	defer lock.UnLock()
+	spec, datasetInfos, datasetNames, err := checkParameters(ctx, option, lock, repo)
+	if err != nil {
+		ctx.JSON(http.StatusOK, models.BaseErrorMessageApi(err.Error()))
+		return
+	}
+
+	command, err := getTrainJobCommand(option)
+	if err != nil {
+		log.Error("getTrainJobCommand failed: %v", err)
+		ctx.JSON(http.StatusOK, models.BaseErrorMessageApi(err.Error()))
+		return
+	}
+
+	errStr := loadCodeAndMakeModelPath(repo, codePath, branchName, jobName, cloudbrain.ModelMountPath)
+	if errStr != "" {
+		ctx.JSON(http.StatusOK, models.BaseErrorMessageApi(ctx.Tr(errStr)))
+		return
+	}
+
+	commitID, _ := ctx.Repo.GitRepo.GetBranchCommitID(branchName)
+
+	req := cloudbrain.GenerateCloudBrainTaskReq{
+		Ctx:                  ctx,
+		DisplayJobName:       displayJobName,
+		JobName:              jobName,
+		Image:                image,
+		Command:              command,
+		Uuids:                uuids,
+		DatasetNames:         datasetNames,
+		DatasetInfos:         datasetInfos,
+		CodePath:             storage.GetMinioPath(jobName, cloudbrain.CodeMountPath+"/"),
+		ModelPath:            storage.GetMinioPath(jobName, cloudbrain.ModelMountPath+"/"),
+		BenchmarkPath:        storage.GetMinioPath(jobName, cloudbrain.BenchMarkMountPath+"/"),
+		Snn4ImageNetPath:     storage.GetMinioPath(jobName, cloudbrain.Snn4imagenetMountPath+"/"),
+		BrainScorePath:       storage.GetMinioPath(jobName, cloudbrain.BrainScoreMountPath+"/"),
+		JobType:              jobType,
+		Description:          option.Description,
+		BranchName:           branchName,
+		BootFile:             option.BootFile,
+		Params:               option.Params,
+		CommitID:             commitID,
+		BenchmarkTypeID:      0,
+		BenchmarkChildTypeID: 0,
+		ResultPath:           storage.GetMinioPath(jobName, cloudbrain.ResultPath+"/"),
+		Spec:                 spec,
+	}
+
+	if option.ModelName != "" { //使用预训练模型训练
+		req.ModelName = option.ModelName
+		req.LabelName = option.LabelName
+		req.CkptName = option.CkptName
+		req.ModelVersion = option.ModelVersion
+		req.PreTrainModelPath = setting.Attachment.Minio.RealPath + option.PreTrainModelUrl
+		req.PreTrainModelUrl = option.PreTrainModelUrl
+
+	}
+
+	jobId, err := cloudbrain.GenerateTask(req)
+	if err != nil {
+		ctx.JSON(http.StatusOK, models.BaseErrorMessageApi(err.Error()))
+		return
+	}
+	ctx.JSON(http.StatusOK, models.BaseMessageApi{
+		Code:    0,
+		Message: jobId,
+	})
+}
+func ModelArtsTrainJobNpuCreate(ctx *context.Context, option api.CreateTrainJobOption) {
+	VersionOutputPath := modelarts.GetOutputPathByCount(modelarts.TotalVersionCount)
+	displayJobName := option.DisplayJobName
+	jobName := util.ConvertDisplayJobNameToJobName(displayJobName)
+	uuid := option.Attachment
+	description := option.Description
+	workServerNumber := option.WorkServerNumber
+	engineID, _ := strconv.Atoi(option.ImageID)
+	bootFile := strings.TrimSpace(option.BootFile)
+	params := option.Params
+	repo := ctx.Repo.Repository
+	codeLocalPath := setting.JobPath + jobName + modelarts.CodePath
+	codeObsPath := "/" + setting.Bucket + modelarts.JobPath + jobName + modelarts.CodePath + VersionOutputPath + "/"
+	outputObsPath := "/" + setting.Bucket + modelarts.JobPath + jobName + modelarts.OutputPath + VersionOutputPath + "/"
+	logObsPath := "/" + setting.Bucket + modelarts.JobPath + jobName + modelarts.LogPath + VersionOutputPath + "/"
+	branchName := option.BranchName
+	isLatestVersion := modelarts.IsLatestVersion
+	VersionCount := modelarts.VersionCountOne
+	EngineName := option.Image
+
+	errStr := checkMultiNode(ctx.User.ID, option.WorkServerNumber)
+	if errStr != "" {
+		ctx.JSON(http.StatusOK, models.BaseErrorMessageApi(ctx.Tr(errStr)))
+		return
+	}
+
+	lock := redis_lock.NewDistributeLock(redis_key.CloudbrainBindingJobNameKey(fmt.Sprint(repo.ID), string(models.JobTypeTrain), displayJobName))
+	defer lock.UnLock()
+
+	spec, _, _, err := checkParameters(ctx, option, lock, repo)
+	if err != nil {
+		ctx.JSON(http.StatusOK, models.BaseErrorMessageApi(err.Error()))
+		return
+	}
+
+	//todo: del the codeLocalPath
+	_, err = ioutil.ReadDir(codeLocalPath)
+	if err == nil {
+		os.RemoveAll(codeLocalPath)
+	}
+
+	gitRepo, _ := git.OpenRepository(repo.RepoPath())
+	commitID, _ := gitRepo.GetBranchCommitID(branchName)
+
+	if err := downloadCode(repo, codeLocalPath, branchName); err != nil {
+		log.Error("downloadCode failed, server timed out: %s (%v)", repo.FullName(), err)
+		ctx.JSON(http.StatusOK, models.BaseErrorMessageApi(ctx.Tr("cloudbrain.load_code_failed")))
+		return
+	}
+
+	//todo: upload code (send to file_server todo this work?)
+	if err := obsMkdir(setting.CodePathPrefix + jobName + modelarts.OutputPath + VersionOutputPath + "/"); err != nil {
+		log.Error("Failed to obsMkdir_output: %s (%v)", repo.FullName(), err)
+		ctx.JSON(http.StatusOK, models.BaseErrorMessageApi("Failed to obsMkdir_output"))
+		return
+	}
+
+	if err := obsMkdir(setting.CodePathPrefix + jobName + modelarts.LogPath + VersionOutputPath + "/"); err != nil {
+		log.Error("Failed to obsMkdir_log: %s (%v)", repo.FullName(), err)
+		ctx.JSON(http.StatusOK, models.BaseErrorMessageApi("Failed to obsMkdir_log"))
+		return
+	}
+
+	parentDir := VersionOutputPath + "/"
+	if err := uploadCodeToObs(codeLocalPath, jobName, parentDir); err != nil {
+		// if err := uploadCodeToObs(codeLocalPath, jobName, parentDir); err != nil {
+		log.Error("Failed to uploadCodeToObs: %s (%v)", repo.FullName(), err)
+		ctx.JSON(http.StatusOK, models.BaseErrorMessageApi(ctx.Tr("cloudbrain.load_code_failed")))
+		return
+	}
+
+	var parameters models.Parameters
+	param := make([]models.Parameter, 0)
+	existDeviceTarget := false
+	if len(params) != 0 {
+		err := json.Unmarshal([]byte(params), &parameters)
+		if err != nil {
+			log.Error("Failed to Unmarshal params: %s (%v)", params, err)
+			ctx.JSON(http.StatusOK, models.BaseErrorMessageApi("运行参数错误"))
+			return
+		}
+
+		for _, parameter := range parameters.Parameter {
+			if parameter.Label == modelarts.DeviceTarget {
+				existDeviceTarget = true
+			}
+			if parameter.Label != modelarts.TrainUrl && parameter.Label != modelarts.DataUrl {
+				param = append(param, models.Parameter{
+					Label: parameter.Label,
+					Value: parameter.Value,
+				})
+			}
+		}
+	}
+	if !existDeviceTarget {
+		param = append(param, models.Parameter{
+			Label: modelarts.DeviceTarget,
+			Value: modelarts.Ascend,
+		})
+	}
+	datasUrlList, dataUrl, datasetNames, isMultiDataset, err := getDatasUrlListByUUIDS(uuid)
+	if err != nil {
+		log.Error("Failed to getDatasUrlListByUUIDS: %v", err)
+		ctx.JSON(http.StatusOK, models.BaseErrorMessageApi("Failed to getDatasUrlListByUUIDS:"+err.Error()))
+		return
+	}
+	dataPath := dataUrl
+	jsondatas, err := json.Marshal(datasUrlList)
+	if err != nil {
+		log.Error("Failed to Marshal: %v", err)
+		ctx.JSON(http.StatusOK, models.BaseErrorMessageApi("json error:"+err.Error()))
+		return
+	}
+	if isMultiDataset {
+		param = append(param, models.Parameter{
+			Label: modelarts.MultiDataUrl,
+			Value: string(jsondatas),
+		})
+	}
+	if option.ModelName != "" { //使用预训练模型训练
+		ckptUrl := "/" + option.PreTrainModelUrl + option.CkptName
+		param = append(param, models.Parameter{
+			Label: modelarts.CkptUrl,
+			Value: "s3:/" + ckptUrl,
+		})
+	}
+
+	req := &modelarts.GenerateTrainJobReq{
+		JobName:           jobName,
+		DisplayJobName:    displayJobName,
+		DataUrl:           dataPath,
+		Description:       description,
+		CodeObsPath:       codeObsPath,
+		BootFileUrl:       codeObsPath + bootFile,
+		BootFile:          bootFile,
+		TrainUrl:          outputObsPath,
+		WorkServerNumber:  workServerNumber,
+		EngineID:          int64(engineID),
+		LogUrl:            logObsPath,
+		PoolID:            getPoolId(),
+		Uuid:              uuid,
+		Parameters:        param,
+		CommitID:          commitID,
+		IsLatestVersion:   isLatestVersion,
+		BranchName:        branchName,
+		Params:            option.Params,
+		EngineName:        EngineName,
+		VersionCount:      VersionCount,
+		TotalVersionCount: modelarts.TotalVersionCount,
+		DatasetName:       datasetNames,
+		Spec:              spec,
+	}
+	if option.ModelName != "" { //使用预训练模型训练
+		req.ModelName = option.ModelName
+		req.LabelName = option.LabelName
+		req.CkptName = option.CkptName
+		req.ModelVersion = option.ModelVersion
+		req.PreTrainModelUrl = option.PreTrainModelUrl
+
+	}
+
+	userCommand, userImageUrl := getUserCommand(engineID, req)
+	req.UserCommand = userCommand
+	req.UserImageUrl = userImageUrl
+
+	//将params转换Parameters.Parameter，出错时返回给前端
+	var Parameters modelarts.Parameters
+	if err := json.Unmarshal([]byte(params), &Parameters); err != nil {
+		ctx.JSON(http.StatusOK, models.BaseErrorMessageApi("json.Unmarshal failed:"+err.Error()))
+		return
+	}
+
+	jobId, err := modelarts.GenerateTrainJob(ctx, req)
+	if err != nil {
+		log.Error("GenerateTrainJob failed:%v", err.Error())
+		ctx.JSON(http.StatusOK, models.BaseErrorMessageApi(err.Error()))
+		return
+	}
+	ctx.JSON(http.StatusOK, models.BaseMessageApi{
+		Code:    0,
+		Message: jobId,
+	})
+
+}
+
 func GrampusTrainJobGpuCreate(ctx *context.Context, option api.CreateTrainJobOption) {
 
 	displayJobName := option.DisplayJobName
@@ -179,13 +451,19 @@ func checkParameters(ctx *context.Context, option api.CreateTrainJobOption, lock
 	}
 
 	computeResource := models.GPUResource
-	if option.Type == 3 {
+	if isNpuTask(option) {
 		computeResource = models.NPUResource
 	}
+
 	//check count limit
-	count, err := GetNotFinalStatusTaskCount(ctx.User.ID, models.TypeC2Net, string(models.JobTypeTrain), computeResource)
+	taskType := option.Type
+	if isC2NetTask(option) {
+		taskType = 2
+	}
+
+	count, err := GetNotFinalStatusTaskCount(ctx.User.ID, taskType, string(models.JobTypeTrain), computeResource)
 	if err != nil {
-		log.Error("GetGrampusCountByUserID failed:%v", err, ctx.Data["MsgID"])
+		log.Error("GetCountByUserID failed:%v", err, ctx.Data["MsgID"])
 		return nil, nil, "", fmt.Errorf("system error")
 	} else {
 		if count >= 1 {
@@ -195,7 +473,7 @@ func checkParameters(ctx *context.Context, option api.CreateTrainJobOption, lock
 	}
 
 	//check param
-	if err := grampusParamCheckCreateTrainJob(option.BootFile, option.BranchName); err != nil {
+	if err := paramCheckCreateTrainJob(option.BootFile, option.BranchName); err != nil {
 		log.Error("paramCheckCreateTrainJob failed:(%v)", err, ctx.Data["MsgID"])
 		return nil, nil, "", err
 	}
@@ -216,13 +494,26 @@ func checkParameters(ctx *context.Context, option api.CreateTrainJobOption, lock
 
 	//check specification
 	computeType := models.GPU
-	if option.Type == 3 {
+
+	if isNpuTask(option) {
 		computeType = models.NPU
 	}
+	cluster := models.OpenICluster
+	if isC2NetTask(option) {
+		cluster = models.C2NetCluster
+	}
+	aiCenterCode := ""
+	if option.Type == TaskTypeCloudbrainOne {
+		aiCenterCode = models.AICenterOfCloudBrainOne
+	} else if option.Type == TaskTypeModelArts {
+		aiCenterCode = models.AICenterOfCloudBrainTwo
+	}
+
 	spec, err := resource.GetAndCheckSpec(ctx.User.ID, option.SpecId, models.FindSpecsOptions{
 		JobType:         models.JobTypeTrain,
 		ComputeResource: computeType,
-		Cluster:         models.C2NetCluster,
+		Cluster:         cluster,
+		AiCenterCode:    aiCenterCode,
 	})
 	if err != nil || spec == nil {
 		return nil, nil, "", fmt.Errorf("Resource specification is not available.")
@@ -234,14 +525,26 @@ func checkParameters(ctx *context.Context, option api.CreateTrainJobOption, lock
 	}
 
 	//check dataset
-	datasetInfos, datasetNames, err := models.GetDatasetInfo(option.Attachment, computeType)
-	if err != nil {
-		log.Error("GetDatasetInfo failed: %v", err, ctx.Data["MsgID"])
-		return nil, nil, "", fmt.Errorf(ctx.Tr("cloudbrain.error.dataset_select"))
+	var datasetInfos map[string]models.DatasetInfo
+	var datasetNames string
+	if option.Type != TaskTypeModelArts {
+		datasetInfos, datasetNames, err = models.GetDatasetInfo(option.Attachment, computeType)
+		if err != nil {
+			log.Error("GetDatasetInfo failed: %v", err, ctx.Data["MsgID"])
+			return nil, nil, "", fmt.Errorf(ctx.Tr("cloudbrain.error.dataset_select"))
+		}
 	}
 	return spec, datasetInfos, datasetNames, err
 }
 
+func isNpuTask(option api.CreateTrainJobOption) bool {
+	return option.Type == TaskTypeModelArts || option.Type == TaskTypeGrampusNPU
+}
+
+func isC2NetTask(option api.CreateTrainJobOption) bool {
+	return option.Type == TaskTypeGrampusGPU || option.Type == TaskTypeGrampusNPU
+}
+
 func GrampusTrainJobNpuCreate(ctx *context.Context, option api.CreateTrainJobOption) {
 
 	displayJobName := option.DisplayJobName
@@ -412,7 +715,7 @@ func uploadCodeToObs(codePath, jobName, parentDir string) error {
 	return nil
 }
 
-func grampusParamCheckCreateTrainJob(bootFile string, branchName string) error {
+func paramCheckCreateTrainJob(bootFile string, branchName string) error {
 	if !strings.HasSuffix(strings.TrimSpace(bootFile), ".py") {
 		log.Error("the boot file(%s) must be a python file", bootFile)
 		return errors.New("启动文件必须是python文件")
@@ -792,3 +1095,99 @@ func SyncTaskStatus(task *models.Cloudbrain) error {
 	return nil
 
 }
+
+func getTrainJobCommand(option api.CreateTrainJobOption) (string, error) {
+	var command string
+	bootFile := strings.TrimSpace(option.BootFile)
+	params := option.Params
+
+	if !strings.HasSuffix(bootFile, ".py") {
+		log.Error("bootFile(%s) format error", bootFile)
+		return command, errors.New("bootFile format error")
+	}
+
+	var parameters models.Parameters
+	var param string
+	if len(params) != 0 {
+		err := json.Unmarshal([]byte(params), &parameters)
+		if err != nil {
+			log.Error("Failed to Unmarshal params: %s (%v)", params, err)
+			return command, err
+		}
+
+		for _, parameter := range parameters.Parameter {
+			param += " --" + parameter.Label + "=" + parameter.Value
+		}
+	}
+	if option.CkptName != "" {
+		param += " --ckpt_url" + "=" + "/pretrainmodel/" + option.CkptName
+	}
+
+	command += "python /code/" + bootFile + param + " > " + cloudbrain.ModelMountPath + "/" + option.DisplayJobName + "-" + cloudbrain.LogFile
+
+	return command, nil
+}
+
+func checkMultiNode(userId int64, serverNum int) string {
+	if serverNum == 1 {
+		return ""
+	}
+	modelarts.InitMultiNode()
+	var isServerNumValid = false
+	if modelarts.MultiNodeConfig != nil {
+		for _, info := range modelarts.MultiNodeConfig.Info {
+			if isInOrg, _ := models.IsOrganizationMemberByOrgName(info.Org, userId); isInOrg {
+				if isInNodes(info.Node, serverNum) {
+					isServerNumValid = true
+					break
+				}
+
+			}
+		}
+	}
+	if isServerNumValid {
+		return ""
+	} else {
+		return "repo.modelarts.no_node_right"
+	}
+}
+
+func isInNodes(nodes []int, num int) bool {
+	for _, node := range nodes {
+		if node == num {
+			return true
+		}
+	}
+	return false
+
+}
+
+func getUserCommand(engineId int, req *modelarts.GenerateTrainJobReq) (string, string) {
+	userImageUrl := ""
+	userCommand := ""
+	if engineId < 0 {
+		tmpCodeObsPath := strings.Trim(req.CodeObsPath, "/")
+		tmpCodeObsPaths := strings.Split(tmpCodeObsPath, "/")
+		lastCodeDir := "code"
+		if len(tmpCodeObsPaths) > 0 {
+			lastCodeDir = tmpCodeObsPaths[len(tmpCodeObsPaths)-1]
+		}
+		userCommand = "/bin/bash /home/work/run_train.sh 's3://" + req.CodeObsPath + "' '" + lastCodeDir + "/" + req.BootFile + "' '/tmp/log/train.log' --'data_url'='s3://" + req.DataUrl + "' --'train_url'='s3://" + req.TrainUrl + "'"
+		var versionInfos modelarts.VersionInfo
+		if err := json.Unmarshal([]byte(setting.EngineVersions), &versionInfos); err != nil {
+			log.Info("json parse err." + err.Error())
+		} else {
+			for _, engine := range versionInfos.Version {
+				if engine.ID == engineId {
+					userImageUrl = engine.Url
+					break
+				}
+			}
+		}
+		for _, param := range req.Parameters {
+			userCommand += " --'" + param.Label + "'='" + param.Value + "'"
+		}
+		return userCommand, userImageUrl
+	}
+	return userCommand, userImageUrl
+}

From 670c13abe6a0ac07cec1c8f83fd8abf19846cb51 Mon Sep 17 00:00:00 2001
From: ychao_1983 <ychao_1983@sina.com>
Date: Tue, 1 Nov 2022 16:20:27 +0800
Subject: [PATCH 038/187] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/convert/cloudbrain.go |  8 +++++
 modules/structs/tagger.go     |  7 ++++
 routers/api/v1/repo/mlops.go  | 63 +++++++++++++++++++++++++++++++++++
 3 files changed, 78 insertions(+)
 create mode 100644 modules/structs/tagger.go
 create mode 100644 routers/api/v1/repo/mlops.go

diff --git a/modules/convert/cloudbrain.go b/modules/convert/cloudbrain.go
index 7df38ee05..1487f468e 100644
--- a/modules/convert/cloudbrain.go
+++ b/modules/convert/cloudbrain.go
@@ -101,3 +101,11 @@ func ToSpecification(s *models.Specification) *api.SpecificationShow {
 		UnitPrice:       s.UnitPrice,
 	}
 }
+
+func ToTagger(user *models.User) *api.Tagger {
+	return &api.Tagger{
+		Name:         user.Name,
+		RelAvatarURL: user.RelAvatarLink(),
+		Email:        user.Email,
+	}
+}
diff --git a/modules/structs/tagger.go b/modules/structs/tagger.go
new file mode 100644
index 000000000..8933c8c5c
--- /dev/null
+++ b/modules/structs/tagger.go
@@ -0,0 +1,7 @@
+package structs
+
+type Tagger struct {
+	Name         string `json:"name"`
+	Email        string `json:"email"`
+	RelAvatarURL string `json:"relAvatarURL"`
+}
diff --git a/routers/api/v1/repo/mlops.go b/routers/api/v1/repo/mlops.go
new file mode 100644
index 000000000..3392ebfec
--- /dev/null
+++ b/routers/api/v1/repo/mlops.go
@@ -0,0 +1,63 @@
+package repo
+
+import (
+	"net/http"
+
+	"code.gitea.io/gitea/models"
+
+	"code.gitea.io/gitea/modules/context"
+	"code.gitea.io/gitea/modules/convert"
+	"code.gitea.io/gitea/modules/log"
+	api "code.gitea.io/gitea/modules/structs"
+	"code.gitea.io/gitea/routers/api/v1/utils"
+)
+
+//标注任务可分配人员
+func ListTagger(ctx *context.APIContext) {
+
+	taggers := make([]*api.Tagger, 0)
+	userRemember := make(map[string]string)
+	collaborators, err := ctx.Repo.Repository.GetCollaborators(utils.GetListOptions(ctx))
+	if err != nil {
+		log.Warn("ListCollaborators", err)
+		ctx.JSON(http.StatusOK, taggers)
+		return
+	}
+	for _, collaborator := range collaborators {
+		taggers = append(taggers, convert.ToTagger(collaborator.User))
+		userRemember[collaborator.User.Name] = ""
+	}
+
+	teams, err := ctx.Repo.Repository.GetRepoTeams()
+	if err != nil {
+		log.Warn("ListTeams", err)
+		ctx.JSON(http.StatusOK, taggers)
+		return
+	}
+
+	for _, team := range teams {
+		for _, user := range team.Members {
+			if _, ok := userRemember[user.Name]; !ok {
+				taggers = append(taggers, convert.ToTagger(user))
+			}
+		}
+	}
+	ctx.JSON(http.StatusOK, taggers)
+
+}
+func GetRight(ctx *context.APIContext) {
+	right := "none"
+
+	if ctx.IsUserRepoReaderSpecific(models.UnitTypeCode) {
+		right = "read"
+	}
+
+	if ctx.IsUserRepoWriter([]models.UnitType{models.UnitTypeCode}) || ctx.IsUserRepoAdmin() {
+		right = "write"
+	}
+
+	ctx.JSON(http.StatusOK, map[string]string{
+		"right": right,
+	})
+
+}

From 92146da8213e5d7b57276ef1b4b32239acab613c Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Tue, 1 Nov 2022 16:45:11 +0800
Subject: [PATCH 039/187] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E5=90=8E=E7=AB=AF?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/repo/ai_model_manage.go | 8 ++++++++
 routers/routes/routes.go        | 2 ++
 2 files changed, 10 insertions(+)

diff --git a/routers/repo/ai_model_manage.go b/routers/repo/ai_model_manage.go
index f2b0fc6d1..3545b090b 100644
--- a/routers/repo/ai_model_manage.go
+++ b/routers/repo/ai_model_manage.go
@@ -189,6 +189,14 @@ func SaveNewNameModel(ctx *context.Context) {
 	log.Info("save model end.")
 }
 
+func SaveLocalModel(ctx *context.Context) {
+
+}
+
+func UploadLocalModel(ctx *context.Context) {
+
+}
+
 func SaveModel(ctx *context.Context) {
 	if !ctx.Repo.CanWrite(models.UnitTypeModelManage) {
 		ctx.Error(403, ctx.Tr("repo.model_noright"))
diff --git a/routers/routes/routes.go b/routers/routes/routes.go
index fd8b274e6..588a00c18 100755
--- a/routers/routes/routes.go
+++ b/routers/routes/routes.go
@@ -1233,6 +1233,8 @@ func RegisterRoutes(m *macaron.Macaron) {
 		}, context.RepoRef())
 		m.Group("/modelmanage", func() {
 			m.Post("/create_model", repo.SaveModel)
+			m.Post("/upload_local_model", repo.UploadLocalModel)
+			m.Post("/create_local_model", repo.SaveLocalModel)
 			m.Post("/create_model_convert", reqWechatBind, reqRepoModelManageWriter, repo.SaveModelConvert)
 			m.Post("/create_new_model", repo.SaveNewNameModel)
 			m.Delete("/delete_model", repo.DeleteModel)

From 7efc877097a6299523972f8ace0fc9df656a9dbf Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Tue, 1 Nov 2022 17:16:28 +0800
Subject: [PATCH 040/187] =?UTF-8?q?=E5=A2=9E=E5=8A=A06.8=E7=9A=84=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/api/v1/api.go              |  3 ++
 routers/api/v1/repo/modelmanage.go | 41 ++++++++++++++++-------
 routers/repo/ai_model_manage.go    | 52 +++++++++++++++++++++++-------
 3 files changed, 72 insertions(+), 24 deletions(-)

diff --git a/routers/api/v1/api.go b/routers/api/v1/api.go
index 5ecbf3a5f..6e2c74b0b 100755
--- a/routers/api/v1/api.go
+++ b/routers/api/v1/api.go
@@ -993,6 +993,9 @@ func RegisterRoutes(m *macaron.Macaron) {
 					m.Get("/query_model_byId", repo.QueryModelById)
 					m.Get("/query_model_for_predict", repo.QueryModelListForPredict)
 					m.Get("/query_modelfile_for_predict", repo.QueryModelFileForPredict)
+					m.Get("/query_train_job", repo.QueryTrainJobList)
+					m.Get("/query_train_model", repo.QueryTrainModelList)
+					m.Get("/query_train_job_version", repo.QueryTrainJobVersionList)
 					m.Post("/create_model_convert", repo.CreateModelConvert)
 					m.Get("/show_model_convert_page")
 					m.Get("/:id", repo.GetCloudbrainModelConvertTask)
diff --git a/routers/api/v1/repo/modelmanage.go b/routers/api/v1/repo/modelmanage.go
index 253d51e00..2c1fd9f01 100644
--- a/routers/api/v1/repo/modelmanage.go
+++ b/routers/api/v1/repo/modelmanage.go
@@ -5,6 +5,7 @@ import (
 
 	"code.gitea.io/gitea/modules/context"
 	"code.gitea.io/gitea/modules/log"
+	"code.gitea.io/gitea/modules/storage"
 	routerRepo "code.gitea.io/gitea/routers/repo"
 )
 
@@ -47,22 +48,38 @@ func QueryModelListForPredict(ctx *context.APIContext) {
 	routerRepo.QueryModelListForPredict(ctx.Context)
 }
 
+func QueryTrainModelList(ctx *context.APIContext) {
+	result, err := routerRepo.QueryTrainModelFileById(ctx.Context)
+	if err != nil {
+		log.Info("query error." + err.Error())
+	}
+	re := convertFileFormat(result)
+	ctx.JSON(http.StatusOK, re)
+}
+
+func convertFileFormat(result []storage.FileInfo) []FileInfo {
+	re := make([]FileInfo, 0)
+	if result != nil {
+		for _, file := range result {
+			tmpFile := FileInfo{
+				FileName: file.FileName,
+				ModTime:  file.ModTime,
+				IsDir:    file.IsDir,
+				Size:     file.Size,
+				ParenDir: file.ParenDir,
+				UUID:     file.UUID,
+			}
+			re = append(re, tmpFile)
+		}
+	}
+	return re
+}
+
 func QueryModelFileForPredict(ctx *context.APIContext) {
 	log.Info("QueryModelFileForPredict by api.")
 	id := ctx.Query("id")
 	result := routerRepo.QueryModelFileByID(id)
-	re := make([]FileInfo, len(result))
-	for _, file := range result {
-		tmpFile := FileInfo{
-			FileName: file.FileName,
-			ModTime:  file.ModTime,
-			IsDir:    file.IsDir,
-			Size:     file.Size,
-			ParenDir: file.ParenDir,
-			UUID:     file.UUID,
-		}
-		re = append(re, tmpFile)
-	}
+	re := convertFileFormat(result)
 	ctx.JSON(http.StatusOK, re)
 }
 
diff --git a/routers/repo/ai_model_manage.go b/routers/repo/ai_model_manage.go
index ca90ff432..99f032572 100644
--- a/routers/repo/ai_model_manage.go
+++ b/routers/repo/ai_model_manage.go
@@ -528,23 +528,33 @@ func QueryTrainJobList(ctx *context.Context) {
 
 }
 
-func QueryTrainModelList(ctx *context.Context) {
-	log.Info("query train job list. start.")
-	jobName := ctx.Query("jobName")
-	taskType := ctx.QueryInt("type")
-	VersionName := ctx.Query("versionName")
-	if VersionName == "" {
-		VersionName = ctx.Query("VersionName")
+func QueryTrainModelFileById(ctx *context.Context) ([]storage.FileInfo, error) {
+	JobID := ctx.Query("jobId")
+	VersionListTasks, count, err := models.QueryModelTrainJobVersionList(JobID)
+	if err == nil {
+		if count == 1 {
+			task := VersionListTasks[0]
+			jobName := task.JobName
+			taskType := task.Type
+			VersionName := task.VersionName
+			modelDbResult, err := getModelFromObjectSave(jobName, taskType, VersionName)
+			return modelDbResult, err
+		}
 	}
+	log.Info("get TypeCloudBrainTwo TrainJobListModel failed:", err)
+	return nil, errors.New("Not found task.")
+}
+
+func getModelFromObjectSave(jobName string, taskType int, VersionName string) ([]storage.FileInfo, error) {
 	if taskType == models.TypeCloudBrainTwo {
 		objectkey := path.Join(setting.TrainJobModelPath, jobName, setting.OutPutPath, VersionName) + "/"
 		modelDbResult, err := storage.GetAllObjectByBucketAndPrefix(setting.Bucket, objectkey)
 		log.Info("bucket=" + setting.Bucket + "  objectkey=" + objectkey)
 		if err != nil {
 			log.Info("get TypeCloudBrainTwo TrainJobListModel failed:", err)
+			return nil, err
 		} else {
-			ctx.JSON(200, modelDbResult)
-			return
+			return modelDbResult, nil
 		}
 	} else if taskType == models.TypeCloudBrainOne {
 		modelSrcPrefix := setting.CBCodePathPrefix + jobName + "/model/"
@@ -552,12 +562,30 @@ func QueryTrainModelList(ctx *context.Context) {
 		modelDbResult, err := storage.GetAllObjectByBucketAndPrefixMinio(bucketName, modelSrcPrefix)
 		if err != nil {
 			log.Info("get TypeCloudBrainOne TrainJobListModel failed:", err)
+			return nil, err
 		} else {
-			ctx.JSON(200, modelDbResult)
-			return
+			return modelDbResult, nil
 		}
 	}
-	ctx.JSON(200, "")
+	return nil, errors.New("Not support.")
+}
+
+func QueryTrainModelList(ctx *context.Context) {
+	log.Info("query train job list. start.")
+	jobName := ctx.Query("jobName")
+	taskType := ctx.QueryInt("type")
+	VersionName := ctx.Query("versionName")
+	if VersionName == "" {
+		VersionName = ctx.Query("VersionName")
+	}
+	modelDbResult, err := getModelFromObjectSave(jobName, taskType, VersionName)
+	if err != nil {
+		log.Info("get TypeCloudBrainTwo TrainJobListModel failed:", err)
+		ctx.JSON(200, "")
+	} else {
+		ctx.JSON(200, modelDbResult)
+		return
+	}
 }
 
 func DownloadSingleModelFile(ctx *context.Context) {

From 7d310b184aae0f039d863c82579fcb067e18f69f Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Tue, 1 Nov 2022 17:54:14 +0800
Subject: [PATCH 041/187] =?UTF-8?q?=E6=A8=A1=E5=9E=8B=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E5=8F=8A=E6=A8=A1=E5=9E=8B=E8=BD=AC=E6=8D=A2=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E5=A4=A7=E5=B0=8F=E5=86=99=E7=BB=9F=E4=B8=80=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 models/ai_model_manage.go                     | 116 ++++++-------
 routers/api/v1/api.go                         |  12 ++
 routers/api/v1/repo/modelmanage.go            | 106 ++++++++++++
 routers/repo/ai_model_convert.go              |  61 ++++---
 routers/repo/ai_model_manage.go               | 162 ++++++++++++------
 templates/repo/cloudbrain/inference/new.tmpl  |   6 +-
 templates/repo/cloudbrain/trainjob/show.tmpl  |  36 ++--
 templates/repo/grampus/trainjob/show.tmpl     |  41 ++---
 .../repo/modelarts/inferencejob/new.tmpl      |   6 +-
 templates/repo/modelarts/trainjob/show.tmpl   |  45 ++---
 templates/repo/modelmanage/convertIndex.tmpl  |  74 ++++----
 templates/repo/modelmanage/index.tmpl         |  54 +++---
 templates/repo/modelmanage/showinfo.tmpl      | 140 ++++++++-------
 web_src/js/components/Model.vue               | 156 ++++++++---------
 web_src/js/features/cloudbrainShow.js         |   8 +-
 15 files changed, 609 insertions(+), 414 deletions(-)
 create mode 100644 routers/api/v1/repo/modelmanage.go

diff --git a/models/ai_model_manage.go b/models/ai_model_manage.go
index d9adda2dc..0d754b0ba 100644
--- a/models/ai_model_manage.go
+++ b/models/ai_model_manage.go
@@ -12,67 +12,67 @@ import (
 )
 
 type AiModelManage struct {
-	ID                string `xorm:"pk"`
-	Name              string `xorm:"INDEX NOT NULL"`
-	Version           string `xorm:"NOT NULL"`
-	VersionCount      int    `xorm:"NOT NULL DEFAULT 0"`
-	New               int    `xorm:"NOT NULL"`
-	Type              int    `xorm:"NOT NULL"`
-	Size              int64  `xorm:"NOT NULL"`
-	Description       string `xorm:"varchar(2000)"`
-	Label             string `xorm:"varchar(1000)"`
-	Path              string `xorm:"varchar(400) NOT NULL"`
-	DownloadCount     int    `xorm:"NOT NULL DEFAULT 0"`
-	Engine            int64  `xorm:"NOT NULL DEFAULT 0"`
-	Status            int    `xorm:"NOT NULL DEFAULT 0"`
-	StatusDesc        string `xorm:"varchar(500)"`
-	Accuracy          string `xorm:"varchar(1000)"`
-	AttachmentId      string `xorm:"NULL"`
-	RepoId            int64  `xorm:"INDEX NULL"`
-	CodeBranch        string `xorm:"varchar(400) NULL"`
-	CodeCommitID      string `xorm:"NULL"`
-	UserId            int64  `xorm:"NOT NULL"`
-	UserName          string
-	UserRelAvatarLink string
-	TrainTaskInfo     string             `xorm:"text NULL"`
-	CreatedUnix       timeutil.TimeStamp `xorm:"created"`
-	UpdatedUnix       timeutil.TimeStamp `xorm:"updated"`
-	IsCanOper         bool
-	IsCanDelete       bool
+	ID                string             `xorm:"pk" json:"id"`
+	Name              string             `xorm:"INDEX NOT NULL" json:"name"`
+	Version           string             `xorm:"NOT NULL" json:"version"`
+	VersionCount      int                `xorm:"NOT NULL DEFAULT 0" json:"versionCount"`
+	New               int                `xorm:"NOT NULL" json:"new"`
+	Type              int                `xorm:"NOT NULL" json:"type"`
+	Size              int64              `xorm:"NOT NULL" json:"size"`
+	Description       string             `xorm:"varchar(2000)" json:"description"`
+	Label             string             `xorm:"varchar(1000)" json:"label"`
+	Path              string             `xorm:"varchar(400) NOT NULL" json:"path"`
+	DownloadCount     int                `xorm:"NOT NULL DEFAULT 0" json:"downloadCount"`
+	Engine            int64              `xorm:"NOT NULL DEFAULT 0" json:"engine"`
+	Status            int                `xorm:"NOT NULL DEFAULT 0" json:"status"`
+	StatusDesc        string             `xorm:"varchar(500)" json:"statusDesc"`
+	Accuracy          string             `xorm:"varchar(1000)" json:"accuracy"`
+	AttachmentId      string             `xorm:"NULL" json:"attachmentId"`
+	RepoId            int64              `xorm:"INDEX NULL" json:"repoId"`
+	CodeBranch        string             `xorm:"varchar(400) NULL" json:"codeBranch"`
+	CodeCommitID      string             `xorm:"NULL" json:"codeCommitID"`
+	UserId            int64              `xorm:"NOT NULL" json:"userId"`
+	UserName          string             `json:"userName"`
+	UserRelAvatarLink string             `json:"userRelAvatarLink"`
+	TrainTaskInfo     string             `xorm:"text NULL" json:"trainTaskInfo"`
+	CreatedUnix       timeutil.TimeStamp `xorm:"created" json:"createdUnix"`
+	UpdatedUnix       timeutil.TimeStamp `xorm:"updated" json:"updatedUnix"`
+	IsCanOper         bool               `json:"isCanOper"`
+	IsCanDelete       bool               `json:"isCanDelete"`
 }
 
 type AiModelConvert struct {
-	ID                 string `xorm:"pk"`
-	Name               string `xorm:"INDEX NOT NULL"`
-	Status             string `xorm:"NULL"`
-	StatusResult       string `xorm:"NULL"`
-	SrcEngine          int    `xorm:"NOT NULL DEFAULT 0"`
-	RepoId             int64  `xorm:"INDEX NULL"`
-	ModelId            string `xorm:"NOT NULL"`
-	ModelName          string `xorm:"NULL"`
-	ModelVersion       string `xorm:"NOT NULL"`
-	ModelPath          string `xorm:"NULL"`
-	DestFormat         int    `xorm:"NOT NULL DEFAULT 0"`
-	NetOutputFormat    int    `xorm:"NULL"`
-	UserId             int64  `xorm:"NOT NULL"`
-	CloudBrainTaskId   string `xorm:"NULL"`
-	ModelArtsVersionId string `xorm:"NULL"`
-	ContainerID        string
-	ContainerIp        string
-	RunTime            int64 `xorm:"NULL"`
-	TrainJobDuration   string
-	InputShape         string             `xorm:"varchar(2000)"`
-	InputDataFormat    string             `xorm:"NOT NULL"`
-	Description        string             `xorm:"varchar(2000)"`
-	Path               string             `xorm:"varchar(400) NOT NULL"`
-	CreatedUnix        timeutil.TimeStamp `xorm:"created"`
-	UpdatedUnix        timeutil.TimeStamp `xorm:"updated"`
-	StartTime          timeutil.TimeStamp
-	EndTime            timeutil.TimeStamp
-	UserName           string
-	UserRelAvatarLink  string
-	IsCanOper          bool
-	IsCanDelete        bool
+	ID                 string             `xorm:"pk" json:"id"`
+	Name               string             `xorm:"INDEX NOT NULL" json:"name"`
+	Status             string             `xorm:"NULL" json:"status"`
+	StatusResult       string             `xorm:"NULL" json:"statusResult"`
+	SrcEngine          int                `xorm:"NOT NULL DEFAULT 0" json:"srcEngine"`
+	RepoId             int64              `xorm:"INDEX NULL" json:"repoId"`
+	ModelId            string             `xorm:"NOT NULL" json:"modelId"`
+	ModelName          string             `xorm:"NULL" json:"modelName"`
+	ModelVersion       string             `xorm:"NOT NULL" json:"modelVersion"`
+	ModelPath          string             `xorm:"NULL" json:"modelPath"`
+	DestFormat         int                `xorm:"NOT NULL DEFAULT 0" json:"destFormat"`
+	NetOutputFormat    int                `xorm:"NULL" json:"netOutputFormat"`
+	UserId             int64              `xorm:"NOT NULL" json:"userId"`
+	CloudBrainTaskId   string             `xorm:"NULL" json:"cloudBrainTaskId"`
+	ModelArtsVersionId string             `xorm:"NULL" json:"modelArtsVersionId"`
+	ContainerID        string             `json:"containerID"`
+	ContainerIp        string             `json:"containerIp"`
+	RunTime            int64              `xorm:"NULL" json:"runTime"`
+	TrainJobDuration   string             `json:"trainJobDuration"`
+	InputShape         string             `xorm:"varchar(2000)" json:"inputShape"`
+	InputDataFormat    string             `xorm:"NOT NULL" json:"inputDataFormat"`
+	Description        string             `xorm:"varchar(2000)" json:"description"`
+	Path               string             `xorm:"varchar(400) NOT NULL" json:"path"`
+	CreatedUnix        timeutil.TimeStamp `xorm:"created" json:"createdUnix"`
+	UpdatedUnix        timeutil.TimeStamp `xorm:"updated" json:"updatedUnix"`
+	StartTime          timeutil.TimeStamp `json:"startTime"`
+	EndTime            timeutil.TimeStamp `json:"endTime"`
+	UserName           string             `json:"userName"`
+	UserRelAvatarLink  string             `json:"userRelAvatarLink"`
+	IsCanOper          bool               `json:"isCanOper"`
+	IsCanDelete        bool               `json:"isCanDelete"`
 }
 
 type AiModelQueryOptions struct {
diff --git a/routers/api/v1/api.go b/routers/api/v1/api.go
index 69de79c10..87d5b37f0 100755
--- a/routers/api/v1/api.go
+++ b/routers/api/v1/api.go
@@ -953,6 +953,18 @@ func RegisterRoutes(m *macaron.Macaron) {
 					})
 				}, reqRepoReader(models.UnitTypeCloudBrain))
 				m.Group("/modelmanage", func() {
+					m.Post("/create_new_model", repo.CreateNewModel)
+					m.Get("/show_model_api", repo.ShowModelManageApi)
+					m.Delete("/delete_model", repo.DeleteModel)
+					m.Get("/downloadall", repo.DownloadModel)
+					m.Get("/query_model_byId", repo.QueryModelById)
+					m.Get("/query_model_for_predict", repo.QueryModelListForPredict)
+					m.Get("/query_modelfile_for_predict", repo.QueryModelFileForPredict)
+					m.Get("/query_train_job", repo.QueryTrainJobList)
+					m.Get("/query_train_model", repo.QueryTrainModelList)
+					m.Get("/query_train_job_version", repo.QueryTrainJobVersionList)
+					m.Post("/create_model_convert", repo.CreateModelConvert)
+					m.Get("/show_model_convert_page")
 					m.Get("/:id", repo.GetCloudbrainModelConvertTask)
 					m.Get("/:id/log", repo.CloudbrainForModelConvertGetLog)
 					m.Get("/:id/modelartlog", repo.TrainJobForModelConvertGetLog)
diff --git a/routers/api/v1/repo/modelmanage.go b/routers/api/v1/repo/modelmanage.go
new file mode 100644
index 000000000..2c1fd9f01
--- /dev/null
+++ b/routers/api/v1/repo/modelmanage.go
@@ -0,0 +1,106 @@
+package repo
+
+import (
+	"net/http"
+
+	"code.gitea.io/gitea/modules/context"
+	"code.gitea.io/gitea/modules/log"
+	"code.gitea.io/gitea/modules/storage"
+	routerRepo "code.gitea.io/gitea/routers/repo"
+)
+
+type FileInfo struct {
+	FileName string `json:"fileName"`
+	ModTime  string `json:"modTime"`
+	IsDir    bool   `json:"isDir"`
+	Size     int64  `json:"size"`
+	ParenDir string `json:"parenDir"`
+	UUID     string `json:"uuid"`
+}
+
+func CreateNewModel(ctx *context.APIContext) {
+	log.Info("CreateNewModel by api.")
+	routerRepo.SaveModel(ctx.Context)
+}
+
+func ShowModelManageApi(ctx *context.APIContext) {
+	log.Info("ShowModelManageApi by api.")
+	routerRepo.ShowModelPageInfo(ctx.Context)
+}
+
+func DeleteModel(ctx *context.APIContext) {
+	log.Info("DeleteModel by api.")
+	routerRepo.DeleteModel(ctx.Context)
+}
+
+func DownloadModel(ctx *context.APIContext) {
+	log.Info("DownloadModel by api.")
+	routerRepo.DownloadMultiModelFile(ctx.Context)
+}
+
+func QueryModelById(ctx *context.APIContext) {
+	log.Info("QueryModelById by api.")
+	routerRepo.QueryModelById(ctx.Context)
+}
+
+func QueryModelListForPredict(ctx *context.APIContext) {
+	log.Info("QueryModelListForPredict by api.")
+	routerRepo.QueryModelListForPredict(ctx.Context)
+}
+
+func QueryTrainModelList(ctx *context.APIContext) {
+	result, err := routerRepo.QueryTrainModelFileById(ctx.Context)
+	if err != nil {
+		log.Info("query error." + err.Error())
+	}
+	re := convertFileFormat(result)
+	ctx.JSON(http.StatusOK, re)
+}
+
+func convertFileFormat(result []storage.FileInfo) []FileInfo {
+	re := make([]FileInfo, 0)
+	if result != nil {
+		for _, file := range result {
+			tmpFile := FileInfo{
+				FileName: file.FileName,
+				ModTime:  file.ModTime,
+				IsDir:    file.IsDir,
+				Size:     file.Size,
+				ParenDir: file.ParenDir,
+				UUID:     file.UUID,
+			}
+			re = append(re, tmpFile)
+		}
+	}
+	return re
+}
+
+func QueryModelFileForPredict(ctx *context.APIContext) {
+	log.Info("QueryModelFileForPredict by api.")
+	id := ctx.Query("id")
+	result := routerRepo.QueryModelFileByID(id)
+	re := convertFileFormat(result)
+	ctx.JSON(http.StatusOK, re)
+}
+
+func CreateModelConvert(ctx *context.APIContext) {
+	log.Info("CreateModelConvert by api.")
+	routerRepo.SaveModelConvert(ctx.Context)
+}
+
+func ShowModelConvertPage(ctx *context.APIContext) {
+	log.Info("ShowModelConvertPage by api.")
+	modelResult, count, err := routerRepo.GetModelConvertPageData(ctx.Context)
+	if err == nil {
+		mapInterface := make(map[string]interface{})
+		mapInterface["data"] = modelResult
+		mapInterface["count"] = count
+		ctx.JSON(http.StatusOK, mapInterface)
+	} else {
+		mapInterface := make(map[string]interface{})
+		mapInterface["data"] = nil
+		mapInterface["count"] = 0
+		ctx.JSON(http.StatusOK, mapInterface)
+	}
+
+}
diff --git a/routers/repo/ai_model_convert.go b/routers/repo/ai_model_convert.go
index bd6a01072..560ace8fd 100644
--- a/routers/repo/ai_model_convert.go
+++ b/routers/repo/ai_model_convert.go
@@ -74,27 +74,27 @@ func SaveModelConvert(ctx *context.Context) {
 	log.Info("save model convert start.")
 	if !ctx.Repo.CanWrite(models.UnitTypeModelManage) {
 		ctx.JSON(200, map[string]string{
-			"result_code": "1",
-			"message":     ctx.Tr("repo.modelconvert.manage.no_operate_right"),
+			"code": "1",
+			"msg":  ctx.Tr("repo.modelconvert.manage.no_operate_right"),
 		})
 		return
 	}
 	name := ctx.Query("name")
 	desc := ctx.Query("desc")
 	modelId := ctx.Query("modelId")
-	modelPath := ctx.Query("ModelFile")
-	SrcEngine := ctx.QueryInt("SrcEngine")
+	modelPath := ctx.Query("modelFile")
+	SrcEngine := ctx.QueryInt("srcEngine")
 	InputShape := ctx.Query("inputshape")
 	InputDataFormat := ctx.Query("inputdataformat")
-	DestFormat := ctx.QueryInt("DestFormat")
-	NetOutputFormat := ctx.QueryInt("NetOutputFormat")
+	DestFormat := ctx.QueryInt("destFormat")
+	NetOutputFormat := ctx.QueryInt("netOutputFormat")
 
 	task, err := models.QueryModelById(modelId)
 	if err != nil {
 		log.Error("no such model!", err.Error())
 		ctx.JSON(200, map[string]string{
-			"result_code": "1",
-			"message":     ctx.Tr("repo.modelconvert.manage.model_not_exist"),
+			"code": "1",
+			"msg":  ctx.Tr("repo.modelconvert.manage.model_not_exist"),
 		})
 		return
 	}
@@ -105,8 +105,8 @@ func SaveModelConvert(ctx *context.Context) {
 			if convert.Name == name {
 				log.Info("convert.Name=" + name + " convert.id=" + convert.ID)
 				ctx.JSON(200, map[string]string{
-					"result_code": "1",
-					"message":     ctx.Tr("repo.modelconvert.manage.create_error1"),
+					"code": "1",
+					"msg":  ctx.Tr("repo.modelconvert.manage.create_error1"),
 				})
 				return
 			}
@@ -119,8 +119,8 @@ func SaveModelConvert(ctx *context.Context) {
 			if isRunningTask(convert.Status) {
 				log.Info("convert.Status=" + convert.Status + " convert.id=" + convert.ID)
 				ctx.JSON(200, map[string]string{
-					"result_code": "1",
-					"message":     ctx.Tr("repo.modelconvert.manage.create_error2"),
+					"code": "1",
+					"msg":  ctx.Tr("repo.modelconvert.manage.create_error2"),
 				})
 				return
 			}
@@ -150,7 +150,7 @@ func SaveModelConvert(ctx *context.Context) {
 	go goCreateTask(modelConvert, ctx, task)
 
 	ctx.JSON(200, map[string]string{
-		"result_code": "0",
+		"code": "0",
 	})
 }
 
@@ -604,11 +604,11 @@ func StopModelConvert(ctx *context.Context) {
 }
 
 func ShowModelConvertInfo(ctx *context.Context) {
-	ctx.Data["ID"] = ctx.Query("ID")
+	ctx.Data["ID"] = ctx.Query("id")
 	ctx.Data["isModelManage"] = true
 	ctx.Data["ModelManageAccess"] = ctx.Repo.CanWrite(models.UnitTypeModelManage)
 
-	job, err := models.QueryModelConvertById(ctx.Query("ID"))
+	job, err := models.QueryModelConvertById(ctx.Query("id"))
 	if err == nil {
 		if job.TrainJobDuration == "" {
 			job.TrainJobDuration = "00:00:00"
@@ -707,6 +707,26 @@ func ShowModelConvertPageInfo(ctx *context.Context) {
 		ctx.NotFound(ctx.Req.URL.RequestURI(), nil)
 		return
 	}
+	page := ctx.QueryInt("page")
+	if page <= 0 {
+		page = 1
+	}
+	pageSize := ctx.QueryInt("pageSize")
+	if pageSize <= 0 {
+		pageSize = setting.UI.IssuePagingNum
+	}
+	modelResult, count, err := GetModelConvertPageData(ctx)
+	if err == nil {
+		pager := context.NewPagination(int(count), page, pageSize, 5)
+		ctx.Data["Page"] = pager
+		ctx.Data["Tasks"] = modelResult
+		ctx.Data["MODEL_CONVERT_COUNT"] = count
+	} else {
+		ctx.ServerError("Query data error.", err)
+	}
+}
+
+func GetModelConvertPageData(ctx *context.Context) ([]*models.AiModelConvert, int64, error) {
 	page := ctx.QueryInt("page")
 	if page <= 0 {
 		page = 1
@@ -725,10 +745,8 @@ func ShowModelConvertPageInfo(ctx *context.Context) {
 	})
 	if err != nil {
 		log.Info("query db error." + err.Error())
-		ctx.ServerError("Cloudbrain", err)
-		return
+		return nil, 0, err
 	}
-	ctx.Data["MODEL_CONVERT_COUNT"] = count
 	userIds := make([]int64, len(modelResult))
 	for i, model := range modelResult {
 		model.IsCanOper = isOper(ctx, model.UserId)
@@ -743,10 +761,7 @@ func ShowModelConvertPageInfo(ctx *context.Context) {
 			model.UserRelAvatarLink = value.RelAvatarLink()
 		}
 	}
-	pager := context.NewPagination(int(count), page, pageSize, 5)
-	ctx.Data["Page"] = pager
-	ctx.Data["Tasks"] = modelResult
-
+	return modelResult, count, nil
 }
 
 func ModelConvertDownloadModel(ctx *context.Context) {
@@ -757,7 +772,7 @@ func ModelConvertDownloadModel(ctx *context.Context) {
 		ctx.ServerError("Not found task.", err)
 		return
 	}
-	AllDownload := ctx.QueryBool("AllDownload")
+	AllDownload := ctx.QueryBool("allDownload")
 	if AllDownload {
 		if job.IsGpuTrainTask() {
 			path := setting.CBCodePathPrefix + job.ID + "/model/"
diff --git a/routers/repo/ai_model_manage.go b/routers/repo/ai_model_manage.go
index 3545b090b..a82930909 100644
--- a/routers/repo/ai_model_manage.go
+++ b/routers/repo/ai_model_manage.go
@@ -17,7 +17,6 @@ import (
 	"code.gitea.io/gitea/modules/notification"
 	"code.gitea.io/gitea/modules/setting"
 	"code.gitea.io/gitea/modules/storage"
-	"code.gitea.io/gitea/services/cloudbrain/resource"
 	uuid "github.com/satori/go.uuid"
 )
 
@@ -34,13 +33,13 @@ const (
 	STATUS_ERROR           = 2
 )
 
-func saveModelByParameters(jobId string, versionName string, name string, version string, label string, description string, engine int, ctx *context.Context) error {
+func saveModelByParameters(jobId string, versionName string, name string, version string, label string, description string, engine int, ctx *context.Context) (string, error) {
 	aiTask, err := models.GetCloudbrainByJobIDAndVersionName(jobId, versionName)
 	if err != nil {
 		aiTask, err = models.GetRepoCloudBrainByJobID(ctx.Repo.Repository.ID, jobId)
 		if err != nil {
 			log.Info("query task error." + err.Error())
-			return err
+			return "", err
 		} else {
 			log.Info("query gpu train task.")
 		}
@@ -56,7 +55,7 @@ func saveModelByParameters(jobId string, versionName string, name string, versio
 	if len(aimodels) > 0 {
 		for _, model := range aimodels {
 			if model.Version == version {
-				return errors.New(ctx.Tr("repo.model.manage.create_error"))
+				return "", errors.New(ctx.Tr("repo.model.manage.create_error"))
 			}
 			if model.New == MODEL_LATEST {
 				lastNewModelId = model.ID
@@ -111,7 +110,7 @@ func saveModelByParameters(jobId string, versionName string, name string, versio
 
 	err = models.SaveModelToDb(model)
 	if err != nil {
-		return err
+		return "", err
 	}
 	if len(lastNewModelId) > 0 {
 		//udpate status and version count
@@ -134,7 +133,7 @@ func saveModelByParameters(jobId string, versionName string, name string, versio
 
 	log.Info("save model end.")
 	notification.NotifyOtherTask(ctx.User, ctx.Repo.Repository, id, name, models.ActionCreateNewModelTask)
-	return nil
+	return id, nil
 }
 
 func asyncToCopyModel(aiTask *models.Cloudbrain, id string, modelSelectedFile string) {
@@ -173,7 +172,7 @@ func SaveNewNameModel(ctx *context.Context) {
 		ctx.Error(403, ctx.Tr("repo.model_noright"))
 		return
 	}
-	name := ctx.Query("Name")
+	name := ctx.Query("name")
 	if name == "" {
 		ctx.Error(500, fmt.Sprintf("name or version is null."))
 		return
@@ -203,38 +202,42 @@ func SaveModel(ctx *context.Context) {
 		return
 	}
 	log.Info("save model start.")
-	JobId := ctx.Query("JobId")
-	VersionName := ctx.Query("VersionName")
-	name := ctx.Query("Name")
-	version := ctx.Query("Version")
-	label := ctx.Query("Label")
-	description := ctx.Query("Description")
-	engine := ctx.QueryInt("Engine")
+	JobId := ctx.Query("jobId")
+	VersionName := ctx.Query("versionName")
+	name := ctx.Query("name")
+	version := ctx.Query("version")
+	label := ctx.Query("label")
+	description := ctx.Query("description")
+	engine := ctx.QueryInt("engine")
 	modelSelectedFile := ctx.Query("modelSelectedFile")
 	log.Info("engine=" + fmt.Sprint(engine) + " modelSelectedFile=" + modelSelectedFile)
-
+	re := map[string]string{
+		"code": "-1",
+	}
 	if JobId == "" || VersionName == "" {
-		ctx.Error(500, fmt.Sprintf("JobId or VersionName is null."))
+		re["msg"] = "JobId or VersionName is null."
+		ctx.JSON(200, re)
 		return
 	}
 	if modelSelectedFile == "" {
-		ctx.Error(500, fmt.Sprintf("Not selected model file."))
+		re["msg"] = "Not selected model file."
+		ctx.JSON(200, re)
 		return
 	}
-
 	if name == "" || version == "" {
-		ctx.Error(500, fmt.Sprintf("name or version is null."))
+		re["msg"] = "name or version is null."
+		ctx.JSON(200, re)
 		return
 	}
-
-	err := saveModelByParameters(JobId, VersionName, name, version, label, description, engine, ctx)
-
+	id, err := saveModelByParameters(JobId, VersionName, name, version, label, description, engine, ctx)
 	if err != nil {
 		log.Info("save model error." + err.Error())
-		ctx.Error(500, fmt.Sprintf("save model error. %v", err))
-		return
+		re["msg"] = err.Error()
+	} else {
+		re["code"] = "0"
+		re["id"] = id
 	}
-	ctx.Status(200)
+	ctx.JSON(200, re)
 	log.Info("save model end.")
 }
 
@@ -299,13 +302,17 @@ func downloadModelFromCloudBrainOne(modelUUID string, jobName string, parentDir
 
 func DeleteModel(ctx *context.Context) {
 	log.Info("delete model start.")
-	id := ctx.Query("ID")
+	id := ctx.Query("id")
 	err := deleteModelByID(ctx, id)
 	if err != nil {
-		ctx.JSON(500, err.Error())
+		re := map[string]string{
+			"code": "-1",
+		}
+		re["msg"] = err.Error()
+		ctx.JSON(200, re)
 	} else {
 		ctx.JSON(200, map[string]string{
-			"result_code": "0",
+			"code": "0",
 		})
 	}
 }
@@ -362,7 +369,7 @@ func QueryModelByParameters(repoId int64, page int) ([]*models.AiModelManage, in
 
 func DownloadMultiModelFile(ctx *context.Context) {
 	log.Info("DownloadMultiModelFile start.")
-	id := ctx.Query("ID")
+	id := ctx.Query("id")
 	log.Info("id=" + id)
 	task, err := models.QueryModelById(id)
 	if err != nil {
@@ -495,7 +502,10 @@ func downloadFromCloudBrainTwo(path string, task *models.AiModelManage, ctx *con
 
 func QueryTrainJobVersionList(ctx *context.Context) {
 	log.Info("query train job version list. start.")
-	JobID := ctx.Query("JobID")
+	JobID := ctx.Query("jobId")
+	if JobID == "" {
+		JobID = ctx.Query("JobId")
+	}
 
 	VersionListTasks, count, err := models.QueryModelTrainJobVersionList(JobID)
 
@@ -523,20 +533,33 @@ func QueryTrainJobList(ctx *context.Context) {
 
 }
 
-func QueryTrainModelList(ctx *context.Context) {
-	log.Info("query train job list. start.")
-	jobName := ctx.Query("jobName")
-	taskType := ctx.QueryInt("type")
-	VersionName := ctx.Query("VersionName")
+func QueryTrainModelFileById(ctx *context.Context) ([]storage.FileInfo, error) {
+	JobID := ctx.Query("jobId")
+	VersionListTasks, count, err := models.QueryModelTrainJobVersionList(JobID)
+	if err == nil {
+		if count == 1 {
+			task := VersionListTasks[0]
+			jobName := task.JobName
+			taskType := task.Type
+			VersionName := task.VersionName
+			modelDbResult, err := getModelFromObjectSave(jobName, taskType, VersionName)
+			return modelDbResult, err
+		}
+	}
+	log.Info("get TypeCloudBrainTwo TrainJobListModel failed:", err)
+	return nil, errors.New("Not found task.")
+}
+
+func getModelFromObjectSave(jobName string, taskType int, VersionName string) ([]storage.FileInfo, error) {
 	if taskType == models.TypeCloudBrainTwo {
 		objectkey := path.Join(setting.TrainJobModelPath, jobName, setting.OutPutPath, VersionName) + "/"
 		modelDbResult, err := storage.GetAllObjectByBucketAndPrefix(setting.Bucket, objectkey)
 		log.Info("bucket=" + setting.Bucket + "  objectkey=" + objectkey)
 		if err != nil {
 			log.Info("get TypeCloudBrainTwo TrainJobListModel failed:", err)
+			return nil, err
 		} else {
-			ctx.JSON(200, modelDbResult)
-			return
+			return modelDbResult, nil
 		}
 	} else if taskType == models.TypeCloudBrainOne {
 		modelSrcPrefix := setting.CBCodePathPrefix + jobName + "/model/"
@@ -544,12 +567,30 @@ func QueryTrainModelList(ctx *context.Context) {
 		modelDbResult, err := storage.GetAllObjectByBucketAndPrefixMinio(bucketName, modelSrcPrefix)
 		if err != nil {
 			log.Info("get TypeCloudBrainOne TrainJobListModel failed:", err)
+			return nil, err
 		} else {
-			ctx.JSON(200, modelDbResult)
-			return
+			return modelDbResult, nil
 		}
 	}
-	ctx.JSON(200, "")
+	return nil, errors.New("Not support.")
+}
+
+func QueryTrainModelList(ctx *context.Context) {
+	log.Info("query train job list. start.")
+	jobName := ctx.Query("jobName")
+	taskType := ctx.QueryInt("type")
+	VersionName := ctx.Query("versionName")
+	if VersionName == "" {
+		VersionName = ctx.Query("VersionName")
+	}
+	modelDbResult, err := getModelFromObjectSave(jobName, taskType, VersionName)
+	if err != nil {
+		log.Info("get TypeCloudBrainTwo TrainJobListModel failed:", err)
+		ctx.JSON(200, "")
+	} else {
+		ctx.JSON(200, modelDbResult)
+		return
+	}
 }
 
 func DownloadSingleModelFile(ctx *context.Context) {
@@ -620,7 +661,7 @@ func DownloadSingleModelFile(ctx *context.Context) {
 }
 
 func ShowModelInfo(ctx *context.Context) {
-	ctx.Data["ID"] = ctx.Query("ID")
+	ctx.Data["ID"] = ctx.Query("id")
 	ctx.Data["name"] = ctx.Query("name")
 	ctx.Data["isModelManage"] = true
 	ctx.Data["ModelManageAccess"] = ctx.Repo.CanWrite(models.UnitTypeModelManage)
@@ -628,6 +669,19 @@ func ShowModelInfo(ctx *context.Context) {
 	ctx.HTML(200, tplModelInfo)
 }
 
+func QueryModelById(ctx *context.Context) {
+	id := ctx.Query("id")
+	model, err := models.QueryModelById(id)
+	if err == nil {
+		model.IsCanOper = isOper(ctx, model.UserId)
+		model.IsCanDelete = isCanDelete(ctx, model.UserId)
+		removeIpInfo(model)
+		ctx.JSON(http.StatusOK, model)
+	} else {
+		ctx.JSON(http.StatusNotFound, nil)
+	}
+}
+
 func ShowSingleModel(ctx *context.Context) {
 	name := ctx.Query("name")
 
@@ -836,8 +890,8 @@ func ModifyModel(id string, description string) error {
 
 func ModifyModelInfo(ctx *context.Context) {
 	log.Info("modify model start.")
-	id := ctx.Query("ID")
-	description := ctx.Query("Description")
+	id := ctx.Query("id")
+	description := ctx.Query("description")
 
 	task, err := models.QueryModelById(id)
 	if err != nil {
@@ -902,28 +956,36 @@ func QueryModelListForPredict(ctx *context.Context) {
 }
 
 func QueryModelFileForPredict(ctx *context.Context) {
-	id := ctx.Query("ID")
+	id := ctx.Query("id")
+	if id == "" {
+		id = ctx.Query("ID")
+	}
+	ctx.JSON(http.StatusOK, QueryModelFileByID(id))
+}
+
+func QueryModelFileByID(id string) []storage.FileInfo {
 	model, err := models.QueryModelById(id)
 	if err == nil {
 		if model.Type == models.TypeCloudBrainTwo {
 			prefix := model.Path[len(setting.Bucket)+1:]
 			fileinfos, _ := storage.GetAllObjectByBucketAndPrefix(setting.Bucket, prefix)
-			ctx.JSON(http.StatusOK, fileinfos)
+			return fileinfos
 		} else if model.Type == models.TypeCloudBrainOne {
 			prefix := model.Path[len(setting.Attachment.Minio.Bucket)+1:]
 			fileinfos, _ := storage.GetAllObjectByBucketAndPrefixMinio(setting.Attachment.Minio.Bucket, prefix)
-			ctx.JSON(http.StatusOK, fileinfos)
+			return fileinfos
 		}
 	} else {
 		log.Error("no such model!", err.Error())
-		ctx.ServerError("no such model:", err)
-		return
 	}
-
+	return nil
 }
 
 func QueryOneLevelModelFile(ctx *context.Context) {
-	id := ctx.Query("ID")
+	id := ctx.Query("id")
+	if id == "" {
+		id = ctx.Query("ID")
+	}
 	parentDir := ctx.Query("parentDir")
 	model, err := models.QueryModelById(id)
 	if err != nil {
diff --git a/templates/repo/cloudbrain/inference/new.tmpl b/templates/repo/cloudbrain/inference/new.tmpl
index df737f995..f2b389393 100644
--- a/templates/repo/cloudbrain/inference/new.tmpl
+++ b/templates/repo/cloudbrain/inference/new.tmpl
@@ -331,9 +331,7 @@
                 $('#model_name_version').empty()
                 let html = ''
                 nameMap[value].forEach(element => {
-                    let {TrainTaskInfo} = element
-                    TrainTaskInfo = JSON.parse(TrainTaskInfo)
-                    html += `<div class="item" data-label="${element.Label}" data-id="${element.ID}" data-value="${element.Path}">${element.Version}</div>`
+                    html += `<div class="item" data-label="${element.label}" data-id="${element.id}" data-value="${element.path}">${element.version}</div>`
                 });
                 $('#model_name_version').append(html)
                 $("#select_model_version").removeClass("loading")
@@ -387,7 +385,7 @@
     }
     function loadCheckpointList(value){
         return new Promise((resolve,reject)=>{
-            $.get(`${RepoLink}/modelmanage/query_modelfile_for_predict`,{ID:value}, (data) => {
+            $.get(`${RepoLink}/modelmanage/query_modelfile_for_predict`,{id:value}, (data) => {
                 resolve(data)
             })
         })
diff --git a/templates/repo/cloudbrain/trainjob/show.tmpl b/templates/repo/cloudbrain/trainjob/show.tmpl
index 44ac57319..2e4d5689b 100644
--- a/templates/repo/cloudbrain/trainjob/show.tmpl
+++ b/templates/repo/cloudbrain/trainjob/show.tmpl
@@ -633,24 +633,24 @@
 
                     <div class="required inline field">
                         <label>{{.i18n.Tr "repo.modelarts.train_job"}}</label>
-                        <input type="hidden"  class="width83" id="JobId" name="JobId" readonly required>
-                        <input type="hidden" id="VersionName" name="VersionName" value="V0001">
+                        <input type="hidden"  class="width83" id="jobId" name="jobId" readonly required>
+                        <input type="hidden" id="versionName" name="versionName" value="V0001">
                         <input style="width: 45%;" id="JobName" readonly required>
                     </div>
 
                     <div class="required inline field" id="modelname">
                         <label>{{.i18n.Tr "repo.model.manage.model_name"}}</label>
-                        <input style="width: 45%;" id="name" name="Name" required maxlength="25"
+                        <input style="width: 45%;" id="name" name="name" required maxlength="25"
                             onkeyup="this.value=this.value.replace(/[, ]/g,'')">
                     </div>
                     <div class="required inline field" id="verionname">
                         <label>{{.i18n.Tr "repo.modelconvert.modelversion"}}</label>
-                        <input style="width: 45%;" id="version" name="Version" value="" readonly required maxlength="255">
+                        <input style="width: 45%;" id="version" name="version" value="" readonly required maxlength="255">
                     </div>
                     <div class="unite min_title inline field required">
                         <label>{{.i18n.Tr "repo.model.manage.engine"}}</label>
                         <div class="ui dropdown selection search width70" id="choice_Engine">
-                            <input type="hidden" id="Engine" name="Engine" required>
+                            <input type="hidden" id="engine" name="engine" required>
                             <div class="default text">{{.i18n.Tr "repo.model.manage.select.engine"}}</div>
                             <i class="dropdown icon"></i>
                             <div class="menu" id="job-Engine">
@@ -677,12 +677,12 @@
                     </div>
                     <div class="inline field">
                         <label>{{.i18n.Tr "repo.model.manage.modellabel"}}</label>
-                        <input style="width: 83%;margin-left: 7px;" id="label" name="Label" maxlength="255"
+                        <input style="width: 83%;margin-left: 7px;" id="label" name="label" maxlength="255"
                             placeholder='{{.i18n.Tr "repo.modelarts.train_job.label_place"}}'>
                     </div>
                     <div class="inline field">
                         <label for="description">{{.i18n.Tr "repo.model.manage.modeldesc"}}</label>
-                        <textarea style="width: 83%;margin-left: 7px;" id="Description" name="Description" rows="3"
+                        <textarea style="width: 83%;margin-left: 7px;" id="description" name="description" rows="3"
                             maxlength="255" placeholder='{{.i18n.Tr "repo.modelarts.train_job.new_place"}}'
                             onchange="this.value=this.value.substring(0, 255)"
                             onkeydown="this.value=this.value.substring(0, 255)"
@@ -850,23 +850,19 @@
             .modal({
                 centered: false,
                 onShow: function () {
-                    $('input[name="Version"]').addClass('model_disabled')
-                    // $('input[name="JobId"]').text(obj.JobName)
+                    $('input[name="version"]').addClass('model_disabled')
                     $('#JobName').val(obj.DisplayJobName).addClass('model_disabled')
-                    $('input[name="JobId"]').val(obj.JobID)
-                    $('input[name="VersionName"]').val("V0001")
+                    $('input[name="jobId"]').val(obj.JobID)
+                    $('input[name="versionName"]').val("V0001")
                    
                     $('#choice_Engine .default.text').text("PyTorch");
-                    $('#choice_Engine input[name="Engine"]').val(0)
+                    $('#choice_Engine input[name="engine"]').val(0)
                     $('#choice_Engine .default.text').css({ "color": "rgb(0, 0, 0,0.87)" })
                     $('.ui.dimmer').css({ "background-color": "rgb(136, 136, 136,0.7)" })
                     createModelName();
                     loadSelectedModelFile(obj);
                 },
                 onHide: function () {
-                    var cityObj = $("#modelSelectedFile");
-			        cityObj.attr("value", "");
-                    document.getElementById("formId").reset();
                     $('.ui.dimmer').css({ "background-color": "" })
                     $('.ui.error.message').text()
                     $('.ui.error.message').css('display', 'none')
@@ -887,8 +883,14 @@
             type: 'POST',
             data: data,
             success: function (res) {
-                $('input[name="Engine_name"]').val("");
-                $('input[name="Engine"]').val("");
+                $('input[name="engine_name"]').val("");
+                $('input[name="engine"]').val("");
+                $('input[name="jobId"]').val("");
+                $('input[name="label"]').val("");
+                $('input[name="description"]').val("");
+                var cityObj = $("#modelSelectedFile");
+			    cityObj.attr("value", "");
+                document.getElementById("formId").reset();
                 location.href = `/${userName}/${repoPath}/modelmanage/show_model`
                 $('.ui.modal.second').modal('hide')
             },
diff --git a/templates/repo/grampus/trainjob/show.tmpl b/templates/repo/grampus/trainjob/show.tmpl
index 38676cd5c..ce257da9a 100755
--- a/templates/repo/grampus/trainjob/show.tmpl
+++ b/templates/repo/grampus/trainjob/show.tmpl
@@ -624,24 +624,24 @@
 
                     <div class="required inline field">
                         <label>{{.i18n.Tr "repo.modelarts.train_job"}}</label>
-                        <input type="hidden"  class="width83" id="JobId" name="JobId" readonly required>
-                        <input type="hidden" id="VersionName" name="VersionName" value="V0001">
+                        <input type="hidden"  class="width83" id="jobId" name="jobId" readonly required>
+                        <input type="hidden" id="versionName" name="versionName" value="V0001">
                         <input style="width: 45%;" id="JobName" readonly required>
                     </div>
 
                     <div class="required inline field" id="modelname">
                         <label>{{.i18n.Tr "repo.model.manage.model_name"}}</label>
-                        <input style="width: 45%;" id="name" name="Name" required maxlength="25"
+                        <input style="width: 45%;" id="name" name="name" required maxlength="25"
                             onkeyup="this.value=this.value.replace(/[, ]/g,'')">
                     </div>
                     <div class="required inline field" id="verionname">
                         <label>{{.i18n.Tr "repo.modelconvert.modelversion"}}</label>
-                        <input style="width: 45%;" id="version" name="Version" value="" readonly required maxlength="255">
+                        <input style="width: 45%;" id="version" name="version" value="" readonly required maxlength="255">
                     </div>
                     <div class="unite min_title inline field required">
                         <label>{{.i18n.Tr "repo.model.manage.engine"}}</label>
                         <div class="ui dropdown selection search width70" id="choice_Engine">
-                            <input type="hidden" id="Engine" name="Engine" required>
+                            <input type="hidden" id="engine" name="engine" required>
                             <div class="default text">{{.i18n.Tr "repo.model.manage.select.engine"}}</div>
                             <i class="dropdown icon"></i>
                             <div class="menu" id="job-Engine">
@@ -669,12 +669,12 @@
                     </div>
                     <div class="inline field">
                         <label>{{.i18n.Tr "repo.model.manage.modellabel"}}</label>
-                        <input style="width: 83%;margin-left: 7px;" id="label" name="Label" maxlength="255"
+                        <input style="width: 83%;margin-left: 7px;" id="label" name="label" maxlength="255"
                             placeholder='{{.i18n.Tr "repo.modelarts.train_job.label_place"}}'>
                     </div>
                     <div class="inline field">
                         <label for="description">{{.i18n.Tr "repo.model.manage.modeldesc"}}</label>
-                        <textarea style="width: 83%;margin-left: 7px;" id="Description" name="Description" rows="3"
+                        <textarea style="width: 83%;margin-left: 7px;" id="description" name="description" rows="3"
                             maxlength="255" placeholder='{{.i18n.Tr "repo.modelarts.train_job.new_place"}}'
                             onchange="this.value=this.value.substring(0, 255)"
                             onkeydown="this.value=this.value.substring(0, 255)"
@@ -762,7 +762,6 @@
 	function showMenu() {
 			var cityObj = $("#modelSelectedFile");
 			var cityOffset = $("#modelSelectedFile").offset();
-			//$("#menuContent").css({left:cityOffset.left + "px", top:cityOffset.top + cityObj.outerHeight() + "px"}).slideDown("fast");
             $("#menuContent").slideDown("fast");
 			$("body").bind("mousedown", onBodyDown);
 	}
@@ -861,11 +860,10 @@
             .modal({
                 centered: false,
                 onShow: function () {
-                    $('input[name="Version"]').addClass('model_disabled')
-                    // $('input[name="JobId"]').text(obj.JobName)
+                    $('input[name="version"]').addClass('model_disabled')
                     $('#JobName').val(obj.DisplayJobName).addClass('model_disabled')
-                    $('input[name="JobId"]').val(obj.JobID)
-                    $('input[name="VersionName"]').val("V0001")
+                    $('input[name="jobId"]').val(obj.JobID)
+                    $('input[name="versionName"]').val("V0001")
                    
                    if(obj.ComputeResource=="NPU"){
                          if (obj.EngineName != null && obj.EngineName != "") {
@@ -873,16 +871,16 @@
                             srcEngine = srcEngine.trim().toLowerCase();
                              if (srcEngine == 'tensorflow') {
                                 $('#choice_Engine .default.text').text("TensorFlow");
-                                $('#choice_Engine input[name="Engine"]').val(1)
+                                $('#choice_Engine input[name="engine"]').val(1)
                              }
                               if (srcEngine == 'mindspore') {
                                 $('#choice_Engine .default.text').text("MindSpore");
-                                $('#choice_Engine input[name="Engine"]').val(2)
+                                $('#choice_Engine input[name="engine"]').val(2)
                               }
                         }
                    }else{
                         $('#choice_Engine .default.text').text("PyTorch");
-                        $('#choice_Engine input[name="Engine"]').val(0)
+                        $('#choice_Engine input[name="engine"]').val(0)
                     }
                    $('#choice_Engine .default.text').css({ "color": "rgb(0, 0, 0,0.87)" })
                    $('.ui.dimmer').css({ "background-color": "rgb(136, 136, 136,0.7)" })
@@ -890,9 +888,6 @@
                    loadSelectedModelFile(obj);
                 },
                 onHide: function () {
-                    var cityObj = $("#modelSelectedFile");
-			        cityObj.attr("value", "");
-                    document.getElementById("formId").reset();
                     $('.ui.dimmer').css({ "background-color": "" })
                     $('.ui.error.message').text()
                     $('.ui.error.message').css('display', 'none')
@@ -914,8 +909,14 @@
             type: 'POST',
             data: data,
             success: function (res) {
-                $('input[name="Engine_name"]').val("");
-                $('input[name="Engine"]').val("");
+                $('input[name="engine_name"]').val("");
+                $('input[name="engine"]').val("");
+                $('input[name="jobId"]').val("");
+                $('input[name="label"]').val("");
+                $('input[name="description"]').val("");
+                var cityObj = $("#modelSelectedFile");
+			    cityObj.attr("value", "");
+                document.getElementById("formId").reset();
                 location.href = `/${userName}/${repoPath}/modelmanage/show_model`
                 $('.ui.modal.second').modal('hide')
             },
diff --git a/templates/repo/modelarts/inferencejob/new.tmpl b/templates/repo/modelarts/inferencejob/new.tmpl
index 48d64cf56..3d196a24f 100644
--- a/templates/repo/modelarts/inferencejob/new.tmpl
+++ b/templates/repo/modelarts/inferencejob/new.tmpl
@@ -362,9 +362,7 @@
                 $('#model_name_version').empty()
                 let html = ''
                 nameMap[value].forEach(element => {
-                    let {TrainTaskInfo} = element
-                    TrainTaskInfo = JSON.parse(TrainTaskInfo)
-                    html += `<div class="item" data-label="${element.Label}" data-id="${element.ID}" data-value="${element.Path}">${element.Version}</div>`
+                    html += `<div class="item" data-label="${element.label}" data-id="${element.id}" data-value="${element.path}">${element.version}</div>`
                 });
                 $('#model_name_version').append(html)
                 $("#select_model_version").removeClass("loading")
@@ -418,7 +416,7 @@
     }
     function loadCheckpointList(value){
         return new Promise((resolve,reject)=>{
-            $.get(`${RepoLink}/modelmanage/query_modelfile_for_predict`,{ID:value}, (data) => {
+            $.get(`${RepoLink}/modelmanage/query_modelfile_for_predict`,{id:value}, (data) => {
                 resolve(data)
             })
         })
diff --git a/templates/repo/modelarts/trainjob/show.tmpl b/templates/repo/modelarts/trainjob/show.tmpl
index 938470fd2..1bd6a8ecb 100755
--- a/templates/repo/modelarts/trainjob/show.tmpl
+++ b/templates/repo/modelarts/trainjob/show.tmpl
@@ -662,29 +662,29 @@
                     <div class="two inline fields ">
                         <div class="required ten wide field">
                             <label>{{.i18n.Tr "repo.modelarts.train_job"}}</label>&nbsp;
-                            <input type="hidden" class="width83" id="JobId" name="JobId" readonly required>
+                            <input type="hidden" class="width83" id="jobId" name="jobId" readonly required>
                             <input class="width83" id="JobName" readonly required>
 
                         </div>
                         <div class="required six widde field">
                             <label>{{.i18n.Tr "repo.model.manage.version"}}</label>
-                            <input class="width70" id="VersionName" name="VersionName" readonly required>
+                            <input class="width70" id="versionName" name="versionName" readonly required>
                         </div>
                     </div>
 
                     <div class="required inline field" id="modelname">
                         <label>{{.i18n.Tr "repo.model.manage.model_name"}}</label>
-                        <input style="width: 45%;" id="name" name="Name" required maxlength="25"
+                        <input style="width: 45%;" id="name" name="name" required maxlength="25"
                             onkeyup="this.value=this.value.replace(/[, ]/g,'')">
                     </div>
                     <div class="required inline field" id="verionname">
                         <label>{{.i18n.Tr "repo.modelconvert.modelversion"}}</label>
-                        <input style="width: 45%;" id="version" name="Version" value="" readonly required maxlength="255">
+                        <input style="width: 45%;" id="version" name="version" value="" readonly required maxlength="255">
                     </div>
                      <div class="unite min_title inline field required">
                         <label>{{.i18n.Tr "repo.model.manage.engine"}}</label>
-                        <input type="hidden" id="Engine" name="Engine" required>
-                        <input style="width: 45%;" id="Engine_name" name="Engine_name" readonly required maxlength="255">
+                        <input type="hidden" id="engine" name="engine" required>
+                        <input style="width: 45%;" id="engine_name" name="engine_name" readonly required maxlength="255">
                     </div>
                     <div class="unite min_title inline fields required">
                         <div class="field required">
@@ -699,12 +699,12 @@
                     </div>
                     <div class="inline field">
                         <label>{{.i18n.Tr "repo.model.manage.modellabel"}}</label>
-                        <input style="width: 83%;margin-left: 7px;" id="label" name="Label" maxlength="255"
+                        <input style="width: 83%;margin-left: 7px;" id="label" name="label" maxlength="255"
                             placeholder='{{.i18n.Tr "repo.modelarts.train_job.label_place"}}'>
                     </div>
                     <div class="inline field">
                         <label for="description">{{.i18n.Tr "repo.model.manage.modeldesc"}}</label>
-                        <textarea style="width: 83%;margin-left: 7px;" id="Description" name="Description" rows="3"
+                        <textarea style="width: 83%;margin-left: 7px;" id="description" name="description" rows="3"
                             maxlength="255" placeholder='{{.i18n.Tr "repo.modelarts.train_job.new_place"}}'
                             onchange="this.value=this.value.substring(0, 255)"
                             onkeydown="this.value=this.value.substring(0, 255)"
@@ -726,7 +726,6 @@
 
         </div>
     </div>
-    
 </div>
 {{template "base/footer" .}}
 
@@ -899,27 +898,23 @@
             .modal({
                 centered: false,
                 onShow: function () {
-                    $('input[name="Version"]').addClass('model_disabled')
-                    // $('input[name="JobId"]').text(obj.JobName)
+                    $('input[name="version"]').addClass('model_disabled')
                     $('#JobName').val(obj.DisplayJobName).addClass('model_disabled')
-                    $('input[name="JobId"]').val(obj.JobID)
-                    $('input[name="VersionName"]').val(obj.VersionName).addClass('model_disabled')
+                    $('input[name="jobId"]').val(obj.JobID)
+                    $('input[name="versionName"]').val(obj.VersionName).addClass('model_disabled')
                     if(obj.EngineID ==122 || obj.EngineID ==35 || obj.EngineID ==-1 || obj.EngineID ==37){
-                        $('input[name="Engine_name"]').val("MindSpore").addClass('model_disabled');
-                        $('input[name="Engine"]').val(2);
+                        $('input[name="engine_name"]').val("MindSpore").addClass('model_disabled');
+                        $('input[name="engine"]').val(2);
                     }
                     if(obj.EngineID ==121 || obj.EngineID ==38){
-                        $('input[name="Engine_name"]').val("TensorFlow").addClass('model_disabled');
-                        $('input[name="Engine"]').val(1);
+                        $('input[name="engine_name"]').val("TensorFlow").addClass('model_disabled');
+                        $('input[name="engine"]').val(1);
                     }
                     $('.ui.dimmer').css({ "background-color": "rgb(136, 136, 136,0.7)" })
                     createModelName();
                     loadSelectedModelFile(obj);
                 },
                 onHide: function () {
-                    var cityObj = $("#modelSelectedFile");
-			        cityObj.attr("value", "");
-                    document.getElementById("formId").reset();
                     $('.ui.dimmer').css({ "background-color": "" })
                     $('.ui.error.message').text()
                     $('.ui.error.message').css('display', 'none')
@@ -940,8 +935,14 @@
             type: 'POST',
             data: data,
             success: function (res) {
-                $('input[name="Engine_name"]').val("");
-                $('input[name="Engine"]').val("");
+                $('input[name="engine_name"]').val("");
+                $('input[name="engine"]').val("");
+                $('input[name="jobId"]').val("");
+                $('input[name="label"]').val("");
+                $('input[name="description"]').val("");
+                var cityObj = $("#modelSelectedFile");
+			    cityObj.attr("value", "");
+                document.getElementById("formId").reset();
                 location.href = `/${userName}/${repoPath}/modelmanage/show_model`
                 $('.ui.modal.second').modal('hide')
             },
diff --git a/templates/repo/modelmanage/convertIndex.tmpl b/templates/repo/modelmanage/convertIndex.tmpl
index 05b5306c8..5d7f10d32 100644
--- a/templates/repo/modelmanage/convertIndex.tmpl
+++ b/templates/repo/modelmanage/convertIndex.tmpl
@@ -93,7 +93,7 @@
                         <div class="ui grid stackable item">
                             <div class="row">
                                   <div class="three wide column padding0">
-                                    <a class="title" href="{{$.RepoLink}}/modelmanage/show_model_convert_info?ID={{.ID}}" title="{{.Name}}" style="font-size: 14px;">
+                                    <a class="title" href="{{$.RepoLink}}/modelmanage/show_model_convert_info?id={{.ID}}" title="{{.Name}}" style="font-size: 14px;">
                                         <span class="fitted" style="width: 90%;vertical-align: middle;">{{.Name}}</span>
                                     </a>
                                   </div>
@@ -141,7 +141,7 @@
                                        </form>
 
                                          {{if .IsCanOper}}
-                                            <a id="ai-download-{{.ID}}"  href="{{$.Repository.HTMLURL}}/modelmanage/download_model_convert/{{.ID}}?AllDownload=true&a=1" class='ui basic {{if eq .Status "SUCCEEDED" "COMPLETED"}}blue {{else}}disabled {{end}}button'  style="border-radius: .28571429rem;">
+                                            <a id="ai-download-{{.ID}}"  href="{{$.Repository.HTMLURL}}/modelmanage/download_model_convert/{{.ID}}?allDownload=true&a=1" class='ui basic {{if eq .Status "SUCCEEDED" "COMPLETED"}}blue {{else}}disabled {{end}}button'  style="border-radius: .28571429rem;">
                                                 {{$.i18n.Tr "repo.modelconvert.download"}}
                                             </a>
                                         {{else}}
@@ -233,7 +233,7 @@
                     </div>
                     
                     <div class="ui dropdown selection search eight wide field" id="choice_version">
-                            <input type="hidden" id="ModelVersion" name="ModelVersion" required>
+                            <input type="hidden" id="modelVersion" name="modelVersion" required>
                             <div class="default text">{{$.i18n.Tr "repo.modelconvert.selectversion"}}</div>
                             <i class="dropdown icon"></i>
                             <div class="menu" id="model-version">
@@ -246,7 +246,7 @@
                         <label for="choice_file">{{$.i18n.Tr "repo.model.manage.modelfile"}}</label>
                     </div>
                     <div class="ui dropdown selection search eight wide field" id="choice_file">
-                            <input type="hidden" id="ModelFile" name="ModelFile" required>
+                            <input type="hidden" id="modelFile" name="modelFile" required>
                             <div class="default text">{{$.i18n.Tr "repo.modelconvert.selectmodelfile"}}</div>
                             <i class="dropdown icon"></i>
                             <div class="menu" id="model-file">
@@ -260,10 +260,10 @@
                 </div>
                 <div class="unite min_title inline fields required">
                     <div class="three wide field right aligned">
-                        <label for="SrcEngine">{{$.i18n.Tr "repo.modelconvert.srcengine"}}</label>
+                        <label for="srcEngine">{{$.i18n.Tr "repo.modelconvert.srcengine"}}</label>
                     </div>
                     
-                    <select id="SrcEngine" class="ui search dropdown eight wide field" placeholder="" style='color:#000000;' name="SrcEngine" onchange="javascript:srcEngineChanged()">
+                    <select id="srcEngine" class="ui search dropdown eight wide field" placeholder="" style='color:#000000;' name="srcEngine" onchange="javascript:srcEngineChanged()">
                         
                     </select>
                 </div>
@@ -289,30 +289,30 @@
                 
                 <div class="unite min_title inline fields required">
                     <div class="three wide field right aligned">
-                        <label for="DestFormat">{{$.i18n.Tr "repo.modelconvert.outputformat"}}</label>
+                        <label for="destFormat">{{$.i18n.Tr "repo.modelconvert.outputformat"}}</label>
                     </div>
        
-                    <select id="DestFormat" class="ui search dropdown eight wide field" placeholder="" style='width:50%' name="DestFormat">
+                    <select id="destFormat" class="ui search dropdown eight wide field" placeholder="" style='width:50%' name="destFormat">
  
                     </select>
                     
                 </div>
                 <div class="unite min_title inline fields">
                     <div class="three wide field right aligned">
-                        <label for="NetOutputFormat">{{$.i18n.Tr "repo.modelconvert.netoutputdata"}}&nbsp;&nbsp;</label>
+                        <label for="netOutputFormat">{{$.i18n.Tr "repo.modelconvert.netoutputdata"}}&nbsp;&nbsp;</label>
                     </div>
    
-                    <select id="NetOutputFormat" class="ui search dropdown eight wide field" placeholder="" style='width:50%' name="NetOutputFormat">
+                    <select id="netOutputFormat" class="ui search dropdown eight wide field" placeholder="" style='width:50%' name="netOutputFormat">
 
                     </select>
                     
                 </div>
                 <div class="unite min_title inline fields">
                     <div class="three wide field right aligned">
-                        <label for="Description">{{$.i18n.Tr "repo.modelconvert.taskdesc"}}&nbsp;&nbsp;</label>
+                        <label for="description">{{$.i18n.Tr "repo.modelconvert.taskdesc"}}&nbsp;&nbsp;</label>
                     </div>
                     <div class="twelve wide field">
-                        <textarea  id="Description" name="Description" rows="1" maxlength="255" placeholder='{{.i18n.Tr "repo.modelarts.train_job.new_place"}}' onchange="this.value=this.value.substring(0, 255)" onkeydown="this.value=this.value.substring(0, 255)" onkeyup="this.value=this.value.substring(0, 256)"></textarea>
+                        <textarea  id="description" name="description" rows="1" maxlength="255" placeholder='{{.i18n.Tr "repo.modelarts.train_job.new_place"}}' onchange="this.value=this.value.substring(0, 255)" onkeydown="this.value=this.value.substring(0, 255)" onkeyup="this.value=this.value.substring(0, 256)"></textarea>
                     </div>
                 </div>
                 <div class="unite min_title inline field">
@@ -364,9 +364,9 @@
             $("#task_name").removeClass("error")
         }
 
-        data['desc']= $('#Description').val()
-        data['modelId'] = $('#ModelVersion').val()
-        data['SrcEngine'] = $('#SrcEngine').val();
+        data['desc']= $('#description').val()
+        data['modelId'] = $('#modelVersion').val()
+        data['srcEngine'] = $('#srcEngine').val();
         data['inputshape']= $('#inputshape').val();
 
         if(inputshapeNotValid(data['inputshape'])){
@@ -379,10 +379,10 @@
         }
 
         data['inputdataformat']= $('#inputdataformat').val();
-        data['DestFormat'] = $('#DestFormat').val();
-        data['NetOutputFormat']= $('#NetOutputFormat').val();
-        data['ModelFile'] = $('#ModelFile').val();
-        if(data['ModelFile']==""){
+        data['destFormat'] = $('#destFormat').val();
+        data['netOutputFormat']= $('#netOutputFormat').val();
+        data['modelFile'] = $('#modelFile').val();
+        if(data['modelFile']==""){
             $('.ui.error.message').text("{{.i18n.Tr "repo.modelconvert.modelfileempty"}}")
             $('.ui.error.message').css('display','block')
             $("#ModelFile_Div").addClass("error")
@@ -392,11 +392,11 @@
         }
         $.post(`${repolink}/modelmanage/create_model_convert`,data,(result) => {
             console.log("result=" + result);
-            if(result.result_code ==0){
+            if(result.code ==0){
                 $('.ui.modal.second').modal('hide');
                 window.location.reload();
             }else{
-                $('.ui.error.message').text(result.message)
+                $('.ui.error.message').text(result.msg)
                 $('.ui.error.message').css('display','block')
             }
         })
@@ -456,7 +456,7 @@
         $('#choice_version').dropdown({
         onChange:function(value){
                 console.log("model version:" + value);
-                $('#choice_version input[name="ModelVersion"]').val(value)
+                $('#choice_version input[name="modelVersion"]').val(value)
                 loadModelFile(value);
             }
         })
@@ -464,26 +464,26 @@
          $('#choice_file').dropdown({
         onChange:function(value){
             console.log("model file:" + value);
-            $('#choice_file input[name="ModelFile"]').val(value)
+            $('#choice_file input[name="modelFile"]').val(value)
             }
         })
 
     })
 
     function srcEngineChanged(){
-        var ele = window.document.getElementById("SrcEngine");
+        var ele = window.document.getElementById("srcEngine");
         var index=ele.selectedIndex;
         var options=ele.options;
         var option = options[index];
-        console.log("SrcEngine value=" + option);
+        console.log("srcEngine value=" + option);
         let destFormatHtml = "<option name=\"ONNX\" value=\"0\">ONNX</option>";
         let netOutputFormatHtml = "<option name=\"FP32\" value=\"0\">FP32</option>";
         if(option==null || option =="undefined" || option.value == 0){
              destFormatHtml += "<option name=\"TensorRT\" value=\"1\">TensorRT</option>"
              netOutputFormatHtml += "<option name=\"FP16\" value=\"1\">FP16</option>";
         }
-        $('#DestFormat').html(destFormatHtml);
-        $('#NetOutputFormat').html(netOutputFormatHtml);
+        $('#destFormat').html(destFormatHtml);
+        $('#netOutputFormat').html(netOutputFormatHtml);
     }
    
     function loadModelList(){
@@ -509,7 +509,7 @@
         if(modelId ==null || modelId ==""){
              console.log("modelId is null");
         }else{
-            $.get(`${repolink}/modelmanage/query_modelfile_for_predict?ID=${modelId}`, (data) => {
+            $.get(`${repolink}/modelmanage/query_modelfile_for_predict?id=${modelId}`, (data) => {
                 const n_length = data.length
                 let file_html=''
                 let firstFileName =''
@@ -526,7 +526,7 @@
                 }
                 $("#model-file").append(file_html)
                 $('#choice_file .default.text').text(firstFileName)
-                $('#choice_file input[name="ModelFile"]').val(firstFileName)
+                $('#choice_file input[name="modelFile"]').val(firstFileName)
             })
 
         }
@@ -550,19 +550,19 @@
             n_length = versionList.length
             let train_html=''
             for (let i=0;i<n_length;i++){
-                    train_html += `<div class="item" data-value="${versionList[i].ID}">${versionList[i].Version}</div>`
+                    train_html += `<div class="item" data-value="${versionList[i].id}">${versionList[i].version}</div>`
                     train_html += '</div>'
             }
             $("#model-version").append(train_html)
             
-            $('#choice_version .default.text').text(versionList[0].Version)
-            $('#choice_version input[name="ModelVersion"]').val(versionList[0].ID)
-            loadModelFile(versionList[0].ID);
+            $('#choice_version .default.text').text(versionList[0].version)
+            $('#choice_version input[name="modelVersion"]').val(versionList[0].id)
+            loadModelFile(versionList[0].id);
         }
         setEngineValue(value);
     }
     function setEngineValue(value){
-        $('#SrcEngine').dropdown('clear');
+        $('#srcEngine').dropdown('clear');
         console.log("setEngineValue value=" + value);
         let html = ""
         html +="<option name=\"PyTorch\" " + getSelected(0,value) +  " value=\"0\">PyTorch</option>";
@@ -580,13 +580,13 @@
         let nameMap = modelData.nameMap
         let versionList = nameMap[modelName]
         if(versionList != null && versionList.length >0){
-            if(versionList[0].Engine == engineOption){
+            if(versionList[0].engine == engineOption){
                 return "selected=\"selected\"";
             }else{
-                if((versionList[0].Engine==122 || versionList[0].Engine==37) && engineOption==2){
+                if((versionList[0].engine==122 || versionList[0].engine==37) && engineOption==2){
                     return "selected=\"selected\"";
                 }
-                if((versionList[0].Engine==121 || versionList[0].Engine==38) && engineOption==1){
+                if((versionList[0].engine==121 || versionList[0].engine==38) && engineOption==1){
                     return "selected=\"selected\"";
                 }
             }
diff --git a/templates/repo/modelmanage/index.tmpl b/templates/repo/modelmanage/index.tmpl
index 062e1908f..2699bed01 100644
--- a/templates/repo/modelmanage/index.tmpl
+++ b/templates/repo/modelmanage/index.tmpl
@@ -138,20 +138,20 @@
                 <input type="hidden" name="_csrf" value="">
                 <div class="inline fields">
                     <div class="required two wide field right aligned">
-                        <label for="JobId">{{.i18n.Tr "repo.model.manage.select.trainjob"}}</label>
+                        <label for="jobId">{{.i18n.Tr "repo.model.manage.select.trainjob"}}</label>
                     </div>
                     <div class="required thirteen wide inline field">
                         <div class="ui dropdown selection search loading" id="choice_model">
-                            <input type="hidden" id="JobId" name="JobId" required>
+                            <input type="hidden" id="jobId" name="jobId" required>
                             <div class="default text">{{.i18n.Tr "repo.model.manage.select.trainjob"}}</div>
                             <i class="dropdown icon"></i>
                             <div class="menu" id="job-name">
                             </div>
                         </div>
-                        <label for="VersionName">{{.i18n.Tr "repo.model.manage.version"}}</label>
+                        <label for="versionName">{{.i18n.Tr "repo.model.manage.version"}}</label>
                         <span>&nbsp;</span>
                         <div class="ui dropdown selection search" id="choice_version">
-                            <input type="hidden" id="VersionName" name="VersionName" required>
+                            <input type="hidden" id="versionName" name="versionName" required>
                             <div class="default text">{{.i18n.Tr "repo.model.manage.select.version"}}</div>
                             <i class="dropdown icon"></i>
                             <div class="menu" id="job-version">
@@ -162,18 +162,18 @@
                 </div>
                 <div class="required inline fields" id="modelname">
                     <div class="two wide field right aligned">
-                        <label for="Name">{{.i18n.Tr "repo.model.manage.model_name"}}</label>
+                        <label for="name">{{.i18n.Tr "repo.model.manage.model_name"}}</label>
                     </div>
                     <div class="eight wide field">
-                        <input id="name" name="Name" required maxlength="25" onkeyup="this.value=this.value.replace(/[, ]/g,'')">
+                        <input id="name" name="name" required maxlength="25" onkeyup="this.value=this.value.replace(/[, ]/g,'')">
                     </div>
                 </div>
-                <div class="required inline fields" id="verionname">
+                <div class="required inline fields" id="verionName">
                     <div class="two wide field right aligned">
-                        <label for="Version">{{.i18n.Tr "repo.model.manage.version"}}</label>
+                        <label for="version">{{.i18n.Tr "repo.model.manage.version"}}</label>
                     </div>
                     <div class="eight wide field">
-                        <input id="version" name="Version" value="" readonly required maxlength="255">
+                        <input id="version" name="version" value="" readonly required maxlength="255">
                     </div>
                 </div>
 
@@ -182,7 +182,7 @@
                         <label for="Engine">{{.i18n.Tr "repo.model.manage.engine"}}</label>
                     </div>
                     <div class="ui ten wide field dropdown selection search" id="choice_Engine">
-                        <input type="hidden" id="Engine" name="Engine" required>
+                        <input type="hidden" id="engine" name="engine" required>
                         <div class="default text newtext">{{.i18n.Tr "repo.model.manage.select.engine"}}</div>
                         <i class="dropdown icon"></i>
                         <div class="menu" id="job-Engine">
@@ -209,7 +209,7 @@
                         <label for="Label">{{.i18n.Tr "repo.model.manage.modellabel"}} &nbsp</label>
                     </div>
                     <div class="thirteen wide field">
-                        <input id="label" name="Label" maxlength="255" placeholder='{{.i18n.Tr "repo.modelarts.train_job.label_place"}}'>
+                        <input id="label" name="label" maxlength="255" placeholder='{{.i18n.Tr "repo.modelarts.train_job.label_place"}}'>
                     </div>    
                 </div>
                 <div class="inline fields">
@@ -217,7 +217,7 @@
                         <label for="description">{{.i18n.Tr "repo.model.manage.modeldesc"}} &nbsp</label>
                     </div>
                     <div class="thirteen wide field">
-                        <textarea id="Description" name="Description" rows="3"
+                        <textarea id="description" name="description" rows="3"
                             maxlength="255" placeholder='{{.i18n.Tr "repo.modelarts.train_job.new_place"}}'
                             onchange="this.value=this.value.substring(0, 255)"
                             onkeydown="this.value=this.value.substring(0, 255)"
@@ -331,7 +331,7 @@
                     centered: false,
                     onShow: function () {
                         $('#model_header').text({{.i18n.Tr "repo.model.manage.import_new_model"}})
-                        $('input[name="Version"]').addClass('model_disabled')
+                        $('input[name="version"]').addClass('model_disabled')
                         $('.ui.dimmer').css({ "background-color": "rgb(136, 136, 136,0.7)" })
                         $("#job-name").empty()
                         createModelName()
@@ -368,7 +368,7 @@
                     console.log("model version:" + value);
                     if (modelData != null) {
                         for (var i = 0; i < modelData.length; i++) {
-                            if (modelData[i].VersionName == value) {
+                            if (modelData[i].versionName == value) {
                                 setEngine(modelData[i])
                                 loadModelFile(modelData[i])
                                 break;
@@ -406,7 +406,7 @@
                     $("#job-name").append(train_html)
                     $("#choice_model").removeClass("loading")
                     $('#choice_model .default.text').text(data[0].DisplayJobName)
-                    $('#choice_model input[name="JobId"]').val(data[0].JobID)
+                    $('#choice_model input[name="jobId"]').val(data[0].JobID)
                     loadTrainVersion()
                 }else{
                     $("#choice_model").removeClass("loading")
@@ -414,8 +414,9 @@
             })
         }
         function loadTrainVersion(value) {
-            let JobID = !value ? $('#choice_model input[name="JobId"]').val() : value
-            $.get(`${repolink}/modelmanage/query_train_job_version?JobID=${JobID}`, (data) => {
+            let tmp = $('#choice_model input[name="jobId"]').val();
+            let jobId = !value ? $('#choice_model input[name="jobId"]').val() : value
+            $.get(`${repolink}/modelmanage/query_train_job_version?jobId=${jobId}`, (data) => {
                 const n_length = data.length
                 let train_html = '';
                 modelData = data;
@@ -431,7 +432,7 @@
                         versionName = "V0001";
                     }
                     $('#choice_version .default.text').text(versionName)
-                    $('#choice_version input[name="VersionName"]').val(versionName)
+                    $('#choice_version input[name="versionName"]').val(versionName)
                     setEngine(data[0])
                     loadModelFile(data[0])
                 }
@@ -453,7 +454,9 @@
                         type=0;
                     }
                 }
-                $.get(`${repolink}/modelmanage/query_train_model?jobName=${trainJob.JobName}&type=${type}&VersionName=${trainJob.VersionName}`, (data) => {
+                $.get(`${repolink}/modelmanage/query_train_model?jobName=${trainJob.JobName}&type=${type}&versionName=${trainJob.VersionName}`, (data) => {
+                    var cityObj = $("#modelSelectedFile");
+			        cityObj.attr("value", "");
                     const n_length = data.length
                     let file_html=''
                     let firstFileName =''
@@ -518,12 +521,12 @@
                 }
             }
         }
-        function setEngine(modelVersion) {
-            console.log("modelVersion=" + modelVersion);
+        function setEngine(trainJob) {
+            console.log("trainJob=" + trainJob);
             $('#choice_Engine').dropdown('clear')
             $("#job-Engine").empty()
-            if (modelVersion.EngineName != null && modelVersion.EngineName != "") {
-                srcEngine = modelVersion.EngineName.split('-')[0]
+            if (trainJob.EngineName != null && trainJob.EngineName != "") {
+                srcEngine = trainJob.EngineName.split('-')[0]
                 srcEngine = srcEngine.trim().toLowerCase();
                 let selectedText = "PyTorch";
                 let selectedValue = 0;
@@ -548,7 +551,7 @@
                 itemHtml += "<option class=\"item\" data-value=\"3\">Other</option>"
 
                 $('#choice_Engine .default.text').text(selectedText)
-                $('#choice_Engine input[name="Engine"]').val(selectedValue)
+                $('#choice_Engine input[name="engine"]').val(selectedValue)
                 $("#job-Engine").append(itemHtml);
                 $("#choice_Engine").removeClass('disabled');
             } else {
@@ -560,10 +563,9 @@
                 itemHtml += "<option class=\"item\" data-value=\"6\">MXNet</option>"
                 itemHtml += "<option class=\"item\" data-value=\"3\">Other</option>"
                 $('#choice_Engine .default.text').text("PyTorch");
-                $('#choice_Engine input[name="Engine"]').val(0)
+                $('#choice_Engine input[name="engine"]').val(0)
                 $("#job-Engine").append(itemHtml);
                 $("#choice_Engine").removeClass('disabled');
             }
         }
-        
     </script>
\ No newline at end of file
diff --git a/templates/repo/modelmanage/showinfo.tmpl b/templates/repo/modelmanage/showinfo.tmpl
index 6e4aa2b5a..0a29375f1 100644
--- a/templates/repo/modelmanage/showinfo.tmpl
+++ b/templates/repo/modelmanage/showinfo.tmpl
@@ -91,16 +91,16 @@
                         <tbody>
                             <tr>
                                 <td class="ti-text-form-label text-width80">{{$.i18n.Tr "repo.model.manage.model_name"}}</td>
-                                <td class="ti-text-form-content word-elipsis"><span id="ModelName" title=""></span></td>
+                                <td class="ti-text-form-content word-elipsis"><span id="modelName" title=""></span></td>
                             </tr>
                             <tr>
                                 <td class="ti-text-form-label text-width80">{{$.i18n.Tr "repo.model.manage.version"}}</td>
-                                <td class="ti-text-form-content word-elipsis"><span id="Version" title=""></span></td>
+                                <td class="ti-text-form-content word-elipsis"><span id="version" title=""></span></td>
                             </tr>
                             <tr>
                                 <td class="ti-text-form-label text-width80">{{$.i18n.Tr "repo.migrate_items_labels"}}</td>
                                 <td class="ti-text-form-content">
-                                    <div id="Label" style="overflow: hidden;width: 95%;">
+                                    <div id="label" style="overflow: hidden;width: 95%;">
                                         
                                     </div>
                                     
@@ -109,17 +109,17 @@
                             </tr>
                             <tr>
                                 <td class="ti-text-form-label text-width80">{{$.i18n.Tr "repo.modelarts.model_size"}}</td>
-                                <td class="ti-text-form-content word-elipsis"><span id="Size" title=""></span></td>
+                                <td class="ti-text-form-content word-elipsis"><span id="size" title=""></span></td>
                             </tr>
                             <tr>
                                 <td class="ti-text-form-label text-width80">{{$.i18n.Tr "repo.modelarts.createtime"}}</td>
-                                <td class="ti-text-form-content word-elipsis"><span id="CreateTime" title=""></span></td>
+                                <td class="ti-text-form-content word-elipsis"><span id="createTime" title=""></span></td>
                             </tr>
                             <tr>
                                 <td class="ti-text-form-label text-width80">{{$.i18n.Tr "repo.model.manage.description"}}</td>
                                 <td class="ti-text-form-content" >
                                     <div id="edit-td" style="display:flex">
-                                        <span id="Description" title="" class="iword-elipsis"></span>
+                                        <span id="description" title="" class="iword-elipsis"></span>
                                         <i id="edit-pencil" data-id="" data-desc="" class="pencil alternate icon" style="cursor:pointer;vertical-align: top;" id="editor" onclick="editorFn(this)"></i>
                                     </div>
                                 </td>
@@ -127,38 +127,38 @@
                             <tr>
                                 <td class="ti-text-form-label text-width80">{{$.i18n.Tr "repo.modelarts.train_job"}}</td>
                                 <td class="ti-text-form-content word-elipsis">
-                                  <a id="DisplayJobNameHref" class="title" style="font-size: 14px;" target="_blank">
-                                        <span id="DisplayJobName" class="fitted" style="width: 90%;vertical-align: middle;"></span>
+                                  <a id="displayJobNameHref" class="title" style="font-size: 14px;" target="_blank">
+                                        <span id="displayJobName" class="fitted" style="width: 90%;vertical-align: middle;"></span>
                                   </a>
                                 </td>
                             </tr>
                             <tr>
                                 <td class="ti-text-form-label text-width80">{{$.i18n.Tr "repo.modelarts.code_version"}}</td>
-                                <td class="ti-text-form-content word-elipsis"><span id="CodeBranch" title=""></span></td>
+                                <td class="ti-text-form-content word-elipsis"><span id="codeBranch" title=""></span></td>
                             </tr>
                             <tr>
                                 <td class="ti-text-form-label text-width80">{{$.i18n.Tr "repo.modelarts.train_job.start_file"}}</td>
-                                <td class="ti-text-form-content word-elipsis"><span id="BootFile" title=""></span></td>
+                                <td class="ti-text-form-content word-elipsis"><span id="bootFile" title=""></span></td>
                             </tr>
                             <tr>
                                 <td class="ti-text-form-label text-width80">{{$.i18n.Tr "repo.modelarts.train_job.train_dataset"}}</td>
-                                <td class="ti-text-form-content word-elipsis"><span id="DatasetName" title=""></span></td>
+                                <td class="ti-text-form-content word-elipsis"><span id="datasetName" title=""></span></td>
                             </tr>
                             <tr>
                                 <td class="ti-text-form-label text-width80">{{$.i18n.Tr "repo.modelarts.train_job.run_parameter"}}</td>
-                                <td class="ti-text-form-content word-elipsis"><span id="Parameters" title=""></span></td>
+                                <td class="ti-text-form-content word-elipsis"><span id="parameters" title=""></span></td>
                             </tr>
                             <tr>
                                 <td class="ti-text-form-label text-width80">{{$.i18n.Tr "repo.modelarts.train_job.AI_Engine"}}</td>
-                                <td class="ti-text-form-content word-elipsis"><span id="EngineName" title=""></span></td>
+                                <td class="ti-text-form-content word-elipsis"><span id="engineName" title=""></span></td>
                             </tr>
                             <tr>
                                 <td class="ti-text-form-label text-width80">{{$.i18n.Tr "repo.modelarts.train_job.standard"}}</td>
-                                <td class="ti-text-form-content word-elipsis"><span id="FlavorName" title=""></span></td>
+                                <td class="ti-text-form-content word-elipsis"><span id="flavorName" title=""></span></td>
                             </tr>
                             <tr>
                                 <td class="ti-text-form-label text-width80">{{$.i18n.Tr "repo.modelarts.train_job.compute_node"}}</td>
-                                <td class="ti-text-form-content word-elipsis"><span id="WorkServerNumber" title=""></span></td>
+                                <td class="ti-text-form-content word-elipsis"><span id="workServerNumber" title=""></span></td>
                             </tr>
                         </tbody>
                     </table>
@@ -214,47 +214,47 @@ $(document).ready(loadInfo);
 function changeInfo(version){
     $.get(`${url}show_model_info_api?name=${ID}`,(data)=>{
         let versionData = data.filter((item)=>{
-            return item.Version === version
+            return item.version === version
         })
         let returnArray = []
         returnArray = transObj(versionData)
         let [initObj,initModelAcc,id] = returnArray
         editorCancel('','')
         renderInfo(initObj,initModelAcc,id)
-        loadModelFile(versionData[0].ID,versionData[0].Version,'','','init')
+        loadModelFile(versionData[0].id,versionData[0].version,'','','init')
     })
 }
 function loadInfo(){
     $.get(`${url}show_model_info_api?name=${ID}`,(data)=>{
         let html = ''
         for (let i=0;i<data.length;i++){
-            if(!data[i].IsCanOper){
+            if(!data[i].isCanOper){
                 $("#edit-pencil").css("display","none")
             }
-            html += `<option value="${data[i].Version}">${data[i].Version}</option>`
+            html += `<option value="${data[i].version}">${data[i].version}</option>`
         }
         $('#dropdown').append(html)
         let returnArray = []
         returnArray = transObj(data)
         let [initObj,initModelAcc,id] = returnArray
         renderInfo(initObj,initModelAcc,id)
-        loadModelFile(data[0].ID,data[0].Version,'','','init')
+        loadModelFile(data[0].id,data[0].version,'','','init')
     })
 }
  function getEngineName(model){
-        if(model.Engine == 0){
+        if(model.engine == 0){
             return "PyTorch";
-        }else  if(model.Engine == 1 || model.Engine == 121 || model.Engine == 38){
+        }else  if(model.engine == 1 || model.engine == 121 || model.engine == 38){
             return "TensorFlow";
-        }else  if(model.Engine == 2 || model.Engine == 122 || model.Engine == 35 || model.Engine == 37){
+        }else  if(model.engine == 2 || model.engine == 122 || model.engine == 35 || model.engine == 37){
             return "MindSpore";
-        }else  if(model.Engine == 3){
+        }else  if(model.engine == 3){
             return "Other";
-        }else  if(model.Engine == 4){
+        }else  if(model.engine == 4){
             return "PaddlePaddle";
-        }else  if(model.Engine == 5){
+        }else  if(model.engine == 5){
             return "OneFlow";
-        }else  if(model.Engine == 6){
+        }else  if(model.engine == 6){
             return "MXNet";
         }
         else{
@@ -262,36 +262,34 @@ function loadInfo(){
         }
 }
 function transObj(data){
-    let {ID,Name,Version,Label,Size,Description,CreatedUnix,Accuracy,CodeBranch,CodeCommitID,TrainTaskInfo} = data[0]
-    let modelAcc = JSON.parse(Accuracy)
-    TrainTaskInfo = JSON.parse(TrainTaskInfo)
-    // Parameters = JSON.parse(Parameters)
-    let {Parameters} = TrainTaskInfo
-    let EngineName = getEngineName(data[0])
-    Parameters = JSON.parse(Parameters)
-    Parameters = Parameters.parameter.length === 0 ? '--':Parameters.parameter
-    let size = tranSize(Size) 
-    let time = transTime(CreatedUnix)
+    let {id,name,version,label,size,description,createdUnix,accuracy,codeBranch,codeCommitID,trainTaskInfo} = data[0]
+    let modelAcc = JSON.parse(accuracy)
+    trainTaskInfo = JSON.parse(trainTaskInfo)
+    let engineName = getEngineName(data[0])
+    parameters = JSON.parse(trainTaskInfo.Parameters)
+    parameters = parameters.parameter.length === 0 ? '--':parameters.parameter
+    size = tranSize(size) 
+    let time = transTime(createdUnix)
     let initObj = {
-        ModelName:Name || '--',
-        Version:Version,
-        Label:Label || '--',
-        Size:size,
-        CreateTime:time,
-        Description:Description || '--',
-        CodeBranch:CodeBranch || '--',
-        CodeCommitID:CodeCommitID || '--',
-        BootFile:TrainTaskInfo.BootFile || '--',
-        DatasetName:TrainTaskInfo.DatasetName || '--',
-        Parameters:TrainTaskInfo.Parameters || '--',
-        FlavorName:TrainTaskInfo.FlavorName || '--',
-        WorkServerNumber:TrainTaskInfo.WorkServerNumber || '1',
-        Parameters:Parameters,
-        EngineName:EngineName,
-        DisplayJobName:TrainTaskInfo.DisplayJobName || '--',
-        TrainJobVersionName:TrainTaskInfo.VersionName || '',
-        CloudBrainJobID:TrainTaskInfo.JobID|| '',
-        CloudBrainType:TrainTaskInfo.Type,
+        modelName:name || '--',
+        version:version,
+        label:label || '--',
+        size:size,
+        createTime:time,
+        description:description || '--',
+        codeBranch:codeBranch || '--',
+        codeCommitID:codeCommitID || '--',
+        bootFile:trainTaskInfo.BootFile || '--',
+        datasetName:trainTaskInfo.DatasetName || '--',
+        parameters:trainTaskInfo.Parameters || '--',
+        flavorName:trainTaskInfo.FlavorName || '--',
+        workServerNumber:trainTaskInfo.WorkServerNumber || '--',
+        parameters:parameters,
+        engineName:engineName,
+        displayJobName:trainTaskInfo.DisplayJobName || '--',
+        trainJobVersionName:trainTaskInfo.VersionName || '',
+        cloudBrainJobID:trainTaskInfo.JobID|| '',
+        cloudBrainType:trainTaskInfo.Type,
     }
     let initModelAcc = {
         Accuracy: modelAcc.Accuracy || '--',
@@ -299,7 +297,7 @@ function transObj(data){
         Precision:modelAcc.Precision || '--',
         Recall: modelAcc.Recall || '--'
     }
-    return [initObj,initModelAcc,ID]
+    return [initObj,initModelAcc,id]
         
 }
 function transTime(time){
@@ -338,8 +336,8 @@ function editorSure(text,id){
     let description=$('#textarea-value').val()
     let sourcetext = $('#textarea-value').val().replace(/\n/g,'enter;')
     let data = {
-        ID:id,
-        Description:description
+        id:id,
+        description:description
     }
     $.ajax({
         url:`${url}modify_model`,
@@ -351,14 +349,14 @@ function editorSure(text,id){
 }
 function renderInfo(obj,accObj,id){
     for(let key in obj){
-        if(key==="Description"){
+        if(key==="description"){
             let descriptionText=obj[key].replace(/\r\n|\n/g,'enter;')
             $(`#${key}`).text(obj[key])
             $(`#${key}`).attr("title",obj[key])
             $('#edit-pencil').attr("data-id",id)
             $('#edit-pencil').attr("data-desc",descriptionText)
         }
-        else if(key==="Label"){
+        else if(key==="label"){
             $('#Label').empty()
             if(obj[key]==='--'){
                 $('#Label').text(obj[key])
@@ -372,33 +370,33 @@ function renderInfo(obj,accObj,id){
                 $('#Label').append(html)
             }
         }
-        else if(key==="CodeCommitID"){
+        else if(key==="codeCommitID"){
             let codeCommit = obj[key].slice(0,10)
             let html = `<a style="margin-left:1rem" class="ui label" title="${codeCommit}">${codeCommit}</a>`
             $('#CodeBranch').append(html)
 
         }
-         else if(key==="DisplayJobName"){
-           let type=obj["CloudBrainType"]
+         else if(key==="displayJobName"){
+           let type=obj["cloudBrainType"]
            let href=""
            if(type==1){
-                href=trainJobUrl + "modelarts/train-job/" + obj["CloudBrainJobID"]
+                href=trainJobUrl + "modelarts/train-job/" + obj["cloudBrainJobID"]
            }else if(type==0){
-                href=trainJobUrl + "cloudbrain/train-job/" + obj["CloudBrainJobID"]
+                href=trainJobUrl + "cloudbrain/train-job/" + obj["cloudBrainJobID"]
            }else if(type==2){
                 href=trainJobUrl + "grampus/train-job/" + obj["CloudBrainJobID"]
            }
-           $(`#DisplayJobNameHref`).attr("href",href)
-           $(`#DisplayJobNameHref`).attr("title",obj[key])
+           $(`#displayJobNameHref`).attr("href",href)
+           $(`#displayJobNameHref`).attr("title",obj[key])
            $(`#${key}`).text(obj[key])
 
-           let versionName = obj["TrainJobVersionName"]
+           let versionName = obj["trainJobVersionName"]
            if(versionName!=""){
                 let html = `<span style="margin-left:1rem" class="ui label">${versionName}</span>`
-                $('#DisplayJobName').append(html)
+                $('#displayJobName').append(html)
            }
         }
-        else if(key==="Parameters"){
+        else if(key==="parameters"){
             if(obj[key]==='--'){
                 $(`#${key}`).text(obj[key])
             }else{
diff --git a/web_src/js/components/Model.vue b/web_src/js/components/Model.vue
index 053d20329..7362246c4 100644
--- a/web_src/js/components/Model.vue
+++ b/web_src/js/components/Model.vue
@@ -13,7 +13,7 @@
           :header-cell-style="tableHeaderStyle"
         >
           <el-table-column
-            prop="Name"
+            prop="name"
             :label="i18n.model_name"
             align="left"
             min-width="17%"
@@ -25,105 +25,105 @@
               <!-- <i class="el-icon-time"></i> -->
               <a
                 class="text-over"
-                :href="showinfoHref + scope.row.Name"
-                :title="scope.row.Name"
-                >{{ scope.row.Name }}</a
+                :href="showinfoHref + scope.row.name"
+                :title="scope.row.name"
+                >{{ scope.row.name }}</a
               >
             </template>
           </el-table-column>
           <el-table-column
-            prop="Status"
+            prop="status"
             :label="i18n.model_status"
             align="center"
             min-width="6.5%"
           >
             <template slot-scope="scope">
-              <span class="text-over" :title="scope.row.Status_title">
-                <i style="vertical-align: middle" :class="scope.row.Status"></i
+              <span class="text-over" :title="scope.row.status_title">
+                <i style="vertical-align: middle" :class="scope.row.status"></i
               ></span>
             </template>
           </el-table-column>
           <el-table-column
-            prop="Version"
+            prop="version"
             :label="i18n.model_version"
             align="center"
             min-width="6%"
           >
             <template slot-scope="scope">
-              <span class="text-over" :title="scope.row.Version">{{
-                scope.row.Version
+              <span class="text-over" :title="scope.row.version">{{
+                scope.row.version
               }}</span>
             </template>
           </el-table-column>
           <el-table-column
-            prop="VersionCount"
+            prop="versionCount"
             :label="i18n.model_version_num"
             align="center"
             min-width="7%"
           >
             <template slot-scope="scope">
-              <span class="text-over" :title="scope.row.VersionCount">{{
-                scope.row.VersionCount
+              <span class="text-over" :title="scope.row.versionCount">{{
+                scope.row.versionCount
               }}</span>
             </template>
           </el-table-column>
 
           <el-table-column
-            prop="Size"
+            prop="size"
             :label="i18n.model_size"
             align="center"
             min-width="10%"
           >
             <template slot-scope="scope">
-              <span class="text-over">{{ renderSize(scope.row.Size) }}</span>
+              <span class="text-over">{{ renderSize(scope.row.size) }}</span>
             </template>
           </el-table-column>
           <el-table-column
-            prop="EngineName"
+            prop="engineName"
             :label="i18n.model_egine"
             align="center"
             min-width="8%"
           >
             <template slot-scope="scope">
-              <span class="text-over" :title="scope.row.EngineName">{{
-                scope.row.EngineName
+              <span class="text-over" :title="scope.row.engineName">{{
+                scope.row.engineName
               }}</span>
             </template>
           </el-table-column>
           <el-table-column
-            prop="ComputeResource"
+            prop="computeResource"
             :label="i18n.model_compute_resource"
             align="center"
             min-width="8%"
           >
             <template slot-scope="scope">
-              <span class="text-over">{{ scope.row.ComputeResource }}</span>
+              <span class="text-over">{{ scope.row.computeResource }}</span>
             </template>
           </el-table-column>
           <el-table-column
-            prop="CreatedUnix"
+            prop="createdUnix"
             :label="i18n.model_create_time"
             align="center"
             min-width="13.75%"
           >
             <template slot-scope="scope">
-              {{ transTime(scope.row.CreatedUnix) }}
+              {{ transTime(scope.row.createdUnix) }}
             </template>
           </el-table-column>
           <el-table-column
-            prop="UserName"
+            prop="userName"
             :label="i18n.model_creator"
             align="center"
             min-width="6.75%"
           >
             <template slot-scope="scope">
               <a
-                :href="!scope.row.UserName ? '#' : '/' + scope.row.UserName"
-                :title="scope.row.UserName || defaultAvatarName"
+                :href="!scope.row.userName ? '#' : '/' + scope.row.userName"
+                :title="scope.row.userName || defaultAvatarName"
               >
                 <img
                   class="ui avatar image"
-                  :src="scope.row.UserRelAvatarLink || defaultAvatar"
+                  :src="scope.row.userRelAvatarLink || defaultAvatar"
                 />
               </a>
             </template>
@@ -140,25 +140,25 @@
                   :style="{
                     visibility: !scope.row.Children ? 'visible' : 'hidden',
                   }"
-                  :class="{ disabled: !scope.row.IsCanOper }"
+                  :class="{ disabled: !scope.row.isCanOper }"
                   @click="
                     showcreateVue(
-                      scope.row.Name,
-                      scope.row.Version,
-                      scope.row.Label
+                      scope.row.name,
+                      scope.row.version,
+                      scope.row.label
                     )
                   "
                   >{{ i18n.model_create_new_ver }}</a
                 >
                 <a
-                  :href="loadhref + scope.row.ID"
-                  :class="{ disabled: !scope.row.IsCanOper }"
+                  :href="loadhref + scope.row.id"
+                  :class="{ disabled: !scope.row.isCanOper }"
                   >{{ i18n.model_download }}</a
                 >
                 <a
-                  :class="{ disabled: !scope.row.IsCanDelete }"
+                  :class="{ disabled: !scope.row.isCanDelete }"
                   @click="
-                    deleteModel(scope.row.ID, scope.row.cName, scope.row.rowKey)
+                    deleteModel(scope.row.id, scope.row.cName, scope.row.rowKey)
                   "
                   >{{ i18n.model_delete }}</a
                 >
@@ -219,17 +219,17 @@ export default {
             },
           })
           .then((res) => {
-            let TrainTaskInfo;
+            let trainTaskInfo;
             let tableData;
             tableData = res.data;
             for (let i = 0; i < tableData.length; i++) {
-              TrainTaskInfo = JSON.parse(tableData[i].TrainTaskInfo);
-              tableData[i].EngineName = this.getEngineName(tableData[i]);
-              tableData[i].ComputeResource = TrainTaskInfo.ComputeResource;
-              tableData[i].cName = tableData[i].Name;
-              tableData[i].rowKey = tableData[i].ID + Math.random();
-              tableData[i].Name = "";
-              tableData[i].VersionCount = "";
+              trainTaskInfo = JSON.parse(tableData[i].trainTaskInfo);
+              tableData[i].engineName = this.getEngineName(tableData[i]);
+              tableData[i].computeResource = trainTaskInfo.ComputeResource;
+              tableData[i].cName = tableData[i].name;
+              tableData[i].rowKey = tableData[i].id + Math.random();
+              tableData[i].name = "";
+              tableData[i].versionCount = "";
               tableData[i].Children = true;
             }
             resolve(tableData || []);
@@ -258,10 +258,10 @@ export default {
           centered: false,
           onShow: function () {
             $("#model_header").text(title);
-            $('input[name="Name"]').addClass("model_disabled");
-            $('input[name="Name"]').attr("readonly", "readonly");
+            $('input[name="name"]').addClass("model_disabled");
+            $('input[name="name"]').attr("readonly", "readonly");
             $('input[name="modelSelectedFile"]').attr("readonly", "readonly");
-            $('input[name="Version"]').addClass("model_disabled");
+            $('input[name="version"]').addClass("model_disabled");
             $(".ui.dimmer").css({
               "background-color": "rgb(136, 136, 136,0.7)",
             });
@@ -274,8 +274,8 @@ export default {
           },
           onHide: function () {
             document.getElementById("formId").reset();
-            $('input[name="Name"]').removeClass("model_disabled");
-            $('input[name="Name"]').removeAttr("readonly");
+            $('input[name="name"]').removeClass("model_disabled");
+            $('input[name="name"]').removeAttr("readonly");
             $('input[name="modelSelectedFile"]').removeAttr("readonly");
             var cityObj = $("#modelSelectedFile");
             cityObj.attr("value", "");
@@ -290,8 +290,8 @@ export default {
         .modal("show");
     },
     check() {
-      let jobid = document.getElementById("JobId").value;
-      let versionname = document.getElementById("VersionName").value;
+      let jobid = document.getElementById("jobId").value;
+      let versionname = document.getElementById("versionName").value;
       let name = document.getElementById("name").value;
       let version = document.getElementById("version").value;
       let modelSelectedFile =
@@ -333,8 +333,8 @@ export default {
       let context = this;
       let flag = this.check();
       if (flag) {
-        let cName = $("input[name='Name']").val();
-        let version = $("input[name='Version']").val();
+        let cName = $("input[name='name']").val();
+        let version = $("input[name='version']").val();
         let data = $("#formId").serialize();
         const initModel = $("input[name='initModel']").val();
         let url_href =
@@ -387,7 +387,7 @@ export default {
           let childrenIndex = store.states.lazyTreeNodeMap[
             parentRow.rowKey
           ].findIndex((child) => child.rowKey == row.rowKey);
-          parentRow.VersionCount = parentRow.VersionCount - 1;
+          parentRow.versionCount = parentRow.versionCount - 1;
           const parent = store.states.lazyTreeNodeMap[parentRow.rowKey];
           if (parent.length === 1) {
             this.getModelList();
@@ -398,7 +398,7 @@ export default {
       }
     },
     deleteModel(id, name, rowKey) {
-      let row = { cName: name, ID: id, rowKey: rowKey };
+      let row = { cName: name, id: id, rowKey: rowKey };
       let _this = this;
       let flag = 1;
       $(".ui.basic.modal.first")
@@ -410,7 +410,7 @@ export default {
             _this.$axios
               .delete(_this.url + "delete_model", {
                 params: {
-                  ID: id,
+                  id: id,
                 },
               })
               .then((res) => {
@@ -442,21 +442,21 @@ export default {
         .modal("show");
     },
     getEngineName(model) {
-      if (model.Engine == 0) {
+      if (model.engine == 0) {
         return "PyTorch";
-      } else if (model.Engine == 1 || model.Engine == 121) {
+      } else if (model.engine == 1 || model.engine == 121) {
         return "TensorFlow";
       } else if (
-        model.Engine == 2 ||
-        model.Engine == 122 ||
-        model.Engine == 35
+        model.engine == 2 ||
+        model.engine == 122 ||
+        model.engine == 35
       ) {
         return "MindSpore";
-      } else if (model.Engine == 4) {
+      } else if (model.engine == 4) {
         return "PaddlePaddle";
-      } else if (model.Engine == 5) {
+      } else if (model.engine == 5) {
         return "OneFlow";
-      } else if (model.Engine == 6) {
+      } else if (model.engine == 6) {
         return "MXNet";
       } else {
         return "Other";
@@ -480,34 +480,34 @@ export default {
           .then((res) => {
             $(".ui.grid").removeAttr("style");
             $("#loadContainer").removeClass("loader");
-            let TrainTaskInfo;
+            let trainTaskInfo;
             this.tableData = res.data.data;
             for (let i = 0; i < this.tableData.length; i++) {
-              TrainTaskInfo = JSON.parse(this.tableData[i].TrainTaskInfo);
-              this.tableData[i].cName = this.tableData[i].Name;
-              this.tableData[i].rowKey = this.tableData[i].ID + Math.random();
-              this.tableData[i].EngineName = this.getEngineName(
+              trainTaskInfo = JSON.parse(this.tableData[i].trainTaskInfo);
+              this.tableData[i].cName = this.tableData[i].name;
+              this.tableData[i].rowKey = this.tableData[i].id + Math.random();
+              this.tableData[i].engineName = this.getEngineName(
                 this.tableData[i]
               );
-              this.tableData[i].ComputeResource = TrainTaskInfo.ComputeResource;
+              this.tableData[i].computeResource = trainTaskInfo.ComputeResource;
               this.tableData[i].hasChildren =
-                res.data.data[i].VersionCount === 1 ? false : true;
-              if (this.tableData[i].Status !== 1) {
+                res.data.data[i].versionCount === 1 ? false : true;
+              if (this.tableData[i].status !== 1) {
                 countStatus++;
               }
 
-              switch (this.tableData[i].Status) {
+              switch (this.tableData[i].status) {
                 case 1:
-                  this.tableData[i].Status = "WAITING";
-                  this.tableData[i].Status_title = this.i18n.model_wait;
+                  this.tableData[i].status = "WAITING";
+                  this.tableData[i].status_title = this.i18n.model_wait;
                   break;
                 case 2:
-                  this.tableData[i].Status = "FAILED";
-                  this.tableData[i].Status_title = this.tableData[i].StatusDesc;
+                  this.tableData[i].status = "FAILED";
+                  this.tableData[i].status_title = this.tableData[i].statusDesc;
                   break;
                 default:
-                  this.tableData[i].Status = "SUCCEEDED";
-                  this.tableData[i].Status_title = this.i18n.model_success;
+                  this.tableData[i].status = "SUCCEEDED";
+                  this.tableData[i].status_title = this.i18n.model_success;
                   break;
               }
             }
@@ -531,7 +531,7 @@ export default {
   },
   computed: {
     loadhref() {
-      return this.url + "downloadall?ID=";
+      return this.url + "downloadall?id=";
     },
     showinfoHref() {
       return this.url + "show_model_info?name=";
diff --git a/web_src/js/features/cloudbrainShow.js b/web_src/js/features/cloudbrainShow.js
index affae8f8f..341c324e1 100644
--- a/web_src/js/features/cloudbrainShow.js
+++ b/web_src/js/features/cloudbrainShow.js
@@ -695,9 +695,9 @@ export default async function initCloudrainSow() {
         if (value) {
           let html = "";
           nameMap[value].forEach((element) => {
-            let { TrainTaskInfo } = element;
-            TrainTaskInfo = JSON.parse(TrainTaskInfo);
-            html += `<div class="item" data-label="${element.Label}" data-id="${element.ID}" data-value="${element.Path}">${element.Version}</div>`;
+            //let { trainTaskInfo } = element;
+            //trainTaskInfo = JSON.parse(trainTaskInfo);
+            html += `<div class="item" data-label="${element.label}" data-id="${element.id}" data-value="${element.path}">${element.version}</div>`;
           });
           $("#model_name_version").append(html);
           const initVersionText = $(
@@ -833,7 +833,7 @@ export default async function initCloudrainSow() {
     return new Promise((resolve, reject) => {
       $.get(
         `${RepoLink}/modelmanage/query_modelfile_for_predict`,
-        { ID: value },
+        { id: value },
         (data) => {
           resolve(data);
         }

From 86a98159ada5e8d5ca48b7a4139b8540f08628c8 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Wed, 2 Nov 2022 08:46:51 +0800
Subject: [PATCH 042/187] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=EF=BC=8C=E8=A7=A3=E5=86=B3=E7=BC=96=E8=AF=91=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/repo/ai_model_manage.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/routers/repo/ai_model_manage.go b/routers/repo/ai_model_manage.go
index a82930909..7fb63d2a4 100644
--- a/routers/repo/ai_model_manage.go
+++ b/routers/repo/ai_model_manage.go
@@ -17,6 +17,7 @@ import (
 	"code.gitea.io/gitea/modules/notification"
 	"code.gitea.io/gitea/modules/setting"
 	"code.gitea.io/gitea/modules/storage"
+	"code.gitea.io/gitea/services/cloudbrain/resource"
 	uuid "github.com/satori/go.uuid"
 )
 

From 564a46f00a66f7204e44951dff645962d3934c41 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Wed, 2 Nov 2022 08:51:12 +0800
Subject: [PATCH 043/187] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E7=BC=96=E8=AF=91?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/api/v1/api.go | 2 --
 1 file changed, 2 deletions(-)

diff --git a/routers/api/v1/api.go b/routers/api/v1/api.go
index 87d5b37f0..ecc246916 100755
--- a/routers/api/v1/api.go
+++ b/routers/api/v1/api.go
@@ -960,9 +960,7 @@ func RegisterRoutes(m *macaron.Macaron) {
 					m.Get("/query_model_byId", repo.QueryModelById)
 					m.Get("/query_model_for_predict", repo.QueryModelListForPredict)
 					m.Get("/query_modelfile_for_predict", repo.QueryModelFileForPredict)
-					m.Get("/query_train_job", repo.QueryTrainJobList)
 					m.Get("/query_train_model", repo.QueryTrainModelList)
-					m.Get("/query_train_job_version", repo.QueryTrainJobVersionList)
 					m.Post("/create_model_convert", repo.CreateModelConvert)
 					m.Get("/show_model_convert_page")
 					m.Get("/:id", repo.GetCloudbrainModelConvertTask)

From 4253a45af450e1634fd7759b4af0755a64067581 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Wed, 2 Nov 2022 08:55:06 +0800
Subject: [PATCH 044/187] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E7=BC=96=E8=AF=91?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/api/v1/api.go | 2 --
 1 file changed, 2 deletions(-)

diff --git a/routers/api/v1/api.go b/routers/api/v1/api.go
index 6e2c74b0b..049fafcaf 100755
--- a/routers/api/v1/api.go
+++ b/routers/api/v1/api.go
@@ -993,9 +993,7 @@ func RegisterRoutes(m *macaron.Macaron) {
 					m.Get("/query_model_byId", repo.QueryModelById)
 					m.Get("/query_model_for_predict", repo.QueryModelListForPredict)
 					m.Get("/query_modelfile_for_predict", repo.QueryModelFileForPredict)
-					m.Get("/query_train_job", repo.QueryTrainJobList)
 					m.Get("/query_train_model", repo.QueryTrainModelList)
-					m.Get("/query_train_job_version", repo.QueryTrainJobVersionList)
 					m.Post("/create_model_convert", repo.CreateModelConvert)
 					m.Get("/show_model_convert_page")
 					m.Get("/:id", repo.GetCloudbrainModelConvertTask)

From 0cd36f95056c759cdc072970a2e527db4075f411 Mon Sep 17 00:00:00 2001
From: ychao_1983 <ychao_1983@sina.com>
Date: Wed, 2 Nov 2022 14:35:27 +0800
Subject: [PATCH 045/187] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 routers/api/v1/api.go | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/routers/api/v1/api.go b/routers/api/v1/api.go
index 049fafcaf..485d26090 100755
--- a/routers/api/v1/api.go
+++ b/routers/api/v1/api.go
@@ -528,10 +528,10 @@ func RegisterRoutes(m *macaron.Macaron) {
 
 		m.Group("/images", func() {
 
-			m.Get("public", repo.GetPublicImages)
-			m.Get("custom", repo.GetCustomImages)
-			m.Get("star", repo.GetStarImages)
-			m.Get("npu", repo.GetNpuImages)
+			m.Get("/public", repo.GetPublicImages)
+			m.Get("/custom", repo.GetCustomImages)
+			m.Get("/star", repo.GetStarImages)
+			m.Get("/npu", repo.GetNpuImages)
 
 		}, reqToken())
 

From a260eb539eebef210f2843de1223ccf7e8dfcb97 Mon Sep 17 00:00:00 2001
From: chenshihai <chenshh@pcl.ac.cn>
Date: Wed, 2 Nov 2022 14:41:51 +0800
Subject: [PATCH 046/187] =?UTF-8?q?fix=20bugs=20=09#3061=20=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E5=90=AF=E6=99=BAnpu=E8=AE=AD=E7=BB=83=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E9=A1=B5=E9=9D=A2=E7=9A=84=E5=9F=BA=E4=BA=8E=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC=E6=98=BE=E7=A4=BA=E7=A9=BA=20=09#3057=20=E3=80=90?=
 =?UTF-8?q?=E9=80=9A=E7=9F=A5=E3=80=91=E5=B7=B2=E8=AF=BB=E6=B6=88=E6=81=AF?=
 =?UTF-8?q?tab=E9=A1=B5=E7=BF=BB=E9=A1=B5=E5=8A=9F=E8=83=BD=E4=B8=8D?=
 =?UTF-8?q?=E5=8F=AF=E7=94=A8=20=09#3058=20=E3=80=90=E5=9B=BD=E9=99=85?=
 =?UTF-8?q?=E5=8C=96=E3=80=91=E8=8B=B1=E6=96=87=E7=95=8C=E9=9D=A2=E6=A8=A1?=
 =?UTF-8?q?=E5=9E=8B=E4=BD=93=E9=AA=8C=E8=8F=9C=E5=8D=95=E4=BB=8D=E7=84=B6?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E7=9A=84=E4=B8=AD=E6=96=87=20=09#1945=20?=
 =?UTF-8?q?=E3=80=90=E4=B8=AA=E4=BA=BA=E4=B8=AD=E5=BF=83=E3=80=91=E5=A4=B4?=
 =?UTF-8?q?=E5=83=8F=E5=88=87=E5=88=B0=E5=85=B6=E5=AE=83=E7=BB=84=E7=BB=87?=
 =?UTF-8?q?=E5=86=8D=E5=88=87=E5=9B=9E=E8=87=AA=E5=B7=B1=E8=B7=B3=E8=BD=AC?=
 =?UTF-8?q?=E5=88=B0=E9=A6=96=E9=A1=B5=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 options/locale/locale_en-US.ini       | 1 +
 options/locale/locale_zh-CN.ini       | 1 +
 routers/user/notification.go          | 4 ++--
 templates/base/head_navbar.tmpl       | 4 ++--
 templates/base/head_navbar_fluid.tmpl | 4 ++--
 templates/base/head_navbar_home.tmpl  | 4 ++--
 templates/base/head_navbar_pro.tmpl   | 4 ++--
 templates/user/dashboard/navbar.tmpl  | 2 +-
 8 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index e7d730027..3013fcdaa 100755
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -1036,6 +1036,7 @@ cloudbrain.time.starttime=Start run time
 cloudbrain.time.endtime=End run time
 cloudbrain.datasetdownload=Dataset download url
 model_manager = Model
+model_experience = Model Experience
 model_noright=You have no right to do the operation.
 model_rename=Duplicate model name, please modify model name.
 
diff --git a/options/locale/locale_zh-CN.ini b/options/locale/locale_zh-CN.ini
index 972865484..e4abf5f11 100755
--- a/options/locale/locale_zh-CN.ini
+++ b/options/locale/locale_zh-CN.ini
@@ -1036,6 +1036,7 @@ datasets.desc=数据集功能
 cloudbrain_helper=使用GPU/NPU资源，开启Notebook、模型训练任务等
 
 model_manager = 模型
+model_experience = 模型体验
 model_noright=您没有操作权限。
 model_rename=模型名称重复，请修改模型名称
 
diff --git a/routers/user/notification.go b/routers/user/notification.go
index 0fd6df007..d66e893a4 100644
--- a/routers/user/notification.go
+++ b/routers/user/notification.go
@@ -132,11 +132,11 @@ func getNotifications(c *context.Context) {
 	}
 
 	c.Data["Title"] = c.Tr("notifications")
-	//c.Data["Keyword"] = keyword
+	c.Data["Type"] = keyword
 	c.Data["Status"] = status
 	c.Data["Notifications"] = notifications
 
-	pager.SetDefaultParams(c)
+	pager.AddParam(c, "q", "Type")
 	c.Data["Page"] = pager
 }
 
diff --git a/templates/base/head_navbar.tmpl b/templates/base/head_navbar.tmpl
index f9908f6f0..50521516f 100755
--- a/templates/base/head_navbar.tmpl
+++ b/templates/base/head_navbar.tmpl
@@ -38,7 +38,7 @@
 			{{.i18n.Tr "repo.model_manager"}}
 			<i class="dropdown icon"></i>
 			<div class="menu">
-				<a class="item" href="{{AppSubUrl}}/extension/tuomin/upload">模型体验</a>	
+				<a class="item" href="{{AppSubUrl}}/extension/tuomin/upload">{{.i18n.Tr "repo.model_experience"}}</a>	
 			</div>
 		</div> 
 		<div class="ui simple dropdown item" id='dropdown_explore'>
@@ -78,7 +78,7 @@
 			{{.i18n.Tr "repo.model_manager"}}
 			<i class="dropdown icon"></i>
 			<div class="menu">
-				<a class="item" href="{{AppSubUrl}}/extension/tuomin/upload">模型体验</a>	
+				<a class="item" href="{{AppSubUrl}}/extension/tuomin/upload">{{.i18n.Tr "repo.model_experience"}}</a>	
 			</div>
 		</div>
 		
diff --git a/templates/base/head_navbar_fluid.tmpl b/templates/base/head_navbar_fluid.tmpl
index 010568e8d..b2fd60787 100644
--- a/templates/base/head_navbar_fluid.tmpl
+++ b/templates/base/head_navbar_fluid.tmpl
@@ -38,7 +38,7 @@
 			{{.i18n.Tr "repo.model_manager"}}
 			<i class="dropdown icon"></i>
 			<div class="menu">
-				<a class="item" href="{{AppSubUrl}}/extension/tuomin/upload">模型体验</a>	
+				<a class="item" href="{{AppSubUrl}}/extension/tuomin/upload">{{.i18n.Tr "repo.model_experience"}}</a>	
 			</div>
 		</div>
 		<div class="ui dropdown item" id='dropdown_explore'> 
@@ -77,7 +77,7 @@
 			{{.i18n.Tr "repo.model_manager"}}
 			<i class="dropdown icon"></i>
 			<div class="menu">
-				<a class="item" href="{{AppSubUrl}}/extension/tuomin/upload">模型体验</a>	
+				<a class="item" href="{{AppSubUrl}}/extension/tuomin/upload">{{.i18n.Tr "repo.model_experience"}}</a>	
 			</div>
 		</div>
 		<div class="ui dropdown item" id='dropdown_PageHome'>
diff --git a/templates/base/head_navbar_home.tmpl b/templates/base/head_navbar_home.tmpl
index 1679bc872..3a8a273d2 100644
--- a/templates/base/head_navbar_home.tmpl
+++ b/templates/base/head_navbar_home.tmpl
@@ -30,7 +30,7 @@
 			{{.i18n.Tr "repo.model_manager"}}
 			<i class="dropdown icon"></i>
 			<div class="menu">
-				<a class="item" href="{{AppSubUrl}}/extension/tuomin/upload">模型体验</a>	
+				<a class="item" href="{{AppSubUrl}}/extension/tuomin/upload">{{.i18n.Tr "repo.model_experience"}}</a>	
 			</div>
 		</div>
 		<div class="ui dropdown item" id='dropdown_explore'>
@@ -70,7 +70,7 @@
 			{{.i18n.Tr "repo.model_manager"}}
 			<i class="dropdown icon"></i>
 			<div class="menu">
-				<a class="item" href="{{AppSubUrl}}/extension/tuomin/upload">模型体验</a>	
+				<a class="item" href="{{AppSubUrl}}/extension/tuomin/upload">{{.i18n.Tr "repo.model_experience"}}</a>	
 			</div>
 		</div>
 		<div class="ui dropdown item" id='dropdown_PageHome'>
diff --git a/templates/base/head_navbar_pro.tmpl b/templates/base/head_navbar_pro.tmpl
index 8f9ef8d9c..f342e568a 100644
--- a/templates/base/head_navbar_pro.tmpl
+++ b/templates/base/head_navbar_pro.tmpl
@@ -40,7 +40,7 @@
 			{{.i18n.Tr "repo.model_manager"}}
 			<i class="dropdown icon"></i>
 			<div class="menu">
-				<a class="item" href="{{AppSubUrl}}/extension/tuomin/upload">模型体验</a>	
+				<a class="item" href="{{AppSubUrl}}/extension/tuomin/upload">{{.i18n.Tr "repo.model_experience"}}</a>	
 			</div>
 		</div>
 		<div class="ui dropdown item" id='dropdown_explore'>
@@ -80,7 +80,7 @@
 			{{.i18n.Tr "repo.model_manager"}}
 			<i class="dropdown icon"></i>
 			<div class="menu">
-				<a class="item" href="{{AppSubUrl}}/extension/tuomin/upload">模型体验</a>	
+				<a class="item" href="{{AppSubUrl}}/extension/tuomin/upload">{{.i18n.Tr "repo.model_experience"}}</a>	
 			</div>
 		</div>
 		<div class="ui dropdown item" id='dropdown_PageHome'>
diff --git a/templates/user/dashboard/navbar.tmpl b/templates/user/dashboard/navbar.tmpl
index 520738e87..faf7b26ff 100644
--- a/templates/user/dashboard/navbar.tmpl
+++ b/templates/user/dashboard/navbar.tmpl
@@ -12,7 +12,7 @@
 						{{.i18n.Tr "home.switch_dashboard_context"}}
 					</div>
 					<div class="scrolling menu items">
-						<a class="{{if eq .ContextUser.ID .SignedUser.ID}}active selected{{end}} item" href="{{AppSubUrl}}/{{if .PageIsIssues}}issues{{else if .PageIsPulls}}pulls{{else if .PageIsMilestonesDashboard}}milestones{{end}}">
+						<a class="{{if eq .ContextUser.ID .SignedUser.ID}}active selected{{end}} item" href="{{AppSubUrl}}/{{if .PageIsIssues}}issues{{else if .PageIsPulls}}pulls{{else if .PageIsMilestonesDashboard}}milestones{{else}}dashboard{{end}}">
 							<img class="ui avatar image" src="{{.SignedUser.RelAvatarLink}}" width="28" height="28">
 							{{.SignedUser.Name}}
 						</a>

From 041b350bc2074bf4650899c0672fe2afe5c2b6ce Mon Sep 17 00:00:00 2001
From: ychao_1983 <ychao_1983@sina.com>
Date: Wed, 2 Nov 2022 14:48:40 +0800
Subject: [PATCH 047/187] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 routers/api/v1/api.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/routers/api/v1/api.go b/routers/api/v1/api.go
index 485d26090..68902ec68 100755
--- a/routers/api/v1/api.go
+++ b/routers/api/v1/api.go
@@ -724,12 +724,12 @@ func RegisterRoutes(m *macaron.Macaron) {
 
 		m.Combo("/repositories/:id", reqToken()).Get(repo.GetByID)
 
-		m.Group("/:username/:reponame/datasets", func() {
+		m.Group("/datasets/:username/:reponame", func() {
 			m.Get("/current_repo", repo.CurrentRepoDatasetMultiple)
 			m.Get("/my_datasets", repo.MyDatasetsMultiple)
 			m.Get("/public_datasets", repo.PublicDatasetMultiple)
 			m.Get("/my_favorite", repo.MyFavoriteDatasetMultiple)
-		}, reqToken())
+		}, reqToken(), repoAssignment())
 
 		m.Group("/repos", func() {
 			m.Get("/search", repo.Search)

From a81b44416e8712726ba67b933f6f36f75f9252fa Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Wed, 2 Nov 2022 14:58:14 +0800
Subject: [PATCH 048/187] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=89=93=E5=8D=B0?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 modules/storage/minio.go        |  2 +-
 routers/repo/ai_model_manage.go | 93 +++++++++++++++++++++++++++++++++
 2 files changed, 94 insertions(+), 1 deletion(-)

diff --git a/modules/storage/minio.go b/modules/storage/minio.go
index 47f70e12d..9b7113ee9 100755
--- a/modules/storage/minio.go
+++ b/modules/storage/minio.go
@@ -144,7 +144,7 @@ func (m *MinioStorage) HasObject(path string) (bool, error) {
 
 	// Indicate to our routine to exit cleanly upon return.
 	defer close(doneCh)
-
+	log.Info("minio object key=" + m.buildMinioPath(path))
 	objectCh := m.client.ListObjects(m.bucket, m.buildMinioPath(path), false, doneCh)
 	for object := range objectCh {
 		if object.Err != nil {
diff --git a/routers/repo/ai_model_manage.go b/routers/repo/ai_model_manage.go
index 7fb63d2a4..ee6a71304 100644
--- a/routers/repo/ai_model_manage.go
+++ b/routers/repo/ai_model_manage.go
@@ -190,7 +190,100 @@ func SaveNewNameModel(ctx *context.Context) {
 }
 
 func SaveLocalModel(ctx *context.Context) {
+	if !ctx.Repo.CanWrite(models.UnitTypeModelManage) {
+		ctx.Error(403, ctx.Tr("repo.model_noright"))
+		return
+	}
+	re := map[string]string{
+		"code": "-1",
+	}
+	log.Info("save SaveLocalModel start.")
+	uuid := uuid.NewV4()
+	id := uuid.String()
+	name := ctx.Query("name")
+	version := ctx.Query("version")
+	if version == "" {
+		version = "0.0.1"
+	}
+	label := ctx.Query("label")
+	description := ctx.Query("description")
+	engine := ctx.QueryInt("engine")
+	taskType := ctx.QueryInt("type")
+	modelActualPath := ""
+	if taskType == models.TypeCloudBrainOne {
+		destKeyNamePrefix := Model_prefix + models.AttachmentRelativePath(id) + "/"
+		modelActualPath = setting.Bucket + "/" + destKeyNamePrefix
+	} else if taskType == models.TypeCloudBrainTwo {
+		destKeyNamePrefix := Model_prefix + models.AttachmentRelativePath(id) + "/"
+		modelActualPath = setting.Attachment.Minio.Bucket + "/" + destKeyNamePrefix
+	} else {
+		re["msg"] = "type is error."
+		ctx.JSON(200, re)
+		return
+	}
+	var lastNewModelId string
+	repoId := ctx.Repo.Repository.RepoID
+	aimodels := models.QueryModelByName(name, repoId)
+	if len(aimodels) > 0 {
+		for _, model := range aimodels {
+			if model.Version == version {
+				re["msg"] = ctx.Tr("repo.model.manage.create_error")
+				ctx.JSON(200, re)
+				return
+			}
+			if model.New == MODEL_LATEST {
+				lastNewModelId = model.ID
+			}
+		}
+	}
+	model := &models.AiModelManage{
+		ID:            id,
+		Version:       version,
+		VersionCount:  len(aimodels) + 1,
+		Label:         label,
+		Name:          name,
+		Description:   description,
+		New:           MODEL_LATEST,
+		Type:          taskType,
+		Path:          modelActualPath,
+		Size:          0,
+		AttachmentId:  "",
+		RepoId:        repoId,
+		UserId:        ctx.User.ID,
+		Engine:        int64(engine),
+		TrainTaskInfo: "",
+		Accuracy:      "",
+		Status:        STATUS_FINISHED,
+	}
+
+	err := models.SaveModelToDb(model)
+	if err != nil {
+		re["msg"] = err.Error()
+		ctx.JSON(200, re)
+		return
+	}
+	if len(lastNewModelId) > 0 {
+		//udpate status and version count
+		models.ModifyModelNewProperty(lastNewModelId, MODEL_NOT_LATEST, 0)
+	}
+	var units []models.RepoUnit
+	var deleteUnitTypes []models.UnitType
+	units = append(units, models.RepoUnit{
+		RepoID: ctx.Repo.Repository.ID,
+		Type:   models.UnitTypeModelManage,
+		Config: &models.ModelManageConfig{
+			EnableModelManage: true,
+		},
+	})
+	deleteUnitTypes = append(deleteUnitTypes, models.UnitTypeModelManage)
+
+	models.UpdateRepositoryUnits(ctx.Repo.Repository, units, deleteUnitTypes)
 
+	log.Info("save model end.")
+	notification.NotifyOtherTask(ctx.User, ctx.Repo.Repository, id, name, models.ActionCreateNewModelTask)
+	re["code"] = "0"
+	re["id"] = id
+	ctx.JSON(200, re)
 }
 
 func UploadLocalModel(ctx *context.Context) {

From fb335042c0e7bdb6f49f975f1bb2089e57e575ca Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Wed, 2 Nov 2022 15:52:46 +0800
Subject: [PATCH 049/187] =?UTF-8?q?=E6=94=AF=E6=8C=81=E6=9C=AC=E5=9C=B0?=
 =?UTF-8?q?=E6=A8=A1=E5=9E=8B=E4=B8=8A=E4=BC=A0=E4=BF=AE=E6=94=B9=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 modules/storage/minio.go        |  4 +-
 modules/storage/minio_ext.go    |  8 ++--
 modules/storage/obs.go          | 10 ++--
 routers/repo/ai_model_manage.go |  1 +
 routers/repo/attachment.go      | 85 ++++++++++++++++++++++++---------
 5 files changed, 75 insertions(+), 33 deletions(-)

diff --git a/modules/storage/minio.go b/modules/storage/minio.go
index 9b7113ee9..a1a6e131a 100755
--- a/modules/storage/minio.go
+++ b/modules/storage/minio.go
@@ -144,8 +144,8 @@ func (m *MinioStorage) HasObject(path string) (bool, error) {
 
 	// Indicate to our routine to exit cleanly upon return.
 	defer close(doneCh)
-	log.Info("minio object key=" + m.buildMinioPath(path))
-	objectCh := m.client.ListObjects(m.bucket, m.buildMinioPath(path), false, doneCh)
+	//objectCh := m.client.ListObjects(m.bucket, m.buildMinioPath(path), false, doneCh)
+	objectCh := m.client.ListObjects(m.bucket, path, false, doneCh)
 	for object := range objectCh {
 		if object.Err != nil {
 			return hasObject, object.Err
diff --git a/modules/storage/minio_ext.go b/modules/storage/minio_ext.go
index 4b738c068..0ed9a59a4 100755
--- a/modules/storage/minio_ext.go
+++ b/modules/storage/minio_ext.go
@@ -101,7 +101,7 @@ func getClients() (*minio_ext.Client, *miniov6.Core, error) {
 	return client, core, nil
 }
 
-func GenMultiPartSignedUrl(uuid string, uploadId string, partNumber int, partSize int64) (string, error) {
+func GenMultiPartSignedUrl(objectName string, uploadId string, partNumber int, partSize int64) (string, error) {
 	minioClient, _, err := getClients()
 	if err != nil {
 		log.Error("getClients failed:", err.Error())
@@ -110,7 +110,7 @@ func GenMultiPartSignedUrl(uuid string, uploadId string, partNumber int, partSiz
 
 	minio := setting.Attachment.Minio
 	bucketName := minio.Bucket
-	objectName := strings.TrimPrefix(path.Join(minio.BasePath, path.Join(uuid[0:1], uuid[1:2], uuid)), "/")
+	//objectName := strings.TrimPrefix(path.Join(minio.BasePath, path.Join(uuid[0:1], uuid[1:2], uuid)), "/")
 
 	return minioClient.GenUploadPartSignedUrl(uploadId, bucketName, objectName, partNumber, partSize, PresignedUploadPartUrlExpireTime, setting.Attachment.Minio.Location)
 }
@@ -301,7 +301,7 @@ func MinioPathCopy(bucketName string, srcPath string, destPath string) (int64, e
 	return fileTotalSize, nil
 }
 
-func NewMultiPartUpload(uuid string) (string, error) {
+func NewMultiPartUpload(objectName string) (string, error) {
 	_, core, err := getClients()
 	if err != nil {
 		log.Error("getClients failed:", err.Error())
@@ -310,7 +310,7 @@ func NewMultiPartUpload(uuid string) (string, error) {
 
 	minio := setting.Attachment.Minio
 	bucketName := minio.Bucket
-	objectName := strings.TrimPrefix(path.Join(minio.BasePath, path.Join(uuid[0:1], uuid[1:2], uuid)), "/")
+	//objectName := strings.TrimPrefix(path.Join(minio.BasePath, path.Join(uuid[0:1], uuid[1:2], uuid)), "/")
 
 	return core.NewMultipartUpload(bucketName, objectName, miniov6.PutObjectOptions{})
 }
diff --git a/modules/storage/obs.go b/modules/storage/obs.go
index 2cb3af927..2ea604c79 100755
--- a/modules/storage/obs.go
+++ b/modules/storage/obs.go
@@ -114,10 +114,11 @@ func GetObsPartInfos(uuid, uploadID, fileName string) (string, error) {
 	return chunks, nil
 }
 
-func NewObsMultiPartUpload(uuid, fileName string) (string, error) {
+func NewObsMultiPartUpload(objectName string) (string, error) {
 	input := &obs.InitiateMultipartUploadInput{}
 	input.Bucket = setting.Bucket
-	input.Key = strings.TrimPrefix(path.Join(setting.BasePath, path.Join(uuid[0:1], uuid[1:2], uuid, fileName)), "/")
+	input.Key = objectName
+	//strings.TrimPrefix(path.Join(setting.BasePath, path.Join(uuid[0:1], uuid[1:2], uuid, fileName)), "/")
 
 	output, err := ObsCli.InitiateMultipartUpload(input)
 	if err != nil {
@@ -526,11 +527,12 @@ func GetObsListObject(jobName, outPutPath, parentDir, versionName string) ([]Fil
 	}
 }
 
-func ObsGenMultiPartSignedUrl(uuid string, uploadId string, partNumber int, fileName string) (string, error) {
+func ObsGenMultiPartSignedUrl(objectName string, uploadId string, partNumber int) (string, error) {
 
 	input := &obs.CreateSignedUrlInput{}
 	input.Bucket = setting.Bucket
-	input.Key = strings.TrimPrefix(path.Join(setting.BasePath, path.Join(uuid[0:1], uuid[1:2], uuid, fileName)), "/")
+	input.Key = objectName
+	//strings.TrimPrefix(path.Join(setting.BasePath, path.Join(uuid[0:1], uuid[1:2], uuid, fileName)), "/")
 	input.Expires = 60 * 60
 	input.Method = obs.HttpMethodPut
 
diff --git a/routers/repo/ai_model_manage.go b/routers/repo/ai_model_manage.go
index ee6a71304..b366d5436 100644
--- a/routers/repo/ai_model_manage.go
+++ b/routers/repo/ai_model_manage.go
@@ -22,6 +22,7 @@ import (
 )
 
 const (
+	Attachment_model       = "model"
 	Model_prefix           = "aimodels/"
 	tplModelManageIndex    = "repo/modelmanage/index"
 	tplModelManageDownload = "repo/modelmanage/download"
diff --git a/routers/repo/attachment.go b/routers/repo/attachment.go
index dc2c417e4..d0eeed076 100755
--- a/routers/repo/attachment.go
+++ b/routers/repo/attachment.go
@@ -11,6 +11,7 @@ import (
 	"fmt"
 	"mime/multipart"
 	"net/http"
+	"path"
 	"strconv"
 	"strings"
 
@@ -415,7 +416,7 @@ func AddAttachment(ctx *context.Context) {
 	uuid := ctx.Query("uuid")
 	has := false
 	if typeCloudBrain == models.TypeCloudBrainOne {
-		has, err = storage.Attachments.HasObject(models.AttachmentRelativePath(uuid))
+		has, err = storage.Attachments.HasObject(setting.Attachment.Minio.BasePath + models.AttachmentRelativePath(uuid))
 		if err != nil {
 			ctx.ServerError("HasObject", err)
 			return
@@ -528,10 +529,28 @@ func UpdateAttachmentDecompressState(ctx *context.Context) {
 	})
 }
 
+func getCloudOneMinioPrefix(scene string) string {
+	if scene == Attachment_model {
+		return Model_prefix
+	} else {
+		return setting.Attachment.Minio.BasePath
+	}
+}
+
+func getCloudTwoOBSPrefix(scene string) string {
+	if scene == Attachment_model {
+		return Model_prefix
+	} else {
+		return setting.BasePath
+	}
+}
+
 func GetSuccessChunks(ctx *context.Context) {
 	fileMD5 := ctx.Query("md5")
 	typeCloudBrain := ctx.QueryInt("type")
 	fileName := ctx.Query("file_name")
+	scene := ctx.Query("scene")
+	log.Info("scene=" + scene)
 	var chunks string
 
 	err := checkTypeCloudBrain(typeCloudBrain)
@@ -557,7 +576,7 @@ func GetSuccessChunks(ctx *context.Context) {
 
 	isExist := false
 	if typeCloudBrain == models.TypeCloudBrainOne {
-		isExist, err = storage.Attachments.HasObject(models.AttachmentRelativePath(fileChunk.UUID))
+		isExist, err = storage.Attachments.HasObject(getCloudOneMinioPrefix(scene) + models.AttachmentRelativePath(fileChunk.UUID))
 		if err != nil {
 			ctx.ServerError("HasObject failed", err)
 			return
@@ -568,7 +587,7 @@ func GetSuccessChunks(ctx *context.Context) {
 		if oldAttachment != nil {
 			oldFileName = oldAttachment.Name
 		}
-		isExist, err = storage.ObsHasObject(setting.BasePath + models.AttachmentRelativePath(fileChunk.UUID) + "/" + oldFileName)
+		isExist, err = storage.ObsHasObject(getCloudTwoOBSPrefix(scene) + models.AttachmentRelativePath(fileChunk.UUID) + "/" + oldFileName)
 		if err != nil {
 			ctx.ServerError("ObsHasObject failed", err)
 			return
@@ -642,24 +661,43 @@ func GetSuccessChunks(ctx *context.Context) {
 		})
 		return
 	}
+	if scene == Attachment_model {
+		//使用description存储模型信息
 
-	dataset, err := models.GetDatasetByID(attach.DatasetID)
-	if err != nil {
-		ctx.ServerError("GetDatasetByID", err)
-		return
+	} else {
+		dataset, err := models.GetDatasetByID(attach.DatasetID)
+		if err != nil {
+			ctx.ServerError("GetDatasetByID", err)
+			return
+		}
+
+		ctx.JSON(200, map[string]string{
+			"uuid":        fileChunk.UUID,
+			"uploaded":    strconv.Itoa(fileChunk.IsUploaded),
+			"uploadID":    fileChunk.UploadID,
+			"chunks":      string(chunks),
+			"attachID":    strconv.Itoa(int(attachID)),
+			"datasetID":   strconv.Itoa(int(attach.DatasetID)),
+			"fileName":    attach.Name,
+			"datasetName": dataset.Title,
+		})
 	}
+}
 
-	ctx.JSON(200, map[string]string{
-		"uuid":        fileChunk.UUID,
-		"uploaded":    strconv.Itoa(fileChunk.IsUploaded),
-		"uploadID":    fileChunk.UploadID,
-		"chunks":      string(chunks),
-		"attachID":    strconv.Itoa(int(attachID)),
-		"datasetID":   strconv.Itoa(int(attach.DatasetID)),
-		"fileName":    attach.Name,
-		"datasetName": dataset.Title,
-	})
+func getCloudOneMinioObjectName(scene string, uuid string, filename string) string {
+	if scene == Attachment_model {
+		return strings.TrimPrefix(path.Join(Model_prefix, path.Join(uuid[0:1], uuid[1:2], uuid, filename)), "/")
+	} else {
+		return strings.TrimPrefix(path.Join(setting.Attachment.Minio.BasePath, path.Join(uuid[0:1], uuid[1:2], uuid)), "/")
+	}
+}
 
+func getCloudTwoOBSObjectName(scene string, uuid string, filename string) string {
+	if scene == Attachment_model {
+		return strings.TrimPrefix(path.Join(Model_prefix, path.Join(uuid[0:1], uuid[1:2], uuid, filename)), "/")
+	} else {
+		return strings.TrimPrefix(path.Join(setting.BasePath, path.Join(uuid[0:1], uuid[1:2], uuid, filename)), "/")
+	}
 }
 
 func NewMultipart(ctx *context.Context) {
@@ -682,6 +720,7 @@ func NewMultipart(ctx *context.Context) {
 	}
 
 	fileName := ctx.Query("file_name")
+	scene := ctx.Query("scene")
 
 	if setting.Attachment.StoreType == storage.MinioStorageType {
 		totalChunkCounts := ctx.QueryInt("totalChunkCounts")
@@ -699,13 +738,13 @@ func NewMultipart(ctx *context.Context) {
 		uuid := gouuid.NewV4().String()
 		var uploadID string
 		if typeCloudBrain == models.TypeCloudBrainOne {
-			uploadID, err = storage.NewMultiPartUpload(uuid)
+			uploadID, err = storage.NewMultiPartUpload(getCloudOneMinioObjectName(scene, uuid, fileName))
 			if err != nil {
 				ctx.ServerError("NewMultipart", err)
 				return
 			}
 		} else {
-			uploadID, err = storage.NewObsMultiPartUpload(uuid, fileName)
+			uploadID, err = storage.NewObsMultiPartUpload(getCloudTwoOBSObjectName(scene, uuid, fileName))
 			if err != nil {
 				ctx.ServerError("NewObsMultiPartUpload", err)
 				return
@@ -790,7 +829,7 @@ func GetMultipartUploadUrl(ctx *context.Context) {
 	partNumber := ctx.QueryInt("chunkNumber")
 	size := ctx.QueryInt64("size")
 	fileName := ctx.Query("file_name")
-
+	scene := ctx.Query("scene")
 	typeCloudBrain := ctx.QueryInt("type")
 	err := checkTypeCloudBrain(typeCloudBrain)
 	if err != nil {
@@ -805,7 +844,7 @@ func GetMultipartUploadUrl(ctx *context.Context) {
 			return
 		}
 
-		url, err = storage.GenMultiPartSignedUrl(uuid, uploadID, partNumber, size)
+		url, err = storage.GenMultiPartSignedUrl(getCloudOneMinioObjectName(scene, uuid, fileName), uploadID, partNumber, size)
 		if err != nil {
 			ctx.Error(500, fmt.Sprintf("GenMultiPartSignedUrl failed: %v", err))
 			return
@@ -815,7 +854,7 @@ func GetMultipartUploadUrl(ctx *context.Context) {
 			url = setting.PROXYURL + "/obs_proxy_multipart?uuid=" + uuid + "&uploadId=" + uploadID + "&partNumber=" + fmt.Sprint(partNumber) + "&file_name=" + fileName
 			log.Info("return url=" + url)
 		} else {
-			url, err = storage.ObsGenMultiPartSignedUrl(uuid, uploadID, partNumber, fileName)
+			url, err = storage.ObsGenMultiPartSignedUrl(getCloudTwoOBSObjectName(scene, uuid, fileName), uploadID, partNumber)
 			if err != nil {
 				ctx.Error(500, fmt.Sprintf("ObsGenMultiPartSignedUrl failed: %v", err))
 				return
@@ -1013,7 +1052,7 @@ func queryDatasets(ctx *context.Context, attachs []*models.AttachmentUsername) {
 	}
 
 	for _, attch := range attachs {
-		has, err := storage.Attachments.HasObject(models.AttachmentRelativePath(attch.UUID))
+		has, err := storage.Attachments.HasObject(setting.Attachment.Minio.BasePath + models.AttachmentRelativePath(attch.UUID))
 		if err != nil || !has {
 			continue
 		}

From 6834f3e065019dddaad97f9694859483459d8f91 Mon Sep 17 00:00:00 2001
From: ychao_1983 <ychao_1983@sina.com>
Date: Wed, 2 Nov 2022 17:26:40 +0800
Subject: [PATCH 050/187] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 services/cloudbrain/cloudbrainTask/train.go | 29 ++++++++++++++-------
 1 file changed, 19 insertions(+), 10 deletions(-)

diff --git a/services/cloudbrain/cloudbrainTask/train.go b/services/cloudbrain/cloudbrainTask/train.go
index 5e2cce1ff..c3eb256f2 100644
--- a/services/cloudbrain/cloudbrainTask/train.go
+++ b/services/cloudbrain/cloudbrainTask/train.go
@@ -13,6 +13,8 @@ import (
 	"strconv"
 	"strings"
 
+	"code.gitea.io/gitea/modules/urfs_client/urchin"
+
 	"code.gitea.io/gitea/modules/timeutil"
 
 	"code.gitea.io/gitea/modules/notification"
@@ -382,7 +384,7 @@ func GrampusTrainJobGpuCreate(ctx *context.Context, option api.CreateTrainJobOpt
 	//prepare command
 	preTrainModelPath := getPreTrainModelPath(option.PreTrainModelUrl, option.CkptName)
 
-	command, err := generateCommand(repo.Name, grampus.ProcessorTypeGPU, codeMinioPath+cloudbrain.DefaultBranchName+".zip", datasetRemotePath, bootFile, params, setting.CBCodePathPrefix+jobName+cloudbrain.ModelMountPath+"/", allFileName, preTrainModelPath, option.CkptName)
+	command, err := generateCommand(repo.Name, grampus.ProcessorTypeGPU, codeMinioPath+cloudbrain.DefaultBranchName+".zip", datasetRemotePath, bootFile, params, setting.CBCodePathPrefix+jobName+cloudbrain.ModelMountPath+"/", allFileName, preTrainModelPath, option.CkptName, "")
 	if err != nil {
 		log.Error("Failed to generateCommand: %s (%v)", displayJobName, err, ctx.Data["MsgID"])
 		ctx.JSON(http.StatusOK, models.BaseErrorMessageApi("Create task failed, internal error"))
@@ -611,7 +613,7 @@ func GrampusTrainJobNpuCreate(ctx *context.Context, option api.CreateTrainJobOpt
 
 	//prepare command
 	preTrainModelPath := getPreTrainModelPath(option.PreTrainModelUrl, option.CkptName)
-	command, err := generateCommand(repo.Name, grampus.ProcessorTypeNPU, codeObsPath+cloudbrain.DefaultBranchName+".zip", datasetRemotePath, bootFile, params, setting.CodePathPrefix+jobName+modelarts.OutputPath, allFileName, preTrainModelPath, option.CkptName)
+	command, err := generateCommand(repo.Name, grampus.ProcessorTypeNPU, codeObsPath+cloudbrain.DefaultBranchName+".zip", datasetRemotePath, bootFile, params, setting.CodePathPrefix+jobName+modelarts.OutputPath, allFileName, preTrainModelPath, option.CkptName, grampus.GetNpuModelRemoteObsUrl(jobName))
 	if err != nil {
 		log.Error("Failed to generateCommand: %s (%v)", displayJobName, err, ctx.Data["MsgID"])
 
@@ -862,15 +864,18 @@ func getPreTrainModelPath(pretrainModelDir string, fileName string) string {
 
 }
 
-func generateCommand(repoName, processorType, codeRemotePath, dataRemotePath, bootFile, paramSrc, outputRemotePath, datasetName, pretrainModelPath, pretrainModelFileName string) (string, error) {
+func generateCommand(repoName, processorType, codeRemotePath, dataRemotePath, bootFile, paramSrc, outputRemotePath, datasetName, pretrainModelPath, pretrainModelFileName, modelRemoteObsUrl string) (string, error) {
 	var command string
 
+	//prepare
 	workDir := grampus.NpuWorkDir
-	if processorType == grampus.ProcessorTypeGPU {
+	if processorType == grampus.ProcessorTypeNPU {
+		command += "pwd;cd " + workDir + grampus.CommandPrepareScriptNpu
+	} else if processorType == grampus.ProcessorTypeGPU {
 		workDir = grampus.GpuWorkDir
+		command += "pwd;cd " + workDir + fmt.Sprintf(grampus.CommandPrepareScriptGpu, setting.Grampus.SyncScriptProject, setting.Grampus.SyncScriptProject)
 	}
 
-	command += "pwd;cd " + workDir + fmt.Sprintf(grampus.CommandPrepareScript, setting.Grampus.SyncScriptProject, setting.Grampus.SyncScriptProject)
 	//download code & dataset
 	if processorType == grampus.ProcessorTypeNPU {
 		//no need to download code & dataset by internet
@@ -885,7 +890,7 @@ func generateCommand(repoName, processorType, codeRemotePath, dataRemotePath, bo
 		//no need to process
 	} else if processorType == grampus.ProcessorTypeGPU {
 		unZipDatasetCommand := generateDatasetUnzipCommand(datasetName)
-		commandUnzip := "cd " + workDir + "code;unzip -q master.zip;echo \"start to unzip dataset\";cd " + workDir + "dataset;" + unZipDatasetCommand
+		commandUnzip := "cd " + workDir + "code;unzip -q master.zip;rm -f master.zip;echo \"start to unzip dataset\";cd " + workDir + "dataset;" + unZipDatasetCommand
 		command += commandUnzip
 	}
 
@@ -919,7 +924,8 @@ func generateCommand(repoName, processorType, codeRemotePath, dataRemotePath, bo
 
 	var commandCode string
 	if processorType == grampus.ProcessorTypeNPU {
-		commandCode = "/bin/bash /home/work/run_train_for_openi.sh /home/work/openi.py /tmp/log/train.log" + paramCode + ";"
+		paramCode += " --model_url=" + modelRemoteObsUrl
+		commandCode = "/bin/bash /home/work/run_train_for_openi.sh /home/work/openi.py " + grampus.NpuLocalLogUrl + paramCode + ";"
 	} else if processorType == grampus.ProcessorTypeGPU {
 		if pretrainModelFileName != "" {
 			paramCode += " --ckpt_url" + "=" + workDir + "pretrainmodel/" + pretrainModelFileName
@@ -935,8 +941,7 @@ func generateCommand(repoName, processorType, codeRemotePath, dataRemotePath, bo
 
 	//upload models
 	if processorType == grampus.ProcessorTypeNPU {
-		commandUpload := "cd " + workDir + setting.Grampus.SyncScriptProject + "/;./uploader_for_npu " + setting.Bucket + " " + outputRemotePath + " " + workDir + "output/;"
-		command += commandUpload
+		// no need to upload
 	} else if processorType == grampus.ProcessorTypeGPU {
 		commandUpload := "cd " + workDir + setting.Grampus.SyncScriptProject + "/;./uploader_for_gpu " + setting.Grampus.Env + " " + outputRemotePath + " " + workDir + "output/;"
 		command += commandUpload
@@ -948,7 +953,6 @@ func generateCommand(repoName, processorType, codeRemotePath, dataRemotePath, bo
 
 	return command, nil
 }
-
 func processPretrainModelParameter(pretrainModelPath string, pretrainModelFileName string, commandDownload string) string {
 	commandDownloadTemp := commandDownload
 	if pretrainModelPath != "" {
@@ -1083,6 +1087,11 @@ func SyncTaskStatus(task *models.Cloudbrain) error {
 				task.CorrectCreateUnix()
 				if oldStatus != task.Status {
 					notification.NotifyChangeCloudbrainStatus(task, oldStatus)
+					if models.IsTrainJobTerminal(task.Status) && task.ComputeResource == models.NPUResource {
+						if len(result.JobInfo.Tasks[0].CenterID) == 1 {
+							urchin.GetBackNpuModel(task.ID, grampus.GetRemoteEndPoint(result.JobInfo.Tasks[0].CenterID[0]), grampus.BucketRemote, grampus.GetNpuModelObjectKey(task.JobName), grampus.GetCenterProxy(setting.Grampus.LocalCenterID))
+						}
+					}
 				}
 				err = models.UpdateJob(task)
 				if err != nil {

From d381c0b5037d8cf1cb4b1dfcbe7b947298ba3363 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Wed, 2 Nov 2022 17:40:34 +0800
Subject: [PATCH 051/187] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=EF=BC=8C=E9=80=82=E9=85=8D=E6=95=B0=E6=8D=AE=E9=9B=86=E5=8F=8A?=
 =?UTF-8?q?=E6=A8=A1=E5=9E=8B=E4=B8=8A=E4=BC=A0=E5=8A=9F=E8=83=BD=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 models/file_chunk.go       |   1 +
 modules/storage/obs.go     |  18 ++--
 routers/repo/attachment.go | 167 ++++++++++++++++++++++---------------
 3 files changed, 112 insertions(+), 74 deletions(-)

diff --git a/models/file_chunk.go b/models/file_chunk.go
index 0fc3a8879..3d83d87e1 100755
--- a/models/file_chunk.go
+++ b/models/file_chunk.go
@@ -17,6 +17,7 @@ type FileChunk struct {
 	ID             int64  `xorm:"pk autoincr"`
 	UUID           string `xorm:"uuid UNIQUE"`
 	Md5            string `xorm:"INDEX"`
+	ObjectName     string `xorm:"DEFAULT ''"`
 	IsUploaded     int    `xorm:"DEFAULT 0"` // not uploaded: 0, uploaded: 1
 	UploadID       string `xorm:"UNIQUE"`    //minio upload id
 	TotalChunks    int
diff --git a/modules/storage/obs.go b/modules/storage/obs.go
index 2ea604c79..be9f2e1d6 100755
--- a/modules/storage/obs.go
+++ b/modules/storage/obs.go
@@ -90,17 +90,16 @@ func listAllParts(uuid, uploadID, key string) (output *obs.ListPartsOutput, err
 		} else {
 			continue
 		}
-
-		break
 	}
 
 	return output, nil
 }
 
-func GetObsPartInfos(uuid, uploadID, fileName string) (string, error) {
-	key := strings.TrimPrefix(path.Join(setting.BasePath, path.Join(uuid[0:1], uuid[1:2], uuid, fileName)), "/")
+func GetObsPartInfos(objectName, uploadID string) (string, error) {
+	key := objectName
+	//strings.TrimPrefix(path.Join(setting.BasePath, path.Join(uuid[0:1], uuid[1:2], uuid, fileName)), "/")
 
-	allParts, err := listAllParts(uuid, uploadID, key)
+	allParts, err := listAllParts(objectName, uploadID, key)
 	if err != nil {
 		log.Error("listAllParts failed: %v", err)
 		return "", err
@@ -129,13 +128,14 @@ func NewObsMultiPartUpload(objectName string) (string, error) {
 	return output.UploadId, nil
 }
 
-func CompleteObsMultiPartUpload(uuid, uploadID, fileName string, totalChunks int) error {
+func CompleteObsMultiPartUpload(objectName, uploadID string, totalChunks int) error {
 	input := &obs.CompleteMultipartUploadInput{}
 	input.Bucket = setting.Bucket
-	input.Key = strings.TrimPrefix(path.Join(setting.BasePath, path.Join(uuid[0:1], uuid[1:2], uuid, fileName)), "/")
+	//input.Key = strings.TrimPrefix(path.Join(setting.BasePath, path.Join(uuid[0:1], uuid[1:2], uuid, fileName)), "/")
+	input.Key = objectName
 	input.UploadId = uploadID
 
-	allParts, err := listAllParts(uuid, uploadID, input.Key)
+	allParts, err := listAllParts(objectName, uploadID, input.Key)
 	if err != nil {
 		log.Error("listAllParts failed: %v", err)
 		return err
@@ -154,7 +154,7 @@ func CompleteObsMultiPartUpload(uuid, uploadID, fileName string, totalChunks int
 		return err
 	}
 
-	log.Info("uuid:%s, RequestId:%s", uuid, output.RequestId)
+	log.Info("uuid:%s, RequestId:%s", objectName, output.RequestId)
 
 	return nil
 }
diff --git a/routers/repo/attachment.go b/routers/repo/attachment.go
index d0eeed076..03c2e845e 100755
--- a/routers/repo/attachment.go
+++ b/routers/repo/attachment.go
@@ -529,19 +529,19 @@ func UpdateAttachmentDecompressState(ctx *context.Context) {
 	})
 }
 
-func getCloudOneMinioPrefix(scene string) string {
+func getCloudOneMinioPrefix(scene string, fileChunk *models.FileChunk) string {
 	if scene == Attachment_model {
-		return Model_prefix
+		return fileChunk.ObjectName
 	} else {
-		return setting.Attachment.Minio.BasePath
+		return setting.Attachment.Minio.BasePath + models.AttachmentRelativePath(fileChunk.UUID)
 	}
 }
 
-func getCloudTwoOBSPrefix(scene string) string {
+func getCloudTwoOBSPrefix(scene string, fileChunk *models.FileChunk, fileName string) string {
 	if scene == Attachment_model {
-		return Model_prefix
+		return fileChunk.ObjectName
 	} else {
-		return setting.BasePath
+		return setting.BasePath + models.AttachmentRelativePath(fileChunk.UUID) + "/" + fileName
 	}
 }
 
@@ -576,7 +576,7 @@ func GetSuccessChunks(ctx *context.Context) {
 
 	isExist := false
 	if typeCloudBrain == models.TypeCloudBrainOne {
-		isExist, err = storage.Attachments.HasObject(getCloudOneMinioPrefix(scene) + models.AttachmentRelativePath(fileChunk.UUID))
+		isExist, err = storage.Attachments.HasObject(getCloudOneMinioPrefix(scene, fileChunk))
 		if err != nil {
 			ctx.ServerError("HasObject failed", err)
 			return
@@ -587,7 +587,7 @@ func GetSuccessChunks(ctx *context.Context) {
 		if oldAttachment != nil {
 			oldFileName = oldAttachment.Name
 		}
-		isExist, err = storage.ObsHasObject(getCloudTwoOBSPrefix(scene) + models.AttachmentRelativePath(fileChunk.UUID) + "/" + oldFileName)
+		isExist, err = storage.ObsHasObject(getCloudTwoOBSPrefix(scene, fileChunk, oldFileName))
 		if err != nil {
 			ctx.ServerError("ObsHasObject failed", err)
 			return
@@ -612,12 +612,12 @@ func GetSuccessChunks(ctx *context.Context) {
 		}
 
 		if typeCloudBrain == models.TypeCloudBrainOne {
-			chunks, err = storage.GetPartInfos(fileChunk.UUID, fileChunk.UploadID)
+			chunks, err = storage.GetPartInfos(getChunkMinioExistObjectName(scene, fileChunk, fileName), fileChunk.UploadID)
 			if err != nil {
 				log.Error("GetPartInfos failed:%v", err.Error())
 			}
 		} else {
-			chunks, err = storage.GetObsPartInfos(fileChunk.UUID, fileChunk.UploadID, fileName)
+			chunks, err = storage.GetObsPartInfos(getChunkOBSExistObjectName(scene, fileChunk, fileName), fileChunk.UploadID)
 			if err != nil {
 				log.Error("GetObsPartInfos failed:%v", err.Error())
 			}
@@ -684,7 +684,7 @@ func GetSuccessChunks(ctx *context.Context) {
 	}
 }
 
-func getCloudOneMinioObjectName(scene string, uuid string, filename string) string {
+func getMinioInitObjectName(scene string, uuid string, filename string) string {
 	if scene == Attachment_model {
 		return strings.TrimPrefix(path.Join(Model_prefix, path.Join(uuid[0:1], uuid[1:2], uuid, filename)), "/")
 	} else {
@@ -692,7 +692,15 @@ func getCloudOneMinioObjectName(scene string, uuid string, filename string) stri
 	}
 }
 
-func getCloudTwoOBSObjectName(scene string, uuid string, filename string) string {
+func getChunkMinioExistObjectName(scene string, fileChunk *models.FileChunk, filename string) string {
+	if scene == Attachment_model {
+		return fileChunk.ObjectName
+	} else {
+		return strings.TrimPrefix(path.Join(setting.Attachment.Minio.BasePath, path.Join(fileChunk.UUID[0:1], fileChunk.UUID[1:2], fileChunk.UUID)), "/")
+	}
+}
+
+func getOBSInitObjectName(scene string, uuid string, filename string) string {
 	if scene == Attachment_model {
 		return strings.TrimPrefix(path.Join(Model_prefix, path.Join(uuid[0:1], uuid[1:2], uuid, filename)), "/")
 	} else {
@@ -700,6 +708,14 @@ func getCloudTwoOBSObjectName(scene string, uuid string, filename string) string
 	}
 }
 
+func getChunkOBSExistObjectName(scene string, fileChunk *models.FileChunk, filename string) string {
+	if scene == Attachment_model {
+		return fileChunk.ObjectName
+	} else {
+		return strings.TrimPrefix(path.Join(setting.BasePath, path.Join(fileChunk.UUID[0:1], fileChunk.UUID[1:2], fileChunk.UUID, filename)), "/")
+	}
+}
+
 func NewMultipart(ctx *context.Context) {
 	if !setting.Attachment.Enabled {
 		ctx.Error(404, "attachment is not enabled")
@@ -736,15 +752,21 @@ func NewMultipart(ctx *context.Context) {
 		}
 
 		uuid := gouuid.NewV4().String()
+		if scene == Attachment_model {
+			uuid = ctx.Query("uuid")
+		}
 		var uploadID string
+		var objectName string
 		if typeCloudBrain == models.TypeCloudBrainOne {
-			uploadID, err = storage.NewMultiPartUpload(getCloudOneMinioObjectName(scene, uuid, fileName))
+			objectName = getMinioInitObjectName(scene, uuid, fileName)
+			uploadID, err = storage.NewMultiPartUpload(objectName)
 			if err != nil {
 				ctx.ServerError("NewMultipart", err)
 				return
 			}
 		} else {
-			uploadID, err = storage.NewObsMultiPartUpload(getCloudTwoOBSObjectName(scene, uuid, fileName))
+			objectName = getOBSInitObjectName(scene, uuid, fileName)
+			uploadID, err = storage.NewObsMultiPartUpload(objectName)
 			if err != nil {
 				ctx.ServerError("NewObsMultiPartUpload", err)
 				return
@@ -755,6 +777,7 @@ func NewMultipart(ctx *context.Context) {
 			UUID:        uuid,
 			UserID:      ctx.User.ID,
 			UploadID:    uploadID,
+			ObjectName:  objectName,
 			Md5:         ctx.Query("md5"),
 			Size:        fileSize,
 			TotalChunks: totalChunkCounts,
@@ -836,7 +859,15 @@ func GetMultipartUploadUrl(ctx *context.Context) {
 		ctx.ServerError("checkTypeCloudBrain failed", err)
 		return
 	}
-
+	fileChunk, err := models.GetFileChunkByUUID(uuid)
+	if err != nil {
+		if models.IsErrFileChunkNotExist(err) {
+			ctx.Error(404)
+		} else {
+			ctx.ServerError("GetFileChunkByUUID", err)
+		}
+		return
+	}
 	url := ""
 	if typeCloudBrain == models.TypeCloudBrainOne {
 		if size > minio_ext.MinPartSize {
@@ -844,7 +875,7 @@ func GetMultipartUploadUrl(ctx *context.Context) {
 			return
 		}
 
-		url, err = storage.GenMultiPartSignedUrl(getCloudOneMinioObjectName(scene, uuid, fileName), uploadID, partNumber, size)
+		url, err = storage.GenMultiPartSignedUrl(getChunkMinioExistObjectName(scene, fileChunk, fileName), uploadID, partNumber, size)
 		if err != nil {
 			ctx.Error(500, fmt.Sprintf("GenMultiPartSignedUrl failed: %v", err))
 			return
@@ -854,7 +885,7 @@ func GetMultipartUploadUrl(ctx *context.Context) {
 			url = setting.PROXYURL + "/obs_proxy_multipart?uuid=" + uuid + "&uploadId=" + uploadID + "&partNumber=" + fmt.Sprint(partNumber) + "&file_name=" + fileName
 			log.Info("return url=" + url)
 		} else {
-			url, err = storage.ObsGenMultiPartSignedUrl(getCloudTwoOBSObjectName(scene, uuid, fileName), uploadID, partNumber)
+			url, err = storage.ObsGenMultiPartSignedUrl(getChunkOBSExistObjectName(scene, fileChunk, fileName), uploadID, partNumber)
 			if err != nil {
 				ctx.Error(500, fmt.Sprintf("ObsGenMultiPartSignedUrl failed: %v", err))
 				return
@@ -873,8 +904,10 @@ func CompleteMultipart(ctx *context.Context) {
 	uploadID := ctx.Query("uploadID")
 	typeCloudBrain := ctx.QueryInt("type")
 	fileName := ctx.Query("file_name")
+	scene := ctx.Query("scene")
 
 	log.Warn("uuid:" + uuid)
+	log.Warn("scene:" + scene)
 	log.Warn("typeCloudBrain:" + strconv.Itoa(typeCloudBrain))
 
 	err := checkTypeCloudBrain(typeCloudBrain)
@@ -894,13 +927,13 @@ func CompleteMultipart(ctx *context.Context) {
 	}
 
 	if typeCloudBrain == models.TypeCloudBrainOne {
-		_, err = storage.CompleteMultiPartUpload(uuid, uploadID, fileChunk.TotalChunks)
+		_, err = storage.CompleteMultiPartUpload(getChunkMinioExistObjectName(scene, fileChunk, fileName), uploadID, fileChunk.TotalChunks)
 		if err != nil {
 			ctx.Error(500, fmt.Sprintf("CompleteMultiPartUpload failed: %v", err))
 			return
 		}
 	} else {
-		err = storage.CompleteObsMultiPartUpload(uuid, uploadID, fileName, fileChunk.TotalChunks)
+		err = storage.CompleteObsMultiPartUpload(getChunkOBSExistObjectName(scene, fileChunk, fileName), uploadID, fileChunk.TotalChunks)
 		if err != nil {
 			ctx.Error(500, fmt.Sprintf("CompleteObsMultiPartUpload failed: %v", err))
 			return
@@ -914,58 +947,62 @@ func CompleteMultipart(ctx *context.Context) {
 		ctx.Error(500, fmt.Sprintf("UpdateFileChunk: %v", err))
 		return
 	}
-	dataset, _ := models.GetDatasetByID(ctx.QueryInt64("dataset_id"))
-	log.Warn("insert attachment to datasetId:" + strconv.FormatInt(dataset.ID, 10))
-	attachment, err := models.InsertAttachment(&models.Attachment{
-		UUID:        uuid,
-		UploaderID:  ctx.User.ID,
-		IsPrivate:   dataset.IsPrivate(),
-		Name:        fileName,
-		Size:        ctx.QueryInt64("size"),
-		DatasetID:   ctx.QueryInt64("dataset_id"),
-		Description: ctx.Query("description"),
-		Type:        typeCloudBrain,
-	})
 
-	if err != nil {
-		ctx.Error(500, fmt.Sprintf("InsertAttachment: %v", err))
-		return
-	}
-	attachment.UpdateDatasetUpdateUnix()
-	repository, _ := models.GetRepositoryByID(dataset.RepoID)
-	notification.NotifyOtherTask(ctx.User, repository, fmt.Sprint(repository.IsPrivate, attachment.IsPrivate), attachment.Name, models.ActionUploadAttachment)
-	if attachment.DatasetID != 0 {
-		if isCanDecompress(attachment.Name) {
-			if typeCloudBrain == models.TypeCloudBrainOne {
-				err = worker.SendDecompressTask(contexExt.Background(), uuid, attachment.Name)
-				if err != nil {
-					log.Error("SendDecompressTask(%s) failed:%s", uuid, err.Error())
-				} else {
-					updateAttachmentDecompressStateIng(attachment)
+	if scene == Attachment_model {
+
+	} else {
+		dataset, _ := models.GetDatasetByID(ctx.QueryInt64("dataset_id"))
+		log.Warn("insert attachment to datasetId:" + strconv.FormatInt(dataset.ID, 10))
+		attachment, err := models.InsertAttachment(&models.Attachment{
+			UUID:        uuid,
+			UploaderID:  ctx.User.ID,
+			IsPrivate:   dataset.IsPrivate(),
+			Name:        fileName,
+			Size:        ctx.QueryInt64("size"),
+			DatasetID:   ctx.QueryInt64("dataset_id"),
+			Description: ctx.Query("description"),
+			Type:        typeCloudBrain,
+		})
+
+		if err != nil {
+			ctx.Error(500, fmt.Sprintf("InsertAttachment: %v", err))
+			return
+		}
+		attachment.UpdateDatasetUpdateUnix()
+		repository, _ := models.GetRepositoryByID(dataset.RepoID)
+		notification.NotifyOtherTask(ctx.User, repository, fmt.Sprint(repository.IsPrivate, attachment.IsPrivate), attachment.Name, models.ActionUploadAttachment)
+		if attachment.DatasetID != 0 {
+			if isCanDecompress(attachment.Name) {
+				if typeCloudBrain == models.TypeCloudBrainOne {
+					err = worker.SendDecompressTask(contexExt.Background(), uuid, attachment.Name)
+					if err != nil {
+						log.Error("SendDecompressTask(%s) failed:%s", uuid, err.Error())
+					} else {
+						updateAttachmentDecompressStateIng(attachment)
+					}
 				}
-			}
-			if typeCloudBrain == models.TypeCloudBrainTwo {
-				attachjson, _ := json.Marshal(attachment)
-				err = labelmsg.SendDecompressAttachToLabelOBS(string(attachjson))
-				if err != nil {
-					log.Error("SendDecompressTask to labelsystem (%s) failed:%s", attachment.UUID, err.Error())
-				} else {
-					updateAttachmentDecompressStateIng(attachment)
+				if typeCloudBrain == models.TypeCloudBrainTwo {
+					attachjson, _ := json.Marshal(attachment)
+					err = labelmsg.SendDecompressAttachToLabelOBS(string(attachjson))
+					if err != nil {
+						log.Error("SendDecompressTask to labelsystem (%s) failed:%s", attachment.UUID, err.Error())
+					} else {
+						updateAttachmentDecompressStateIng(attachment)
+					}
 				}
+			} else {
+				var labelMap map[string]string
+				labelMap = make(map[string]string)
+				labelMap["UUID"] = uuid
+				labelMap["Type"] = fmt.Sprint(attachment.Type)
+				labelMap["UploaderID"] = fmt.Sprint(attachment.UploaderID)
+				labelMap["RepoID"] = fmt.Sprint(dataset.RepoID)
+				labelMap["AttachName"] = attachment.Name
+				attachjson, _ := json.Marshal(labelMap)
+				labelmsg.SendAddAttachToLabelSys(string(attachjson))
 			}
-		} else {
-			var labelMap map[string]string
-			labelMap = make(map[string]string)
-			labelMap["UUID"] = uuid
-			labelMap["Type"] = fmt.Sprint(attachment.Type)
-			labelMap["UploaderID"] = fmt.Sprint(attachment.UploaderID)
-			labelMap["RepoID"] = fmt.Sprint(dataset.RepoID)
-			labelMap["AttachName"] = attachment.Name
-			attachjson, _ := json.Marshal(labelMap)
-			labelmsg.SendAddAttachToLabelSys(string(attachjson))
 		}
 	}
-
 	ctx.JSON(200, map[string]string{
 		"result_code": "0",
 	})

From 8842ba0349fa643ce5cf3aa96cf0ded2e05a16e1 Mon Sep 17 00:00:00 2001
From: ychao_1983 <ychao_1983@sina.com>
Date: Thu, 3 Nov 2022 10:11:15 +0800
Subject: [PATCH 052/187] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/structs/cloudbrain.go               |  2 +-
 routers/api/v1/api.go                       |  4 +-
 routers/repo/grampus.go                     | 49 +--------------------
 services/cloudbrain/cloudbrainTask/train.go |  9 ++--
 4 files changed, 10 insertions(+), 54 deletions(-)

diff --git a/modules/structs/cloudbrain.go b/modules/structs/cloudbrain.go
index b29d7e722..d12d05a21 100644
--- a/modules/structs/cloudbrain.go
+++ b/modules/structs/cloudbrain.go
@@ -32,7 +32,7 @@ type CreateTrainJobOption struct {
 	BootFile         string `json:"boot_file" binding:"Required"`
 	BranchName       string `json:"branch_name" binding:"Required"`
 	Params           string `json:"run_para_list" binding:"Required"`
-	WorkServerNumber int    `json:"work_server_number" binding:"Required"`
+	WorkServerNumber int    `json:"work_server_number"`
 	ModelName        string `json:"model_name"`
 	ModelVersion     string `json:"model_version"`
 	CkptName         string `json:"ckpt_name"`
diff --git a/routers/api/v1/api.go b/routers/api/v1/api.go
index 2f5f059b6..d6a8adc44 100755
--- a/routers/api/v1/api.go
+++ b/routers/api/v1/api.go
@@ -1011,11 +1011,11 @@ func RegisterRoutes(m *macaron.Macaron) {
 					m.Group("/train-job", func() {
 						m.Get("/:jobid", reqRepoReader(models.UnitTypeCloudBrain), repo.CloudBrainShow)
 
-						m.Post("/create", reqRepoWriter(models.UnitTypeCloudBrain), reqWeChat, bind(api.CreateTrainJobOption{}), repo.CreateCloudBrain)
+						m.Post("/create", reqRepoWriter(models.UnitTypeCloudBrain), reqWeChat(), bind(api.CreateTrainJobOption{}), repo.CreateCloudBrain)
 
 					})
 					m.Group("/inference-job", func() {
-						m.Post("/create", reqRepoWriter(models.UnitTypeCloudBrain), reqWeChat, bind(api.CreateTrainJobOption{}), repo.CreateCloudBrainInferenceTask)
+						m.Post("/create", reqRepoWriter(models.UnitTypeCloudBrain), reqWeChat(), bind(api.CreateTrainJobOption{}), repo.CreateCloudBrainInferenceTask)
 						m.Get("/:jobid", reqRepoReader(models.UnitTypeCloudBrain), repo.CloudBrainShow)
 					})
 
diff --git a/routers/repo/grampus.go b/routers/repo/grampus.go
index 35f9a11bf..0620350f6 100755
--- a/routers/repo/grampus.go
+++ b/routers/repo/grampus.go
@@ -509,28 +509,6 @@ func GrampusTrainJobVersionCreate(ctx *context.Context, form auth.CreateGrampusT
 
 }
 
-func checkSpecialPool(ctx *context.Context, resourceType string) string {
-	grampus.InitSpecialPool()
-	if grampus.SpecialPools != nil {
-		for _, pool := range grampus.SpecialPools.Pools {
-
-			if pool.IsExclusive && pool.Type == resourceType {
-
-				org, _ := models.GetOrgByName(pool.Org)
-				if org != nil {
-					isOrgMember, _ := models.IsOrganizationMember(org.ID, ctx.User.ID)
-					if !isOrgMember {
-						return ctx.Tr("repo.grampus.no_operate_right")
-					}
-				}
-			}
-
-		}
-
-	}
-	return ""
-}
-
 func GrampusTrainJobNpuCreate(ctx *context.Context, form auth.CreateGrampusTrainJobForm) {
 	ctx.Data["IsCreate"] = true
 	grampusTrainJobNpuCreate(ctx, form)
@@ -1003,7 +981,7 @@ func generateCommand(repoName, processorType, codeRemotePath, dataRemotePath, bo
 	if processorType == grampus.ProcessorTypeNPU {
 		//no need to process
 	} else if processorType == grampus.ProcessorTypeGPU {
-		unZipDatasetCommand := generateDatasetUnzipCommand(datasetName)
+		unZipDatasetCommand := cloudbrainTask.GenerateDatasetUnzipCommand(datasetName)
 		commandUnzip := "cd " + workDir + "code;unzip -q master.zip;rm -f master.zip;echo \"start to unzip dataset\";cd " + workDir + "dataset;" + unZipDatasetCommand
 		command += commandUnzip
 	}
@@ -1077,31 +1055,6 @@ func processPretrainModelParameter(pretrainModelPath string, pretrainModelFileNa
 	return commandDownloadTemp
 }
 
-func generateDatasetUnzipCommand(datasetName string) string {
-	var unZipDatasetCommand string
-
-	datasetNameArray := strings.Split(datasetName, ";")
-	if len(datasetNameArray) == 1 { //单数据集
-		unZipDatasetCommand = "unzip -q '" + datasetName + "';"
-		if strings.HasSuffix(datasetNameArray[0], ".tar.gz") {
-			unZipDatasetCommand = "tar --strip-components=1 -zxvf '" + datasetName + "';"
-		}
-		unZipDatasetCommand += "rm -f '" + datasetName + "';"
-
-	} else { //多数据集
-		for _, datasetNameTemp := range datasetNameArray {
-			if strings.HasSuffix(datasetNameTemp, ".tar.gz") {
-				unZipDatasetCommand = unZipDatasetCommand + "tar -zxvf '" + datasetNameTemp + "';"
-			} else {
-				unZipDatasetCommand = unZipDatasetCommand + "unzip -q '" + datasetNameTemp + "' -d './" + strings.TrimSuffix(datasetNameTemp, ".zip") + "';"
-			}
-			unZipDatasetCommand += "rm -f '" + datasetNameTemp + "';"
-		}
-
-	}
-	return unZipDatasetCommand
-}
-
 func downloadZipCode(ctx *context.Context, codePath, branchName string) error {
 	archiveType := git.ZIP
 	archivePath := codePath
diff --git a/services/cloudbrain/cloudbrainTask/train.go b/services/cloudbrain/cloudbrainTask/train.go
index c3eb256f2..b59cbc804 100644
--- a/services/cloudbrain/cloudbrainTask/train.go
+++ b/services/cloudbrain/cloudbrainTask/train.go
@@ -889,7 +889,7 @@ func generateCommand(repoName, processorType, codeRemotePath, dataRemotePath, bo
 	if processorType == grampus.ProcessorTypeNPU {
 		//no need to process
 	} else if processorType == grampus.ProcessorTypeGPU {
-		unZipDatasetCommand := generateDatasetUnzipCommand(datasetName)
+		unZipDatasetCommand := GenerateDatasetUnzipCommand(datasetName)
 		commandUnzip := "cd " + workDir + "code;unzip -q master.zip;rm -f master.zip;echo \"start to unzip dataset\";cd " + workDir + "dataset;" + unZipDatasetCommand
 		command += commandUnzip
 	}
@@ -962,7 +962,7 @@ func processPretrainModelParameter(pretrainModelPath string, pretrainModelFileNa
 	return commandDownloadTemp
 }
 
-func generateDatasetUnzipCommand(datasetName string) string {
+func GenerateDatasetUnzipCommand(datasetName string) string {
 	var unZipDatasetCommand string
 
 	datasetNameArray := strings.Split(datasetName, ";")
@@ -971,6 +971,7 @@ func generateDatasetUnzipCommand(datasetName string) string {
 		if strings.HasSuffix(datasetNameArray[0], ".tar.gz") {
 			unZipDatasetCommand = "tar --strip-components=1 -zxvf '" + datasetName + "';"
 		}
+		unZipDatasetCommand += "rm -f '" + datasetName + "';"
 
 	} else { //多数据集
 		for _, datasetNameTemp := range datasetNameArray {
@@ -979,6 +980,7 @@ func generateDatasetUnzipCommand(datasetName string) string {
 			} else {
 				unZipDatasetCommand = unZipDatasetCommand + "unzip -q '" + datasetNameTemp + "' -d './" + strings.TrimSuffix(datasetNameTemp, ".zip") + "';"
 			}
+			unZipDatasetCommand += "rm -f '" + datasetNameTemp + "';"
 		}
 
 	}
@@ -1071,7 +1073,8 @@ func SyncTaskStatus(task *models.Cloudbrain) error {
 			}
 			oldStatus := task.Status
 			task.Status = grampus.TransTrainJobStatus(result.JobInfo.Status)
-			if task.Status != result.JobInfo.Status || result.JobInfo.Status == models.GrampusStatusRunning {
+
+			if task.Status != oldStatus || task.Status == models.GrampusStatusRunning {
 				task.Duration = result.JobInfo.RunSec
 				if task.Duration < 0 {
 					task.Duration = 0

From 9c2060151e5aad13abeffe41a88eb359e74d9a19 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Thu, 3 Nov 2022 10:14:26 +0800
Subject: [PATCH 053/187] =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=B8=8A=E4=BC=A0?=
 =?UTF-8?q?=E7=BB=93=E6=9E=9C=E5=A4=84=E7=90=86=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 modules/storage/minio_ext.go | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/modules/storage/minio_ext.go b/modules/storage/minio_ext.go
index 0ed9a59a4..69151b11e 100755
--- a/modules/storage/minio_ext.go
+++ b/modules/storage/minio_ext.go
@@ -3,7 +3,6 @@ package storage
 import (
 	"encoding/xml"
 	"errors"
-	"path"
 	"sort"
 	"strconv"
 	"strings"
@@ -315,7 +314,7 @@ func NewMultiPartUpload(objectName string) (string, error) {
 	return core.NewMultipartUpload(bucketName, objectName, miniov6.PutObjectOptions{})
 }
 
-func CompleteMultiPartUpload(uuid string, uploadID string, totalChunks int) (string, error) {
+func CompleteMultiPartUpload(objectName string, uploadID string, totalChunks int) (string, error) {
 	client, core, err := getClients()
 	if err != nil {
 		log.Error("getClients failed:", err.Error())
@@ -324,8 +323,8 @@ func CompleteMultiPartUpload(uuid string, uploadID string, totalChunks int) (str
 
 	minio := setting.Attachment.Minio
 	bucketName := minio.Bucket
-	objectName := strings.TrimPrefix(path.Join(minio.BasePath, path.Join(uuid[0:1], uuid[1:2], uuid)), "/")
-
+	//objectName := strings.TrimPrefix(path.Join(minio.BasePath, path.Join(uuid[0:1], uuid[1:2], uuid)), "/")
+	log.Info("bucketName=" + bucketName + " objectName=" + objectName + " uploadID=" + uploadID)
 	partInfos, err := client.ListObjectParts(bucketName, objectName, uploadID)
 	if err != nil {
 		log.Error("ListObjectParts failed:", err.Error())
@@ -351,7 +350,7 @@ func CompleteMultiPartUpload(uuid string, uploadID string, totalChunks int) (str
 	return core.CompleteMultipartUpload(bucketName, objectName, uploadID, complMultipartUpload.Parts)
 }
 
-func GetPartInfos(uuid string, uploadID string) (string, error) {
+func GetPartInfos(objectName string, uploadID string) (string, error) {
 	minioClient, _, err := getClients()
 	if err != nil {
 		log.Error("getClients failed:", err.Error())
@@ -360,7 +359,7 @@ func GetPartInfos(uuid string, uploadID string) (string, error) {
 
 	minio := setting.Attachment.Minio
 	bucketName := minio.Bucket
-	objectName := strings.TrimPrefix(path.Join(minio.BasePath, path.Join(uuid[0:1], uuid[1:2], uuid)), "/")
+	//objectName := strings.TrimPrefix(path.Join(minio.BasePath, path.Join(uuid[0:1], uuid[1:2], uuid)), "/")
 
 	partInfos, err := minioClient.ListObjectParts(bucketName, objectName, uploadID)
 	if err != nil {

From c34021b030ad2f2d1de6b6942f0c8905bcbee1bc Mon Sep 17 00:00:00 2001
From: ychao_1983 <ychao_1983@sina.com>
Date: Thu, 3 Nov 2022 10:46:28 +0800
Subject: [PATCH 054/187] =?UTF-8?q?=E8=A1=A5=E5=85=85gitRepo?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 routers/api/v1/api.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/routers/api/v1/api.go b/routers/api/v1/api.go
index d6a8adc44..c5325c5ab 100755
--- a/routers/api/v1/api.go
+++ b/routers/api/v1/api.go
@@ -1011,11 +1011,11 @@ func RegisterRoutes(m *macaron.Macaron) {
 					m.Group("/train-job", func() {
 						m.Get("/:jobid", reqRepoReader(models.UnitTypeCloudBrain), repo.CloudBrainShow)
 
-						m.Post("/create", reqRepoWriter(models.UnitTypeCloudBrain), reqWeChat(), bind(api.CreateTrainJobOption{}), repo.CreateCloudBrain)
+						m.Post("/create", reqRepoWriter(models.UnitTypeCloudBrain), reqWeChat(), context.ReferencesGitRepo(false), bind(api.CreateTrainJobOption{}), repo.CreateCloudBrain)
 
 					})
 					m.Group("/inference-job", func() {
-						m.Post("/create", reqRepoWriter(models.UnitTypeCloudBrain), reqWeChat(), bind(api.CreateTrainJobOption{}), repo.CreateCloudBrainInferenceTask)
+						m.Post("/create", reqRepoWriter(models.UnitTypeCloudBrain), reqWeChat(), bind(api.CreateTrainJobOption{}), context.ReferencesGitRepo(false), repo.CreateCloudBrainInferenceTask)
 						m.Get("/:jobid", reqRepoReader(models.UnitTypeCloudBrain), repo.CloudBrainShow)
 					})
 

From 28889f60b321923afde2f5cf23ed286bd67269ba Mon Sep 17 00:00:00 2001
From: ychao_1983 <ychao_1983@sina.com>
Date: Thu, 3 Nov 2022 11:04:15 +0800
Subject: [PATCH 055/187] =?UTF-8?q?=E6=8F=90=E4=BA=A4diam?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 routers/api/v1/api.go | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/routers/api/v1/api.go b/routers/api/v1/api.go
index c5325c5ab..92ec10cdd 100755
--- a/routers/api/v1/api.go
+++ b/routers/api/v1/api.go
@@ -977,15 +977,23 @@ func RegisterRoutes(m *macaron.Macaron) {
 					m.Get("/:id/log", repo.CloudbrainGetLog)
 					m.Get("/:id/download_log_file", repo.CloudbrainDownloadLogFile)
 					m.Group("/train-job", func() {
+
+						m.Post("/create", reqToken(), reqRepoWriter(models.UnitTypeCloudBrain), reqWeChat(), context.ReferencesGitRepo(false), bind(api.CreateTrainJobOption{}), repo.CreateCloudBrain)
+
 						m.Group("/:jobid", func() {
 							m.Get("", repo.GetModelArtsTrainJobVersion)
+							m.Get("/detail", reqToken(), reqRepoReader(models.UnitTypeCloudBrain), repo.CloudBrainShow)
 							m.Get("/model_list", repo.CloudBrainModelList)
 							m.Post("/stop_version", cloudbrain.AdminOrOwnerOrJobCreaterRightForTrain, repo_ext.CloudBrainStop)
 						})
 					})
 					m.Group("/inference-job", func() {
+						m.Post("/create", reqToken(), reqRepoWriter(models.UnitTypeCloudBrain), reqWeChat(), bind(api.CreateTrainJobOption{}), context.ReferencesGitRepo(false), repo.CreateCloudBrainInferenceTask)
+
 						m.Group("/:jobid", func() {
 							m.Get("", repo.GetCloudBrainInferenceJob)
+							m.Get("/detail", reqToken(), reqRepoReader(models.UnitTypeCloudBrain), repo.CloudBrainShow)
+
 							m.Post("/del", cloudbrain.AdminOrOwnerOrJobCreaterRightForTrain, repo.DelCloudBrainJob)
 							m.Get("/result_list", repo.InferencJobResultList)
 						})
@@ -1007,19 +1015,6 @@ func RegisterRoutes(m *macaron.Macaron) {
 					m.Get("/:id/modelartlog", repo.TrainJobForModelConvertGetLog)
 					m.Get("/:id/model_list", repo.CloudBrainModelConvertList)
 				}, reqRepoReader(models.UnitTypeModelManage))
-				m.Group("/cloudbrain", func() {
-					m.Group("/train-job", func() {
-						m.Get("/:jobid", reqRepoReader(models.UnitTypeCloudBrain), repo.CloudBrainShow)
-
-						m.Post("/create", reqRepoWriter(models.UnitTypeCloudBrain), reqWeChat(), context.ReferencesGitRepo(false), bind(api.CreateTrainJobOption{}), repo.CreateCloudBrain)
-
-					})
-					m.Group("/inference-job", func() {
-						m.Post("/create", reqRepoWriter(models.UnitTypeCloudBrain), reqWeChat(), bind(api.CreateTrainJobOption{}), context.ReferencesGitRepo(false), repo.CreateCloudBrainInferenceTask)
-						m.Get("/:jobid", reqRepoReader(models.UnitTypeCloudBrain), repo.CloudBrainShow)
-					})
-
-				}, reqToken())
 				m.Group("/modelarts", func() {
 					m.Group("/notebook", func() {
 						//m.Get("/:jobid", repo.GetModelArtsNotebook)

From 636c6909d39d3cd18d8bd31a6254b3edd384eb23 Mon Sep 17 00:00:00 2001
From: ychao_1983 <ychao_1983@sina.com>
Date: Thu, 3 Nov 2022 11:12:24 +0800
Subject: [PATCH 056/187] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 routers/api/v1/repo/cloudbrain.go | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/routers/api/v1/repo/cloudbrain.go b/routers/api/v1/repo/cloudbrain.go
index 9c99f6e48..c933c97d3 100755
--- a/routers/api/v1/repo/cloudbrain.go
+++ b/routers/api/v1/repo/cloudbrain.go
@@ -16,6 +16,8 @@ import (
 	"strings"
 	"time"
 
+	cloudbrainService "code.gitea.io/gitea/services/cloudbrain"
+
 	"code.gitea.io/gitea/modules/convert"
 
 	"code.gitea.io/gitea/services/cloudbrain/cloudbrainTask"
@@ -72,6 +74,7 @@ func CloudBrainShow(ctx *context.APIContext) {
 	} else if task.Type == models.TypeC2Net {
 		task.Image = task.EngineName
 	}
+	task.AiCenter = cloudbrainService.GetAiCenterShow(task.AiCenter, ctx.Context)
 
 	ctx.JSON(http.StatusOK, models.BaseMessageWithDataApi{Code: 0, Message: "", Data: convert.ToCloudBrain(task)})
 

From beeb8f06304a6c2c30d58eb75591f0dc6fb3045f Mon Sep 17 00:00:00 2001
From: ychao_1983 <ychao_1983@sina.com>
Date: Thu, 3 Nov 2022 12:42:51 +0800
Subject: [PATCH 057/187] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 services/cloudbrain/cloudbrainTask/count.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/cloudbrain/cloudbrainTask/count.go b/services/cloudbrain/cloudbrainTask/count.go
index 34b334445..985706911 100644
--- a/services/cloudbrain/cloudbrainTask/count.go
+++ b/services/cloudbrain/cloudbrainTask/count.go
@@ -71,7 +71,7 @@ func GetNotFinalStatusTaskCount(uid int64, cloudbrainType int, jobType string, c
 	}
 
 	key := jobNewType + "-" + strconv.Itoa(cloudbrainType)
-	if len(computeResource) > 0 {
+	if len(computeResource) > 0 && cloudbrainType == models.TypeC2Net {
 		key = key + "-" + computeResource[0]
 	}
 

From 3ebd9d325ac125e32a69bcae470d7da66c5b9689 Mon Sep 17 00:00:00 2001
From: ychao_1983 <ychao_1983@sina.com>
Date: Thu, 3 Nov 2022 14:29:54 +0800
Subject: [PATCH 058/187] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/structs/cloudbrain.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/structs/cloudbrain.go b/modules/structs/cloudbrain.go
index d12d05a21..866c85dad 100644
--- a/modules/structs/cloudbrain.go
+++ b/modules/structs/cloudbrain.go
@@ -22,7 +22,7 @@ type CreateGrampusTrainJobOption struct {
 }
 
 type CreateTrainJobOption struct {
-	Type             int    `json:"type" binding:"Required"`
+	Type             int    `json:"type"`
 	DisplayJobName   string `json:"display_job_name" binding:"Required"`
 	ImageID          string `json:"image_id"`
 	Image            string `json:"image" binding:"Required"`

From bd96fa5515c0799d84f788f7751400896aaaddd5 Mon Sep 17 00:00:00 2001
From: ychao_1983 <ychao_1983@sina.com>
Date: Thu, 3 Nov 2022 15:02:50 +0800
Subject: [PATCH 059/187] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 services/cloudbrain/cloudbrainTask/train.go | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/services/cloudbrain/cloudbrainTask/train.go b/services/cloudbrain/cloudbrainTask/train.go
index b59cbc804..8e4673d66 100644
--- a/services/cloudbrain/cloudbrainTask/train.go
+++ b/services/cloudbrain/cloudbrainTask/train.go
@@ -530,7 +530,12 @@ func checkParameters(ctx *context.Context, option api.CreateTrainJobOption, lock
 	var datasetInfos map[string]models.DatasetInfo
 	var datasetNames string
 	if option.Type != TaskTypeModelArts {
-		datasetInfos, datasetNames, err = models.GetDatasetInfo(option.Attachment, computeType)
+		if isC2NetTask(option) {
+			datasetInfos, datasetNames, err = models.GetDatasetInfo(option.Attachment, computeType)
+		} else {
+			datasetInfos, datasetNames, err = models.GetDatasetInfo(option.Attachment)
+		}
+
 		if err != nil {
 			log.Error("GetDatasetInfo failed: %v", err, ctx.Data["MsgID"])
 			return nil, nil, "", fmt.Errorf(ctx.Tr("cloudbrain.error.dataset_select"))

From 306cf75a8e40941c597e58f428ba4592eebb02c1 Mon Sep 17 00:00:00 2001
From: chenyifan01 <cyf_uestc@outlook.com>
Date: Thu, 3 Nov 2022 15:15:46 +0800
Subject: [PATCH 060/187] #3045 update

---
 models/resource_queue.go                              |  3 ---
 models/resource_specification.go                      | 11 ++++-------
 .../cloudbrain/resource/resource_specification.go     |  1 +
 3 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/models/resource_queue.go b/models/resource_queue.go
index fc0dd8cb5..87809bba7 100644
--- a/models/resource_queue.go
+++ b/models/resource_queue.go
@@ -313,9 +313,6 @@ func SyncGrampusQueues(updateList []ResourceQueue, insertList []ResourceQueue, e
 			if _, err = sess.In("id", deleteSpcIds).Update(&ResourceSpecification{Status: SpecOffShelf}); err != nil {
 				return err
 			}
-			if _, err = sess.In("spec_id", deleteSpcIds).Delete(&ResourceSceneSpec{}); err != nil {
-				return err
-			}
 		}
 
 	}
diff --git a/models/resource_specification.go b/models/resource_specification.go
index 2da8d015d..a6f5f1f82 100644
--- a/models/resource_specification.go
+++ b/models/resource_specification.go
@@ -168,6 +168,7 @@ type FindSpecsOptions struct {
 	UseShareMemGiB  bool
 	//if true,find specs no matter used or not used in scene. if false,only find specs used in scene
 	RequestAll bool
+	SpecStatus int
 }
 
 type Specification struct {
@@ -269,10 +270,6 @@ func ResourceSpecOffShelf(id int64) (int64, error) {
 		}
 		sess.Close()
 	}()
-	//delete scene spec relation
-	if _, err = sess.Where("spec_id = ?", id).Delete(&ResourceSceneSpec{}); err != nil {
-		return 0, err
-	}
 
 	param := ResourceSpecification{
 		Status: SpecOffShelf,
@@ -317,9 +314,6 @@ func SyncGrampusSpecs(updateList []ResourceSpecification, insertList []ResourceS
 		if _, err = sess.Cols("status", "is_available").In("id", deleteIds).Update(&ResourceSpecification{Status: SpecOffShelf, IsAvailable: false}); err != nil {
 			return err
 		}
-		if _, err = sess.In("spec_id", deleteIds).Delete(&ResourceSceneSpec{}); err != nil {
-			return err
-		}
 	}
 
 	//update exists specs
@@ -384,6 +378,9 @@ func FindSpecs(opts FindSpecsOptions) ([]*Specification, error) {
 	if opts.UseShareMemGiB {
 		cond = cond.And(builder.Eq{"resource_specification.share_mem_gi_b": opts.ShareMemGiB})
 	}
+	if opts.SpecStatus > 0 {
+		cond = cond.And(builder.Eq{"resource_specification.status": opts.SpecStatus})
+	}
 	r := make([]*Specification, 0)
 	s := x.Where(cond).
 		Join("INNER", "resource_queue", "resource_queue.id = resource_specification.queue_id")
diff --git a/services/cloudbrain/resource/resource_specification.go b/services/cloudbrain/resource/resource_specification.go
index b68abbb88..9388a1efb 100644
--- a/services/cloudbrain/resource/resource_specification.go
+++ b/services/cloudbrain/resource/resource_specification.go
@@ -197,6 +197,7 @@ func AddSpecOperateLog(doerId int64, operateType string, newValue, oldValue *mod
 }
 
 func FindAvailableSpecs(userId int64, opts models.FindSpecsOptions) ([]*models.Specification, error) {
+	opts.SpecStatus = models.SpecOnShelf
 	r, err := models.FindSpecs(opts)
 	if err != nil {
 		log.Error("FindAvailableSpecs error.%v", err)

From 54ff3a22dd80b5648bc61e1f9f47c413491360ee Mon Sep 17 00:00:00 2001
From: ychao_1983 <ychao_1983@sina.com>
Date: Thu, 3 Nov 2022 15:46:58 +0800
Subject: [PATCH 061/187] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 routers/api/v1/api.go | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/routers/api/v1/api.go b/routers/api/v1/api.go
index 92ec10cdd..813b77c8c 100755
--- a/routers/api/v1/api.go
+++ b/routers/api/v1/api.go
@@ -749,6 +749,8 @@ func RegisterRoutes(m *macaron.Macaron) {
 			}, reqToken())
 
 			m.Group("/:username/:reponame", func() {
+				m.Get("/right", reqToken(), repo.GetRight)
+				m.Get("/tagger", reqToken(), repo.ListTagger)
 				m.Combo("").Get(reqAnyRepoReader(), repo.Get).
 					Delete(reqToken(), reqOwner(), repo.Delete).
 					Patch(reqToken(), reqAdmin(), bind(api.EditRepoOption{}), context.RepoRef(), repo.Edit)

From 5453f901f1df25da6d09022ba10eda28cba3619c Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Thu, 3 Nov 2022 16:10:54 +0800
Subject: [PATCH 062/187] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=EF=BC=8C=E8=A7=A3=E5=86=B3=E9=97=AE=E9=A2=98=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 models/attachment.go            |  4 +-
 modules/storage/obs.go          | 96 +++++++++++++++++----------------
 routers/repo/ai_model_manage.go | 52 ++++++++++++------
 routers/routes/routes.go        |  7 ++-
 4 files changed, 95 insertions(+), 64 deletions(-)

diff --git a/models/attachment.go b/models/attachment.go
index 55c6dbad3..e9b04e61d 100755
--- a/models/attachment.go
+++ b/models/attachment.go
@@ -158,7 +158,8 @@ func (a *Attachment) S3DownloadURL() string {
 	if a.Type == TypeCloudBrainOne {
 		url, _ = storage.Attachments.PresignedGetURL(setting.Attachment.Minio.BasePath+AttachmentRelativePath(a.UUID), a.Name)
 	} else if a.Type == TypeCloudBrainTwo {
-		url, _ = storage.ObsGetPreSignedUrl(a.UUID, a.Name)
+		objectName := strings.TrimPrefix(path.Join(setting.BasePath, path.Join(a.UUID[0:1], a.UUID[1:2], a.UUID, a.Name)), "/")
+		url, _ = storage.ObsGetPreSignedUrl(objectName, a.Name)
 	}
 
 	return url
@@ -587,7 +588,6 @@ func AttachmentsByDatasetOption(datasets []int64, opts *SearchDatasetOptions) ([
 		)
 	}
 
-
 	attachments := make([]*Attachment, 0)
 	if err := sess.Table(&Attachment{}).Where(cond).Desc("id").
 		Find(&attachments); err != nil {
diff --git a/modules/storage/obs.go b/modules/storage/obs.go
index be9f2e1d6..2ed254706 100755
--- a/modules/storage/obs.go
+++ b/modules/storage/obs.go
@@ -159,10 +159,11 @@ func CompleteObsMultiPartUpload(objectName, uploadID string, totalChunks int) er
 	return nil
 }
 
-func ObsMultiPartUpload(uuid string, uploadId string, partNumber int, fileName string, putBody io.ReadCloser) error {
+func ObsMultiPartUpload(objectName string, uploadId string, partNumber int, fileName string, putBody io.ReadCloser) error {
 	input := &obs.UploadPartInput{}
 	input.Bucket = setting.Bucket
-	input.Key = strings.TrimPrefix(path.Join(setting.BasePath, path.Join(uuid[0:1], uuid[1:2], uuid, fileName)), "/")
+	input.Key = objectName
+	//strings.TrimPrefix(path.Join(setting.BasePath, path.Join(uuid[0:1], uuid[1:2], uuid, fileName)), "/")
 	input.UploadId = uploadId
 	input.PartNumber = partNumber
 	input.Body = putBody
@@ -242,11 +243,6 @@ func ObsDownloadAFile(bucket string, key string) (io.ReadCloser, error) {
 	}
 }
 
-func ObsDownload(uuid string, fileName string) (io.ReadCloser, error) {
-
-	return ObsDownloadAFile(setting.Bucket, strings.TrimPrefix(path.Join(setting.BasePath, path.Join(uuid[0:1], uuid[1:2], uuid, fileName)), "/"))
-}
-
 func ObsModelDownload(JobName string, fileName string) (io.ReadCloser, error) {
 	input := &obs.GetObjectInput{}
 	input.Bucket = setting.Bucket
@@ -368,51 +364,60 @@ func GetOneLevelAllObjectUnderDir(bucket string, prefixRootPath string, relative
 	if !strings.HasSuffix(input.Prefix, "/") {
 		input.Prefix += "/"
 	}
-	output, err := ObsCli.ListObjects(input)
 	fileInfos := make([]FileInfo, 0)
 	prefixLen := len(input.Prefix)
 	fileMap := make(map[string]bool, 0)
-	if err == nil {
-		for _, val := range output.Contents {
-			log.Info("val key=" + val.Key)
-			var isDir bool
-			var fileName string
-			if val.Key == input.Prefix {
-				continue
-			}
-			fileName = val.Key[prefixLen:]
-			log.Info("fileName =" + fileName)
-			files := strings.Split(fileName, "/")
-			if fileMap[files[0]] {
-				continue
-			} else {
-				fileMap[files[0]] = true
+	index := 1
+	for {
+		output, err := ObsCli.ListObjects(input)
+		if err == nil {
+			log.Info("Page:%d\n", index)
+			index++
+			for _, val := range output.Contents {
+				log.Info("val key=" + val.Key)
+				var isDir bool
+				var fileName string
+				if val.Key == input.Prefix {
+					continue
+				}
+				fileName = val.Key[prefixLen:]
+				//log.Info("fileName =" + fileName)
+				files := strings.Split(fileName, "/")
+				if fileMap[files[0]] {
+					continue
+				} else {
+					fileMap[files[0]] = true
+				}
+				ParenDir := relativePath
+				fileName = files[0]
+				if len(files) > 1 {
+					isDir = true
+					ParenDir += fileName + "/"
+				} else {
+					isDir = false
+				}
+				fileInfo := FileInfo{
+					ModTime:  val.LastModified.Local().Format("2006-01-02 15:04:05"),
+					FileName: fileName,
+					Size:     val.Size,
+					IsDir:    isDir,
+					ParenDir: ParenDir,
+				}
+				fileInfos = append(fileInfos, fileInfo)
 			}
-			ParenDir := relativePath
-			fileName = files[0]
-			if len(files) > 1 {
-				isDir = true
-				ParenDir += fileName + "/"
+			if output.IsTruncated {
+				input.Marker = output.NextMarker
 			} else {
-				isDir = false
+				break
 			}
-			fileInfo := FileInfo{
-				ModTime:  val.LastModified.Local().Format("2006-01-02 15:04:05"),
-				FileName: fileName,
-				Size:     val.Size,
-				IsDir:    isDir,
-				ParenDir: ParenDir,
+		} else {
+			if obsError, ok := err.(obs.ObsError); ok {
+				log.Error("Code:%s, Message:%s", obsError.Code, obsError.Message)
 			}
-			fileInfos = append(fileInfos, fileInfo)
-		}
-		return fileInfos, err
-	} else {
-		if obsError, ok := err.(obs.ObsError); ok {
-			log.Error("Code:%s, Message:%s", obsError.Code, obsError.Message)
+			return nil, err
 		}
-		return nil, err
 	}
-
+	return fileInfos, nil
 }
 
 func GetAllObjectByBucketAndPrefix(bucket string, prefix string) ([]FileInfo, error) {
@@ -580,10 +585,11 @@ func GetObsCreateSignedUrl(jobName, parentDir, fileName string) (string, error)
 	return GetObsCreateSignedUrlByBucketAndKey(setting.Bucket, strings.TrimPrefix(path.Join(setting.TrainJobModelPath, jobName, setting.OutPutPath, parentDir, fileName), "/"))
 }
 
-func ObsGetPreSignedUrl(uuid, fileName string) (string, error) {
+func ObsGetPreSignedUrl(objectName, fileName string) (string, error) {
 	input := &obs.CreateSignedUrlInput{}
 	input.Method = obs.HttpMethodGet
-	input.Key = strings.TrimPrefix(path.Join(setting.BasePath, path.Join(uuid[0:1], uuid[1:2], uuid, fileName)), "/")
+	input.Key = objectName
+	//strings.TrimPrefix(path.Join(setting.BasePath, path.Join(uuid[0:1], uuid[1:2], uuid, fileName)), "/")
 	input.Bucket = setting.Bucket
 	input.Expires = 60 * 60
 
diff --git a/routers/repo/ai_model_manage.go b/routers/repo/ai_model_manage.go
index b366d5436..247caa010 100644
--- a/routers/repo/ai_model_manage.go
+++ b/routers/repo/ai_model_manage.go
@@ -22,17 +22,21 @@ import (
 )
 
 const (
-	Attachment_model       = "model"
-	Model_prefix           = "aimodels/"
-	tplModelManageIndex    = "repo/modelmanage/index"
-	tplModelManageDownload = "repo/modelmanage/download"
-	tplModelInfo           = "repo/modelmanage/showinfo"
-	MODEL_LATEST           = 1
-	MODEL_NOT_LATEST       = 0
-	MODEL_MAX_SIZE         = 1024 * 1024 * 1024
-	STATUS_COPY_MODEL      = 1
-	STATUS_FINISHED        = 0
-	STATUS_ERROR           = 2
+	Attachment_model                 = "model"
+	Model_prefix                     = "aimodels/"
+	tplModelManageIndex              = "repo/modelmanage/index"
+	tplModelManageDownload           = "repo/modelmanage/download"
+	tplModelInfo                     = "repo/modelmanage/showinfo"
+	tplCreateLocalModelInfo          = "repo/modelmanage/create_local_1"
+	tplCreateLocalForUploadModelInfo = "repo/modelmanage/create_local_2"
+	tplCreateOnlineModelInfo         = "repo/modelmanage/create_online"
+
+	MODEL_LATEST      = 1
+	MODEL_NOT_LATEST  = 0
+	MODEL_MAX_SIZE    = 1024 * 1024 * 1024
+	STATUS_COPY_MODEL = 1
+	STATUS_FINISHED   = 0
+	STATUS_ERROR      = 2
 )
 
 func saveModelByParameters(jobId string, versionName string, name string, version string, label string, description string, engine int, ctx *context.Context) (string, error) {
@@ -287,10 +291,6 @@ func SaveLocalModel(ctx *context.Context) {
 	ctx.JSON(200, re)
 }
 
-func UploadLocalModel(ctx *context.Context) {
-
-}
-
 func SaveModel(ctx *context.Context) {
 	if !ctx.Repo.CanWrite(models.UnitTypeModelManage) {
 		ctx.Error(403, ctx.Tr("repo.model_noright"))
@@ -1106,3 +1106,25 @@ func QueryOneLevelModelFile(ctx *context.Context) {
 		ctx.JSON(http.StatusOK, fileinfos)
 	}
 }
+
+func CreateLocalModel(ctx *context.Context) {
+	ctx.Data["isModelManage"] = true
+	ctx.Data["ModelManageAccess"] = ctx.Repo.CanWrite(models.UnitTypeModelManage)
+
+	ctx.HTML(200, tplCreateLocalModelInfo)
+}
+
+func CreateLocalModelForUpload(ctx *context.Context) {
+	ctx.Data["uuid"] = ctx.Query("uuid")
+	ctx.Data["isModelManage"] = true
+	ctx.Data["ModelManageAccess"] = ctx.Repo.CanWrite(models.UnitTypeModelManage)
+
+	ctx.HTML(200, tplCreateLocalForUploadModelInfo)
+}
+
+func CreateOnlineModel(ctx *context.Context) {
+	ctx.Data["isModelManage"] = true
+	ctx.Data["ModelManageAccess"] = ctx.Repo.CanWrite(models.UnitTypeModelManage)
+
+	ctx.HTML(200, tplCreateOnlineModelInfo)
+}
diff --git a/routers/routes/routes.go b/routers/routes/routes.go
index 588a00c18..4270245cd 100755
--- a/routers/routes/routes.go
+++ b/routers/routes/routes.go
@@ -1232,9 +1232,12 @@ func RegisterRoutes(m *macaron.Macaron) {
 			})
 		}, context.RepoRef())
 		m.Group("/modelmanage", func() {
-			m.Post("/create_model", repo.SaveModel)
-			m.Post("/upload_local_model", repo.UploadLocalModel)
+			m.Get("/create_local_model_tmpl1", repo.CreateLocalModel)
+			m.Get("/create_local_model_tmpl2", repo.CreateLocalModelForUpload)
+			m.Get("/create_online_model_tmpl", repo.CreateOnlineModel)
 			m.Post("/create_local_model", repo.SaveLocalModel)
+
+			m.Post("/create_model", repo.SaveModel)
 			m.Post("/create_model_convert", reqWechatBind, reqRepoModelManageWriter, repo.SaveModelConvert)
 			m.Post("/create_new_model", repo.SaveNewNameModel)
 			m.Delete("/delete_model", repo.DeleteModel)

From 974701ce3162c3154e3e535dee96835ada6e3796 Mon Sep 17 00:00:00 2001
From: ychao_1983 <ychao_1983@sina.com>
Date: Thu, 3 Nov 2022 16:32:16 +0800
Subject: [PATCH 063/187] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 routers/api/v1/repo/mlops.go | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/routers/api/v1/repo/mlops.go b/routers/api/v1/repo/mlops.go
index 3392ebfec..43969330d 100644
--- a/routers/api/v1/repo/mlops.go
+++ b/routers/api/v1/repo/mlops.go
@@ -36,12 +36,20 @@ func ListTagger(ctx *context.APIContext) {
 	}
 
 	for _, team := range teams {
+		team.GetMembers(&models.SearchMembersOptions{})
 		for _, user := range team.Members {
 			if _, ok := userRemember[user.Name]; !ok {
 				taggers = append(taggers, convert.ToTagger(user))
+				userRemember[user.Name] = ""
 			}
 		}
 	}
+	if !ctx.Repo.Owner.IsOrganization() {
+		if _, ok := userRemember[ctx.Repo.Owner.Name]; !ok {
+			taggers = append(taggers, convert.ToTagger(ctx.Repo.Owner))
+
+		}
+	}
 	ctx.JSON(http.StatusOK, taggers)
 
 }

From 08ad1679e8641cf9d718f897bbadee9f31b63193 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Thu, 3 Nov 2022 16:43:48 +0800
Subject: [PATCH 064/187] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/repo/attachment.go | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/routers/repo/attachment.go b/routers/repo/attachment.go
index 03c2e845e..f45b5c935 100755
--- a/routers/repo/attachment.go
+++ b/routers/repo/attachment.go
@@ -312,7 +312,8 @@ func GetAttachment(ctx *context.Context) {
 				url = setting.PROXYURL + "/obs_proxy_download?uuid=" + attach.UUID + "&file_name=" + attach.Name
 				log.Info("return url=" + url)
 			} else {
-				url, err = storage.ObsGetPreSignedUrl(attach.UUID, attach.Name)
+				objectName := strings.TrimPrefix(path.Join(setting.BasePath, path.Join(attach.UUID[0:1], attach.UUID[1:2], attach.UUID, attach.Name)), "/")
+				url, err = storage.ObsGetPreSignedUrl(objectName, attach.Name)
 				if err != nil {
 					ctx.ServerError("ObsGetPreSignedUrl", err)
 					return
@@ -684,9 +685,9 @@ func GetSuccessChunks(ctx *context.Context) {
 	}
 }
 
-func getMinioInitObjectName(scene string, uuid string, filename string) string {
+func getMinioInitObjectName(scene string, uuid, modeluuid string, filename string) string {
 	if scene == Attachment_model {
-		return strings.TrimPrefix(path.Join(Model_prefix, path.Join(uuid[0:1], uuid[1:2], uuid, filename)), "/")
+		return strings.TrimPrefix(path.Join(Model_prefix, path.Join(modeluuid[0:1], modeluuid[1:2], modeluuid, filename)), "/")
 	} else {
 		return strings.TrimPrefix(path.Join(setting.Attachment.Minio.BasePath, path.Join(uuid[0:1], uuid[1:2], uuid)), "/")
 	}
@@ -700,9 +701,9 @@ func getChunkMinioExistObjectName(scene string, fileChunk *models.FileChunk, fil
 	}
 }
 
-func getOBSInitObjectName(scene string, uuid string, filename string) string {
+func getOBSInitObjectName(scene string, uuid, modeluuid string, filename string) string {
 	if scene == Attachment_model {
-		return strings.TrimPrefix(path.Join(Model_prefix, path.Join(uuid[0:1], uuid[1:2], uuid, filename)), "/")
+		return strings.TrimPrefix(path.Join(Model_prefix, path.Join(modeluuid[0:1], modeluuid[1:2], modeluuid, filename)), "/")
 	} else {
 		return strings.TrimPrefix(path.Join(setting.BasePath, path.Join(uuid[0:1], uuid[1:2], uuid, filename)), "/")
 	}
@@ -752,20 +753,21 @@ func NewMultipart(ctx *context.Context) {
 		}
 
 		uuid := gouuid.NewV4().String()
+		modeluuid := ""
 		if scene == Attachment_model {
-			uuid = ctx.Query("uuid")
+			modeluuid = ctx.Query("modeluuid")
 		}
 		var uploadID string
 		var objectName string
 		if typeCloudBrain == models.TypeCloudBrainOne {
-			objectName = getMinioInitObjectName(scene, uuid, fileName)
+			objectName = getMinioInitObjectName(scene, uuid, modeluuid, fileName)
 			uploadID, err = storage.NewMultiPartUpload(objectName)
 			if err != nil {
 				ctx.ServerError("NewMultipart", err)
 				return
 			}
 		} else {
-			objectName = getOBSInitObjectName(scene, uuid, fileName)
+			objectName = getOBSInitObjectName(scene, uuid, modeluuid, fileName)
 			uploadID, err = storage.NewObsMultiPartUpload(objectName)
 			if err != nil {
 				ctx.ServerError("NewObsMultiPartUpload", err)
@@ -811,8 +813,8 @@ func PutOBSProxyUpload(ctx *context.Context) {
 		ctx.Error(500, fmt.Sprintf("FormFile: %v", RequestBody))
 		return
 	}
-
-	err := storage.ObsMultiPartUpload(uuid, uploadID, partNumber, fileName, RequestBody.ReadCloser())
+	objectName := strings.TrimPrefix(path.Join(setting.BasePath, path.Join(uuid[0:1], uuid[1:2], uuid, fileName)), "/")
+	err := storage.ObsMultiPartUpload(objectName, uploadID, partNumber, fileName, RequestBody.ReadCloser())
 	if err != nil {
 		log.Info("upload error.")
 	}
@@ -821,8 +823,8 @@ func PutOBSProxyUpload(ctx *context.Context) {
 func GetOBSProxyDownload(ctx *context.Context) {
 	uuid := ctx.Query("uuid")
 	fileName := ctx.Query("file_name")
-
-	body, err := storage.ObsDownload(uuid, fileName)
+	objectName := strings.TrimPrefix(path.Join(setting.BasePath, path.Join(uuid[0:1], uuid[1:2], uuid, fileName)), "/")
+	body, err := storage.ObsDownloadAFile(setting.Bucket, objectName)
 	if err != nil {
 		log.Info("upload error.")
 	} else {

From 84523e9d58aeac03712ca709dc89878d785552e7 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Fri, 4 Nov 2022 09:01:24 +0800
Subject: [PATCH 065/187] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=EF=BC=8C=E8=A7=A3=E5=86=B3Bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/repo/ai_model_manage.go | 2 +-
 routers/repo/attachment.go      | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/routers/repo/ai_model_manage.go b/routers/repo/ai_model_manage.go
index 247caa010..74d24d38d 100644
--- a/routers/repo/ai_model_manage.go
+++ b/routers/repo/ai_model_manage.go
@@ -227,7 +227,7 @@ func SaveLocalModel(ctx *context.Context) {
 		return
 	}
 	var lastNewModelId string
-	repoId := ctx.Repo.Repository.RepoID
+	repoId := ctx.Repo.Repository.ID
 	aimodels := models.QueryModelByName(name, repoId)
 	if len(aimodels) > 0 {
 		for _, model := range aimodels {
diff --git a/routers/repo/attachment.go b/routers/repo/attachment.go
index f45b5c935..07fc15dc5 100755
--- a/routers/repo/attachment.go
+++ b/routers/repo/attachment.go
@@ -738,6 +738,7 @@ func NewMultipart(ctx *context.Context) {
 
 	fileName := ctx.Query("file_name")
 	scene := ctx.Query("scene")
+	modeluuid := ctx.Query("modeluuid")
 
 	if setting.Attachment.StoreType == storage.MinioStorageType {
 		totalChunkCounts := ctx.QueryInt("totalChunkCounts")
@@ -753,10 +754,7 @@ func NewMultipart(ctx *context.Context) {
 		}
 
 		uuid := gouuid.NewV4().String()
-		modeluuid := ""
-		if scene == Attachment_model {
-			modeluuid = ctx.Query("modeluuid")
-		}
+
 		var uploadID string
 		var objectName string
 		if typeCloudBrain == models.TypeCloudBrainOne {
@@ -907,8 +905,10 @@ func CompleteMultipart(ctx *context.Context) {
 	typeCloudBrain := ctx.QueryInt("type")
 	fileName := ctx.Query("file_name")
 	scene := ctx.Query("scene")
+	modeluuid := ctx.Query("modeluuid")
 
 	log.Warn("uuid:" + uuid)
+	log.Warn("modeluuid:" + modeluuid)
 	log.Warn("scene:" + scene)
 	log.Warn("typeCloudBrain:" + strconv.Itoa(typeCloudBrain))
 

From 44e19cd8ef7b0ab0b3ae144abdb0fbf64e224e35 Mon Sep 17 00:00:00 2001
From: chenshihai <chenshh@pcl.ac.cn>
Date: Fri, 4 Nov 2022 09:41:14 +0800
Subject: [PATCH 066/187] =?UTF-8?q?#3045=20=E7=AE=97=E5=8A=9B=E8=B5=84?=
 =?UTF-8?q?=E6=BA=90=E7=AE=A1=E7=90=86=E6=94=AF=E6=8C=81=E8=B5=84=E6=BA=90?=
 =?UTF-8?q?=E7=9F=AD=E6=9C=9F=E5=9B=9E=E6=94=B6=E7=9A=84=E5=9C=BA=E6=99=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/resources/components/SceneDialog.vue         | 10 ++++++----
 web_src/vuepages/pages/resources/scene/index.vue       |  9 +++++----
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/web_src/vuepages/pages/resources/components/SceneDialog.vue b/web_src/vuepages/pages/resources/components/SceneDialog.vue
index 3b77be6e2..cadfb1db1 100644
--- a/web_src/vuepages/pages/resources/components/SceneDialog.vue
+++ b/web_src/vuepages/pages/resources/components/SceneDialog.vue
@@ -69,7 +69,9 @@
             </div>
             <div class="content">
               <el-select v-model="dataInfo.SpecIds" multiple collapse-tags class="specSel">
-                <el-option v-for="item in specsList" :key="item.k" :label="item.v" :value="item.k" />
+                <el-option v-for="item in specsList" :label="item.v" :key="item.k" :value="item.k">
+                  <span v-html="item.v"></span>
+                </el-option>
               </el-select>
             </div>
           </div>
@@ -167,7 +169,7 @@ export default {
       const params = {
         cluster: this.dataInfo.Cluster,
         queue: this.dataInfo.QueueId === '-1' ? '' : this.dataInfo.QueueId,
-        status: 2,
+        // status: 2,
         page: 1,
       };
       return getResSpecificationList(params).then(res => {
@@ -177,11 +179,11 @@ export default {
           const data = list.map((item) => {
             const Queue = item.Queue;
             const Spec = item.Spec;
-            // const NGPU = `${Queue.ComputeResource}:${Spec.AccCardsNum === 0 ? '0' : Spec.AccCardsNum + '*' + getListValueWithKey(this.accCardTypeList, Queue.AccCardType)}`;
             const NGPU = `${Queue.ComputeResource}:${Spec.AccCardsNum + '*' + getListValueWithKey(this.accCardTypeList, Queue.AccCardType)}`;
+            const statusStr = Spec.Status != '2' ? `<span style="color:rgb(245, 34, 45)">(${getListValueWithKey(this.statusList, Spec.Status.toString())})</span>` : '';
             return {
               k: Spec.ID,
-              v: `${NGPU}, CPU:${Spec.CpuCores}, ${this.$t('resourcesManagement.gpuMem')}:${Spec.GPUMemGiB}GB, ${this.$t('resourcesManagement.mem')}:${Spec.MemGiB}GB, ${this.$t('resourcesManagement.shareMem')}:${Spec.ShareMemGiB}GB, ${this.$t('resourcesManagement.unitPrice')}:${Spec.UnitPrice}${this.$t('resourcesManagement.point_hr')}`,
+              v: `${NGPU}, CPU:${Spec.CpuCores}, ${this.$t('resourcesManagement.gpuMem')}:${Spec.GPUMemGiB}GB, ${this.$t('resourcesManagement.mem')}:${Spec.MemGiB}GB, ${this.$t('resourcesManagement.shareMem')}:${Spec.ShareMemGiB}GB, ${this.$t('resourcesManagement.unitPrice')}:${Spec.UnitPrice}${this.$t('resourcesManagement.point_hr')}${statusStr}`,
             }
           });
           this.specsList.splice(0, Infinity, ...data);
diff --git a/web_src/vuepages/pages/resources/scene/index.vue b/web_src/vuepages/pages/resources/scene/index.vue
index 30c53b742..a706b358b 100644
--- a/web_src/vuepages/pages/resources/scene/index.vue
+++ b/web_src/vuepages/pages/resources/scene/index.vue
@@ -64,7 +64,7 @@
             header-align="center" min-width="180">
             <template slot-scope="scope">
               <div v-for="item in scope.row.SpecsList" :key="item.k">
-                <span>{{ item.v }}</span>
+                <span v-html="item.v"></span>
               </div>
             </template>
           </el-table-column>
@@ -100,7 +100,7 @@
 <script>
 import SceneDialog from '../components/SceneDialog.vue';
 import { getQueueList, getResQueueCode, getResSceneList, updateResScene, getAiCenterList } from '~/apis/modules/resources';
-import { JOB_TYPE, CLUSTERS, ACC_CARD_TYPE } from '~/const';
+import { JOB_TYPE, CLUSTERS, ACC_CARD_TYPE, SPECIFICATION_STATUS } from '~/const';
 import { getListValueWithKey } from '~/utils';
 import { formatDate } from 'element-ui/lib/utils/date-util';
 
@@ -117,6 +117,7 @@ export default {
       selAiCenter: '',
       aiCenterList: [{ k: '', v: this.$t('resourcesManagement.allAiCenter') }],
       accCardTypeList: [...ACC_CARD_TYPE],
+      statusList: [{ k: '', v: this.$t('resourcesManagement.allStatus') }, ...SPECIFICATION_STATUS],
       loading: false,
       tableData: [],
       pageInfo: {
@@ -191,11 +192,11 @@ export default {
             let cluster = '';
             for (let i = 0, iLen = Specs.length; i < iLen; i++) {
               const Spec = Specs[i];
-              // const NGPU = `${Spec.ComputeResource}:${Spec.AccCardsNum === 0 ? '0' : Spec.AccCardsNum + '*' + getListValueWithKey(this.accCardTypeList, Spec.AccCardType)}`;
               const NGPU = `${Spec.ComputeResource}:${Spec.AccCardsNum + '*' + getListValueWithKey(this.accCardTypeList, Spec.AccCardType)}`;
+              const statusStr = Spec.Status != '2' ? `<span style="color:rgb(245, 34, 45)">(${getListValueWithKey(this.statusList, Spec.Status.toString())})</span>` : '';
               specsList.push({
                 k: Spec.ID,
-                v: `${NGPU}, CPU:${Spec.CpuCores}, ${this.$t('resourcesManagement.gpuMem')}:${Spec.GPUMemGiB}GB, ${this.$t('resourcesManagement.mem')}:${Spec.MemGiB}GB, ${this.$t('resourcesManagement.shareMem')}:${Spec.ShareMemGiB}GB, ${this.$t('resourcesManagement.unitPrice')}:${Spec.UnitPrice}${this.$t('resourcesManagement.point_hr')}`,
+                v: `${NGPU}, CPU:${Spec.CpuCores}, ${this.$t('resourcesManagement.gpuMem')}:${Spec.GPUMemGiB}GB, ${this.$t('resourcesManagement.mem')}:${Spec.MemGiB}GB, ${this.$t('resourcesManagement.shareMem')}:${Spec.ShareMemGiB}GB, ${this.$t('resourcesManagement.unitPrice')}:${Spec.UnitPrice}${this.$t('resourcesManagement.point_hr')}${statusStr}`,
               });
               cluster = Spec.Cluster;
               if (queueIds.indexOf(Spec.QueueId) < 0) {

From 9b068dfc389dac07f92ef6caa41dfe14828f575e Mon Sep 17 00:00:00 2001
From: chenyifan01 <cyf_uestc@outlook.com>
Date: Fri, 4 Nov 2022 09:48:33 +0800
Subject: [PATCH 067/187] #3045 update

---
 models/resource_scene.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/models/resource_scene.go b/models/resource_scene.go
index 0c921b578..0117535ea 100644
--- a/models/resource_scene.go
+++ b/models/resource_scene.go
@@ -116,7 +116,7 @@ func InsertResourceScene(r ResourceSceneReq) error {
 
 	//check
 	specs := make([]ResourceSpecification, 0)
-	cond := builder.In("id", r.SpecIds).And(builder.Eq{"status": SpecOnShelf})
+	cond := builder.In("id", r.SpecIds)
 	if err := sess.Where(cond).Find(&specs); err != nil {
 		return err
 	}
@@ -175,7 +175,7 @@ func UpdateResourceScene(r ResourceSceneReq) error {
 	}
 	//check specification
 	specs := make([]ResourceSpecification, 0)
-	cond := builder.In("id", r.SpecIds).And(builder.Eq{"status": SpecOnShelf})
+	cond := builder.In("id", r.SpecIds)
 	if err := sess.Where(cond).Find(&specs); err != nil {
 		return err
 	}

From 6cb536b0e5a85813344c74109e90182f4f3c6226 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Fri, 4 Nov 2022 10:17:49 +0800
Subject: [PATCH 068/187] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 models/ai_model_manage.go       | 15 +++++++++
 routers/repo/ai_model_manage.go | 55 ++++++++++++++++++++++++++++++---
 routers/repo/attachment.go      |  6 ++++
 3 files changed, 71 insertions(+), 5 deletions(-)

diff --git a/models/ai_model_manage.go b/models/ai_model_manage.go
index 0d754b0ba..3165d8d45 100644
--- a/models/ai_model_manage.go
+++ b/models/ai_model_manage.go
@@ -14,6 +14,7 @@ import (
 type AiModelManage struct {
 	ID                string             `xorm:"pk" json:"id"`
 	Name              string             `xorm:"INDEX NOT NULL" json:"name"`
+	ModelType         int                `xorm:"NULL"`
 	Version           string             `xorm:"NOT NULL" json:"version"`
 	VersionCount      int                `xorm:"NOT NULL DEFAULT 0" json:"versionCount"`
 	New               int                `xorm:"NOT NULL" json:"new"`
@@ -287,6 +288,20 @@ func ModifyModelDescription(id string, description string) error {
 	return nil
 }
 
+func ModifyModelSize(id string, size int64) error {
+	var sess *xorm.Session
+	sess = x.ID(id)
+	defer sess.Close()
+	re, err := sess.Cols("size").Update(&AiModelManage{
+		Size: size,
+	})
+	if err != nil {
+		return err
+	}
+	log.Info("success to update size from  db.re=" + fmt.Sprint((re)))
+	return nil
+}
+
 func ModifyModelStatus(id string, modelSize int64, status int, modelPath string, statusDesc string) error {
 	var sess *xorm.Session
 	sess = x.ID(id)
diff --git a/routers/repo/ai_model_manage.go b/routers/repo/ai_model_manage.go
index 74d24d38d..2682a34a5 100644
--- a/routers/repo/ai_model_manage.go
+++ b/routers/repo/ai_model_manage.go
@@ -244,6 +244,7 @@ func SaveLocalModel(ctx *context.Context) {
 	model := &models.AiModelManage{
 		ID:            id,
 		Version:       version,
+		ModelType:     1,
 		VersionCount:  len(aimodels) + 1,
 		Label:         label,
 		Name:          name,
@@ -291,6 +292,39 @@ func SaveLocalModel(ctx *context.Context) {
 	ctx.JSON(200, re)
 }
 
+func getSize(files []storage.FileInfo) int64 {
+	var size int64
+	for _, file := range files {
+		size += file.Size
+	}
+	return size
+}
+
+func UpdateModelSize(modeluuid string) {
+	model, err := models.QueryModelById(modeluuid)
+	if err == nil {
+		if model.Type == models.TypeCloudBrainOne {
+			if strings.HasPrefix(model.Path, setting.Bucket+"/"+Model_prefix) {
+				files, err := storage.GetAllObjectByBucketAndPrefixMinio(setting.Bucket, model.Path[len(setting.Bucket)+1:])
+				if err != nil {
+					log.Info("Failed to query model size from minio. id=" + modeluuid)
+				}
+				size := getSize(files)
+				models.ModifyModelSize(modeluuid, size)
+			}
+		} else if model.Type == models.TypeCloudBrainTwo {
+			if strings.HasPrefix(model.Path, setting.Bucket+"/"+Model_prefix) {
+				files, err := storage.GetAllObjectByBucketAndPrefix(setting.Bucket, model.Path[len(setting.Bucket)+1:])
+				if err != nil {
+					log.Info("Failed to query model size from obs. id=" + modeluuid)
+				}
+				size := getSize(files)
+				models.ModifyModelSize(modeluuid, size)
+			}
+		}
+	}
+}
+
 func SaveModel(ctx *context.Context) {
 	if !ctx.Repo.CanWrite(models.UnitTypeModelManage) {
 		ctx.Error(403, ctx.Tr("repo.model_noright"))
@@ -420,13 +454,24 @@ func deleteModelByID(ctx *context.Context, id string) error {
 	}
 	if err == nil {
 		log.Info("bucket=" + setting.Bucket + " path=" + model.Path)
-		if strings.HasPrefix(model.Path, setting.Bucket+"/"+Model_prefix) {
-			err := storage.ObsRemoveObject(setting.Bucket, model.Path[len(setting.Bucket)+1:])
-			if err != nil {
-				log.Info("Failed to delete model. id=" + id)
-				return err
+		if model.Type == models.TypeCloudBrainOne {
+			if strings.HasPrefix(model.Path, setting.Bucket+"/"+Model_prefix) {
+				err := storage.Attachments.DeleteDir(model.Path[len(setting.Bucket)+1:])
+				if err != nil {
+					log.Info("Failed to delete model. id=" + id)
+					return err
+				}
+			}
+		} else if model.Type == models.TypeCloudBrainTwo {
+			if strings.HasPrefix(model.Path, setting.Bucket+"/"+Model_prefix) {
+				err := storage.ObsRemoveObject(setting.Bucket, model.Path[len(setting.Bucket)+1:])
+				if err != nil {
+					log.Info("Failed to delete model. id=" + id)
+					return err
+				}
 			}
 		}
+
 		err = models.DeleteModelById(id)
 		if err == nil { //find a model to change new
 			aimodels := models.QueryModelByName(model.Name, model.RepoId)
diff --git a/routers/repo/attachment.go b/routers/repo/attachment.go
index 07fc15dc5..44db6c8bc 100755
--- a/routers/repo/attachment.go
+++ b/routers/repo/attachment.go
@@ -951,6 +951,12 @@ func CompleteMultipart(ctx *context.Context) {
 	}
 
 	if scene == Attachment_model {
+		//更新模型大小信息
+		UpdateModelSize(modeluuid)
+
+		ctx.JSON(200, map[string]string{
+			"result_code": "0",
+		})
 
 	} else {
 		dataset, _ := models.GetDatasetByID(ctx.QueryInt64("dataset_id"))

From c4632710cae8edd09bfb272bbb7bcb8bb8558a9c Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Fri, 4 Nov 2022 10:27:25 +0800
Subject: [PATCH 069/187] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=A8=A1=E5=9E=8B?=
 =?UTF-8?q?=E8=BD=AC=E6=8D=A2=E4=BB=BB=E5=8A=A1Api=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/api/v1/api.go              | 4 +++-
 routers/api/v1/repo/modelmanage.go | 9 +++++++++
 routers/repo/ai_model_convert.go   | 6 ++++++
 3 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/routers/api/v1/api.go b/routers/api/v1/api.go
index ecc246916..798f81078 100755
--- a/routers/api/v1/api.go
+++ b/routers/api/v1/api.go
@@ -962,7 +962,9 @@ func RegisterRoutes(m *macaron.Macaron) {
 					m.Get("/query_modelfile_for_predict", repo.QueryModelFileForPredict)
 					m.Get("/query_train_model", repo.QueryTrainModelList)
 					m.Post("/create_model_convert", repo.CreateModelConvert)
-					m.Get("/show_model_convert_page")
+					m.Get("/show_model_convert_page", repo.ShowModelConvertPage)
+					m.Get("/query_model_convert_byId", repo.QueryModelConvertById)
+
 					m.Get("/:id", repo.GetCloudbrainModelConvertTask)
 					m.Get("/:id/log", repo.CloudbrainForModelConvertGetLog)
 					m.Get("/:id/modelartlog", repo.TrainJobForModelConvertGetLog)
diff --git a/routers/api/v1/repo/modelmanage.go b/routers/api/v1/repo/modelmanage.go
index 2c1fd9f01..15260790d 100644
--- a/routers/api/v1/repo/modelmanage.go
+++ b/routers/api/v1/repo/modelmanage.go
@@ -104,3 +104,12 @@ func ShowModelConvertPage(ctx *context.APIContext) {
 	}
 
 }
+
+func QueryModelConvertById(ctx *context.APIContext) {
+	modelResult, err := routerRepo.GetModelConvertById(ctx.Context)
+	if err == nil {
+		ctx.JSON(http.StatusOK, modelResult)
+	} else {
+		ctx.JSON(http.StatusOK, nil)
+	}
+}
diff --git a/routers/repo/ai_model_convert.go b/routers/repo/ai_model_convert.go
index 560ace8fd..962c76aae 100644
--- a/routers/repo/ai_model_convert.go
+++ b/routers/repo/ai_model_convert.go
@@ -150,6 +150,7 @@ func SaveModelConvert(ctx *context.Context) {
 	go goCreateTask(modelConvert, ctx, task)
 
 	ctx.JSON(200, map[string]string{
+		"id":   id,
 		"code": "0",
 	})
 }
@@ -726,6 +727,11 @@ func ShowModelConvertPageInfo(ctx *context.Context) {
 	}
 }
 
+func GetModelConvertById(ctx *context.Context) (*models.AiModelConvert, error) {
+	id := ctx.Query("id")
+	return models.QueryModelConvertById(id)
+}
+
 func GetModelConvertPageData(ctx *context.Context) ([]*models.AiModelConvert, int64, error) {
 	page := ctx.QueryInt("page")
 	if page <= 0 {

From ec13dacb407ff00fb419ee072c327fd81c901ed1 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Fri, 4 Nov 2022 10:36:21 +0800
Subject: [PATCH 070/187] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=A8=A1=E5=9E=8B?=
 =?UTF-8?q?=E8=BD=AC=E6=8D=A2=E4=BB=BB=E5=8A=A1Api=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 models/ai_model_manage.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/models/ai_model_manage.go b/models/ai_model_manage.go
index 3165d8d45..399c02e28 100644
--- a/models/ai_model_manage.go
+++ b/models/ai_model_manage.go
@@ -14,7 +14,7 @@ import (
 type AiModelManage struct {
 	ID                string             `xorm:"pk" json:"id"`
 	Name              string             `xorm:"INDEX NOT NULL" json:"name"`
-	ModelType         int                `xorm:"NULL"`
+	ModelType         int                `xorm:"NULL" json:"modelType"`
 	Version           string             `xorm:"NOT NULL" json:"version"`
 	VersionCount      int                `xorm:"NOT NULL DEFAULT 0" json:"versionCount"`
 	New               int                `xorm:"NOT NULL" json:"new"`

From b53cf10b9b4b105ba43a76defa57f90e2bcc8f27 Mon Sep 17 00:00:00 2001
From: ychao_1983 <ychao_1983@sina.com>
Date: Fri, 4 Nov 2022 17:02:36 +0800
Subject: [PATCH 071/187] fix-3106

---
 routers/api/v1/repo/cloudbrain.go             | 45 +++-------
 routers/api/v1/repo/modelarts.go              | 33 +-------
 routers/repo/cloudbrain.go                    | 62 +++++---------
 .../cloudbrain/cloudbrainTask/sync_status.go  | 83 +++++++++++++++++++
 4 files changed, 117 insertions(+), 106 deletions(-)
 create mode 100644 services/cloudbrain/cloudbrainTask/sync_status.go

diff --git a/routers/api/v1/repo/cloudbrain.go b/routers/api/v1/repo/cloudbrain.go
index 2303ec7ee..3c120cb54 100755
--- a/routers/api/v1/repo/cloudbrain.go
+++ b/routers/api/v1/repo/cloudbrain.go
@@ -16,6 +16,8 @@ import (
 	"strings"
 	"time"
 
+	"code.gitea.io/gitea/services/cloudbrain/cloudbrainTask"
+
 	"code.gitea.io/gitea/modules/notification"
 
 	"code.gitea.io/gitea/modules/setting"
@@ -81,47 +83,22 @@ func GetCloudbrainTask(ctx *context.APIContext) {
 			"JobDuration":   job.TrainJobDuration,
 		})
 	} else {
-		jobResult, err := cloudbrain.GetJob(job.JobID)
-		if err != nil {
-			ctx.NotFound(err)
-			log.Error("GetJob failed:", err)
-			return
-		}
-		result, _ := models.ConvertToJobResultPayload(jobResult.Payload)
+		jobAfter, err := cloudbrainTask.SyncCloudBrainOneStatus(job)
+
 		if err != nil {
 			ctx.NotFound(err)
-			log.Error("ConvertToJobResultPayload failed:", err)
+			log.Error("Sync cloud brain one status failed:", err)
 			return
 		}
-		oldStatus := job.Status
-		job.Status = result.JobStatus.State
-		taskRoles := result.TaskRoles
-		taskRes, _ := models.ConvertToTaskPod(taskRoles[cloudbrain.SubTaskName].(map[string]interface{}))
-		if result.JobStatus.State != string(models.JobWaiting) && result.JobStatus.State != string(models.JobFailed) {
-			job.ContainerIp = taskRes.TaskStatuses[0].ContainerIP
-			job.ContainerID = taskRes.TaskStatuses[0].ContainerID
-			job.Status = taskRes.TaskStatuses[0].State
-		}
-
-		if result.JobStatus.State != string(models.JobWaiting) {
-			models.ParseAndSetDurationFromCloudBrainOne(result, job)
-			if oldStatus != job.Status {
-				notification.NotifyChangeCloudbrainStatus(job, oldStatus)
-			}
-			err = models.UpdateJob(job)
-			if err != nil {
-				log.Error("UpdateJob failed:", err)
-			}
-		}
 
 		ctx.JSON(http.StatusOK, map[string]interface{}{
 			"ID":            ID,
-			"JobName":       result.Config.JobName,
-			"JobStatus":     result.JobStatus.State,
-			"SubState":      result.JobStatus.SubState,
-			"CreatedTime":   time.Unix(result.JobStatus.CreatedTime/1000, 0).Format("2006-01-02 15:04:05"),
-			"CompletedTime": time.Unix(result.JobStatus.CompletedTime/1000, 0).Format("2006-01-02 15:04:05"),
-			"JobDuration":   job.TrainJobDuration,
+			"JobName":       jobAfter.JobName,
+			"JobStatus":     jobAfter.Status,
+			"SubState":      "",
+			"CreatedTime":   jobAfter.CreatedUnix.Format("2006-01-02 15:04:05"),
+			"CompletedTime": jobAfter.UpdatedUnix.Format("2006-01-02 15:04:05"),
+			"JobDuration":   jobAfter.TrainJobDuration,
 		})
 	}
 }
diff --git a/routers/api/v1/repo/modelarts.go b/routers/api/v1/repo/modelarts.go
index 5a0e21ed8..cd129dd5f 100755
--- a/routers/api/v1/repo/modelarts.go
+++ b/routers/api/v1/repo/modelarts.go
@@ -12,6 +12,8 @@ import (
 	"strconv"
 	"strings"
 
+	"code.gitea.io/gitea/services/cloudbrain/cloudbrainTask"
+
 	"code.gitea.io/gitea/modules/urfs_client/urchin"
 
 	"code.gitea.io/gitea/modules/notification"
@@ -20,7 +22,6 @@ import (
 	"code.gitea.io/gitea/modules/setting"
 
 	"code.gitea.io/gitea/models"
-	"code.gitea.io/gitea/modules/cloudbrain"
 	"code.gitea.io/gitea/modules/context"
 	"code.gitea.io/gitea/modules/log"
 	"code.gitea.io/gitea/modules/modelarts"
@@ -109,39 +110,11 @@ func GetModelArtsTrainJobVersion(ctx *context.APIContext) {
 	}
 
 	if job.Type == models.TypeCloudBrainOne {
-		jobResult, err := cloudbrain.GetJob(job.JobID)
-		if err != nil {
-			ctx.NotFound(err)
-			log.Error("GetJob failed:", err)
-			return
-		}
-		result, err := models.ConvertToJobResultPayload(jobResult.Payload)
+		job, err = cloudbrainTask.SyncCloudBrainOneStatus(job)
 		if err != nil {
 			ctx.NotFound(err)
-			log.Error("ConvertToJobResultPayload failed:", err)
 			return
 		}
-		oldStatus := job.Status
-		job.Status = result.JobStatus.State
-		if result.JobStatus.State != string(models.JobWaiting) && result.JobStatus.State != string(models.JobFailed) {
-			taskRoles := result.TaskRoles
-			taskRes, _ := models.ConvertToTaskPod(taskRoles[cloudbrain.SubTaskName].(map[string]interface{}))
-
-			job.ContainerIp = taskRes.TaskStatuses[0].ContainerIP
-			job.ContainerID = taskRes.TaskStatuses[0].ContainerID
-			job.Status = taskRes.TaskStatuses[0].State
-		}
-
-		if result.JobStatus.State != string(models.JobWaiting) {
-			models.ParseAndSetDurationFromCloudBrainOne(result, job)
-			if oldStatus != job.Status {
-				notification.NotifyChangeCloudbrainStatus(job, oldStatus)
-			}
-			err = models.UpdateJob(job)
-			if err != nil {
-				log.Error("UpdateJob failed:", err)
-			}
-		}
 	} else if job.Type == models.TypeCloudBrainTwo {
 		err := modelarts.HandleTrainJobInfo(job)
 		if err != nil {
diff --git a/routers/repo/cloudbrain.go b/routers/repo/cloudbrain.go
index de0e0e8bf..aac941101 100755
--- a/routers/repo/cloudbrain.go
+++ b/routers/repo/cloudbrain.go
@@ -1845,59 +1845,37 @@ func SyncCloudbrainStatus() {
 			continue
 		}
 		if task.Type == models.TypeCloudBrainOne {
-			result, err := cloudbrain.GetJob(task.JobID)
+
+			task, err = cloudbrainTask.SyncCloudBrainOneStatus(task)
 			if err != nil {
-				log.Error("GetJob(%s) failed:%v", task.JobName, err)
+				log.Error("Sync cloud brain one (%s) failed:%v", task.JobName, err)
 				continue
 			}
 
-			if result != nil {
-				jobRes, _ := models.ConvertToJobResultPayload(result.Payload)
-				taskRoles := jobRes.TaskRoles
-				taskRes, _ := models.ConvertToTaskPod(taskRoles[cloudbrain.SubTaskName].(map[string]interface{}))
-				oldStatus := task.Status
-				task.Status = taskRes.TaskStatuses[0].State
-				if task.Status != string(models.JobWaiting) {
-					models.ParseAndSetDurationFromCloudBrainOne(jobRes, task)
+			if task.Status != string(models.JobWaiting) {
+				if task.Duration >= setting.MaxDuration && task.JobType == string(models.JobTypeDebug) {
+					log.Info("begin to stop job(%s), because of the duration", task.DisplayJobName)
+					err = cloudbrain.StopJob(task.JobID)
+					if err != nil {
+						log.Error("StopJob(%s) failed:%v", task.DisplayJobName, err)
+						continue
+					}
+					oldStatus := task.Status
+					task.Status = string(models.JobStopped)
+					if task.EndTime == 0 {
+						task.EndTime = timeutil.TimeStampNow()
+					}
+					task.ComputeAndSetDuration()
 					if oldStatus != task.Status {
 						notification.NotifyChangeCloudbrainStatus(task, oldStatus)
 					}
 					err = models.UpdateJob(task)
 					if err != nil {
-						log.Error("UpdateJob(%s) failed:%v", task.JobName, err)
-					}
-
-					var maxDuration int64
-					if task.JobType == string(models.JobTypeBenchmark) {
-						maxDuration = setting.BenchmarkMaxDuration
-					} else if task.JobType == string(models.JobTypeSnn4imagenet) || task.JobType == string(models.JobTypeBrainScore) {
-						maxDuration = setting.ModelBenchmarkMaxDuration
-					} else {
-						maxDuration = setting.MaxDuration
-					}
-
-					if task.Duration >= maxDuration && task.JobType != string(models.JobTypeTrain) {
-						log.Info("begin to stop job(%s), because of the duration", task.DisplayJobName)
-						err = cloudbrain.StopJob(task.JobID)
-						if err != nil {
-							log.Error("StopJob(%s) failed:%v", task.DisplayJobName, err)
-							continue
-						}
-						task.Status = string(models.JobStopped)
-						if task.EndTime == 0 {
-							task.EndTime = timeutil.TimeStampNow()
-						}
-						task.ComputeAndSetDuration()
-						if oldStatus != task.Status {
-							notification.NotifyChangeCloudbrainStatus(task, oldStatus)
-						}
-						err = models.UpdateJob(task)
-						if err != nil {
-							log.Error("UpdateJob(%s) failed:%v", task.DisplayJobName, err)
-							continue
-						}
+						log.Error("UpdateJob(%s) failed:%v", task.DisplayJobName, err)
+						continue
 					}
 				}
+
 			}
 		} else if task.Type == models.TypeCloudBrainTwo {
 			if task.JobType == string(models.JobTypeDebug) {
diff --git a/services/cloudbrain/cloudbrainTask/sync_status.go b/services/cloudbrain/cloudbrainTask/sync_status.go
new file mode 100644
index 000000000..c9a004874
--- /dev/null
+++ b/services/cloudbrain/cloudbrainTask/sync_status.go
@@ -0,0 +1,83 @@
+package cloudbrainTask
+
+import (
+	"net/http"
+
+	"code.gitea.io/gitea/models"
+	"code.gitea.io/gitea/modules/cloudbrain"
+	"code.gitea.io/gitea/modules/httplib"
+	"code.gitea.io/gitea/modules/log"
+	"code.gitea.io/gitea/modules/notification"
+	"code.gitea.io/gitea/modules/setting"
+)
+
+var noteBookOKMap = make(map[int64]int, 20)
+
+//if a task notebook url can get  two times,  the notebook can browser.
+const successfulCount = 2
+
+func SyncCloudBrainOneStatus(task *models.Cloudbrain) (*models.Cloudbrain, error) {
+	jobResult, err := cloudbrain.GetJob(task.JobID)
+	if err != nil {
+
+		log.Error("GetJob failed:", err)
+
+		return task, err
+	}
+	result, err := models.ConvertToJobResultPayload(jobResult.Payload)
+	if err != nil {
+		log.Error("ConvertToJobResultPayload failed:", err)
+		return task, err
+	}
+	oldStatus := task.Status
+
+	if result.JobStatus.State != string(models.JobWaiting) && result.JobStatus.State != string(models.JobFailed) {
+		taskRoles := result.TaskRoles
+		taskRes, _ := models.ConvertToTaskPod(taskRoles[cloudbrain.SubTaskName].(map[string]interface{}))
+
+		task.ContainerIp = taskRes.TaskStatuses[0].ContainerIP
+		task.ContainerID = taskRes.TaskStatuses[0].ContainerID
+	}
+
+	if (result.JobStatus.State != string(models.JobWaiting) && result.JobStatus.State != string(models.JobRunning)) ||
+		task.Status == string(models.JobRunning) || (result.JobStatus.State == string(models.JobRunning) && isNoteBookReady(task)) {
+
+		models.ParseAndSetDurationFromCloudBrainOne(result, task)
+		task.Status = result.JobStatus.State
+		if oldStatus != task.Status {
+			notification.NotifyChangeCloudbrainStatus(task, oldStatus)
+		}
+		err = models.UpdateJob(task)
+		if err != nil {
+			log.Error("UpdateJob failed:", err)
+			return task, err
+		}
+	}
+	return task, nil
+
+}
+
+func isNoteBookReady(task *models.Cloudbrain) bool {
+	if task.JobType != string(models.JobTypeDebug) {
+		return true
+	}
+	noteBookUrl := setting.DebugServerHost + "jpylab_" + task.JobID + "_" + task.SubTaskName
+	r := httplib.Get(noteBookUrl)
+	res, err := r.Response()
+	if err != nil {
+		return false
+	}
+	if res.StatusCode == http.StatusOK {
+		count := noteBookOKMap[task.ID]
+		if count < successfulCount {
+			noteBookOKMap[task.ID] = count + 1
+			return false
+		} else {
+			delete(noteBookOKMap, task.ID)
+			return true
+		}
+
+	}
+	return false
+
+}

From a4ff6baa36c65120193fcbec19e9fdfd9339667c Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Fri, 4 Nov 2022 17:11:20 +0800
Subject: [PATCH 072/187] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=EF=BC=8C=E5=A2=9E=E5=8A=A0=E6=A8=A1=E5=9E=8B=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 models/ai_model_manage.go       | 17 ++++++++++++++
 routers/repo/ai_model_manage.go | 39 +++++++++++++++++++++++++--------
 routers/repo/attachment.go      | 34 ++++++++++++++++++++++++++--
 3 files changed, 79 insertions(+), 11 deletions(-)

diff --git a/models/ai_model_manage.go b/models/ai_model_manage.go
index 399c02e28..5b14b9ba2 100644
--- a/models/ai_model_manage.go
+++ b/models/ai_model_manage.go
@@ -288,6 +288,23 @@ func ModifyModelDescription(id string, description string) error {
 	return nil
 }
 
+func ModifyLocalModel(id string, name, label, description string, engine int) error {
+	var sess *xorm.Session
+	sess = x.ID(id)
+	defer sess.Close()
+	re, err := sess.Cols("name", "label", "description", "engine").Update(&AiModelManage{
+		Description: description,
+		Name:        name,
+		Label:       label,
+		Engine:      int64(engine),
+	})
+	if err != nil {
+		return err
+	}
+	log.Info("success to update description from  db.re=" + fmt.Sprint((re)))
+	return nil
+}
+
 func ModifyModelSize(id string, size int64) error {
 	var sess *xorm.Session
 	sess = x.ID(id)
diff --git a/routers/repo/ai_model_manage.go b/routers/repo/ai_model_manage.go
index 2682a34a5..3a25c37d2 100644
--- a/routers/repo/ai_model_manage.go
+++ b/routers/repo/ai_model_manage.go
@@ -37,6 +37,9 @@ const (
 	STATUS_COPY_MODEL = 1
 	STATUS_FINISHED   = 0
 	STATUS_ERROR      = 2
+
+	MODEL_LOCAL_TYPE  = 1
+	MODEL_ONLINE_TYPE = 0
 )
 
 func saveModelByParameters(jobId string, versionName string, name string, version string, label string, description string, engine int, ctx *context.Context) (string, error) {
@@ -1032,28 +1035,46 @@ func ModifyModelInfo(ctx *context.Context) {
 	log.Info("modify model start.")
 	id := ctx.Query("id")
 	description := ctx.Query("description")
-
+	re := map[string]string{
+		"code": "-1",
+	}
 	task, err := models.QueryModelById(id)
 	if err != nil {
+		re["msg"] = err.Error()
 		log.Error("no such model!", err.Error())
-		ctx.ServerError("no such model:", err)
+		ctx.JSON(200, re)
 		return
 	}
 	if !isOper(ctx, task.UserId) {
-		ctx.NotFound(ctx.Req.URL.RequestURI(), nil)
-		//ctx.ServerError("no right.", errors.New(ctx.Tr("repo.model_noright")))
+		re["msg"] = "No right to operation."
+		ctx.JSON(200, re)
 		return
 	}
+	if task.ModelType == MODEL_LOCAL_TYPE {
+		name := ctx.Query("name")
+		label := ctx.Query("label")
+		description := ctx.Query("description")
+		engine := ctx.QueryInt("engine")
+		aimodels := models.QueryModelByName(name, task.RepoId)
+		if aimodels != nil && len(aimodels) > 0 {
+			re["msg"] = ctx.Tr("repo.model.manage.create_error")
+			ctx.JSON(200, re)
+			return
+		}
+		err = models.ModifyLocalModel(id, name, label, description, engine)
 
-	err = ModifyModel(id, description)
+	} else {
+		err = ModifyModel(id, description)
+	}
 
 	if err != nil {
-		log.Info("modify error," + err.Error())
-		ctx.ServerError("error.", err)
+		re["msg"] = err.Error()
+		ctx.JSON(200, re)
+		return
 	} else {
-		ctx.JSON(200, "success")
+		re["code"] = "0"
+		ctx.JSON(200, re)
 	}
-
 }
 
 func QueryModelListForPredict(ctx *context.Context) {
diff --git a/routers/repo/attachment.go b/routers/repo/attachment.go
index 44db6c8bc..271183e65 100755
--- a/routers/repo/attachment.go
+++ b/routers/repo/attachment.go
@@ -664,7 +664,24 @@ func GetSuccessChunks(ctx *context.Context) {
 	}
 	if scene == Attachment_model {
 		//使用description存储模型信息
-
+		modeluuid := attach.Description
+		modelname := ""
+		if modeluuid != "" {
+			model, err := models.QueryModelById(modeluuid)
+			if err == nil {
+				modelname = model.Name
+			}
+		}
+		ctx.JSON(200, map[string]string{
+			"uuid":      fileChunk.UUID,
+			"uploaded":  strconv.Itoa(fileChunk.IsUploaded),
+			"uploadID":  fileChunk.UploadID,
+			"chunks":    string(chunks),
+			"attachID":  strconv.Itoa(int(attachID)),
+			"modeluuid": modeluuid,
+			"fileName":  attach.Name,
+			"modelName": modelname,
+		})
 	} else {
 		dataset, err := models.GetDatasetByID(attach.DatasetID)
 		if err != nil {
@@ -953,7 +970,20 @@ func CompleteMultipart(ctx *context.Context) {
 	if scene == Attachment_model {
 		//更新模型大小信息
 		UpdateModelSize(modeluuid)
-
+		_, err := models.InsertAttachment(&models.Attachment{
+			UUID:        uuid,
+			UploaderID:  ctx.User.ID,
+			IsPrivate:   true,
+			Name:        fileName,
+			Size:        ctx.QueryInt64("size"),
+			DatasetID:   0,
+			Description: modeluuid,
+			Type:        typeCloudBrain,
+		})
+		if err != nil {
+			ctx.Error(500, fmt.Sprintf("InsertAttachment: %v", err))
+			return
+		}
 		ctx.JSON(200, map[string]string{
 			"result_code": "0",
 		})

From 47c597212677eeaaa4155a59ed042fe1ad98ad5d Mon Sep 17 00:00:00 2001
From: ychao_1983 <ychao_1983@sina.com>
Date: Fri, 4 Nov 2022 17:21:18 +0800
Subject: [PATCH 073/187] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 services/cloudbrain/cloudbrainTask/sync_status.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/cloudbrain/cloudbrainTask/sync_status.go b/services/cloudbrain/cloudbrainTask/sync_status.go
index c9a004874..7153a7ec0 100644
--- a/services/cloudbrain/cloudbrainTask/sync_status.go
+++ b/services/cloudbrain/cloudbrainTask/sync_status.go
@@ -69,7 +69,7 @@ func isNoteBookReady(task *models.Cloudbrain) bool {
 	}
 	if res.StatusCode == http.StatusOK {
 		count := noteBookOKMap[task.ID]
-		if count < successfulCount {
+		if count < successfulCount-1 {
 			noteBookOKMap[task.ID] = count + 1
 			return false
 		} else {

From 403331e721c81e9752dce25ded1f9fe27292e122 Mon Sep 17 00:00:00 2001
From: chenshihai <chenshh@pcl.ac.cn>
Date: Fri, 4 Nov 2022 18:18:50 +0800
Subject: [PATCH 074/187] model manage

---
 .../repo/modelmanage/create_local_1.tmpl      |  12 +
 .../repo/modelmanage/create_local_2.tmpl      |  12 +
 templates/repo/modelmanage/create_online.tmpl |  12 +
 templates/repo/modelmanage/index.tmpl         |  21 +-
 web_src/js/components/Model.vue               |  35 +-
 web_src/vuepages/apis/modules/fileupload.js   |  48 ++
 web_src/vuepages/apis/modules/modelmanage.js  |  23 +
 .../local/modelmanage-local-create-1.vue      | 425 +++++++++++
 .../local/modelmanage-local-create-2.vue      | 677 ++++++++++++++++++
 .../local/vp-modelmanage-local-create-1.js    |  17 +
 .../local/vp-modelmanage-local-create-2.js    |  17 +
 web_src/vuepages/utils/index.js               |   9 +
 12 files changed, 1303 insertions(+), 5 deletions(-)
 create mode 100644 templates/repo/modelmanage/create_local_1.tmpl
 create mode 100644 templates/repo/modelmanage/create_local_2.tmpl
 create mode 100644 templates/repo/modelmanage/create_online.tmpl
 create mode 100644 web_src/vuepages/apis/modules/fileupload.js
 create mode 100644 web_src/vuepages/apis/modules/modelmanage.js
 create mode 100644 web_src/vuepages/pages/modelmanage/local/modelmanage-local-create-1.vue
 create mode 100644 web_src/vuepages/pages/modelmanage/local/modelmanage-local-create-2.vue
 create mode 100644 web_src/vuepages/pages/modelmanage/local/vp-modelmanage-local-create-1.js
 create mode 100644 web_src/vuepages/pages/modelmanage/local/vp-modelmanage-local-create-2.js

diff --git a/templates/repo/modelmanage/create_local_1.tmpl b/templates/repo/modelmanage/create_local_1.tmpl
new file mode 100644
index 000000000..5d017c256
--- /dev/null
+++ b/templates/repo/modelmanage/create_local_1.tmpl
@@ -0,0 +1,12 @@
+{{template "base/head" .}}
+<link rel="stylesheet" href="{{StaticUrlPrefix}}/css/vp-modelmanage-local-create-1.css?v={{MD5 AppVer}}" />
+<style></style>
+{{$repository := .Repository.ID}}
+<div class="repository release dataset-list view">
+    {{template "repo/header" .}}
+    <div class="ui container">
+        <div id="__vue-root"></div>
+    </div>    
+</div>
+<script src="{{StaticUrlPrefix}}/js/vp-modelmanage-local-create-1.js?v={{MD5 AppVer}}"></script>
+{{template "base/footer" .}}
diff --git a/templates/repo/modelmanage/create_local_2.tmpl b/templates/repo/modelmanage/create_local_2.tmpl
new file mode 100644
index 000000000..575b64a6d
--- /dev/null
+++ b/templates/repo/modelmanage/create_local_2.tmpl
@@ -0,0 +1,12 @@
+{{template "base/head" .}}
+<link rel="stylesheet" href="{{StaticUrlPrefix}}/css/vp-modelmanage-local-create-2.css?v={{MD5 AppVer}}" />
+<style></style>
+{{$repository := .Repository.ID}}
+<div class="repository release dataset-list view">
+    {{template "repo/header" .}}
+    <div class="ui container">
+        <div id="__vue-root"></div>
+    </div>    
+</div>
+<script src="{{StaticUrlPrefix}}/js/vp-modelmanage-local-create-2.js?v={{MD5 AppVer}}"></script>
+{{template "base/footer" .}}
diff --git a/templates/repo/modelmanage/create_online.tmpl b/templates/repo/modelmanage/create_online.tmpl
new file mode 100644
index 000000000..5d017c256
--- /dev/null
+++ b/templates/repo/modelmanage/create_online.tmpl
@@ -0,0 +1,12 @@
+{{template "base/head" .}}
+<link rel="stylesheet" href="{{StaticUrlPrefix}}/css/vp-modelmanage-local-create-1.css?v={{MD5 AppVer}}" />
+<style></style>
+{{$repository := .Repository.ID}}
+<div class="repository release dataset-list view">
+    {{template "repo/header" .}}
+    <div class="ui container">
+        <div id="__vue-root"></div>
+    </div>    
+</div>
+<script src="{{StaticUrlPrefix}}/js/vp-modelmanage-local-create-1.js?v={{MD5 AppVer}}"></script>
+{{template "base/footer" .}}
diff --git a/templates/repo/modelmanage/index.tmpl b/templates/repo/modelmanage/index.tmpl
index 2699bed01..2cced090f 100644
--- a/templates/repo/modelmanage/index.tmpl
+++ b/templates/repo/modelmanage/index.tmpl
@@ -25,6 +25,23 @@
         border-bottom-left-radius: 4px;
         box-shadow: 0 2px 3px 0 rgb(34 36 38 / 15%);
     }
+    .m-blue-btn {
+        background-color: rgb(22, 132, 252) !important;
+    }
+    .m-blue-btn:hover {
+        background-color: #66b1ff !important;
+        color: #fff;
+    }
+
+    .m-blue-btn:focus {
+        background-color: #66b1ff !important;
+        color: #fff;
+    }
+
+    .m-blue-btn:active {
+        background-color: #3a8ee6 !important;
+        color: #fff;
+    }
 </style>
 <link rel="stylesheet" href="/self/ztree/css/zTreeStyle/zTreeStyle.css" type="text/css">
 
@@ -57,8 +74,10 @@
             </div>
             <div class="column right aligned">
                 <!--  -->
+                <a class="ui button {{if .Permission.CanWrite $.UnitTypeModelManage}} blue m-blue-btn {{else}} disabled {{end}}"
+                    href="{{.RepoLink}}/modelmanage/create_local_model_tmpl1">导入本地模型</a>
                 <a class="ui button {{if .Permission.CanWrite $.UnitTypeModelManage}} green {{else}} disabled {{end}}"
-                    onclick="showcreate(this)">{{$.i18n.Tr "repo.model.manage.import_new_model"}}</a>
+                    onclick="showcreate(this)">导入线上模型</a>
             </div>
         </div>
         {{if eq $.MODEL_COUNT 0}}
diff --git a/web_src/js/components/Model.vue b/web_src/js/components/Model.vue
index 7362246c4..62fca9b91 100644
--- a/web_src/js/components/Model.vue
+++ b/web_src/js/components/Model.vue
@@ -23,6 +23,7 @@
                 <i class="el-icon-arrow-right"></i>
               </div>
               <!-- <i class="el-icon-time"></i> -->
+              <span :class="scope.row.modelType == '1' ? 'm-local' : 'm-online'">{{ scope.row.modelType == '1' ? '本地' : '线上' }}</span>
               <a
                 class="text-over"
                 :href="showinfoHref + scope.row.name"
@@ -136,7 +137,7 @@
           >
             <template slot-scope="scope">
               <div class="space-around">
-                <a
+                <!--<a
                   :style="{
                     visibility: !scope.row.Children ? 'visible' : 'hidden',
                   }"
@@ -149,6 +150,12 @@
                     )
                   "
                   >{{ i18n.model_create_new_ver }}</a
+                >-->
+                <a
+                  v-if="scope.row.modelType == 1"
+                  :href="url + 'create_local_model_tmpl1?type=1&name=' + scope.row.name + '&id=' + scope.row.id"
+                  :class="{ disabled: !scope.row.isCanOper }"
+                  >{{ '修改' }}</a
                 >
                 <a
                   :href="loadhref + scope.row.id"
@@ -223,9 +230,10 @@ export default {
             let tableData;
             tableData = res.data;
             for (let i = 0; i < tableData.length; i++) {
-              trainTaskInfo = JSON.parse(tableData[i].trainTaskInfo);
+              trainTaskInfo = JSON.parse(tableData[i].trainTaskInfo || '{}');
               tableData[i].engineName = this.getEngineName(tableData[i]);
               tableData[i].computeResource = trainTaskInfo.ComputeResource;
+              tableData[i].computeResource = tableData[i].type == '0' ? 'CPU/GPU' : 'NPU';
               tableData[i].cName = tableData[i].name;
               tableData[i].rowKey = tableData[i].id + Math.random();
               tableData[i].name = "";
@@ -483,13 +491,14 @@ export default {
             let trainTaskInfo;
             this.tableData = res.data.data;
             for (let i = 0; i < this.tableData.length; i++) {
-              trainTaskInfo = JSON.parse(this.tableData[i].trainTaskInfo);
+              trainTaskInfo = JSON.parse(this.tableData[i].trainTaskInfo || '{}');
               this.tableData[i].cName = this.tableData[i].name;
               this.tableData[i].rowKey = this.tableData[i].id + Math.random();
               this.tableData[i].engineName = this.getEngineName(
                 this.tableData[i]
               );
-              this.tableData[i].computeResource = trainTaskInfo.ComputeResource;
+              // this.tableData[i].computeResource = trainTaskInfo.ComputeResource;
+              this.tableData[i].computeResource = this.tableData[i].type == '0' ? 'CPU/GPU' : 'NPU';
               this.tableData[i].hasChildren =
                 res.data.data[i].versionCount === 1 ? false : true;
               if (this.tableData[i].status !== 1) {
@@ -615,6 +624,24 @@ export default {
   white-space: nowrap;
 }
 
+.m-local {
+  background-color: rgb(22, 132, 252);
+  color: white;
+  padding: 2px 3px;
+  border-radius: 4px;
+  font-size: 12px;
+  margin-right: 2px;
+}
+
+.m-online {
+  background-color: rgb(91, 185, 115);
+  color: white;
+  padding: 2px 3px;
+  border-radius: 4px;
+  font-size: 12px;
+  margin-right: 2px;
+}
+
 .el-icon-arrow-right {
   font-family: element-icons !important;
   speak: none;
diff --git a/web_src/vuepages/apis/modules/fileupload.js b/web_src/vuepages/apis/modules/fileupload.js
new file mode 100644
index 000000000..9936e27ec
--- /dev/null
+++ b/web_src/vuepages/apis/modules/fileupload.js
@@ -0,0 +1,48 @@
+import service from "../service";
+
+// 上传文件1: 获取文件chunks信息
+// params: { md5, type: 0-CPU/GPU,1-NPU, file_name, scene: ''-数据集,'model'-模型 }
+// return: uploadID, uuid, uploaded, chunks, attachID, datasetID(), datasetName(), fileName
+export const getChunks = (params) => {
+  return service({
+    url: `/attachments/get_chunks`,
+    method: 'get',
+    params,
+    data: {},
+  });
+};
+
+// 上传文件2: 上传新文件
+// params: { totalChunkCounts, md5, size, fileType, type, file_name, scene=model, modeluuid=xxxx }
+// return: uploadID, uuid
+export const getNewMultipart = (params) => {
+  return service({
+    url: `/attachments/new_multipart`,
+    method: 'get',
+    params,
+    data: {},
+  });
+};
+
+// 上传文件3: 获取分片上传地址
+// params: { uuid, uploadID, size, chunkNumber, type, file_name, scene=model }
+// return: url
+export const getMultipartUrl = (params) => {
+  return service({
+    url: `/attachments/get_multipart_url`,
+    method: 'get',
+    params,
+    data: {},
+  });
+};
+
+// 上传文件4: 完成上传后
+// data: { uuid, uploadID, size, type, file_name, dataset_id, description, scene=model, modeluuid=xxxx }
+export const setCompleteMultipart = (data) => {
+  return service({
+    url: `/attachments/complete_multipart`,
+    method: 'post',
+    params: {},
+    data,
+  });
+};
diff --git a/web_src/vuepages/apis/modules/modelmanage.js b/web_src/vuepages/apis/modules/modelmanage.js
new file mode 100644
index 000000000..f096eec3f
--- /dev/null
+++ b/web_src/vuepages/apis/modules/modelmanage.js
@@ -0,0 +1,23 @@
+import service from "../service";
+import Qs from 'qs';
+
+// 保存本地模型
+export const saveLocalModel = (data) => {
+  return service({
+    url: `${data.repo}/modelmanage/create_local_model`,
+    method: 'post',
+    headers: { 'Content-type': 'application/x-www-form-urlencoded' },
+    params: {},
+    data: Qs.stringify(data),
+  });
+};
+
+// 求模型信息
+export const getModelInfoByName = (params) => {
+  return service({
+    url: `${params.repo}/modelmanage/show_model_info_api`,
+    method: 'get',
+    params,
+    data: {},
+  });
+};
diff --git a/web_src/vuepages/pages/modelmanage/local/modelmanage-local-create-1.vue b/web_src/vuepages/pages/modelmanage/local/modelmanage-local-create-1.vue
new file mode 100644
index 000000000..9bf281fc6
--- /dev/null
+++ b/web_src/vuepages/pages/modelmanage/local/modelmanage-local-create-1.vue
@@ -0,0 +1,425 @@
+<template>
+  <div>
+    <div class="header">
+      <span class="title">{{ type == '1' ? '修改模型信息' : '导入本地模型' }}</span>
+    </div>
+    <div class="content">
+      <div class="guide-c" v-if="type != '1'">
+        <div class="step focused">
+          <div class="num">1</div>
+          <div class="txt">创建模型</div>
+        </div>
+        <div class="line"></div>
+        <div class="step">
+          <div class="num">2</div>
+          <div class="txt">上传模型文件</div>
+        </div>
+      </div>
+      <div class="row-c" v-loading="loading">
+        <div class="row">
+          <div class="r-title"><label class="required">可用集群</label></div>
+          <div class="r-content" style="display:flex;">
+            <div class="cluster-type-btn" v-if="type != 1 || type == 1 && state.type === 0"
+              :class="state.type === 0 ? 'focused' : ''"
+              :style="type != 1 ? 'border-top-right-radius:unset;border-bottom-right-radius:unset;' : ''"
+              @click="state.type = 0">
+              <svg xmlns="http://www.w3.org/2000/svg"
+                class="icon styles__StyledSVGIconPathComponent-sc-16fsqc8-0 cSaWDI svg-icon-path-icon fill"
+                viewBox="0 0 32 32" width="16" height="16">
+                <defs data-reactroot=""></defs>
+                <g>
+                  <path
+                    d="M4 3.989c0-0.731 0.593-1.323 1.324-1.323h21.352c0.729 0.005 1.318 0.594 1.324 1.322v24.022c-0.001 0.731-0.593 1.323-1.324 1.323h-21.352c-0.729-0.005-1.318-0.594-1.324-1.322v-24.022zM25.333 14.667v-9.333h-18.667v9.333h18.667zM25.333 17.333h-18.667v9.333h18.667v-9.333zM12 8h8v2.667h-8v-2.667zM12 20h8v2.667h-8v-2.667z">
+                  </path>
+                </g>
+              </svg>
+              <span class="txt">CPU / GPU</span>
+            </div>
+            <div class="cluster-type-btn" v-if="type != 1 || type == 1 && state.type === 1"
+              :class="state.type === 1 ? 'focused' : ''"
+              :style="type != 1 ? 'border-top-left-radius:unset;border-bottom-left-radius:unset;' : ''"
+              @click="state.type = 1">
+              <svg xmlns="http://www.w3.org/2000/svg"
+                class="icon styles__StyledSVGIconPathComponent-sc-16fsqc8-0 iKfgJk svg-icon-path-icon fill"
+                viewBox="0 0 32 32" width="16" height="16">
+                <defs data-reactroot=""></defs>
+                <g>
+                  <path
+                    d="M4 3.989c0-0.731 0.593-1.323 1.324-1.323h21.352c0.729 0.005 1.318 0.594 1.324 1.322v24.022c-0.001 0.731-0.593 1.323-1.324 1.323h-21.352c-0.729-0.005-1.318-0.594-1.324-1.322v-24.022zM25.333 14.667v-9.333h-18.667v9.333h18.667zM25.333 17.333h-18.667v9.333h18.667v-9.333zM12 8h8v2.667h-8v-2.667zM12 20h8v2.667h-8v-2.667z">
+                  </path>
+                </g>
+              </svg>
+              <span class="txt">Ascend NPU</span>
+            </div>
+          </div>
+        </div>
+        <div class="row">
+          <div class="r-title"><label class="required">模型名称</label></div>
+          <div class="r-content">
+            <el-input size="medium" :maxLength="25" v-model="state.name" placeholder="请输入模型名称"></el-input>
+          </div>
+        </div>
+        <div class="row">
+          <div class="r-title"><label class="required">版本</label></div>
+          <div class="r-content">
+            <el-input class="input-disabled" style="width:288px;" size="medium" v-model="state.version" readonly>
+            </el-input>
+          </div>
+        </div>
+        <div class="row">
+          <div class="r-title"><label class="required">模型框架</label></div>
+          <div class="r-content">
+            <el-select style="width:288px;" size="medium" v-model="state.engine" placeholder="请选择">
+              <el-option v-for="item in engineList" :key="item.k" :label="item.v" :value="item.k">
+              </el-option>
+            </el-select>
+          </div>
+        </div>
+        <div class="row">
+          <div class="r-title"><label>模型标签</label></div>
+          <div class="r-content">
+            <el-input size="medium" :maxLength="255" v-model="state.label" placeholder="输入标签，多个标签用空格区分"></el-input>
+          </div>
+        </div>
+        <div class="row" style="align-items:flex-start;">
+          <div class="r-title"><label>模型描述</label></div>
+          <div class="r-content">
+            <el-input type="textarea" :maxLength="255" size="medium" v-model="state.description" :rows="3"
+              placeholder="描述字数不超过255个字符">
+            </el-input>
+          </div>
+        </div>
+        <div class="row" style="margin-top:20px">
+          <div class="r-title"><label></label></div>
+          <div class="r-content">
+            <el-button size="medium" class="green" @click="submit">保存模型</el-button>
+            <el-button size="medium" @click="cancel">取消</el-button>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+
+import { saveLocalModel, getModelInfoByName } from '~/apis/modules/modelmanage';
+// import { CLUSTERS, COMPUTER_RESOURCES, ACC_CARD_TYPE } from '~/const';
+import { getUrlSearchParams } from '~/utils';
+// import { formatDate } from 'element-ui/lib/utils/date-util';
+
+const REPO_NAME = location.pathname.split('/')[2];
+
+export default {
+  data() {
+    return {
+      type: '0', // 1-修改，其它-新增
+      loading: false,
+      state: {
+        type: 0,
+        name: REPO_NAME + '_model_' + Math.random().toString(36).substr(2, 4),
+        version: '0.0.1',
+        engine: '0',
+        label: '',
+        description: '',
+      },
+      engineList: [{ k: '0', v: 'PyTorch' }, { k: '1', v: 'TensorFlow' }, { k: '2', v: 'MindSpore' }, { k: '4', v: 'PaddlePaddle' }, { k: '5', v: 'OneFlow' }, { k: '6', v: 'MXNet' }, { k: '3', v: 'Other' }],
+    };
+  },
+  components: { /*QueueDialog*/ },
+  methods: {
+    submit() {
+      console.log(this.state);
+      if (!this.state.name) {
+        this.$message({
+          type: 'info',
+          message: '请输入模型名称',
+        });
+        return;
+      }
+      saveLocalModel({
+        repo: location.pathname.split('/').slice(0, 3).join('/'),
+        ...this.state,
+      }).then(res => {
+        res = res.data;
+        if (res && res.code == '0') {
+          if (this.type == '1') {
+            this.cancel();
+            return;
+          }
+          const list = window.location.href.split('/');
+          list.pop();
+          list.push('create_local_model_tmpl2');
+          window.location.href = list.join('/') + '?type=0name=' + this.state.name + '&id=' + res.id;
+        } else {
+          this.$message({
+            type: 'error',
+            message: '模型保存失败',
+          });
+        }
+      }).catch(err => {
+        console.log(err);
+      });
+    },
+    cancel() {
+      const list = window.location.href.split('/');
+      list.pop();
+      list.push('show_model');
+      window.location.href = list.join('/');
+    },
+  },
+  mounted() {
+    const urlParams = getUrlSearchParams();
+    if (urlParams.type == '1' && urlParams.name && urlParams.id) { // update
+      this.type = urlParams.type;
+      this.state.name = urlParams.name;
+      this.state.id = urlParams.id;
+      this.loading = true;
+      getModelInfoByName({
+        repo: location.pathname.split('/').slice(0, 3).join('/'),
+        name: urlParams.name,
+        id: urlParams.id
+      }).then(res => {
+        this.loading = false;
+        const list = res.data;
+        if (list && list.length) {
+          const data = list[0];
+          this.state.type = data.type;
+          this.state.id = data.id;
+          this.state.name = data.name;
+          this.state.version = data.version;
+          this.state.engine = data.engine.toString();
+          this.state.label = data.label;
+          this.state.description = data.description;
+        }
+      }).catch(err => {
+        this.loading = false;
+        console.log(err);
+        this.cancel();
+      });
+    }
+  },
+  beforeDestroy() {
+  },
+};
+</script>
+
+<style scoped lang="less">
+.header {
+  height: 45px;
+  border-color: rgb(212, 212, 213);
+  border-width: 1px;
+  border-style: solid;
+  border-radius: 5px 5px 0px 0px;
+  font-size: 14px;
+  background: rgb(240, 240, 240);
+  display: flex;
+  align-items: center;
+
+  .title {
+    font-weight: 600;
+    font-size: 16px;
+    color: rgb(16, 16, 16);
+    margin-left: 10px;
+  }
+}
+
+.content {
+  margin-top: -1px;
+  border-color: rgb(212, 212, 213);
+  border-width: 1px;
+  border-style: solid;
+  padding: 30px 0;
+  border-top: none;
+
+  .guide-c {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    margin-bottom: 20px;
+
+    .step {
+      display: flex;
+      align-items: center;
+      color: rgb(136, 136, 136);
+
+      .num {
+        border: 1px solid rgb(136, 136, 136);
+        width: 34px;
+        height: 34px;
+        font-size: 24px;
+        text-align: center;
+        line-height: 34px;
+        border-radius: 17px;
+        margin-right: 8px;
+      }
+
+      .txt {
+        font-weight: 600;
+      }
+
+      &.focused {
+        color: rgb(22, 132, 252);
+
+        .num {
+          border-color: rgb(22, 132, 252);
+        }
+      }
+    }
+
+    .line {
+      height: 2px;
+      width: 50px;
+      background-color: rgb(187, 187, 187);
+      margin: 0 10px;
+    }
+  }
+
+  .row-c {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    flex-direction: column;
+    margin: 0 auto;
+    width: 80%;
+
+    .row {
+      width: 100%;
+      display: flex;
+      align-items: center;
+      margin: 8px 0;
+      margin-left: -190px;
+
+      .r-title {
+        text-align: right;
+        font-size: .92857143em;
+        font-weight: 700;
+        color: rgba(0, 0, 0, .87);
+        width: 200px;
+        margin-right: 28px;
+        position: relative;
+
+        .required {
+          &::after {
+            position: absolute;
+            margin: -0.2em 0 0 0.2em;
+            content: '*';
+            color: #db2828;
+          }
+        }
+      }
+
+      .r-content {
+        flex: 1;
+
+        .cluster-type-btn {
+          display: flex;
+          align-items: center;
+          justify-content: center;
+          border: 1px solid #DCDFE6;
+          height: 36px;
+          padding: 10px;
+          cursor: pointer;
+          border-radius: 4px;
+
+          .icon {
+            margin-right: 5px;
+          }
+
+          .txt {}
+
+          &.focused {
+            border-color: rgb(50, 145, 248);
+            color: rgb(50, 145, 248);
+            cursor: default;
+
+            .icon {
+              :not([stroke]) {
+                fill: rgb(50, 145, 248);
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}
+
+.input-disabled {
+  /deep/ .el-input__inner {
+    background-color: #f5f5f6 !important;
+    color: #888888 !important;
+  }
+}
+
+.el-select-dropdown__item.selected {
+  color: rgba(0, 0, 0, .95);
+}
+
+/deep/ .el-button {
+  background-color: #e0e1e2;
+  color: rgba(0, 0, 0, .6);
+  border-color: transparent;
+  transition: opacity .1s ease, background-color .1s ease, color .1s ease, box-shadow .1s ease, background .1s ease, -webkit-box-shadow .1s ease;
+  will-change: auto;
+  -webkit-tap-highlight-color: transparent;
+
+  &:hover {
+    border-color: transparent;
+    background-color: #cacbcd;
+    color: rgba(0, 0, 0, .8);
+  }
+
+  &:focus {
+    background-color: #cacbcd;
+    color: rgba(0, 0, 0, .8);
+    border-color: transparent;
+  }
+
+  &:active {
+    background-color: #babbbc;
+    color: rgba(0, 0, 0, .9);
+    border-color: transparent;
+  }
+
+  &.green {
+    background-color: #5bb973;
+    color: #fff;
+
+    &:hover {
+      background-color: #16ab39;
+      border-color: transparent;
+    }
+
+    &:focus {
+      background-color: #0ea432;
+      border-color: transparent;
+    }
+
+    &:active {
+      background-color: #198f35;
+      border-color: transparent;
+    }
+  }
+}
+
+/deep/ .el-select {
+  .is-focus {
+    .el-input__inner {
+      border-color: #85b7d9;
+    }
+  }
+}
+
+/deep/ .el-input__inner {
+  &:focus {
+    border-color: #85b7d9;
+  }
+}
+
+/deep/ .el-textarea__inner {
+  &:focus {
+    border-color: #85b7d9;
+  }
+}
+</style>
diff --git a/web_src/vuepages/pages/modelmanage/local/modelmanage-local-create-2.vue b/web_src/vuepages/pages/modelmanage/local/modelmanage-local-create-2.vue
new file mode 100644
index 000000000..745e88d72
--- /dev/null
+++ b/web_src/vuepages/pages/modelmanage/local/modelmanage-local-create-2.vue
@@ -0,0 +1,677 @@
+<template>
+  <div>
+    <div class="header">
+      <span class="title">{{ type == '1' ? '增加模型文件' : '上传模型文件' }}</span>
+    </div>
+    <div class="content">
+      <div class="guide-c" v-if="type != '1'">
+        <div class="step">
+          <div class="num">1</div>
+          <div class="txt">创建模型</div>
+        </div>
+        <div class="line"></div>
+        <div class="step focused">
+          <div class="num">2</div>
+          <div class="txt">上传模型文件</div>
+        </div>
+      </div>
+      <div class="row-c">
+        <div class="row">
+          <div class="r-title"><label class="required">模型名称</label></div>
+          <div class="r-content">
+            <el-input size="medium" class="input-disabled" v-model="state.name" placeholder="请输入模型名称" readonly>
+            </el-input>
+          </div>
+        </div>
+        <div class="row" style="align-items:flex-start;">
+          <div class="r-title"><label class="required">文件上传</label></div>
+          <div class="r-content">
+            <div>
+              <form class="dropzone" ref="dropzoneRef"></form>
+            </div>
+          </div>
+        </div>
+        <div class="row" style="margin-top:10px">
+          <div class="r-title"><label></label></div>
+          <div class="r-content">
+            <el-button size="medium" class="green" @click="submit">上传</el-button>
+            <el-button size="medium" @click="cancel">取消</el-button>
+          </div>
+        </div>
+        <div class="row" style="align-items:flex-start;">
+          <div class="r-title"><label>上传状态：</label></div>
+          <div class="r-content">
+
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+
+import { getModelInfoByName } from '~/apis/modules/modelmanage';
+import { getChunks, getNewMultipart, getMultipartUrl, setCompleteMultipart } from '~/apis/modules/fileupload';
+// import { CLUSTERS, COMPUTER_RESOURCES, ACC_CARD_TYPE } from '~/const';
+import { getUrlSearchParams } from '~/utils';
+// import { formatDate } from 'element-ui/lib/utils/date-util';
+
+import 'dropzone/dist/dropzone.css';
+import Dropzone from 'dropzone';
+import SparkMD5 from "spark-md5";
+
+Dropzone.autoDiscover = false;
+
+const uploadChunkSize = 1024 * 1024 * 64;
+const md5ChunkSize = 1024 * 1024 * 64;
+
+export default {
+  data() {
+    return {
+      dropzoneHandler: null,
+      type: '0', // 1-修改，其它-新增
+      state: {
+        type: '',
+        id: '',
+        name: '',
+        version: '',
+        engine: '',
+        label: '',
+        description: '',
+        size: '',
+      }
+    };
+  },
+  components: { /*QueueDialog*/ },
+  methods: {
+    initDropZone() {
+      this.dropzoneHandler = new Dropzone(this.$refs.dropzoneRef, {
+        url: '/',
+        parallelUploads: 20,
+        uploadMultiple: true,
+        maxFilesize: 2048,
+        timeout: 0,
+        addRemoveLinks: true,
+        autoProcessQueue: false,
+        dictDefaultMessage: '点击添加文件或直接拖拽文件到此处',
+        dictInvalidFileType: 'dictInvalidFileType',
+        dictFileTooBig: 'dictFileTooBig',
+        dictRemoveFile: 'dictRemoveFile',
+      });
+      this.dropzoneHandler.on("addedfile", file => {
+        console.log(`File added: ${file.name}`);
+        console.log(file);
+        // this.calcFileMd5(file);
+      });
+      this.dropzoneHandler.on("removedfile", file => {
+        console.log(`File removedfile: ${file.name}`);
+      });
+      this.dropzoneHandler.on("maxfilesexceeded", file => {
+        console.log(`File removedfile: ${file.name}`);
+      });
+    },
+    calcFileMd5(file) {
+      const blobSlice = File.prototype.slice || File.prototype.mozSlice || File.prototype.webkitSlice;
+      const chunkSize = md5ChunkSize;
+      const chunks = Math.ceil(file.size / chunkSize);
+      const spark = new SparkMD5.ArrayBuffer();
+      const fileReader = new FileReader();
+      file.totalChunkCounts = chunks;
+      if (file.size == 0) {
+        file.totalChunkCounts = 1;
+      }
+      let currentChunk = 0;
+      return new Promise((resolve, reject) => {
+        fileReader.onload = function (e) {
+          console.log(file.name + ': read chunk nr', currentChunk + 1, 'of', chunks);
+          spark.append(e.target.result);
+          currentChunk++;
+          if (currentChunk < chunks) {
+            loadNext();
+          } else {
+            console.log(file.name + ': finished loading');
+            console.info(file.name + ': computed hash', spark.end());
+            const md5 = spark.end();
+            spark.destroy();
+            file.uniqueIdentifier = md5;
+            resolve(md5);
+          }
+        };
+        fileReader.onerror = function (e) {
+          console.warn(file.name + ': oops, calcFileMd5 went wrong.');
+          reject(e);
+        };
+
+        function loadNext() {
+          const start = currentChunk * chunkSize;
+          const end = ((start + chunkSize) >= file.size) ? file.size : start + chunkSize;
+          fileReader.readAsArrayBuffer(blobSlice.call(file, start, end));
+        }
+        loadNext();
+      });
+    },
+    async _getChunksInfo(file) {
+      const params = {
+        params: {
+          md5: file.uniqueIdentifier,
+          type: this.state.type,
+          file_name: file.name,
+          _csrf: csrf,
+        },
+      };
+      try {
+        // const response = axios.get("/attachments/get_chunks", params);
+        const response = await getChunks(params);
+        file.uploadID = response.data.uploadID;
+        file.uuid = response.data.uuid;
+        file.uploaded = response.data.uploaded;
+        file.chunks = response.data.chunks;
+        file.attachID = response.data.attachID;
+        file.datasetID = response.data.datasetID;
+        file.datasetName = response.data.datasetName;
+        file.realName = response.data.fileName;
+        return file;
+      } catch (error) {
+        this.emitDropzoneFailed(file);
+        console.log("getChunksInfo catch: ", error);
+        return null;
+      }
+    },
+    getChunksInfo(file) {
+      return getChunks({
+        md5: file.uniqueIdentifier,
+        type: this.state.type,
+        file_name: file.name,
+        scene: 'model',
+      }).then(res => {
+        const data = res.data;
+        file.uploadID = data.uploadID;
+        file.uuid = data.uuid;
+        file.uploaded = data.uploaded;
+        file.chunks = data.chunks;
+        file.attachID = data.attachID;
+        // file.datasetID = data.datasetID;
+        // file.datasetName = data.datasetName;
+        file.modelUuid = data.modeluuid;
+        file.modelName = data.modelName;
+        file.realName = data.fileName;
+        return file;
+      }).catch(err => {
+        console.info('getChunksInfo', err);
+        return err;
+      });
+    },
+    async _newUpload(file) {
+      const res = await axios.get("/attachments/new_multipart", {
+        params: {
+          totalChunkCounts: file.totalChunkCounts,
+          md5: file.uniqueIdentifier,
+          size: file.size,
+          fileType: file.type,
+          type: this.uploadtype,
+          file_name: file.name,
+          _csrf: csrf,
+        },
+      });
+      file.uploadID = res.data.uploadID;
+      file.uuid = res.data.uuid;
+    },
+    newUpload(file) {
+      return getNewMultipart({
+        totalChunkCounts: file.totalChunkCounts,
+        md5: file.uniqueIdentifier,
+        size: file.size,
+        fileType: file.type,
+        type: this.state.type,
+        file_name: file.name,
+        scene: 'model',
+        modeluuid: file.modelUuid,
+      }).then(res => {
+        const data = res.data;
+        file.uploadID = data.uploadID;
+        file.uuid = data.uuid;
+        if (file.uploadID && file.uuid) {
+          file.chunks = '';
+          this.breakpointUpload(file);
+        }
+        return file;
+      }).catch(err => {
+        console.log('getNewMultipart', err);
+        return err;
+      });
+    },
+    breakpointUpload(file) {
+      const blobSlice = File.prototype.slice || File.prototype.mozSlice || File.prototype.webkitSlice;
+      const chunks = Math.ceil(file.size / chunkSize);
+      const fileReader = new FileReader();
+      const time = new Date().getTime();
+      const chunkSize = uploadChunkSize;
+      const _this = this;
+      let currentChunk = 0;
+      const successChunks = [];
+      const successParts = file.chunks.split(",");
+      for (let i = 0; i < successParts.length; i++) {
+        successChunks[i] = successParts[i].split("-")[0];
+      }
+      const urls = [];
+      const etags = [];
+      function checkSuccessChunks() {
+        const index = successChunks.indexOf((currentChunk + 1).toString());
+        if (index == -1) {
+          return false;
+        }
+        return true;
+      }
+
+      async function getUploadChunkUrl(currentChunk, partSize) {
+        const res = await getMultipartUrl({
+          uuid: file.uuid,
+          uploadID: file.uploadID,
+          size: partSize,
+          chunkNumber: currentChunk + 1,
+          type: _this.state.type,
+          file_name: file.name,
+          scene: 'model',
+        });
+        urls[currentChunk] = res.data.url;
+      }
+
+      async function uploadMinioNewMethod(url, e) {
+        const xhr = new XMLHttpRequest();
+        xhr.open("PUT", url, false);
+        if (_this.state.type == 0) {
+          xhr.setRequestHeader("Content-Type", "text/plain");
+          xhr.send(e.target.result);
+          const etagValue = xhr.getResponseHeader("etag");
+          etags[currentChunk] = etagValue;
+        } else if (_this.state.type == 1) {
+          xhr.setRequestHeader("Content-Type", "");
+          xhr.send(e.target.result);
+          const etagValue = xhr.getResponseHeader("ETag");
+          etags[currentChunk] = etagValue;
+        }
+      }
+
+      async function uploadChunk(e) {
+        try {
+          if (!checkSuccessChunks()) {
+            const start = currentChunk * chunkSize;
+            const partSize = start + chunkSize >= file.size ? file.size - start : chunkSize;
+            // 获取分片上传url
+            await getUploadChunkUrl(currentChunk, partSize);
+            if (urls[currentChunk] != '') {
+              await uploadMinioNewMethod(urls[currentChunk], e);
+              if (etags[currentChunk] != '') {
+              } else {
+                console.log("上传到minio uploadChunk etags[currentChunk] == ''"); // TODO
+              }
+            } else {
+              console.log("uploadChunk urls[currentChunk] != ''"); // TODO
+            }
+          }
+        } catch (error) {
+          console.log(error);
+        }
+      }
+
+      async function completeUpload() {
+        return await setCompleteMultipart({
+          uuid: file.uuid,
+          uploadID: file.uploadID,
+          file_name: file.name,
+          size: file.size,
+          type: _this.state.type,
+          scene: 'model',
+          modeluuid: file.modelUuid,
+        });
+      }
+
+      function loadNext() {
+        const start = currentChunk * chunkSize;
+        const end = start + chunkSize >= file.size ? file.size : start + chunkSize;
+        fileReader.readAsArrayBuffer(blobSlice.call(file, start, end));
+      }
+
+      fileReader.onload = async (e) => {
+        try {
+          await uploadChunk(e);
+          fileReader.abort();
+          currentChunk++;
+          if (currentChunk < chunks) {
+            console.log(`第${currentChunk}个分片上传完成, 开始第${currentChunk + 1}/${chunks}个分片上传`);
+            // this.progress = Math.ceil((currentChunk / chunks) * 100);
+            // this.updateProgress(file, this.dropzoneParams.data("uploading"), Number(((currentChunk / chunks) * 100).toFixed(2)), 3);
+            // this.status = `${this.dropzoneParams.data("uploading")} ${((currentChunk / chunks) * 100).toFixed(2)}%`;
+            loadNext();
+          } else {
+            try {
+              await completeUpload();
+              console.log(`文件上传完成：${file.name} \n分片：${chunks} 大小:${file.size} 用时：${(new Date().getTime() - time) / 1000} s`);
+              // this.uploadLength++;
+              // this.allUploadLength++;
+              // this.updateProgress(file, "上传成功", 100, 0);          
+              // this.finishUpload(file);
+            } catch (err) {
+              const info = "上传失败";
+              console.log(info, file)
+              // this.allUploadLength++;
+              // this.uploadError(file, info);
+              // this.updateProgress(file, info, Number(((currentChunk / chunks) * 100).toFixed(2)) - 1, 2);
+            }
+          }
+        } catch (err) {
+          console.log(err);
+        }
+      };
+      console.log("上传分片...");
+      loadNext();
+    },
+    submit() {
+      console.log(this.dropzoneHandler);
+      const fileList = this.dropzoneHandler.getAcceptedFiles();
+      if (!fileList.length) return;
+      for (let i = 0, iLen = fileList.length; i < iLen; i++) {
+        const file = fileList[i];
+        this.calcFileMd5(file).then(res => { // 计算MD5
+          this.getChunksInfo(file).then(res => { // 获取Chunk信息
+            if (file.uploadID == '' || file.uuid == '') { // 未上传过
+              this.newUpload(file);
+            } else if (file.uploaded == '1') { // 已上传成功 秒传          
+              if (file.attachID == '0') { // 删除数据集记录，未删除文件                
+                // await addAttachment(file);
+                console.log(`file.attachID == '0'`);
+              }
+              // 同一模型上传同一个文件
+              if (file.modelUuid != '') {
+                if (file.modelName != '' && file.realName != '') {
+                  let info = `该文件已上传在模型: ${file.modelName}`;
+                  console.log(info);
+                  // this.uploadError(file, info);
+                  // this.allUploadLength++;
+                  // this.updateProgress(file, "上传失败", 0, 1, info);                  
+                }
+              }
+              console.log('文件上传处理完成');
+            } else { // 断点续传
+              this.breakpointUpload(file);
+            }
+          }).catch(err => {
+            console.info('getChunksInfo', err);
+          });
+        }).catch(err => {
+          console.info('calcFileMd5', err);
+        });
+      }
+    },
+    cancel() {
+      const list = window.location.href.split('/');
+      list.pop();
+      list.push('show_model');
+      window.location.href = list.join('/');
+    },
+  },
+  mounted() {
+    const urlParams = getUrlSearchParams();
+    if (urlParams.name && urlParams.id) {
+      this.type = urlParams.type || '0';
+      this.state.name = urlParams.name;
+      this.state.id = urlParams.id;
+      this.loading = true;
+      getModelInfoByName({
+        repo: location.pathname.split('/').slice(0, 3).join('/'),
+        name: urlParams.name,
+        id: urlParams.id
+      }).then(res => {
+        this.loading = false;
+        const list = res.data;
+        if (list && list.length) {
+          const data = list[0];
+          this.state.type = data.type;
+          this.state.id = data.id;
+          this.state.name = data.name;
+          this.state.version = data.version;
+          this.state.engine = data.engine.toString();
+          this.state.label = data.label;
+          this.state.description = data.description;
+          this.state.size = data.size;
+        }
+      }).catch(err => {
+        this.loading = false;
+        console.log(err);
+        this.cancel();
+      });
+    } else {
+      this.cancel();
+      return;
+    }
+    this.initDropZone();
+  },
+  beforeDestroy() {
+  },
+};
+</script>
+
+<style scoped lang="less">
+.header {
+  height: 45px;
+  border-color: rgb(212, 212, 213);
+  border-width: 1px;
+  border-style: solid;
+  border-radius: 5px 5px 0px 0px;
+  font-size: 14px;
+  background: rgb(240, 240, 240);
+  display: flex;
+  align-items: center;
+
+  .title {
+    font-weight: 600;
+    font-size: 16px;
+    color: rgb(16, 16, 16);
+    margin-left: 10px;
+  }
+}
+
+.content {
+  margin-top: -1px;
+  border-color: rgb(212, 212, 213);
+  border-width: 1px;
+  border-style: solid;
+  padding: 30px 0;
+  border-top: none;
+
+  .guide-c {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    margin-bottom: 20px;
+
+    .step {
+      display: flex;
+      align-items: center;
+      color: rgb(136, 136, 136);
+
+      .num {
+        border: 1px solid rgb(136, 136, 136);
+        width: 34px;
+        height: 34px;
+        font-size: 24px;
+        text-align: center;
+        line-height: 34px;
+        border-radius: 17px;
+        margin-right: 8px;
+      }
+
+      .txt {
+        font-weight: 600;
+      }
+
+      &.focused {
+        color: rgb(22, 132, 252);
+
+        .num {
+          border-color: rgb(22, 132, 252);
+        }
+      }
+    }
+
+    .line {
+      height: 2px;
+      width: 50px;
+      background-color: rgb(187, 187, 187);
+      margin: 0 10px;
+    }
+  }
+
+  .row-c {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    flex-direction: column;
+    margin: 0 auto;
+    width: 80%;
+
+    .row {
+      width: 100%;
+      display: flex;
+      align-items: center;
+      margin: 8px 0;
+      margin-left: -190px;
+
+      .r-title {
+        text-align: right;
+        font-size: .92857143em;
+        font-weight: 700;
+        color: rgba(0, 0, 0, .87);
+        width: 200px;
+        margin-right: 28px;
+        position: relative;
+
+        .required {
+          &::after {
+            position: absolute;
+            margin: -0.2em 0 0 0.2em;
+            content: '*';
+            color: #db2828;
+          }
+        }
+      }
+
+      .r-content {
+        flex: 1;
+
+        .cluster-type-btn {
+          display: flex;
+          align-items: center;
+          justify-content: center;
+          border: 1px solid #DCDFE6;
+          height: 36px;
+          padding: 10px;
+          cursor: pointer;
+          border-radius: 4px;
+
+          .icon {
+            margin-right: 5px;
+          }
+
+          .txt {}
+
+          &.focused {
+            border-color: rgb(50, 145, 248);
+            color: rgb(50, 145, 248);
+            cursor: default;
+
+            .icon {
+              :not([stroke]) {
+                fill: rgb(50, 145, 248);
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}
+
+.input-disabled {
+  /deep/ .el-input__inner {
+    background-color: #f5f5f6 !important;
+    color: #888888 !important;
+  }
+}
+
+/deep/ .dz-progress {
+  display: none;
+}
+
+.el-select-dropdown__item.selected {
+  color: #85b7d9;
+}
+
+/deep/ .el-button {
+  background-color: #e0e1e2;
+  color: rgba(0, 0, 0, .6);
+  border-color: transparent;
+  transition: opacity .1s ease, background-color .1s ease, color .1s ease, box-shadow .1s ease, background .1s ease, -webkit-box-shadow .1s ease;
+  will-change: auto;
+  -webkit-tap-highlight-color: transparent;
+
+  &:hover {
+    border-color: transparent;
+    background-color: #cacbcd;
+    color: rgba(0, 0, 0, .8);
+  }
+
+  &:focus {
+    background-color: #cacbcd;
+    color: rgba(0, 0, 0, .8);
+    border-color: transparent;
+  }
+
+  &:active {
+    background-color: #babbbc;
+    color: rgba(0, 0, 0, .9);
+    border-color: transparent;
+  }
+
+  &.green {
+    background-color: #5bb973;
+    color: #fff;
+
+    &:hover {
+      background-color: #16ab39;
+      border-color: transparent;
+    }
+
+    &:focus {
+      background-color: #0ea432;
+      border-color: transparent;
+    }
+
+    &:active {
+      background-color: #198f35;
+      border-color: transparent;
+    }
+  }
+}
+
+/deep/ .el-select {
+  .is-focus {
+    .el-input__inner {
+      border-color: #85b7d9;
+    }
+  }
+}
+
+/deep/ .el-input__inner {
+  &:focus {
+    border-color: #85b7d9;
+  }
+}
+
+/deep/ .el-textarea__inner {
+  &:focus {
+    border-color: #85b7d9;
+  }
+}
+</style>
diff --git a/web_src/vuepages/pages/modelmanage/local/vp-modelmanage-local-create-1.js b/web_src/vuepages/pages/modelmanage/local/vp-modelmanage-local-create-1.js
new file mode 100644
index 000000000..c2054c59a
--- /dev/null
+++ b/web_src/vuepages/pages/modelmanage/local/vp-modelmanage-local-create-1.js
@@ -0,0 +1,17 @@
+import Vue from 'vue';
+import ElementUI from 'element-ui';
+import 'element-ui/lib/theme-chalk/index.css';
+import localeEn from 'element-ui/lib/locale/lang/en';
+import localeZh from 'element-ui/lib/locale/lang/zh-CN';
+import { i18n, lang } from '~/langs';
+import App from './modelmanage-local-create-1.vue';
+
+Vue.use(ElementUI, {
+  locale: lang === 'zh-CN' ? localeZh : localeEn,
+  size: 'small',
+});
+
+new Vue({
+  i18n,
+  render: (h) => h(App),
+}).$mount('#__vue-root');
diff --git a/web_src/vuepages/pages/modelmanage/local/vp-modelmanage-local-create-2.js b/web_src/vuepages/pages/modelmanage/local/vp-modelmanage-local-create-2.js
new file mode 100644
index 000000000..2cad84464
--- /dev/null
+++ b/web_src/vuepages/pages/modelmanage/local/vp-modelmanage-local-create-2.js
@@ -0,0 +1,17 @@
+import Vue from 'vue';
+import ElementUI from 'element-ui';
+import 'element-ui/lib/theme-chalk/index.css';
+import localeEn from 'element-ui/lib/locale/lang/en';
+import localeZh from 'element-ui/lib/locale/lang/zh-CN';
+import { i18n, lang } from '~/langs';
+import App from './modelmanage-local-create-2.vue';
+
+Vue.use(ElementUI, {
+  locale: lang === 'zh-CN' ? localeZh : localeEn,
+  size: 'small',
+});
+
+new Vue({
+  i18n,
+  render: (h) => h(App),
+}).$mount('#__vue-root');
diff --git a/web_src/vuepages/utils/index.js b/web_src/vuepages/utils/index.js
index 06abb4473..bec5a084e 100644
--- a/web_src/vuepages/utils/index.js
+++ b/web_src/vuepages/utils/index.js
@@ -5,3 +5,12 @@ export const getListValueWithKey = (list, key, k = 'k', v = 'v') => {
   }
   return '';
 };
+
+export const getUrlSearchParams = () => {
+  const params = new URLSearchParams(location.search);
+  const obj = {};
+  params.forEach((value, key) => {
+    obj[key] = value;
+  });
+  return obj;
+};

From ff7df68b61e7bb5ec91316f3c2123c44d85878ba Mon Sep 17 00:00:00 2001
From: zhoupzh <zhoupzh@pcl.ac.cn>
Date: Mon, 7 Nov 2022 11:01:01 +0800
Subject: [PATCH 075/187] fix issue

---
 package-lock.json                            | 19368 +----------------
 package.json                                 |     1 +
 templates/custom/max_log.tmpl                |     2 +-
 templates/repo/modelsafety/show.tmpl         |     1 +
 templates/repo/view_file.tmpl                |    41 +-
 web_src/js/components/images/Images.vue      |    12 +-
 web_src/js/components/images/adminImages.vue |     4 +-
 web_src/js/index.js                          |    30 +
 web_src/less/index.less                      |     1 +
 9 files changed, 104 insertions(+), 19356 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 192f3f342..c7b2f49b3 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,19327 +1,6 @@
 {
-  "name": "aiforge",
-  "lockfileVersion": 2,
   "requires": true,
-  "packages": {
-    "": {
-      "license": "MIT",
-      "dependencies": {
-        "@babel/core": "7.9.6",
-        "@babel/plugin-proposal-object-rest-spread": "7.9.6",
-        "@babel/plugin-transform-runtime": "7.9.6",
-        "@babel/preset-env": "7.9.6",
-        "@babel/runtime": "7.9.6",
-        "@primer/octicons": "9.6.0",
-        "axios": "0.21.1",
-        "babel-loader": "8.1.0",
-        "clipboard": "2.0.6",
-        "core-js": "3.6.5",
-        "css-loader": "3.5.3",
-        "cssnano": "4.1.10",
-        "domino": "2.1.5",
-        "dropzone": "5.7.2",
-        "echarts": "3.8.5",
-        "element-ui": "2.15.5",
-        "esdk-obs-browserjs": "3.20.7",
-        "esdk-obs-nodejs": "3.20.11",
-        "fast-glob": "3.2.2",
-        "file-loader": "6.0.0",
-        "file-saver": "2.0.5",
-        "fomantic-ui": "2.8.4",
-        "fs": "0.0.1-security",
-        "highlight.js": "10.4.1",
-        "imports-loader": "0.8.0",
-        "jquery": "3.5.1",
-        "jquery-datetimepicker": "2.5.21",
-        "jquery.are-you-sure": "1.9.0",
-        "js-cookie": "3.0.1",
-        "less-loader": "6.1.0",
-        "mini-css-extract-plugin": "0.9.0",
-        "monaco-editor": "0.20.0",
-        "monaco-editor-webpack-plugin": "1.9.0",
-        "optimize-css-assets-webpack-plugin": "5.0.3",
-        "postcss-loader": "3.0.0",
-        "postcss-preset-env": "6.7.0",
-        "postcss-safe-parser": "4.0.2",
-        "qrcodejs2": "0.0.2",
-        "qs": "6.9.4",
-        "remixicon": "2.5.0",
-        "spark-md5": "3.0.1",
-        "svg-sprite-loader": "5.0.0",
-        "svgo": "1.3.2",
-        "svgo-loader": "2.2.1",
-        "swagger-ui": "3.25.3",
-        "terser-webpack-plugin": "3.0.1",
-        "vue": "2.6.11",
-        "vue-bar-graph": "1.2.0",
-        "vue-calendar-heatmap": "0.8.4",
-        "vue-i18n": "6.1.3",
-        "vue-loader": "15.9.2",
-        "vue-router": "3.3.4",
-        "vue-template-compiler": "2.6.11",
-        "webpack": "4.43.0",
-        "webpack-cli": "3.3.11",
-        "webpack-fix-style-only-entries": "0.4.0",
-        "worker-loader": "2.0.0",
-        "xlsx": "0.17.3"
-      },
-      "devDependencies": {
-        "eslint": "6.8.0",
-        "eslint-config-airbnb-base": "14.1.0",
-        "eslint-plugin-import": "2.20.2",
-        "eslint-plugin-vue": "6.2.2",
-        "prettier": "2.6.2",
-        "script-loader": "0.7.2",
-        "stylelint": "13.3.3",
-        "stylelint-config-standard": "20.0.0",
-        "ts-loader": "4.0.0",
-        "typescript": "4.5.5",
-        "updates": "10.2.11"
-      },
-      "engines": {
-        "node": ">= 10.13.0"
-      }
-    },
-    "node_modules/@babel/code-frame": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.8.3.tgz",
-      "integrity": "sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g==",
-      "dependencies": {
-        "@babel/highlight": "^7.8.3"
-      }
-    },
-    "node_modules/@babel/compat-data": {
-      "version": "7.9.6",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.9.6.tgz",
-      "integrity": "sha512-5QPTrNen2bm7RBc7dsOmcA5hbrS4O2Vhmk5XOL4zWW/zD/hV0iinpefDlkm+tBBy8kDtFaaeEvmAqt+nURAV2g==",
-      "dependencies": {
-        "browserslist": "^4.11.1",
-        "invariant": "^2.2.4",
-        "semver": "^5.5.0"
-      }
-    },
-    "node_modules/@babel/core": {
-      "version": "7.9.6",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.9.6.tgz",
-      "integrity": "sha512-nD3deLvbsApbHAHttzIssYqgb883yU/d9roe4RZymBCDaZryMJDbptVpEpeQuRh4BJ+SYI8le9YGxKvFEvl1Wg==",
-      "dependencies": {
-        "@babel/code-frame": "^7.8.3",
-        "@babel/generator": "^7.9.6",
-        "@babel/helper-module-transforms": "^7.9.0",
-        "@babel/helpers": "^7.9.6",
-        "@babel/parser": "^7.9.6",
-        "@babel/template": "^7.8.6",
-        "@babel/traverse": "^7.9.6",
-        "@babel/types": "^7.9.6",
-        "convert-source-map": "^1.7.0",
-        "debug": "^4.1.0",
-        "gensync": "^1.0.0-beta.1",
-        "json5": "^2.1.2",
-        "lodash": "^4.17.13",
-        "resolve": "^1.3.2",
-        "semver": "^5.4.1",
-        "source-map": "^0.5.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/babel"
-      }
-    },
-    "node_modules/@babel/generator": {
-      "version": "7.9.6",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.9.6.tgz",
-      "integrity": "sha512-+htwWKJbH2bL72HRluF8zumBxzuX0ZZUFl3JLNyoUjM/Ho8wnVpPXM6aUz8cfKDqQ/h7zHqKt4xzJteUosckqQ==",
-      "dependencies": {
-        "@babel/types": "^7.9.6",
-        "jsesc": "^2.5.1",
-        "lodash": "^4.17.13",
-        "source-map": "^0.5.0"
-      }
-    },
-    "node_modules/@babel/helper-annotate-as-pure": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.8.3.tgz",
-      "integrity": "sha512-6o+mJrZBxOoEX77Ezv9zwW7WV8DdluouRKNY/IR5u/YTMuKHgugHOzYWlYvYLpLA9nPsQCAAASpCIbjI9Mv+Uw==",
-      "dependencies": {
-        "@babel/types": "^7.8.3"
-      }
-    },
-    "node_modules/@babel/helper-builder-binary-assignment-operator-visitor": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.8.3.tgz",
-      "integrity": "sha512-5eFOm2SyFPK4Rh3XMMRDjN7lBH0orh3ss0g3rTYZnBQ+r6YPj7lgDyCvPphynHvUrobJmeMignBr6Acw9mAPlw==",
-      "dependencies": {
-        "@babel/helper-explode-assignable-expression": "^7.8.3",
-        "@babel/types": "^7.8.3"
-      }
-    },
-    "node_modules/@babel/helper-compilation-targets": {
-      "version": "7.9.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.9.6.tgz",
-      "integrity": "sha512-x2Nvu0igO0ejXzx09B/1fGBxY9NXQlBW2kZsSxCJft+KHN8t9XWzIvFxtPHnBOAXpVsdxZKZFbRUC8TsNKajMw==",
-      "dependencies": {
-        "@babel/compat-data": "^7.9.6",
-        "browserslist": "^4.11.1",
-        "invariant": "^2.2.4",
-        "levenary": "^1.1.1",
-        "semver": "^5.5.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0"
-      }
-    },
-    "node_modules/@babel/helper-create-regexp-features-plugin": {
-      "version": "7.8.8",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.8.8.tgz",
-      "integrity": "sha512-LYVPdwkrQEiX9+1R29Ld/wTrmQu1SSKYnuOk3g0CkcZMA1p0gsNxJFj/3gBdaJ7Cg0Fnek5z0DsMULePP7Lrqg==",
-      "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.8.3",
-        "@babel/helper-regex": "^7.8.3",
-        "regexpu-core": "^4.7.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0"
-      }
-    },
-    "node_modules/@babel/helper-define-map": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/helper-define-map/-/helper-define-map-7.8.3.tgz",
-      "integrity": "sha512-PoeBYtxoZGtct3md6xZOCWPcKuMuk3IHhgxsRRNtnNShebf4C8YonTSblsK4tvDbm+eJAw2HAPOfCr+Q/YRG/g==",
-      "dependencies": {
-        "@babel/helper-function-name": "^7.8.3",
-        "@babel/types": "^7.8.3",
-        "lodash": "^4.17.13"
-      }
-    },
-    "node_modules/@babel/helper-explode-assignable-expression": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.8.3.tgz",
-      "integrity": "sha512-N+8eW86/Kj147bO9G2uclsg5pwfs/fqqY5rwgIL7eTBklgXjcOJ3btzS5iM6AitJcftnY7pm2lGsrJVYLGjzIw==",
-      "dependencies": {
-        "@babel/traverse": "^7.8.3",
-        "@babel/types": "^7.8.3"
-      }
-    },
-    "node_modules/@babel/helper-function-name": {
-      "version": "7.9.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.9.5.tgz",
-      "integrity": "sha512-JVcQZeXM59Cd1qanDUxv9fgJpt3NeKUaqBqUEvfmQ+BCOKq2xUgaWZW2hr0dkbyJgezYuplEoh5knmrnS68efw==",
-      "dependencies": {
-        "@babel/helper-get-function-arity": "^7.8.3",
-        "@babel/template": "^7.8.3",
-        "@babel/types": "^7.9.5"
-      }
-    },
-    "node_modules/@babel/helper-get-function-arity": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.8.3.tgz",
-      "integrity": "sha512-FVDR+Gd9iLjUMY1fzE2SR0IuaJToR4RkCDARVfsBBPSP53GEqSFjD8gNyxg246VUyc/ALRxFaAK8rVG7UT7xRA==",
-      "dependencies": {
-        "@babel/types": "^7.8.3"
-      }
-    },
-    "node_modules/@babel/helper-hoist-variables": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.8.3.tgz",
-      "integrity": "sha512-ky1JLOjcDUtSc+xkt0xhYff7Z6ILTAHKmZLHPxAhOP0Nd77O+3nCsd6uSVYur6nJnCI029CrNbYlc0LoPfAPQg==",
-      "dependencies": {
-        "@babel/types": "^7.8.3"
-      }
-    },
-    "node_modules/@babel/helper-member-expression-to-functions": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.8.3.tgz",
-      "integrity": "sha512-fO4Egq88utkQFjbPrSHGmGLFqmrshs11d46WI+WZDESt7Wu7wN2G2Iu+NMMZJFDOVRHAMIkB5SNh30NtwCA7RA==",
-      "dependencies": {
-        "@babel/types": "^7.8.3"
-      }
-    },
-    "node_modules/@babel/helper-module-imports": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.8.3.tgz",
-      "integrity": "sha512-R0Bx3jippsbAEtzkpZ/6FIiuzOURPcMjHp+Z6xPe6DtApDJx+w7UYyOLanZqO8+wKR9G10s/FmHXvxaMd9s6Kg==",
-      "dependencies": {
-        "@babel/types": "^7.8.3"
-      }
-    },
-    "node_modules/@babel/helper-module-transforms": {
-      "version": "7.9.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.9.0.tgz",
-      "integrity": "sha512-0FvKyu0gpPfIQ8EkxlrAydOWROdHpBmiCiRwLkUiBGhCUPRRbVD2/tm3sFr/c/GWFrQ/ffutGUAnx7V0FzT2wA==",
-      "dependencies": {
-        "@babel/helper-module-imports": "^7.8.3",
-        "@babel/helper-replace-supers": "^7.8.6",
-        "@babel/helper-simple-access": "^7.8.3",
-        "@babel/helper-split-export-declaration": "^7.8.3",
-        "@babel/template": "^7.8.6",
-        "@babel/types": "^7.9.0",
-        "lodash": "^4.17.13"
-      }
-    },
-    "node_modules/@babel/helper-optimise-call-expression": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.8.3.tgz",
-      "integrity": "sha512-Kag20n86cbO2AvHca6EJsvqAd82gc6VMGule4HwebwMlwkpXuVqrNRj6CkCV2sKxgi9MyAUnZVnZ6lJ1/vKhHQ==",
-      "dependencies": {
-        "@babel/types": "^7.8.3"
-      }
-    },
-    "node_modules/@babel/helper-plugin-utils": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz",
-      "integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ=="
-    },
-    "node_modules/@babel/helper-regex": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/helper-regex/-/helper-regex-7.8.3.tgz",
-      "integrity": "sha512-BWt0QtYv/cg/NecOAZMdcn/waj/5P26DR4mVLXfFtDokSR6fyuG0Pj+e2FqtSME+MqED1khnSMulkmGl8qWiUQ==",
-      "dependencies": {
-        "lodash": "^4.17.13"
-      }
-    },
-    "node_modules/@babel/helper-remap-async-to-generator": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.8.3.tgz",
-      "integrity": "sha512-kgwDmw4fCg7AVgS4DukQR/roGp+jP+XluJE5hsRZwxCYGg+Rv9wSGErDWhlI90FODdYfd4xG4AQRiMDjjN0GzA==",
-      "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.8.3",
-        "@babel/helper-wrap-function": "^7.8.3",
-        "@babel/template": "^7.8.3",
-        "@babel/traverse": "^7.8.3",
-        "@babel/types": "^7.8.3"
-      }
-    },
-    "node_modules/@babel/helper-replace-supers": {
-      "version": "7.9.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.9.6.tgz",
-      "integrity": "sha512-qX+chbxkbArLyCImk3bWV+jB5gTNU/rsze+JlcF6Nf8tVTigPJSI1o1oBow/9Resa1yehUO9lIipsmu9oG4RzA==",
-      "dependencies": {
-        "@babel/helper-member-expression-to-functions": "^7.8.3",
-        "@babel/helper-optimise-call-expression": "^7.8.3",
-        "@babel/traverse": "^7.9.6",
-        "@babel/types": "^7.9.6"
-      }
-    },
-    "node_modules/@babel/helper-simple-access": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.8.3.tgz",
-      "integrity": "sha512-VNGUDjx5cCWg4vvCTR8qQ7YJYZ+HBjxOgXEl7ounz+4Sn7+LMD3CFrCTEU6/qXKbA2nKg21CwhhBzO0RpRbdCw==",
-      "dependencies": {
-        "@babel/template": "^7.8.3",
-        "@babel/types": "^7.8.3"
-      }
-    },
-    "node_modules/@babel/helper-split-export-declaration": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.8.3.tgz",
-      "integrity": "sha512-3x3yOeyBhW851hroze7ElzdkeRXQYQbFIb7gLK1WQYsw2GWDay5gAJNw1sWJ0VFP6z5J1whqeXH/WCdCjZv6dA==",
-      "dependencies": {
-        "@babel/types": "^7.8.3"
-      }
-    },
-    "node_modules/@babel/helper-validator-identifier": {
-      "version": "7.9.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.9.5.tgz",
-      "integrity": "sha512-/8arLKUFq882w4tWGj9JYzRpAlZgiWUJ+dtteNTDqrRBz9Iguck9Rn3ykuBDoUwh2TO4tSAJlrxDUOXWklJe4g=="
-    },
-    "node_modules/@babel/helper-wrap-function": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.8.3.tgz",
-      "integrity": "sha512-LACJrbUET9cQDzb6kG7EeD7+7doC3JNvUgTEQOx2qaO1fKlzE/Bf05qs9w1oXQMmXlPO65lC3Tq9S6gZpTErEQ==",
-      "dependencies": {
-        "@babel/helper-function-name": "^7.8.3",
-        "@babel/template": "^7.8.3",
-        "@babel/traverse": "^7.8.3",
-        "@babel/types": "^7.8.3"
-      }
-    },
-    "node_modules/@babel/helpers": {
-      "version": "7.9.6",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.9.6.tgz",
-      "integrity": "sha512-tI4bUbldloLcHWoRUMAj4g1bF313M/o6fBKhIsb3QnGVPwRm9JsNf/gqMkQ7zjqReABiffPV6RWj7hEglID5Iw==",
-      "dependencies": {
-        "@babel/template": "^7.8.3",
-        "@babel/traverse": "^7.9.6",
-        "@babel/types": "^7.9.6"
-      }
-    },
-    "node_modules/@babel/highlight": {
-      "version": "7.9.0",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.9.0.tgz",
-      "integrity": "sha512-lJZPilxX7Op3Nv/2cvFdnlepPXDxi29wxteT57Q965oc5R9v86ztx0jfxVrTcBk8C2kcPkkDa2Z4T3ZsPPVWsQ==",
-      "dependencies": {
-        "@babel/helper-validator-identifier": "^7.9.0",
-        "chalk": "^2.0.0",
-        "js-tokens": "^4.0.0"
-      }
-    },
-    "node_modules/@babel/parser": {
-      "version": "7.9.6",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.9.6.tgz",
-      "integrity": "sha512-AoeIEJn8vt+d/6+PXDRPaksYhnlbMIiejioBZvvMQsOjW/JYK6k/0dKnvvP3EhK5GfMBWDPtrxRtegWdAcdq9Q==",
-      "bin": {
-        "parser": "bin/babel-parser.js"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-async-generator-functions": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.8.3.tgz",
-      "integrity": "sha512-NZ9zLv848JsV3hs8ryEh7Uaz/0KsmPLqv0+PdkDJL1cJy0K4kOCFa8zc1E3mp+RHPQcpdfb/6GovEsW4VDrOMw==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.3",
-        "@babel/helper-remap-async-to-generator": "^7.8.3",
-        "@babel/plugin-syntax-async-generators": "^7.8.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-dynamic-import": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.8.3.tgz",
-      "integrity": "sha512-NyaBbyLFXFLT9FP+zk0kYlUlA8XtCUbehs67F0nnEg7KICgMc2mNkIeu9TYhKzyXMkrapZFwAhXLdnt4IYHy1w==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.3",
-        "@babel/plugin-syntax-dynamic-import": "^7.8.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-json-strings": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.8.3.tgz",
-      "integrity": "sha512-KGhQNZ3TVCQG/MjRbAUwuH+14y9q0tpxs1nWWs3pbSleRdDro9SAMMDyye8HhY1gqZ7/NqIc8SKhya0wRDgP1Q==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.3",
-        "@babel/plugin-syntax-json-strings": "^7.8.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-nullish-coalescing-operator": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.8.3.tgz",
-      "integrity": "sha512-TS9MlfzXpXKt6YYomudb/KU7nQI6/xnapG6in1uZxoxDghuSMZsPb6D2fyUwNYSAp4l1iR7QtFOjkqcRYcUsfw==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.3",
-        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-numeric-separator": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.8.3.tgz",
-      "integrity": "sha512-jWioO1s6R/R+wEHizfaScNsAx+xKgwTLNXSh7tTC4Usj3ItsPEhYkEpU4h+lpnBwq7NBVOJXfO6cRFYcX69JUQ==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.3",
-        "@babel/plugin-syntax-numeric-separator": "^7.8.3"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-object-rest-spread": {
-      "version": "7.9.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.9.6.tgz",
-      "integrity": "sha512-Ga6/fhGqA9Hj+y6whNpPv8psyaK5xzrQwSPsGPloVkvmH+PqW1ixdnfJ9uIO06OjQNYol3PMnfmJ8vfZtkzF+A==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.3",
-        "@babel/plugin-syntax-object-rest-spread": "^7.8.0",
-        "@babel/plugin-transform-parameters": "^7.9.5"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-optional-catch-binding": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.8.3.tgz",
-      "integrity": "sha512-0gkX7J7E+AtAw9fcwlVQj8peP61qhdg/89D5swOkjYbkboA2CVckn3kiyum1DE0wskGb7KJJxBdyEBApDLLVdw==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.3",
-        "@babel/plugin-syntax-optional-catch-binding": "^7.8.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-optional-chaining": {
-      "version": "7.9.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.9.0.tgz",
-      "integrity": "sha512-NDn5tu3tcv4W30jNhmc2hyD5c56G6cXx4TesJubhxrJeCvuuMpttxr0OnNCqbZGhFjLrg+NIhxxC+BK5F6yS3w==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.3",
-        "@babel/plugin-syntax-optional-chaining": "^7.8.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-unicode-property-regex": {
-      "version": "7.8.8",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.8.8.tgz",
-      "integrity": "sha512-EVhjVsMpbhLw9ZfHWSx2iy13Q8Z/eg8e8ccVWt23sWQK5l1UdkoLJPN5w69UA4uITGBnEZD2JOe4QOHycYKv8A==",
-      "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.8.8",
-        "@babel/helper-plugin-utils": "^7.8.3"
-      },
-      "engines": {
-        "node": ">=4"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-async-generators": {
-      "version": "7.8.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz",
-      "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-dynamic-import": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz",
-      "integrity": "sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-json-strings": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz",
-      "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-nullish-coalescing-operator": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz",
-      "integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-numeric-separator": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.8.3.tgz",
-      "integrity": "sha512-H7dCMAdN83PcCmqmkHB5dtp+Xa9a6LKSvA2hiFBC/5alSHxM5VgWZXFqDi0YFe8XNGT6iCa+z4V4zSt/PdZ7Dw==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.3"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-object-rest-spread": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz",
-      "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-optional-catch-binding": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz",
-      "integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-optional-chaining": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz",
-      "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-top-level-await": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.8.3.tgz",
-      "integrity": "sha512-kwj1j9lL/6Wd0hROD3b/OZZ7MSrZLqqn9RAZ5+cYYsflQ9HZBIKCUkr3+uL1MEJ1NePiUbf98jjiMQSv0NMR9g==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.3"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-arrow-functions": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.8.3.tgz",
-      "integrity": "sha512-0MRF+KC8EqH4dbuITCWwPSzsyO3HIWWlm30v8BbbpOrS1B++isGxPnnuq/IZvOX5J2D/p7DQalQm+/2PnlKGxg==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.3"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-async-to-generator": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.8.3.tgz",
-      "integrity": "sha512-imt9tFLD9ogt56Dd5CI/6XgpukMwd/fLGSrix2httihVe7LOGVPhyhMh1BU5kDM7iHD08i8uUtmV2sWaBFlHVQ==",
-      "dependencies": {
-        "@babel/helper-module-imports": "^7.8.3",
-        "@babel/helper-plugin-utils": "^7.8.3",
-        "@babel/helper-remap-async-to-generator": "^7.8.3"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-block-scoped-functions": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.8.3.tgz",
-      "integrity": "sha512-vo4F2OewqjbB1+yaJ7k2EJFHlTP3jR634Z9Cj9itpqNjuLXvhlVxgnjsHsdRgASR8xYDrx6onw4vW5H6We0Jmg==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.3"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-block-scoping": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.8.3.tgz",
-      "integrity": "sha512-pGnYfm7RNRgYRi7bids5bHluENHqJhrV4bCZRwc5GamaWIIs07N4rZECcmJL6ZClwjDz1GbdMZFtPs27hTB06w==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.3",
-        "lodash": "^4.17.13"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-classes": {
-      "version": "7.9.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.9.5.tgz",
-      "integrity": "sha512-x2kZoIuLC//O5iA7PEvecB105o7TLzZo8ofBVhP79N+DO3jaX+KYfww9TQcfBEZD0nikNyYcGB1IKtRq36rdmg==",
-      "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.8.3",
-        "@babel/helper-define-map": "^7.8.3",
-        "@babel/helper-function-name": "^7.9.5",
-        "@babel/helper-optimise-call-expression": "^7.8.3",
-        "@babel/helper-plugin-utils": "^7.8.3",
-        "@babel/helper-replace-supers": "^7.8.6",
-        "@babel/helper-split-export-declaration": "^7.8.3",
-        "globals": "^11.1.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-computed-properties": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.8.3.tgz",
-      "integrity": "sha512-O5hiIpSyOGdrQZRQ2ccwtTVkgUDBBiCuK//4RJ6UfePllUTCENOzKxfh6ulckXKc0DixTFLCfb2HVkNA7aDpzA==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.3"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-destructuring": {
-      "version": "7.9.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.9.5.tgz",
-      "integrity": "sha512-j3OEsGel8nHL/iusv/mRd5fYZ3DrOxWC82x0ogmdN/vHfAP4MYw+AFKYanzWlktNwikKvlzUV//afBW5FTp17Q==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.3"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-dotall-regex": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.8.3.tgz",
-      "integrity": "sha512-kLs1j9Nn4MQoBYdRXH6AeaXMbEJFaFu/v1nQkvib6QzTj8MZI5OQzqmD83/2jEM1z0DLilra5aWO5YpyC0ALIw==",
-      "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.8.3",
-        "@babel/helper-plugin-utils": "^7.8.3"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-duplicate-keys": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.8.3.tgz",
-      "integrity": "sha512-s8dHiBUbcbSgipS4SMFuWGqCvyge5V2ZeAWzR6INTVC3Ltjig/Vw1G2Gztv0vU/hRG9X8IvKvYdoksnUfgXOEQ==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.3"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-exponentiation-operator": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.8.3.tgz",
-      "integrity": "sha512-zwIpuIymb3ACcInbksHaNcR12S++0MDLKkiqXHl3AzpgdKlFNhog+z/K0+TGW+b0w5pgTq4H6IwV/WhxbGYSjQ==",
-      "dependencies": {
-        "@babel/helper-builder-binary-assignment-operator-visitor": "^7.8.3",
-        "@babel/helper-plugin-utils": "^7.8.3"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-for-of": {
-      "version": "7.9.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.9.0.tgz",
-      "integrity": "sha512-lTAnWOpMwOXpyDx06N+ywmF3jNbafZEqZ96CGYabxHrxNX8l5ny7dt4bK/rGwAh9utyP2b2Hv7PlZh1AAS54FQ==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.3"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-function-name": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.8.3.tgz",
-      "integrity": "sha512-rO/OnDS78Eifbjn5Py9v8y0aR+aSYhDhqAwVfsTl0ERuMZyr05L1aFSCJnbv2mmsLkit/4ReeQ9N2BgLnOcPCQ==",
-      "dependencies": {
-        "@babel/helper-function-name": "^7.8.3",
-        "@babel/helper-plugin-utils": "^7.8.3"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-literals": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.8.3.tgz",
-      "integrity": "sha512-3Tqf8JJ/qB7TeldGl+TT55+uQei9JfYaregDcEAyBZ7akutriFrt6C/wLYIer6OYhleVQvH/ntEhjE/xMmy10A==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.3"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-member-expression-literals": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.8.3.tgz",
-      "integrity": "sha512-3Wk2EXhnw+rP+IDkK6BdtPKsUE5IeZ6QOGrPYvw52NwBStw9V1ZVzxgK6fSKSxqUvH9eQPR3tm3cOq79HlsKYA==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.3"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-modules-amd": {
-      "version": "7.9.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.9.6.tgz",
-      "integrity": "sha512-zoT0kgC3EixAyIAU+9vfaUVKTv9IxBDSabgHoUCBP6FqEJ+iNiN7ip7NBKcYqbfUDfuC2mFCbM7vbu4qJgOnDw==",
-      "dependencies": {
-        "@babel/helper-module-transforms": "^7.9.0",
-        "@babel/helper-plugin-utils": "^7.8.3",
-        "babel-plugin-dynamic-import-node": "^2.3.3"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-modules-commonjs": {
-      "version": "7.9.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.9.6.tgz",
-      "integrity": "sha512-7H25fSlLcn+iYimmsNe3uK1at79IE6SKW9q0/QeEHTMC9MdOZ+4bA+T1VFB5fgOqBWoqlifXRzYD0JPdmIrgSQ==",
-      "dependencies": {
-        "@babel/helper-module-transforms": "^7.9.0",
-        "@babel/helper-plugin-utils": "^7.8.3",
-        "@babel/helper-simple-access": "^7.8.3",
-        "babel-plugin-dynamic-import-node": "^2.3.3"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-modules-systemjs": {
-      "version": "7.9.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.9.6.tgz",
-      "integrity": "sha512-NW5XQuW3N2tTHim8e1b7qGy7s0kZ2OH3m5octc49K1SdAKGxYxeIx7hiIz05kS1R2R+hOWcsr1eYwcGhrdHsrg==",
-      "dependencies": {
-        "@babel/helper-hoist-variables": "^7.8.3",
-        "@babel/helper-module-transforms": "^7.9.0",
-        "@babel/helper-plugin-utils": "^7.8.3",
-        "babel-plugin-dynamic-import-node": "^2.3.3"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-modules-umd": {
-      "version": "7.9.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.9.0.tgz",
-      "integrity": "sha512-uTWkXkIVtg/JGRSIABdBoMsoIeoHQHPTL0Y2E7xf5Oj7sLqwVsNXOkNk0VJc7vF0IMBsPeikHxFjGe+qmwPtTQ==",
-      "dependencies": {
-        "@babel/helper-module-transforms": "^7.9.0",
-        "@babel/helper-plugin-utils": "^7.8.3"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-named-capturing-groups-regex": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.8.3.tgz",
-      "integrity": "sha512-f+tF/8UVPU86TrCb06JoPWIdDpTNSGGcAtaD9mLP0aYGA0OS0j7j7DHJR0GTFrUZPUU6loZhbsVZgTh0N+Qdnw==",
-      "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.8.3"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-new-target": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.8.3.tgz",
-      "integrity": "sha512-QuSGysibQpyxexRyui2vca+Cmbljo8bcRckgzYV4kRIsHpVeyeC3JDO63pY+xFZ6bWOBn7pfKZTqV4o/ix9sFw==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.3"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-object-super": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.8.3.tgz",
-      "integrity": "sha512-57FXk+gItG/GejofIyLIgBKTas4+pEU47IXKDBWFTxdPd7F80H8zybyAY7UoblVfBhBGs2EKM+bJUu2+iUYPDQ==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.3",
-        "@babel/helper-replace-supers": "^7.8.3"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-parameters": {
-      "version": "7.9.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.9.5.tgz",
-      "integrity": "sha512-0+1FhHnMfj6lIIhVvS4KGQJeuhe1GI//h5uptK4PvLt+BGBxsoUJbd3/IW002yk//6sZPlFgsG1hY6OHLcy6kA==",
-      "dependencies": {
-        "@babel/helper-get-function-arity": "^7.8.3",
-        "@babel/helper-plugin-utils": "^7.8.3"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-property-literals": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.8.3.tgz",
-      "integrity": "sha512-uGiiXAZMqEoQhRWMK17VospMZh5sXWg+dlh2soffpkAl96KAm+WZuJfa6lcELotSRmooLqg0MWdH6UUq85nmmg==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.3"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-regenerator": {
-      "version": "7.8.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.8.7.tgz",
-      "integrity": "sha512-TIg+gAl4Z0a3WmD3mbYSk+J9ZUH6n/Yc57rtKRnlA/7rcCvpekHXe0CMZHP1gYp7/KLe9GHTuIba0vXmls6drA==",
-      "dependencies": {
-        "regenerator-transform": "^0.14.2"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-reserved-words": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.8.3.tgz",
-      "integrity": "sha512-mwMxcycN3omKFDjDQUl+8zyMsBfjRFr0Zn/64I41pmjv4NJuqcYlEtezwYtw9TFd9WR1vN5kiM+O0gMZzO6L0A==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.3"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-runtime": {
-      "version": "7.9.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.9.6.tgz",
-      "integrity": "sha512-qcmiECD0mYOjOIt8YHNsAP1SxPooC/rDmfmiSK9BNY72EitdSc7l44WTEklaWuFtbOEBjNhWWyph/kOImbNJ4w==",
-      "dependencies": {
-        "@babel/helper-module-imports": "^7.8.3",
-        "@babel/helper-plugin-utils": "^7.8.3",
-        "resolve": "^1.8.1",
-        "semver": "^5.5.1"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-shorthand-properties": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.8.3.tgz",
-      "integrity": "sha512-I9DI6Odg0JJwxCHzbzW08ggMdCezoWcuQRz3ptdudgwaHxTjxw5HgdFJmZIkIMlRymL6YiZcped4TTCB0JcC8w==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.3"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-spread": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.8.3.tgz",
-      "integrity": "sha512-CkuTU9mbmAoFOI1tklFWYYbzX5qCIZVXPVy0jpXgGwkplCndQAa58s2jr66fTeQnA64bDox0HL4U56CFYoyC7g==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.3"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-sticky-regex": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.8.3.tgz",
-      "integrity": "sha512-9Spq0vGCD5Bb4Z/ZXXSK5wbbLFMG085qd2vhL1JYu1WcQ5bXqZBAYRzU1d+p79GcHs2szYv5pVQCX13QgldaWw==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.3",
-        "@babel/helper-regex": "^7.8.3"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-template-literals": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.8.3.tgz",
-      "integrity": "sha512-820QBtykIQOLFT8NZOcTRJ1UNuztIELe4p9DCgvj4NK+PwluSJ49we7s9FB1HIGNIYT7wFUJ0ar2QpCDj0escQ==",
-      "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.8.3",
-        "@babel/helper-plugin-utils": "^7.8.3"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-typeof-symbol": {
-      "version": "7.8.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.8.4.tgz",
-      "integrity": "sha512-2QKyfjGdvuNfHsb7qnBBlKclbD4CfshH2KvDabiijLMGXPHJXGxtDzwIF7bQP+T0ysw8fYTtxPafgfs/c1Lrqg==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.3"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-unicode-regex": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.8.3.tgz",
-      "integrity": "sha512-+ufgJjYdmWfSQ+6NS9VGUR2ns8cjJjYbrbi11mZBTaWm+Fui/ncTLFF28Ei1okavY+xkojGr1eJxNsWYeA5aZw==",
-      "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.8.3",
-        "@babel/helper-plugin-utils": "^7.8.3"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/preset-env": {
-      "version": "7.9.6",
-      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.9.6.tgz",
-      "integrity": "sha512-0gQJ9RTzO0heXOhzftog+a/WyOuqMrAIugVYxMYf83gh1CQaQDjMtsOpqOwXyDL/5JcWsrCm8l4ju8QC97O7EQ==",
-      "dependencies": {
-        "@babel/compat-data": "^7.9.6",
-        "@babel/helper-compilation-targets": "^7.9.6",
-        "@babel/helper-module-imports": "^7.8.3",
-        "@babel/helper-plugin-utils": "^7.8.3",
-        "@babel/plugin-proposal-async-generator-functions": "^7.8.3",
-        "@babel/plugin-proposal-dynamic-import": "^7.8.3",
-        "@babel/plugin-proposal-json-strings": "^7.8.3",
-        "@babel/plugin-proposal-nullish-coalescing-operator": "^7.8.3",
-        "@babel/plugin-proposal-numeric-separator": "^7.8.3",
-        "@babel/plugin-proposal-object-rest-spread": "^7.9.6",
-        "@babel/plugin-proposal-optional-catch-binding": "^7.8.3",
-        "@babel/plugin-proposal-optional-chaining": "^7.9.0",
-        "@babel/plugin-proposal-unicode-property-regex": "^7.8.3",
-        "@babel/plugin-syntax-async-generators": "^7.8.0",
-        "@babel/plugin-syntax-dynamic-import": "^7.8.0",
-        "@babel/plugin-syntax-json-strings": "^7.8.0",
-        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.0",
-        "@babel/plugin-syntax-numeric-separator": "^7.8.0",
-        "@babel/plugin-syntax-object-rest-spread": "^7.8.0",
-        "@babel/plugin-syntax-optional-catch-binding": "^7.8.0",
-        "@babel/plugin-syntax-optional-chaining": "^7.8.0",
-        "@babel/plugin-syntax-top-level-await": "^7.8.3",
-        "@babel/plugin-transform-arrow-functions": "^7.8.3",
-        "@babel/plugin-transform-async-to-generator": "^7.8.3",
-        "@babel/plugin-transform-block-scoped-functions": "^7.8.3",
-        "@babel/plugin-transform-block-scoping": "^7.8.3",
-        "@babel/plugin-transform-classes": "^7.9.5",
-        "@babel/plugin-transform-computed-properties": "^7.8.3",
-        "@babel/plugin-transform-destructuring": "^7.9.5",
-        "@babel/plugin-transform-dotall-regex": "^7.8.3",
-        "@babel/plugin-transform-duplicate-keys": "^7.8.3",
-        "@babel/plugin-transform-exponentiation-operator": "^7.8.3",
-        "@babel/plugin-transform-for-of": "^7.9.0",
-        "@babel/plugin-transform-function-name": "^7.8.3",
-        "@babel/plugin-transform-literals": "^7.8.3",
-        "@babel/plugin-transform-member-expression-literals": "^7.8.3",
-        "@babel/plugin-transform-modules-amd": "^7.9.6",
-        "@babel/plugin-transform-modules-commonjs": "^7.9.6",
-        "@babel/plugin-transform-modules-systemjs": "^7.9.6",
-        "@babel/plugin-transform-modules-umd": "^7.9.0",
-        "@babel/plugin-transform-named-capturing-groups-regex": "^7.8.3",
-        "@babel/plugin-transform-new-target": "^7.8.3",
-        "@babel/plugin-transform-object-super": "^7.8.3",
-        "@babel/plugin-transform-parameters": "^7.9.5",
-        "@babel/plugin-transform-property-literals": "^7.8.3",
-        "@babel/plugin-transform-regenerator": "^7.8.7",
-        "@babel/plugin-transform-reserved-words": "^7.8.3",
-        "@babel/plugin-transform-shorthand-properties": "^7.8.3",
-        "@babel/plugin-transform-spread": "^7.8.3",
-        "@babel/plugin-transform-sticky-regex": "^7.8.3",
-        "@babel/plugin-transform-template-literals": "^7.8.3",
-        "@babel/plugin-transform-typeof-symbol": "^7.8.4",
-        "@babel/plugin-transform-unicode-regex": "^7.8.3",
-        "@babel/preset-modules": "^0.1.3",
-        "@babel/types": "^7.9.6",
-        "browserslist": "^4.11.1",
-        "core-js-compat": "^3.6.2",
-        "invariant": "^2.2.2",
-        "levenary": "^1.1.1",
-        "semver": "^5.5.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/preset-modules": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.3.tgz",
-      "integrity": "sha512-Ra3JXOHBq2xd56xSF7lMKXdjBn3T772Y1Wet3yWnkDly9zHvJki029tAFzvAAK5cf4YV3yoxuP61crYRol6SVg==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.0.0",
-        "@babel/plugin-proposal-unicode-property-regex": "^7.4.4",
-        "@babel/plugin-transform-dotall-regex": "^7.4.4",
-        "@babel/types": "^7.4.4",
-        "esutils": "^2.0.2"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/runtime": {
-      "version": "7.9.6",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.9.6.tgz",
-      "integrity": "sha512-64AF1xY3OAkFHqOb9s4jpgk1Mm5vDZ4L3acHvAml+53nO1XbXLuDodsVpO4OIUsmemlUHMxNdYMNJmsvOwLrvQ==",
-      "dependencies": {
-        "regenerator-runtime": "^0.13.4"
-      }
-    },
-    "node_modules/@babel/runtime-corejs2": {
-      "version": "7.9.6",
-      "resolved": "https://registry.npmjs.org/@babel/runtime-corejs2/-/runtime-corejs2-7.9.6.tgz",
-      "integrity": "sha512-TcdM3xc7weMrwTawuG3BTjtVE3mQLXUPQ9CxTbSKOrhn3QAcqCJ2fz+IIv25wztzUnhNZat7hr655YJa61F3zg==",
-      "dependencies": {
-        "core-js": "^2.6.5",
-        "regenerator-runtime": "^0.13.4"
-      }
-    },
-    "node_modules/@babel/runtime-corejs2/node_modules/core-js": {
-      "version": "2.6.11",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.11.tgz",
-      "integrity": "sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg==",
-      "deprecated": "core-js@<3.23.3 is no longer maintained and not recommended for usage due to the number of issues. Because of the V8 engine whims, feature detection in old core-js versions could cause a slowdown up to 100x even if nothing is polyfilled. Some versions have web compatibility issues. Please, upgrade your dependencies to the actual version of core-js.",
-      "hasInstallScript": true
-    },
-    "node_modules/@babel/runtime-corejs3": {
-      "version": "7.15.3",
-      "resolved": "https://registry.nlark.com/@babel/runtime-corejs3/download/@babel/runtime-corejs3-7.15.3.tgz",
-      "integrity": "sha1-KHVCY5iBmPKpKMCXM63i+00oCJ0=",
-      "dependencies": {
-        "core-js-pure": "^3.16.0",
-        "regenerator-runtime": "^0.13.4"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/template": {
-      "version": "7.8.6",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.8.6.tgz",
-      "integrity": "sha512-zbMsPMy/v0PWFZEhQJ66bqjhH+z0JgMoBWuikXybgG3Gkd/3t5oQ1Rw2WQhnSrsOmsKXnZOx15tkC4qON/+JPg==",
-      "dependencies": {
-        "@babel/code-frame": "^7.8.3",
-        "@babel/parser": "^7.8.6",
-        "@babel/types": "^7.8.6"
-      }
-    },
-    "node_modules/@babel/traverse": {
-      "version": "7.9.6",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.9.6.tgz",
-      "integrity": "sha512-b3rAHSjbxy6VEAvlxM8OV/0X4XrG72zoxme6q1MOoe2vd0bEc+TwayhuC1+Dfgqh1QEG+pj7atQqvUprHIccsg==",
-      "dependencies": {
-        "@babel/code-frame": "^7.8.3",
-        "@babel/generator": "^7.9.6",
-        "@babel/helper-function-name": "^7.9.5",
-        "@babel/helper-split-export-declaration": "^7.8.3",
-        "@babel/parser": "^7.9.6",
-        "@babel/types": "^7.9.6",
-        "debug": "^4.1.0",
-        "globals": "^11.1.0",
-        "lodash": "^4.17.13"
-      }
-    },
-    "node_modules/@babel/types": {
-      "version": "7.9.6",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.9.6.tgz",
-      "integrity": "sha512-qxXzvBO//jO9ZnoasKF1uJzHd2+M6Q2ZPIVfnFps8JJvXy0ZBbwbNOmE6SGIY5XOY6d1Bo5lb9d9RJ8nv3WSeA==",
-      "dependencies": {
-        "@babel/helper-validator-identifier": "^7.9.5",
-        "lodash": "^4.17.13",
-        "to-fast-properties": "^2.0.0"
-      }
-    },
-    "node_modules/@braintree/sanitize-url": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/@braintree/sanitize-url/-/sanitize-url-4.0.1.tgz",
-      "integrity": "sha512-THIQtVN491hY2rTZ/h5boj0CwDKrZQIUnfaj6RbpGwRJKfmEIgNpgcCJC3KZl1Vux9bQmdE2P4Q7cYUoSUQ4MA==",
-      "deprecated": "Potential XSS vulnerability patched in v6.0.0."
-    },
-    "node_modules/@csstools/convert-colors": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/@csstools/convert-colors/-/convert-colors-1.4.0.tgz",
-      "integrity": "sha512-5a6wqoJV/xEdbRNKVo6I4hO3VjyDq//8q2f9I6PBAvMesJHFauXDorcNCsr9RzvsZnaWi5NYCcfyqP1QeFHFbw==",
-      "engines": {
-        "node": ">=4.0.0"
-      }
-    },
-    "node_modules/@kyleshockey/object-assign-deep": {
-      "version": "0.4.2",
-      "resolved": "https://registry.npmjs.org/@kyleshockey/object-assign-deep/-/object-assign-deep-0.4.2.tgz",
-      "integrity": "sha1-hJAPDu/DcnmPR1G1JigwuCCJIuw=",
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@kyleshockey/xml": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/@kyleshockey/xml/-/xml-1.0.2.tgz",
-      "integrity": "sha512-iMo32MPLcI9cPxs3YL5kmKxKgDmkSZDCFEqIT5eRk7d/Ll8r4X3SwGYSigzALd6+RHWlFEmjL1QyaQ15xDZFlw==",
-      "dependencies": {
-        "stream": "^0.0.2"
-      }
-    },
-    "node_modules/@nodelib/fs.scandir": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.3.tgz",
-      "integrity": "sha512-eGmwYQn3gxo4r7jdQnkrrN6bY478C3P+a/y72IJukF8LjB6ZHeB3c+Ehacj3sYeSmUXGlnA67/PmbM9CVwL7Dw==",
-      "dependencies": {
-        "@nodelib/fs.stat": "2.0.3",
-        "run-parallel": "^1.1.9"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/@nodelib/fs.stat": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.3.tgz",
-      "integrity": "sha512-bQBFruR2TAwoevBEd/NWMoAAtNGzTRgdrqnYCc7dhzfoNvqPzLyqlEQnzZ3kVnNrSp25iyxE00/3h2fqGAGArA==",
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/@nodelib/fs.walk": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.4.tgz",
-      "integrity": "sha512-1V9XOY4rDW0rehzbrcqAmHnz8e7SKvX27gh8Gt2WgB0+pdzdiLV83p72kZPU+jvMbS1qU5mauP2iOvO8rhmurQ==",
-      "dependencies": {
-        "@nodelib/fs.scandir": "2.1.3",
-        "fastq": "^1.6.0"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/@octokit/auth-token": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/@octokit/auth-token/-/auth-token-2.4.0.tgz",
-      "integrity": "sha512-eoOVMjILna7FVQf96iWc3+ZtE/ZT6y8ob8ZzcqKY1ibSQCnu4O/B7pJvzMx5cyZ/RjAff6DAdEb0O0Cjcxidkg==",
-      "dependencies": {
-        "@octokit/types": "^2.0.0"
-      }
-    },
-    "node_modules/@octokit/endpoint": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-6.0.1.tgz",
-      "integrity": "sha512-pOPHaSz57SFT/m3R5P8MUu4wLPszokn5pXcB/pzavLTQf2jbU+6iayTvzaY6/BiotuRS0qyEUkx3QglT4U958A==",
-      "dependencies": {
-        "@octokit/types": "^2.11.1",
-        "is-plain-object": "^3.0.0",
-        "universal-user-agent": "^5.0.0"
-      }
-    },
-    "node_modules/@octokit/endpoint/node_modules/universal-user-agent": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-5.0.0.tgz",
-      "integrity": "sha512-B5TPtzZleXyPrUMKCpEHFmVhMN6EhmJYjG5PQna9s7mXeSqGTLap4OpqLl5FCEFUI3UBmllkETwKf/db66Y54Q==",
-      "dependencies": {
-        "os-name": "^3.1.0"
-      }
-    },
-    "node_modules/@octokit/plugin-paginate-rest": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-1.1.2.tgz",
-      "integrity": "sha512-jbsSoi5Q1pj63sC16XIUboklNw+8tL9VOnJsWycWYR78TKss5PVpIPb1TUUcMQ+bBh7cY579cVAWmf5qG+dw+Q==",
-      "dependencies": {
-        "@octokit/types": "^2.0.1"
-      }
-    },
-    "node_modules/@octokit/plugin-request-log": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@octokit/plugin-request-log/-/plugin-request-log-1.0.0.tgz",
-      "integrity": "sha512-ywoxP68aOT3zHCLgWZgwUJatiENeHE7xJzYjfz8WI0goynp96wETBF+d95b8g/uL4QmS6owPVlaxiz3wyMAzcw=="
-    },
-    "node_modules/@octokit/plugin-rest-endpoint-methods": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-2.4.0.tgz",
-      "integrity": "sha512-EZi/AWhtkdfAYi01obpX0DF7U6b1VRr30QNQ5xSFPITMdLSfhcBqjamE3F+sKcxPbD7eZuMHu3Qkk2V+JGxBDQ==",
-      "dependencies": {
-        "@octokit/types": "^2.0.1",
-        "deprecation": "^2.3.1"
-      }
-    },
-    "node_modules/@octokit/request": {
-      "version": "5.4.2",
-      "resolved": "https://registry.npmjs.org/@octokit/request/-/request-5.4.2.tgz",
-      "integrity": "sha512-zKdnGuQ2TQ2vFk9VU8awFT4+EYf92Z/v3OlzRaSh4RIP0H6cvW1BFPXq4XYvNez+TPQjqN+0uSkCYnMFFhcFrw==",
-      "dependencies": {
-        "@octokit/endpoint": "^6.0.1",
-        "@octokit/request-error": "^2.0.0",
-        "@octokit/types": "^2.11.1",
-        "deprecation": "^2.0.0",
-        "is-plain-object": "^3.0.0",
-        "node-fetch": "^2.3.0",
-        "once": "^1.4.0",
-        "universal-user-agent": "^5.0.0"
-      }
-    },
-    "node_modules/@octokit/request-error": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/@octokit/request-error/-/request-error-1.2.1.tgz",
-      "integrity": "sha512-+6yDyk1EES6WK+l3viRDElw96MvwfJxCt45GvmjDUKWjYIb3PJZQkq3i46TwGwoPD4h8NmTrENmtyA1FwbmhRA==",
-      "dependencies": {
-        "@octokit/types": "^2.0.0",
-        "deprecation": "^2.0.0",
-        "once": "^1.4.0"
-      }
-    },
-    "node_modules/@octokit/request/node_modules/@octokit/request-error": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/@octokit/request-error/-/request-error-2.0.0.tgz",
-      "integrity": "sha512-rtYicB4Absc60rUv74Rjpzek84UbVHGHJRu4fNVlZ1mCcyUPPuzFfG9Rn6sjHrd95DEsmjSt1Axlc699ZlbDkw==",
-      "dependencies": {
-        "@octokit/types": "^2.0.0",
-        "deprecation": "^2.0.0",
-        "once": "^1.4.0"
-      }
-    },
-    "node_modules/@octokit/request/node_modules/universal-user-agent": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-5.0.0.tgz",
-      "integrity": "sha512-B5TPtzZleXyPrUMKCpEHFmVhMN6EhmJYjG5PQna9s7mXeSqGTLap4OpqLl5FCEFUI3UBmllkETwKf/db66Y54Q==",
-      "dependencies": {
-        "os-name": "^3.1.0"
-      }
-    },
-    "node_modules/@octokit/rest": {
-      "version": "16.43.1",
-      "resolved": "https://registry.npmjs.org/@octokit/rest/-/rest-16.43.1.tgz",
-      "integrity": "sha512-gfFKwRT/wFxq5qlNjnW2dh+qh74XgTQ2B179UX5K1HYCluioWj8Ndbgqw2PVqa1NnVJkGHp2ovMpVn/DImlmkw==",
-      "dependencies": {
-        "@octokit/auth-token": "^2.4.0",
-        "@octokit/plugin-paginate-rest": "^1.1.1",
-        "@octokit/plugin-request-log": "^1.0.0",
-        "@octokit/plugin-rest-endpoint-methods": "2.4.0",
-        "@octokit/request": "^5.2.0",
-        "@octokit/request-error": "^1.0.2",
-        "atob-lite": "^2.0.0",
-        "before-after-hook": "^2.0.0",
-        "btoa-lite": "^1.0.0",
-        "deprecation": "^2.0.0",
-        "lodash.get": "^4.4.2",
-        "lodash.set": "^4.3.2",
-        "lodash.uniq": "^4.5.0",
-        "octokit-pagination-methods": "^1.1.0",
-        "once": "^1.4.0",
-        "universal-user-agent": "^4.0.0"
-      }
-    },
-    "node_modules/@octokit/types": {
-      "version": "2.16.2",
-      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-2.16.2.tgz",
-      "integrity": "sha512-O75k56TYvJ8WpAakWwYRN8Bgu60KrmX0z1KqFp1kNiFNkgW+JW+9EBKZ+S33PU6SLvbihqd+3drvPxKK68Ee8Q==",
-      "dependencies": {
-        "@types/node": ">= 8"
-      }
-    },
-    "node_modules/@primer/octicons": {
-      "version": "9.6.0",
-      "resolved": "https://registry.npmjs.org/@primer/octicons/-/octicons-9.6.0.tgz",
-      "integrity": "sha512-B5Wzk5izRXXz0JqEXJkVUtqhCXSpUKgqYkVwegMkp5sziBW+ksd9LPbONlCWyyLODwf9GsI2sBXekR7m+JJDBw==",
-      "dependencies": {
-        "object-assign": "^4.1.1"
-      }
-    },
-    "node_modules/@stylelint/postcss-css-in-js": {
-      "version": "0.37.1",
-      "resolved": "https://registry.npmjs.org/@stylelint/postcss-css-in-js/-/postcss-css-in-js-0.37.1.tgz",
-      "integrity": "sha512-UMf2Rni3JGKi3ZwYRGMYJ5ipOA5ENJSKMtYA/pE1ZLURwdh7B5+z2r73RmWvub+N0UuH1Lo+TGfCgYwPvqpXNw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/core": ">=7.9.0"
-      },
-      "peerDependencies": {
-        "postcss": ">=7.0.0",
-        "postcss-syntax": ">=0.36.2"
-      }
-    },
-    "node_modules/@stylelint/postcss-markdown": {
-      "version": "0.36.1",
-      "resolved": "https://registry.npmjs.org/@stylelint/postcss-markdown/-/postcss-markdown-0.36.1.tgz",
-      "integrity": "sha512-iDxMBWk9nB2BPi1VFQ+Dc5+XpvODBHw2n3tYpaBZuEAFQlbtF9If0Qh5LTTwSi/XwdbJ2jt+0dis3i8omyggpw==",
-      "deprecated": "Use the original unforked package instead: postcss-markdown",
-      "dev": true,
-      "dependencies": {
-        "remark": "^12.0.0",
-        "unist-util-find-all-after": "^3.0.1"
-      },
-      "peerDependencies": {
-        "postcss": ">=7.0.0",
-        "postcss-syntax": ">=0.36.2"
-      }
-    },
-    "node_modules/@types/color-name": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/@types/color-name/-/color-name-1.1.1.tgz",
-      "integrity": "sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==",
-      "dev": true
-    },
-    "node_modules/@types/minimist": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.0.tgz",
-      "integrity": "sha1-aaI6OtKcrwCX8G7aWbNh7i8GOfY=",
-      "dev": true
-    },
-    "node_modules/@types/node": {
-      "version": "14.0.1",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.0.1.tgz",
-      "integrity": "sha512-FAYBGwC+W6F9+huFIDtn43cpy7+SzG+atzRiTfdp3inUKL2hXnd4rG8hylJLIh4+hqrQy1P17kvJByE/z825hA=="
-    },
-    "node_modules/@types/normalize-package-data": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz",
-      "integrity": "sha512-f5j5b/Gf71L+dbqxIpQ4Z2WlmI/mPJ0fOkGGmFgtb6sAu97EPczzbS3/tJKxmcYDj55OX6ssqwDAWOHIYDRDGA==",
-      "dev": true
-    },
-    "node_modules/@types/parse-json": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz",
-      "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==",
-      "dev": true
-    },
-    "node_modules/@types/q": {
-      "version": "1.5.2",
-      "resolved": "https://registry.npmjs.org/@types/q/-/q-1.5.2.tgz",
-      "integrity": "sha512-ce5d3q03Ex0sy4R14722Rmt6MT07Ua+k4FwDfdcToYJcMKNtRVQvJ6JCAPdAmAnbRb6CsX6aYb9m96NGod9uTw=="
-    },
-    "node_modules/@types/react": {
-      "version": "16.4.6",
-      "resolved": "https://registry.npmjs.org/@types/react/-/react-16.4.6.tgz",
-      "integrity": "sha512-9LDZdhsuKSc+DjY65SjBkA958oBWcTWSVWAd2cD9XqKBjhGw1KzAkRhWRw2eIsXvaIE/TOTjjKMFVC+JA1iU4g==",
-      "optional": true,
-      "dependencies": {
-        "csstype": "^2.2.0"
-      }
-    },
-    "node_modules/@types/unist": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/@types/unist/-/unist-2.0.3.tgz",
-      "integrity": "sha512-FvUupuM3rlRsRtCN+fDudtmytGO6iHJuuRKS1Ss0pG5z8oX0diNEw94UEL7hgDbpN94rgaK5R7sWm6RrSkZuAQ==",
-      "dev": true
-    },
-    "node_modules/@vue/component-compiler-utils": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/@vue/component-compiler-utils/-/component-compiler-utils-3.1.2.tgz",
-      "integrity": "sha512-QLq9z8m79mCinpaEeSURhnNCN6djxpHw0lpP/bodMlt5kALfONpryMthvnrQOlTcIKoF+VoPi+lPHUYeDFPXug==",
-      "dependencies": {
-        "consolidate": "^0.15.1",
-        "hash-sum": "^1.0.2",
-        "lru-cache": "^4.1.2",
-        "merge-source-map": "^1.1.0",
-        "postcss": "^7.0.14",
-        "postcss-selector-parser": "^6.0.2",
-        "source-map": "~0.6.1",
-        "vue-template-es2015-compiler": "^1.9.0"
-      },
-      "optionalDependencies": {
-        "prettier": "^1.18.2"
-      }
-    },
-    "node_modules/@vue/component-compiler-utils/node_modules/prettier": {
-      "version": "1.19.1",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-1.19.1.tgz",
-      "integrity": "sha512-s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew==",
-      "optional": true,
-      "bin": {
-        "prettier": "bin-prettier.js"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@vue/component-compiler-utils/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/@webassemblyjs/ast": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.9.0.tgz",
-      "integrity": "sha512-C6wW5L+b7ogSDVqymbkkvuW9kruN//YisMED04xzeBBqjHa2FYnmvOlS6Xj68xWQRgWvI9cIglsjFowH/RJyEA==",
-      "dependencies": {
-        "@webassemblyjs/helper-module-context": "1.9.0",
-        "@webassemblyjs/helper-wasm-bytecode": "1.9.0",
-        "@webassemblyjs/wast-parser": "1.9.0"
-      }
-    },
-    "node_modules/@webassemblyjs/floating-point-hex-parser": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.9.0.tgz",
-      "integrity": "sha512-TG5qcFsS8QB4g4MhrxK5TqfdNe7Ey/7YL/xN+36rRjl/BlGE/NcBvJcqsRgCP6Z92mRE+7N50pRIi8SmKUbcQA=="
-    },
-    "node_modules/@webassemblyjs/helper-api-error": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.9.0.tgz",
-      "integrity": "sha512-NcMLjoFMXpsASZFxJ5h2HZRcEhDkvnNFOAKneP5RbKRzaWJN36NC4jqQHKwStIhGXu5mUWlUUk7ygdtrO8lbmw=="
-    },
-    "node_modules/@webassemblyjs/helper-buffer": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.9.0.tgz",
-      "integrity": "sha512-qZol43oqhq6yBPx7YM3m9Bv7WMV9Eevj6kMi6InKOuZxhw+q9hOkvq5e/PpKSiLfyetpaBnogSbNCfBwyB00CA=="
-    },
-    "node_modules/@webassemblyjs/helper-code-frame": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.9.0.tgz",
-      "integrity": "sha512-ERCYdJBkD9Vu4vtjUYe8LZruWuNIToYq/ME22igL+2vj2dQ2OOujIZr3MEFvfEaqKoVqpsFKAGsRdBSBjrIvZA==",
-      "dependencies": {
-        "@webassemblyjs/wast-printer": "1.9.0"
-      }
-    },
-    "node_modules/@webassemblyjs/helper-fsm": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-fsm/-/helper-fsm-1.9.0.tgz",
-      "integrity": "sha512-OPRowhGbshCb5PxJ8LocpdX9Kl0uB4XsAjl6jH/dWKlk/mzsANvhwbiULsaiqT5GZGT9qinTICdj6PLuM5gslw=="
-    },
-    "node_modules/@webassemblyjs/helper-module-context": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-module-context/-/helper-module-context-1.9.0.tgz",
-      "integrity": "sha512-MJCW8iGC08tMk2enck1aPW+BE5Cw8/7ph/VGZxwyvGbJwjktKkDK7vy7gAmMDx88D7mhDTCNKAW5tED+gZ0W8g==",
-      "dependencies": {
-        "@webassemblyjs/ast": "1.9.0"
-      }
-    },
-    "node_modules/@webassemblyjs/helper-wasm-bytecode": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.9.0.tgz",
-      "integrity": "sha512-R7FStIzyNcd7xKxCZH5lE0Bqy+hGTwS3LJjuv1ZVxd9O7eHCedSdrId/hMOd20I+v8wDXEn+bjfKDLzTepoaUw=="
-    },
-    "node_modules/@webassemblyjs/helper-wasm-section": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.9.0.tgz",
-      "integrity": "sha512-XnMB8l3ek4tvrKUUku+IVaXNHz2YsJyOOmz+MMkZvh8h1uSJpSen6vYnw3IoQ7WwEuAhL8Efjms1ZWjqh2agvw==",
-      "dependencies": {
-        "@webassemblyjs/ast": "1.9.0",
-        "@webassemblyjs/helper-buffer": "1.9.0",
-        "@webassemblyjs/helper-wasm-bytecode": "1.9.0",
-        "@webassemblyjs/wasm-gen": "1.9.0"
-      }
-    },
-    "node_modules/@webassemblyjs/ieee754": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.9.0.tgz",
-      "integrity": "sha512-dcX8JuYU/gvymzIHc9DgxTzUUTLexWwt8uCTWP3otys596io0L5aW02Gb1RjYpx2+0Jus1h4ZFqjla7umFniTg==",
-      "dependencies": {
-        "@xtuc/ieee754": "^1.2.0"
-      }
-    },
-    "node_modules/@webassemblyjs/leb128": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.9.0.tgz",
-      "integrity": "sha512-ENVzM5VwV1ojs9jam6vPys97B/S65YQtv/aanqnU7D8aSoHFX8GyhGg0CMfyKNIHBuAVjy3tlzd5QMMINa7wpw==",
-      "dependencies": {
-        "@xtuc/long": "4.2.2"
-      }
-    },
-    "node_modules/@webassemblyjs/utf8": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.9.0.tgz",
-      "integrity": "sha512-GZbQlWtopBTP0u7cHrEx+73yZKrQoBMpwkGEIqlacljhXCkVM1kMQge/Mf+csMJAjEdSwhOyLAS0AoR3AG5P8w=="
-    },
-    "node_modules/@webassemblyjs/wasm-edit": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.9.0.tgz",
-      "integrity": "sha512-FgHzBm80uwz5M8WKnMTn6j/sVbqilPdQXTWraSjBwFXSYGirpkSWE2R9Qvz9tNiTKQvoKILpCuTjBKzOIm0nxw==",
-      "dependencies": {
-        "@webassemblyjs/ast": "1.9.0",
-        "@webassemblyjs/helper-buffer": "1.9.0",
-        "@webassemblyjs/helper-wasm-bytecode": "1.9.0",
-        "@webassemblyjs/helper-wasm-section": "1.9.0",
-        "@webassemblyjs/wasm-gen": "1.9.0",
-        "@webassemblyjs/wasm-opt": "1.9.0",
-        "@webassemblyjs/wasm-parser": "1.9.0",
-        "@webassemblyjs/wast-printer": "1.9.0"
-      }
-    },
-    "node_modules/@webassemblyjs/wasm-gen": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.9.0.tgz",
-      "integrity": "sha512-cPE3o44YzOOHvlsb4+E9qSqjc9Qf9Na1OO/BHFy4OI91XDE14MjFN4lTMezzaIWdPqHnsTodGGNP+iRSYfGkjA==",
-      "dependencies": {
-        "@webassemblyjs/ast": "1.9.0",
-        "@webassemblyjs/helper-wasm-bytecode": "1.9.0",
-        "@webassemblyjs/ieee754": "1.9.0",
-        "@webassemblyjs/leb128": "1.9.0",
-        "@webassemblyjs/utf8": "1.9.0"
-      }
-    },
-    "node_modules/@webassemblyjs/wasm-opt": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.9.0.tgz",
-      "integrity": "sha512-Qkjgm6Anhm+OMbIL0iokO7meajkzQD71ioelnfPEj6r4eOFuqm4YC3VBPqXjFyyNwowzbMD+hizmprP/Fwkl2A==",
-      "dependencies": {
-        "@webassemblyjs/ast": "1.9.0",
-        "@webassemblyjs/helper-buffer": "1.9.0",
-        "@webassemblyjs/wasm-gen": "1.9.0",
-        "@webassemblyjs/wasm-parser": "1.9.0"
-      }
-    },
-    "node_modules/@webassemblyjs/wasm-parser": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.9.0.tgz",
-      "integrity": "sha512-9+wkMowR2AmdSWQzsPEjFU7njh8HTO5MqO8vjwEHuM+AMHioNqSBONRdr0NQQ3dVQrzp0s8lTcYqzUdb7YgELA==",
-      "dependencies": {
-        "@webassemblyjs/ast": "1.9.0",
-        "@webassemblyjs/helper-api-error": "1.9.0",
-        "@webassemblyjs/helper-wasm-bytecode": "1.9.0",
-        "@webassemblyjs/ieee754": "1.9.0",
-        "@webassemblyjs/leb128": "1.9.0",
-        "@webassemblyjs/utf8": "1.9.0"
-      }
-    },
-    "node_modules/@webassemblyjs/wast-parser": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-parser/-/wast-parser-1.9.0.tgz",
-      "integrity": "sha512-qsqSAP3QQ3LyZjNC/0jBJ/ToSxfYJ8kYyuiGvtn/8MK89VrNEfwj7BPQzJVHi0jGTRK2dGdJ5PRqhtjzoww+bw==",
-      "dependencies": {
-        "@webassemblyjs/ast": "1.9.0",
-        "@webassemblyjs/floating-point-hex-parser": "1.9.0",
-        "@webassemblyjs/helper-api-error": "1.9.0",
-        "@webassemblyjs/helper-code-frame": "1.9.0",
-        "@webassemblyjs/helper-fsm": "1.9.0",
-        "@xtuc/long": "4.2.2"
-      }
-    },
-    "node_modules/@webassemblyjs/wast-printer": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.9.0.tgz",
-      "integrity": "sha512-2J0nE95rHXHyQ24cWjMKJ1tqB/ds8z/cyeOZxJhcb+rW+SQASVjuznUSmdz5GpVJTzU8JkhYut0D3siFDD6wsA==",
-      "dependencies": {
-        "@webassemblyjs/ast": "1.9.0",
-        "@webassemblyjs/wast-parser": "1.9.0",
-        "@xtuc/long": "4.2.2"
-      }
-    },
-    "node_modules/@xtuc/ieee754": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
-      "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA=="
-    },
-    "node_modules/@xtuc/long": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz",
-      "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ=="
-    },
-    "node_modules/abbrev": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
-      "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q=="
-    },
-    "node_modules/accord": {
-      "version": "0.29.0",
-      "resolved": "https://registry.npmjs.org/accord/-/accord-0.29.0.tgz",
-      "integrity": "sha512-3OOR92FTc2p5/EcOzPcXp+Cbo+3C15nV9RXHlOUBCBpHhcB+0frbSNR9ehED/o7sTcyGVtqGJpguToEdlXhD0w==",
-      "dependencies": {
-        "convert-source-map": "^1.5.0",
-        "glob": "^7.0.5",
-        "indx": "^0.2.3",
-        "lodash.clone": "^4.3.2",
-        "lodash.defaults": "^4.0.1",
-        "lodash.flatten": "^4.2.0",
-        "lodash.merge": "^4.4.0",
-        "lodash.partialright": "^4.1.4",
-        "lodash.pick": "^4.2.1",
-        "lodash.uniq": "^4.3.0",
-        "resolve": "^1.5.0",
-        "semver": "^5.3.0",
-        "uglify-js": "^2.8.22",
-        "when": "^3.7.8"
-      }
-    },
-    "node_modules/accord/node_modules/lodash.defaults": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-4.2.0.tgz",
-      "integrity": "sha1-0JF4cW/+pN3p5ft7N/bwgCJ0WAw="
-    },
-    "node_modules/acorn": {
-      "version": "6.4.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.1.tgz",
-      "integrity": "sha512-ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA==",
-      "bin": {
-        "acorn": "bin/acorn"
-      },
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/acorn-jsx": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npm.taobao.org/acorn-jsx/download/acorn-jsx-5.2.0.tgz?cache=0&sync_timestamp=1589684116279&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Facorn-jsx%2Fdownload%2Facorn-jsx-5.2.0.tgz",
-      "integrity": "sha1-TGYGkXPW/daO2FI5/CViJhgrLr4=",
-      "dev": true,
-      "peerDependencies": {
-        "acorn": "^6.0.0 || ^7.0.0"
-      }
-    },
-    "node_modules/adler-32": {
-      "version": "1.2.0",
-      "resolved": "https://registry.nlark.com/adler-32/download/adler-32-1.2.0.tgz",
-      "integrity": "sha1-aj5r8KY5ALoVZSgIyxXGgT0aXyU=",
-      "dependencies": {
-        "exit-on-epipe": "~1.0.1",
-        "printj": "~1.1.0"
-      },
-      "bin": {
-        "adler32": "bin/adler32.njs"
-      },
-      "engines": {
-        "node": ">=0.8"
-      }
-    },
-    "node_modules/aggregate-error": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.0.1.tgz",
-      "integrity": "sha512-quoaXsZ9/BLNae5yiNoUz+Nhkwz83GhWwtYFglcjEQB2NDHCIpApbqXxIFnm4Pq/Nvhrsq5sYJFyohrrxnTGAA==",
-      "dependencies": {
-        "clean-stack": "^2.0.0",
-        "indent-string": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/ajv": {
-      "version": "6.12.2",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.2.tgz",
-      "integrity": "sha512-k+V+hzjm5q/Mr8ef/1Y9goCmlsK4I6Sm74teeyGvFk1XrOsbsKLjEdrvny42CZ+a8sXbk8KWpY/bDwS+FLL2UQ==",
-      "dependencies": {
-        "fast-deep-equal": "^3.1.1",
-        "fast-json-stable-stringify": "^2.0.0",
-        "json-schema-traverse": "^0.4.1",
-        "uri-js": "^4.2.2"
-      }
-    },
-    "node_modules/ajv-errors": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/ajv-errors/-/ajv-errors-1.0.1.tgz",
-      "integrity": "sha512-DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ==",
-      "peerDependencies": {
-        "ajv": ">=5.0.0"
-      }
-    },
-    "node_modules/ajv-keywords": {
-      "version": "3.4.1",
-      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.4.1.tgz",
-      "integrity": "sha512-RO1ibKvd27e6FEShVFfPALuHI3WjSVNeK5FIsmme/LYRNxjKuNj+Dt7bucLa6NdSv3JcVTyMlm9kGR84z1XpaQ==",
-      "peerDependencies": {
-        "ajv": "^6.9.1"
-      }
-    },
-    "node_modules/align-text": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz",
-      "integrity": "sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=",
-      "dependencies": {
-        "kind-of": "^3.0.2",
-        "longest": "^1.0.1",
-        "repeat-string": "^1.5.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/align-text/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/alphanum-sort": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/alphanum-sort/-/alphanum-sort-1.0.2.tgz",
-      "integrity": "sha1-l6ERlkmyEa0zaR2fn0hqjsn74KM="
-    },
-    "node_modules/ansi-colors": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz",
-      "integrity": "sha512-SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA==",
-      "dependencies": {
-        "ansi-wrap": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/ansi-cyan": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-cyan/-/ansi-cyan-0.1.1.tgz",
-      "integrity": "sha1-U4rlKK+JgvKK4w2G8vF0VtJgmHM=",
-      "dependencies": {
-        "ansi-wrap": "0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/ansi-escapes": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz",
-      "integrity": "sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==",
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/ansi-gray": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-gray/-/ansi-gray-0.1.1.tgz",
-      "integrity": "sha1-KWLPVOyXksSFEKPetSRDaGHvclE=",
-      "dependencies": {
-        "ansi-wrap": "0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/ansi-red": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-red/-/ansi-red-0.1.1.tgz",
-      "integrity": "sha1-jGOPnRCAgAo1PJwoyKgcpHBdlGw=",
-      "dependencies": {
-        "ansi-wrap": "0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/ansi-regex": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "dependencies": {
-        "color-convert": "^1.9.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/ansi-wrap": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/ansi-wrap/-/ansi-wrap-0.1.0.tgz",
-      "integrity": "sha1-qCJQ3bABXponyoLoLqYDu/pF768=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/any-shell-escape": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/any-shell-escape/-/any-shell-escape-0.1.1.tgz",
-      "integrity": "sha1-1Vq5ciRMcaml4asIefML8RCAaVk="
-    },
-    "node_modules/anymatch": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
-      "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
-      "dependencies": {
-        "micromatch": "^3.1.4",
-        "normalize-path": "^2.1.1"
-      }
-    },
-    "node_modules/anymatch/node_modules/braces": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-      "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-      "dependencies": {
-        "arr-flatten": "^1.1.0",
-        "array-unique": "^0.3.2",
-        "extend-shallow": "^2.0.1",
-        "fill-range": "^4.0.0",
-        "isobject": "^3.0.1",
-        "repeat-element": "^1.1.2",
-        "snapdragon": "^0.8.1",
-        "snapdragon-node": "^2.0.1",
-        "split-string": "^3.0.2",
-        "to-regex": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/anymatch/node_modules/braces/node_modules/extend-shallow": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-      "dependencies": {
-        "is-extendable": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/anymatch/node_modules/fill-range": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-      "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
-      "dependencies": {
-        "extend-shallow": "^2.0.1",
-        "is-number": "^3.0.0",
-        "repeat-string": "^1.6.1",
-        "to-regex-range": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/anymatch/node_modules/fill-range/node_modules/extend-shallow": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-      "dependencies": {
-        "is-extendable": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/anymatch/node_modules/is-number": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-      "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/anymatch/node_modules/is-number/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/anymatch/node_modules/isobject": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/anymatch/node_modules/micromatch": {
-      "version": "3.1.10",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-      "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
-      "dependencies": {
-        "arr-diff": "^4.0.0",
-        "array-unique": "^0.3.2",
-        "braces": "^2.3.1",
-        "define-property": "^2.0.2",
-        "extend-shallow": "^3.0.2",
-        "extglob": "^2.0.4",
-        "fragment-cache": "^0.2.1",
-        "kind-of": "^6.0.2",
-        "nanomatch": "^1.2.9",
-        "object.pick": "^1.3.0",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/anymatch/node_modules/normalize-path": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
-      "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
-      "dependencies": {
-        "remove-trailing-separator": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/anymatch/node_modules/to-regex-range": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
-      "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
-      "dependencies": {
-        "is-number": "^3.0.0",
-        "repeat-string": "^1.6.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/append-buffer": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/append-buffer/-/append-buffer-1.0.2.tgz",
-      "integrity": "sha1-2CIM9GYIFSXv6lBhTz3mUU36WPE=",
-      "dependencies": {
-        "buffer-equal": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/aproba": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz",
-      "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw=="
-    },
-    "node_modules/archy": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz",
-      "integrity": "sha1-+cjBN1fMHde8N5rHeyxipcKGjEA="
-    },
-    "node_modules/argparse": {
-      "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
-      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
-      "dependencies": {
-        "sprintf-js": "~1.0.2"
-      }
-    },
-    "node_modules/arr-diff": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
-      "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/arr-filter": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/arr-filter/-/arr-filter-1.1.2.tgz",
-      "integrity": "sha1-Q/3d0JHo7xGqTEXZzcGOLf8XEe4=",
-      "dependencies": {
-        "make-iterator": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/arr-flatten": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz",
-      "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/arr-map": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/arr-map/-/arr-map-2.0.2.tgz",
-      "integrity": "sha1-Onc0X/wc814qkYJWAfnljy4kysQ=",
-      "dependencies": {
-        "make-iterator": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/arr-union": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
-      "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/array-differ": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/array-differ/-/array-differ-1.0.0.tgz",
-      "integrity": "sha1-7/UuN1gknTO+QCuLuOVkuytdQDE=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/array-each": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/array-each/-/array-each-1.0.1.tgz",
-      "integrity": "sha1-p5SvDAWrF1KEbudTofIRoFugxE8=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/array-includes": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.1.tgz",
-      "integrity": "sha512-c2VXaCHl7zPsvpkFsw4nxvFie4fh1ur9bpcgsVkIjqn0H/Xwdg+7fv3n2r/isyS8EBj5b06M9kHyZuIr4El6WQ==",
-      "dev": true,
-      "dependencies": {
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.0",
-        "is-string": "^1.0.5"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/array-initial": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/array-initial/-/array-initial-1.1.0.tgz",
-      "integrity": "sha1-L6dLJnOTccOUe9enrcc74zSz15U=",
-      "dependencies": {
-        "array-slice": "^1.0.0",
-        "is-number": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/array-initial/node_modules/is-number": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz",
-      "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/array-last": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/array-last/-/array-last-1.3.0.tgz",
-      "integrity": "sha512-eOCut5rXlI6aCOS7Z7kCplKRKyiFQ6dHFBem4PwlwKeNFk2/XxTrhRh5T9PyaEWGy/NHTZWbY+nsZlNFJu9rYg==",
-      "dependencies": {
-        "is-number": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/array-last/node_modules/is-number": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz",
-      "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/array-slice": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-1.1.0.tgz",
-      "integrity": "sha512-B1qMD3RBP7O8o0H2KbrXDyB0IccejMF15+87Lvlor12ONPRHP6gTjXMNkt/d3ZuOGbAe66hFmaCfECI24Ufp6w==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/array-sort": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/array-sort/-/array-sort-1.0.0.tgz",
-      "integrity": "sha512-ihLeJkonmdiAsD7vpgN3CRcx2J2S0TiYW+IS/5zHBI7mKUq3ySvBdzzBfD236ubDBQFiiyG3SWCPc+msQ9KoYg==",
-      "dependencies": {
-        "default-compare": "^1.0.0",
-        "get-value": "^2.0.6",
-        "kind-of": "^5.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/array-sort/node_modules/kind-of": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-      "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/array-union": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz",
-      "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=",
-      "dependencies": {
-        "array-uniq": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/array-uniq": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz",
-      "integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/array-unique": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
-      "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/array.prototype.flat": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.2.3.tgz",
-      "integrity": "sha512-gBlRZV0VSmfPIeWfuuy56XZMvbVfbEUnOXUvt3F/eUUUSyzlgLxhEX4YAEpxNAogRGehPSnfXyPtYyKAhkzQhQ==",
-      "dev": true,
-      "dependencies": {
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.0-next.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/arrify": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
-      "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/asap": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz",
-      "integrity": "sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY="
-    },
-    "node_modules/asn1": {
-      "version": "0.2.4",
-      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz",
-      "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==",
-      "optional": true,
-      "dependencies": {
-        "safer-buffer": "~2.1.0"
-      }
-    },
-    "node_modules/asn1.js": {
-      "version": "4.10.1",
-      "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-4.10.1.tgz",
-      "integrity": "sha512-p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw==",
-      "dependencies": {
-        "bn.js": "^4.0.0",
-        "inherits": "^2.0.1",
-        "minimalistic-assert": "^1.0.0"
-      }
-    },
-    "node_modules/asn1.js/node_modules/bn.js": {
-      "version": "4.11.8",
-      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz",
-      "integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA=="
-    },
-    "node_modules/assert": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/assert/-/assert-1.5.0.tgz",
-      "integrity": "sha512-EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA==",
-      "dependencies": {
-        "object-assign": "^4.1.1",
-        "util": "0.10.3"
-      }
-    },
-    "node_modules/assert-plus": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-      "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
-      "optional": true,
-      "engines": {
-        "node": ">=0.8"
-      }
-    },
-    "node_modules/assert/node_modules/inherits": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
-      "integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE="
-    },
-    "node_modules/assert/node_modules/util": {
-      "version": "0.10.3",
-      "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz",
-      "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=",
-      "dependencies": {
-        "inherits": "2.0.1"
-      }
-    },
-    "node_modules/assign-symbols": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz",
-      "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/astral-regex": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-1.0.0.tgz",
-      "integrity": "sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/async": {
-      "version": "1.5.2",
-      "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz",
-      "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo="
-    },
-    "node_modules/async-done": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/async-done/-/async-done-1.3.2.tgz",
-      "integrity": "sha512-uYkTP8dw2og1tu1nmza1n1CMW0qb8gWWlwqMmLb7MhBVs4BXrFziT6HXUd+/RlRA/i4H9AkofYloUbs1fwMqlw==",
-      "dependencies": {
-        "end-of-stream": "^1.1.0",
-        "once": "^1.3.2",
-        "process-nextick-args": "^2.0.0",
-        "stream-exhaust": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/async-each": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.3.tgz",
-      "integrity": "sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ=="
-    },
-    "node_modules/async-settle": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/async-settle/-/async-settle-1.0.0.tgz",
-      "integrity": "sha1-HQqRS7Aldb7IqPOnTlCA9yssDGs=",
-      "dependencies": {
-        "async-done": "^1.2.2"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/async-validator": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/async-validator/-/async-validator-1.8.5.tgz",
-      "integrity": "sha512-tXBM+1m056MAX0E8TL2iCjg8WvSyXu0Zc8LNtYqrVeyoL3+esHRZ4SieE9fKQyyU09uONjnMEjrNBMqT0mbvmA==",
-      "dependencies": {
-        "babel-runtime": "6.x"
-      }
-    },
-    "node_modules/asynckit": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
-    },
-    "node_modules/atob": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz",
-      "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==",
-      "bin": {
-        "atob": "bin/atob.js"
-      },
-      "engines": {
-        "node": ">= 4.5.0"
-      }
-    },
-    "node_modules/atob-lite": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/atob-lite/-/atob-lite-2.0.0.tgz",
-      "integrity": "sha1-D+9a1G8b16hQLGVyfwNn1e5D1pY="
-    },
-    "node_modules/autolinker": {
-      "version": "0.28.1",
-      "resolved": "https://registry.npmjs.org/autolinker/-/autolinker-0.28.1.tgz",
-      "integrity": "sha1-BlK0kYgYefB3XazgzcoyM5QqTkc=",
-      "dependencies": {
-        "gulp-header": "^1.7.1"
-      }
-    },
-    "node_modules/autolinker/node_modules/gulp-header": {
-      "version": "1.8.12",
-      "resolved": "https://registry.npmjs.org/gulp-header/-/gulp-header-1.8.12.tgz",
-      "integrity": "sha512-lh9HLdb53sC7XIZOYzTXM4lFuXElv3EVkSDhsd7DoJBj7hm+Ni7D3qYbb+Rr8DuM8nRanBvkVO9d7askreXGnQ==",
-      "deprecated": "Removed event-stream from gulp-header",
-      "dependencies": {
-        "concat-with-sourcemaps": "*",
-        "lodash.template": "^4.4.0",
-        "through2": "^2.0.0"
-      }
-    },
-    "node_modules/autolinker/node_modules/lodash.template": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-4.5.0.tgz",
-      "integrity": "sha512-84vYFxIkmidUiFxidA/KjjH9pAycqW+h980j7Fuz5qxRtO9pgB7MDFTdys1N7A5mcucRiDyEq4fusljItR1T/A==",
-      "dependencies": {
-        "lodash._reinterpolate": "^3.0.0",
-        "lodash.templatesettings": "^4.0.0"
-      }
-    },
-    "node_modules/autolinker/node_modules/lodash.templatesettings": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-4.2.0.tgz",
-      "integrity": "sha512-stgLz+i3Aa9mZgnjr/O+v9ruKZsPsndy7qPZOchbqk2cnTU1ZaldKK+v7m54WoKIyxiuMZTKT2H81F8BeAc3ZQ==",
-      "dependencies": {
-        "lodash._reinterpolate": "^3.0.0"
-      }
-    },
-    "node_modules/autoprefixer": {
-      "version": "9.7.6",
-      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.7.6.tgz",
-      "integrity": "sha512-F7cYpbN7uVVhACZTeeIeealwdGM6wMtfWARVLTy5xmKtgVdBNJvbDRoCK3YO1orcs7gv/KwYlb3iXwu9Ug9BkQ==",
-      "dependencies": {
-        "browserslist": "^4.11.1",
-        "caniuse-lite": "^1.0.30001039",
-        "chalk": "^2.4.2",
-        "normalize-range": "^0.1.2",
-        "num2fraction": "^1.2.2",
-        "postcss": "^7.0.27",
-        "postcss-value-parser": "^4.0.3"
-      },
-      "bin": {
-        "autoprefixer": "bin/autoprefixer"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      },
-      "funding": {
-        "type": "tidelift",
-        "url": "https://tidelift.com/funding/github/npm/autoprefixer"
-      }
-    },
-    "node_modules/aws-sign2": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
-      "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=",
-      "optional": true,
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/aws4": {
-      "version": "1.9.1",
-      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.9.1.tgz",
-      "integrity": "sha512-wMHVg2EOHaMRxbzgFJ9gtjOOCrI80OHLG14rxi28XwOW8ux6IiEbRCGGGqCtdAIg4FQCbW20k9RsT4y3gJlFug==",
-      "optional": true
-    },
-    "node_modules/axios": {
-      "version": "0.21.1",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.1.tgz",
-      "integrity": "sha512-dKQiRHxGD9PPRIUNIWvZhPTPpl1rf/OxTYKsqKUDjBwYylTvV7SjSHJb9ratfyzM6wCdLCOYLzs73qpg5c4iGA==",
-      "dependencies": {
-        "follow-redirects": "^1.10.0"
-      }
-    },
-    "node_modules/axios/node_modules/follow-redirects": {
-      "version": "1.13.2",
-      "resolved": "https://registry.npm.taobao.org/follow-redirects/download/follow-redirects-1.13.2.tgz?cache=0&sync_timestamp=1611606737937&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ffollow-redirects%2Fdownload%2Ffollow-redirects-1.13.2.tgz",
-      "integrity": "sha1-3XPI7/wScoulz0JZ12DqX7g+MUc=",
-      "funding": [
-        {
-          "type": "individual",
-          "url": "https://github.com/sponsors/RubenVerborgh"
-        }
-      ],
-      "engines": {
-        "node": ">=4.0"
-      },
-      "peerDependenciesMeta": {
-        "debug": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/babel-helper-vue-jsx-merge-props": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/babel-helper-vue-jsx-merge-props/-/babel-helper-vue-jsx-merge-props-2.0.3.tgz",
-      "integrity": "sha512-gsLiKK7Qrb7zYJNgiXKpXblxbV5ffSwR0f5whkPAaBAR4fhi6bwRZxX9wBlIc5M/v8CCkXUbXZL4N/nSE97cqg=="
-    },
-    "node_modules/babel-loader": {
-      "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.1.0.tgz",
-      "integrity": "sha512-7q7nC1tYOrqvUrN3LQK4GwSk/TQorZSOlO9C+RZDZpODgyN4ZlCqE5q9cDsyWOliN+aU9B4JX01xK9eJXowJLw==",
-      "dependencies": {
-        "find-cache-dir": "^2.1.0",
-        "loader-utils": "^1.4.0",
-        "mkdirp": "^0.5.3",
-        "pify": "^4.0.1",
-        "schema-utils": "^2.6.5"
-      },
-      "engines": {
-        "node": ">= 6.9"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0",
-        "webpack": ">=2"
-      }
-    },
-    "node_modules/babel-plugin-dynamic-import-node": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz",
-      "integrity": "sha512-jZVI+s9Zg3IqA/kdi0i6UDCybUI3aSBLnglhYbSSjKlV7yF1F/5LWv8MakQmvYpnbJDS6fcBL2KzHSxNCMtWSQ==",
-      "dependencies": {
-        "object.assign": "^4.1.0"
-      }
-    },
-    "node_modules/babel-polyfill": {
-      "version": "6.26.0",
-      "resolved": "https://registry.npm.taobao.org/babel-polyfill/download/babel-polyfill-6.26.0.tgz",
-      "integrity": "sha1-N5k3q8Z9eJWXCtxiHyhM2WbPIVM=",
-      "dependencies": {
-        "babel-runtime": "^6.26.0",
-        "core-js": "^2.5.0",
-        "regenerator-runtime": "^0.10.5"
-      }
-    },
-    "node_modules/babel-polyfill/node_modules/core-js": {
-      "version": "2.6.12",
-      "resolved": "https://registry.npm.taobao.org/core-js/download/core-js-2.6.12.tgz?cache=0&sync_timestamp=1611040749668&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcore-js%2Fdownload%2Fcore-js-2.6.12.tgz",
-      "integrity": "sha1-2TM9+nsGXjR8xWgiGdb2kIWcwuw=",
-      "deprecated": "core-js@<3.23.3 is no longer maintained and not recommended for usage due to the number of issues. Because of the V8 engine whims, feature detection in old core-js versions could cause a slowdown up to 100x even if nothing is polyfilled. Some versions have web compatibility issues. Please, upgrade your dependencies to the actual version of core-js.",
-      "hasInstallScript": true
-    },
-    "node_modules/babel-polyfill/node_modules/regenerator-runtime": {
-      "version": "0.10.5",
-      "resolved": "https://registry.npm.taobao.org/regenerator-runtime/download/regenerator-runtime-0.10.5.tgz",
-      "integrity": "sha1-M2w+/BIgrc7dosn6tntaeVWjNlg="
-    },
-    "node_modules/babel-runtime": {
-      "version": "6.26.0",
-      "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
-      "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=",
-      "dependencies": {
-        "core-js": "^2.4.0",
-        "regenerator-runtime": "^0.11.0"
-      }
-    },
-    "node_modules/babel-runtime/node_modules/core-js": {
-      "version": "2.6.11",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.11.tgz",
-      "integrity": "sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg==",
-      "deprecated": "core-js@<3.23.3 is no longer maintained and not recommended for usage due to the number of issues. Because of the V8 engine whims, feature detection in old core-js versions could cause a slowdown up to 100x even if nothing is polyfilled. Some versions have web compatibility issues. Please, upgrade your dependencies to the actual version of core-js.",
-      "hasInstallScript": true
-    },
-    "node_modules/babel-runtime/node_modules/regenerator-runtime": {
-      "version": "0.11.1",
-      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz",
-      "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg=="
-    },
-    "node_modules/bach": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/bach/-/bach-1.2.0.tgz",
-      "integrity": "sha1-Szzpa/JxNPeaG0FKUcFONMO9mIA=",
-      "dependencies": {
-        "arr-filter": "^1.1.1",
-        "arr-flatten": "^1.0.1",
-        "arr-map": "^2.0.0",
-        "array-each": "^1.0.0",
-        "array-initial": "^1.0.0",
-        "array-last": "^1.1.1",
-        "async-done": "^1.2.2",
-        "async-settle": "^1.0.0",
-        "now-and-later": "^2.0.0"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/bail": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/bail/-/bail-1.0.5.tgz",
-      "integrity": "sha512-xFbRxM1tahm08yHBP16MMjVUAvDaBMD38zsM9EMAUN61omwLmKlOpB/Zku5QkjZ8TZ4vn53pj+t518cH0S03RQ==",
-      "dev": true,
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
-      }
-    },
-    "node_modules/balanced-match": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
-      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c="
-    },
-    "node_modules/base": {
-      "version": "0.11.2",
-      "resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
-      "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
-      "dependencies": {
-        "cache-base": "^1.0.1",
-        "class-utils": "^0.3.5",
-        "component-emitter": "^1.2.1",
-        "define-property": "^1.0.0",
-        "isobject": "^3.0.1",
-        "mixin-deep": "^1.2.0",
-        "pascalcase": "^0.1.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/base/node_modules/define-property": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-      "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-      "dependencies": {
-        "is-descriptor": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/base/node_modules/is-accessor-descriptor": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-      "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
-      "dependencies": {
-        "kind-of": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/base/node_modules/is-data-descriptor": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-      "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
-      "dependencies": {
-        "kind-of": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/base/node_modules/is-descriptor": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-      "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-      "dependencies": {
-        "is-accessor-descriptor": "^1.0.0",
-        "is-data-descriptor": "^1.0.0",
-        "kind-of": "^6.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/base/node_modules/isobject": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/base64-js": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.1.tgz",
-      "integrity": "sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g=="
-    },
-    "node_modules/bcrypt-pbkdf": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
-      "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=",
-      "optional": true,
-      "dependencies": {
-        "tweetnacl": "^0.14.3"
-      }
-    },
-    "node_modules/beeper": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/beeper/-/beeper-1.1.1.tgz",
-      "integrity": "sha1-5tXqjF2tABMEpwsiY4RH9pyy+Ak=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/before-after-hook": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/before-after-hook/-/before-after-hook-2.1.0.tgz",
-      "integrity": "sha512-IWIbu7pMqyw3EAJHzzHbWa85b6oud/yfKYg5rqB5hNE8CeMi3nX+2C2sj0HswfblST86hpVEOAb9x34NZd6P7A=="
-    },
-    "node_modules/better-console": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/better-console/-/better-console-1.0.1.tgz",
-      "integrity": "sha1-mjNh+fRc2vr/pdh9Yv1Jt/jb8ys=",
-      "dependencies": {
-        "chalk": "^1.1.3",
-        "cli-table": "~0.3.1"
-      }
-    },
-    "node_modules/better-console/node_modules/ansi-styles": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-      "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/better-console/node_modules/chalk": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-      "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-      "dependencies": {
-        "ansi-styles": "^2.2.1",
-        "escape-string-regexp": "^1.0.2",
-        "has-ansi": "^2.0.0",
-        "strip-ansi": "^3.0.0",
-        "supports-color": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/better-console/node_modules/supports-color": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-      "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
-    "node_modules/big.js": {
-      "version": "5.2.2",
-      "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz",
-      "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==",
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/binary-extensions": {
-      "version": "1.13.1",
-      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz",
-      "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/binaryextensions": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/binaryextensions/-/binaryextensions-2.2.0.tgz",
-      "integrity": "sha512-bHhs98rj/7i/RZpCSJ3uk55pLXOItjIrh2sRQZSM6OoktScX+LxJzvlU+FELp9j3TdcddTmmYArLSGptCTwjuw==",
-      "engines": {
-        "node": ">=0.8"
-      },
-      "funding": {
-        "url": "https://bevry.me/fund"
-      }
-    },
-    "node_modules/bindings": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz",
-      "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==",
-      "optional": true,
-      "dependencies": {
-        "file-uri-to-path": "1.0.0"
-      }
-    },
-    "node_modules/bluebird": {
-      "version": "3.7.2",
-      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz",
-      "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg=="
-    },
-    "node_modules/blueimp-md5": {
-      "version": "2.18.0",
-      "resolved": "https://registry.npm.taobao.org/blueimp-md5/download/blueimp-md5-2.18.0.tgz",
-      "integrity": "sha1-EVK+EzXwxrORHtnjbbVPPmrFKTU="
-    },
-    "node_modules/bn.js": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.1.1.tgz",
-      "integrity": "sha512-IUTD/REb78Z2eodka1QZyyEk66pciRcP6Sroka0aI3tG/iwIdYLrBD62RsubR7vqdt3WyX8p4jxeatzmRSphtA=="
-    },
-    "node_modules/boolbase": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
-      "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24="
-    },
-    "node_modules/brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "dependencies": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
-      }
-    },
-    "node_modules/braces": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
-      "dependencies": {
-        "fill-range": "^7.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/brorand": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz",
-      "integrity": "sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8="
-    },
-    "node_modules/browserify-aes": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz",
-      "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==",
-      "dependencies": {
-        "buffer-xor": "^1.0.3",
-        "cipher-base": "^1.0.0",
-        "create-hash": "^1.1.0",
-        "evp_bytestokey": "^1.0.3",
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.0.1"
-      }
-    },
-    "node_modules/browserify-cipher": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.1.tgz",
-      "integrity": "sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==",
-      "dependencies": {
-        "browserify-aes": "^1.0.4",
-        "browserify-des": "^1.0.0",
-        "evp_bytestokey": "^1.0.0"
-      }
-    },
-    "node_modules/browserify-des": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.2.tgz",
-      "integrity": "sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==",
-      "dependencies": {
-        "cipher-base": "^1.0.1",
-        "des.js": "^1.0.0",
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.1.2"
-      }
-    },
-    "node_modules/browserify-rsa": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz",
-      "integrity": "sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=",
-      "dependencies": {
-        "bn.js": "^4.1.0",
-        "randombytes": "^2.0.1"
-      }
-    },
-    "node_modules/browserify-rsa/node_modules/bn.js": {
-      "version": "4.11.8",
-      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz",
-      "integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA=="
-    },
-    "node_modules/browserify-sign": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.1.0.tgz",
-      "integrity": "sha512-VYxo7cDCeYUoBZ0ZCy4UyEUCP3smyBd4DRQM5nrFS1jJjPJjX7rP3oLRpPoWfkhQfyJ0I9ZbHbKafrFD/SGlrg==",
-      "dependencies": {
-        "bn.js": "^5.1.1",
-        "browserify-rsa": "^4.0.1",
-        "create-hash": "^1.2.0",
-        "create-hmac": "^1.1.7",
-        "elliptic": "^6.5.2",
-        "inherits": "^2.0.4",
-        "parse-asn1": "^5.1.5",
-        "readable-stream": "^3.6.0"
-      }
-    },
-    "node_modules/browserify-sign/node_modules/readable-stream": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-      "dependencies": {
-        "inherits": "^2.0.3",
-        "string_decoder": "^1.1.1",
-        "util-deprecate": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/browserify-zlib": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.2.0.tgz",
-      "integrity": "sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==",
-      "dependencies": {
-        "pako": "~1.0.5"
-      }
-    },
-    "node_modules/browserslist": {
-      "version": "4.12.0",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.12.0.tgz",
-      "integrity": "sha512-UH2GkcEDSI0k/lRkuDSzFl9ZZ87skSy9w2XAn1MsZnL+4c4rqbBd3e82UWHbYDpztABrPBhZsTEeuxVfHppqDg==",
-      "dependencies": {
-        "caniuse-lite": "^1.0.30001043",
-        "electron-to-chromium": "^1.3.413",
-        "node-releases": "^1.1.53",
-        "pkg-up": "^2.0.0"
-      },
-      "bin": {
-        "browserslist": "cli.js"
-      },
-      "funding": {
-        "type": "tidelift",
-        "url": "https://tidelift.com/funding/github/npm/browserslist"
-      }
-    },
-    "node_modules/btoa": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/btoa/-/btoa-1.2.1.tgz",
-      "integrity": "sha512-SB4/MIGlsiVkMcHmT+pSmIPoNDoHg+7cMzmt3Uxt628MTz2487DKSqK/fuhFBrkuqrYv5UCEnACpF4dTFNKc/g==",
-      "bin": {
-        "btoa": "bin/btoa.js"
-      },
-      "engines": {
-        "node": ">= 0.4.0"
-      }
-    },
-    "node_modules/btoa-lite": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/btoa-lite/-/btoa-lite-1.0.0.tgz",
-      "integrity": "sha1-M3dm2hWAEhD92VbCLpxokaudAzc="
-    },
-    "node_modules/buffer": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz",
-      "integrity": "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ],
-      "dependencies": {
-        "base64-js": "^1.3.1",
-        "ieee754": "^1.2.1"
-      }
-    },
-    "node_modules/buffer-equal": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/buffer-equal/-/buffer-equal-1.0.0.tgz",
-      "integrity": "sha1-WWFrSYME1Var1GaWayLu2j7KX74=",
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/buffer-from": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz",
-      "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A=="
-    },
-    "node_modules/buffer-xor": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz",
-      "integrity": "sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk="
-    },
-    "node_modules/buffer/node_modules/ieee754": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
-      "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ]
-    },
-    "node_modules/builtin-status-codes": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz",
-      "integrity": "sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug="
-    },
-    "node_modules/cacache": {
-      "version": "15.0.3",
-      "resolved": "https://registry.npmjs.org/cacache/-/cacache-15.0.3.tgz",
-      "integrity": "sha512-bc3jKYjqv7k4pWh7I/ixIjfcjPul4V4jme/WbjvwGS5LzoPL/GzXr4C5EgPNLO/QEZl9Oi61iGitYEdwcrwLCQ==",
-      "dependencies": {
-        "chownr": "^2.0.0",
-        "fs-minipass": "^2.0.0",
-        "glob": "^7.1.4",
-        "infer-owner": "^1.0.4",
-        "lru-cache": "^5.1.1",
-        "minipass": "^3.1.1",
-        "minipass-collect": "^1.0.2",
-        "minipass-flush": "^1.0.5",
-        "minipass-pipeline": "^1.2.2",
-        "mkdirp": "^1.0.3",
-        "move-file": "^2.0.0",
-        "p-map": "^4.0.0",
-        "promise-inflight": "^1.0.1",
-        "rimraf": "^3.0.2",
-        "ssri": "^8.0.0",
-        "tar": "^6.0.2",
-        "unique-filename": "^1.1.1"
-      },
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/cacache/node_modules/lru-cache": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
-      "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
-      "dependencies": {
-        "yallist": "^3.0.2"
-      }
-    },
-    "node_modules/cacache/node_modules/mkdirp": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
-      "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
-      "bin": {
-        "mkdirp": "bin/cmd.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/cacache/node_modules/p-map": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz",
-      "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==",
-      "dependencies": {
-        "aggregate-error": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/cacache/node_modules/rimraf": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
-      "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
-      "dependencies": {
-        "glob": "^7.1.3"
-      },
-      "bin": {
-        "rimraf": "bin.js"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/cacache/node_modules/yallist": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
-      "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g=="
-    },
-    "node_modules/cache-base": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz",
-      "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==",
-      "dependencies": {
-        "collection-visit": "^1.0.0",
-        "component-emitter": "^1.2.1",
-        "get-value": "^2.0.6",
-        "has-value": "^1.0.0",
-        "isobject": "^3.0.1",
-        "set-value": "^2.0.0",
-        "to-object-path": "^0.3.0",
-        "union-value": "^1.0.0",
-        "unset-value": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/cache-base/node_modules/isobject": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/caller-callsite": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/caller-callsite/-/caller-callsite-2.0.0.tgz",
-      "integrity": "sha1-hH4PzgoiN1CpoCfFSzNzGtMVQTQ=",
-      "dependencies": {
-        "callsites": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/caller-path": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/caller-path/-/caller-path-2.0.0.tgz",
-      "integrity": "sha1-Ro+DBE42mrIBD6xfBs7uFbsssfQ=",
-      "dependencies": {
-        "caller-callsite": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/callsites": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/callsites/-/callsites-2.0.0.tgz",
-      "integrity": "sha1-BuuE8A7qQT2oav/vrL/7Ngk7PFA=",
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/camel-case": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/camel-case/-/camel-case-3.0.0.tgz",
-      "integrity": "sha1-yjw2iKTpzzpM2nd9xNy8cTJJz3M=",
-      "dependencies": {
-        "no-case": "^2.2.0",
-        "upper-case": "^1.1.1"
-      }
-    },
-    "node_modules/camelcase": {
-      "version": "5.3.1",
-      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
-      "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/camelcase-keys": {
-      "version": "6.2.2",
-      "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-6.2.2.tgz",
-      "integrity": "sha512-YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg==",
-      "dev": true,
-      "dependencies": {
-        "camelcase": "^5.3.1",
-        "map-obj": "^4.0.0",
-        "quick-lru": "^4.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/caniuse-api": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/caniuse-api/-/caniuse-api-3.0.0.tgz",
-      "integrity": "sha512-bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==",
-      "dependencies": {
-        "browserslist": "^4.0.0",
-        "caniuse-lite": "^1.0.0",
-        "lodash.memoize": "^4.1.2",
-        "lodash.uniq": "^4.5.0"
-      }
-    },
-    "node_modules/caniuse-lite": {
-      "version": "1.0.30001203",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001203.tgz",
-      "integrity": "sha512-/I9tvnzU/PHMH7wBPrfDMSuecDeUKerjCPX7D0xBbaJZPxoT9m+yYxt0zCTkcijCkjTdim3H56Zm0i5Adxch4w=="
-    },
-    "node_modules/caseless": {
-      "version": "0.12.0",
-      "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
-      "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=",
-      "optional": true
-    },
-    "node_modules/ccount": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/ccount/-/ccount-1.0.5.tgz",
-      "integrity": "sha512-MOli1W+nfbPLlKEhInaxhRdp7KVLFxLN5ykwzHgLsLI3H3gs5jjFAK4Eoj3OzzcxCtumDaI8onoVDeQyWaNTkw==",
-      "dev": true,
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
-      }
-    },
-    "node_modules/center-align": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz",
-      "integrity": "sha1-qg0yYptu6XIgBBHL1EYckHvCt60=",
-      "dependencies": {
-        "align-text": "^0.1.3",
-        "lazy-cache": "^1.0.3"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/cfb": {
-      "version": "1.2.1",
-      "resolved": "https://registry.nlark.com/cfb/download/cfb-1.2.1.tgz",
-      "integrity": "sha1-IJQp5MaO/TBkH2/HSy1gKL0gJAI=",
-      "dependencies": {
-        "adler-32": "~1.3.0",
-        "crc-32": "~1.2.0",
-        "printj": "~1.3.0"
-      },
-      "engines": {
-        "node": ">=0.8"
-      }
-    },
-    "node_modules/cfb/node_modules/adler-32": {
-      "version": "1.3.0",
-      "resolved": "https://registry.nlark.com/adler-32/download/adler-32-1.3.0.tgz",
-      "integrity": "sha1-PK0bcc36afbIqR8+NhXTGk/e3HI=",
-      "dependencies": {
-        "printj": "~1.2.2"
-      },
-      "engines": {
-        "node": ">=0.8"
-      }
-    },
-    "node_modules/cfb/node_modules/adler-32/node_modules/printj": {
-      "version": "1.2.3",
-      "resolved": "https://registry.nlark.com/printj/download/printj-1.2.3.tgz",
-      "integrity": "sha1-LPsrGSoeU4XbvltGZYrDSqgoUIo=",
-      "bin": {
-        "printj": "bin/printj.njs"
-      },
-      "engines": {
-        "node": ">=0.8"
-      }
-    },
-    "node_modules/cfb/node_modules/printj": {
-      "version": "1.3.0",
-      "resolved": "https://registry.nlark.com/printj/download/printj-1.3.0.tgz",
-      "integrity": "sha1-kBipGKeQ5DcH8QYl1uEBh6Nnz/Y=",
-      "bin": {
-        "printj": "bin/printj.njs"
-      },
-      "engines": {
-        "node": ">=0.8"
-      }
-    },
-    "node_modules/chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-      "dependencies": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/character-entities": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/character-entities/-/character-entities-1.2.4.tgz",
-      "integrity": "sha512-iBMyeEHxfVnIakwOuDXpVkc54HijNgCyQB2w0VfGQThle6NXn50zU6V/u+LDhxHcDUPojn6Kpga3PTAD8W1bQw==",
-      "dev": true,
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
-      }
-    },
-    "node_modules/character-entities-html4": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/character-entities-html4/-/character-entities-html4-1.1.4.tgz",
-      "integrity": "sha512-HRcDxZuZqMx3/a+qrzxdBKBPUpxWEq9xw2OPZ3a/174ihfrQKVsFhqtthBInFy1zZ9GgZyFXOatNujm8M+El3g==",
-      "dev": true,
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
-      }
-    },
-    "node_modules/character-entities-legacy": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/character-entities-legacy/-/character-entities-legacy-1.1.4.tgz",
-      "integrity": "sha512-3Xnr+7ZFS1uxeiUDvV02wQ+QDbc55o97tIV5zHScSPJpcLm/r0DFPcoY3tYRp+VZukxuMeKgXYmsXQHO05zQeA==",
-      "dev": true,
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
-      }
-    },
-    "node_modules/character-reference-invalid": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/character-reference-invalid/-/character-reference-invalid-1.1.4.tgz",
-      "integrity": "sha512-mKKUkUbhPpQlCOfIuZkvSEgktjPFIsZKRRbC6KWVEMvlzblj3i3asQv5ODsrwt0N3pHAEvjP8KTQPHkp0+6jOg==",
-      "dev": true,
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
-      }
-    },
-    "node_modules/chardet": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz",
-      "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA=="
-    },
-    "node_modules/chokidar": {
-      "version": "2.1.8",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz",
-      "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==",
-      "deprecated": "Chokidar 2 does not receive security updates since 2019. Upgrade to chokidar 3 with 15x fewer dependencies",
-      "dependencies": {
-        "anymatch": "^2.0.0",
-        "async-each": "^1.0.1",
-        "braces": "^2.3.2",
-        "glob-parent": "^3.1.0",
-        "inherits": "^2.0.3",
-        "is-binary-path": "^1.0.0",
-        "is-glob": "^4.0.0",
-        "normalize-path": "^3.0.0",
-        "path-is-absolute": "^1.0.0",
-        "readdirp": "^2.2.1",
-        "upath": "^1.1.1"
-      },
-      "optionalDependencies": {
-        "fsevents": "^1.2.7"
-      }
-    },
-    "node_modules/chokidar/node_modules/braces": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-      "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-      "dependencies": {
-        "arr-flatten": "^1.1.0",
-        "array-unique": "^0.3.2",
-        "extend-shallow": "^2.0.1",
-        "fill-range": "^4.0.0",
-        "isobject": "^3.0.1",
-        "repeat-element": "^1.1.2",
-        "snapdragon": "^0.8.1",
-        "snapdragon-node": "^2.0.1",
-        "split-string": "^3.0.2",
-        "to-regex": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/chokidar/node_modules/extend-shallow": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-      "dependencies": {
-        "is-extendable": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/chokidar/node_modules/fill-range": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-      "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
-      "dependencies": {
-        "extend-shallow": "^2.0.1",
-        "is-number": "^3.0.0",
-        "repeat-string": "^1.6.1",
-        "to-regex-range": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/chokidar/node_modules/glob-parent": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
-      "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
-      "dependencies": {
-        "is-glob": "^3.1.0",
-        "path-dirname": "^1.0.0"
-      }
-    },
-    "node_modules/chokidar/node_modules/glob-parent/node_modules/is-glob": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
-      "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
-      "dependencies": {
-        "is-extglob": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/chokidar/node_modules/is-number": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-      "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/chokidar/node_modules/isobject": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/chokidar/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/chokidar/node_modules/to-regex-range": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
-      "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
-      "dependencies": {
-        "is-number": "^3.0.0",
-        "repeat-string": "^1.6.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/chownr": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz",
-      "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==",
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/chrome-trace-event": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.2.tgz",
-      "integrity": "sha512-9e/zx1jw7B4CO+c/RXoCsfg/x1AfUBioy4owYH0bJprEYAx5hRFLRhWBqHAG57D0ZM4H7vxbP7bPe0VwhQRYDQ==",
-      "dependencies": {
-        "tslib": "^1.9.0"
-      },
-      "engines": {
-        "node": ">=6.0"
-      }
-    },
-    "node_modules/cipher-base": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz",
-      "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==",
-      "dependencies": {
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.0.1"
-      }
-    },
-    "node_modules/class-utils": {
-      "version": "0.3.6",
-      "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz",
-      "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==",
-      "dependencies": {
-        "arr-union": "^3.1.0",
-        "define-property": "^0.2.5",
-        "isobject": "^3.0.0",
-        "static-extend": "^0.1.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/class-utils/node_modules/define-property": {
-      "version": "0.2.5",
-      "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-      "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-      "dependencies": {
-        "is-descriptor": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/class-utils/node_modules/isobject": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/classnames": {
-      "version": "2.2.6",
-      "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.2.6.tgz",
-      "integrity": "sha512-JR/iSQOSt+LQIWwrwEzJ9uk0xfN3mTVYMwt1Ir5mUcSN6pU+V4zQFFaJsclJbPuAUQH+yfWef6tm7l1quW3C8Q=="
-    },
-    "node_modules/clean-css": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.2.1.tgz",
-      "integrity": "sha512-4ZxI6dy4lrY6FHzfiy1aEOXgu4LIsW2MhwG0VBKdcoGoH/XLFgaHSdLTGr4O8Be6A8r3MOphEiI8Gc1n0ecf3g==",
-      "dependencies": {
-        "source-map": "~0.6.0"
-      },
-      "engines": {
-        "node": ">= 4.0"
-      }
-    },
-    "node_modules/clean-css/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/clean-stack": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz",
-      "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/cli-cursor": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz",
-      "integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=",
-      "dependencies": {
-        "restore-cursor": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/cli-table": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/cli-table/-/cli-table-0.3.1.tgz",
-      "integrity": "sha1-9TsFJmqLGguTSz0IIebi3FkUriM=",
-      "dependencies": {
-        "colors": "1.0.3"
-      },
-      "engines": {
-        "node": ">= 0.2.0"
-      }
-    },
-    "node_modules/cli-width": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.1.tgz",
-      "integrity": "sha512-GRMWDxpOB6Dgk2E5Uo+3eEBvtOOlimMmpbFiKuLFnQzYDavtLFY3K5ona41jgN/WdRZtG7utuVSVTL4HbZHGkw=="
-    },
-    "node_modules/clipboard": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/clipboard/-/clipboard-2.0.6.tgz",
-      "integrity": "sha512-g5zbiixBRk/wyKakSwCKd7vQXDjFnAMGHoEyBogG/bw9kTD9GvdAvaoRR1ALcEzt3pVKxZR0pViekPMIS0QyGg==",
-      "dependencies": {
-        "good-listener": "^1.2.2",
-        "select": "^1.1.2",
-        "tiny-emitter": "^2.0.0"
-      }
-    },
-    "node_modules/cliui": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
-      "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
-      "dependencies": {
-        "string-width": "^1.0.1",
-        "strip-ansi": "^3.0.1",
-        "wrap-ansi": "^2.0.0"
-      }
-    },
-    "node_modules/clone": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz",
-      "integrity": "sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18=",
-      "engines": {
-        "node": ">=0.8"
-      }
-    },
-    "node_modules/clone-buffer": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/clone-buffer/-/clone-buffer-1.0.0.tgz",
-      "integrity": "sha1-4+JbIHrE5wGvch4staFnksrD3Fg=",
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/clone-regexp": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/clone-regexp/-/clone-regexp-2.2.0.tgz",
-      "integrity": "sha512-beMpP7BOtTipFuW8hrJvREQ2DrRu3BE7by0ZpibtfBA+qfHYvMGTc2Yb1JMYPKg/JUw0CHYvpg796aNTSW9z7Q==",
-      "dev": true,
-      "dependencies": {
-        "is-regexp": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/clone-regexp/node_modules/is-regexp": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-regexp/-/is-regexp-2.1.0.tgz",
-      "integrity": "sha512-OZ4IlER3zmRIoB9AqNhEggVxqIH4ofDns5nRrPS6yQxXE1TPCUpFznBfRQmQa8uC+pXqjMnukiJBxCisIxiLGA==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/clone-stats": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-1.0.0.tgz",
-      "integrity": "sha1-s3gt/4u1R04Yuba/D9/ngvh3doA="
-    },
-    "node_modules/cloneable-readable": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/cloneable-readable/-/cloneable-readable-1.1.3.tgz",
-      "integrity": "sha512-2EF8zTQOxYq70Y4XKtorQupqF0m49MBz2/yf5Bj+MHjvpG3Hy7sImifnqD6UA+TKYxeSV+u6qqQPawN5UvnpKQ==",
-      "dependencies": {
-        "inherits": "^2.0.1",
-        "process-nextick-args": "^2.0.0",
-        "readable-stream": "^2.3.5"
-      }
-    },
-    "node_modules/coa": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/coa/-/coa-2.0.2.tgz",
-      "integrity": "sha512-q5/jG+YQnSy4nRTV4F7lPepBJZ8qBNJJDBuJdoejDyLXgmL7IEo+Le2JDZudFTFt7mrCqIRaSjws4ygRCTCAXA==",
-      "dependencies": {
-        "@types/q": "^1.5.1",
-        "chalk": "^2.4.1",
-        "q": "^1.1.2"
-      },
-      "engines": {
-        "node": ">= 4.0"
-      }
-    },
-    "node_modules/code-point-at": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
-      "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/codepage": {
-      "version": "1.15.0",
-      "resolved": "https://registry.nlark.com/codepage/download/codepage-1.15.0.tgz",
-      "integrity": "sha1-LgBRkCSzlCTsZu6z7AcifmkmGKs=",
-      "engines": {
-        "node": ">=0.8"
-      }
-    },
-    "node_modules/collapse-white-space": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/collapse-white-space/-/collapse-white-space-1.0.6.tgz",
-      "integrity": "sha512-jEovNnrhMuqyCcjfEJA56v0Xq8SkIoPKDyaHahwo3POf4qcSXqMYuwNcOTzp74vTsR9Tn08z4MxWqAhcekogkQ==",
-      "dev": true,
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
-      }
-    },
-    "node_modules/collection-map": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/collection-map/-/collection-map-1.0.0.tgz",
-      "integrity": "sha1-rqDwb40mx4DCt1SUOFVEsiVa8Yw=",
-      "dependencies": {
-        "arr-map": "^2.0.2",
-        "for-own": "^1.0.0",
-        "make-iterator": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/collection-visit": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz",
-      "integrity": "sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=",
-      "dependencies": {
-        "map-visit": "^1.0.0",
-        "object-visit": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/color": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/color/-/color-3.1.2.tgz",
-      "integrity": "sha512-vXTJhHebByxZn3lDvDJYw4lR5+uB3vuoHsuYA5AKuxRVn5wzzIfQKGLBmgdVRHKTJYeK5rvJcHnrd0Li49CFpg==",
-      "dependencies": {
-        "color-convert": "^1.9.1",
-        "color-string": "^1.5.2"
-      }
-    },
-    "node_modules/color-convert": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-      "dependencies": {
-        "color-name": "1.1.3"
-      }
-    },
-    "node_modules/color-name": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
-    },
-    "node_modules/color-string": {
-      "version": "1.5.3",
-      "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.5.3.tgz",
-      "integrity": "sha512-dC2C5qeWoYkxki5UAXapdjqO672AM4vZuPGRQfO8b5HKuKGBbKWpITyDYN7TOFKvRW7kOgAn3746clDBMDJyQw==",
-      "dependencies": {
-        "color-name": "^1.0.0",
-        "simple-swizzle": "^0.2.2"
-      }
-    },
-    "node_modules/color-support": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz",
-      "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==",
-      "bin": {
-        "color-support": "bin.js"
-      }
-    },
-    "node_modules/colors": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/colors/-/colors-1.0.3.tgz",
-      "integrity": "sha1-BDP0TYCWgP3rYO0mDxsMJi6CpAs=",
-      "engines": {
-        "node": ">=0.1.90"
-      }
-    },
-    "node_modules/combined-stream": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
-      "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
-      "dependencies": {
-        "delayed-stream": "~1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/commander": {
-      "version": "2.20.3",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
-      "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ=="
-    },
-    "node_modules/commondir": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
-      "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs="
-    },
-    "node_modules/component-emitter": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz",
-      "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg=="
-    },
-    "node_modules/concat-map": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
-    },
-    "node_modules/concat-stream": {
-      "version": "1.6.2",
-      "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz",
-      "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==",
-      "engines": [
-        "node >= 0.8"
-      ],
-      "dependencies": {
-        "buffer-from": "^1.0.0",
-        "inherits": "^2.0.3",
-        "readable-stream": "^2.2.2",
-        "typedarray": "^0.0.6"
-      }
-    },
-    "node_modules/concat-with-sourcemaps": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/concat-with-sourcemaps/-/concat-with-sourcemaps-1.1.0.tgz",
-      "integrity": "sha512-4gEjHJFT9e+2W/77h/DS5SGUgwDaOwprX8L/gl5+3ixnzkVJJsZWDSelmN3Oilw3LNDZjZV0yqH1hLG3k6nghg==",
-      "dependencies": {
-        "source-map": "^0.6.1"
-      }
-    },
-    "node_modules/concat-with-sourcemaps/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/config-chain": {
-      "version": "1.1.12",
-      "resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.12.tgz",
-      "integrity": "sha512-a1eOIcu8+7lUInge4Rpf/n4Krkf3Dd9lqhljRzII1/Zno/kRtUWnznPO3jOKBmTEktkt3fkxisUcivoj0ebzoA==",
-      "dependencies": {
-        "ini": "^1.3.4",
-        "proto-list": "~1.2.1"
-      }
-    },
-    "node_modules/confusing-browser-globals": {
-      "version": "1.0.9",
-      "resolved": "https://registry.npmjs.org/confusing-browser-globals/-/confusing-browser-globals-1.0.9.tgz",
-      "integrity": "sha512-KbS1Y0jMtyPgIxjO7ZzMAuUpAKMt1SzCL9fsrKsX6b0zJPTaT0SiSPmewwVZg9UAO83HVIlEhZF84LIjZ0lmAw==",
-      "dev": true
-    },
-    "node_modules/console-browserify": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.2.0.tgz",
-      "integrity": "sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA=="
-    },
-    "node_modules/consolidate": {
-      "version": "0.15.1",
-      "resolved": "https://registry.npmjs.org/consolidate/-/consolidate-0.15.1.tgz",
-      "integrity": "sha512-DW46nrsMJgy9kqAbPt5rKaCr7uFtpo4mSUvLHIUbJEjm0vo+aY5QLwBUq3FK4tRnJr/X0Psc0C4jf/h+HtXSMw==",
-      "dependencies": {
-        "bluebird": "^3.1.1"
-      },
-      "engines": {
-        "node": ">= 0.10.0"
-      }
-    },
-    "node_modules/constants-browserify": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz",
-      "integrity": "sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U="
-    },
-    "node_modules/contains-path": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/contains-path/-/contains-path-0.1.0.tgz",
-      "integrity": "sha1-/ozxhP9mcLa67wGp1IYaXL7EEgo=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/convert-source-map": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.7.0.tgz",
-      "integrity": "sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==",
-      "dependencies": {
-        "safe-buffer": "~5.1.1"
-      }
-    },
-    "node_modules/cookie": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.1.tgz",
-      "integrity": "sha512-ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA==",
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/copy-concurrently": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/copy-concurrently/-/copy-concurrently-1.0.5.tgz",
-      "integrity": "sha512-f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A==",
-      "dependencies": {
-        "aproba": "^1.1.1",
-        "fs-write-stream-atomic": "^1.0.8",
-        "iferr": "^0.1.5",
-        "mkdirp": "^0.5.1",
-        "rimraf": "^2.5.4",
-        "run-queue": "^1.0.0"
-      }
-    },
-    "node_modules/copy-descriptor": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz",
-      "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/copy-props": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/copy-props/-/copy-props-2.0.4.tgz",
-      "integrity": "sha512-7cjuUME+p+S3HZlbllgsn2CDwS+5eCCX16qBgNC4jgSTf49qR1VKy/Zhl400m0IQXl/bPGEVqncgUUMjrr4s8A==",
-      "dependencies": {
-        "each-props": "^1.3.0",
-        "is-plain-object": "^2.0.1"
-      }
-    },
-    "node_modules/copy-props/node_modules/is-plain-object": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
-      "dependencies": {
-        "isobject": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/copy-props/node_modules/isobject": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/core-js": {
-      "version": "3.6.5",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.6.5.tgz",
-      "integrity": "sha512-vZVEEwZoIsI+vPEuoF9Iqf5H7/M3eeQqWlQnYa8FSKKePuYTf5MWnxb5SDAzCa60b3JBRS5g9b+Dq7b1y/RCrA==",
-      "deprecated": "core-js@<3.23.3 is no longer maintained and not recommended for usage due to the number of issues. Because of the V8 engine whims, feature detection in old core-js versions could cause a slowdown up to 100x even if nothing is polyfilled. Some versions have web compatibility issues. Please, upgrade your dependencies to the actual version of core-js.",
-      "hasInstallScript": true,
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/core-js"
-      }
-    },
-    "node_modules/core-js-compat": {
-      "version": "3.6.5",
-      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.6.5.tgz",
-      "integrity": "sha512-7ItTKOhOZbznhXAQ2g/slGg1PJV5zDO/WdkTwi7UEOJmkvsE32PWvx6mKtDjiMpjnR2CNf6BAD6sSxIlv7ptng==",
-      "dependencies": {
-        "browserslist": "^4.8.5",
-        "semver": "7.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/core-js"
-      }
-    },
-    "node_modules/core-js-compat/node_modules/semver": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.0.0.tgz",
-      "integrity": "sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==",
-      "bin": {
-        "semver": "bin/semver.js"
-      }
-    },
-    "node_modules/core-js-pure": {
-      "version": "3.16.3",
-      "resolved": "https://registry.nlark.com/core-js-pure/download/core-js-pure-3.16.3.tgz",
-      "integrity": "sha1-Qcy5tgJ1NfjdUaCvAEwcfwqMnKc=",
-      "deprecated": "core-js-pure@<3.23.3 is no longer maintained and not recommended for usage due to the number of issues. Because of the V8 engine whims, feature detection in old core-js versions could cause a slowdown up to 100x even if nothing is polyfilled. Some versions have web compatibility issues. Please, upgrade your dependencies to the actual version of core-js-pure.",
-      "hasInstallScript": true,
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/core-js"
-      }
-    },
-    "node_modules/core-util-is": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
-    },
-    "node_modules/cosmiconfig": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-5.2.1.tgz",
-      "integrity": "sha512-H65gsXo1SKjf8zmrJ67eJk8aIRKV5ff2D4uKZIBZShbhGSpEmsQOPW/SKMKYhSTrqR7ufy6RP69rPogdaPh/kA==",
-      "dependencies": {
-        "import-fresh": "^2.0.0",
-        "is-directory": "^0.3.1",
-        "js-yaml": "^3.13.1",
-        "parse-json": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/crc-32": {
-      "version": "1.2.0",
-      "resolved": "https://registry.nlark.com/crc-32/download/crc-32-1.2.0.tgz",
-      "integrity": "sha1-yy224puIUI4y2d0OwWk+e0Ghggg=",
-      "dependencies": {
-        "exit-on-epipe": "~1.0.1",
-        "printj": "~1.1.0"
-      },
-      "bin": {
-        "crc32": "bin/crc32.njs"
-      },
-      "engines": {
-        "node": ">=0.8"
-      }
-    },
-    "node_modules/create-ecdh": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.3.tgz",
-      "integrity": "sha512-GbEHQPMOswGpKXM9kCWVrremUcBmjteUaQ01T9rkKCPDXfUHX0IoP9LpHYo2NPFampa4e+/pFDc3jQdxrxQLaw==",
-      "dependencies": {
-        "bn.js": "^4.1.0",
-        "elliptic": "^6.0.0"
-      }
-    },
-    "node_modules/create-ecdh/node_modules/bn.js": {
-      "version": "4.11.8",
-      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz",
-      "integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA=="
-    },
-    "node_modules/create-hash": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz",
-      "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==",
-      "dependencies": {
-        "cipher-base": "^1.0.1",
-        "inherits": "^2.0.1",
-        "md5.js": "^1.3.4",
-        "ripemd160": "^2.0.1",
-        "sha.js": "^2.4.0"
-      }
-    },
-    "node_modules/create-hmac": {
-      "version": "1.1.7",
-      "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz",
-      "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==",
-      "dependencies": {
-        "cipher-base": "^1.0.3",
-        "create-hash": "^1.1.0",
-        "inherits": "^2.0.1",
-        "ripemd160": "^2.0.0",
-        "safe-buffer": "^5.0.1",
-        "sha.js": "^2.4.8"
-      }
-    },
-    "node_modules/create-react-class": {
-      "version": "15.7.0",
-      "resolved": "https://registry.npmjs.org/create-react-class/-/create-react-class-15.7.0.tgz",
-      "integrity": "sha512-QZv4sFWG9S5RUvkTYWbflxeZX+JG7Cz0Tn33rQBJ+WFQTqTfUTjMjiv9tnfXazjsO5r0KhPs+AqCjyrQX6h2ng==",
-      "dependencies": {
-        "loose-envify": "^1.3.1",
-        "object-assign": "^4.1.1"
-      }
-    },
-    "node_modules/cross-fetch": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.1.2.tgz",
-      "integrity": "sha512-+JhD65rDNqLbGmB3Gzs3HrEKC0aQnD+XA3SY6RjgkF88jV2q5cTc5+CwxlS3sdmLk98gpPt5CF9XRnPdlxZe6w==",
-      "dependencies": {
-        "node-fetch": "2.6.1"
-      }
-    },
-    "node_modules/cross-spawn": {
-      "version": "6.0.5",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
-      "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
-      "dependencies": {
-        "nice-try": "^1.0.4",
-        "path-key": "^2.0.1",
-        "semver": "^5.5.0",
-        "shebang-command": "^1.2.0",
-        "which": "^1.2.9"
-      },
-      "engines": {
-        "node": ">=4.8"
-      }
-    },
-    "node_modules/crypto-browserify": {
-      "version": "3.12.0",
-      "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz",
-      "integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==",
-      "dependencies": {
-        "browserify-cipher": "^1.0.0",
-        "browserify-sign": "^4.0.0",
-        "create-ecdh": "^4.0.0",
-        "create-hash": "^1.1.0",
-        "create-hmac": "^1.1.0",
-        "diffie-hellman": "^5.0.0",
-        "inherits": "^2.0.1",
-        "pbkdf2": "^3.0.3",
-        "public-encrypt": "^4.0.0",
-        "randombytes": "^2.0.0",
-        "randomfill": "^1.0.3"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/css": {
-      "version": "2.2.4",
-      "resolved": "https://registry.npmjs.org/css/-/css-2.2.4.tgz",
-      "integrity": "sha512-oUnjmWpy0niI3x/mPL8dVEI1l7MnG3+HHyRPHf+YFSbK+svOhXpmSOcDURUh2aOCgl2grzrOPt1nHLuCVFULLw==",
-      "dependencies": {
-        "inherits": "^2.0.3",
-        "source-map": "^0.6.1",
-        "source-map-resolve": "^0.5.2",
-        "urix": "^0.1.0"
-      }
-    },
-    "node_modules/css-blank-pseudo": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/css-blank-pseudo/-/css-blank-pseudo-0.1.4.tgz",
-      "integrity": "sha512-LHz35Hr83dnFeipc7oqFDmsjHdljj3TQtxGGiNWSOsTLIAubSm4TEz8qCaKFpk7idaQ1GfWscF4E6mgpBysA1w==",
-      "dependencies": {
-        "postcss": "^7.0.5"
-      },
-      "bin": {
-        "css-blank-pseudo": "cli.js"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/css-color-names": {
-      "version": "0.0.4",
-      "resolved": "https://registry.npmjs.org/css-color-names/-/css-color-names-0.0.4.tgz",
-      "integrity": "sha1-gIrcLnnPhHOAabZGyyDsJ762KeA=",
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/css-declaration-sorter": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-4.0.1.tgz",
-      "integrity": "sha512-BcxQSKTSEEQUftYpBVnsH4SF05NTuBokb19/sBt6asXGKZ/6VP7PLG1CBCkFDYOnhXhPh0jMhO6xZ71oYHXHBA==",
-      "dependencies": {
-        "postcss": "^7.0.1",
-        "timsort": "^0.3.0"
-      },
-      "engines": {
-        "node": ">4"
-      }
-    },
-    "node_modules/css-has-pseudo": {
-      "version": "0.10.0",
-      "resolved": "https://registry.npmjs.org/css-has-pseudo/-/css-has-pseudo-0.10.0.tgz",
-      "integrity": "sha512-Z8hnfsZu4o/kt+AuFzeGpLVhFOGO9mluyHBaA2bA8aCGTwah5sT3WV/fTHH8UNZUytOIImuGPrl/prlb4oX4qQ==",
-      "dependencies": {
-        "postcss": "^7.0.6",
-        "postcss-selector-parser": "^5.0.0-rc.4"
-      },
-      "bin": {
-        "css-has-pseudo": "cli.js"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/css-has-pseudo/node_modules/cssesc": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-2.0.0.tgz",
-      "integrity": "sha512-MsCAG1z9lPdoO/IUMLSBWBSVxVtJ1395VGIQ+Fc2gNdkQ1hNDnQdw3YhA71WJCBW1vdwA0cAnk/DnW6bqoEUYg==",
-      "bin": {
-        "cssesc": "bin/cssesc"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/css-has-pseudo/node_modules/postcss-selector-parser": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-5.0.0.tgz",
-      "integrity": "sha512-w+zLE5Jhg6Liz8+rQOWEAwtwkyqpfnmsinXjXg6cY7YIONZZtgvE0v2O0uhQBs0peNomOJwWRKt6JBfTdTd3OQ==",
-      "dependencies": {
-        "cssesc": "^2.0.0",
-        "indexes-of": "^1.0.1",
-        "uniq": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/css-loader": {
-      "version": "3.5.3",
-      "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-3.5.3.tgz",
-      "integrity": "sha512-UEr9NH5Lmi7+dguAm+/JSPovNjYbm2k3TK58EiwQHzOHH5Jfq1Y+XoP2bQO6TMn7PptMd0opxxedAWcaSTRKHw==",
-      "dependencies": {
-        "camelcase": "^5.3.1",
-        "cssesc": "^3.0.0",
-        "icss-utils": "^4.1.1",
-        "loader-utils": "^1.2.3",
-        "normalize-path": "^3.0.0",
-        "postcss": "^7.0.27",
-        "postcss-modules-extract-imports": "^2.0.0",
-        "postcss-modules-local-by-default": "^3.0.2",
-        "postcss-modules-scope": "^2.2.0",
-        "postcss-modules-values": "^3.0.0",
-        "postcss-value-parser": "^4.0.3",
-        "schema-utils": "^2.6.6",
-        "semver": "^6.3.0"
-      },
-      "engines": {
-        "node": ">= 8.9.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
-      "peerDependencies": {
-        "webpack": "^4.0.0 || ^5.0.0"
-      }
-    },
-    "node_modules/css-loader/node_modules/semver": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-      "bin": {
-        "semver": "bin/semver.js"
-      }
-    },
-    "node_modules/css-prefers-color-scheme": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/css-prefers-color-scheme/-/css-prefers-color-scheme-3.1.1.tgz",
-      "integrity": "sha512-MTu6+tMs9S3EUqzmqLXEcgNRbNkkD/TGFvowpeoWJn5Vfq7FMgsmRQs9X5NXAURiOBmOxm/lLjsDNXDE6k9bhg==",
-      "dependencies": {
-        "postcss": "^7.0.5"
-      },
-      "bin": {
-        "css-prefers-color-scheme": "cli.js"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/css-select": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/css-select/-/css-select-2.1.0.tgz",
-      "integrity": "sha512-Dqk7LQKpwLoH3VovzZnkzegqNSuAziQyNZUcrdDM401iY+R5NkGBXGmtO05/yaXQziALuPogeG0b7UAgjnTJTQ==",
-      "dependencies": {
-        "boolbase": "^1.0.0",
-        "css-what": "^3.2.1",
-        "domutils": "^1.7.0",
-        "nth-check": "^1.0.2"
-      }
-    },
-    "node_modules/css-select-base-adapter": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/css-select-base-adapter/-/css-select-base-adapter-0.1.1.tgz",
-      "integrity": "sha512-jQVeeRG70QI08vSTwf1jHxp74JoZsr2XSgETae8/xC8ovSnL2WF87GTLO86Sbwdt2lK4Umg4HnnwMO4YF3Ce7w=="
-    },
-    "node_modules/css-tree": {
-      "version": "1.0.0-alpha.37",
-      "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha.37.tgz",
-      "integrity": "sha512-DMxWJg0rnz7UgxKT0Q1HU/L9BeJI0M6ksor0OgqOnF+aRCDWg/N2641HmVyU9KVIu0OVVWOb2IpC9A+BJRnejg==",
-      "dependencies": {
-        "mdn-data": "2.0.4",
-        "source-map": "^0.6.1"
-      },
-      "engines": {
-        "node": ">=8.0.0"
-      }
-    },
-    "node_modules/css-tree/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/css-what": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/css-what/-/css-what-3.2.1.tgz",
-      "integrity": "sha512-WwOrosiQTvyms+Ti5ZC5vGEK0Vod3FTt1ca+payZqvKuGJF+dq7bG63DstxtN0dpm6FxY27a/zS3Wten+gEtGw==",
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/css.escape": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/css.escape/-/css.escape-1.5.1.tgz",
-      "integrity": "sha1-QuJ9T6BK4y+TGktNQZH6nN3ul8s="
-    },
-    "node_modules/css/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/cssdb": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/cssdb/-/cssdb-4.4.0.tgz",
-      "integrity": "sha512-LsTAR1JPEM9TpGhl/0p3nQecC2LJ0kD8X5YARu1hk/9I1gril5vDtMZyNxcEpxxDj34YNck/ucjuoUd66K03oQ=="
-    },
-    "node_modules/cssesc": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz",
-      "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==",
-      "bin": {
-        "cssesc": "bin/cssesc"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/cssnano": {
-      "version": "4.1.10",
-      "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-4.1.10.tgz",
-      "integrity": "sha512-5wny+F6H4/8RgNlaqab4ktc3e0/blKutmq8yNlBFXA//nSFFAqAngjNVRzUvCgYROULmZZUoosL/KSoZo5aUaQ==",
-      "dependencies": {
-        "cosmiconfig": "^5.0.0",
-        "cssnano-preset-default": "^4.0.7",
-        "is-resolvable": "^1.0.0",
-        "postcss": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/cssnano-preset-default": {
-      "version": "4.0.7",
-      "resolved": "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-4.0.7.tgz",
-      "integrity": "sha512-x0YHHx2h6p0fCl1zY9L9roD7rnlltugGu7zXSKQx6k2rYw0Hi3IqxcoAGF7u9Q5w1nt7vK0ulxV8Lo+EvllGsA==",
-      "dependencies": {
-        "css-declaration-sorter": "^4.0.1",
-        "cssnano-util-raw-cache": "^4.0.1",
-        "postcss": "^7.0.0",
-        "postcss-calc": "^7.0.1",
-        "postcss-colormin": "^4.0.3",
-        "postcss-convert-values": "^4.0.1",
-        "postcss-discard-comments": "^4.0.2",
-        "postcss-discard-duplicates": "^4.0.2",
-        "postcss-discard-empty": "^4.0.1",
-        "postcss-discard-overridden": "^4.0.1",
-        "postcss-merge-longhand": "^4.0.11",
-        "postcss-merge-rules": "^4.0.3",
-        "postcss-minify-font-values": "^4.0.2",
-        "postcss-minify-gradients": "^4.0.2",
-        "postcss-minify-params": "^4.0.2",
-        "postcss-minify-selectors": "^4.0.2",
-        "postcss-normalize-charset": "^4.0.1",
-        "postcss-normalize-display-values": "^4.0.2",
-        "postcss-normalize-positions": "^4.0.2",
-        "postcss-normalize-repeat-style": "^4.0.2",
-        "postcss-normalize-string": "^4.0.2",
-        "postcss-normalize-timing-functions": "^4.0.2",
-        "postcss-normalize-unicode": "^4.0.1",
-        "postcss-normalize-url": "^4.0.1",
-        "postcss-normalize-whitespace": "^4.0.2",
-        "postcss-ordered-values": "^4.1.2",
-        "postcss-reduce-initial": "^4.0.3",
-        "postcss-reduce-transforms": "^4.0.2",
-        "postcss-svgo": "^4.0.2",
-        "postcss-unique-selectors": "^4.0.1"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/cssnano-util-get-arguments": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/cssnano-util-get-arguments/-/cssnano-util-get-arguments-4.0.0.tgz",
-      "integrity": "sha1-7ToIKZ8h11dBsg87gfGU7UnMFQ8=",
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/cssnano-util-get-match": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/cssnano-util-get-match/-/cssnano-util-get-match-4.0.0.tgz",
-      "integrity": "sha1-wOTKB/U4a7F+xeUiULT1lhNlFW0=",
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/cssnano-util-raw-cache": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/cssnano-util-raw-cache/-/cssnano-util-raw-cache-4.0.1.tgz",
-      "integrity": "sha512-qLuYtWK2b2Dy55I8ZX3ky1Z16WYsx544Q0UWViebptpwn/xDBmog2TLg4f+DBMg1rJ6JDWtn96WHbOKDWt1WQA==",
-      "dependencies": {
-        "postcss": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/cssnano-util-same-parent": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/cssnano-util-same-parent/-/cssnano-util-same-parent-4.0.1.tgz",
-      "integrity": "sha512-WcKx5OY+KoSIAxBW6UBBRay1U6vkYheCdjyVNDm85zt5K9mHoGOfsOsqIszfAqrQQFIIKgjh2+FDgIj/zsl21Q==",
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/csso": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/csso/-/csso-4.0.3.tgz",
-      "integrity": "sha512-NL3spysxUkcrOgnpsT4Xdl2aiEiBG6bXswAABQVHcMrfjjBisFOKwLDOmf4wf32aPdcJws1zds2B0Rg+jqMyHQ==",
-      "dependencies": {
-        "css-tree": "1.0.0-alpha.39"
-      },
-      "engines": {
-        "node": ">=8.0.0"
-      }
-    },
-    "node_modules/csso/node_modules/css-tree": {
-      "version": "1.0.0-alpha.39",
-      "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha.39.tgz",
-      "integrity": "sha512-7UvkEYgBAHRG9Nt980lYxjsTrCyHFN53ky3wVsDkiMdVqylqRt+Zc+jm5qw7/qyOvN2dHSYtX0e4MbCCExSvnA==",
-      "dependencies": {
-        "mdn-data": "2.0.6",
-        "source-map": "^0.6.1"
-      },
-      "engines": {
-        "node": ">=8.0.0"
-      }
-    },
-    "node_modules/csso/node_modules/mdn-data": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.6.tgz",
-      "integrity": "sha512-rQvjv71olwNHgiTbfPZFkJtjNMciWgswYeciZhtvWLO8bmX3TnhyA62I6sTWOyZssWHJJjY6/KiWwqQsWWsqOA=="
-    },
-    "node_modules/csso/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/csstype": {
-      "version": "2.6.10",
-      "resolved": "https://registry.npmjs.org/csstype/-/csstype-2.6.10.tgz",
-      "integrity": "sha512-D34BqZU4cIlMCY93rZHbrq9pjTAQJ3U8S8rfBqjwHxkGPThWFjzZDQpgMJY0QViLxth6ZKYiwFBo14RdN44U/w==",
-      "optional": true
-    },
-    "node_modules/cyclist": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/cyclist/-/cyclist-1.0.1.tgz",
-      "integrity": "sha1-WW6WmP0MgOEgOMK4LW6xs1tiJNk="
-    },
-    "node_modules/d": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/d/-/d-1.0.1.tgz",
-      "integrity": "sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==",
-      "dependencies": {
-        "es5-ext": "^0.10.50",
-        "type": "^1.0.1"
-      }
-    },
-    "node_modules/dashdash": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
-      "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
-      "optional": true,
-      "dependencies": {
-        "assert-plus": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10"
-      }
-    },
-    "node_modules/date-format": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npm.taobao.org/date-format/download/date-format-3.0.0.tgz",
-      "integrity": "sha1-64eANlx9KxURB4+0keZHl4DzrZU=",
-      "deprecated": "3.x is no longer supported. Please upgrade to 4.x or higher.",
-      "engines": {
-        "node": ">=4.0"
-      }
-    },
-    "node_modules/dateformat": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-2.2.0.tgz",
-      "integrity": "sha1-QGXiATz5+5Ft39gu+1Bq1MZ2kGI=",
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/de-indent": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/de-indent/-/de-indent-1.0.2.tgz",
-      "integrity": "sha1-sgOOhG3DO6pXlhKNCAS0VbjB4h0="
-    },
-    "node_modules/debug": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-      "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
-      "deprecated": "Debug versions >=3.2.0 <3.2.7 || >=4 <4.3.1 have a low-severity ReDos regression when used in a Node.js environment. It is recommended you upgrade to 3.2.7 or 4.3.1. (https://github.com/visionmedia/debug/issues/797)",
-      "dependencies": {
-        "ms": "^2.1.1"
-      }
-    },
-    "node_modules/decamelize": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
-      "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/decamelize-keys": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/decamelize-keys/-/decamelize-keys-1.1.0.tgz",
-      "integrity": "sha1-0XGoeTMlKAfrPLYdwcFEXQeN8tk=",
-      "dev": true,
-      "dependencies": {
-        "decamelize": "^1.1.0",
-        "map-obj": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/decamelize-keys/node_modules/map-obj": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz",
-      "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/decode-uri-component": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz",
-      "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=",
-      "engines": {
-        "node": ">=0.10"
-      }
-    },
-    "node_modules/deep-assign": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/deep-assign/-/deep-assign-1.0.0.tgz",
-      "integrity": "sha1-sJJ0O+hCfcYh6gBnzex+cN0Z83s=",
-      "dependencies": {
-        "is-obj": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/deep-assign/node_modules/is-obj": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz",
-      "integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/deep-extend": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
-      "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==",
-      "engines": {
-        "node": ">=4.0.0"
-      }
-    },
-    "node_modules/deep-is": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz",
-      "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=",
-      "dev": true
-    },
-    "node_modules/deepmerge": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz",
-      "integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/default-compare": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/default-compare/-/default-compare-1.0.0.tgz",
-      "integrity": "sha512-QWfXlM0EkAbqOCbD/6HjdwT19j7WCkMyiRhWilc4H9/5h/RzTF9gv5LYh1+CmDV5d1rki6KAWLtQale0xt20eQ==",
-      "dependencies": {
-        "kind-of": "^5.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/default-compare/node_modules/kind-of": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-      "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/default-resolution": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/default-resolution/-/default-resolution-2.0.0.tgz",
-      "integrity": "sha1-vLgrqnKtebQmp2cy8aga1t8m1oQ=",
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/define-properties": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
-      "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==",
-      "dependencies": {
-        "object-keys": "^1.0.12"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/define-property": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz",
-      "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==",
-      "dependencies": {
-        "is-descriptor": "^1.0.2",
-        "isobject": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/define-property/node_modules/is-accessor-descriptor": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-      "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
-      "dependencies": {
-        "kind-of": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/define-property/node_modules/is-data-descriptor": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-      "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
-      "dependencies": {
-        "kind-of": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/define-property/node_modules/is-descriptor": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-      "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-      "dependencies": {
-        "is-accessor-descriptor": "^1.0.0",
-        "is-data-descriptor": "^1.0.0",
-        "kind-of": "^6.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/define-property/node_modules/isobject": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/del": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/del/-/del-3.0.0.tgz",
-      "integrity": "sha1-U+z2mf/LyzljdpGrE7rxYIGXZuU=",
-      "dependencies": {
-        "globby": "^6.1.0",
-        "is-path-cwd": "^1.0.0",
-        "is-path-in-cwd": "^1.0.0",
-        "p-map": "^1.1.1",
-        "pify": "^3.0.0",
-        "rimraf": "^2.2.8"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/del/node_modules/pify": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
-      "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/delayed-stream": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-      "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/delegate": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/delegate/-/delegate-3.2.0.tgz",
-      "integrity": "sha512-IofjkYBZaZivn0V8nnsMJGBr4jVLxHDheKSW88PyxS5QC4Vo9ZbZVvhzlSxY87fVq3STR6r+4cGepyHkcWOQSw=="
-    },
-    "node_modules/deprecation": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/deprecation/-/deprecation-2.3.1.tgz",
-      "integrity": "sha512-xmHIy4F3scKVwMsQ4WnVaS8bHOx0DmVwRywosKhaILI0ywMDWPtBSku2HNxRvF7jtwDRsoEwYQSfbxj8b7RlJQ=="
-    },
-    "node_modules/des.js": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.1.tgz",
-      "integrity": "sha512-Q0I4pfFrv2VPd34/vfLrFOoRmlYj3OV50i7fskps1jZWK1kApMWWT9G6RRUeYedLcBDIhnSDaUvJMb3AhUlaEA==",
-      "dependencies": {
-        "inherits": "^2.0.1",
-        "minimalistic-assert": "^1.0.0"
-      }
-    },
-    "node_modules/detect-file": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/detect-file/-/detect-file-1.0.0.tgz",
-      "integrity": "sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/detect-indent": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-6.0.0.tgz",
-      "integrity": "sha512-oSyFlqaTHCItVRGK5RmrmjB+CmaMOW7IaNA/kdxqhoa6d17j/5ce9O9eWXmV/KEdRwqpQA+Vqe8a8Bsybu4YnA==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/diff": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/diff/-/diff-1.0.8.tgz",
-      "integrity": "sha1-NDJ2MI7Jkbe8giZ+1VvBQR+XFmY=",
-      "engines": {
-        "node": ">=0.3.1"
-      }
-    },
-    "node_modules/diffie-hellman": {
-      "version": "5.0.3",
-      "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz",
-      "integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==",
-      "dependencies": {
-        "bn.js": "^4.1.0",
-        "miller-rabin": "^4.0.0",
-        "randombytes": "^2.0.0"
-      }
-    },
-    "node_modules/diffie-hellman/node_modules/bn.js": {
-      "version": "4.11.8",
-      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz",
-      "integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA=="
-    },
-    "node_modules/dir-glob": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
-      "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
-      "dev": true,
-      "dependencies": {
-        "path-type": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/dir-glob/node_modules/path-type": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
-      "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/doctrine": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npm.taobao.org/doctrine/download/doctrine-3.0.0.tgz",
-      "integrity": "sha1-rd6+rXKmV023g2OdyHoSF3OXOWE=",
-      "dev": true,
-      "dependencies": {
-        "esutils": "^2.0.2"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/dom-converter": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/dom-converter/-/dom-converter-0.2.0.tgz",
-      "integrity": "sha512-gd3ypIPfOMr9h5jIKq8E3sHOTCjeirnl0WK5ZdS1AW0Odt0b1PaWaHdJ4Qk4klv+YB9aJBS7mESXjFoDQPu6DA==",
-      "dependencies": {
-        "utila": "~0.4"
-      }
-    },
-    "node_modules/dom-serializer": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.2.2.tgz",
-      "integrity": "sha512-2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g==",
-      "dependencies": {
-        "domelementtype": "^2.0.1",
-        "entities": "^2.0.0"
-      }
-    },
-    "node_modules/dom-serializer/node_modules/domelementtype": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.0.1.tgz",
-      "integrity": "sha512-5HOHUDsYZWV8FGWN0Njbr/Rn7f/eWSQi1v7+HsUVwXgn8nWWlL64zKDkS0n8ZmQ3mlWOMuXOnR+7Nx/5tMO5AQ=="
-    },
-    "node_modules/domain-browser": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz",
-      "integrity": "sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==",
-      "engines": {
-        "node": ">=0.4",
-        "npm": ">=1.2"
-      }
-    },
-    "node_modules/domelementtype": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz",
-      "integrity": "sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w=="
-    },
-    "node_modules/domhandler": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.4.2.tgz",
-      "integrity": "sha512-JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA==",
-      "dependencies": {
-        "domelementtype": "1"
-      }
-    },
-    "node_modules/domino": {
-      "version": "2.1.5",
-      "resolved": "https://registry.npmjs.org/domino/-/domino-2.1.5.tgz",
-      "integrity": "sha512-vMDo7f6ogUV9PkzmxXLiXzJkJZqU09Le4C40mj+HmAGS/2FPmdetoNOQZXpu2kekn0GJKvtwKMAVoruTj60Xww=="
-    },
-    "node_modules/dompurify": {
-      "version": "2.2.7",
-      "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-2.2.7.tgz",
-      "integrity": "sha512-jdtDffdGNY+C76jvodNTu9jt5yYj59vuTUyx+wXdzcSwAGTYZDAQkQ7Iwx9zcGrA4ixC1syU4H3RZROqRxokxg=="
-    },
-    "node_modules/domready": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/domready/-/domready-1.0.8.tgz",
-      "integrity": "sha1-kfJS5Ze2Wvd+dFriTdAYXV4m1Yw="
-    },
-    "node_modules/domutils": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.7.0.tgz",
-      "integrity": "sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==",
-      "dependencies": {
-        "dom-serializer": "0",
-        "domelementtype": "1"
-      }
-    },
-    "node_modules/dot-prop": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-5.2.0.tgz",
-      "integrity": "sha512-uEUyaDKoSQ1M4Oq8l45hSE26SnTxL6snNnqvK/VWx5wJhmff5z0FUVJDKDanor/6w3kzE3i7XZOk+7wC0EXr1A==",
-      "dependencies": {
-        "is-obj": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/dropzone": {
-      "version": "5.7.2",
-      "resolved": "https://registry.npm.taobao.org/dropzone/download/dropzone-5.7.2.tgz?cache=0&sync_timestamp=1596009792692&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdropzone%2Fdownload%2Fdropzone-5.7.2.tgz",
-      "integrity": "sha1-kb7hVy3aUV1AkB2jBLx53d8wm0w="
-    },
-    "node_modules/duplexer2": {
-      "version": "0.0.2",
-      "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz",
-      "integrity": "sha1-xhTc9n4vsUmVqRcR5aYX6KYKMds=",
-      "dependencies": {
-        "readable-stream": "~1.1.9"
-      }
-    },
-    "node_modules/duplexer2/node_modules/isarray": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-      "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8="
-    },
-    "node_modules/duplexer2/node_modules/readable-stream": {
-      "version": "1.1.14",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
-      "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
-      "dependencies": {
-        "core-util-is": "~1.0.0",
-        "inherits": "~2.0.1",
-        "isarray": "0.0.1",
-        "string_decoder": "~0.10.x"
-      }
-    },
-    "node_modules/duplexer2/node_modules/string_decoder": {
-      "version": "0.10.31",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-      "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ="
-    },
-    "node_modules/duplexify": {
-      "version": "3.7.1",
-      "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.7.1.tgz",
-      "integrity": "sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==",
-      "dependencies": {
-        "end-of-stream": "^1.0.0",
-        "inherits": "^2.0.1",
-        "readable-stream": "^2.0.0",
-        "stream-shift": "^1.0.0"
-      }
-    },
-    "node_modules/each-props": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/each-props/-/each-props-1.3.2.tgz",
-      "integrity": "sha512-vV0Hem3zAGkJAyU7JSjixeU66rwdynTAa1vofCrSA5fEln+m67Az9CcnkVD776/fsN/UjIWmBDoNRS6t6G9RfA==",
-      "dependencies": {
-        "is-plain-object": "^2.0.1",
-        "object.defaults": "^1.1.0"
-      }
-    },
-    "node_modules/each-props/node_modules/is-plain-object": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
-      "dependencies": {
-        "isobject": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/each-props/node_modules/isobject": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/ecc-jsbn": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
-      "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=",
-      "optional": true,
-      "dependencies": {
-        "jsbn": "~0.1.0",
-        "safer-buffer": "^2.1.0"
-      }
-    },
-    "node_modules/echarts": {
-      "version": "3.8.5",
-      "resolved": "https://registry.npmmirror.com/echarts/download/echarts-3.8.5.tgz",
-      "integrity": "sha1-WOSlHSdDxvt1JXsNwKnPn1N4rA4=",
-      "dependencies": {
-        "zrender": "3.7.4"
-      }
-    },
-    "node_modules/editions": {
-      "version": "1.3.4",
-      "resolved": "https://registry.npmjs.org/editions/-/editions-1.3.4.tgz",
-      "integrity": "sha512-gzao+mxnYDzIysXKMQi/+M1mjy/rjestjg6OPoYTtI+3Izp23oiGZitsl9lPDPiTGXbcSIk1iJWhliSaglxnUg==",
-      "engines": {
-        "node": ">=0.8"
-      }
-    },
-    "node_modules/editorconfig": {
-      "version": "0.15.3",
-      "resolved": "https://registry.npmjs.org/editorconfig/-/editorconfig-0.15.3.tgz",
-      "integrity": "sha512-M9wIMFx96vq0R4F+gRpY3o2exzb8hEj/n9S8unZtHSvYjibBp/iMufSzvmOcV/laG0ZtuTVGtiJggPOSW2r93g==",
-      "dependencies": {
-        "commander": "^2.19.0",
-        "lru-cache": "^4.1.5",
-        "semver": "^5.6.0",
-        "sigmund": "^1.0.1"
-      },
-      "bin": {
-        "editorconfig": "bin/editorconfig"
-      }
-    },
-    "node_modules/electron-to-chromium": {
-      "version": "1.3.437",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.437.tgz",
-      "integrity": "sha512-PBQn2q68ErqMyBUABh9Gh8R6DunGky8aB5y3N5lPM7OVpldwyUbAK5AX9WcwE/5F6ceqvQ+iQLYkJYRysAs6Bg=="
-    },
-    "node_modules/element-ui": {
-      "version": "2.15.5",
-      "resolved": "https://registry.npmjs.org/element-ui/-/element-ui-2.15.5.tgz",
-      "integrity": "sha512-B/YCdz2aRY2WnFXzbTRTHPKZHBD/2KV6u88EBnkaARC/Lyxnap+7vpvrcW5UNTyVwjItS5Fj1eQyRy6236lbXg==",
-      "dependencies": {
-        "async-validator": "~1.8.1",
-        "babel-helper-vue-jsx-merge-props": "^2.0.0",
-        "deepmerge": "^1.2.0",
-        "normalize-wheel": "^1.0.1",
-        "resize-observer-polyfill": "^1.5.0",
-        "throttle-debounce": "^1.0.1"
-      },
-      "peerDependencies": {
-        "vue": "^2.5.17"
-      }
-    },
-    "node_modules/element-ui/node_modules/deepmerge": {
-      "version": "1.5.2",
-      "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-1.5.2.tgz",
-      "integrity": "sha512-95k0GDqvBjZavkuvzx/YqVLv/6YYa17fz6ILMSf7neqQITCPbnfEnQvEgMPNjH4kgobe7+WIL0yJEHku+H3qtQ==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/elliptic": {
-      "version": "6.5.4",
-      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz",
-      "integrity": "sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==",
-      "dependencies": {
-        "bn.js": "^4.11.9",
-        "brorand": "^1.1.0",
-        "hash.js": "^1.0.0",
-        "hmac-drbg": "^1.0.1",
-        "inherits": "^2.0.4",
-        "minimalistic-assert": "^1.0.1",
-        "minimalistic-crypto-utils": "^1.0.1"
-      }
-    },
-    "node_modules/elliptic/node_modules/bn.js": {
-      "version": "4.12.0",
-      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
-      "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA=="
-    },
-    "node_modules/emitter-component": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/emitter-component/-/emitter-component-1.1.1.tgz",
-      "integrity": "sha1-Bl4tvtaVm/RwZ57avq95gdEAOrY="
-    },
-    "node_modules/emoji-regex": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
-      "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA=="
-    },
-    "node_modules/emojis-list": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz",
-      "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==",
-      "engines": {
-        "node": ">= 4"
-      }
-    },
-    "node_modules/encoding": {
-      "version": "0.1.12",
-      "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.12.tgz",
-      "integrity": "sha1-U4tm8+5izRq1HsMjgp0flIDHS+s=",
-      "dependencies": {
-        "iconv-lite": "~0.4.13"
-      }
-    },
-    "node_modules/end-of-stream": {
-      "version": "1.4.4",
-      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
-      "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
-      "dependencies": {
-        "once": "^1.4.0"
-      }
-    },
-    "node_modules/enhanced-resolve": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-4.1.1.tgz",
-      "integrity": "sha512-98p2zE+rL7/g/DzMHMTF4zZlCgeVdJ7yr6xzEpJRYwFYrGi9ANdn5DnJURg6RpBkyk60XYDnWIv51VfIhfNGuA==",
-      "dependencies": {
-        "graceful-fs": "^4.1.2",
-        "memory-fs": "^0.5.0",
-        "tapable": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/enhanced-resolve/node_modules/memory-fs": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.5.0.tgz",
-      "integrity": "sha512-jA0rdU5KoQMC0e6ppoNRtpp6vjFq6+NY7r8hywnC7V+1Xj/MtHwGIbB1QaK/dunyjWteJzmkpd7ooeWg10T7GA==",
-      "dependencies": {
-        "errno": "^0.1.3",
-        "readable-stream": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=4.3.0 <5.0.0 || >=5.10"
-      }
-    },
-    "node_modules/entities": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/entities/-/entities-2.0.2.tgz",
-      "integrity": "sha512-dmD3AvJQBUjKpcNkoqr+x+IF0SdRtPz9Vk0uTy4yWqga9ibB6s4v++QFWNohjiUGoMlF552ZvNyXDxz5iW0qmw=="
-    },
-    "node_modules/errno": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.7.tgz",
-      "integrity": "sha512-MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg==",
-      "dependencies": {
-        "prr": "~1.0.1"
-      },
-      "bin": {
-        "errno": "cli.js"
-      }
-    },
-    "node_modules/error-ex": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
-      "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
-      "dependencies": {
-        "is-arrayish": "^0.2.1"
-      }
-    },
-    "node_modules/es-abstract": {
-      "version": "1.17.5",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.5.tgz",
-      "integrity": "sha512-BR9auzDbySxOcfog0tLECW8l28eRGpDpU3Dm3Hp4q/N+VtLTmyj4EUN088XZWQDW/hzj6sYRDXeOFsaAODKvpg==",
-      "dependencies": {
-        "es-to-primitive": "^1.2.1",
-        "function-bind": "^1.1.1",
-        "has": "^1.0.3",
-        "has-symbols": "^1.0.1",
-        "is-callable": "^1.1.5",
-        "is-regex": "^1.0.5",
-        "object-inspect": "^1.7.0",
-        "object-keys": "^1.1.1",
-        "object.assign": "^4.1.0",
-        "string.prototype.trimleft": "^2.1.1",
-        "string.prototype.trimright": "^2.1.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/es-to-primitive": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
-      "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
-      "dependencies": {
-        "is-callable": "^1.1.4",
-        "is-date-object": "^1.0.1",
-        "is-symbol": "^1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/es5-ext": {
-      "version": "0.10.53",
-      "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.53.tgz",
-      "integrity": "sha512-Xs2Stw6NiNHWypzRTY1MtaG/uJlwCk8kH81920ma8mvN8Xq1gsfhZvpkImLQArw8AHnv8MT2I45J3c0R8slE+Q==",
-      "dependencies": {
-        "es6-iterator": "~2.0.3",
-        "es6-symbol": "~3.1.3",
-        "next-tick": "~1.0.0"
-      }
-    },
-    "node_modules/es6-iterator": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz",
-      "integrity": "sha1-p96IkUGgWpSwhUQDstCg+/qY87c=",
-      "dependencies": {
-        "d": "1",
-        "es5-ext": "^0.10.35",
-        "es6-symbol": "^3.1.1"
-      }
-    },
-    "node_modules/es6-symbol": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.3.tgz",
-      "integrity": "sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==",
-      "dependencies": {
-        "d": "^1.0.1",
-        "ext": "^1.1.2"
-      }
-    },
-    "node_modules/es6-weak-map": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-2.0.3.tgz",
-      "integrity": "sha512-p5um32HOTO1kP+w7PRnB+5lQ43Z6muuMuIMffvDN8ZB4GcnjLBV6zGStpbASIMk4DCAvEaamhe2zhyCb/QXXsA==",
-      "dependencies": {
-        "d": "1",
-        "es5-ext": "^0.10.46",
-        "es6-iterator": "^2.0.3",
-        "es6-symbol": "^3.1.1"
-      }
-    },
-    "node_modules/escape-string-regexp": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
-    "node_modules/esdk-obs-browserjs": {
-      "version": "3.20.7",
-      "resolved": "https://registry.npm.taobao.org/esdk-obs-browserjs/download/esdk-obs-browserjs-3.20.7.tgz",
-      "integrity": "sha1-vhziRlKEhW3PgZPl0DyX68bJI0s=",
-      "dependencies": {
-        "axios": "^0.19.0",
-        "babel-polyfill": "^6.26.0",
-        "blueimp-md5": "^2.10.0",
-        "js-base64": "^2.3.2",
-        "jssha": "^2.3.1",
-        "urijs": "^1.19.1"
-      }
-    },
-    "node_modules/esdk-obs-browserjs/node_modules/axios": {
-      "version": "0.19.2",
-      "resolved": "https://registry.npm.taobao.org/axios/download/axios-0.19.2.tgz?cache=0&sync_timestamp=1608609215811&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Faxios%2Fdownload%2Faxios-0.19.2.tgz",
-      "integrity": "sha1-PqNsXYgY0NX4qKl6bTa4bNwAyyc=",
-      "deprecated": "Critical security vulnerability fixed in v0.21.1. For more information, see https://github.com/axios/axios/pull/3410",
-      "dependencies": {
-        "follow-redirects": "1.5.10"
-      }
-    },
-    "node_modules/esdk-obs-nodejs": {
-      "version": "3.20.11",
-      "resolved": "https://registry.npm.taobao.org/esdk-obs-nodejs/download/esdk-obs-nodejs-3.20.11.tgz?cache=0&sync_timestamp=1610351636380&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fesdk-obs-nodejs%2Fdownload%2Fesdk-obs-nodejs-3.20.11.tgz",
-      "integrity": "sha1-/bMuzu3qoT+xLgmCcgg8yM6MIsE=",
-      "dependencies": {
-        "log4js": "^6.3.0",
-        "xml2js": "^0.4.23"
-      },
-      "engines": {
-        "node": ">=0.12.7"
-      }
-    },
-    "node_modules/eslint": {
-      "version": "6.8.0",
-      "resolved": "https://registry.npm.taobao.org/eslint/download/eslint-6.8.0.tgz",
-      "integrity": "sha1-YiYtZylzn5J1cjgkMC+yJ8jJP/s=",
-      "dev": true,
-      "dependencies": {
-        "@babel/code-frame": "^7.0.0",
-        "ajv": "^6.10.0",
-        "chalk": "^2.1.0",
-        "cross-spawn": "^6.0.5",
-        "debug": "^4.0.1",
-        "doctrine": "^3.0.0",
-        "eslint-scope": "^5.0.0",
-        "eslint-utils": "^1.4.3",
-        "eslint-visitor-keys": "^1.1.0",
-        "espree": "^6.1.2",
-        "esquery": "^1.0.1",
-        "esutils": "^2.0.2",
-        "file-entry-cache": "^5.0.1",
-        "functional-red-black-tree": "^1.0.1",
-        "glob-parent": "^5.0.0",
-        "globals": "^12.1.0",
-        "ignore": "^4.0.6",
-        "import-fresh": "^3.0.0",
-        "imurmurhash": "^0.1.4",
-        "inquirer": "^7.0.0",
-        "is-glob": "^4.0.0",
-        "js-yaml": "^3.13.1",
-        "json-stable-stringify-without-jsonify": "^1.0.1",
-        "levn": "^0.3.0",
-        "lodash": "^4.17.14",
-        "minimatch": "^3.0.4",
-        "mkdirp": "^0.5.1",
-        "natural-compare": "^1.4.0",
-        "optionator": "^0.8.3",
-        "progress": "^2.0.0",
-        "regexpp": "^2.0.1",
-        "semver": "^6.1.2",
-        "strip-ansi": "^5.2.0",
-        "strip-json-comments": "^3.0.1",
-        "table": "^5.2.3",
-        "text-table": "^0.2.0",
-        "v8-compile-cache": "^2.0.3"
-      },
-      "bin": {
-        "eslint": "bin/eslint.js"
-      },
-      "engines": {
-        "node": "^8.10.0 || ^10.13.0 || >=11.10.1"
-      },
-      "funding": {
-        "url": "https://opencollective.com/eslint"
-      }
-    },
-    "node_modules/eslint-config-airbnb-base": {
-      "version": "14.1.0",
-      "resolved": "https://registry.npmjs.org/eslint-config-airbnb-base/-/eslint-config-airbnb-base-14.1.0.tgz",
-      "integrity": "sha512-+XCcfGyCnbzOnktDVhwsCAx+9DmrzEmuwxyHUJpw+kqBVT744OUBrB09khgFKlK1lshVww6qXGsYPZpavoNjJw==",
-      "dev": true,
-      "dependencies": {
-        "confusing-browser-globals": "^1.0.9",
-        "object.assign": "^4.1.0",
-        "object.entries": "^1.1.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      },
-      "peerDependencies": {
-        "eslint": "^5.16.0 || ^6.8.0",
-        "eslint-plugin-import": "^2.20.1"
-      }
-    },
-    "node_modules/eslint-import-resolver-node": {
-      "version": "0.3.3",
-      "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.3.tgz",
-      "integrity": "sha512-b8crLDo0M5RSe5YG8Pu2DYBj71tSB6OvXkfzwbJU2w7y8P4/yo0MyF8jU26IEuEuHF2K5/gcAJE3LhQGqBBbVg==",
-      "dev": true,
-      "dependencies": {
-        "debug": "^2.6.9",
-        "resolve": "^1.13.1"
-      }
-    },
-    "node_modules/eslint-import-resolver-node/node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.0.0"
-      }
-    },
-    "node_modules/eslint-import-resolver-node/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-      "dev": true
-    },
-    "node_modules/eslint-module-utils": {
-      "version": "2.6.0",
-      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.6.0.tgz",
-      "integrity": "sha512-6j9xxegbqe8/kZY8cYpcp0xhbK0EgJlg3g9mib3/miLaExuuwc3n5UEfSnU6hWMbT0FAYVvDbL9RrRgpUeQIvA==",
-      "dev": true,
-      "dependencies": {
-        "debug": "^2.6.9",
-        "pkg-dir": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/eslint-module-utils/node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.0.0"
-      }
-    },
-    "node_modules/eslint-module-utils/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-      "dev": true
-    },
-    "node_modules/eslint-module-utils/node_modules/pkg-dir": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-2.0.0.tgz",
-      "integrity": "sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=",
-      "dev": true,
-      "dependencies": {
-        "find-up": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/eslint-plugin-import": {
-      "version": "2.20.2",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.20.2.tgz",
-      "integrity": "sha512-FObidqpXrR8OnCh4iNsxy+WACztJLXAHBO5hK79T1Hc77PgQZkyDGA5Ag9xAvRpglvLNxhH/zSmZ70/pZ31dHg==",
-      "dev": true,
-      "dependencies": {
-        "array-includes": "^3.0.3",
-        "array.prototype.flat": "^1.2.1",
-        "contains-path": "^0.1.0",
-        "debug": "^2.6.9",
-        "doctrine": "1.5.0",
-        "eslint-import-resolver-node": "^0.3.2",
-        "eslint-module-utils": "^2.4.1",
-        "has": "^1.0.3",
-        "minimatch": "^3.0.4",
-        "object.values": "^1.1.0",
-        "read-pkg-up": "^2.0.0",
-        "resolve": "^1.12.0"
-      },
-      "engines": {
-        "node": ">=4"
-      },
-      "peerDependencies": {
-        "eslint": "2.x - 6.x"
-      }
-    },
-    "node_modules/eslint-plugin-import/node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.0.0"
-      }
-    },
-    "node_modules/eslint-plugin-import/node_modules/doctrine": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-1.5.0.tgz",
-      "integrity": "sha1-N53Ocw9hZvds76TmcHoVmwLFpvo=",
-      "dev": true,
-      "dependencies": {
-        "esutils": "^2.0.2",
-        "isarray": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/eslint-plugin-import/node_modules/load-json-file": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz",
-      "integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=",
-      "dev": true,
-      "dependencies": {
-        "graceful-fs": "^4.1.2",
-        "parse-json": "^2.2.0",
-        "pify": "^2.0.0",
-        "strip-bom": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/eslint-plugin-import/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-      "dev": true
-    },
-    "node_modules/eslint-plugin-import/node_modules/parse-json": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
-      "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
-      "dev": true,
-      "dependencies": {
-        "error-ex": "^1.2.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/eslint-plugin-import/node_modules/path-type": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz",
-      "integrity": "sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=",
-      "dev": true,
-      "dependencies": {
-        "pify": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/eslint-plugin-import/node_modules/pify": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-      "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/eslint-plugin-import/node_modules/read-pkg": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz",
-      "integrity": "sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=",
-      "dev": true,
-      "dependencies": {
-        "load-json-file": "^2.0.0",
-        "normalize-package-data": "^2.3.2",
-        "path-type": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/eslint-plugin-import/node_modules/read-pkg-up": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz",
-      "integrity": "sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=",
-      "dev": true,
-      "dependencies": {
-        "find-up": "^2.0.0",
-        "read-pkg": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/eslint-plugin-import/node_modules/strip-bom": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
-      "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/eslint-plugin-vue": {
-      "version": "6.2.2",
-      "resolved": "https://registry.npm.taobao.org/eslint-plugin-vue/download/eslint-plugin-vue-6.2.2.tgz?cache=0&sync_timestamp=1597198168566&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Feslint-plugin-vue%2Fdownload%2Feslint-plugin-vue-6.2.2.tgz",
-      "integrity": "sha1-J/7NmjokeJsPER7N1UCp5WGY4P4=",
-      "dev": true,
-      "dependencies": {
-        "natural-compare": "^1.4.0",
-        "semver": "^5.6.0",
-        "vue-eslint-parser": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=8.10"
-      },
-      "peerDependencies": {
-        "eslint": "^5.0.0 || ^6.0.0"
-      }
-    },
-    "node_modules/eslint-scope": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.3.tgz",
-      "integrity": "sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==",
-      "dependencies": {
-        "esrecurse": "^4.1.0",
-        "estraverse": "^4.1.1"
-      },
-      "engines": {
-        "node": ">=4.0.0"
-      }
-    },
-    "node_modules/eslint-utils": {
-      "version": "1.4.3",
-      "resolved": "https://registry.npm.taobao.org/eslint-utils/download/eslint-utils-1.4.3.tgz",
-      "integrity": "sha1-dP7HxU0Hdrb2fgJRBAtYBlZOmB8=",
-      "dev": true,
-      "dependencies": {
-        "eslint-visitor-keys": "^1.1.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/eslint-visitor-keys": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npm.taobao.org/eslint-visitor-keys/download/eslint-visitor-keys-1.3.0.tgz?cache=0&sync_timestamp=1597435068105&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Feslint-visitor-keys%2Fdownload%2Feslint-visitor-keys-1.3.0.tgz",
-      "integrity": "sha1-MOvR73wv3/AcOk8VEESvJfqwUj4=",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/eslint/node_modules/ansi-escapes": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npm.taobao.org/ansi-escapes/download/ansi-escapes-4.3.1.tgz",
-      "integrity": "sha1-pcR8xDGB8fOP/XB2g3cA05VSKmE=",
-      "dev": true,
-      "dependencies": {
-        "type-fest": "^0.11.0"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/eslint/node_modules/ansi-escapes/node_modules/type-fest": {
-      "version": "0.11.0",
-      "resolved": "https://registry.npm.taobao.org/type-fest/download/type-fest-0.11.0.tgz",
-      "integrity": "sha1-l6vwhyMQ/tiKXEZrJWgVdhReM/E=",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/eslint/node_modules/ansi-regex": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npm.taobao.org/ansi-regex/download/ansi-regex-5.0.0.tgz",
-      "integrity": "sha1-OIU59VF5vzkznIGvMKZU1p+Hy3U=",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/eslint/node_modules/ansi-styles": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npm.taobao.org/ansi-styles/download/ansi-styles-4.2.1.tgz",
-      "integrity": "sha1-kK51xCTQCNJiTFvynq0xd+v881k=",
-      "dev": true,
-      "dependencies": {
-        "@types/color-name": "^1.1.1",
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/eslint/node_modules/cli-cursor": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npm.taobao.org/cli-cursor/download/cli-cursor-3.1.0.tgz",
-      "integrity": "sha1-JkMFp65JDR0Dvwybp8kl0XU68wc=",
-      "dev": true,
-      "dependencies": {
-        "restore-cursor": "^3.1.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/eslint/node_modules/cli-width": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npm.taobao.org/cli-width/download/cli-width-3.0.0.tgz",
-      "integrity": "sha1-ovSEN6LKqaIkNueUvwceyeYc7fY=",
-      "dev": true,
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/eslint/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npm.taobao.org/color-convert/download/color-convert-2.0.1.tgz",
-      "integrity": "sha1-ctOmjVmMm9s68q0ehPIdiWq9TeM=",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/eslint/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npm.taobao.org/color-name/download/color-name-1.1.4.tgz",
-      "integrity": "sha1-wqCah6y95pVD3m9j+jmVyCbFNqI=",
-      "dev": true
-    },
-    "node_modules/eslint/node_modules/emoji-regex": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npm.taobao.org/emoji-regex/download/emoji-regex-8.0.0.tgz",
-      "integrity": "sha1-6Bj9ac5cz8tARZT4QpY79TFkzDc=",
-      "dev": true
-    },
-    "node_modules/eslint/node_modules/eslint-scope": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npm.taobao.org/eslint-scope/download/eslint-scope-5.1.0.tgz?cache=0&sync_timestamp=1591269986906&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Feslint-scope%2Fdownload%2Feslint-scope-5.1.0.tgz",
-      "integrity": "sha1-0Plx3+WcaeDK2mhLI9Sdv4JgDOU=",
-      "dev": true,
-      "dependencies": {
-        "esrecurse": "^4.1.0",
-        "estraverse": "^4.1.1"
-      },
-      "engines": {
-        "node": ">=8.0.0"
-      }
-    },
-    "node_modules/eslint/node_modules/figures": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npm.taobao.org/figures/download/figures-3.2.0.tgz",
-      "integrity": "sha1-YlwYvSk8YE3EqN2y/r8MiDQXRq8=",
-      "dev": true,
-      "dependencies": {
-        "escape-string-regexp": "^1.0.5"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/eslint/node_modules/globals": {
-      "version": "12.4.0",
-      "resolved": "https://registry.npm.taobao.org/globals/download/globals-12.4.0.tgz",
-      "integrity": "sha1-oYgTV2pBsAokqX5/gVkYwuGZJfg=",
-      "dev": true,
-      "dependencies": {
-        "type-fest": "^0.8.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/eslint/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npm.taobao.org/has-flag/download/has-flag-4.0.0.tgz",
-      "integrity": "sha1-lEdx/ZyByBJlxNaUGGDaBrtZR5s=",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/eslint/node_modules/import-fresh": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npm.taobao.org/import-fresh/download/import-fresh-3.2.1.tgz?cache=0&sync_timestamp=1589682760620&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fimport-fresh%2Fdownload%2Fimport-fresh-3.2.1.tgz",
-      "integrity": "sha1-Yz/2GFBueTr1rJG/SLcmd+FcvmY=",
-      "dev": true,
-      "dependencies": {
-        "parent-module": "^1.0.0",
-        "resolve-from": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/eslint/node_modules/inquirer": {
-      "version": "7.3.3",
-      "resolved": "https://registry.npm.taobao.org/inquirer/download/inquirer-7.3.3.tgz",
-      "integrity": "sha1-BNF2sq8Er8FXqD/XwQDpjuCq0AM=",
-      "dev": true,
-      "dependencies": {
-        "ansi-escapes": "^4.2.1",
-        "chalk": "^4.1.0",
-        "cli-cursor": "^3.1.0",
-        "cli-width": "^3.0.0",
-        "external-editor": "^3.0.3",
-        "figures": "^3.0.0",
-        "lodash": "^4.17.19",
-        "mute-stream": "0.0.8",
-        "run-async": "^2.4.0",
-        "rxjs": "^6.6.0",
-        "string-width": "^4.1.0",
-        "strip-ansi": "^6.0.0",
-        "through": "^2.3.6"
-      },
-      "engines": {
-        "node": ">=8.0.0"
-      }
-    },
-    "node_modules/eslint/node_modules/inquirer/node_modules/chalk": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npm.taobao.org/chalk/download/chalk-4.1.0.tgz",
-      "integrity": "sha1-ThSHCmGNni7dl92DRf2dncMVZGo=",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/eslint/node_modules/inquirer/node_modules/lodash": {
-      "version": "4.17.20",
-      "resolved": "https://registry.npm.taobao.org/lodash/download/lodash-4.17.20.tgz?cache=0&sync_timestamp=1597335994883&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Flodash%2Fdownload%2Flodash-4.17.20.tgz",
-      "integrity": "sha1-tEqbYpe8tpjxxRo1RaKzs2jVnFI=",
-      "dev": true
-    },
-    "node_modules/eslint/node_modules/inquirer/node_modules/strip-ansi": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npm.taobao.org/strip-ansi/download/strip-ansi-6.0.0.tgz?cache=0&sync_timestamp=1589682795383&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fstrip-ansi%2Fdownload%2Fstrip-ansi-6.0.0.tgz",
-      "integrity": "sha1-CxVx3XZpzNTz4G4U7x7tJiJa5TI=",
-      "dev": true,
-      "dependencies": {
-        "ansi-regex": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/eslint/node_modules/is-fullwidth-code-point": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npm.taobao.org/is-fullwidth-code-point/download/is-fullwidth-code-point-3.0.0.tgz",
-      "integrity": "sha1-8Rb4Bk/pCz94RKOJl8C3UFEmnx0=",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/eslint/node_modules/mimic-fn": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npm.taobao.org/mimic-fn/download/mimic-fn-2.1.0.tgz?cache=0&sync_timestamp=1596095644798&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fmimic-fn%2Fdownload%2Fmimic-fn-2.1.0.tgz",
-      "integrity": "sha1-ftLCzMyvhNP/y3pptXcR/CCDQBs=",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/eslint/node_modules/mute-stream": {
-      "version": "0.0.8",
-      "resolved": "https://registry.npm.taobao.org/mute-stream/download/mute-stream-0.0.8.tgz",
-      "integrity": "sha1-FjDEKyJR/4HiooPelqVJfqkuXg0=",
-      "dev": true
-    },
-    "node_modules/eslint/node_modules/onetime": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npm.taobao.org/onetime/download/onetime-5.1.2.tgz?cache=0&sync_timestamp=1597005345612&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fonetime%2Fdownload%2Fonetime-5.1.2.tgz",
-      "integrity": "sha1-0Oluu1awdHbfHdnEgG5SN5hcpF4=",
-      "dev": true,
-      "dependencies": {
-        "mimic-fn": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/eslint/node_modules/resolve-from": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npm.taobao.org/resolve-from/download/resolve-from-4.0.0.tgz",
-      "integrity": "sha1-SrzYUq0y3Xuqv+m0DgCjbbXzkuY=",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/eslint/node_modules/restore-cursor": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npm.taobao.org/restore-cursor/download/restore-cursor-3.1.0.tgz",
-      "integrity": "sha1-OfZ8VLOnpYzqUjbZXPADQjljH34=",
-      "dev": true,
-      "dependencies": {
-        "onetime": "^5.1.0",
-        "signal-exit": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/eslint/node_modules/rxjs": {
-      "version": "6.6.2",
-      "resolved": "https://registry.npm.taobao.org/rxjs/download/rxjs-6.6.2.tgz",
-      "integrity": "sha1-gJanrAPyzE/lhg725XKBDZ4BwNI=",
-      "dev": true,
-      "dependencies": {
-        "tslib": "^1.9.0"
-      },
-      "engines": {
-        "npm": ">=2.0.0"
-      }
-    },
-    "node_modules/eslint/node_modules/semver": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npm.taobao.org/semver/download/semver-6.3.0.tgz?cache=0&sync_timestamp=1589682805026&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsemver%2Fdownload%2Fsemver-6.3.0.tgz",
-      "integrity": "sha1-7gpkyK9ejO6mdoexM3YeG+y9HT0=",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver.js"
-      }
-    },
-    "node_modules/eslint/node_modules/string-width": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npm.taobao.org/string-width/download/string-width-4.2.0.tgz",
-      "integrity": "sha1-lSGCxGzHssMT0VluYjmSvRY7crU=",
-      "dev": true,
-      "dependencies": {
-        "emoji-regex": "^8.0.0",
-        "is-fullwidth-code-point": "^3.0.0",
-        "strip-ansi": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/eslint/node_modules/string-width/node_modules/strip-ansi": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npm.taobao.org/strip-ansi/download/strip-ansi-6.0.0.tgz?cache=0&sync_timestamp=1589682795383&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fstrip-ansi%2Fdownload%2Fstrip-ansi-6.0.0.tgz",
-      "integrity": "sha1-CxVx3XZpzNTz4G4U7x7tJiJa5TI=",
-      "dev": true,
-      "dependencies": {
-        "ansi-regex": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/eslint/node_modules/strip-ansi": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npm.taobao.org/strip-ansi/download/strip-ansi-5.2.0.tgz?cache=0&sync_timestamp=1589682795383&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fstrip-ansi%2Fdownload%2Fstrip-ansi-5.2.0.tgz",
-      "integrity": "sha1-jJpTb+tq/JYr36WxBKUJHBrZwK4=",
-      "dev": true,
-      "dependencies": {
-        "ansi-regex": "^4.1.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/eslint/node_modules/strip-ansi/node_modules/ansi-regex": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npm.taobao.org/ansi-regex/download/ansi-regex-4.1.0.tgz",
-      "integrity": "sha1-i5+PCM8ay4Q3Vqg5yox+MWjFGZc=",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/eslint/node_modules/strip-json-comments": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npm.taobao.org/strip-json-comments/download/strip-json-comments-3.1.1.tgz?cache=0&sync_timestamp=1594567532500&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fstrip-json-comments%2Fdownload%2Fstrip-json-comments-3.1.1.tgz",
-      "integrity": "sha1-MfEoGzgyYwQ0gxwxDAHMzajL4AY=",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/eslint/node_modules/supports-color": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npm.taobao.org/supports-color/download/supports-color-7.1.0.tgz",
-      "integrity": "sha1-aOMlkd9z4lrRxLSRCKLsUHliv9E=",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/espree": {
-      "version": "6.2.1",
-      "resolved": "https://registry.npm.taobao.org/espree/download/espree-6.2.1.tgz?cache=0&sync_timestamp=1595034145062&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fespree%2Fdownload%2Fespree-6.2.1.tgz",
-      "integrity": "sha1-d/xy4f10SiBSwg84pbV1gy6Cc0o=",
-      "dev": true,
-      "dependencies": {
-        "acorn": "^7.1.1",
-        "acorn-jsx": "^5.2.0",
-        "eslint-visitor-keys": "^1.1.0"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/espree/node_modules/acorn": {
-      "version": "7.4.0",
-      "resolved": "https://registry.npm.taobao.org/acorn/download/acorn-7.4.0.tgz?cache=0&sync_timestamp=1597235774928&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Facorn%2Fdownload%2Facorn-7.4.0.tgz",
-      "integrity": "sha1-4a1IbmxUUBY0xsOXxcEh2qODYHw=",
-      "dev": true,
-      "bin": {
-        "acorn": "bin/acorn"
-      },
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/esprima": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
-      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
-      "bin": {
-        "esparse": "bin/esparse.js",
-        "esvalidate": "bin/esvalidate.js"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/esquery": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npm.taobao.org/esquery/download/esquery-1.3.1.tgz",
-      "integrity": "sha1-t4tYKKqOIU4p+3TE1bdS4cAz2lc=",
-      "dev": true,
-      "dependencies": {
-        "estraverse": "^5.1.0"
-      },
-      "engines": {
-        "node": ">=0.10"
-      }
-    },
-    "node_modules/esquery/node_modules/estraverse": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npm.taobao.org/estraverse/download/estraverse-5.2.0.tgz?cache=0&sync_timestamp=1596642998635&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Festraverse%2Fdownload%2Festraverse-5.2.0.tgz",
-      "integrity": "sha1-MH30JUfmzHMk088DwVXVzbjFOIA=",
-      "dev": true,
-      "engines": {
-        "node": ">=4.0"
-      }
-    },
-    "node_modules/esrecurse": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.1.tgz",
-      "integrity": "sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==",
-      "dependencies": {
-        "estraverse": "^4.1.0"
-      },
-      "engines": {
-        "node": ">=4.0"
-      }
-    },
-    "node_modules/estraverse": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
-      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
-      "engines": {
-        "node": ">=4.0"
-      }
-    },
-    "node_modules/esutils": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
-      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/event-emitter": {
-      "version": "0.3.5",
-      "resolved": "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz",
-      "integrity": "sha1-34xp7vFkeSPHFXuc6DhAYQsCzDk=",
-      "dependencies": {
-        "d": "1",
-        "es5-ext": "~0.10.14"
-      }
-    },
-    "node_modules/events": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/events/-/events-3.1.0.tgz",
-      "integrity": "sha512-Rv+u8MLHNOdMjTAFeT3nCjHn2aGlx435FP/sDHNaRhDEMwyI/aB22Kj2qIN8R0cw3z28psEQLYwxVKLsKrMgWg==",
-      "engines": {
-        "node": ">=0.8.x"
-      }
-    },
-    "node_modules/evp_bytestokey": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz",
-      "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==",
-      "dependencies": {
-        "md5.js": "^1.3.4",
-        "safe-buffer": "^5.1.1"
-      }
-    },
-    "node_modules/execa": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
-      "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
-      "dependencies": {
-        "cross-spawn": "^6.0.0",
-        "get-stream": "^4.0.0",
-        "is-stream": "^1.1.0",
-        "npm-run-path": "^2.0.0",
-        "p-finally": "^1.0.0",
-        "signal-exit": "^3.0.0",
-        "strip-eof": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/execall": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/execall/-/execall-2.0.0.tgz",
-      "integrity": "sha512-0FU2hZ5Hh6iQnarpRtQurM/aAvp3RIbfvgLHrcqJYzhXyV2KFruhuChf9NC6waAhiUR7FFtlugkI4p7f2Fqlow==",
-      "dev": true,
-      "dependencies": {
-        "clone-regexp": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/exit-on-epipe": {
-      "version": "1.0.1",
-      "resolved": "https://registry.nlark.com/exit-on-epipe/download/exit-on-epipe-1.0.1.tgz",
-      "integrity": "sha1-C92S6H1ShdJn2qgXHQ6wYVlolpI=",
-      "engines": {
-        "node": ">=0.8"
-      }
-    },
-    "node_modules/expand-brackets": {
-      "version": "2.1.4",
-      "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
-      "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
-      "dependencies": {
-        "debug": "^2.3.3",
-        "define-property": "^0.2.5",
-        "extend-shallow": "^2.0.1",
-        "posix-character-classes": "^0.1.0",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/expand-brackets/node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "dependencies": {
-        "ms": "2.0.0"
-      }
-    },
-    "node_modules/expand-brackets/node_modules/define-property": {
-      "version": "0.2.5",
-      "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-      "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-      "dependencies": {
-        "is-descriptor": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/expand-brackets/node_modules/extend-shallow": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-      "dependencies": {
-        "is-extendable": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/expand-brackets/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
-    },
-    "node_modules/expand-tilde": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz",
-      "integrity": "sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=",
-      "dependencies": {
-        "homedir-polyfill": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/ext": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/ext/-/ext-1.4.0.tgz",
-      "integrity": "sha512-Key5NIsUxdqKg3vIsdw9dSuXpPCQ297y6wBjL30edxwPgt2E44WcWBZey/ZvUc6sERLTxKdyCu4gZFmUbk1Q7A==",
-      "dependencies": {
-        "type": "^2.0.0"
-      }
-    },
-    "node_modules/ext/node_modules/type": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/type/-/type-2.0.0.tgz",
-      "integrity": "sha512-KBt58xCHry4Cejnc2ISQAF7QY+ORngsWfxezO68+12hKV6lQY8P/psIkcbjeHWn7MqcgciWJyCCevFMJdIXpow=="
-    },
-    "node_modules/extend": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
-      "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="
-    },
-    "node_modules/extend-shallow": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
-      "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
-      "dependencies": {
-        "assign-symbols": "^1.0.0",
-        "is-extendable": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/extend-shallow/node_modules/is-extendable": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
-      "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
-      "dependencies": {
-        "is-plain-object": "^2.0.4"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/extend-shallow/node_modules/is-plain-object": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
-      "dependencies": {
-        "isobject": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/extend-shallow/node_modules/isobject": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/external-editor": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz",
-      "integrity": "sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==",
-      "dependencies": {
-        "chardet": "^0.7.0",
-        "iconv-lite": "^0.4.24",
-        "tmp": "^0.0.33"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/extglob": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
-      "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
-      "dependencies": {
-        "array-unique": "^0.3.2",
-        "define-property": "^1.0.0",
-        "expand-brackets": "^2.1.4",
-        "extend-shallow": "^2.0.1",
-        "fragment-cache": "^0.2.1",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/extglob/node_modules/define-property": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-      "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-      "dependencies": {
-        "is-descriptor": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/extglob/node_modules/extend-shallow": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-      "dependencies": {
-        "is-extendable": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/extglob/node_modules/is-accessor-descriptor": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-      "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
-      "dependencies": {
-        "kind-of": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/extglob/node_modules/is-data-descriptor": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-      "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
-      "dependencies": {
-        "kind-of": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/extglob/node_modules/is-descriptor": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-      "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-      "dependencies": {
-        "is-accessor-descriptor": "^1.0.0",
-        "is-data-descriptor": "^1.0.0",
-        "kind-of": "^6.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/extsprintf": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
-      "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=",
-      "engines": [
-        "node >=0.6.0"
-      ],
-      "optional": true
-    },
-    "node_modules/fancy-log": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/fancy-log/-/fancy-log-1.3.3.tgz",
-      "integrity": "sha512-k9oEhlyc0FrVh25qYuSELjr8oxsCoc4/LEZfg2iJJrfEk/tZL9bCoJE47gqAvI2m/AUjluCS4+3I0eTx8n3AEw==",
-      "dependencies": {
-        "ansi-gray": "^0.1.1",
-        "color-support": "^1.1.3",
-        "parse-node-version": "^1.0.0",
-        "time-stamp": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/fast-deep-equal": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz",
-      "integrity": "sha512-8UEa58QDLauDNfpbrX55Q9jrGHThw2ZMdOky5Gl1CDtVeJDPVrG4Jxx1N8jw2gkWaff5UUuX1KJd+9zGe2B+ZA=="
-    },
-    "node_modules/fast-glob": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.2.tgz",
-      "integrity": "sha512-UDV82o4uQyljznxwMxyVRJgZZt3O5wENYojjzbaGEGZgeOxkLFf+V4cnUD+krzb2F72E18RhamkMZ7AdeggF7A==",
-      "dependencies": {
-        "@nodelib/fs.stat": "^2.0.2",
-        "@nodelib/fs.walk": "^1.2.3",
-        "glob-parent": "^5.1.0",
-        "merge2": "^1.3.0",
-        "micromatch": "^4.0.2",
-        "picomatch": "^2.2.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/fast-json-patch": {
-      "version": "3.0.0-1",
-      "resolved": "https://registry.npmjs.org/fast-json-patch/-/fast-json-patch-3.0.0-1.tgz",
-      "integrity": "sha512-6pdFb07cknxvPzCeLsFHStEy+MysPJPgZQ9LbQ/2O67unQF93SNqfdSqnPPl71YMHX+AD8gbl7iuoGFzHEdDuw=="
-    },
-    "node_modules/fast-json-stable-stringify": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
-      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw=="
-    },
-    "node_modules/fast-levenshtein": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
-      "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=",
-      "dev": true
-    },
-    "node_modules/fastq": {
-      "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.8.0.tgz",
-      "integrity": "sha512-SMIZoZdLh/fgofivvIkmknUXyPnvxRE3DhtZ5Me3Mrsk5gyPL42F0xr51TdRXskBxHfMp+07bcYzfsYEsSQA9Q==",
-      "dependencies": {
-        "reusify": "^1.0.4"
-      }
-    },
-    "node_modules/fbjs": {
-      "version": "0.8.17",
-      "resolved": "https://registry.npmjs.org/fbjs/-/fbjs-0.8.17.tgz",
-      "integrity": "sha1-xNWY6taUkRJlPWWIsBpc3Nn5D90=",
-      "dependencies": {
-        "core-js": "^1.0.0",
-        "isomorphic-fetch": "^2.1.1",
-        "loose-envify": "^1.0.0",
-        "object-assign": "^4.1.0",
-        "promise": "^7.1.1",
-        "setimmediate": "^1.0.5",
-        "ua-parser-js": "^0.7.18"
-      }
-    },
-    "node_modules/fbjs/node_modules/core-js": {
-      "version": "1.2.7",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-1.2.7.tgz",
-      "integrity": "sha1-ZSKUwUZR2yj6k70tX/KYOk8IxjY=",
-      "deprecated": "core-js@<3.23.3 is no longer maintained and not recommended for usage due to the number of issues. Because of the V8 engine whims, feature detection in old core-js versions could cause a slowdown up to 100x even if nothing is polyfilled. Some versions have web compatibility issues. Please, upgrade your dependencies to the actual version of core-js."
-    },
-    "node_modules/fflate": {
-      "version": "0.7.1",
-      "resolved": "https://registry.nlark.com/fflate/download/fflate-0.7.1.tgz",
-      "integrity": "sha1-Vuh+h8Py/gGwJfuxxOqDWZDAL6I="
-    },
-    "node_modules/figures": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz",
-      "integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=",
-      "dependencies": {
-        "escape-string-regexp": "^1.0.5"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/file-entry-cache": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-5.0.1.tgz",
-      "integrity": "sha512-bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g==",
-      "dev": true,
-      "dependencies": {
-        "flat-cache": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/file-loader": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-6.0.0.tgz",
-      "integrity": "sha512-/aMOAYEFXDdjG0wytpTL5YQLfZnnTmLNjn+AIrJ/6HVnTfDqLsVKUUwkDf4I4kgex36BvjuXEn/TX9B/1ESyqQ==",
-      "dependencies": {
-        "loader-utils": "^2.0.0",
-        "schema-utils": "^2.6.5"
-      },
-      "engines": {
-        "node": ">= 10.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
-      "peerDependencies": {
-        "webpack": "^4.0.0 || ^5.0.0"
-      }
-    },
-    "node_modules/file-loader/node_modules/loader-utils": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz",
-      "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==",
-      "dependencies": {
-        "big.js": "^5.2.2",
-        "emojis-list": "^3.0.0",
-        "json5": "^2.1.2"
-      },
-      "engines": {
-        "node": ">=8.9.0"
-      }
-    },
-    "node_modules/file-saver": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npm.taobao.org/file-saver/download/file-saver-2.0.5.tgz",
-      "integrity": "sha1-1hz+LOBZ9BTYmendbUEH7iVnDDg="
-    },
-    "node_modules/file-uri-to-path": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
-      "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==",
-      "optional": true
-    },
-    "node_modules/fill-range": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
-      "dependencies": {
-        "to-regex-range": "^5.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/find-cache-dir": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.1.0.tgz",
-      "integrity": "sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==",
-      "dependencies": {
-        "commondir": "^1.0.1",
-        "make-dir": "^2.0.0",
-        "pkg-dir": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/find-up": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
-      "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
-      "dependencies": {
-        "locate-path": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/findup": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/findup/-/findup-0.1.5.tgz",
-      "integrity": "sha1-itkpozk7rGJ5V6fl3kYjsGsOLOs=",
-      "dependencies": {
-        "colors": "~0.6.0-1",
-        "commander": "~2.1.0"
-      },
-      "bin": {
-        "findup": "bin/findup.js"
-      },
-      "engines": {
-        "node": ">=0.6"
-      }
-    },
-    "node_modules/findup-sync": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-3.0.0.tgz",
-      "integrity": "sha512-YbffarhcicEhOrm4CtrwdKBdCuz576RLdhJDsIfvNtxUuhdRet1qZcsMjqbePtAseKdAnDyM/IyXbu7PRPRLYg==",
-      "dependencies": {
-        "detect-file": "^1.0.0",
-        "is-glob": "^4.0.0",
-        "micromatch": "^3.0.4",
-        "resolve-dir": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/findup-sync/node_modules/braces": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-      "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-      "dependencies": {
-        "arr-flatten": "^1.1.0",
-        "array-unique": "^0.3.2",
-        "extend-shallow": "^2.0.1",
-        "fill-range": "^4.0.0",
-        "isobject": "^3.0.1",
-        "repeat-element": "^1.1.2",
-        "snapdragon": "^0.8.1",
-        "snapdragon-node": "^2.0.1",
-        "split-string": "^3.0.2",
-        "to-regex": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/findup-sync/node_modules/braces/node_modules/extend-shallow": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-      "dependencies": {
-        "is-extendable": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/findup-sync/node_modules/fill-range": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-      "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
-      "dependencies": {
-        "extend-shallow": "^2.0.1",
-        "is-number": "^3.0.0",
-        "repeat-string": "^1.6.1",
-        "to-regex-range": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/findup-sync/node_modules/fill-range/node_modules/extend-shallow": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-      "dependencies": {
-        "is-extendable": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/findup-sync/node_modules/is-number": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-      "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/findup-sync/node_modules/is-number/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/findup-sync/node_modules/isobject": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/findup-sync/node_modules/micromatch": {
-      "version": "3.1.10",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-      "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
-      "dependencies": {
-        "arr-diff": "^4.0.0",
-        "array-unique": "^0.3.2",
-        "braces": "^2.3.1",
-        "define-property": "^2.0.2",
-        "extend-shallow": "^3.0.2",
-        "extglob": "^2.0.4",
-        "fragment-cache": "^0.2.1",
-        "kind-of": "^6.0.2",
-        "nanomatch": "^1.2.9",
-        "object.pick": "^1.3.0",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/findup-sync/node_modules/to-regex-range": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
-      "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
-      "dependencies": {
-        "is-number": "^3.0.0",
-        "repeat-string": "^1.6.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/findup/node_modules/colors": {
-      "version": "0.6.2",
-      "resolved": "https://registry.npmjs.org/colors/-/colors-0.6.2.tgz",
-      "integrity": "sha1-JCP+ZnisDF2uiFLl0OW+CMmXq8w=",
-      "engines": {
-        "node": ">=0.1.90"
-      }
-    },
-    "node_modules/findup/node_modules/commander": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-2.1.0.tgz",
-      "integrity": "sha1-0SG7roYNmZKj1Re6lvVliOR8Z4E=",
-      "engines": {
-        "node": ">= 0.6.x"
-      }
-    },
-    "node_modules/fined": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/fined/-/fined-1.2.0.tgz",
-      "integrity": "sha512-ZYDqPLGxDkDhDZBjZBb+oD1+j0rA4E0pXY50eplAAOPg2N/gUBSSk5IM1/QhPfyVo19lJ+CvXpqfvk+b2p/8Ng==",
-      "dependencies": {
-        "expand-tilde": "^2.0.2",
-        "is-plain-object": "^2.0.3",
-        "object.defaults": "^1.1.0",
-        "object.pick": "^1.2.0",
-        "parse-filepath": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/fined/node_modules/is-plain-object": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
-      "dependencies": {
-        "isobject": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/fined/node_modules/isobject": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/first-chunk-stream": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/first-chunk-stream/-/first-chunk-stream-2.0.0.tgz",
-      "integrity": "sha1-G97NuOCDwGZLkZRVgVd6Q6nzHXA=",
-      "dependencies": {
-        "readable-stream": "^2.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/flagged-respawn": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/flagged-respawn/-/flagged-respawn-1.0.1.tgz",
-      "integrity": "sha512-lNaHNVymajmk0OJMBn8fVUAU1BtDeKIqKoVhk4xAALB57aALg6b4W0MfJ/cUE0g9YBXy5XhSlPIpYIJ7HaY/3Q==",
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/flat-cache": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-2.0.1.tgz",
-      "integrity": "sha512-LoQe6yDuUMDzQAEH8sgmh4Md6oZnc/7PjtwjNFSzveXqSHt6ka9fPBuso7IGf9Rz4uqnSnWiFH2B/zj24a5ReA==",
-      "dev": true,
-      "dependencies": {
-        "flatted": "^2.0.0",
-        "rimraf": "2.6.3",
-        "write": "1.0.3"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/flat-cache/node_modules/rimraf": {
-      "version": "2.6.3",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz",
-      "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
-      "dev": true,
-      "dependencies": {
-        "glob": "^7.1.3"
-      },
-      "bin": {
-        "rimraf": "bin.js"
-      }
-    },
-    "node_modules/flatted": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/flatted/-/flatted-2.0.2.tgz",
-      "integrity": "sha512-r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA=="
-    },
-    "node_modules/flatten": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/flatten/-/flatten-1.0.3.tgz",
-      "integrity": "sha512-dVsPA/UwQ8+2uoFe5GHtiBMu48dWLTdsuEd7CKGlZlD78r1TTWBvDuFaFGKCo/ZfEr95Uk56vZoX86OsHkUeIg==",
-      "deprecated": "flatten is deprecated in favor of utility frameworks such as lodash."
-    },
-    "node_modules/flush-write-stream": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.1.1.tgz",
-      "integrity": "sha512-3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w==",
-      "dependencies": {
-        "inherits": "^2.0.3",
-        "readable-stream": "^2.3.6"
-      }
-    },
-    "node_modules/follow-redirects": {
-      "version": "1.5.10",
-      "resolved": "https://registry.npm.taobao.org/follow-redirects/download/follow-redirects-1.5.10.tgz?cache=0&sync_timestamp=1611606737937&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ffollow-redirects%2Fdownload%2Ffollow-redirects-1.5.10.tgz",
-      "integrity": "sha1-e3qfmuov3/NnhqlP9kPtB/T/Xio=",
-      "dependencies": {
-        "debug": "=3.1.0"
-      },
-      "engines": {
-        "node": ">=4.0"
-      }
-    },
-    "node_modules/follow-redirects/node_modules/debug": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npm.taobao.org/debug/download/debug-3.1.0.tgz?cache=0&sync_timestamp=1607566533140&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdebug%2Fdownload%2Fdebug-3.1.0.tgz",
-      "integrity": "sha1-W7WgZyYotkFJVmuhaBnmFRjGcmE=",
-      "dependencies": {
-        "ms": "2.0.0"
-      }
-    },
-    "node_modules/follow-redirects/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
-    },
-    "node_modules/fomantic-ui": {
-      "version": "2.8.4",
-      "resolved": "https://registry.npmjs.org/fomantic-ui/-/fomantic-ui-2.8.4.tgz",
-      "integrity": "sha512-We34raC+xqoaIOFFamsN8cHc+tCNy+6JWjWmkWIEjeIxZRrbXsoqto8eLFjMIPEwL1C6H0FwONqt39AmL+8zeg==",
-      "hasInstallScript": true,
-      "dependencies": {
-        "@octokit/rest": "^16.16.0",
-        "better-console": "1.0.1",
-        "del": "^3.0.0",
-        "extend": "^3.0.2",
-        "gulp": "^4.0.0",
-        "gulp-autoprefixer": "^6.0.0",
-        "gulp-chmod": "^2.0.0",
-        "gulp-clean-css": "^3.10.0",
-        "gulp-clone": "^2.0.1",
-        "gulp-concat": "^2.6.1",
-        "gulp-concat-css": "^3.1.0",
-        "gulp-concat-filenames": "^1.2.0",
-        "gulp-copy": "^4.0.0",
-        "gulp-debug": "^4.0.0",
-        "gulp-dedupe": "0.0.2",
-        "gulp-flatten": "^0.4.0",
-        "gulp-git": "^2.9.0",
-        "gulp-header": "^2.0.5",
-        "gulp-if": "^2.0.2",
-        "gulp-json-editor": "^2.4.3",
-        "gulp-less": "^4.0.1",
-        "gulp-notify": "^3.0.0",
-        "gulp-plumber": "^1.1.0",
-        "gulp-print": "^5.0.0",
-        "gulp-rename": "^1.4.0",
-        "gulp-replace": "^1.0.0",
-        "gulp-rtlcss": "^1.3.0",
-        "gulp-tap": "^1.0.1",
-        "gulp-uglify": "^3.0.1",
-        "inquirer": "^6.2.1",
-        "jquery": "^3.4.0",
-        "less": "^3.7.0",
-        "map-stream": "^0.1.0",
-        "merge-stream": "^2.0.0",
-        "mkdirp": "^0.5.1",
-        "normalize-path": "^3.0.0",
-        "replace-ext": "^1.0.0",
-        "require-dot-file": "^0.4.0",
-        "wrench-sui": "^0.0.3",
-        "yamljs": "^0.3.0"
-      },
-      "engines": {
-        "node": ">=10.15.3",
-        "npm": ">=6.4.1"
-      }
-    },
-    "node_modules/for-in": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
-      "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/for-own": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/for-own/-/for-own-1.0.0.tgz",
-      "integrity": "sha1-xjMy9BXO3EsE2/5wz4NklMU8tEs=",
-      "dependencies": {
-        "for-in": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/forever-agent": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
-      "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=",
-      "optional": true,
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/fork-stream": {
-      "version": "0.0.4",
-      "resolved": "https://registry.npmjs.org/fork-stream/-/fork-stream-0.0.4.tgz",
-      "integrity": "sha1-24Sfznf2cIpfjzhq5TOgkHtUrnA="
-    },
-    "node_modules/form-data": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",
-      "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==",
-      "dependencies": {
-        "asynckit": "^0.4.0",
-        "combined-stream": "^1.0.6",
-        "mime-types": "^2.1.12"
-      },
-      "engines": {
-        "node": ">= 0.12"
-      }
-    },
-    "node_modules/frac": {
-      "version": "1.1.2",
-      "resolved": "https://registry.nlark.com/frac/download/frac-1.1.2.tgz",
-      "integrity": "sha1-PXT39keMiKG1AgMG10fcYxPHTQs=",
-      "engines": {
-        "node": ">=0.8"
-      }
-    },
-    "node_modules/fragment-cache": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz",
-      "integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=",
-      "dependencies": {
-        "map-cache": "^0.2.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/from2": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/from2/-/from2-2.3.0.tgz",
-      "integrity": "sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=",
-      "dependencies": {
-        "inherits": "^2.0.1",
-        "readable-stream": "^2.0.0"
-      }
-    },
-    "node_modules/fs": {
-      "version": "0.0.1-security",
-      "resolved": "https://registry.npm.taobao.org/fs/download/fs-0.0.1-security.tgz",
-      "integrity": "sha1-invTcYa23d84E/I4WLV+yq9eQdQ="
-    },
-    "node_modules/fs-extra": {
-      "version": "8.1.0",
-      "resolved": "https://registry.npm.taobao.org/fs-extra/download/fs-extra-8.1.0.tgz?cache=0&sync_timestamp=1611075469998&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ffs-extra%2Fdownload%2Ffs-extra-8.1.0.tgz",
-      "integrity": "sha1-SdQ8RaiM2Wd2aMt74bRu/bjS4cA=",
-      "dependencies": {
-        "graceful-fs": "^4.2.0",
-        "jsonfile": "^4.0.0",
-        "universalify": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=6 <7 || >=8"
-      }
-    },
-    "node_modules/fs-minipass": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz",
-      "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==",
-      "dependencies": {
-        "minipass": "^3.0.0"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/fs-mkdirp-stream": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs-mkdirp-stream/-/fs-mkdirp-stream-1.0.0.tgz",
-      "integrity": "sha1-C3gV/DIBxqaeFNuYzgmMFpNSWes=",
-      "dependencies": {
-        "graceful-fs": "^4.1.11",
-        "through2": "^2.0.3"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/fs-write-stream-atomic": {
-      "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz",
-      "integrity": "sha1-tH31NJPvkR33VzHnCp3tAYnbQMk=",
-      "dependencies": {
-        "graceful-fs": "^4.1.2",
-        "iferr": "^0.1.5",
-        "imurmurhash": "^0.1.4",
-        "readable-stream": "1 || 2"
-      }
-    },
-    "node_modules/fs.realpath": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
-    },
-    "node_modules/fsevents": {
-      "version": "1.2.13",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz",
-      "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==",
-      "deprecated": "fsevents 1 will break on node v14+ and could be using insecure binaries. Upgrade to fsevents 2.",
-      "hasInstallScript": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "dependencies": {
-        "bindings": "^1.5.0",
-        "nan": "^2.12.1"
-      },
-      "engines": {
-        "node": ">= 4.0"
-      }
-    },
-    "node_modules/function-bind": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
-    },
-    "node_modules/functional-red-black-tree": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
-      "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=",
-      "dev": true
-    },
-    "node_modules/gensync": {
-      "version": "1.0.0-beta.1",
-      "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.1.tgz",
-      "integrity": "sha512-r8EC6NO1sngH/zdD9fiRDLdcgnbayXah+mLgManTaIZJqEC1MZstmnox8KpnI2/fxQwrp5OpCOYWLp4rBl4Jcg==",
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/get-caller-file": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz",
-      "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w=="
-    },
-    "node_modules/get-imports": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/get-imports/-/get-imports-1.0.0.tgz",
-      "integrity": "sha1-R8C07piTUWQsVJdxk79Pyqv1N48=",
-      "dependencies": {
-        "array-uniq": "^1.0.1",
-        "import-regex": "^1.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/get-own-enumerable-property-symbols": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.2.tgz",
-      "integrity": "sha512-I0UBV/XOz1XkIJHEUDMZAbzCThU/H8DxmSfmdGcKPnVhu2VfFqr34jr9777IyaTYvxjedWhqVIilEDsCdP5G6g=="
-    },
-    "node_modules/get-stdin": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-7.0.0.tgz",
-      "integrity": "sha512-zRKcywvrXlXsA0v0i9Io4KDRaAw7+a1ZpjRwl9Wox8PFlVCCHra7E9c4kqXCoCM9nR5tBkaTTZRBoCm60bFqTQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/get-stream": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
-      "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
-      "dependencies": {
-        "pump": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/get-value": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz",
-      "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/getpass": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
-      "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
-      "optional": true,
-      "dependencies": {
-        "assert-plus": "^1.0.0"
-      }
-    },
-    "node_modules/glob": {
-      "version": "7.1.6",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
-      "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
-      "dependencies": {
-        "fs.realpath": "^1.0.0",
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "^3.0.4",
-        "once": "^1.3.0",
-        "path-is-absolute": "^1.0.0"
-      },
-      "engines": {
-        "node": "*"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/glob-parent": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz",
-      "integrity": "sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==",
-      "dependencies": {
-        "is-glob": "^4.0.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/glob-stream": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-6.1.0.tgz",
-      "integrity": "sha1-cEXJlBOz65SIjYOrRtC0BMx73eQ=",
-      "dependencies": {
-        "extend": "^3.0.0",
-        "glob": "^7.1.1",
-        "glob-parent": "^3.1.0",
-        "is-negated-glob": "^1.0.0",
-        "ordered-read-streams": "^1.0.0",
-        "pumpify": "^1.3.5",
-        "readable-stream": "^2.1.5",
-        "remove-trailing-separator": "^1.0.1",
-        "to-absolute-glob": "^2.0.0",
-        "unique-stream": "^2.0.2"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/glob-stream/node_modules/glob-parent": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
-      "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
-      "dependencies": {
-        "is-glob": "^3.1.0",
-        "path-dirname": "^1.0.0"
-      }
-    },
-    "node_modules/glob-stream/node_modules/is-glob": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
-      "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
-      "dependencies": {
-        "is-extglob": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/glob-watcher": {
-      "version": "5.0.3",
-      "resolved": "https://registry.npmjs.org/glob-watcher/-/glob-watcher-5.0.3.tgz",
-      "integrity": "sha512-8tWsULNEPHKQ2MR4zXuzSmqbdyV5PtwwCaWSGQ1WwHsJ07ilNeN1JB8ntxhckbnpSHaf9dXFUHzIWvm1I13dsg==",
-      "dependencies": {
-        "anymatch": "^2.0.0",
-        "async-done": "^1.2.0",
-        "chokidar": "^2.0.0",
-        "is-negated-glob": "^1.0.0",
-        "just-debounce": "^1.0.0",
-        "object.defaults": "^1.1.0"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/global-modules": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz",
-      "integrity": "sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==",
-      "dependencies": {
-        "global-prefix": "^1.0.1",
-        "is-windows": "^1.0.1",
-        "resolve-dir": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/global-prefix": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-1.0.2.tgz",
-      "integrity": "sha1-2/dDxsFJklk8ZVVoy2btMsASLr4=",
-      "dependencies": {
-        "expand-tilde": "^2.0.2",
-        "homedir-polyfill": "^1.0.1",
-        "ini": "^1.3.4",
-        "is-windows": "^1.0.1",
-        "which": "^1.2.14"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/globals": {
-      "version": "11.12.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
-      "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/globby": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz",
-      "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=",
-      "dependencies": {
-        "array-union": "^1.0.1",
-        "glob": "^7.0.3",
-        "object-assign": "^4.0.1",
-        "pify": "^2.0.0",
-        "pinkie-promise": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/globby/node_modules/pify": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-      "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/globjoin": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/globjoin/-/globjoin-0.1.4.tgz",
-      "integrity": "sha1-L0SUrIkZ43Z8XLtpHp9GMyQoXUM=",
-      "dev": true
-    },
-    "node_modules/glogg": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/glogg/-/glogg-1.0.2.tgz",
-      "integrity": "sha512-5mwUoSuBk44Y4EshyiqcH95ZntbDdTQqA3QYSrxmzj28Ai0vXBGMH1ApSANH14j2sIRtqCEyg6PfsuP7ElOEDA==",
-      "dependencies": {
-        "sparkles": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/gonzales-pe": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/gonzales-pe/-/gonzales-pe-4.3.0.tgz",
-      "integrity": "sha512-otgSPpUmdWJ43VXyiNgEYE4luzHCL2pz4wQ0OnDluC6Eg4Ko3Vexy/SrSynglw/eR+OhkzmqFCZa/OFa/RgAOQ==",
-      "dev": true,
-      "dependencies": {
-        "minimist": "^1.2.5"
-      },
-      "bin": {
-        "gonzales": "bin/gonzales.js"
-      },
-      "engines": {
-        "node": ">=0.6.0"
-      }
-    },
-    "node_modules/good-listener": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/good-listener/-/good-listener-1.2.2.tgz",
-      "integrity": "sha1-1TswzfkxPf+33JoNR3CWqm0UXFA=",
-      "dependencies": {
-        "delegate": "^3.1.2"
-      }
-    },
-    "node_modules/graceful-fs": {
-      "version": "4.2.4",
-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz",
-      "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw=="
-    },
-    "node_modules/growly": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/growly/-/growly-1.3.0.tgz",
-      "integrity": "sha1-8QdIy+dq+WS3yWyTxrzCivEgwIE="
-    },
-    "node_modules/gsap": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/gsap/-/gsap-3.6.0.tgz",
-      "integrity": "sha512-0P3syv1TmYr+A/VZ8UMFzw+s0XoaKSzzDFs8NqkXiJTXI4E/VTi0zRjPgxaPBpiUPPycgRnFjLDe0Tb4dRRf+w=="
-    },
-    "node_modules/gulp": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/gulp/-/gulp-4.0.2.tgz",
-      "integrity": "sha512-dvEs27SCZt2ibF29xYgmnwwCYZxdxhQ/+LFWlbAW8y7jt68L/65402Lz3+CKy0Ov4rOs+NERmDq7YlZaDqUIfA==",
-      "dependencies": {
-        "glob-watcher": "^5.0.3",
-        "gulp-cli": "^2.2.0",
-        "undertaker": "^1.2.1",
-        "vinyl-fs": "^3.0.0"
-      },
-      "bin": {
-        "gulp": "bin/gulp.js"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/gulp-autoprefixer": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/gulp-autoprefixer/-/gulp-autoprefixer-6.1.0.tgz",
-      "integrity": "sha512-Ti/BUFe+ekhbDJfspZIMiOsOvw51KhI9EncsDfK7NaxjqRm+v4xS9v99kPxEoiDavpWqQWvG8Y6xT1mMlB3aXA==",
-      "dependencies": {
-        "autoprefixer": "^9.5.1",
-        "fancy-log": "^1.3.2",
-        "plugin-error": "^1.0.1",
-        "postcss": "^7.0.2",
-        "through2": "^3.0.1",
-        "vinyl-sourcemaps-apply": "^0.2.1"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/gulp-autoprefixer/node_modules/through2": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/through2/-/through2-3.0.1.tgz",
-      "integrity": "sha512-M96dvTalPT3YbYLaKaCuwu+j06D/8Jfib0o/PxbVt6Amhv3dUAtW6rTV1jPgJSBG83I/e04Y6xkVdVhSRhi0ww==",
-      "dependencies": {
-        "readable-stream": "2 || 3"
-      }
-    },
-    "node_modules/gulp-chmod": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/gulp-chmod/-/gulp-chmod-2.0.0.tgz",
-      "integrity": "sha1-AMOQuSigeZslGsz2MaoJ4BzGKZw=",
-      "dependencies": {
-        "deep-assign": "^1.0.0",
-        "stat-mode": "^0.2.0",
-        "through2": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/gulp-clean-css": {
-      "version": "3.10.0",
-      "resolved": "https://registry.npmjs.org/gulp-clean-css/-/gulp-clean-css-3.10.0.tgz",
-      "integrity": "sha512-7Isf9Y690o/Q5MVjEylH1H7L8WeZ89woW7DnhD5unTintOdZb67KdOayRgp9trUFo+f9UyJtuatV42e/+kghPg==",
-      "dependencies": {
-        "clean-css": "4.2.1",
-        "plugin-error": "1.0.1",
-        "through2": "2.0.3",
-        "vinyl-sourcemaps-apply": "0.2.1"
-      }
-    },
-    "node_modules/gulp-clean-css/node_modules/through2": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz",
-      "integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=",
-      "dependencies": {
-        "readable-stream": "^2.1.5",
-        "xtend": "~4.0.1"
-      }
-    },
-    "node_modules/gulp-clone": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/gulp-clone/-/gulp-clone-2.0.1.tgz",
-      "integrity": "sha512-SLg/KsHBbinR/pCX3PF5l1YlR28hLp0X+bcpf77PtMJ6zvAQ5kRjtCPV5Wt1wHXsXWZN0eTUZ15R8ZYpi/CdCA==",
-      "dependencies": {
-        "plugin-error": "^0.1.2",
-        "through2": "^2.0.3"
-      }
-    },
-    "node_modules/gulp-clone/node_modules/arr-diff": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-1.1.0.tgz",
-      "integrity": "sha1-aHwydYFjWI/vfeezb6vklesaOZo=",
-      "dependencies": {
-        "arr-flatten": "^1.0.1",
-        "array-slice": "^0.2.3"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp-clone/node_modules/arr-union": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-2.1.0.tgz",
-      "integrity": "sha1-IPnqtexw9cfSFbEHexw5Fh0pLH0=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp-clone/node_modules/array-slice": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-0.2.3.tgz",
-      "integrity": "sha1-3Tz7gO15c6dRF82sabC5nshhhvU=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp-clone/node_modules/extend-shallow": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-1.1.4.tgz",
-      "integrity": "sha1-Gda/lN/AnXa6cR85uHLSH/TdkHE=",
-      "dependencies": {
-        "kind-of": "^1.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp-clone/node_modules/kind-of": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-1.1.0.tgz",
-      "integrity": "sha1-FAo9LUGjbS78+pN3tiwk+ElaXEQ=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp-clone/node_modules/plugin-error": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-0.1.2.tgz",
-      "integrity": "sha1-O5uzM1zPAPQl4HQ34ZJ2ln2kes4=",
-      "dependencies": {
-        "ansi-cyan": "^0.1.1",
-        "ansi-red": "^0.1.1",
-        "arr-diff": "^1.0.1",
-        "arr-union": "^2.0.1",
-        "extend-shallow": "^1.1.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp-concat": {
-      "version": "2.6.1",
-      "resolved": "https://registry.npmjs.org/gulp-concat/-/gulp-concat-2.6.1.tgz",
-      "integrity": "sha1-Yz0WyV2IUEYorQJmVmPO5aR5M1M=",
-      "dependencies": {
-        "concat-with-sourcemaps": "^1.0.0",
-        "through2": "^2.0.0",
-        "vinyl": "^2.0.0"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/gulp-concat-css": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/gulp-concat-css/-/gulp-concat-css-3.1.0.tgz",
-      "integrity": "sha512-iLTBPS+cutlgLyK3bp9DMts+WuS8n2mQpjzQ7p/ZVQc8FO5fvpN+ntg9U6jsuNvPeuii82aKm8XeOzF0nUK+TA==",
-      "dependencies": {
-        "lodash.defaults": "^3.0.0",
-        "parse-import": "^2.0.0",
-        "plugin-error": "^0.1.2",
-        "rework": "~1.0.0",
-        "rework-import": "^2.0.0",
-        "rework-plugin-url": "^1.0.1",
-        "through2": "~1.1.1",
-        "vinyl": "^2.1.0"
-      }
-    },
-    "node_modules/gulp-concat-css/node_modules/arr-diff": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-1.1.0.tgz",
-      "integrity": "sha1-aHwydYFjWI/vfeezb6vklesaOZo=",
-      "dependencies": {
-        "arr-flatten": "^1.0.1",
-        "array-slice": "^0.2.3"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp-concat-css/node_modules/arr-union": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-2.1.0.tgz",
-      "integrity": "sha1-IPnqtexw9cfSFbEHexw5Fh0pLH0=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp-concat-css/node_modules/array-slice": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-0.2.3.tgz",
-      "integrity": "sha1-3Tz7gO15c6dRF82sabC5nshhhvU=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp-concat-css/node_modules/extend-shallow": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-1.1.4.tgz",
-      "integrity": "sha1-Gda/lN/AnXa6cR85uHLSH/TdkHE=",
-      "dependencies": {
-        "kind-of": "^1.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp-concat-css/node_modules/isarray": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-      "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8="
-    },
-    "node_modules/gulp-concat-css/node_modules/kind-of": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-1.1.0.tgz",
-      "integrity": "sha1-FAo9LUGjbS78+pN3tiwk+ElaXEQ=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp-concat-css/node_modules/plugin-error": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-0.1.2.tgz",
-      "integrity": "sha1-O5uzM1zPAPQl4HQ34ZJ2ln2kes4=",
-      "dependencies": {
-        "ansi-cyan": "^0.1.1",
-        "ansi-red": "^0.1.1",
-        "arr-diff": "^1.0.1",
-        "arr-union": "^2.0.1",
-        "extend-shallow": "^1.1.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp-concat-css/node_modules/readable-stream": {
-      "version": "1.1.14",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
-      "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
-      "dependencies": {
-        "core-util-is": "~1.0.0",
-        "inherits": "~2.0.1",
-        "isarray": "0.0.1",
-        "string_decoder": "~0.10.x"
-      }
-    },
-    "node_modules/gulp-concat-css/node_modules/string_decoder": {
-      "version": "0.10.31",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-      "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ="
-    },
-    "node_modules/gulp-concat-css/node_modules/through2": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/through2/-/through2-1.1.1.tgz",
-      "integrity": "sha1-CEfLxESfNAVXTb3M2buEG4OsNUU=",
-      "dependencies": {
-        "readable-stream": ">=1.1.13-1 <1.2.0-0",
-        "xtend": ">=4.0.0 <4.1.0-0"
-      }
-    },
-    "node_modules/gulp-concat-filenames": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/gulp-concat-filenames/-/gulp-concat-filenames-1.2.0.tgz",
-      "integrity": "sha1-3b904qupfi9NoVVjUwT9UcdVt2E=",
-      "dependencies": {
-        "gulp-util": "3.x.x",
-        "through": "2.x.x"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/gulp-copy": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/gulp-copy/-/gulp-copy-4.0.1.tgz",
-      "integrity": "sha512-UbdAwmEiVNNv55KAiUYWOP6Za7h8JPHNNyekNx8Gyc5XRlpUzTrlEclps939nOeiDPsd6jUtT2LmfavJirbZQg==",
-      "dependencies": {
-        "gulp": "^4.0.0",
-        "plugin-error": "^0.1.2",
-        "through2": "^2.0.3"
-      }
-    },
-    "node_modules/gulp-copy/node_modules/arr-diff": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-1.1.0.tgz",
-      "integrity": "sha1-aHwydYFjWI/vfeezb6vklesaOZo=",
-      "dependencies": {
-        "arr-flatten": "^1.0.1",
-        "array-slice": "^0.2.3"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp-copy/node_modules/arr-union": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-2.1.0.tgz",
-      "integrity": "sha1-IPnqtexw9cfSFbEHexw5Fh0pLH0=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp-copy/node_modules/array-slice": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-0.2.3.tgz",
-      "integrity": "sha1-3Tz7gO15c6dRF82sabC5nshhhvU=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp-copy/node_modules/extend-shallow": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-1.1.4.tgz",
-      "integrity": "sha1-Gda/lN/AnXa6cR85uHLSH/TdkHE=",
-      "dependencies": {
-        "kind-of": "^1.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp-copy/node_modules/kind-of": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-1.1.0.tgz",
-      "integrity": "sha1-FAo9LUGjbS78+pN3tiwk+ElaXEQ=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp-copy/node_modules/plugin-error": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-0.1.2.tgz",
-      "integrity": "sha1-O5uzM1zPAPQl4HQ34ZJ2ln2kes4=",
-      "dependencies": {
-        "ansi-cyan": "^0.1.1",
-        "ansi-red": "^0.1.1",
-        "arr-diff": "^1.0.1",
-        "arr-union": "^2.0.1",
-        "extend-shallow": "^1.1.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp-debug": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/gulp-debug/-/gulp-debug-4.0.0.tgz",
-      "integrity": "sha512-cn/GhMD2nVZCVxAl5vWao4/dcoZ8wUJ8w3oqTvQaGDmC1vT7swNOEbhQTWJp+/otKePT64aENcqAQXDcdj5H1g==",
-      "dependencies": {
-        "chalk": "^2.3.0",
-        "fancy-log": "^1.3.2",
-        "plur": "^3.0.0",
-        "stringify-object": "^3.0.0",
-        "through2": "^2.0.0",
-        "tildify": "^1.1.2"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "peerDependencies": {
-        "gulp": ">=4"
-      }
-    },
-    "node_modules/gulp-dedupe": {
-      "version": "0.0.2",
-      "resolved": "https://registry.npmjs.org/gulp-dedupe/-/gulp-dedupe-0.0.2.tgz",
-      "integrity": "sha1-Nu+Srff89T4vCW++lmXZiPnhyn4=",
-      "dependencies": {
-        "colors": "~1.0.2",
-        "diff": "~1.0.8",
-        "gulp-util": "~3.0.1",
-        "lodash.defaults": "~2.4.1",
-        "through": "~2.3.6"
-      },
-      "engines": {
-        "node": ">=0.10"
-      }
-    },
-    "node_modules/gulp-dedupe/node_modules/lodash.defaults": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-2.4.1.tgz",
-      "integrity": "sha1-p+iIXwXmiFEUS24SqPNngCa8TFQ=",
-      "dependencies": {
-        "lodash._objecttypes": "~2.4.1",
-        "lodash.keys": "~2.4.1"
-      }
-    },
-    "node_modules/gulp-dedupe/node_modules/lodash.keys": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-2.4.1.tgz",
-      "integrity": "sha1-SN6kbfj/djKxDXBrissmWR4rNyc=",
-      "dependencies": {
-        "lodash._isnative": "~2.4.1",
-        "lodash._shimkeys": "~2.4.1",
-        "lodash.isobject": "~2.4.1"
-      }
-    },
-    "node_modules/gulp-flatten": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/gulp-flatten/-/gulp-flatten-0.4.0.tgz",
-      "integrity": "sha512-eg4spVTAiv1xXmugyaCxWne1oPtNG0UHEtABx5W8ScLiqAYceyYm6GYA36x0Qh8KOIXmAZV97L2aYGnKREG3Sg==",
-      "dependencies": {
-        "plugin-error": "^0.1.2",
-        "through2": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10"
-      }
-    },
-    "node_modules/gulp-flatten/node_modules/arr-diff": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-1.1.0.tgz",
-      "integrity": "sha1-aHwydYFjWI/vfeezb6vklesaOZo=",
-      "dependencies": {
-        "arr-flatten": "^1.0.1",
-        "array-slice": "^0.2.3"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp-flatten/node_modules/arr-union": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-2.1.0.tgz",
-      "integrity": "sha1-IPnqtexw9cfSFbEHexw5Fh0pLH0=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp-flatten/node_modules/array-slice": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-0.2.3.tgz",
-      "integrity": "sha1-3Tz7gO15c6dRF82sabC5nshhhvU=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp-flatten/node_modules/extend-shallow": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-1.1.4.tgz",
-      "integrity": "sha1-Gda/lN/AnXa6cR85uHLSH/TdkHE=",
-      "dependencies": {
-        "kind-of": "^1.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp-flatten/node_modules/kind-of": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-1.1.0.tgz",
-      "integrity": "sha1-FAo9LUGjbS78+pN3tiwk+ElaXEQ=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp-flatten/node_modules/plugin-error": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-0.1.2.tgz",
-      "integrity": "sha1-O5uzM1zPAPQl4HQ34ZJ2ln2kes4=",
-      "dependencies": {
-        "ansi-cyan": "^0.1.1",
-        "ansi-red": "^0.1.1",
-        "arr-diff": "^1.0.1",
-        "arr-union": "^2.0.1",
-        "extend-shallow": "^1.1.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp-git": {
-      "version": "2.10.1",
-      "resolved": "https://registry.npmjs.org/gulp-git/-/gulp-git-2.10.1.tgz",
-      "integrity": "sha512-qiXYYDXchMZU/AWAgtphi4zbJb/0gXgfPw7TlZwu/7qPS3Bdcc3zbVe1B0xY9S8on6RQTmWoi+KaTGACIXQeNg==",
-      "dependencies": {
-        "any-shell-escape": "^0.1.1",
-        "fancy-log": "^1.3.2",
-        "lodash.template": "^4.4.0",
-        "plugin-error": "^1.0.1",
-        "require-dir": "^1.0.0",
-        "strip-bom-stream": "^3.0.0",
-        "through2": "^2.0.3",
-        "vinyl": "^2.0.1"
-      },
-      "engines": {
-        "node": ">= 0.9.0"
-      }
-    },
-    "node_modules/gulp-git/node_modules/lodash.template": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-4.5.0.tgz",
-      "integrity": "sha512-84vYFxIkmidUiFxidA/KjjH9pAycqW+h980j7Fuz5qxRtO9pgB7MDFTdys1N7A5mcucRiDyEq4fusljItR1T/A==",
-      "dependencies": {
-        "lodash._reinterpolate": "^3.0.0",
-        "lodash.templatesettings": "^4.0.0"
-      }
-    },
-    "node_modules/gulp-git/node_modules/lodash.templatesettings": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-4.2.0.tgz",
-      "integrity": "sha512-stgLz+i3Aa9mZgnjr/O+v9ruKZsPsndy7qPZOchbqk2cnTU1ZaldKK+v7m54WoKIyxiuMZTKT2H81F8BeAc3ZQ==",
-      "dependencies": {
-        "lodash._reinterpolate": "^3.0.0"
-      }
-    },
-    "node_modules/gulp-header": {
-      "version": "2.0.9",
-      "resolved": "https://registry.npmjs.org/gulp-header/-/gulp-header-2.0.9.tgz",
-      "integrity": "sha512-LMGiBx+qH8giwrOuuZXSGvswcIUh0OiioNkUpLhNyvaC6/Ga8X6cfAeme2L5PqsbXMhL8o8b/OmVqIQdxprhcQ==",
-      "dependencies": {
-        "concat-with-sourcemaps": "^1.1.0",
-        "lodash.template": "^4.5.0",
-        "map-stream": "0.0.7",
-        "through2": "^2.0.0"
-      }
-    },
-    "node_modules/gulp-header/node_modules/lodash.template": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-4.5.0.tgz",
-      "integrity": "sha512-84vYFxIkmidUiFxidA/KjjH9pAycqW+h980j7Fuz5qxRtO9pgB7MDFTdys1N7A5mcucRiDyEq4fusljItR1T/A==",
-      "dependencies": {
-        "lodash._reinterpolate": "^3.0.0",
-        "lodash.templatesettings": "^4.0.0"
-      }
-    },
-    "node_modules/gulp-header/node_modules/lodash.templatesettings": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-4.2.0.tgz",
-      "integrity": "sha512-stgLz+i3Aa9mZgnjr/O+v9ruKZsPsndy7qPZOchbqk2cnTU1ZaldKK+v7m54WoKIyxiuMZTKT2H81F8BeAc3ZQ==",
-      "dependencies": {
-        "lodash._reinterpolate": "^3.0.0"
-      }
-    },
-    "node_modules/gulp-header/node_modules/map-stream": {
-      "version": "0.0.7",
-      "resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.0.7.tgz",
-      "integrity": "sha1-ih8HiW2CsQkmvTdEokIACfiJdKg="
-    },
-    "node_modules/gulp-if": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/gulp-if/-/gulp-if-2.0.2.tgz",
-      "integrity": "sha1-pJe351cwBQQcqivIt92jyARE1ik=",
-      "dependencies": {
-        "gulp-match": "^1.0.3",
-        "ternary-stream": "^2.0.1",
-        "through2": "^2.0.1"
-      },
-      "engines": {
-        "node": ">= 0.10.0"
-      }
-    },
-    "node_modules/gulp-json-editor": {
-      "version": "2.5.4",
-      "resolved": "https://registry.npmjs.org/gulp-json-editor/-/gulp-json-editor-2.5.4.tgz",
-      "integrity": "sha512-3IdMYsSACfLFYipet9Rmpag7PEU059KnR6TWgfuAfz+ftyzN8yaEvf9vXAD5b9K9v711Ymcpqe6vWGQYfQJ/uQ==",
-      "dependencies": {
-        "deepmerge": "^4.2.1",
-        "detect-indent": "^6.0.0",
-        "js-beautify": "^1.10.2",
-        "plugin-error": "^1.0.1",
-        "through2": "^3.0.1"
-      }
-    },
-    "node_modules/gulp-json-editor/node_modules/through2": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/through2/-/through2-3.0.1.tgz",
-      "integrity": "sha512-M96dvTalPT3YbYLaKaCuwu+j06D/8Jfib0o/PxbVt6Amhv3dUAtW6rTV1jPgJSBG83I/e04Y6xkVdVhSRhi0ww==",
-      "dependencies": {
-        "readable-stream": "2 || 3"
-      }
-    },
-    "node_modules/gulp-less": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/gulp-less/-/gulp-less-4.0.1.tgz",
-      "integrity": "sha512-hmM2k0FfQp7Ptm3ZaqO2CkMX3hqpiIOn4OHtuSsCeFym63F7oWlEua5v6u1cIjVUKYsVIs9zPg9vbqTEb/udpA==",
-      "dependencies": {
-        "accord": "^0.29.0",
-        "less": "2.6.x || ^3.7.1",
-        "object-assign": "^4.0.1",
-        "plugin-error": "^0.1.2",
-        "replace-ext": "^1.0.0",
-        "through2": "^2.0.0",
-        "vinyl-sourcemaps-apply": "^0.2.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp-less/node_modules/arr-diff": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-1.1.0.tgz",
-      "integrity": "sha1-aHwydYFjWI/vfeezb6vklesaOZo=",
-      "dependencies": {
-        "arr-flatten": "^1.0.1",
-        "array-slice": "^0.2.3"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp-less/node_modules/arr-union": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-2.1.0.tgz",
-      "integrity": "sha1-IPnqtexw9cfSFbEHexw5Fh0pLH0=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp-less/node_modules/array-slice": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-0.2.3.tgz",
-      "integrity": "sha1-3Tz7gO15c6dRF82sabC5nshhhvU=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp-less/node_modules/extend-shallow": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-1.1.4.tgz",
-      "integrity": "sha1-Gda/lN/AnXa6cR85uHLSH/TdkHE=",
-      "dependencies": {
-        "kind-of": "^1.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp-less/node_modules/kind-of": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-1.1.0.tgz",
-      "integrity": "sha1-FAo9LUGjbS78+pN3tiwk+ElaXEQ=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp-less/node_modules/plugin-error": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-0.1.2.tgz",
-      "integrity": "sha1-O5uzM1zPAPQl4HQ34ZJ2ln2kes4=",
-      "dependencies": {
-        "ansi-cyan": "^0.1.1",
-        "ansi-red": "^0.1.1",
-        "arr-diff": "^1.0.1",
-        "arr-union": "^2.0.1",
-        "extend-shallow": "^1.1.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp-match": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/gulp-match/-/gulp-match-1.1.0.tgz",
-      "integrity": "sha512-DlyVxa1Gj24DitY2OjEsS+X6tDpretuxD6wTfhXE/Rw2hweqc1f6D/XtsJmoiCwLWfXgR87W9ozEityPCVzGtQ==",
-      "dependencies": {
-        "minimatch": "^3.0.3"
-      }
-    },
-    "node_modules/gulp-notify": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/gulp-notify/-/gulp-notify-3.2.0.tgz",
-      "integrity": "sha512-qEocs1UVoDKKUjfsxJNMNwkRla0PbsyJwsqNNXpzYWsLQ29LhxRMY3wnTGZcc4hMHtalnvah/Dwlwb4NijH/0A==",
-      "dependencies": {
-        "ansi-colors": "^1.0.1",
-        "fancy-log": "^1.3.2",
-        "lodash.template": "^4.4.0",
-        "node-notifier": "^5.2.1",
-        "node.extend": "^2.0.0",
-        "plugin-error": "^0.1.2",
-        "through2": "^2.0.3"
-      },
-      "engines": {
-        "node": ">=0.8.0",
-        "npm": ">=1.2.10"
-      }
-    },
-    "node_modules/gulp-notify/node_modules/arr-diff": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-1.1.0.tgz",
-      "integrity": "sha1-aHwydYFjWI/vfeezb6vklesaOZo=",
-      "dependencies": {
-        "arr-flatten": "^1.0.1",
-        "array-slice": "^0.2.3"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp-notify/node_modules/arr-union": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-2.1.0.tgz",
-      "integrity": "sha1-IPnqtexw9cfSFbEHexw5Fh0pLH0=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp-notify/node_modules/array-slice": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-0.2.3.tgz",
-      "integrity": "sha1-3Tz7gO15c6dRF82sabC5nshhhvU=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp-notify/node_modules/extend-shallow": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-1.1.4.tgz",
-      "integrity": "sha1-Gda/lN/AnXa6cR85uHLSH/TdkHE=",
-      "dependencies": {
-        "kind-of": "^1.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp-notify/node_modules/kind-of": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-1.1.0.tgz",
-      "integrity": "sha1-FAo9LUGjbS78+pN3tiwk+ElaXEQ=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp-notify/node_modules/lodash.template": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-4.5.0.tgz",
-      "integrity": "sha512-84vYFxIkmidUiFxidA/KjjH9pAycqW+h980j7Fuz5qxRtO9pgB7MDFTdys1N7A5mcucRiDyEq4fusljItR1T/A==",
-      "dependencies": {
-        "lodash._reinterpolate": "^3.0.0",
-        "lodash.templatesettings": "^4.0.0"
-      }
-    },
-    "node_modules/gulp-notify/node_modules/lodash.templatesettings": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-4.2.0.tgz",
-      "integrity": "sha512-stgLz+i3Aa9mZgnjr/O+v9ruKZsPsndy7qPZOchbqk2cnTU1ZaldKK+v7m54WoKIyxiuMZTKT2H81F8BeAc3ZQ==",
-      "dependencies": {
-        "lodash._reinterpolate": "^3.0.0"
-      }
-    },
-    "node_modules/gulp-notify/node_modules/plugin-error": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-0.1.2.tgz",
-      "integrity": "sha1-O5uzM1zPAPQl4HQ34ZJ2ln2kes4=",
-      "dependencies": {
-        "ansi-cyan": "^0.1.1",
-        "ansi-red": "^0.1.1",
-        "arr-diff": "^1.0.1",
-        "arr-union": "^2.0.1",
-        "extend-shallow": "^1.1.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp-plumber": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/gulp-plumber/-/gulp-plumber-1.2.1.tgz",
-      "integrity": "sha512-mctAi9msEAG7XzW5ytDVZ9PxWMzzi1pS2rBH7lA095DhMa6KEXjm+St0GOCc567pJKJ/oCvosVAZEpAey0q2eQ==",
-      "dependencies": {
-        "chalk": "^1.1.3",
-        "fancy-log": "^1.3.2",
-        "plugin-error": "^0.1.2",
-        "through2": "^2.0.3"
-      },
-      "engines": {
-        "node": ">=0.10",
-        "npm": ">=1.2.10"
-      }
-    },
-    "node_modules/gulp-plumber/node_modules/ansi-styles": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-      "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp-plumber/node_modules/arr-diff": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-1.1.0.tgz",
-      "integrity": "sha1-aHwydYFjWI/vfeezb6vklesaOZo=",
-      "dependencies": {
-        "arr-flatten": "^1.0.1",
-        "array-slice": "^0.2.3"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp-plumber/node_modules/arr-union": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-2.1.0.tgz",
-      "integrity": "sha1-IPnqtexw9cfSFbEHexw5Fh0pLH0=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp-plumber/node_modules/array-slice": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-0.2.3.tgz",
-      "integrity": "sha1-3Tz7gO15c6dRF82sabC5nshhhvU=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp-plumber/node_modules/chalk": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-      "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-      "dependencies": {
-        "ansi-styles": "^2.2.1",
-        "escape-string-regexp": "^1.0.2",
-        "has-ansi": "^2.0.0",
-        "strip-ansi": "^3.0.0",
-        "supports-color": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp-plumber/node_modules/extend-shallow": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-1.1.4.tgz",
-      "integrity": "sha1-Gda/lN/AnXa6cR85uHLSH/TdkHE=",
-      "dependencies": {
-        "kind-of": "^1.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp-plumber/node_modules/kind-of": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-1.1.0.tgz",
-      "integrity": "sha1-FAo9LUGjbS78+pN3tiwk+ElaXEQ=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp-plumber/node_modules/plugin-error": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-0.1.2.tgz",
-      "integrity": "sha1-O5uzM1zPAPQl4HQ34ZJ2ln2kes4=",
-      "dependencies": {
-        "ansi-cyan": "^0.1.1",
-        "ansi-red": "^0.1.1",
-        "arr-diff": "^1.0.1",
-        "arr-union": "^2.0.1",
-        "extend-shallow": "^1.1.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp-plumber/node_modules/supports-color": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-      "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
-    "node_modules/gulp-print": {
-      "version": "5.0.2",
-      "resolved": "https://registry.npmjs.org/gulp-print/-/gulp-print-5.0.2.tgz",
-      "integrity": "sha512-iIpHMzC/b3gFvVXOfP9Jk94SWGIsDLVNUrxULRleQev+08ug07mh84b1AOlW6QDQdmInQiqDFqJN1UvhU2nXdg==",
-      "dependencies": {
-        "ansi-colors": "^3.2.4",
-        "fancy-log": "^1.3.3",
-        "map-stream": "0.0.7",
-        "vinyl": "^2.2.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/gulp-print/node_modules/ansi-colors": {
-      "version": "3.2.4",
-      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.4.tgz",
-      "integrity": "sha512-hHUXGagefjN2iRrID63xckIvotOXOojhQKWIPUZ4mNUZ9nLZW+7FMNoE1lOkEhNWYsx/7ysGIuJYCiMAA9FnrA==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/gulp-print/node_modules/map-stream": {
-      "version": "0.0.7",
-      "resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.0.7.tgz",
-      "integrity": "sha1-ih8HiW2CsQkmvTdEokIACfiJdKg="
-    },
-    "node_modules/gulp-rename": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/gulp-rename/-/gulp-rename-1.4.0.tgz",
-      "integrity": "sha512-swzbIGb/arEoFK89tPY58vg3Ok1bw+d35PfUNwWqdo7KM4jkmuGA78JiDNqR+JeZFaeeHnRg9N7aihX3YPmsyg==",
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/gulp-replace": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/gulp-replace/-/gulp-replace-1.0.0.tgz",
-      "integrity": "sha512-lgdmrFSI1SdhNMXZQbrC75MOl1UjYWlOWNbNRnz+F/KHmgxt3l6XstBoAYIdadwETFyG/6i+vWUSCawdC3pqOw==",
-      "dependencies": {
-        "istextorbinary": "2.2.1",
-        "readable-stream": "^2.0.1",
-        "replacestream": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=0.10"
-      }
-    },
-    "node_modules/gulp-rtlcss": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/gulp-rtlcss/-/gulp-rtlcss-1.4.1.tgz",
-      "integrity": "sha512-xXqTnmNbcjA6K9ogR36i2SaN8E5CWTCtRQGSY2k0W3cOISGnNkBTAt0GNThlq9iJT0ttR759kopDGn5PZTH4kg==",
-      "dependencies": {
-        "plugin-error": "^1.0.1",
-        "rtlcss": "^2.4.0",
-        "through2": "^2.0.5",
-        "vinyl-sourcemaps-apply": "^0.2.1"
-      }
-    },
-    "node_modules/gulp-tap": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/gulp-tap/-/gulp-tap-1.0.1.tgz",
-      "integrity": "sha1-5nESThJZtM6iGe0cqXt/WFwzRpA=",
-      "dependencies": {
-        "through2": "^2.0.3"
-      }
-    },
-    "node_modules/gulp-uglify": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/gulp-uglify/-/gulp-uglify-3.0.2.tgz",
-      "integrity": "sha512-gk1dhB74AkV2kzqPMQBLA3jPoIAPd/nlNzP2XMDSG8XZrqnlCiDGAqC+rZOumzFvB5zOphlFh6yr3lgcAb/OOg==",
-      "dependencies": {
-        "array-each": "^1.0.1",
-        "extend-shallow": "^3.0.2",
-        "gulplog": "^1.0.0",
-        "has-gulplog": "^0.1.0",
-        "isobject": "^3.0.1",
-        "make-error-cause": "^1.1.1",
-        "safe-buffer": "^5.1.2",
-        "through2": "^2.0.0",
-        "uglify-js": "^3.0.5",
-        "vinyl-sourcemaps-apply": "^0.2.0"
-      }
-    },
-    "node_modules/gulp-uglify/node_modules/isobject": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp-uglify/node_modules/uglify-js": {
-      "version": "3.9.3",
-      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.9.3.tgz",
-      "integrity": "sha512-r5ImcL6QyzQGVimQoov3aL2ZScywrOgBXGndbWrdehKoSvGe/RmiE5Jpw/v+GvxODt6l2tpBXwA7n+qZVlHBMA==",
-      "dependencies": {
-        "commander": "~2.20.3"
-      },
-      "bin": {
-        "uglifyjs": "bin/uglifyjs"
-      },
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
-    "node_modules/gulp-util": {
-      "version": "3.0.8",
-      "resolved": "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.8.tgz",
-      "integrity": "sha1-AFTh50RQLifATBh8PsxQXdVLu08=",
-      "deprecated": "gulp-util is deprecated - replace it, following the guidelines at https://medium.com/gulpjs/gulp-util-ca3b1f9f9ac5",
-      "dependencies": {
-        "array-differ": "^1.0.0",
-        "array-uniq": "^1.0.2",
-        "beeper": "^1.0.0",
-        "chalk": "^1.0.0",
-        "dateformat": "^2.0.0",
-        "fancy-log": "^1.1.0",
-        "gulplog": "^1.0.0",
-        "has-gulplog": "^0.1.0",
-        "lodash._reescape": "^3.0.0",
-        "lodash._reevaluate": "^3.0.0",
-        "lodash._reinterpolate": "^3.0.0",
-        "lodash.template": "^3.0.0",
-        "minimist": "^1.1.0",
-        "multipipe": "^0.1.2",
-        "object-assign": "^3.0.0",
-        "replace-ext": "0.0.1",
-        "through2": "^2.0.0",
-        "vinyl": "^0.5.0"
-      },
-      "engines": {
-        "node": ">=0.10"
-      }
-    },
-    "node_modules/gulp-util/node_modules/ansi-styles": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-      "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp-util/node_modules/chalk": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-      "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-      "dependencies": {
-        "ansi-styles": "^2.2.1",
-        "escape-string-regexp": "^1.0.2",
-        "has-ansi": "^2.0.0",
-        "strip-ansi": "^3.0.0",
-        "supports-color": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp-util/node_modules/clone": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz",
-      "integrity": "sha1-2jCcwmPfFZlMaIypAheco8fNfH4=",
-      "engines": {
-        "node": ">=0.8"
-      }
-    },
-    "node_modules/gulp-util/node_modules/clone-stats": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz",
-      "integrity": "sha1-uI+UqCzzi4eR1YBG6kAprYjKmdE="
-    },
-    "node_modules/gulp-util/node_modules/object-assign": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz",
-      "integrity": "sha1-m+3VygiXlJvKR+f/QIBi1Un1h/I=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp-util/node_modules/replace-ext": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz",
-      "integrity": "sha1-KbvZIHinOfC8zitO5B6DeVNSKSQ=",
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/gulp-util/node_modules/supports-color": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-      "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
-    "node_modules/gulp-util/node_modules/vinyl": {
-      "version": "0.5.3",
-      "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.5.3.tgz",
-      "integrity": "sha1-sEVbOPxeDPMNQyUTLkYZcMIJHN4=",
-      "dependencies": {
-        "clone": "^1.0.0",
-        "clone-stats": "^0.0.1",
-        "replace-ext": "0.0.1"
-      },
-      "engines": {
-        "node": ">= 0.9"
-      }
-    },
-    "node_modules/gulp/node_modules/gulp-cli": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/gulp-cli/-/gulp-cli-2.2.0.tgz",
-      "integrity": "sha512-rGs3bVYHdyJpLqR0TUBnlcZ1O5O++Zs4bA0ajm+zr3WFCfiSLjGwoCBqFs18wzN+ZxahT9DkOK5nDf26iDsWjA==",
-      "dependencies": {
-        "ansi-colors": "^1.0.1",
-        "archy": "^1.0.0",
-        "array-sort": "^1.0.0",
-        "color-support": "^1.1.3",
-        "concat-stream": "^1.6.0",
-        "copy-props": "^2.0.1",
-        "fancy-log": "^1.3.2",
-        "gulplog": "^1.0.0",
-        "interpret": "^1.1.0",
-        "isobject": "^3.0.1",
-        "liftoff": "^3.1.0",
-        "matchdep": "^2.0.0",
-        "mute-stdout": "^1.0.0",
-        "pretty-hrtime": "^1.0.0",
-        "replace-homedir": "^1.0.0",
-        "semver-greatest-satisfied-range": "^1.1.0",
-        "v8flags": "^3.0.1",
-        "yargs": "^7.1.0"
-      },
-      "bin": {
-        "gulp": "bin/gulp.js"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/gulp/node_modules/isobject": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulplog": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/gulplog/-/gulplog-1.0.0.tgz",
-      "integrity": "sha1-4oxNRdBey77YGDY86PnFkmIp/+U=",
-      "dependencies": {
-        "glogg": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/har-schema": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
-      "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=",
-      "optional": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/har-validator": {
-      "version": "5.1.3",
-      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz",
-      "integrity": "sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==",
-      "deprecated": "this library is no longer supported",
-      "optional": true,
-      "dependencies": {
-        "ajv": "^6.5.5",
-        "har-schema": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/hard-rejection": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/hard-rejection/-/hard-rejection-2.1.0.tgz",
-      "integrity": "sha512-VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/has": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
-      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
-      "dependencies": {
-        "function-bind": "^1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.4.0"
-      }
-    },
-    "node_modules/has-ansi": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
-      "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
-      "dependencies": {
-        "ansi-regex": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/has-gulplog": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/has-gulplog/-/has-gulplog-0.1.0.tgz",
-      "integrity": "sha1-ZBTIKRNpfaUVkDl9r7EvIpZ4Ec4=",
-      "dependencies": {
-        "sparkles": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/has-symbols": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz",
-      "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==",
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/has-value": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz",
-      "integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=",
-      "dependencies": {
-        "get-value": "^2.0.6",
-        "has-values": "^1.0.0",
-        "isobject": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/has-value/node_modules/isobject": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/has-values": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz",
-      "integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=",
-      "dependencies": {
-        "is-number": "^3.0.0",
-        "kind-of": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/has-values/node_modules/is-number": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-      "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/has-values/node_modules/is-number/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/has-values/node_modules/kind-of": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz",
-      "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=",
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hash-base": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.1.0.tgz",
-      "integrity": "sha512-1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA==",
-      "dependencies": {
-        "inherits": "^2.0.4",
-        "readable-stream": "^3.6.0",
-        "safe-buffer": "^5.2.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/hash-base/node_modules/readable-stream": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-      "dependencies": {
-        "inherits": "^2.0.3",
-        "string_decoder": "^1.1.1",
-        "util-deprecate": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/hash-base/node_modules/safe-buffer": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ]
-    },
-    "node_modules/hash-sum": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/hash-sum/-/hash-sum-1.0.2.tgz",
-      "integrity": "sha1-M7QHd3VMZDJXPBIMw4CLvRDUfwQ="
-    },
-    "node_modules/hash.js": {
-      "version": "1.1.7",
-      "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz",
-      "integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==",
-      "dependencies": {
-        "inherits": "^2.0.3",
-        "minimalistic-assert": "^1.0.1"
-      }
-    },
-    "node_modules/he": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
-      "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==",
-      "bin": {
-        "he": "bin/he"
-      }
-    },
-    "node_modules/hex-color-regex": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/hex-color-regex/-/hex-color-regex-1.1.0.tgz",
-      "integrity": "sha512-l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ=="
-    },
-    "node_modules/highlight.js": {
-      "version": "10.4.1",
-      "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-10.4.1.tgz",
-      "integrity": "sha512-yR5lWvNz7c85OhVAEAeFhVCc/GV4C30Fjzc/rCP0aCWzc1UUOPUk55dK/qdwTZHBvMZo+eZ2jpk62ndX/xMFlg==",
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/hmac-drbg": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz",
-      "integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=",
-      "dependencies": {
-        "hash.js": "^1.0.3",
-        "minimalistic-assert": "^1.0.0",
-        "minimalistic-crypto-utils": "^1.0.1"
-      }
-    },
-    "node_modules/hoist-non-react-statics": {
-      "version": "3.3.2",
-      "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz",
-      "integrity": "sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==",
-      "dependencies": {
-        "react-is": "^16.7.0"
-      }
-    },
-    "node_modules/homedir-polyfill": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz",
-      "integrity": "sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==",
-      "dependencies": {
-        "parse-passwd": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hosted-git-info": {
-      "version": "2.8.8",
-      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.8.tgz",
-      "integrity": "sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg=="
-    },
-    "node_modules/hsl-regex": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/hsl-regex/-/hsl-regex-1.0.0.tgz",
-      "integrity": "sha1-1JMwx4ntgZ4nakwNJy3/owsY/m4="
-    },
-    "node_modules/hsla-regex": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/hsla-regex/-/hsla-regex-1.0.0.tgz",
-      "integrity": "sha1-wc56MWjIxmFAM6S194d/OyJfnDg="
-    },
-    "node_modules/html-comment-regex": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/html-comment-regex/-/html-comment-regex-1.1.2.tgz",
-      "integrity": "sha512-P+M65QY2JQ5Y0G9KKdlDpo0zK+/OHptU5AaBwUfAIDJZk1MYf32Frm84EcOytfJE0t5JvkAnKlmjsXDnWzCJmQ=="
-    },
-    "node_modules/html-minifier": {
-      "version": "3.5.21",
-      "resolved": "https://registry.npmjs.org/html-minifier/-/html-minifier-3.5.21.tgz",
-      "integrity": "sha512-LKUKwuJDhxNa3uf/LPR/KVjm/l3rBqtYeCOAekvG8F1vItxMUpueGd94i/asDDr8/1u7InxzFA5EeGjhhG5mMA==",
-      "dependencies": {
-        "camel-case": "3.0.x",
-        "clean-css": "4.2.x",
-        "commander": "2.17.x",
-        "he": "1.2.x",
-        "param-case": "2.1.x",
-        "relateurl": "0.2.x",
-        "uglify-js": "3.4.x"
-      },
-      "bin": {
-        "html-minifier": "cli.js"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/html-minifier/node_modules/commander": {
-      "version": "2.17.1",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-2.17.1.tgz",
-      "integrity": "sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg=="
-    },
-    "node_modules/html-minifier/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/html-minifier/node_modules/uglify-js": {
-      "version": "3.4.10",
-      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.10.tgz",
-      "integrity": "sha512-Y2VsbPVs0FIshJztycsO2SfPk7/KAF/T72qzv9u5EpQ4kB2hQoHlhNQTsNyy6ul7lQtqJN/AoWeS23OzEiEFxw==",
-      "dependencies": {
-        "commander": "~2.19.0",
-        "source-map": "~0.6.1"
-      },
-      "bin": {
-        "uglifyjs": "bin/uglifyjs"
-      },
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
-    "node_modules/html-minifier/node_modules/uglify-js/node_modules/commander": {
-      "version": "2.19.0",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-2.19.0.tgz",
-      "integrity": "sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg=="
-    },
-    "node_modules/html-tags": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/html-tags/-/html-tags-3.1.0.tgz",
-      "integrity": "sha512-1qYz89hW3lFDEazhjW0yVAV87lw8lVkrJocr72XmBkMKsoSVJCQx3W8BXsC7hO2qAt8BoVjYjtAcZ9perqGnNg==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/html-webpack-plugin": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-3.2.0.tgz",
-      "integrity": "sha1-sBq71yOsqqeze2r0SS69oD2d03s=",
-      "deprecated": "3.x is no longer supported",
-      "dependencies": {
-        "html-minifier": "^3.2.3",
-        "loader-utils": "^0.2.16",
-        "lodash": "^4.17.3",
-        "pretty-error": "^2.0.2",
-        "tapable": "^1.0.0",
-        "toposort": "^1.0.0",
-        "util.promisify": "1.0.0"
-      },
-      "engines": {
-        "node": ">=6.9"
-      },
-      "peerDependencies": {
-        "webpack": "^1.0.0 || ^2.0.0 || ^3.0.0 || ^4.0.0"
-      }
-    },
-    "node_modules/html-webpack-plugin/node_modules/big.js": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/big.js/-/big.js-3.2.0.tgz",
-      "integrity": "sha512-+hN/Zh2D08Mx65pZ/4g5bsmNiZUuChDiQfTUQ7qJr4/kuopCr88xZsAXv6mBoZEsUI4OuGHlX59qE94K2mMW8Q==",
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/html-webpack-plugin/node_modules/emojis-list": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-2.1.0.tgz",
-      "integrity": "sha1-TapNnbAPmBmIDHn6RXrlsJof04k=",
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/html-webpack-plugin/node_modules/json5": {
-      "version": "0.5.1",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz",
-      "integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=",
-      "bin": {
-        "json5": "lib/cli.js"
-      }
-    },
-    "node_modules/html-webpack-plugin/node_modules/loader-utils": {
-      "version": "0.2.17",
-      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-0.2.17.tgz",
-      "integrity": "sha1-+G5jdNQyBabmxg6RlvF8Apm/s0g=",
-      "dependencies": {
-        "big.js": "^3.1.3",
-        "emojis-list": "^2.0.0",
-        "json5": "^0.5.0",
-        "object-assign": "^4.0.1"
-      }
-    },
-    "node_modules/html-webpack-plugin/node_modules/util.promisify": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.0.tgz",
-      "integrity": "sha512-i+6qA2MPhvoKLuxnJNpXAGhg7HphQOSUq2LKMZD0m15EiskXUkMvKdF4Uui0WYeCUGea+o2cw/ZuwehtfsrNkA==",
-      "dependencies": {
-        "define-properties": "^1.1.2",
-        "object.getownpropertydescriptors": "^2.0.3"
-      }
-    },
-    "node_modules/htmlparser2": {
-      "version": "3.10.1",
-      "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.10.1.tgz",
-      "integrity": "sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==",
-      "dependencies": {
-        "domelementtype": "^1.3.1",
-        "domhandler": "^2.3.0",
-        "domutils": "^1.5.1",
-        "entities": "^1.1.1",
-        "inherits": "^2.0.1",
-        "readable-stream": "^3.1.1"
-      }
-    },
-    "node_modules/htmlparser2/node_modules/entities": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz",
-      "integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w=="
-    },
-    "node_modules/htmlparser2/node_modules/readable-stream": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-      "dependencies": {
-        "inherits": "^2.0.3",
-        "string_decoder": "^1.1.1",
-        "util-deprecate": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/http-signature": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
-      "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
-      "optional": true,
-      "dependencies": {
-        "assert-plus": "^1.0.0",
-        "jsprim": "^1.2.2",
-        "sshpk": "^1.7.0"
-      },
-      "engines": {
-        "node": ">=0.8",
-        "npm": ">=1.3.7"
-      }
-    },
-    "node_modules/https-browserify": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz",
-      "integrity": "sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM="
-    },
-    "node_modules/iconv-lite": {
-      "version": "0.4.24",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
-      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
-      "dependencies": {
-        "safer-buffer": ">= 2.1.2 < 3"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/icss-utils": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-4.1.1.tgz",
-      "integrity": "sha512-4aFq7wvWyMHKgxsH8QQtGpvbASCf+eM3wPRLI6R+MgAnTCZ6STYsRvttLvRWK0Nfif5piF394St3HeJDaljGPA==",
-      "dependencies": {
-        "postcss": "^7.0.14"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/ieee754": {
-      "version": "1.1.13",
-      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz",
-      "integrity": "sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg=="
-    },
-    "node_modules/iferr": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/iferr/-/iferr-0.1.5.tgz",
-      "integrity": "sha1-xg7taebY/bazEEofy8ocGS3FtQE="
-    },
-    "node_modules/ignore": {
-      "version": "4.0.6",
-      "resolved": "https://registry.npm.taobao.org/ignore/download/ignore-4.0.6.tgz",
-      "integrity": "sha1-dQ49tYYgh7RzfrrIIH/9HvJ7Jfw=",
-      "dev": true,
-      "engines": {
-        "node": ">= 4"
-      }
-    },
-    "node_modules/image-size": {
-      "version": "0.5.5",
-      "resolved": "https://registry.npmjs.org/image-size/-/image-size-0.5.5.tgz",
-      "integrity": "sha1-Cd/Uq50g4p6xw+gLiZA3jfnjy5w=",
-      "bin": {
-        "image-size": "bin/image-size.js"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/immutable": {
-      "version": "3.8.2",
-      "resolved": "https://registry.npmjs.org/immutable/-/immutable-3.8.2.tgz",
-      "integrity": "sha1-wkOZUUVbs5kT2vKBN28VMOEErfM=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/import-cwd": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/import-cwd/-/import-cwd-2.1.0.tgz",
-      "integrity": "sha1-qmzzbnInYShcs3HsZRn1PiQ1sKk=",
-      "dependencies": {
-        "import-from": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/import-fresh": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-2.0.0.tgz",
-      "integrity": "sha1-2BNVwVYS04bGH53dOSLUMEgipUY=",
-      "dependencies": {
-        "caller-path": "^2.0.0",
-        "resolve-from": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/import-from": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/import-from/-/import-from-2.1.0.tgz",
-      "integrity": "sha1-M1238qev/VOqpHHUuAId7ja387E=",
-      "dependencies": {
-        "resolve-from": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/import-lazy": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/import-lazy/-/import-lazy-4.0.0.tgz",
-      "integrity": "sha512-rKtvo6a868b5Hu3heneU+L4yEQ4jYKLtjpnPeUdK7h0yzXGmyBTypknlkCvHFBqfX9YlorEiMM6Dnq/5atfHkw==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/import-local": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/import-local/-/import-local-2.0.0.tgz",
-      "integrity": "sha512-b6s04m3O+s3CGSbqDIyP4R6aAwAeYlVq9+WUWep6iHa8ETRf9yei1U48C5MmfJmV9AiLYYBKPMq/W+/WRpQmCQ==",
-      "dependencies": {
-        "pkg-dir": "^3.0.0",
-        "resolve-cwd": "^2.0.0"
-      },
-      "bin": {
-        "import-local-fixture": "fixtures/cli.js"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/import-regex": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/import-regex/-/import-regex-1.1.0.tgz",
-      "integrity": "sha1-pVxS5McFx2XKIQ6SQqBrvMiqf2Y=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/imports-loader": {
-      "version": "0.8.0",
-      "resolved": "https://registry.npmjs.org/imports-loader/-/imports-loader-0.8.0.tgz",
-      "integrity": "sha512-kXWL7Scp8KQ4552ZcdVTeaQCZSLW+e6nJfp3cwUMB673T7Hr98Xjx5JK+ql7ADlJUvj1JS5O01RLbKoutN5QDQ==",
-      "dependencies": {
-        "loader-utils": "^1.0.2",
-        "source-map": "^0.6.1"
-      },
-      "engines": {
-        "node": ">= 4"
-      }
-    },
-    "node_modules/imports-loader/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/imurmurhash": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
-      "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
-      "engines": {
-        "node": ">=0.8.19"
-      }
-    },
-    "node_modules/indent-string": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",
-      "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/indexes-of": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/indexes-of/-/indexes-of-1.0.1.tgz",
-      "integrity": "sha1-8w9xbI4r00bHtn0985FVZqfAVgc="
-    },
-    "node_modules/indx": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/indx/-/indx-0.2.3.tgz",
-      "integrity": "sha1-Fdz1bunPZcAjTFE8J/vVgOcPvFA="
-    },
-    "node_modules/infer-owner": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/infer-owner/-/infer-owner-1.0.4.tgz",
-      "integrity": "sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A=="
-    },
-    "node_modules/inflight": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
-      "dependencies": {
-        "once": "^1.3.0",
-        "wrappy": "1"
-      }
-    },
-    "node_modules/inherits": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
-    },
-    "node_modules/ini": {
-      "version": "1.3.8",
-      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
-      "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew=="
-    },
-    "node_modules/inquirer": {
-      "version": "6.5.2",
-      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-6.5.2.tgz",
-      "integrity": "sha512-cntlB5ghuB0iuO65Ovoi8ogLHiWGs/5yNrtUcKjFhSSiVeAIVpD7koaSU9RM8mpXw5YDi9RdYXGQMaOURB7ycQ==",
-      "dependencies": {
-        "ansi-escapes": "^3.2.0",
-        "chalk": "^2.4.2",
-        "cli-cursor": "^2.1.0",
-        "cli-width": "^2.0.0",
-        "external-editor": "^3.0.3",
-        "figures": "^2.0.0",
-        "lodash": "^4.17.12",
-        "mute-stream": "0.0.7",
-        "run-async": "^2.2.0",
-        "rxjs": "^6.4.0",
-        "string-width": "^2.1.0",
-        "strip-ansi": "^5.1.0",
-        "through": "^2.3.6"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/inquirer/node_modules/ansi-regex": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-      "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/inquirer/node_modules/is-fullwidth-code-point": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-      "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/inquirer/node_modules/string-width": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-      "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
-      "dependencies": {
-        "is-fullwidth-code-point": "^2.0.0",
-        "strip-ansi": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/inquirer/node_modules/string-width/node_modules/strip-ansi": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-      "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
-      "dependencies": {
-        "ansi-regex": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/inquirer/node_modules/strip-ansi": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-      "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
-      "dependencies": {
-        "ansi-regex": "^4.1.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/inquirer/node_modules/strip-ansi/node_modules/ansi-regex": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
-      "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/interpret": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.2.0.tgz",
-      "integrity": "sha512-mT34yGKMNceBQUoVn7iCDKDntA7SC6gycMAWzGx1z/CMCTV7b2AAtXlo3nRyHZ1FelRkQbQjprHSYGwzLtkVbw==",
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/invariant": {
-      "version": "2.2.4",
-      "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz",
-      "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==",
-      "dependencies": {
-        "loose-envify": "^1.0.0"
-      }
-    },
-    "node_modules/invert-kv": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz",
-      "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/ip-regex": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-1.0.3.tgz",
-      "integrity": "sha1-3FiQdvZZ9BnCIgOaMzFvHHOH7/0=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/irregular-plurals": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/irregular-plurals/-/irregular-plurals-2.0.0.tgz",
-      "integrity": "sha512-Y75zBYLkh0lJ9qxeHlMjQ7bSbyiSqNW/UOPWDmzC7cXskL1hekSITh1Oc6JV0XCWWZ9DE8VYSB71xocLk3gmGw==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/is": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/is/-/is-3.3.0.tgz",
-      "integrity": "sha512-nW24QBoPcFGGHJGUwnfpI7Yc5CdqWNdsyHQszVE/z2pKHXzh7FZ5GWhJqSyaQ9wMkQnsTx+kAI8bHlCX4tKdbg==",
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/is-absolute": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-1.0.0.tgz",
-      "integrity": "sha512-dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA==",
-      "dependencies": {
-        "is-relative": "^1.0.0",
-        "is-windows": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-absolute-url": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-2.1.0.tgz",
-      "integrity": "sha1-UFMN+4T8yap9vnhS6Do3uTufKqY=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-accessor-descriptor": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-      "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-accessor-descriptor/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-alphabetical": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-alphabetical/-/is-alphabetical-1.0.4.tgz",
-      "integrity": "sha512-DwzsA04LQ10FHTZuL0/grVDk4rFoVH1pjAToYwBrHSxcrBIGQuXrQMtD5U1b0U2XVgKZCTLLP8u2Qxqhy3l2Vg==",
-      "dev": true,
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
-      }
-    },
-    "node_modules/is-alphanumeric": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-alphanumeric/-/is-alphanumeric-1.0.0.tgz",
-      "integrity": "sha1-Spzvcdr0wAHB2B1j0UDPU/1oifQ=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-alphanumerical": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-alphanumerical/-/is-alphanumerical-1.0.4.tgz",
-      "integrity": "sha512-UzoZUr+XfVz3t3v4KyGEniVL9BDRoQtY7tOyrRybkVNjDFWyo1yhXNGrrBTQxp3ib9BLAWs7k2YKBQsFRkZG9A==",
-      "dev": true,
-      "dependencies": {
-        "is-alphabetical": "^1.0.0",
-        "is-decimal": "^1.0.0"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
-      }
-    },
-    "node_modules/is-arrayish": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
-      "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0="
-    },
-    "node_modules/is-binary-path": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz",
-      "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=",
-      "dependencies": {
-        "binary-extensions": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-buffer": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=="
-    },
-    "node_modules/is-callable": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.5.tgz",
-      "integrity": "sha512-ESKv5sMCJB2jnHTWZ3O5itG+O128Hsus4K4Qh1h2/cgn2vbgnLSVqfV46AeJA9D5EeeLa9w81KUXMtn34zhX+Q==",
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-color-stop": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-color-stop/-/is-color-stop-1.1.0.tgz",
-      "integrity": "sha1-z/9HGu5N1cnhWFmPvhKWe1za00U=",
-      "dependencies": {
-        "css-color-names": "^0.0.4",
-        "hex-color-regex": "^1.1.0",
-        "hsl-regex": "^1.0.0",
-        "hsla-regex": "^1.0.0",
-        "rgb-regex": "^1.0.1",
-        "rgba-regex": "^1.0.0"
-      }
-    },
-    "node_modules/is-data-descriptor": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-      "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-data-descriptor/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-date-object": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.2.tgz",
-      "integrity": "sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g==",
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-decimal": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-decimal/-/is-decimal-1.0.4.tgz",
-      "integrity": "sha512-RGdriMmQQvZ2aqaQq3awNA6dCGtKpiDFcOzrTWrDAT2MiWrKQVPmxLGHl7Y2nNu6led0kEyoX0enY0qXYsv9zw==",
-      "dev": true,
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
-      }
-    },
-    "node_modules/is-descriptor": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-      "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-      "dependencies": {
-        "is-accessor-descriptor": "^0.1.6",
-        "is-data-descriptor": "^0.1.4",
-        "kind-of": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-descriptor/node_modules/kind-of": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-      "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-directory": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/is-directory/-/is-directory-0.3.1.tgz",
-      "integrity": "sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-dom": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-dom/-/is-dom-1.1.0.tgz",
-      "integrity": "sha512-u82f6mvhYxRPKpw8V1N0W8ce1xXwOrQtgGcxl6UCL5zBmZu3is/18K0rR7uFCnMDuAsS/3W54mGL4vsaFUQlEQ==",
-      "dependencies": {
-        "is-object": "^1.0.1",
-        "is-window": "^1.0.2"
-      }
-    },
-    "node_modules/is-extendable": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-extglob": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-      "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-fullwidth-code-point": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
-      "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
-      "dependencies": {
-        "number-is-nan": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-glob": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz",
-      "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==",
-      "dependencies": {
-        "is-extglob": "^2.1.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-hexadecimal": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-hexadecimal/-/is-hexadecimal-1.0.4.tgz",
-      "integrity": "sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw==",
-      "dev": true,
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
-      }
-    },
-    "node_modules/is-negated-glob": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-negated-glob/-/is-negated-glob-1.0.0.tgz",
-      "integrity": "sha1-aRC8pdqMleeEtXUbl2z1oQ/uNtI=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-number": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-      "engines": {
-        "node": ">=0.12.0"
-      }
-    },
-    "node_modules/is-obj": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-2.0.0.tgz",
-      "integrity": "sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/is-object": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-object/-/is-object-1.0.1.tgz",
-      "integrity": "sha1-iVJojF7C/9awPsyF52ngKQMINHA="
-    },
-    "node_modules/is-path-cwd": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-1.0.0.tgz",
-      "integrity": "sha1-0iXsIxMuie3Tj9p2dHLmLmXxEG0=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-path-in-cwd": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-1.0.1.tgz",
-      "integrity": "sha512-FjV1RTW48E7CWM7eE/J2NJvAEEVektecDBVBE5Hh3nM1Jd0kvhHtX68Pr3xsDf857xt3Y4AkwVULK1Vku62aaQ==",
-      "dependencies": {
-        "is-path-inside": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-path-inside": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-1.0.1.tgz",
-      "integrity": "sha1-jvW33lBDej/cprToZe96pVy0gDY=",
-      "dependencies": {
-        "path-is-inside": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-plain-obj": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
-      "integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-plain-object": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-3.0.0.tgz",
-      "integrity": "sha512-tZIpofR+P05k8Aocp7UI/2UTa9lTJSebCXpFFoR9aibpokDj/uXBsJ8luUu0tTVYKkMU6URDUuOfJZ7koewXvg==",
-      "dependencies": {
-        "isobject": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-promise": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.2.2.tgz",
-      "integrity": "sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ=="
-    },
-    "node_modules/is-regex": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.5.tgz",
-      "integrity": "sha512-vlKW17SNq44owv5AQR3Cq0bQPEb8+kF3UKZ2fiZNOWtztYE5i0CzCZxFDwO58qAOWtxdBRVO/V5Qin1wjCqFYQ==",
-      "dependencies": {
-        "has": "^1.0.3"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-regexp": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-regexp/-/is-regexp-1.0.0.tgz",
-      "integrity": "sha1-/S2INUXEa6xaYz57mgnof6LLUGk=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-relative": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-relative/-/is-relative-1.0.0.tgz",
-      "integrity": "sha512-Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA==",
-      "dependencies": {
-        "is-unc-path": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-resolvable": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.1.0.tgz",
-      "integrity": "sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg=="
-    },
-    "node_modules/is-stream": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
-      "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-string": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.5.tgz",
-      "integrity": "sha512-buY6VNRjhQMiF1qWDouloZlQbRhDPCebwxSjxMjxgemYT46YMd2NR0/H+fBhEfWX4A/w9TBJ+ol+okqJKFE6vQ==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-svg": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-svg/-/is-svg-3.0.0.tgz",
-      "integrity": "sha512-gi4iHK53LR2ujhLVVj+37Ykh9GLqYHX6JOVXbLAucaG/Cqw9xwdFOjDM2qeifLs1sF1npXXFvDu0r5HNgCMrzQ==",
-      "dependencies": {
-        "html-comment-regex": "^1.1.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/is-symbol": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz",
-      "integrity": "sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==",
-      "dependencies": {
-        "has-symbols": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-typedarray": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
-      "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=",
-      "devOptional": true
-    },
-    "node_modules/is-unc-path": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-unc-path/-/is-unc-path-1.0.0.tgz",
-      "integrity": "sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ==",
-      "dependencies": {
-        "unc-path-regex": "^0.1.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-utf8": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz",
-      "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI="
-    },
-    "node_modules/is-valid-glob": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-valid-glob/-/is-valid-glob-1.0.0.tgz",
-      "integrity": "sha1-Kb8+/3Ab4tTTFdusw5vDn+j2Aao=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-whitespace-character": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-whitespace-character/-/is-whitespace-character-1.0.4.tgz",
-      "integrity": "sha512-SDweEzfIZM0SJV0EUga669UTKlmL0Pq8Lno0QDQsPnvECB3IM2aP0gdx5TrU0A01MAPfViaZiI2V1QMZLaKK5w==",
-      "dev": true,
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
-      }
-    },
-    "node_modules/is-window": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-window/-/is-window-1.0.2.tgz",
-      "integrity": "sha1-LIlspT25feRdPDMTOmXYyfVjSA0="
-    },
-    "node_modules/is-windows": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
-      "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-word-character": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-word-character/-/is-word-character-1.0.4.tgz",
-      "integrity": "sha512-5SMO8RVennx3nZrqtKwCGyyetPE9VDba5ugvKLaD4KopPG5kR4mQ7tNt/r7feL5yt5h3lpuBbIUmCOG2eSzXHA==",
-      "dev": true,
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
-      }
-    },
-    "node_modules/is-wsl": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz",
-      "integrity": "sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0=",
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/isarray": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
-    },
-    "node_modules/isexe": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA="
-    },
-    "node_modules/isobject": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-4.0.0.tgz",
-      "integrity": "sha512-S/2fF5wH8SJA/kmwr6HYhK/RI/OkhD84k8ntalo0iJjZikgq1XFvR5M8NPT1x5F7fBwCG3qHfnzeP/Vh/ZxCUA==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/isomorphic-fetch": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/isomorphic-fetch/-/isomorphic-fetch-2.2.1.tgz",
-      "integrity": "sha1-YRrhrPFPXoH3KVB0coGf6XM1WKk=",
-      "dependencies": {
-        "node-fetch": "^1.0.1",
-        "whatwg-fetch": ">=0.10.0"
-      }
-    },
-    "node_modules/isomorphic-fetch/node_modules/node-fetch": {
-      "version": "1.7.3",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-1.7.3.tgz",
-      "integrity": "sha512-NhZ4CsKx7cYm2vSrBAr2PvFOe6sWDf0UYLRqA6svUYg7+/TSfVAu49jYC4BvQ4Sms9SZgdqGBgroqfDhJdTyKQ==",
-      "dependencies": {
-        "encoding": "^0.1.11",
-        "is-stream": "^1.0.1"
-      }
-    },
-    "node_modules/isomorphic-form-data": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/isomorphic-form-data/-/isomorphic-form-data-2.0.0.tgz",
-      "integrity": "sha512-TYgVnXWeESVmQSg4GLVbalmQ+B4NPi/H4eWxqALKj63KsUrcu301YDjBqaOw3h+cbak7Na4Xyps3BiptHtxTfg==",
-      "dependencies": {
-        "form-data": "^2.3.2"
-      }
-    },
-    "node_modules/isstream": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
-      "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=",
-      "optional": true
-    },
-    "node_modules/istextorbinary": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/istextorbinary/-/istextorbinary-2.2.1.tgz",
-      "integrity": "sha512-TS+hoFl8Z5FAFMK38nhBkdLt44CclNRgDHWeMgsV8ko3nDlr/9UI2Sf839sW7enijf8oKsZYXRvM8g0it9Zmcw==",
-      "dependencies": {
-        "binaryextensions": "2",
-        "editions": "^1.3.3",
-        "textextensions": "2"
-      },
-      "engines": {
-        "node": ">=0.12"
-      }
-    },
-    "node_modules/jest-worker": {
-      "version": "26.0.0",
-      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-26.0.0.tgz",
-      "integrity": "sha512-pPaYa2+JnwmiZjK9x7p9BoZht+47ecFCDFA/CJxspHzeDvQcfVBLWzCiWyo+EGrSiQMWZtCFo9iSvMZnAAo8vw==",
-      "dependencies": {
-        "merge-stream": "^2.0.0",
-        "supports-color": "^7.0.0"
-      },
-      "engines": {
-        "node": ">= 10.14.2"
-      }
-    },
-    "node_modules/jest-worker/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest-worker/node_modules/supports-color": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
-      "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jquery": {
-      "version": "3.5.1",
-      "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.5.1.tgz",
-      "integrity": "sha512-XwIBPqcMn57FxfT+Go5pzySnm4KWkT1Tv7gjrpT1srtf8Weynl6R273VJ5GjkRb51IzMp5nbaPjJXMWeju2MKg=="
-    },
-    "node_modules/jquery-datetimepicker": {
-      "version": "2.5.21",
-      "resolved": "https://registry.npmjs.org/jquery-datetimepicker/-/jquery-datetimepicker-2.5.21.tgz",
-      "integrity": "sha512-wDTpZ4f1PWd1XGaIIE0n6jLynlm+akBJ7/NjaB1bk2UJSS593CHJPZ3+FNEXoyvNVUeBlBC0oX6WTfCyfUhX/w==",
-      "dependencies": {
-        "jquery": ">= 1.7.2",
-        "jquery-mousewheel": ">= 3.1.13",
-        "php-date-formatter": "^1.3.4"
-      }
-    },
-    "node_modules/jquery-mousewheel": {
-      "version": "3.1.13",
-      "resolved": "https://registry.npmjs.org/jquery-mousewheel/-/jquery-mousewheel-3.1.13.tgz",
-      "integrity": "sha1-BvAzXxbjU6aV5yBr9QUDy1I6buU="
-    },
-    "node_modules/jquery.are-you-sure": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/jquery.are-you-sure/-/jquery.are-you-sure-1.9.0.tgz",
-      "integrity": "sha512-2r0uFx8CyAopjeHGOdvvwpFP921TnW1+v1uJXcAWQYHYGB1tryTDhQY+5u6HsVeMwbWiRTKVZFWnLaFpDvIqZQ==",
-      "dependencies": {
-        "jquery": ">=1.4.2"
-      },
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
-    "node_modules/js-base64": {
-      "version": "2.5.2",
-      "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.5.2.tgz",
-      "integrity": "sha512-Vg8czh0Q7sFBSUMWWArX/miJeBWYBPpdU/3M/DKSaekLMqrqVPaedp+5mZhie/r0lgrcaYBfwXatEew6gwgiQQ=="
-    },
-    "node_modules/js-beautify": {
-      "version": "1.11.0",
-      "resolved": "https://registry.npmjs.org/js-beautify/-/js-beautify-1.11.0.tgz",
-      "integrity": "sha512-a26B+Cx7USQGSWnz9YxgJNMmML/QG2nqIaL7VVYPCXbqiKz8PN0waSNvroMtvAK6tY7g/wPdNWGEP+JTNIBr6A==",
-      "dependencies": {
-        "config-chain": "^1.1.12",
-        "editorconfig": "^0.15.3",
-        "glob": "^7.1.3",
-        "mkdirp": "~1.0.3",
-        "nopt": "^4.0.3"
-      },
-      "bin": {
-        "css-beautify": "js/bin/css-beautify.js",
-        "html-beautify": "js/bin/html-beautify.js",
-        "js-beautify": "js/bin/js-beautify.js"
-      }
-    },
-    "node_modules/js-beautify/node_modules/mkdirp": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
-      "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
-      "bin": {
-        "mkdirp": "bin/cmd.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/js-cookie": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/js-cookie/-/js-cookie-3.0.1.tgz",
-      "integrity": "sha512-+0rgsUXZu4ncpPxRL+lNEptWMOWl9etvPHc/koSRp6MPwpRYAhmk0dUG00J4bxVV3r9uUzfo24wW0knS07SKSw==",
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/js-file-download": {
-      "version": "0.4.12",
-      "resolved": "https://registry.npmjs.org/js-file-download/-/js-file-download-0.4.12.tgz",
-      "integrity": "sha512-rML+NkoD08p5Dllpjo0ffy4jRHeY6Zsapvr/W86N7E0yuzAO6qa5X9+xog6zQNlH102J7IXljNY2FtS6Lj3ucg=="
-    },
-    "node_modules/js-tokens": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
-      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="
-    },
-    "node_modules/js-yaml": {
-      "version": "3.13.1",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz",
-      "integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==",
-      "dependencies": {
-        "argparse": "^1.0.7",
-        "esprima": "^4.0.0"
-      },
-      "bin": {
-        "js-yaml": "bin/js-yaml.js"
-      }
-    },
-    "node_modules/jsbn": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
-      "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
-      "optional": true
-    },
-    "node_modules/jsesc": {
-      "version": "2.5.2",
-      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
-      "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
-      "bin": {
-        "jsesc": "bin/jsesc"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/json-parse-better-errors": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",
-      "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw=="
-    },
-    "node_modules/json-schema": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
-      "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=",
-      "optional": true
-    },
-    "node_modules/json-schema-traverse": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
-    },
-    "node_modules/json-stable-stringify-without-jsonify": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
-      "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE="
-    },
-    "node_modules/json-stringify-safe": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
-      "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=",
-      "optional": true
-    },
-    "node_modules/json5": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-2.1.3.tgz",
-      "integrity": "sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA==",
-      "dependencies": {
-        "minimist": "^1.2.5"
-      },
-      "bin": {
-        "json5": "lib/cli.js"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/jsonfile": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npm.taobao.org/jsonfile/download/jsonfile-4.0.0.tgz?cache=0&sync_timestamp=1604161797011&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fjsonfile%2Fdownload%2Fjsonfile-4.0.0.tgz",
-      "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
-      "optionalDependencies": {
-        "graceful-fs": "^4.1.6"
-      }
-    },
-    "node_modules/jsprim": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
-      "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
-      "engines": [
-        "node >=0.6.0"
-      ],
-      "optional": true,
-      "dependencies": {
-        "assert-plus": "1.0.0",
-        "extsprintf": "1.3.0",
-        "json-schema": "0.2.3",
-        "verror": "1.10.0"
-      }
-    },
-    "node_modules/jssha": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npm.taobao.org/jssha/download/jssha-2.4.2.tgz",
-      "integrity": "sha1-2VCwlWNJKL1rK9odQtqaOnYtZek=",
-      "deprecated": "jsSHA versions < 3.0.0 will no longer receive feature updates",
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/just-debounce": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/just-debounce/-/just-debounce-1.0.0.tgz",
-      "integrity": "sha1-h/zPrv/AtozRnVX2cilD+SnqNeo="
-    },
-    "node_modules/kind-of": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/known-css-properties": {
-      "version": "0.18.0",
-      "resolved": "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.18.0.tgz",
-      "integrity": "sha512-69AgJ1rQa7VvUsd2kpvVq+VeObDuo3zrj0CzM5Slmf6yduQFAI2kXPDQJR2IE/u6MSAUOJrwSzjg5vlz8qcMiw==",
-      "dev": true
-    },
-    "node_modules/last-call-webpack-plugin": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/last-call-webpack-plugin/-/last-call-webpack-plugin-3.0.0.tgz",
-      "integrity": "sha512-7KI2l2GIZa9p2spzPIVZBYyNKkN+e/SQPpnjlTiPhdbDW3F86tdKKELxKpzJ5sgU19wQWsACULZmpTPYHeWO5w==",
-      "dependencies": {
-        "lodash": "^4.17.5",
-        "webpack-sources": "^1.1.0"
-      }
-    },
-    "node_modules/last-run": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/last-run/-/last-run-1.1.1.tgz",
-      "integrity": "sha1-RblpQsF7HHnHchmCWbqUO+v4yls=",
-      "dependencies": {
-        "default-resolution": "^2.0.0",
-        "es6-weak-map": "^2.0.1"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/lazy-cache": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz",
-      "integrity": "sha1-odePw6UEdMuAhF07O24dpJpEbo4=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/lazystream": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/lazystream/-/lazystream-1.0.0.tgz",
-      "integrity": "sha1-9plf4PggOS9hOWvolGJAe7dxaOQ=",
-      "dependencies": {
-        "readable-stream": "^2.0.5"
-      },
-      "engines": {
-        "node": ">= 0.6.3"
-      }
-    },
-    "node_modules/lcid": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz",
-      "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=",
-      "dependencies": {
-        "invert-kv": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/lead": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/lead/-/lead-1.0.0.tgz",
-      "integrity": "sha1-bxT5mje+Op3XhPVJVpDlkDRm7kI=",
-      "dependencies": {
-        "flush-write-stream": "^1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/less": {
-      "version": "3.11.1",
-      "resolved": "https://registry.npmjs.org/less/-/less-3.11.1.tgz",
-      "integrity": "sha512-tlWX341RECuTOvoDIvtFqXsKj072hm3+9ymRBe76/mD6O5ZZecnlAOVDlWAleF2+aohFrxNidXhv2773f6kY7g==",
-      "dependencies": {
-        "clone": "^2.1.2",
-        "tslib": "^1.10.0"
-      },
-      "bin": {
-        "lessc": "bin/lessc"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "optionalDependencies": {
-        "errno": "^0.1.1",
-        "graceful-fs": "^4.1.2",
-        "image-size": "~0.5.0",
-        "mime": "^1.4.1",
-        "mkdirp": "^0.5.0",
-        "promise": "^7.1.1",
-        "request": "^2.83.0",
-        "source-map": "~0.6.0"
-      }
-    },
-    "node_modules/less-loader": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/less-loader/-/less-loader-6.1.0.tgz",
-      "integrity": "sha512-/jLzOwLyqJ7Kt3xg5sHHkXtOyShWwFj410K9Si9WO+/h8rmYxxkSR0A3/hFEntWudE20zZnWMtpMYnLzqTVdUA==",
-      "dependencies": {
-        "clone": "^2.1.2",
-        "less": "^3.11.1",
-        "loader-utils": "^2.0.0",
-        "schema-utils": "^2.6.6"
-      },
-      "engines": {
-        "node": ">= 10.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
-      "peerDependencies": {
-        "webpack": "^4.0.0 || ^5.0.0"
-      }
-    },
-    "node_modules/less-loader/node_modules/loader-utils": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz",
-      "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==",
-      "dependencies": {
-        "big.js": "^5.2.2",
-        "emojis-list": "^3.0.0",
-        "json5": "^2.1.2"
-      },
-      "engines": {
-        "node": ">=8.9.0"
-      }
-    },
-    "node_modules/less/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "optional": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/leven": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz",
-      "integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/levenary": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/levenary/-/levenary-1.1.1.tgz",
-      "integrity": "sha512-mkAdOIt79FD6irqjYSs4rdbnlT5vRonMEvBVPVb3XmevfS8kgRXwfes0dhPdEtzTWD/1eNE/Bm/G1iRt6DcnQQ==",
-      "dependencies": {
-        "leven": "^3.1.0"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/levn": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
-      "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=",
-      "dev": true,
-      "dependencies": {
-        "prelude-ls": "~1.1.2",
-        "type-check": "~0.3.2"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/liftoff": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/liftoff/-/liftoff-3.1.0.tgz",
-      "integrity": "sha512-DlIPlJUkCV0Ips2zf2pJP0unEoT1kwYhiiPUGF3s/jtxTCjziNLoiVVh+jqWOWeFi6mmwQ5fNxvAUyPad4Dfog==",
-      "dependencies": {
-        "extend": "^3.0.0",
-        "findup-sync": "^3.0.0",
-        "fined": "^1.0.1",
-        "flagged-respawn": "^1.0.0",
-        "is-plain-object": "^2.0.4",
-        "object.map": "^1.0.0",
-        "rechoir": "^0.6.2",
-        "resolve": "^1.1.7"
-      },
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/liftoff/node_modules/is-plain-object": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
-      "dependencies": {
-        "isobject": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/liftoff/node_modules/isobject": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/lines-and-columns": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.1.6.tgz",
-      "integrity": "sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA=",
-      "dev": true
-    },
-    "node_modules/load-json-file": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
-      "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=",
-      "dependencies": {
-        "graceful-fs": "^4.1.2",
-        "parse-json": "^2.2.0",
-        "pify": "^2.0.0",
-        "pinkie-promise": "^2.0.0",
-        "strip-bom": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/load-json-file/node_modules/parse-json": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
-      "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
-      "dependencies": {
-        "error-ex": "^1.2.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/load-json-file/node_modules/pify": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-      "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/loader-runner": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-2.4.0.tgz",
-      "integrity": "sha512-Jsmr89RcXGIwivFY21FcRrisYZfvLMTWx5kOLc+JTxtpBOG6xML0vzbc6SEQG2FO9/4Fc3wW4LVcB5DmGflaRw==",
-      "engines": {
-        "node": ">=4.3.0 <5.0.0 || >=5.10"
-      }
-    },
-    "node_modules/loader-utils": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz",
-      "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==",
-      "dependencies": {
-        "big.js": "^5.2.2",
-        "emojis-list": "^3.0.0",
-        "json5": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=4.0.0"
-      }
-    },
-    "node_modules/loader-utils/node_modules/json5": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
-      "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
-      "dependencies": {
-        "minimist": "^1.2.0"
-      },
-      "bin": {
-        "json5": "lib/cli.js"
-      }
-    },
-    "node_modules/locate-path": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
-      "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
-      "dependencies": {
-        "p-locate": "^2.0.0",
-        "path-exists": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/lodash": {
-      "version": "4.17.21",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
-    },
-    "node_modules/lodash-es": {
-      "version": "4.17.15",
-      "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.15.tgz",
-      "integrity": "sha512-rlrc3yU3+JNOpZ9zj5pQtxnx2THmvRykwL4Xlxoa8I9lHBlVbbyPhgyPMioxVZ4NqyxaVVtaJnzsyOidQIhyyQ=="
-    },
-    "node_modules/lodash._baseassign": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/lodash._baseassign/-/lodash._baseassign-3.2.0.tgz",
-      "integrity": "sha1-jDigmVAPIVrQnlnxci/QxSv+Ck4=",
-      "dependencies": {
-        "lodash._basecopy": "^3.0.0",
-        "lodash.keys": "^3.0.0"
-      }
-    },
-    "node_modules/lodash._basecopy": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz",
-      "integrity": "sha1-jaDmqHbPNEwK2KVIghEd08XHyjY="
-    },
-    "node_modules/lodash._basetostring": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz",
-      "integrity": "sha1-0YYdh3+CSlL2aYMtyvPuFVZqB9U="
-    },
-    "node_modules/lodash._basevalues": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz",
-      "integrity": "sha1-W3dXYoAr3j0yl1A+JjAIIP32Ybc="
-    },
-    "node_modules/lodash._bindcallback": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/lodash._bindcallback/-/lodash._bindcallback-3.0.1.tgz",
-      "integrity": "sha1-5THCdkTPi1epnhftlbNcdIeJOS4="
-    },
-    "node_modules/lodash._createassigner": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/lodash._createassigner/-/lodash._createassigner-3.1.1.tgz",
-      "integrity": "sha1-g4pbri/aymOsIt7o4Z+k5taXCxE=",
-      "dependencies": {
-        "lodash._bindcallback": "^3.0.0",
-        "lodash._isiterateecall": "^3.0.0",
-        "lodash.restparam": "^3.0.0"
-      }
-    },
-    "node_modules/lodash._getnative": {
-      "version": "3.9.1",
-      "resolved": "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz",
-      "integrity": "sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U="
-    },
-    "node_modules/lodash._isiterateecall": {
-      "version": "3.0.9",
-      "resolved": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz",
-      "integrity": "sha1-UgOte6Ql+uhCRg5pbbnPPmqsBXw="
-    },
-    "node_modules/lodash._isnative": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/lodash._isnative/-/lodash._isnative-2.4.1.tgz",
-      "integrity": "sha1-PqZAS3hKe+g2x7V1gOHN95sUgyw="
-    },
-    "node_modules/lodash._objecttypes": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/lodash._objecttypes/-/lodash._objecttypes-2.4.1.tgz",
-      "integrity": "sha1-fAt/admKH3ZSn4kLDNsbTf7BHBE="
-    },
-    "node_modules/lodash._reescape": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/lodash._reescape/-/lodash._reescape-3.0.0.tgz",
-      "integrity": "sha1-Kx1vXf4HyKNVdT5fJ/rH8c3hYWo="
-    },
-    "node_modules/lodash._reevaluate": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/lodash._reevaluate/-/lodash._reevaluate-3.0.0.tgz",
-      "integrity": "sha1-WLx0xAZklTrgsSTYBpltrKQx4u0="
-    },
-    "node_modules/lodash._reinterpolate": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz",
-      "integrity": "sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0="
-    },
-    "node_modules/lodash._root": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/lodash._root/-/lodash._root-3.0.1.tgz",
-      "integrity": "sha1-+6HEUkwZ7ppfgTa0YJ8BfPTe1pI="
-    },
-    "node_modules/lodash._shimkeys": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/lodash._shimkeys/-/lodash._shimkeys-2.4.1.tgz",
-      "integrity": "sha1-bpzJZm/wgfC1psl4uD4kLmlJ0gM=",
-      "dependencies": {
-        "lodash._objecttypes": "~2.4.1"
-      }
-    },
-    "node_modules/lodash.assign": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/lodash.assign/-/lodash.assign-3.2.0.tgz",
-      "integrity": "sha1-POnwI0tLIiPilrj6CsH+6OvKZPo=",
-      "dependencies": {
-        "lodash._baseassign": "^3.0.0",
-        "lodash._createassigner": "^3.0.0",
-        "lodash.keys": "^3.0.0"
-      }
-    },
-    "node_modules/lodash.clone": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/lodash.clone/-/lodash.clone-4.5.0.tgz",
-      "integrity": "sha1-GVhwRQ9aExkkeN9Lw9I9LeoZB7Y="
-    },
-    "node_modules/lodash.debounce": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz",
-      "integrity": "sha1-gteb/zCmfEAF/9XiUVMArZyk168="
-    },
-    "node_modules/lodash.defaults": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-3.1.2.tgz",
-      "integrity": "sha1-xzCLGNv4vJNy1wGnNJPGEZK9Liw=",
-      "dependencies": {
-        "lodash.assign": "^3.0.0",
-        "lodash.restparam": "^3.0.0"
-      }
-    },
-    "node_modules/lodash.escape": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-3.2.0.tgz",
-      "integrity": "sha1-mV7g3BjBtIzJLv+ucaEKq1tIdpg=",
-      "dependencies": {
-        "lodash._root": "^3.0.0"
-      }
-    },
-    "node_modules/lodash.flatten": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/lodash.flatten/-/lodash.flatten-4.4.0.tgz",
-      "integrity": "sha1-8xwiIlqWMtK7+OSt2+8kCqdlph8="
-    },
-    "node_modules/lodash.get": {
-      "version": "4.4.2",
-      "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz",
-      "integrity": "sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk="
-    },
-    "node_modules/lodash.isarguments": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz",
-      "integrity": "sha1-L1c9hcaiQon/AGY7SRwdM4/zRYo="
-    },
-    "node_modules/lodash.isarray": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz",
-      "integrity": "sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U="
-    },
-    "node_modules/lodash.isobject": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/lodash.isobject/-/lodash.isobject-2.4.1.tgz",
-      "integrity": "sha1-Wi5H/mmVPx7mMafrof5k0tBlWPU=",
-      "dependencies": {
-        "lodash._objecttypes": "~2.4.1"
-      }
-    },
-    "node_modules/lodash.keys": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz",
-      "integrity": "sha1-TbwEcrFWvlCgsoaFXRvQsMZWCYo=",
-      "dependencies": {
-        "lodash._getnative": "^3.0.0",
-        "lodash.isarguments": "^3.0.0",
-        "lodash.isarray": "^3.0.0"
-      }
-    },
-    "node_modules/lodash.memoize": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
-      "integrity": "sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4="
-    },
-    "node_modules/lodash.merge": {
-      "version": "4.6.2",
-      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
-      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ=="
-    },
-    "node_modules/lodash.partialright": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/lodash.partialright/-/lodash.partialright-4.2.1.tgz",
-      "integrity": "sha1-ATDYDoM2MmTUAHTzKbij56ihzEs="
-    },
-    "node_modules/lodash.pick": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/lodash.pick/-/lodash.pick-4.4.0.tgz",
-      "integrity": "sha1-UvBWEP/53tQiYRRB7R/BI6AwAbM="
-    },
-    "node_modules/lodash.restparam": {
-      "version": "3.6.1",
-      "resolved": "https://registry.npmjs.org/lodash.restparam/-/lodash.restparam-3.6.1.tgz",
-      "integrity": "sha1-k2pOMJ7zMKdkXtQUWYbIWuWyCAU="
-    },
-    "node_modules/lodash.set": {
-      "version": "4.3.2",
-      "resolved": "https://registry.npmjs.org/lodash.set/-/lodash.set-4.3.2.tgz",
-      "integrity": "sha1-2HV7HagH3eJIFrDWqEvqGnYjCyM="
-    },
-    "node_modules/lodash.template": {
-      "version": "3.6.2",
-      "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-3.6.2.tgz",
-      "integrity": "sha1-+M3sxhaaJVvpCYrosMU9N4kx0U8=",
-      "dependencies": {
-        "lodash._basecopy": "^3.0.0",
-        "lodash._basetostring": "^3.0.0",
-        "lodash._basevalues": "^3.0.0",
-        "lodash._isiterateecall": "^3.0.0",
-        "lodash._reinterpolate": "^3.0.0",
-        "lodash.escape": "^3.0.0",
-        "lodash.keys": "^3.0.0",
-        "lodash.restparam": "^3.0.0",
-        "lodash.templatesettings": "^3.0.0"
-      }
-    },
-    "node_modules/lodash.templatesettings": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-3.1.1.tgz",
-      "integrity": "sha1-+zB4RHU7Zrnxr6VOJix0UwfbqOU=",
-      "dependencies": {
-        "lodash._reinterpolate": "^3.0.0",
-        "lodash.escape": "^3.0.0"
-      }
-    },
-    "node_modules/lodash.uniq": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz",
-      "integrity": "sha1-0CJTc662Uq3BvILklFM5qEJ1R3M="
-    },
-    "node_modules/log-symbols": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-3.0.0.tgz",
-      "integrity": "sha512-dSkNGuI7iG3mfvDzUuYZyvk5dD9ocYCYzNU6CYDE6+Xqd+gwme6Z00NS3dUh8mq/73HaEtT7m6W+yUPtU6BZnQ==",
-      "dev": true,
-      "dependencies": {
-        "chalk": "^2.4.2"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/log4js": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npm.taobao.org/log4js/download/log4js-6.3.0.tgz",
-      "integrity": "sha1-EN+vu0NDUaPjAnegC5h5RG9xW8s=",
-      "dependencies": {
-        "date-format": "^3.0.0",
-        "debug": "^4.1.1",
-        "flatted": "^2.0.1",
-        "rfdc": "^1.1.4",
-        "streamroller": "^2.2.4"
-      },
-      "engines": {
-        "node": ">=8.0"
-      }
-    },
-    "node_modules/longest": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz",
-      "integrity": "sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/longest-streak": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/longest-streak/-/longest-streak-2.0.4.tgz",
-      "integrity": "sha512-vM6rUVCVUJJt33bnmHiZEvr7wPT78ztX7rojL+LW51bHtLh6HTjx84LA5W4+oa6aKEJA7jJu5LR6vQRBpA5DVg==",
-      "dev": true,
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
-      }
-    },
-    "node_modules/loose-envify": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
-      "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
-      "dependencies": {
-        "js-tokens": "^3.0.0 || ^4.0.0"
-      },
-      "bin": {
-        "loose-envify": "cli.js"
-      }
-    },
-    "node_modules/lower-case": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-1.1.4.tgz",
-      "integrity": "sha1-miyr0bno4K6ZOkv31YdcOcQujqw="
-    },
-    "node_modules/lru-cache": {
-      "version": "4.1.5",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
-      "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
-      "dependencies": {
-        "pseudomap": "^1.0.2",
-        "yallist": "^2.1.2"
-      }
-    },
-    "node_modules/lru-queue": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/lru-queue/-/lru-queue-0.1.0.tgz",
-      "integrity": "sha1-Jzi9nw089PhEkMVzbEhpmsYyzaM=",
-      "dependencies": {
-        "es5-ext": "~0.10.2"
-      }
-    },
-    "node_modules/macos-release": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/macos-release/-/macos-release-2.3.0.tgz",
-      "integrity": "sha512-OHhSbtcviqMPt7yfw5ef5aghS2jzFVKEFyCJndQt2YpSQ9qRVSEv2axSJI1paVThEu+FFGs584h/1YhxjVqajA==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/make-dir": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz",
-      "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==",
-      "dependencies": {
-        "pify": "^4.0.1",
-        "semver": "^5.6.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/make-error": {
-      "version": "1.3.6",
-      "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz",
-      "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw=="
-    },
-    "node_modules/make-error-cause": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/make-error-cause/-/make-error-cause-1.2.2.tgz",
-      "integrity": "sha1-3wOI/NCzeBbf8KX7gQiTl3fcvJ0=",
-      "dependencies": {
-        "make-error": "^1.2.0"
-      }
-    },
-    "node_modules/make-iterator": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/make-iterator/-/make-iterator-1.0.1.tgz",
-      "integrity": "sha512-pxiuXh0iVEq7VM7KMIhs5gxsfxCux2URptUQaXo4iZZJxBAzTPOLE2BumO5dbfVYq/hBJFBR/a1mFDmOx5AGmw==",
-      "dependencies": {
-        "kind-of": "^6.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/map-age-cleaner": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz",
-      "integrity": "sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w==",
-      "dependencies": {
-        "p-defer": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/map-cache": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz",
-      "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/map-obj": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-4.1.0.tgz",
-      "integrity": "sha512-glc9y00wgtwcDmp7GaE/0b0OnxpNJsVf3ael/An6Fe2Q51LLwN1er6sdomLRzz5h0+yMpiYLhWYF5R7HeqVd4g==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/map-stream": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.1.0.tgz",
-      "integrity": "sha1-5WqpTEyAVaFkBKBnS3jyFffI4ZQ="
-    },
-    "node_modules/map-visit": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz",
-      "integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=",
-      "dependencies": {
-        "object-visit": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/markdown-escapes": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/markdown-escapes/-/markdown-escapes-1.0.4.tgz",
-      "integrity": "sha512-8z4efJYk43E0upd0NbVXwgSTQs6cT3T06etieCMEg7dRbzCbxUCK/GHlX8mhHRDcp+OLlHkPKsvqQTCvsRl2cg==",
-      "dev": true,
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
-      }
-    },
-    "node_modules/markdown-table": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/markdown-table/-/markdown-table-2.0.0.tgz",
-      "integrity": "sha512-Ezda85ToJUBhM6WGaG6veasyym+Tbs3cMAw/ZhOPqXiYsr0jgocBV3j3nx+4lk47plLlIqjwuTm/ywVI+zjJ/A==",
-      "dev": true,
-      "dependencies": {
-        "repeat-string": "^1.0.0"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
-      }
-    },
-    "node_modules/matchdep": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/matchdep/-/matchdep-2.0.0.tgz",
-      "integrity": "sha1-xvNINKDY28OzfCfui7yyfHd1WC4=",
-      "dependencies": {
-        "findup-sync": "^2.0.0",
-        "micromatch": "^3.0.4",
-        "resolve": "^1.4.0",
-        "stack-trace": "0.0.10"
-      },
-      "engines": {
-        "node": ">= 0.10.0"
-      }
-    },
-    "node_modules/matchdep/node_modules/braces": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-      "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-      "dependencies": {
-        "arr-flatten": "^1.1.0",
-        "array-unique": "^0.3.2",
-        "extend-shallow": "^2.0.1",
-        "fill-range": "^4.0.0",
-        "isobject": "^3.0.1",
-        "repeat-element": "^1.1.2",
-        "snapdragon": "^0.8.1",
-        "snapdragon-node": "^2.0.1",
-        "split-string": "^3.0.2",
-        "to-regex": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/matchdep/node_modules/braces/node_modules/extend-shallow": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-      "dependencies": {
-        "is-extendable": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/matchdep/node_modules/fill-range": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-      "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
-      "dependencies": {
-        "extend-shallow": "^2.0.1",
-        "is-number": "^3.0.0",
-        "repeat-string": "^1.6.1",
-        "to-regex-range": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/matchdep/node_modules/fill-range/node_modules/extend-shallow": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-      "dependencies": {
-        "is-extendable": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/matchdep/node_modules/findup-sync": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-2.0.0.tgz",
-      "integrity": "sha1-kyaxSIwi0aYIhlCoaQGy2akKLLw=",
-      "dependencies": {
-        "detect-file": "^1.0.0",
-        "is-glob": "^3.1.0",
-        "micromatch": "^3.0.4",
-        "resolve-dir": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/matchdep/node_modules/is-glob": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
-      "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
-      "dependencies": {
-        "is-extglob": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/matchdep/node_modules/is-number": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-      "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/matchdep/node_modules/is-number/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/matchdep/node_modules/isobject": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/matchdep/node_modules/micromatch": {
-      "version": "3.1.10",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-      "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
-      "dependencies": {
-        "arr-diff": "^4.0.0",
-        "array-unique": "^0.3.2",
-        "braces": "^2.3.1",
-        "define-property": "^2.0.2",
-        "extend-shallow": "^3.0.2",
-        "extglob": "^2.0.4",
-        "fragment-cache": "^0.2.1",
-        "kind-of": "^6.0.2",
-        "nanomatch": "^1.2.9",
-        "object.pick": "^1.3.0",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/matchdep/node_modules/to-regex-range": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
-      "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
-      "dependencies": {
-        "is-number": "^3.0.0",
-        "repeat-string": "^1.6.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/mathml-tag-names": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz",
-      "integrity": "sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==",
-      "dev": true,
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
-      }
-    },
-    "node_modules/md5.js": {
-      "version": "1.3.5",
-      "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz",
-      "integrity": "sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==",
-      "dependencies": {
-        "hash-base": "^3.0.0",
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.1.2"
-      }
-    },
-    "node_modules/mdast-util-compact": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/mdast-util-compact/-/mdast-util-compact-2.0.1.tgz",
-      "integrity": "sha512-7GlnT24gEwDrdAwEHrU4Vv5lLWrEer4KOkAiKT9nYstsTad7Oc1TwqT2zIMKRdZF7cTuaf+GA1E4Kv7jJh8mPA==",
-      "dev": true,
-      "dependencies": {
-        "unist-util-visit": "^2.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      }
-    },
-    "node_modules/mdn-data": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.4.tgz",
-      "integrity": "sha512-iV3XNKw06j5Q7mi6h+9vbx23Tv7JkjEVgKHW4pimwyDGWm0OIQntJJ+u1C6mg6mK1EaTv42XQ7w76yuzH7M2cA=="
-    },
-    "node_modules/mem": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/mem/-/mem-4.3.0.tgz",
-      "integrity": "sha512-qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w==",
-      "dependencies": {
-        "map-age-cleaner": "^0.1.1",
-        "mimic-fn": "^2.0.0",
-        "p-is-promise": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/mem/node_modules/mimic-fn": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
-      "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/memoizee": {
-      "version": "0.4.14",
-      "resolved": "https://registry.npmjs.org/memoizee/-/memoizee-0.4.14.tgz",
-      "integrity": "sha512-/SWFvWegAIYAO4NQMpcX+gcra0yEZu4OntmUdrBaWrJncxOqAziGFlHxc7yjKVK2uu3lpPW27P27wkR82wA8mg==",
-      "dependencies": {
-        "d": "1",
-        "es5-ext": "^0.10.45",
-        "es6-weak-map": "^2.0.2",
-        "event-emitter": "^0.3.5",
-        "is-promise": "^2.1",
-        "lru-queue": "0.1",
-        "next-tick": "1",
-        "timers-ext": "^0.1.5"
-      }
-    },
-    "node_modules/memory-fs": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz",
-      "integrity": "sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=",
-      "dependencies": {
-        "errno": "^0.1.3",
-        "readable-stream": "^2.0.1"
-      }
-    },
-    "node_modules/meow": {
-      "version": "6.1.1",
-      "resolved": "https://registry.npmjs.org/meow/-/meow-6.1.1.tgz",
-      "integrity": "sha512-3YffViIt2QWgTy6Pale5QpopX/IvU3LPL03jOTqp6pGj3VjesdO/U8CuHMKpnQr4shCNCM5fd5XFFvIIl6JBHg==",
-      "dev": true,
-      "dependencies": {
-        "@types/minimist": "^1.2.0",
-        "camelcase-keys": "^6.2.2",
-        "decamelize-keys": "^1.1.0",
-        "hard-rejection": "^2.1.0",
-        "minimist-options": "^4.0.2",
-        "normalize-package-data": "^2.5.0",
-        "read-pkg-up": "^7.0.1",
-        "redent": "^3.0.0",
-        "trim-newlines": "^3.0.0",
-        "type-fest": "^0.13.1",
-        "yargs-parser": "^18.1.3"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/meow/node_modules/find-up": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-      "dev": true,
-      "dependencies": {
-        "locate-path": "^5.0.0",
-        "path-exists": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/meow/node_modules/locate-path": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-      "dev": true,
-      "dependencies": {
-        "p-locate": "^4.1.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/meow/node_modules/p-limit": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-      "dev": true,
-      "dependencies": {
-        "p-try": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/meow/node_modules/p-locate": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-      "dev": true,
-      "dependencies": {
-        "p-limit": "^2.2.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/meow/node_modules/p-try": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/meow/node_modules/parse-json": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.0.0.tgz",
-      "integrity": "sha512-OOY5b7PAEFV0E2Fir1KOkxchnZNCdowAJgQ5NuxjpBKTRP3pQhwkrkxqQjeoKJ+fO7bCpmIZaogI4eZGDMEGOw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/code-frame": "^7.0.0",
-        "error-ex": "^1.3.1",
-        "json-parse-better-errors": "^1.0.1",
-        "lines-and-columns": "^1.1.6"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/meow/node_modules/path-exists": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/meow/node_modules/read-pkg": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz",
-      "integrity": "sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==",
-      "dev": true,
-      "dependencies": {
-        "@types/normalize-package-data": "^2.4.0",
-        "normalize-package-data": "^2.5.0",
-        "parse-json": "^5.0.0",
-        "type-fest": "^0.6.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/meow/node_modules/read-pkg-up": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz",
-      "integrity": "sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==",
-      "dev": true,
-      "dependencies": {
-        "find-up": "^4.1.0",
-        "read-pkg": "^5.2.0",
-        "type-fest": "^0.8.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/meow/node_modules/read-pkg-up/node_modules/type-fest": {
-      "version": "0.8.1",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
-      "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/meow/node_modules/read-pkg/node_modules/type-fest": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz",
-      "integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/meow/node_modules/type-fest": {
-      "version": "0.13.1",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.13.1.tgz",
-      "integrity": "sha512-34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/meow/node_modules/yargs-parser": {
-      "version": "18.1.3",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz",
-      "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==",
-      "dev": true,
-      "dependencies": {
-        "camelcase": "^5.0.0",
-        "decamelize": "^1.2.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/merge-options": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/merge-options/-/merge-options-1.0.1.tgz",
-      "integrity": "sha512-iuPV41VWKWBIOpBsjoxjDZw8/GbSfZ2mk7N1453bwMrfzdrIk7EzBd+8UVR6rkw67th7xnk9Dytl3J+lHPdxvg==",
-      "dependencies": {
-        "is-plain-obj": "^1.1"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/merge-source-map": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/merge-source-map/-/merge-source-map-1.1.0.tgz",
-      "integrity": "sha512-Qkcp7P2ygktpMPh2mCQZaf3jhN6D3Z/qVZHSdWvQ+2Ef5HgRAPBO57A77+ENm0CPx2+1Ce/MYKi3ymqdfuqibw==",
-      "dependencies": {
-        "source-map": "^0.6.1"
-      }
-    },
-    "node_modules/merge-source-map/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/merge-stream": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
-      "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w=="
-    },
-    "node_modules/merge2": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.3.0.tgz",
-      "integrity": "sha512-2j4DAdlBOkiSZIsaXk4mTE3sRS02yBHAtfy127xRV3bQUFqXkjHCHLW6Scv7DwNRbIWNHH8zpnz9zMaKXIdvYw==",
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/micromatch": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz",
-      "integrity": "sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==",
-      "dependencies": {
-        "braces": "^3.0.1",
-        "picomatch": "^2.0.5"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/miller-rabin": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz",
-      "integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==",
-      "dependencies": {
-        "bn.js": "^4.0.0",
-        "brorand": "^1.0.1"
-      },
-      "bin": {
-        "miller-rabin": "bin/miller-rabin"
-      }
-    },
-    "node_modules/miller-rabin/node_modules/bn.js": {
-      "version": "4.11.8",
-      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz",
-      "integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA=="
-    },
-    "node_modules/mime": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
-      "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
-      "optional": true,
-      "bin": {
-        "mime": "cli.js"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/mime-db": {
-      "version": "1.44.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.44.0.tgz",
-      "integrity": "sha512-/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg==",
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/mime-types": {
-      "version": "2.1.27",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.27.tgz",
-      "integrity": "sha512-JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w==",
-      "dependencies": {
-        "mime-db": "1.44.0"
-      },
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/mimic-fn": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz",
-      "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==",
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/min-indent": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/min-indent/-/min-indent-1.0.0.tgz",
-      "integrity": "sha1-z8RcN+nsDY8KDsPdTvf3w6vjklY=",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/mini-css-extract-plugin": {
-      "version": "0.9.0",
-      "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-0.9.0.tgz",
-      "integrity": "sha512-lp3GeY7ygcgAmVIcRPBVhIkf8Us7FZjA+ILpal44qLdSu11wmjKQ3d9k15lfD7pO4esu9eUIAW7qiYIBppv40A==",
-      "dependencies": {
-        "loader-utils": "^1.1.0",
-        "normalize-url": "1.9.1",
-        "schema-utils": "^1.0.0",
-        "webpack-sources": "^1.1.0"
-      },
-      "engines": {
-        "node": ">= 6.9.0"
-      },
-      "peerDependencies": {
-        "webpack": "^4.4.0"
-      }
-    },
-    "node_modules/mini-css-extract-plugin/node_modules/normalize-url": {
-      "version": "1.9.1",
-      "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-1.9.1.tgz",
-      "integrity": "sha1-LMDWazHqIwNkWENuNiDYWVTGbDw=",
-      "dependencies": {
-        "object-assign": "^4.0.1",
-        "prepend-http": "^1.0.0",
-        "query-string": "^4.1.0",
-        "sort-keys": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/mini-css-extract-plugin/node_modules/schema-utils": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
-      "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
-      "dependencies": {
-        "ajv": "^6.1.0",
-        "ajv-errors": "^1.0.0",
-        "ajv-keywords": "^3.1.0"
-      },
-      "engines": {
-        "node": ">= 4"
-      }
-    },
-    "node_modules/minimalistic-assert": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
-      "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A=="
-    },
-    "node_modules/minimalistic-crypto-utils": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz",
-      "integrity": "sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo="
-    },
-    "node_modules/minimatch": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
-      "dependencies": {
-        "brace-expansion": "^1.1.7"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/minimist": {
-      "version": "1.2.5",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
-      "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="
-    },
-    "node_modules/minimist-options": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/minimist-options/-/minimist-options-4.0.2.tgz",
-      "integrity": "sha512-seq4hpWkYSUh1y7NXxzucwAN9yVlBc3Upgdjz8vLCP97jG8kaOmzYrVH/m7tQ1NYD1wdtZbSLfdy4zFmRWuc/w==",
-      "dev": true,
-      "dependencies": {
-        "arrify": "^1.0.1",
-        "is-plain-obj": "^1.1.0"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/minipass": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.1.3.tgz",
-      "integrity": "sha512-Mgd2GdMVzY+x3IJ+oHnVM+KG3lA5c8tnabyJKmHSaG2kAGpudxuOf8ToDkhumF7UzME7DecbQE9uOZhNm7PuJg==",
-      "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/minipass-collect": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/minipass-collect/-/minipass-collect-1.0.2.tgz",
-      "integrity": "sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA==",
-      "dependencies": {
-        "minipass": "^3.0.0"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/minipass-flush": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/minipass-flush/-/minipass-flush-1.0.5.tgz",
-      "integrity": "sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==",
-      "dependencies": {
-        "minipass": "^3.0.0"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/minipass-pipeline": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/minipass-pipeline/-/minipass-pipeline-1.2.3.tgz",
-      "integrity": "sha512-cFOknTvng5vqnwOpDsZTWhNll6Jf8o2x+/diplafmxpuIymAjzoOolZG0VvQf3V2HgqzJNhnuKHYp2BqDgz8IQ==",
-      "dependencies": {
-        "minipass": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/minipass/node_modules/yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
-    },
-    "node_modules/minizlib": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.0.tgz",
-      "integrity": "sha512-EzTZN/fjSvifSX0SlqUERCN39o6T40AMarPbv0MrarSFtIITCBh7bi+dU8nxGFHuqs9jdIAeoYoKuQAAASsPPA==",
-      "dependencies": {
-        "minipass": "^3.0.0",
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/minizlib/node_modules/yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
-    },
-    "node_modules/mitt": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/mitt/-/mitt-1.1.2.tgz",
-      "integrity": "sha1-OA5hSA1qYVtmDwertg1R4KTkvtY="
-    },
-    "node_modules/mixin-deep": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz",
-      "integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==",
-      "dependencies": {
-        "for-in": "^1.0.2",
-        "is-extendable": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/mixin-deep/node_modules/is-extendable": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
-      "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
-      "dependencies": {
-        "is-plain-object": "^2.0.4"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/mixin-deep/node_modules/is-plain-object": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
-      "dependencies": {
-        "isobject": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/mixin-deep/node_modules/isobject": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/mkdirp": {
-      "version": "0.5.5",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
-      "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
-      "dependencies": {
-        "minimist": "^1.2.5"
-      },
-      "bin": {
-        "mkdirp": "bin/cmd.js"
-      }
-    },
-    "node_modules/monaco-editor": {
-      "version": "0.20.0",
-      "resolved": "https://registry.npmjs.org/monaco-editor/-/monaco-editor-0.20.0.tgz",
-      "integrity": "sha512-hkvf4EtPJRMQlPC3UbMoRs0vTAFAYdzFQ+gpMb8A+9znae1c43q8Mab9iVsgTcg/4PNiLGGn3SlDIa8uvK1FIQ=="
-    },
-    "node_modules/monaco-editor-webpack-plugin": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/monaco-editor-webpack-plugin/-/monaco-editor-webpack-plugin-1.9.0.tgz",
-      "integrity": "sha512-tOiiToc94E1sb50BgZ8q8WK/bxus77SRrwCqIpAB5er3cpX78SULbEBY4YPOB8kDolOzKRt30WIHG/D6gz69Ww==",
-      "dependencies": {
-        "loader-utils": "^1.2.3"
-      },
-      "peerDependencies": {
-        "monaco-editor": "0.19.x || 0.20.x",
-        "webpack": "^4.5.0"
-      }
-    },
-    "node_modules/move-file": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/move-file/-/move-file-2.0.0.tgz",
-      "integrity": "sha512-cdkdhNCgbP5dvS4tlGxZbD+nloio9GIimP57EjqFhwLcMjnU+XJKAZzlmg/TN/AK1LuNAdTSvm3CPPP4Xkv0iQ==",
-      "dependencies": {
-        "path-exists": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10.17"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/move-file/node_modules/path-exists": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
-    },
-    "node_modules/multipipe": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/multipipe/-/multipipe-0.1.2.tgz",
-      "integrity": "sha1-Ko8t33Du1WTf8tV/HhoTfZ8FB4s=",
-      "dependencies": {
-        "duplexer2": "0.0.2"
-      }
-    },
-    "node_modules/mute-stdout": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/mute-stdout/-/mute-stdout-1.0.1.tgz",
-      "integrity": "sha512-kDcwXR4PS7caBpuRYYBUz9iVixUk3anO3f5OYFiIPwK/20vCzKCHyKoulbiDY1S53zD2bxUpxN/IJ+TnXjfvxg==",
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/mute-stream": {
-      "version": "0.0.7",
-      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz",
-      "integrity": "sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s="
-    },
-    "node_modules/nan": {
-      "version": "2.14.1",
-      "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.1.tgz",
-      "integrity": "sha512-isWHgVjnFjh2x2yuJ/tj3JbwoHu3UC2dX5G/88Cm24yB6YopVgxvBObDY7n5xW6ExmFhJpSEQqFPvq9zaXc8Jw==",
-      "optional": true
-    },
-    "node_modules/nanomatch": {
-      "version": "1.2.13",
-      "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
-      "integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==",
-      "dependencies": {
-        "arr-diff": "^4.0.0",
-        "array-unique": "^0.3.2",
-        "define-property": "^2.0.2",
-        "extend-shallow": "^3.0.2",
-        "fragment-cache": "^0.2.1",
-        "is-windows": "^1.0.2",
-        "kind-of": "^6.0.2",
-        "object.pick": "^1.3.0",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/natural-compare": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
-      "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=",
-      "dev": true
-    },
-    "node_modules/neo-async": {
-      "version": "2.6.1",
-      "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.1.tgz",
-      "integrity": "sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw=="
-    },
-    "node_modules/next-tick": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz",
-      "integrity": "sha1-yobR/ogoFpsBICCOPchCS524NCw="
-    },
-    "node_modules/nice-try": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
-      "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ=="
-    },
-    "node_modules/no-case": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/no-case/-/no-case-2.3.2.tgz",
-      "integrity": "sha512-rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ==",
-      "dependencies": {
-        "lower-case": "^1.1.1"
-      }
-    },
-    "node_modules/node-fetch": {
-      "version": "2.6.1",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz",
-      "integrity": "sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==",
-      "engines": {
-        "node": "4.x || >=6.0.0"
-      }
-    },
-    "node_modules/node-libs-browser": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.2.1.tgz",
-      "integrity": "sha512-h/zcD8H9kaDZ9ALUWwlBUDo6TKF8a7qBSCSEGfjTVIYeqsioSKaAX+BN7NgiMGp6iSIXZ3PxgCu8KS3b71YK5Q==",
-      "dependencies": {
-        "assert": "^1.1.1",
-        "browserify-zlib": "^0.2.0",
-        "buffer": "^4.3.0",
-        "console-browserify": "^1.1.0",
-        "constants-browserify": "^1.0.0",
-        "crypto-browserify": "^3.11.0",
-        "domain-browser": "^1.1.1",
-        "events": "^3.0.0",
-        "https-browserify": "^1.0.0",
-        "os-browserify": "^0.3.0",
-        "path-browserify": "0.0.1",
-        "process": "^0.11.10",
-        "punycode": "^1.2.4",
-        "querystring-es3": "^0.2.0",
-        "readable-stream": "^2.3.3",
-        "stream-browserify": "^2.0.1",
-        "stream-http": "^2.7.2",
-        "string_decoder": "^1.0.0",
-        "timers-browserify": "^2.0.4",
-        "tty-browserify": "0.0.0",
-        "url": "^0.11.0",
-        "util": "^0.11.0",
-        "vm-browserify": "^1.0.1"
-      }
-    },
-    "node_modules/node-libs-browser/node_modules/buffer": {
-      "version": "4.9.2",
-      "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.2.tgz",
-      "integrity": "sha512-xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg==",
-      "dependencies": {
-        "base64-js": "^1.0.2",
-        "ieee754": "^1.1.4",
-        "isarray": "^1.0.0"
-      }
-    },
-    "node_modules/node-libs-browser/node_modules/punycode": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
-      "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4="
-    },
-    "node_modules/node-notifier": {
-      "version": "5.4.3",
-      "resolved": "https://registry.npmjs.org/node-notifier/-/node-notifier-5.4.3.tgz",
-      "integrity": "sha512-M4UBGcs4jeOK9CjTsYwkvH6/MzuUmGCyTW+kCY7uO+1ZVr0+FHGdPdIf5CCLqAaxnRrWidyoQlNkMIIVwbKB8Q==",
-      "dependencies": {
-        "growly": "^1.3.0",
-        "is-wsl": "^1.1.0",
-        "semver": "^5.5.0",
-        "shellwords": "^0.1.1",
-        "which": "^1.3.0"
-      }
-    },
-    "node_modules/node-releases": {
-      "version": "1.1.55",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.55.tgz",
-      "integrity": "sha512-H3R3YR/8TjT5WPin/wOoHOUPHgvj8leuU/Keta/rwelEQN9pA/S2Dx8/se4pZ2LBxSd0nAGzsNzhqwa77v7F1w=="
-    },
-    "node_modules/node.extend": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/node.extend/-/node.extend-2.0.2.tgz",
-      "integrity": "sha512-pDT4Dchl94/+kkgdwyS2PauDFjZG0Hk0IcHIB+LkW27HLDtdoeMxHTxZh39DYbPP8UflWXWj9JcdDozF+YDOpQ==",
-      "dependencies": {
-        "has": "^1.0.3",
-        "is": "^3.2.1"
-      },
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/nopt": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.3.tgz",
-      "integrity": "sha512-CvaGwVMztSMJLOeXPrez7fyfObdZqNUK1cPAEzLHrTybIua9pMdmmPR5YwtfNftIOMv3DPUhFaxsZMNTQO20Kg==",
-      "dependencies": {
-        "abbrev": "1",
-        "osenv": "^0.1.4"
-      },
-      "bin": {
-        "nopt": "bin/nopt.js"
-      }
-    },
-    "node_modules/normalize-package-data": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
-      "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
-      "dependencies": {
-        "hosted-git-info": "^2.1.4",
-        "resolve": "^1.10.0",
-        "semver": "2 || 3 || 4 || 5",
-        "validate-npm-package-license": "^3.0.1"
-      }
-    },
-    "node_modules/normalize-path": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
-      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/normalize-range": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz",
-      "integrity": "sha1-LRDAa9/TEuqXd2laTShDlFa3WUI=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/normalize-selector": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/normalize-selector/-/normalize-selector-0.2.0.tgz",
-      "integrity": "sha1-0LFF62kRicY6eNIB3E/bEpPvDAM=",
-      "dev": true
-    },
-    "node_modules/normalize-url": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-3.3.0.tgz",
-      "integrity": "sha512-U+JJi7duF1o+u2pynbp2zXDW2/PADgC30f0GsHZtRh+HOcXHnw137TrNlyxxRvWW5fjKd3bcLHPxofWuCjaeZg==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/normalize-wheel": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/normalize-wheel/-/normalize-wheel-1.0.1.tgz",
-      "integrity": "sha1-rsiGr/2wRQcNhWRH32Ls+GFG7EU="
-    },
-    "node_modules/now-and-later": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/now-and-later/-/now-and-later-2.0.1.tgz",
-      "integrity": "sha512-KGvQ0cB70AQfg107Xvs/Fbu+dGmZoTRJp2TaPwcwQm3/7PteUyN2BCgk8KBMPGBUXZdVwyWS8fDCGFygBm19UQ==",
-      "dependencies": {
-        "once": "^1.3.2"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/npm-run-path": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
-      "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=",
-      "dependencies": {
-        "path-key": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/nth-check": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.2.tgz",
-      "integrity": "sha512-WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg==",
-      "dependencies": {
-        "boolbase": "~1.0.0"
-      }
-    },
-    "node_modules/num2fraction": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/num2fraction/-/num2fraction-1.2.2.tgz",
-      "integrity": "sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4="
-    },
-    "node_modules/number-is-nan": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
-      "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/oauth-sign": {
-      "version": "0.9.0",
-      "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz",
-      "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==",
-      "optional": true,
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/object-assign": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/object-copy": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz",
-      "integrity": "sha1-fn2Fi3gb18mRpBupde04EnVOmYw=",
-      "dependencies": {
-        "copy-descriptor": "^0.1.0",
-        "define-property": "^0.2.5",
-        "kind-of": "^3.0.3"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/object-copy/node_modules/define-property": {
-      "version": "0.2.5",
-      "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-      "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-      "dependencies": {
-        "is-descriptor": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/object-copy/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/object-inspect": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.7.0.tgz",
-      "integrity": "sha512-a7pEHdh1xKIAgTySUGgLMx/xwDZskN1Ud6egYYN3EdRW4ZMPNEDUTF+hwy2LUC+Bl+SyLXANnwz/jyh/qutKUw==",
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object-keys": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
-      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/object-visit": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz",
-      "integrity": "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=",
-      "dependencies": {
-        "isobject": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/object-visit/node_modules/isobject": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/object.assign": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz",
-      "integrity": "sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==",
-      "dependencies": {
-        "define-properties": "^1.1.2",
-        "function-bind": "^1.1.1",
-        "has-symbols": "^1.0.0",
-        "object-keys": "^1.0.11"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/object.defaults": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/object.defaults/-/object.defaults-1.1.0.tgz",
-      "integrity": "sha1-On+GgzS0B96gbaFtiNXNKeQ1/s8=",
-      "dependencies": {
-        "array-each": "^1.0.1",
-        "array-slice": "^1.0.0",
-        "for-own": "^1.0.0",
-        "isobject": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/object.defaults/node_modules/isobject": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/object.entries": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.1.tgz",
-      "integrity": "sha512-ilqR7BgdyZetJutmDPfXCDffGa0/Yzl2ivVNpbx/g4UeWrCdRnFDUBrKJGLhGieRHDATnyZXWBeCb29k9CJysQ==",
-      "dev": true,
-      "dependencies": {
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.0-next.1",
-        "function-bind": "^1.1.1",
-        "has": "^1.0.3"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/object.getownpropertydescriptors": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.0.tgz",
-      "integrity": "sha512-Z53Oah9A3TdLoblT7VKJaTDdXdT+lQO+cNpKVnya5JDe9uLvzu1YyY1yFDFrcxrlRgWrEFH0jJtD/IbuwjcEVg==",
-      "dependencies": {
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.0-next.1"
-      },
-      "engines": {
-        "node": ">= 0.8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.map": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/object.map/-/object.map-1.0.1.tgz",
-      "integrity": "sha1-z4Plncj8wK1fQlDh94s7gb2AHTc=",
-      "dependencies": {
-        "for-own": "^1.0.0",
-        "make-iterator": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/object.pick": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz",
-      "integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=",
-      "dependencies": {
-        "isobject": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/object.pick/node_modules/isobject": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/object.reduce": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/object.reduce/-/object.reduce-1.0.1.tgz",
-      "integrity": "sha1-b+NI8qx/oPlcpiEiZZkJaCW7A60=",
-      "dependencies": {
-        "for-own": "^1.0.0",
-        "make-iterator": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/object.values": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.1.tgz",
-      "integrity": "sha512-WTa54g2K8iu0kmS/us18jEmdv1a4Wi//BZ/DTVYEcH0XhLM5NYdpDHja3gt57VrZLcNAO2WGA+KpWsDBaHt6eA==",
-      "dependencies": {
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.0-next.1",
-        "function-bind": "^1.1.1",
-        "has": "^1.0.3"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/octokit-pagination-methods": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/octokit-pagination-methods/-/octokit-pagination-methods-1.1.0.tgz",
-      "integrity": "sha512-fZ4qZdQ2nxJvtcasX7Ghl+WlWS/d9IgnBIwFZXVNNZUmzpno91SX5bc5vuxiuKoCtK78XxGGNuSCrDC7xYB3OQ=="
-    },
-    "node_modules/once": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
-      "dependencies": {
-        "wrappy": "1"
-      }
-    },
-    "node_modules/onetime": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz",
-      "integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=",
-      "dependencies": {
-        "mimic-fn": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/optimize-css-assets-webpack-plugin": {
-      "version": "5.0.3",
-      "resolved": "https://registry.npmjs.org/optimize-css-assets-webpack-plugin/-/optimize-css-assets-webpack-plugin-5.0.3.tgz",
-      "integrity": "sha512-q9fbvCRS6EYtUKKSwI87qm2IxlyJK5b4dygW1rKUBT6mMDhdG5e5bZT63v6tnJR9F9FB/H5a0HTmtw+laUBxKA==",
-      "dependencies": {
-        "cssnano": "^4.1.10",
-        "last-call-webpack-plugin": "^3.0.0"
-      },
-      "peerDependencies": {
-        "webpack": "^4.0.0"
-      }
-    },
-    "node_modules/optionator": {
-      "version": "0.8.3",
-      "resolved": "https://registry.npm.taobao.org/optionator/download/optionator-0.8.3.tgz",
-      "integrity": "sha1-hPodA2/p08fiHZmIS2ARZ+yPtJU=",
-      "dev": true,
-      "dependencies": {
-        "deep-is": "~0.1.3",
-        "fast-levenshtein": "~2.0.6",
-        "levn": "~0.3.0",
-        "prelude-ls": "~1.1.2",
-        "type-check": "~0.3.2",
-        "word-wrap": "~1.2.3"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/ordered-read-streams": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-1.0.1.tgz",
-      "integrity": "sha1-d8DLN8QVJdZBZtmQ/61+xqDhNj4=",
-      "dependencies": {
-        "readable-stream": "^2.0.1"
-      }
-    },
-    "node_modules/os-browserify": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz",
-      "integrity": "sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc="
-    },
-    "node_modules/os-homedir": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
-      "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/os-locale": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz",
-      "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=",
-      "dependencies": {
-        "lcid": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/os-name": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/os-name/-/os-name-3.1.0.tgz",
-      "integrity": "sha512-h8L+8aNjNcMpo/mAIBPn5PXCM16iyPGjHNWo6U1YO8sJTMHtEtyczI6QJnLoplswm6goopQkqc7OAnjhWcugVg==",
-      "dependencies": {
-        "macos-release": "^2.2.0",
-        "windows-release": "^3.1.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/os-tmpdir": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
-      "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/osenv": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz",
-      "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==",
-      "dependencies": {
-        "os-homedir": "^1.0.0",
-        "os-tmpdir": "^1.0.0"
-      }
-    },
-    "node_modules/p-defer": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/p-defer/-/p-defer-1.0.0.tgz",
-      "integrity": "sha1-n26xgvbJqozXQwBKfU+WsZaw+ww=",
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/p-finally": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
-      "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=",
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/p-is-promise": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/p-is-promise/-/p-is-promise-2.1.0.tgz",
-      "integrity": "sha512-Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/p-limit": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
-      "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
-      "dependencies": {
-        "p-try": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/p-locate": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
-      "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
-      "dependencies": {
-        "p-limit": "^1.1.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/p-map": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/p-map/-/p-map-1.2.0.tgz",
-      "integrity": "sha512-r6zKACMNhjPJMTl8KcFH4li//gkrXWfbD6feV8l6doRHlzljFWGJ2AP6iKaCJXyZmAUMOPtvbW7EXkbWO/pLEA==",
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/p-try": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
-      "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=",
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/pako": {
-      "version": "1.0.11",
-      "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz",
-      "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw=="
-    },
-    "node_modules/parallel-transform": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/parallel-transform/-/parallel-transform-1.2.0.tgz",
-      "integrity": "sha512-P2vSmIu38uIlvdcU7fDkyrxj33gTUy/ABO5ZUbGowxNCopBq/OoD42bP4UmMrJoPyk4Uqf0mu3mtWBhHCZD8yg==",
-      "dependencies": {
-        "cyclist": "^1.0.1",
-        "inherits": "^2.0.3",
-        "readable-stream": "^2.1.5"
-      }
-    },
-    "node_modules/param-case": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/param-case/-/param-case-2.1.1.tgz",
-      "integrity": "sha1-35T9jPZTHs915r75oIWPvHK+Ikc=",
-      "dependencies": {
-        "no-case": "^2.2.0"
-      }
-    },
-    "node_modules/parent-module": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
-      "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
-      "dev": true,
-      "dependencies": {
-        "callsites": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/parent-module/node_modules/callsites": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
-      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/parse-asn1": {
-      "version": "5.1.5",
-      "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.5.tgz",
-      "integrity": "sha512-jkMYn1dcJqF6d5CpU689bq7w/b5ALS9ROVSpQDPrZsqqesUJii9qutvoT5ltGedNXMO2e16YUWIghG9KxaViTQ==",
-      "dependencies": {
-        "asn1.js": "^4.0.0",
-        "browserify-aes": "^1.0.0",
-        "create-hash": "^1.1.0",
-        "evp_bytestokey": "^1.0.0",
-        "pbkdf2": "^3.0.3",
-        "safe-buffer": "^5.1.1"
-      }
-    },
-    "node_modules/parse-entities": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/parse-entities/-/parse-entities-2.0.0.tgz",
-      "integrity": "sha512-kkywGpCcRYhqQIchaWqZ875wzpS/bMKhz5HnN3p7wveJTkTtyAB/AlnS0f8DFSqYW1T82t6yEAkEcB+A1I3MbQ==",
-      "dev": true,
-      "dependencies": {
-        "character-entities": "^1.0.0",
-        "character-entities-legacy": "^1.0.0",
-        "character-reference-invalid": "^1.0.0",
-        "is-alphanumerical": "^1.0.0",
-        "is-decimal": "^1.0.0",
-        "is-hexadecimal": "^1.0.0"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
-      }
-    },
-    "node_modules/parse-filepath": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/parse-filepath/-/parse-filepath-1.0.2.tgz",
-      "integrity": "sha1-pjISf1Oq89FYdvWHLz/6x2PWyJE=",
-      "dependencies": {
-        "is-absolute": "^1.0.0",
-        "map-cache": "^0.2.0",
-        "path-root": "^0.1.1"
-      },
-      "engines": {
-        "node": ">=0.8"
-      }
-    },
-    "node_modules/parse-import": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/parse-import/-/parse-import-2.0.0.tgz",
-      "integrity": "sha1-KyR0Aw4AirmNt2xLy/TbWucwb18=",
-      "dependencies": {
-        "get-imports": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/parse-json": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
-      "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=",
-      "dependencies": {
-        "error-ex": "^1.3.1",
-        "json-parse-better-errors": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/parse-node-version": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/parse-node-version/-/parse-node-version-1.0.1.tgz",
-      "integrity": "sha512-3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA==",
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/parse-passwd": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz",
-      "integrity": "sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/pascalcase": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz",
-      "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/path-browserify": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.1.tgz",
-      "integrity": "sha512-BapA40NHICOS+USX9SN4tyhq+A2RrN/Ws5F0Z5aMHDp98Fl86lX8Oti8B7uN93L4Ifv4fHOEA+pQw87gmMO/lQ=="
-    },
-    "node_modules/path-dirname": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz",
-      "integrity": "sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA="
-    },
-    "node_modules/path-exists": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
-      "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/path-is-absolute": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/path-is-inside": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz",
-      "integrity": "sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM="
-    },
-    "node_modules/path-key": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
-      "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=",
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/path-parse": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz",
-      "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw=="
-    },
-    "node_modules/path-root": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/path-root/-/path-root-0.1.1.tgz",
-      "integrity": "sha1-mkpoFMrBwM1zNgqV8yCDyOpHRbc=",
-      "dependencies": {
-        "path-root-regex": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/path-root-regex": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/path-root-regex/-/path-root-regex-0.1.2.tgz",
-      "integrity": "sha1-v8zcjfWxLcUsi0PsONGNcsBLqW0=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/path-type": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
-      "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=",
-      "dependencies": {
-        "graceful-fs": "^4.1.2",
-        "pify": "^2.0.0",
-        "pinkie-promise": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/path-type/node_modules/pify": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-      "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/pbkdf2": {
-      "version": "3.0.17",
-      "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.17.tgz",
-      "integrity": "sha512-U/il5MsrZp7mGg3mSQfn742na2T+1/vHDCG5/iTI3X9MKUuYUZVLQhyRsg06mCgDBTd57TxzgZt7P+fYfjRLtA==",
-      "dependencies": {
-        "create-hash": "^1.1.2",
-        "create-hmac": "^1.1.4",
-        "ripemd160": "^2.0.1",
-        "safe-buffer": "^5.0.1",
-        "sha.js": "^2.4.8"
-      },
-      "engines": {
-        "node": ">=0.12"
-      }
-    },
-    "node_modules/performance-now": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
-      "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns="
-    },
-    "node_modules/php-date-formatter": {
-      "version": "1.3.4",
-      "resolved": "https://registry.npmjs.org/php-date-formatter/-/php-date-formatter-1.3.4.tgz",
-      "integrity": "sha1-CaFa4HZroL6xkAwnwewxnvLkVj4="
-    },
-    "node_modules/picomatch": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz",
-      "integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==",
-      "engines": {
-        "node": ">=8.6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/jonschlinkert"
-      }
-    },
-    "node_modules/pify": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
-      "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/pinkie": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
-      "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/pinkie-promise": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
-      "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=",
-      "dependencies": {
-        "pinkie": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/pkg-dir": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz",
-      "integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==",
-      "dependencies": {
-        "find-up": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/pkg-dir/node_modules/find-up": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
-      "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
-      "dependencies": {
-        "locate-path": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/pkg-dir/node_modules/locate-path": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
-      "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
-      "dependencies": {
-        "p-locate": "^3.0.0",
-        "path-exists": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/pkg-dir/node_modules/p-limit": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-      "dependencies": {
-        "p-try": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/pkg-dir/node_modules/p-locate": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
-      "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
-      "dependencies": {
-        "p-limit": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/pkg-dir/node_modules/p-try": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/pkg-up": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/pkg-up/-/pkg-up-2.0.0.tgz",
-      "integrity": "sha1-yBmscoBZpGHKscOImivjxJoATX8=",
-      "dependencies": {
-        "find-up": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/plugin-error": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-1.0.1.tgz",
-      "integrity": "sha512-L1zP0dk7vGweZME2i+EeakvUNqSrdiI3F91TwEoYiGrAfUXmVv6fJIq4g82PAXxNsWOp0J7ZqQy/3Szz0ajTxA==",
-      "dependencies": {
-        "ansi-colors": "^1.0.1",
-        "arr-diff": "^4.0.0",
-        "arr-union": "^3.1.0",
-        "extend-shallow": "^3.0.2"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/plur": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/plur/-/plur-3.1.1.tgz",
-      "integrity": "sha512-t1Ax8KUvV3FFII8ltczPn2tJdjqbd1sIzu6t4JL7nQ3EyeL/lTrj5PWKb06ic5/6XYDr65rQ4uzQEGN70/6X5w==",
-      "dependencies": {
-        "irregular-plurals": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/popper.js": {
-      "version": "1.16.1",
-      "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.16.1.tgz",
-      "integrity": "sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ==",
-      "deprecated": "You can find the new Popper v2 at @popperjs/core, this package is dedicated to the legacy v1",
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/popperjs"
-      }
-    },
-    "node_modules/posix-character-classes": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz",
-      "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/postcss": {
-      "version": "7.0.30",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.30.tgz",
-      "integrity": "sha512-nu/0m+NtIzoubO+xdAlwZl/u5S5vi/y6BCsoL8D+8IxsD3XvBS8X4YEADNIVXKVuQvduiucnRv+vPIqj56EGMQ==",
-      "dependencies": {
-        "chalk": "^2.4.2",
-        "source-map": "^0.6.1",
-        "supports-color": "^6.1.0"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      },
-      "funding": {
-        "type": "tidelift",
-        "url": "https://tidelift.com/funding/github/npm/postcss"
-      }
-    },
-    "node_modules/postcss-attribute-case-insensitive": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-attribute-case-insensitive/-/postcss-attribute-case-insensitive-4.0.2.tgz",
-      "integrity": "sha512-clkFxk/9pcdb4Vkn0hAHq3YnxBQ2p0CGD1dy24jN+reBck+EWxMbxSUqN4Yj7t0w8csl87K6p0gxBe1utkJsYA==",
-      "dependencies": {
-        "postcss": "^7.0.2",
-        "postcss-selector-parser": "^6.0.2"
-      }
-    },
-    "node_modules/postcss-calc": {
-      "version": "7.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-7.0.2.tgz",
-      "integrity": "sha512-rofZFHUg6ZIrvRwPeFktv06GdbDYLcGqh9EwiMutZg+a0oePCCw1zHOEiji6LCpyRcjTREtPASuUqeAvYlEVvQ==",
-      "dependencies": {
-        "postcss": "^7.0.27",
-        "postcss-selector-parser": "^6.0.2",
-        "postcss-value-parser": "^4.0.2"
-      }
-    },
-    "node_modules/postcss-color-functional-notation": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-color-functional-notation/-/postcss-color-functional-notation-2.0.1.tgz",
-      "integrity": "sha512-ZBARCypjEDofW4P6IdPVTLhDNXPRn8T2s1zHbZidW6rPaaZvcnCS2soYFIQJrMZSxiePJ2XIYTlcb2ztr/eT2g==",
-      "dependencies": {
-        "postcss": "^7.0.2",
-        "postcss-values-parser": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/postcss-color-gray": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-color-gray/-/postcss-color-gray-5.0.0.tgz",
-      "integrity": "sha512-q6BuRnAGKM/ZRpfDascZlIZPjvwsRye7UDNalqVz3s7GDxMtqPY6+Q871liNxsonUw8oC61OG+PSaysYpl1bnw==",
-      "dependencies": {
-        "@csstools/convert-colors": "^1.4.0",
-        "postcss": "^7.0.5",
-        "postcss-values-parser": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/postcss-color-hex-alpha": {
-      "version": "5.0.3",
-      "resolved": "https://registry.npmjs.org/postcss-color-hex-alpha/-/postcss-color-hex-alpha-5.0.3.tgz",
-      "integrity": "sha512-PF4GDel8q3kkreVXKLAGNpHKilXsZ6xuu+mOQMHWHLPNyjiUBOr75sp5ZKJfmv1MCus5/DWUGcK9hm6qHEnXYw==",
-      "dependencies": {
-        "postcss": "^7.0.14",
-        "postcss-values-parser": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/postcss-color-mod-function": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/postcss-color-mod-function/-/postcss-color-mod-function-3.0.3.tgz",
-      "integrity": "sha512-YP4VG+xufxaVtzV6ZmhEtc+/aTXH3d0JLpnYfxqTvwZPbJhWqp8bSY3nfNzNRFLgB4XSaBA82OE4VjOOKpCdVQ==",
-      "dependencies": {
-        "@csstools/convert-colors": "^1.4.0",
-        "postcss": "^7.0.2",
-        "postcss-values-parser": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/postcss-color-rebeccapurple": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-color-rebeccapurple/-/postcss-color-rebeccapurple-4.0.1.tgz",
-      "integrity": "sha512-aAe3OhkS6qJXBbqzvZth2Au4V3KieR5sRQ4ptb2b2O8wgvB3SJBsdG+jsn2BZbbwekDG8nTfcCNKcSfe/lEy8g==",
-      "dependencies": {
-        "postcss": "^7.0.2",
-        "postcss-values-parser": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/postcss-colormin": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-4.0.3.tgz",
-      "integrity": "sha512-WyQFAdDZpExQh32j0U0feWisZ0dmOtPl44qYmJKkq9xFWY3p+4qnRzCHeNrkeRhwPHz9bQ3mo0/yVkaply0MNw==",
-      "dependencies": {
-        "browserslist": "^4.0.0",
-        "color": "^3.0.0",
-        "has": "^1.0.0",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/postcss-colormin/node_modules/postcss-value-parser": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ=="
-    },
-    "node_modules/postcss-convert-values": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-4.0.1.tgz",
-      "integrity": "sha512-Kisdo1y77KUC0Jmn0OXU/COOJbzM8cImvw1ZFsBgBgMgb1iL23Zs/LXRe3r+EZqM3vGYKdQ2YJVQ5VkJI+zEJQ==",
-      "dependencies": {
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/postcss-convert-values/node_modules/postcss-value-parser": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ=="
-    },
-    "node_modules/postcss-custom-media": {
-      "version": "7.0.8",
-      "resolved": "https://registry.npmjs.org/postcss-custom-media/-/postcss-custom-media-7.0.8.tgz",
-      "integrity": "sha512-c9s5iX0Ge15o00HKbuRuTqNndsJUbaXdiNsksnVH8H4gdc+zbLzr/UasOwNG6CTDpLFekVY4672eWdiiWu2GUg==",
-      "dependencies": {
-        "postcss": "^7.0.14"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/postcss-custom-properties": {
-      "version": "8.0.11",
-      "resolved": "https://registry.npmjs.org/postcss-custom-properties/-/postcss-custom-properties-8.0.11.tgz",
-      "integrity": "sha512-nm+o0eLdYqdnJ5abAJeXp4CEU1c1k+eB2yMCvhgzsds/e0umabFrN6HoTy/8Q4K5ilxERdl/JD1LO5ANoYBeMA==",
-      "dependencies": {
-        "postcss": "^7.0.17",
-        "postcss-values-parser": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/postcss-custom-selectors": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/postcss-custom-selectors/-/postcss-custom-selectors-5.1.2.tgz",
-      "integrity": "sha512-DSGDhqinCqXqlS4R7KGxL1OSycd1lydugJ1ky4iRXPHdBRiozyMHrdu0H3o7qNOCiZwySZTUI5MV0T8QhCLu+w==",
-      "dependencies": {
-        "postcss": "^7.0.2",
-        "postcss-selector-parser": "^5.0.0-rc.3"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/postcss-custom-selectors/node_modules/cssesc": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-2.0.0.tgz",
-      "integrity": "sha512-MsCAG1z9lPdoO/IUMLSBWBSVxVtJ1395VGIQ+Fc2gNdkQ1hNDnQdw3YhA71WJCBW1vdwA0cAnk/DnW6bqoEUYg==",
-      "bin": {
-        "cssesc": "bin/cssesc"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/postcss-custom-selectors/node_modules/postcss-selector-parser": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-5.0.0.tgz",
-      "integrity": "sha512-w+zLE5Jhg6Liz8+rQOWEAwtwkyqpfnmsinXjXg6cY7YIONZZtgvE0v2O0uhQBs0peNomOJwWRKt6JBfTdTd3OQ==",
-      "dependencies": {
-        "cssesc": "^2.0.0",
-        "indexes-of": "^1.0.1",
-        "uniq": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/postcss-dir-pseudo-class": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-dir-pseudo-class/-/postcss-dir-pseudo-class-5.0.0.tgz",
-      "integrity": "sha512-3pm4oq8HYWMZePJY+5ANriPs3P07q+LW6FAdTlkFH2XqDdP4HeeJYMOzn0HYLhRSjBO3fhiqSwwU9xEULSrPgw==",
-      "dependencies": {
-        "postcss": "^7.0.2",
-        "postcss-selector-parser": "^5.0.0-rc.3"
-      },
-      "engines": {
-        "node": ">=4.0.0"
-      }
-    },
-    "node_modules/postcss-dir-pseudo-class/node_modules/cssesc": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-2.0.0.tgz",
-      "integrity": "sha512-MsCAG1z9lPdoO/IUMLSBWBSVxVtJ1395VGIQ+Fc2gNdkQ1hNDnQdw3YhA71WJCBW1vdwA0cAnk/DnW6bqoEUYg==",
-      "bin": {
-        "cssesc": "bin/cssesc"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/postcss-dir-pseudo-class/node_modules/postcss-selector-parser": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-5.0.0.tgz",
-      "integrity": "sha512-w+zLE5Jhg6Liz8+rQOWEAwtwkyqpfnmsinXjXg6cY7YIONZZtgvE0v2O0uhQBs0peNomOJwWRKt6JBfTdTd3OQ==",
-      "dependencies": {
-        "cssesc": "^2.0.0",
-        "indexes-of": "^1.0.1",
-        "uniq": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/postcss-discard-comments": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-4.0.2.tgz",
-      "integrity": "sha512-RJutN259iuRf3IW7GZyLM5Sw4GLTOH8FmsXBnv8Ab/Tc2k4SR4qbV4DNbyyY4+Sjo362SyDmW2DQ7lBSChrpkg==",
-      "dependencies": {
-        "postcss": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/postcss-discard-duplicates": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-4.0.2.tgz",
-      "integrity": "sha512-ZNQfR1gPNAiXZhgENFfEglF93pciw0WxMkJeVmw8eF+JZBbMD7jp6C67GqJAXVZP2BWbOztKfbsdmMp/k8c6oQ==",
-      "dependencies": {
-        "postcss": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/postcss-discard-empty": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-4.0.1.tgz",
-      "integrity": "sha512-B9miTzbznhDjTfjvipfHoqbWKwd0Mj+/fL5s1QOz06wufguil+Xheo4XpOnc4NqKYBCNqqEzgPv2aPBIJLox0w==",
-      "dependencies": {
-        "postcss": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/postcss-discard-overridden": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-4.0.1.tgz",
-      "integrity": "sha512-IYY2bEDD7g1XM1IDEsUT4//iEYCxAmP5oDSFMVU/JVvT7gh+l4fmjciLqGgwjdWpQIdb0Che2VX00QObS5+cTg==",
-      "dependencies": {
-        "postcss": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/postcss-double-position-gradients": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-double-position-gradients/-/postcss-double-position-gradients-1.0.0.tgz",
-      "integrity": "sha512-G+nV8EnQq25fOI8CH/B6krEohGWnF5+3A6H/+JEpOncu5dCnkS1QQ6+ct3Jkaepw1NGVqqOZH6lqrm244mCftA==",
-      "dependencies": {
-        "postcss": "^7.0.5",
-        "postcss-values-parser": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/postcss-env-function": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-env-function/-/postcss-env-function-2.0.2.tgz",
-      "integrity": "sha512-rwac4BuZlITeUbiBq60h/xbLzXY43qOsIErngWa4l7Mt+RaSkT7QBjXVGTcBHupykkblHMDrBFh30zchYPaOUw==",
-      "dependencies": {
-        "postcss": "^7.0.2",
-        "postcss-values-parser": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/postcss-focus-visible": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-focus-visible/-/postcss-focus-visible-4.0.0.tgz",
-      "integrity": "sha512-Z5CkWBw0+idJHSV6+Bgf2peDOFf/x4o+vX/pwcNYrWpXFrSfTkQ3JQ1ojrq9yS+upnAlNRHeg8uEwFTgorjI8g==",
-      "dependencies": {
-        "postcss": "^7.0.2"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/postcss-focus-within": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-focus-within/-/postcss-focus-within-3.0.0.tgz",
-      "integrity": "sha512-W0APui8jQeBKbCGZudW37EeMCjDeVxKgiYfIIEo8Bdh5SpB9sxds/Iq8SEuzS0Q4YFOlG7EPFulbbxujpkrV2w==",
-      "dependencies": {
-        "postcss": "^7.0.2"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/postcss-font-variant": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-font-variant/-/postcss-font-variant-4.0.0.tgz",
-      "integrity": "sha512-M8BFYKOvCrI2aITzDad7kWuXXTm0YhGdP9Q8HanmN4EF1Hmcgs1KK5rSHylt/lUJe8yLxiSwWAHdScoEiIxztg==",
-      "dependencies": {
-        "postcss": "^7.0.2"
-      }
-    },
-    "node_modules/postcss-gap-properties": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-gap-properties/-/postcss-gap-properties-2.0.0.tgz",
-      "integrity": "sha512-QZSqDaMgXCHuHTEzMsS2KfVDOq7ZFiknSpkrPJY6jmxbugUPTuSzs/vuE5I3zv0WAS+3vhrlqhijiprnuQfzmg==",
-      "dependencies": {
-        "postcss": "^7.0.2"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/postcss-html": {
-      "version": "0.36.0",
-      "resolved": "https://registry.npmjs.org/postcss-html/-/postcss-html-0.36.0.tgz",
-      "integrity": "sha512-HeiOxGcuwID0AFsNAL0ox3mW6MHH5cstWN1Z3Y+n6H+g12ih7LHdYxWwEA/QmrebctLjo79xz9ouK3MroHwOJw==",
-      "dev": true,
-      "dependencies": {
-        "htmlparser2": "^3.10.0"
-      },
-      "peerDependencies": {
-        "postcss": ">=5.0.0",
-        "postcss-syntax": ">=0.36.0"
-      }
-    },
-    "node_modules/postcss-image-set-function": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-image-set-function/-/postcss-image-set-function-3.0.1.tgz",
-      "integrity": "sha512-oPTcFFip5LZy8Y/whto91L9xdRHCWEMs3e1MdJxhgt4jy2WYXfhkng59fH5qLXSCPN8k4n94p1Czrfe5IOkKUw==",
-      "dependencies": {
-        "postcss": "^7.0.2",
-        "postcss-values-parser": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/postcss-initial": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-initial/-/postcss-initial-3.0.2.tgz",
-      "integrity": "sha512-ugA2wKonC0xeNHgirR4D3VWHs2JcU08WAi1KFLVcnb7IN89phID6Qtg2RIctWbnvp1TM2BOmDtX8GGLCKdR8YA==",
-      "dependencies": {
-        "lodash.template": "^4.5.0",
-        "postcss": "^7.0.2"
-      }
-    },
-    "node_modules/postcss-initial/node_modules/lodash.template": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-4.5.0.tgz",
-      "integrity": "sha512-84vYFxIkmidUiFxidA/KjjH9pAycqW+h980j7Fuz5qxRtO9pgB7MDFTdys1N7A5mcucRiDyEq4fusljItR1T/A==",
-      "dependencies": {
-        "lodash._reinterpolate": "^3.0.0",
-        "lodash.templatesettings": "^4.0.0"
-      }
-    },
-    "node_modules/postcss-initial/node_modules/lodash.templatesettings": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-4.2.0.tgz",
-      "integrity": "sha512-stgLz+i3Aa9mZgnjr/O+v9ruKZsPsndy7qPZOchbqk2cnTU1ZaldKK+v7m54WoKIyxiuMZTKT2H81F8BeAc3ZQ==",
-      "dependencies": {
-        "lodash._reinterpolate": "^3.0.0"
-      }
-    },
-    "node_modules/postcss-lab-function": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-lab-function/-/postcss-lab-function-2.0.1.tgz",
-      "integrity": "sha512-whLy1IeZKY+3fYdqQFuDBf8Auw+qFuVnChWjmxm/UhHWqNHZx+B99EwxTvGYmUBqe3Fjxs4L1BoZTJmPu6usVg==",
-      "dependencies": {
-        "@csstools/convert-colors": "^1.4.0",
-        "postcss": "^7.0.2",
-        "postcss-values-parser": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/postcss-less": {
-      "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/postcss-less/-/postcss-less-3.1.4.tgz",
-      "integrity": "sha512-7TvleQWNM2QLcHqvudt3VYjULVB49uiW6XzEUFmvwHzvsOEF5MwBrIXZDJQvJNFGjJQTzSzZnDoCJ8h/ljyGXA==",
-      "dev": true,
-      "dependencies": {
-        "postcss": "^7.0.14"
-      },
-      "engines": {
-        "node": ">=6.14.4"
-      }
-    },
-    "node_modules/postcss-load-config": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-2.1.0.tgz",
-      "integrity": "sha512-4pV3JJVPLd5+RueiVVB+gFOAa7GWc25XQcMp86Zexzke69mKf6Nx9LRcQywdz7yZI9n1udOxmLuAwTBypypF8Q==",
-      "dependencies": {
-        "cosmiconfig": "^5.0.0",
-        "import-cwd": "^2.0.0"
-      },
-      "engines": {
-        "node": ">= 4"
-      }
-    },
-    "node_modules/postcss-loader": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-3.0.0.tgz",
-      "integrity": "sha512-cLWoDEY5OwHcAjDnkyRQzAXfs2jrKjXpO/HQFcc5b5u/r7aa471wdmChmwfnv7x2u840iat/wi0lQ5nbRgSkUA==",
-      "dependencies": {
-        "loader-utils": "^1.1.0",
-        "postcss": "^7.0.0",
-        "postcss-load-config": "^2.0.0",
-        "schema-utils": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/postcss-loader/node_modules/schema-utils": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
-      "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
-      "dependencies": {
-        "ajv": "^6.1.0",
-        "ajv-errors": "^1.0.0",
-        "ajv-keywords": "^3.1.0"
-      },
-      "engines": {
-        "node": ">= 4"
-      }
-    },
-    "node_modules/postcss-logical": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-logical/-/postcss-logical-3.0.0.tgz",
-      "integrity": "sha512-1SUKdJc2vuMOmeItqGuNaC+N8MzBWFWEkAnRnLpFYj1tGGa7NqyVBujfRtgNa2gXR+6RkGUiB2O5Vmh7E2RmiA==",
-      "dependencies": {
-        "postcss": "^7.0.2"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/postcss-media-minmax": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-media-minmax/-/postcss-media-minmax-4.0.0.tgz",
-      "integrity": "sha512-fo9moya6qyxsjbFAYl97qKO9gyre3qvbMnkOZeZwlsW6XYFsvs2DMGDlchVLfAd8LHPZDxivu/+qW2SMQeTHBw==",
-      "dependencies": {
-        "postcss": "^7.0.2"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/postcss-media-query-parser": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/postcss-media-query-parser/-/postcss-media-query-parser-0.2.3.tgz",
-      "integrity": "sha1-J7Ocb02U+Bsac7j3Y1HGCeXO8kQ=",
-      "dev": true
-    },
-    "node_modules/postcss-merge-longhand": {
-      "version": "4.0.11",
-      "resolved": "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-4.0.11.tgz",
-      "integrity": "sha512-alx/zmoeXvJjp7L4mxEMjh8lxVlDFX1gqWHzaaQewwMZiVhLo42TEClKaeHbRf6J7j82ZOdTJ808RtN0ZOZwvw==",
-      "dependencies": {
-        "css-color-names": "0.0.4",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0",
-        "stylehacks": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/postcss-merge-longhand/node_modules/postcss-value-parser": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ=="
-    },
-    "node_modules/postcss-merge-rules": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-4.0.3.tgz",
-      "integrity": "sha512-U7e3r1SbvYzO0Jr3UT/zKBVgYYyhAz0aitvGIYOYK5CPmkNih+WDSsS5tvPrJ8YMQYlEMvsZIiqmn7HdFUaeEQ==",
-      "dependencies": {
-        "browserslist": "^4.0.0",
-        "caniuse-api": "^3.0.0",
-        "cssnano-util-same-parent": "^4.0.0",
-        "postcss": "^7.0.0",
-        "postcss-selector-parser": "^3.0.0",
-        "vendors": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/postcss-merge-rules/node_modules/postcss-selector-parser": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-3.1.2.tgz",
-      "integrity": "sha512-h7fJ/5uWuRVyOtkO45pnt1Ih40CEleeyCHzipqAZO2e5H20g25Y48uYnFUiShvY4rZWNJ/Bib/KVPmanaCtOhA==",
-      "dependencies": {
-        "dot-prop": "^5.2.0",
-        "indexes-of": "^1.0.1",
-        "uniq": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/postcss-minify-font-values": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-4.0.2.tgz",
-      "integrity": "sha512-j85oO6OnRU9zPf04+PZv1LYIYOprWm6IA6zkXkrJXyRveDEuQggG6tvoy8ir8ZwjLxLuGfNkCZEQG7zan+Hbtg==",
-      "dependencies": {
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/postcss-minify-font-values/node_modules/postcss-value-parser": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ=="
-    },
-    "node_modules/postcss-minify-gradients": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-4.0.2.tgz",
-      "integrity": "sha512-qKPfwlONdcf/AndP1U8SJ/uzIJtowHlMaSioKzebAXSG4iJthlWC9iSWznQcX4f66gIWX44RSA841HTHj3wK+Q==",
-      "dependencies": {
-        "cssnano-util-get-arguments": "^4.0.0",
-        "is-color-stop": "^1.0.0",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/postcss-minify-gradients/node_modules/postcss-value-parser": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ=="
-    },
-    "node_modules/postcss-minify-params": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-4.0.2.tgz",
-      "integrity": "sha512-G7eWyzEx0xL4/wiBBJxJOz48zAKV2WG3iZOqVhPet/9geefm/Px5uo1fzlHu+DOjT+m0Mmiz3jkQzVHe6wxAWg==",
-      "dependencies": {
-        "alphanum-sort": "^1.0.0",
-        "browserslist": "^4.0.0",
-        "cssnano-util-get-arguments": "^4.0.0",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0",
-        "uniqs": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/postcss-minify-params/node_modules/postcss-value-parser": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ=="
-    },
-    "node_modules/postcss-minify-selectors": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-4.0.2.tgz",
-      "integrity": "sha512-D5S1iViljXBj9kflQo4YutWnJmwm8VvIsU1GeXJGiG9j8CIg9zs4voPMdQDUmIxetUOh60VilsNzCiAFTOqu3g==",
-      "dependencies": {
-        "alphanum-sort": "^1.0.0",
-        "has": "^1.0.0",
-        "postcss": "^7.0.0",
-        "postcss-selector-parser": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/postcss-minify-selectors/node_modules/postcss-selector-parser": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-3.1.2.tgz",
-      "integrity": "sha512-h7fJ/5uWuRVyOtkO45pnt1Ih40CEleeyCHzipqAZO2e5H20g25Y48uYnFUiShvY4rZWNJ/Bib/KVPmanaCtOhA==",
-      "dependencies": {
-        "dot-prop": "^5.2.0",
-        "indexes-of": "^1.0.1",
-        "uniq": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/postcss-modules-extract-imports": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-2.0.0.tgz",
-      "integrity": "sha512-LaYLDNS4SG8Q5WAWqIJgdHPJrDDr/Lv775rMBFUbgjTz6j34lUznACHcdRWroPvXANP2Vj7yNK57vp9eFqzLWQ==",
-      "dependencies": {
-        "postcss": "^7.0.5"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/postcss-modules-local-by-default": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-3.0.2.tgz",
-      "integrity": "sha512-jM/V8eqM4oJ/22j0gx4jrp63GSvDH6v86OqyTHHUvk4/k1vceipZsaymiZ5PvocqZOl5SFHiFJqjs3la0wnfIQ==",
-      "dependencies": {
-        "icss-utils": "^4.1.1",
-        "postcss": "^7.0.16",
-        "postcss-selector-parser": "^6.0.2",
-        "postcss-value-parser": "^4.0.0"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/postcss-modules-scope": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-2.2.0.tgz",
-      "integrity": "sha512-YyEgsTMRpNd+HmyC7H/mh3y+MeFWevy7V1evVhJWewmMbjDHIbZbOXICC2y+m1xI1UVfIT1HMW/O04Hxyu9oXQ==",
-      "dependencies": {
-        "postcss": "^7.0.6",
-        "postcss-selector-parser": "^6.0.0"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/postcss-modules-values": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-3.0.0.tgz",
-      "integrity": "sha512-1//E5jCBrZ9DmRX+zCtmQtRSV6PV42Ix7Bzj9GbwJceduuf7IqP8MgeTXuRDHOWj2m0VzZD5+roFWDuU8RQjcg==",
-      "dependencies": {
-        "icss-utils": "^4.0.0",
-        "postcss": "^7.0.6"
-      }
-    },
-    "node_modules/postcss-nesting": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-nesting/-/postcss-nesting-7.0.1.tgz",
-      "integrity": "sha512-FrorPb0H3nuVq0Sff7W2rnc3SmIcruVC6YwpcS+k687VxyxO33iE1amna7wHuRVzM8vfiYofXSBHNAZ3QhLvYg==",
-      "dependencies": {
-        "postcss": "^7.0.2"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/postcss-normalize-charset": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-4.0.1.tgz",
-      "integrity": "sha512-gMXCrrlWh6G27U0hF3vNvR3w8I1s2wOBILvA87iNXaPvSNo5uZAMYsZG7XjCUf1eVxuPfyL4TJ7++SGZLc9A3g==",
-      "dependencies": {
-        "postcss": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/postcss-normalize-display-values": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-display-values/-/postcss-normalize-display-values-4.0.2.tgz",
-      "integrity": "sha512-3F2jcsaMW7+VtRMAqf/3m4cPFhPD3EFRgNs18u+k3lTJJlVe7d0YPO+bnwqo2xg8YiRpDXJI2u8A0wqJxMsQuQ==",
-      "dependencies": {
-        "cssnano-util-get-match": "^4.0.0",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/postcss-normalize-display-values/node_modules/postcss-value-parser": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ=="
-    },
-    "node_modules/postcss-normalize-positions": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-positions/-/postcss-normalize-positions-4.0.2.tgz",
-      "integrity": "sha512-Dlf3/9AxpxE+NF1fJxYDeggi5WwV35MXGFnnoccP/9qDtFrTArZ0D0R+iKcg5WsUd8nUYMIl8yXDCtcrT8JrdA==",
-      "dependencies": {
-        "cssnano-util-get-arguments": "^4.0.0",
-        "has": "^1.0.0",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/postcss-normalize-positions/node_modules/postcss-value-parser": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ=="
-    },
-    "node_modules/postcss-normalize-repeat-style": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-4.0.2.tgz",
-      "integrity": "sha512-qvigdYYMpSuoFs3Is/f5nHdRLJN/ITA7huIoCyqqENJe9PvPmLhNLMu7QTjPdtnVf6OcYYO5SHonx4+fbJE1+Q==",
-      "dependencies": {
-        "cssnano-util-get-arguments": "^4.0.0",
-        "cssnano-util-get-match": "^4.0.0",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/postcss-normalize-repeat-style/node_modules/postcss-value-parser": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ=="
-    },
-    "node_modules/postcss-normalize-string": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-string/-/postcss-normalize-string-4.0.2.tgz",
-      "integrity": "sha512-RrERod97Dnwqq49WNz8qo66ps0swYZDSb6rM57kN2J+aoyEAJfZ6bMx0sx/F9TIEX0xthPGCmeyiam/jXif0eA==",
-      "dependencies": {
-        "has": "^1.0.0",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/postcss-normalize-string/node_modules/postcss-value-parser": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ=="
-    },
-    "node_modules/postcss-normalize-timing-functions": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-4.0.2.tgz",
-      "integrity": "sha512-acwJY95edP762e++00Ehq9L4sZCEcOPyaHwoaFOhIwWCDfik6YvqsYNxckee65JHLKzuNSSmAdxwD2Cud1Z54A==",
-      "dependencies": {
-        "cssnano-util-get-match": "^4.0.0",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/postcss-normalize-timing-functions/node_modules/postcss-value-parser": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ=="
-    },
-    "node_modules/postcss-normalize-unicode": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-unicode/-/postcss-normalize-unicode-4.0.1.tgz",
-      "integrity": "sha512-od18Uq2wCYn+vZ/qCOeutvHjB5jm57ToxRaMeNuf0nWVHaP9Hua56QyMF6fs/4FSUnVIw0CBPsU0K4LnBPwYwg==",
-      "dependencies": {
-        "browserslist": "^4.0.0",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/postcss-normalize-unicode/node_modules/postcss-value-parser": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ=="
-    },
-    "node_modules/postcss-normalize-url": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-4.0.1.tgz",
-      "integrity": "sha512-p5oVaF4+IHwu7VpMan/SSpmpYxcJMtkGppYf0VbdH5B6hN8YNmVyJLuY9FmLQTzY3fag5ESUUHDqM+heid0UVA==",
-      "dependencies": {
-        "is-absolute-url": "^2.0.0",
-        "normalize-url": "^3.0.0",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/postcss-normalize-url/node_modules/postcss-value-parser": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ=="
-    },
-    "node_modules/postcss-normalize-whitespace": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-whitespace/-/postcss-normalize-whitespace-4.0.2.tgz",
-      "integrity": "sha512-tO8QIgrsI3p95r8fyqKV+ufKlSHh9hMJqACqbv2XknufqEDhDvbguXGBBqxw9nsQoXWf0qOqppziKJKHMD4GtA==",
-      "dependencies": {
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/postcss-normalize-whitespace/node_modules/postcss-value-parser": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ=="
-    },
-    "node_modules/postcss-ordered-values": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-4.1.2.tgz",
-      "integrity": "sha512-2fCObh5UanxvSxeXrtLtlwVThBvHn6MQcu4ksNT2tsaV2Fg76R2CV98W7wNSlX+5/pFwEyaDwKLLoEV7uRybAw==",
-      "dependencies": {
-        "cssnano-util-get-arguments": "^4.0.0",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/postcss-ordered-values/node_modules/postcss-value-parser": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ=="
-    },
-    "node_modules/postcss-overflow-shorthand": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-overflow-shorthand/-/postcss-overflow-shorthand-2.0.0.tgz",
-      "integrity": "sha512-aK0fHc9CBNx8jbzMYhshZcEv8LtYnBIRYQD5i7w/K/wS9c2+0NSR6B3OVMu5y0hBHYLcMGjfU+dmWYNKH0I85g==",
-      "dependencies": {
-        "postcss": "^7.0.2"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/postcss-page-break": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-page-break/-/postcss-page-break-2.0.0.tgz",
-      "integrity": "sha512-tkpTSrLpfLfD9HvgOlJuigLuk39wVTbbd8RKcy8/ugV2bNBUW3xU+AIqyxhDrQr1VUj1RmyJrBn1YWrqUm9zAQ==",
-      "dependencies": {
-        "postcss": "^7.0.2"
-      }
-    },
-    "node_modules/postcss-place": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-place/-/postcss-place-4.0.1.tgz",
-      "integrity": "sha512-Zb6byCSLkgRKLODj/5mQugyuj9bvAAw9LqJJjgwz5cYryGeXfFZfSXoP1UfveccFmeq0b/2xxwcTEVScnqGxBg==",
-      "dependencies": {
-        "postcss": "^7.0.2",
-        "postcss-values-parser": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/postcss-prefix-selector": {
-      "version": "1.7.2",
-      "resolved": "https://registry.npmjs.org/postcss-prefix-selector/-/postcss-prefix-selector-1.7.2.tgz",
-      "integrity": "sha512-ddmzjWNmGs7E/nyolJ021/Gk6oBLRQLyyXKGV4Mu+Y0gquo+XlXSDP0/Y2J8C/cad/GLyftf2H0XtuDFQZxN3w==",
-      "dependencies": {
-        "postcss": "^7.0.0"
-      }
-    },
-    "node_modules/postcss-preset-env": {
-      "version": "6.7.0",
-      "resolved": "https://registry.npmjs.org/postcss-preset-env/-/postcss-preset-env-6.7.0.tgz",
-      "integrity": "sha512-eU4/K5xzSFwUFJ8hTdTQzo2RBLbDVt83QZrAvI07TULOkmyQlnYlpwep+2yIK+K+0KlZO4BvFcleOCCcUtwchg==",
-      "dependencies": {
-        "autoprefixer": "^9.6.1",
-        "browserslist": "^4.6.4",
-        "caniuse-lite": "^1.0.30000981",
-        "css-blank-pseudo": "^0.1.4",
-        "css-has-pseudo": "^0.10.0",
-        "css-prefers-color-scheme": "^3.1.1",
-        "cssdb": "^4.4.0",
-        "postcss": "^7.0.17",
-        "postcss-attribute-case-insensitive": "^4.0.1",
-        "postcss-color-functional-notation": "^2.0.1",
-        "postcss-color-gray": "^5.0.0",
-        "postcss-color-hex-alpha": "^5.0.3",
-        "postcss-color-mod-function": "^3.0.3",
-        "postcss-color-rebeccapurple": "^4.0.1",
-        "postcss-custom-media": "^7.0.8",
-        "postcss-custom-properties": "^8.0.11",
-        "postcss-custom-selectors": "^5.1.2",
-        "postcss-dir-pseudo-class": "^5.0.0",
-        "postcss-double-position-gradients": "^1.0.0",
-        "postcss-env-function": "^2.0.2",
-        "postcss-focus-visible": "^4.0.0",
-        "postcss-focus-within": "^3.0.0",
-        "postcss-font-variant": "^4.0.0",
-        "postcss-gap-properties": "^2.0.0",
-        "postcss-image-set-function": "^3.0.1",
-        "postcss-initial": "^3.0.0",
-        "postcss-lab-function": "^2.0.1",
-        "postcss-logical": "^3.0.0",
-        "postcss-media-minmax": "^4.0.0",
-        "postcss-nesting": "^7.0.0",
-        "postcss-overflow-shorthand": "^2.0.0",
-        "postcss-page-break": "^2.0.0",
-        "postcss-place": "^4.0.1",
-        "postcss-pseudo-class-any-link": "^6.0.0",
-        "postcss-replace-overflow-wrap": "^3.0.0",
-        "postcss-selector-matches": "^4.0.0",
-        "postcss-selector-not": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/postcss-pseudo-class-any-link": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-pseudo-class-any-link/-/postcss-pseudo-class-any-link-6.0.0.tgz",
-      "integrity": "sha512-lgXW9sYJdLqtmw23otOzrtbDXofUdfYzNm4PIpNE322/swES3VU9XlXHeJS46zT2onFO7V1QFdD4Q9LiZj8mew==",
-      "dependencies": {
-        "postcss": "^7.0.2",
-        "postcss-selector-parser": "^5.0.0-rc.3"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/postcss-pseudo-class-any-link/node_modules/cssesc": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-2.0.0.tgz",
-      "integrity": "sha512-MsCAG1z9lPdoO/IUMLSBWBSVxVtJ1395VGIQ+Fc2gNdkQ1hNDnQdw3YhA71WJCBW1vdwA0cAnk/DnW6bqoEUYg==",
-      "bin": {
-        "cssesc": "bin/cssesc"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/postcss-pseudo-class-any-link/node_modules/postcss-selector-parser": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-5.0.0.tgz",
-      "integrity": "sha512-w+zLE5Jhg6Liz8+rQOWEAwtwkyqpfnmsinXjXg6cY7YIONZZtgvE0v2O0uhQBs0peNomOJwWRKt6JBfTdTd3OQ==",
-      "dependencies": {
-        "cssesc": "^2.0.0",
-        "indexes-of": "^1.0.1",
-        "uniq": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/postcss-reduce-initial": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-4.0.3.tgz",
-      "integrity": "sha512-gKWmR5aUulSjbzOfD9AlJiHCGH6AEVLaM0AV+aSioxUDd16qXP1PCh8d1/BGVvpdWn8k/HiK7n6TjeoXN1F7DA==",
-      "dependencies": {
-        "browserslist": "^4.0.0",
-        "caniuse-api": "^3.0.0",
-        "has": "^1.0.0",
-        "postcss": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/postcss-reduce-transforms": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-4.0.2.tgz",
-      "integrity": "sha512-EEVig1Q2QJ4ELpJXMZR8Vt5DQx8/mo+dGWSR7vWXqcob2gQLyQGsionYcGKATXvQzMPn6DSN1vTN7yFximdIAg==",
-      "dependencies": {
-        "cssnano-util-get-match": "^4.0.0",
-        "has": "^1.0.0",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/postcss-reduce-transforms/node_modules/postcss-value-parser": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ=="
-    },
-    "node_modules/postcss-replace-overflow-wrap": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-replace-overflow-wrap/-/postcss-replace-overflow-wrap-3.0.0.tgz",
-      "integrity": "sha512-2T5hcEHArDT6X9+9dVSPQdo7QHzG4XKclFT8rU5TzJPDN7RIRTbO9c4drUISOVemLj03aezStHCR2AIcr8XLpw==",
-      "dependencies": {
-        "postcss": "^7.0.2"
-      }
-    },
-    "node_modules/postcss-reporter": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-reporter/-/postcss-reporter-6.0.1.tgz",
-      "integrity": "sha512-LpmQjfRWyabc+fRygxZjpRxfhRf9u/fdlKf4VHG4TSPbV2XNsuISzYW1KL+1aQzx53CAppa1bKG4APIB/DOXXw==",
-      "dev": true,
-      "dependencies": {
-        "chalk": "^2.4.1",
-        "lodash": "^4.17.11",
-        "log-symbols": "^2.2.0",
-        "postcss": "^7.0.7"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/postcss-reporter/node_modules/log-symbols": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-2.2.0.tgz",
-      "integrity": "sha512-VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg==",
-      "dev": true,
-      "dependencies": {
-        "chalk": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/postcss-resolve-nested-selector": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/postcss-resolve-nested-selector/-/postcss-resolve-nested-selector-0.1.1.tgz",
-      "integrity": "sha1-Kcy8fDfe36wwTp//C/FZaz9qDk4=",
-      "dev": true
-    },
-    "node_modules/postcss-safe-parser": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-safe-parser/-/postcss-safe-parser-4.0.2.tgz",
-      "integrity": "sha512-Uw6ekxSWNLCPesSv/cmqf2bY/77z11O7jZGPax3ycZMFU/oi2DMH9i89AdHc1tRwFg/arFoEwX0IS3LCUxJh1g==",
-      "dependencies": {
-        "postcss": "^7.0.26"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/postcss-sass": {
-      "version": "0.4.4",
-      "resolved": "https://registry.npmjs.org/postcss-sass/-/postcss-sass-0.4.4.tgz",
-      "integrity": "sha512-BYxnVYx4mQooOhr+zer0qWbSPYnarAy8ZT7hAQtbxtgVf8gy+LSLT/hHGe35h14/pZDTw1DsxdbrwxBN++H+fg==",
-      "dev": true,
-      "dependencies": {
-        "gonzales-pe": "^4.3.0",
-        "postcss": "^7.0.21"
-      }
-    },
-    "node_modules/postcss-scss": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-scss/-/postcss-scss-2.0.0.tgz",
-      "integrity": "sha512-um9zdGKaDZirMm+kZFKKVsnKPF7zF7qBAtIfTSnZXD1jZ0JNZIxdB6TxQOjCnlSzLRInVl2v3YdBh/M881C4ug==",
-      "dev": true,
-      "dependencies": {
-        "postcss": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/postcss-selector-matches": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-selector-matches/-/postcss-selector-matches-4.0.0.tgz",
-      "integrity": "sha512-LgsHwQR/EsRYSqlwdGzeaPKVT0Ml7LAT6E75T8W8xLJY62CE4S/l03BWIt3jT8Taq22kXP08s2SfTSzaraoPww==",
-      "dependencies": {
-        "balanced-match": "^1.0.0",
-        "postcss": "^7.0.2"
-      }
-    },
-    "node_modules/postcss-selector-not": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-selector-not/-/postcss-selector-not-4.0.0.tgz",
-      "integrity": "sha512-W+bkBZRhqJaYN8XAnbbZPLWMvZD1wKTu0UxtFKdhtGjWYmxhkUneoeOhRJKdAE5V7ZTlnbHfCR+6bNwK9e1dTQ==",
-      "dependencies": {
-        "balanced-match": "^1.0.0",
-        "postcss": "^7.0.2"
-      }
-    },
-    "node_modules/postcss-selector-parser": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.2.tgz",
-      "integrity": "sha512-36P2QR59jDTOAiIkqEprfJDsoNrvwFei3eCqKd1Y0tUsBimsq39BLp7RD+JWny3WgB1zGhJX8XVePwm9k4wdBg==",
-      "dependencies": {
-        "cssesc": "^3.0.0",
-        "indexes-of": "^1.0.1",
-        "uniq": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/postcss-svgo": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-4.0.2.tgz",
-      "integrity": "sha512-C6wyjo3VwFm0QgBy+Fu7gCYOkCmgmClghO+pjcxvrcBKtiKt0uCF+hvbMO1fyv5BMImRK90SMb+dwUnfbGd+jw==",
-      "dependencies": {
-        "is-svg": "^3.0.0",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0",
-        "svgo": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/postcss-svgo/node_modules/postcss-value-parser": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ=="
-    },
-    "node_modules/postcss-syntax": {
-      "version": "0.36.2",
-      "resolved": "https://registry.npmjs.org/postcss-syntax/-/postcss-syntax-0.36.2.tgz",
-      "integrity": "sha512-nBRg/i7E3SOHWxF3PpF5WnJM/jQ1YpY9000OaVXlAQj6Zp/kIqJxEDWIZ67tAd7NLuk7zqN4yqe9nc0oNAOs1w==",
-      "dev": true,
-      "peerDependencies": {
-        "postcss": ">=5.0.0"
-      }
-    },
-    "node_modules/postcss-unique-selectors": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-4.0.1.tgz",
-      "integrity": "sha512-+JanVaryLo9QwZjKrmJgkI4Fn8SBgRO6WXQBJi7KiAVPlmxikB5Jzc4EvXMT2H0/m0RjrVVm9rGNhZddm/8Spg==",
-      "dependencies": {
-        "alphanum-sort": "^1.0.0",
-        "postcss": "^7.0.0",
-        "uniqs": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/postcss-value-parser": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz",
-      "integrity": "sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ=="
-    },
-    "node_modules/postcss-values-parser": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-values-parser/-/postcss-values-parser-2.0.1.tgz",
-      "integrity": "sha512-2tLuBsA6P4rYTNKCXYG/71C7j1pU6pK503suYOmn4xYrQIzW+opD+7FAFNuGSdZC/3Qfy334QbeMu7MEb8gOxg==",
-      "dependencies": {
-        "flatten": "^1.0.2",
-        "indexes-of": "^1.0.1",
-        "uniq": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=6.14.4"
-      }
-    },
-    "node_modules/postcss/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/postcss/node_modules/supports-color": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
-      "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
-      "dependencies": {
-        "has-flag": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/posthtml": {
-      "version": "0.9.2",
-      "resolved": "https://registry.npmjs.org/posthtml/-/posthtml-0.9.2.tgz",
-      "integrity": "sha1-9MBtufZ7Yf0XxOJW5+PZUVv3Jv0=",
-      "dependencies": {
-        "posthtml-parser": "^0.2.0",
-        "posthtml-render": "^1.0.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/posthtml-parser": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/posthtml-parser/-/posthtml-parser-0.2.1.tgz",
-      "integrity": "sha1-NdUw3jhnQMK6JP8usvrznM3ycd0=",
-      "dependencies": {
-        "htmlparser2": "^3.8.3",
-        "isobject": "^2.1.0"
-      }
-    },
-    "node_modules/posthtml-parser/node_modules/isobject": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
-      "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=",
-      "dependencies": {
-        "isarray": "1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/posthtml-rename-id": {
-      "version": "1.0.12",
-      "resolved": "https://registry.npmjs.org/posthtml-rename-id/-/posthtml-rename-id-1.0.12.tgz",
-      "integrity": "sha512-UKXf9OF/no8WZo9edRzvuMenb6AD5hDLzIepJW+a4oJT+T/Lx7vfMYWT4aWlGNQh0WMhnUx1ipN9OkZ9q+ddEw==",
-      "dependencies": {
-        "escape-string-regexp": "1.0.5"
-      }
-    },
-    "node_modules/posthtml-render": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/posthtml-render/-/posthtml-render-1.2.2.tgz",
-      "integrity": "sha512-MbIXTWwAfJ9qET6Zl29UNwJcDJEEz9Zkr5oDhiujitJa7YBJwEpbkX2cmuklCDxubTMoRWpid3q8DrSyGnUUzQ==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/posthtml-svg-mode": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/posthtml-svg-mode/-/posthtml-svg-mode-1.0.3.tgz",
-      "integrity": "sha512-hEqw9NHZ9YgJ2/0G7CECOeuLQKZi8HjWLkBaSVtOWjygQ9ZD8P7tqeowYs7WrFdKsWEKG7o+IlsPY8jrr0CJpQ==",
-      "dependencies": {
-        "merge-options": "1.0.1",
-        "posthtml": "^0.9.2",
-        "posthtml-parser": "^0.2.1",
-        "posthtml-render": "^1.0.6"
-      }
-    },
-    "node_modules/prelude-ls": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
-      "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/prepend-http": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz",
-      "integrity": "sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/prettier": {
-      "version": "2.6.2",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.6.2.tgz",
-      "integrity": "sha512-PkUpF+qoXTqhOeWL9fu7As8LXsIUZ1WYaJiY/a7McAQzxjk82OF0tibkFXVCDImZtWxbvojFjerkiLb0/q8mew==",
-      "dev": true,
-      "bin": {
-        "prettier": "bin-prettier.js"
-      },
-      "engines": {
-        "node": ">=10.13.0"
-      },
-      "funding": {
-        "url": "https://github.com/prettier/prettier?sponsor=1"
-      }
-    },
-    "node_modules/pretty-error": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/pretty-error/-/pretty-error-2.1.1.tgz",
-      "integrity": "sha1-X0+HyPkeWuPzuoerTPXgOxoX8aM=",
-      "dependencies": {
-        "renderkid": "^2.0.1",
-        "utila": "~0.4"
-      }
-    },
-    "node_modules/pretty-hrtime": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz",
-      "integrity": "sha1-t+PqQkNaTJsnWdmeDyAesZWALuE=",
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/printj": {
-      "version": "1.1.2",
-      "resolved": "https://registry.nlark.com/printj/download/printj-1.1.2.tgz",
-      "integrity": "sha1-2Q3rKXWoufYA+zoclOP0xTx4oiI=",
-      "bin": {
-        "printj": "bin/printj.njs"
-      },
-      "engines": {
-        "node": ">=0.8"
-      }
-    },
-    "node_modules/private": {
-      "version": "0.1.8",
-      "resolved": "https://registry.npmjs.org/private/-/private-0.1.8.tgz",
-      "integrity": "sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg==",
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/process": {
-      "version": "0.11.10",
-      "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
-      "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI=",
-      "engines": {
-        "node": ">= 0.6.0"
-      }
-    },
-    "node_modules/process-nextick-args": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
-      "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="
-    },
-    "node_modules/progress": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npm.taobao.org/progress/download/progress-2.0.3.tgz",
-      "integrity": "sha1-foz42PW48jnBvGi+tOt4Vn1XLvg=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/promise": {
-      "version": "7.3.1",
-      "resolved": "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz",
-      "integrity": "sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==",
-      "dependencies": {
-        "asap": "~2.0.3"
-      }
-    },
-    "node_modules/promise-inflight": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz",
-      "integrity": "sha1-mEcocL8igTL8vdhoEputEsPAKeM="
-    },
-    "node_modules/prop-types": {
-      "version": "15.7.2",
-      "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.7.2.tgz",
-      "integrity": "sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==",
-      "dependencies": {
-        "loose-envify": "^1.4.0",
-        "object-assign": "^4.1.1",
-        "react-is": "^16.8.1"
-      }
-    },
-    "node_modules/proto-list": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz",
-      "integrity": "sha1-IS1b/hMYMGpCD2QCuOJv85ZHqEk="
-    },
-    "node_modules/prr": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz",
-      "integrity": "sha1-0/wRS6BplaRexok/SEzrHXj19HY="
-    },
-    "node_modules/pseudomap": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
-      "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM="
-    },
-    "node_modules/psl": {
-      "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz",
-      "integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==",
-      "optional": true
-    },
-    "node_modules/public-encrypt": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.3.tgz",
-      "integrity": "sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==",
-      "dependencies": {
-        "bn.js": "^4.1.0",
-        "browserify-rsa": "^4.0.0",
-        "create-hash": "^1.1.0",
-        "parse-asn1": "^5.0.0",
-        "randombytes": "^2.0.1",
-        "safe-buffer": "^5.1.2"
-      }
-    },
-    "node_modules/public-encrypt/node_modules/bn.js": {
-      "version": "4.11.8",
-      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz",
-      "integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA=="
-    },
-    "node_modules/pump": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
-      "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
-      "dependencies": {
-        "end-of-stream": "^1.1.0",
-        "once": "^1.3.1"
-      }
-    },
-    "node_modules/pumpify": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/pumpify/-/pumpify-1.5.1.tgz",
-      "integrity": "sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==",
-      "dependencies": {
-        "duplexify": "^3.6.0",
-        "inherits": "^2.0.3",
-        "pump": "^2.0.0"
-      }
-    },
-    "node_modules/pumpify/node_modules/pump": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz",
-      "integrity": "sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==",
-      "dependencies": {
-        "end-of-stream": "^1.1.0",
-        "once": "^1.3.1"
-      }
-    },
-    "node_modules/punycode": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
-      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/q": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz",
-      "integrity": "sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=",
-      "engines": {
-        "node": ">=0.6.0",
-        "teleport": ">=0.2.0"
-      }
-    },
-    "node_modules/qrcodejs2": {
-      "version": "0.0.2",
-      "resolved": "https://registry.npmjs.org/qrcodejs2/-/qrcodejs2-0.0.2.tgz",
-      "integrity": "sha1-Rlr+Xjnxn6zsuTLBH3oYYQkUauE="
-    },
-    "node_modules/qs": {
-      "version": "6.9.4",
-      "resolved": "https://registry.npm.taobao.org/qs/download/qs-6.9.4.tgz",
-      "integrity": "sha1-kJCykNH5FyjTwi5UhDykSupatoc=",
-      "engines": {
-        "node": ">=0.6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/query-string": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/query-string/-/query-string-4.3.4.tgz",
-      "integrity": "sha1-u7aTucqRXCMlFbIosaArYJBD2+s=",
-      "dependencies": {
-        "object-assign": "^4.1.0",
-        "strict-uri-encode": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/querystring": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz",
-      "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=",
-      "deprecated": "The querystring API is considered Legacy. new code should use the URLSearchParams API instead.",
-      "engines": {
-        "node": ">=0.4.x"
-      }
-    },
-    "node_modules/querystring-browser": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/querystring-browser/-/querystring-browser-1.0.4.tgz",
-      "integrity": "sha1-8uNYgYQKgZvHsb9Zf68JeeZiLcY="
-    },
-    "node_modules/querystring-es3": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz",
-      "integrity": "sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM=",
-      "engines": {
-        "node": ">=0.4.x"
-      }
-    },
-    "node_modules/querystringify": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.1.1.tgz",
-      "integrity": "sha512-w7fLxIRCRT7U8Qu53jQnJyPkYZIaR4n5151KMfcJlO/A9397Wxb1amJvROTK6TOnp7PfoAmg/qXiNHI+08jRfA=="
-    },
-    "node_modules/quick-lru": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-4.0.1.tgz",
-      "integrity": "sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/raf": {
-      "version": "3.4.1",
-      "resolved": "https://registry.npmjs.org/raf/-/raf-3.4.1.tgz",
-      "integrity": "sha512-Sq4CW4QhwOHE8ucn6J34MqtZCeWFP2aQSmrlroYgqAV1PjStIhJXxYuTgUIfkEk7zTLjmIjLmU5q+fbD1NnOJA==",
-      "dependencies": {
-        "performance-now": "^2.1.0"
-      }
-    },
-    "node_modules/randombytes": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
-      "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
-      "dependencies": {
-        "safe-buffer": "^5.1.0"
-      }
-    },
-    "node_modules/randomfill": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz",
-      "integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==",
-      "dependencies": {
-        "randombytes": "^2.0.5",
-        "safe-buffer": "^5.1.0"
-      }
-    },
-    "node_modules/raw-loader": {
-      "version": "0.5.1",
-      "resolved": "https://registry.npmjs.org/raw-loader/-/raw-loader-0.5.1.tgz",
-      "integrity": "sha1-DD0L6u2KAclm2Xh793goElKpeao=",
-      "dev": true
-    },
-    "node_modules/react": {
-      "version": "15.7.0",
-      "resolved": "https://registry.npmjs.org/react/-/react-15.7.0.tgz",
-      "integrity": "sha512-5/MMRYmpmM0sMTHGLossnJCrmXQIiJilD6y3YN3TzAwGFj6zdnMtFv6xmi65PHKRV+pehIHpT7oy67Sr6s9AHA==",
-      "dependencies": {
-        "create-react-class": "^15.6.0",
-        "fbjs": "^0.8.9",
-        "loose-envify": "^1.1.0",
-        "object-assign": "^4.1.0",
-        "prop-types": "^15.5.10"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/react-debounce-input": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/react-debounce-input/-/react-debounce-input-3.2.2.tgz",
-      "integrity": "sha512-RIBu68Cq/gImKz/2h1cE042REDqyqj3D+7SJ3lnnIpJX0ht9D9PfH7KAnL+SgDz6hvKa9pZS2CnAxlkrLmnQlg==",
-      "dependencies": {
-        "lodash.debounce": "^4",
-        "prop-types": "^15.7.2"
-      },
-      "peerDependencies": {
-        "react": "^15.3.0 || ^16.0.0"
-      }
-    },
-    "node_modules/react-dom": {
-      "version": "15.6.2",
-      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-15.6.2.tgz",
-      "integrity": "sha1-Qc+t9pO3V/rycIRDodH9WgK+9zA=",
-      "dependencies": {
-        "fbjs": "^0.8.9",
-        "loose-envify": "^1.1.0",
-        "object-assign": "^4.1.0",
-        "prop-types": "^15.5.10"
-      },
-      "peerDependencies": {
-        "react": "^15.6.2"
-      }
-    },
-    "node_modules/react-immutable-proptypes": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/react-immutable-proptypes/-/react-immutable-proptypes-2.1.0.tgz",
-      "integrity": "sha1-Aj1vObsVyXwHHp5g0A0TbqxfoLQ=",
-      "peerDependencies": {
-        "immutable": ">=3.6.2"
-      }
-    },
-    "node_modules/react-immutable-pure-component": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/react-immutable-pure-component/-/react-immutable-pure-component-1.2.3.tgz",
-      "integrity": "sha512-kNy2A/fDrSuR8TKwB+4ynmItmp1vgF87tWxxfmadwDYo2J3ANipHqTjDIBvJvJ7libvuh76jIbvmK0krjtKH1g==",
-      "optionalDependencies": {
-        "@types/react": "16.4.6"
-      },
-      "peerDependencies": {
-        "immutable": ">= 3",
-        "react": ">= 15",
-        "react-dom": ">= 15"
-      }
-    },
-    "node_modules/react-inspector": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/react-inspector/-/react-inspector-2.3.1.tgz",
-      "integrity": "sha512-tUUK7t3KWgZEIUktOYko5Ic/oYwvjEvQUFAGC1UeMeDaQ5za2yZFtItJa2RTwBJB//NxPr000WQK6sEbqC6y0Q==",
-      "dependencies": {
-        "babel-runtime": "^6.26.0",
-        "is-dom": "^1.0.9",
-        "prop-types": "^15.6.1"
-      },
-      "peerDependencies": {
-        "react": "^0.14.0 || ^15.0.0 || ^16.0.0"
-      }
-    },
-    "node_modules/react-is": {
-      "version": "16.13.1",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
-      "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="
-    },
-    "node_modules/react-motion": {
-      "version": "0.5.2",
-      "resolved": "https://registry.npmjs.org/react-motion/-/react-motion-0.5.2.tgz",
-      "integrity": "sha512-9q3YAvHoUiWlP3cK0v+w1N5Z23HXMj4IF4YuvjvWegWqNPfLXsOBE/V7UvQGpXxHFKRQQcNcVQE31g9SB/6qgQ==",
-      "dependencies": {
-        "performance-now": "^0.2.0",
-        "prop-types": "^15.5.8",
-        "raf": "^3.1.0"
-      },
-      "peerDependencies": {
-        "react": "^0.14.9 || ^15.3.0 || ^16.0.0"
-      }
-    },
-    "node_modules/react-motion/node_modules/performance-now": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-0.2.0.tgz",
-      "integrity": "sha1-M+8wxcd9TqIcWlOGnZG1bY8lVeU="
-    },
-    "node_modules/react-redux": {
-      "version": "4.4.10",
-      "resolved": "https://registry.npmjs.org/react-redux/-/react-redux-4.4.10.tgz",
-      "integrity": "sha512-tjL0Bmpkj75Td0k+lXlF8Fc8a9GuXFv/3ahUOCXExWs/jhsKiQeTffdH0j5byejCGCRL4tvGFYlrwBF1X/Aujg==",
-      "dependencies": {
-        "create-react-class": "^15.5.1",
-        "hoist-non-react-statics": "^3.3.0",
-        "invariant": "^2.0.0",
-        "lodash": "^4.17.11",
-        "loose-envify": "^1.4.0",
-        "prop-types": "^15.7.2"
-      },
-      "peerDependencies": {
-        "react": "^0.14.0 || ^15.0.0-0 || ^15.4.0-0 || ^16.0.0-0",
-        "redux": "^2.0.0 || ^3.0.0"
-      }
-    },
-    "node_modules/read-pkg": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
-      "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=",
-      "dependencies": {
-        "load-json-file": "^1.0.0",
-        "normalize-package-data": "^2.3.2",
-        "path-type": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/read-pkg-up": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
-      "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=",
-      "dependencies": {
-        "find-up": "^1.0.0",
-        "read-pkg": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/read-pkg-up/node_modules/find-up": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
-      "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
-      "dependencies": {
-        "path-exists": "^2.0.0",
-        "pinkie-promise": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/read-pkg-up/node_modules/path-exists": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
-      "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
-      "dependencies": {
-        "pinkie-promise": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/readable-stream": {
-      "version": "2.3.7",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
-      "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
-      "dependencies": {
-        "core-util-is": "~1.0.0",
-        "inherits": "~2.0.3",
-        "isarray": "~1.0.0",
-        "process-nextick-args": "~2.0.0",
-        "safe-buffer": "~5.1.1",
-        "string_decoder": "~1.1.1",
-        "util-deprecate": "~1.0.1"
-      }
-    },
-    "node_modules/readdirp": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz",
-      "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==",
-      "dependencies": {
-        "graceful-fs": "^4.1.11",
-        "micromatch": "^3.1.10",
-        "readable-stream": "^2.0.2"
-      },
-      "engines": {
-        "node": ">=0.10"
-      }
-    },
-    "node_modules/readdirp/node_modules/braces": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-      "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-      "dependencies": {
-        "arr-flatten": "^1.1.0",
-        "array-unique": "^0.3.2",
-        "extend-shallow": "^2.0.1",
-        "fill-range": "^4.0.0",
-        "isobject": "^3.0.1",
-        "repeat-element": "^1.1.2",
-        "snapdragon": "^0.8.1",
-        "snapdragon-node": "^2.0.1",
-        "split-string": "^3.0.2",
-        "to-regex": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/readdirp/node_modules/braces/node_modules/extend-shallow": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-      "dependencies": {
-        "is-extendable": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/readdirp/node_modules/fill-range": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-      "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
-      "dependencies": {
-        "extend-shallow": "^2.0.1",
-        "is-number": "^3.0.0",
-        "repeat-string": "^1.6.1",
-        "to-regex-range": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/readdirp/node_modules/fill-range/node_modules/extend-shallow": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-      "dependencies": {
-        "is-extendable": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/readdirp/node_modules/is-number": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-      "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/readdirp/node_modules/is-number/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/readdirp/node_modules/isobject": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/readdirp/node_modules/micromatch": {
-      "version": "3.1.10",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-      "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
-      "dependencies": {
-        "arr-diff": "^4.0.0",
-        "array-unique": "^0.3.2",
-        "braces": "^2.3.1",
-        "define-property": "^2.0.2",
-        "extend-shallow": "^3.0.2",
-        "extglob": "^2.0.4",
-        "fragment-cache": "^0.2.1",
-        "kind-of": "^6.0.2",
-        "nanomatch": "^1.2.9",
-        "object.pick": "^1.3.0",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/readdirp/node_modules/to-regex-range": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
-      "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
-      "dependencies": {
-        "is-number": "^3.0.0",
-        "repeat-string": "^1.6.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/rechoir": {
-      "version": "0.6.2",
-      "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz",
-      "integrity": "sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=",
-      "dependencies": {
-        "resolve": "^1.1.6"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/redent": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/redent/-/redent-3.0.0.tgz",
-      "integrity": "sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==",
-      "dev": true,
-      "dependencies": {
-        "indent-string": "^4.0.0",
-        "strip-indent": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/redux": {
-      "version": "3.7.2",
-      "resolved": "https://registry.npmjs.org/redux/-/redux-3.7.2.tgz",
-      "integrity": "sha512-pNqnf9q1hI5HHZRBkj3bAngGZW/JMCmexDlOxw4XagXY2o1327nHH54LoTjiPJ0gizoqPDRqWyX/00g0hD6w+A==",
-      "dependencies": {
-        "lodash": "^4.2.1",
-        "lodash-es": "^4.2.1",
-        "loose-envify": "^1.1.0",
-        "symbol-observable": "^1.0.3"
-      }
-    },
-    "node_modules/redux-immutable": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/redux-immutable/-/redux-immutable-3.1.0.tgz",
-      "integrity": "sha1-yvvWhuBxEmERm5wolgk13EeknQo=",
-      "dependencies": {
-        "immutable": "^3.8.1"
-      }
-    },
-    "node_modules/regenerate": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.0.tgz",
-      "integrity": "sha512-1G6jJVDWrt0rK99kBjvEtziZNCICAuvIPkSiUFIQxVP06RCVpq3dmDo2oi6ABpYaDYaTRr67BEhL8r1wgEZZKg=="
-    },
-    "node_modules/regenerate-unicode-properties": {
-      "version": "8.2.0",
-      "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-8.2.0.tgz",
-      "integrity": "sha512-F9DjY1vKLo/tPePDycuH3dn9H1OTPIkVD9Kz4LODu+F2C75mgjAJ7x/gwy6ZcSNRAAkhNlJSOHRe8k3p+K9WhA==",
-      "dependencies": {
-        "regenerate": "^1.4.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/regenerator-runtime": {
-      "version": "0.13.5",
-      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz",
-      "integrity": "sha512-ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA=="
-    },
-    "node_modules/regenerator-transform": {
-      "version": "0.14.4",
-      "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.14.4.tgz",
-      "integrity": "sha512-EaJaKPBI9GvKpvUz2mz4fhx7WPgvwRLY9v3hlNHWmAuJHI13T4nwKnNvm5RWJzEdnI5g5UwtOww+S8IdoUC2bw==",
-      "dependencies": {
-        "@babel/runtime": "^7.8.4",
-        "private": "^0.1.8"
-      }
-    },
-    "node_modules/regex-not": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz",
-      "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==",
-      "dependencies": {
-        "extend-shallow": "^3.0.2",
-        "safe-regex": "^1.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/regexpp": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npm.taobao.org/regexpp/download/regexpp-2.0.1.tgz",
-      "integrity": "sha1-jRnTHPYySCtYkEn4KB+T28uk0H8=",
-      "dev": true,
-      "engines": {
-        "node": ">=6.5.0"
-      }
-    },
-    "node_modules/regexpu-core": {
-      "version": "4.7.0",
-      "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.7.0.tgz",
-      "integrity": "sha512-TQ4KXRnIn6tz6tjnrXEkD/sshygKH/j5KzK86X8MkeHyZ8qst/LZ89j3X4/8HEIfHANTFIP/AbXakeRhWIl5YQ==",
-      "dependencies": {
-        "regenerate": "^1.4.0",
-        "regenerate-unicode-properties": "^8.2.0",
-        "regjsgen": "^0.5.1",
-        "regjsparser": "^0.6.4",
-        "unicode-match-property-ecmascript": "^1.0.4",
-        "unicode-match-property-value-ecmascript": "^1.2.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/regjsgen": {
-      "version": "0.5.1",
-      "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.5.1.tgz",
-      "integrity": "sha512-5qxzGZjDs9w4tzT3TPhCJqWdCc3RLYwy9J2NB0nm5Lz+S273lvWcpjaTGHsT1dc6Hhfq41uSEOw8wBmxrKOuyg=="
-    },
-    "node_modules/regjsparser": {
-      "version": "0.6.4",
-      "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.6.4.tgz",
-      "integrity": "sha512-64O87/dPDgfk8/RQqC4gkZoGyyWFIEUTTh80CU6CWuK5vkCGyekIx+oKcEIYtP/RAxSQltCZHCNu/mdd7fqlJw==",
-      "dependencies": {
-        "jsesc": "~0.5.0"
-      },
-      "bin": {
-        "regjsparser": "bin/parser"
-      }
-    },
-    "node_modules/regjsparser/node_modules/jsesc": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
-      "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=",
-      "bin": {
-        "jsesc": "bin/jsesc"
-      }
-    },
-    "node_modules/relateurl": {
-      "version": "0.2.7",
-      "resolved": "https://registry.npmjs.org/relateurl/-/relateurl-0.2.7.tgz",
-      "integrity": "sha1-VNvzd+UUQKypCkzSdGANP/LYiKk=",
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/remark": {
-      "version": "12.0.0",
-      "resolved": "https://registry.npmjs.org/remark/-/remark-12.0.0.tgz",
-      "integrity": "sha512-oX4lMIS0csgk8AEbzY0h2jdR0ngiCHOpwwpxjmRa5TqAkeknY+tkhjRJGZqnCmvyuWh55/0SW5WY3R3nn3PH9A==",
-      "dev": true,
-      "dependencies": {
-        "remark-parse": "^8.0.0",
-        "remark-stringify": "^8.0.0",
-        "unified": "^9.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      }
-    },
-    "node_modules/remark-parse": {
-      "version": "8.0.2",
-      "resolved": "https://registry.npmjs.org/remark-parse/-/remark-parse-8.0.2.tgz",
-      "integrity": "sha512-eMI6kMRjsAGpMXXBAywJwiwAse+KNpmt+BK55Oofy4KvBZEqUDj6mWbGLJZrujoPIPPxDXzn3T9baRlpsm2jnQ==",
-      "dev": true,
-      "dependencies": {
-        "ccount": "^1.0.0",
-        "collapse-white-space": "^1.0.2",
-        "is-alphabetical": "^1.0.0",
-        "is-decimal": "^1.0.0",
-        "is-whitespace-character": "^1.0.0",
-        "is-word-character": "^1.0.0",
-        "markdown-escapes": "^1.0.0",
-        "parse-entities": "^2.0.0",
-        "repeat-string": "^1.5.4",
-        "state-toggle": "^1.0.0",
-        "trim": "0.0.1",
-        "trim-trailing-lines": "^1.0.0",
-        "unherit": "^1.0.4",
-        "unist-util-remove-position": "^2.0.0",
-        "vfile-location": "^3.0.0",
-        "xtend": "^4.0.1"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      }
-    },
-    "node_modules/remark-stringify": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/remark-stringify/-/remark-stringify-8.0.0.tgz",
-      "integrity": "sha512-cABVYVloFH+2ZI5bdqzoOmemcz/ZuhQSH6W6ZNYnLojAUUn3xtX7u+6BpnYp35qHoGr2NFBsERV14t4vCIeW8w==",
-      "dev": true,
-      "dependencies": {
-        "ccount": "^1.0.0",
-        "is-alphanumeric": "^1.0.0",
-        "is-decimal": "^1.0.0",
-        "is-whitespace-character": "^1.0.0",
-        "longest-streak": "^2.0.1",
-        "markdown-escapes": "^1.0.0",
-        "markdown-table": "^2.0.0",
-        "mdast-util-compact": "^2.0.0",
-        "parse-entities": "^2.0.0",
-        "repeat-string": "^1.5.4",
-        "state-toggle": "^1.0.0",
-        "stringify-entities": "^3.0.0",
-        "unherit": "^1.0.4",
-        "xtend": "^4.0.1"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      }
-    },
-    "node_modules/remarkable": {
-      "version": "1.7.4",
-      "resolved": "https://registry.npmjs.org/remarkable/-/remarkable-1.7.4.tgz",
-      "integrity": "sha512-e6NKUXgX95whv7IgddywbeN/ItCkWbISmc2DiqHJb0wTrqZIexqdco5b8Z3XZoo/48IdNVKM9ZCvTPJ4F5uvhg==",
-      "dependencies": {
-        "argparse": "^1.0.10",
-        "autolinker": "~0.28.0"
-      },
-      "bin": {
-        "remarkable": "bin/remarkable.js"
-      },
-      "engines": {
-        "node": ">= 0.10.0"
-      }
-    },
-    "node_modules/remixicon": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/remixicon/-/remixicon-2.5.0.tgz",
-      "integrity": "sha512-q54ra2QutYDZpuSnFjmeagmEiN9IMo56/zz5dDNitzKD23oFRw77cWo4TsrAdmdkPiEn8mxlrTqxnkujDbEGww=="
-    },
-    "node_modules/remove-bom-buffer": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/remove-bom-buffer/-/remove-bom-buffer-3.0.0.tgz",
-      "integrity": "sha512-8v2rWhaakv18qcvNeli2mZ/TMTL2nEyAKRvzo1WtnZBl15SHyEhrCu2/xKlJyUFKHiHgfXIyuY6g2dObJJycXQ==",
-      "dependencies": {
-        "is-buffer": "^1.1.5",
-        "is-utf8": "^0.2.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/remove-bom-stream": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/remove-bom-stream/-/remove-bom-stream-1.2.0.tgz",
-      "integrity": "sha1-BfGlk/FuQuH7kOv1nejlaVJflSM=",
-      "dependencies": {
-        "remove-bom-buffer": "^3.0.0",
-        "safe-buffer": "^5.1.0",
-        "through2": "^2.0.3"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/remove-trailing-separator": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz",
-      "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8="
-    },
-    "node_modules/renderkid": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/renderkid/-/renderkid-2.0.3.tgz",
-      "integrity": "sha512-z8CLQp7EZBPCwCnncgf9C4XAi3WR0dv+uWu/PjIyhhAb5d6IJ/QZqlHFprHeKT+59//V6BNUsLbvN8+2LarxGA==",
-      "dependencies": {
-        "css-select": "^1.1.0",
-        "dom-converter": "^0.2",
-        "htmlparser2": "^3.3.0",
-        "strip-ansi": "^3.0.0",
-        "utila": "^0.4.0"
-      }
-    },
-    "node_modules/renderkid/node_modules/css-select": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/css-select/-/css-select-1.2.0.tgz",
-      "integrity": "sha1-KzoRBTnFNV8c2NMUYj6HCxIeyFg=",
-      "dependencies": {
-        "boolbase": "~1.0.0",
-        "css-what": "2.1",
-        "domutils": "1.5.1",
-        "nth-check": "~1.0.1"
-      }
-    },
-    "node_modules/renderkid/node_modules/css-what": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/css-what/-/css-what-2.1.3.tgz",
-      "integrity": "sha512-a+EPoD+uZiNfh+5fxw2nO9QwFa6nJe2Or35fGY6Ipw1R3R4AGz1d1TEZrCegvw2YTmZ0jXirGYlzxxpYSHwpEg==",
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/renderkid/node_modules/domutils": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz",
-      "integrity": "sha1-3NhIiib1Y9YQeeSMn3t+Mjc2gs8=",
-      "dependencies": {
-        "dom-serializer": "0",
-        "domelementtype": "1"
-      }
-    },
-    "node_modules/repeat-element": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.3.tgz",
-      "integrity": "sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/repeat-string": {
-      "version": "1.6.1",
-      "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz",
-      "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=",
-      "engines": {
-        "node": ">=0.10"
-      }
-    },
-    "node_modules/replace-ext": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.1.tgz",
-      "integrity": "sha512-yD5BHCe7quCgBph4rMQ+0KkIRKwWCrHDOX1p1Gp6HwjPM5kVoCdKGNhN7ydqqsX6lJEnQDKZ/tFMiEdQ1dvPEw==",
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/replace-homedir": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/replace-homedir/-/replace-homedir-1.0.0.tgz",
-      "integrity": "sha1-6H9tUTuSjd6AgmDBK+f+xv9ueYw=",
-      "dependencies": {
-        "homedir-polyfill": "^1.0.1",
-        "is-absolute": "^1.0.0",
-        "remove-trailing-separator": "^1.1.0"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/replacestream": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/replacestream/-/replacestream-4.0.3.tgz",
-      "integrity": "sha512-AC0FiLS352pBBiZhd4VXB1Ab/lh0lEgpP+GGvZqbQh8a5cmXVoTe5EX/YeTFArnp4SRGTHh1qCHu9lGs1qG8sA==",
-      "dependencies": {
-        "escape-string-regexp": "^1.0.3",
-        "object-assign": "^4.0.1",
-        "readable-stream": "^2.0.2"
-      }
-    },
-    "node_modules/request": {
-      "version": "2.88.2",
-      "resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz",
-      "integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==",
-      "deprecated": "request has been deprecated, see https://github.com/request/request/issues/3142",
-      "optional": true,
-      "dependencies": {
-        "aws-sign2": "~0.7.0",
-        "aws4": "^1.8.0",
-        "caseless": "~0.12.0",
-        "combined-stream": "~1.0.6",
-        "extend": "~3.0.2",
-        "forever-agent": "~0.6.1",
-        "form-data": "~2.3.2",
-        "har-validator": "~5.1.3",
-        "http-signature": "~1.2.0",
-        "is-typedarray": "~1.0.0",
-        "isstream": "~0.1.2",
-        "json-stringify-safe": "~5.0.1",
-        "mime-types": "~2.1.19",
-        "oauth-sign": "~0.9.0",
-        "performance-now": "^2.1.0",
-        "qs": "~6.5.2",
-        "safe-buffer": "^5.1.2",
-        "tough-cookie": "~2.5.0",
-        "tunnel-agent": "^0.6.0",
-        "uuid": "^3.3.2"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/request/node_modules/qs": {
-      "version": "6.5.2",
-      "resolved": "https://registry.npm.taobao.org/qs/download/qs-6.5.2.tgz",
-      "integrity": "sha1-yzroBuh0BERYTvFUzo7pjUA/PjY=",
-      "optional": true,
-      "engines": {
-        "node": ">=0.6"
-      }
-    },
-    "node_modules/require-dir": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/require-dir/-/require-dir-1.2.0.tgz",
-      "integrity": "sha512-LY85DTSu+heYgDqq/mK+7zFHWkttVNRXC9NKcKGyuGLdlsfbjEPrIEYdCVrx6hqnJb+xSu3Lzaoo8VnmOhhjNA==",
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/require-directory": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
-      "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/require-dot-file": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/require-dot-file/-/require-dot-file-0.4.0.tgz",
-      "integrity": "sha1-tb9ValWJXC1ZDl3srUU1cXhQqek="
-    },
-    "node_modules/require-main-filename": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz",
-      "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE="
-    },
-    "node_modules/requires-port": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
-      "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8="
-    },
-    "node_modules/reselect": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/reselect/-/reselect-4.0.0.tgz",
-      "integrity": "sha512-qUgANli03jjAyGlnbYVAV5vvnOmJnODyABz51RdBN7M4WaVu8mecZWgyQNkG8Yqe3KRGRt0l4K4B3XVEULC4CA=="
-    },
-    "node_modules/resize-observer-polyfill": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz",
-      "integrity": "sha512-LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg=="
-    },
-    "node_modules/resolve": {
-      "version": "1.17.0",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz",
-      "integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==",
-      "dependencies": {
-        "path-parse": "^1.0.6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/resolve-cwd": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-2.0.0.tgz",
-      "integrity": "sha1-AKn3OHVW4nA46uIyyqNypqWbZlo=",
-      "dependencies": {
-        "resolve-from": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/resolve-dir": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/resolve-dir/-/resolve-dir-1.0.1.tgz",
-      "integrity": "sha1-eaQGRMNivoLybv/nOcm7U4IEb0M=",
-      "dependencies": {
-        "expand-tilde": "^2.0.0",
-        "global-modules": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/resolve-from": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz",
-      "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=",
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/resolve-options": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/resolve-options/-/resolve-options-1.1.0.tgz",
-      "integrity": "sha1-MrueOcBtZzONyTeMDW1gdFZq0TE=",
-      "dependencies": {
-        "value-or-function": "^3.0.0"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/resolve-url": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz",
-      "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=",
-      "deprecated": "https://github.com/lydell/resolve-url#deprecated"
-    },
-    "node_modules/restore-cursor": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz",
-      "integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=",
-      "dependencies": {
-        "onetime": "^2.0.0",
-        "signal-exit": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/ret": {
-      "version": "0.1.15",
-      "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz",
-      "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==",
-      "engines": {
-        "node": ">=0.12"
-      }
-    },
-    "node_modules/reusify": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
-      "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
-      "engines": {
-        "iojs": ">=1.0.0",
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/rework": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/rework/-/rework-1.0.1.tgz",
-      "integrity": "sha1-MIBqhBNCtUUQqkEQhQzUhTQUSqc=",
-      "dependencies": {
-        "convert-source-map": "^0.3.3",
-        "css": "^2.0.0"
-      }
-    },
-    "node_modules/rework-import": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/rework-import/-/rework-import-2.1.0.tgz",
-      "integrity": "sha1-wm7StTFZrHvi7GDaIj74lgPB7x8=",
-      "dependencies": {
-        "css": "^2.0.0",
-        "globby": "^2.0.0",
-        "parse-import": "^2.0.0",
-        "url-regex": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/rework-import/node_modules/glob": {
-      "version": "5.0.15",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
-      "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=",
-      "dependencies": {
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "2 || 3",
-        "once": "^1.3.0",
-        "path-is-absolute": "^1.0.0"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/rework-import/node_modules/globby": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-2.1.0.tgz",
-      "integrity": "sha1-npGSvNM/Srak+JTl5+qLcTITxII=",
-      "dependencies": {
-        "array-union": "^1.0.1",
-        "async": "^1.2.1",
-        "glob": "^5.0.3",
-        "object-assign": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/rework-import/node_modules/object-assign": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz",
-      "integrity": "sha1-m+3VygiXlJvKR+f/QIBi1Un1h/I=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/rework-plugin-function": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/rework-plugin-function/-/rework-plugin-function-1.0.2.tgz",
-      "integrity": "sha1-Es5G+1sptdk1FGaD9rmM9J0jc7k=",
-      "dependencies": {
-        "rework-visit": "^1.0.0"
-      }
-    },
-    "node_modules/rework-plugin-url": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/rework-plugin-url/-/rework-plugin-url-1.1.0.tgz",
-      "integrity": "sha1-q1PosQV7nV7MHIJz/32xhgg3XEU=",
-      "dependencies": {
-        "rework-plugin-function": "^1.0.0"
-      }
-    },
-    "node_modules/rework-visit": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/rework-visit/-/rework-visit-1.0.0.tgz",
-      "integrity": "sha1-mUWygD8hni96ygCtuLyfZA+ELJo="
-    },
-    "node_modules/rework/node_modules/convert-source-map": {
-      "version": "0.3.5",
-      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-0.3.5.tgz",
-      "integrity": "sha1-8dgClQr33SYxof6+BZZVDIarMZA="
-    },
-    "node_modules/rfdc": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npm.taobao.org/rfdc/download/rfdc-1.2.0.tgz?cache=0&sync_timestamp=1610744108114&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Frfdc%2Fdownload%2Frfdc-1.2.0.tgz",
-      "integrity": "sha1-npiUJY9I8oS0PDFDxoBwpPNzuUk="
-    },
-    "node_modules/rgb-regex": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/rgb-regex/-/rgb-regex-1.0.1.tgz",
-      "integrity": "sha1-wODWiC3w4jviVKR16O3UGRX+rrE="
-    },
-    "node_modules/rgba-regex": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/rgba-regex/-/rgba-regex-1.0.0.tgz",
-      "integrity": "sha1-QzdOLiyglosO8VI0YLfXMP8i7rM="
-    },
-    "node_modules/right-align": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz",
-      "integrity": "sha1-YTObci/mo1FWiSENJOFMlhSGE+8=",
-      "dependencies": {
-        "align-text": "^0.1.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/rimraf": {
-      "version": "2.7.1",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
-      "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
-      "dependencies": {
-        "glob": "^7.1.3"
-      },
-      "bin": {
-        "rimraf": "bin.js"
-      }
-    },
-    "node_modules/ripemd160": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz",
-      "integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==",
-      "dependencies": {
-        "hash-base": "^3.0.0",
-        "inherits": "^2.0.1"
-      }
-    },
-    "node_modules/rtlcss": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/rtlcss/-/rtlcss-2.5.0.tgz",
-      "integrity": "sha512-NCVdF45w70/3CQeqVvQ84bu2HN8agNn+CDjw+RxXaiWb7mPOmEvltdd1z4qzm9kin4Jnu9ShFBIx28yvWerZ2g==",
-      "dependencies": {
-        "chalk": "^2.4.2",
-        "findup": "^0.1.5",
-        "mkdirp": "^0.5.1",
-        "postcss": "^6.0.23",
-        "strip-json-comments": "^2.0.0"
-      },
-      "bin": {
-        "rtlcss": "bin/rtlcss.js"
-      }
-    },
-    "node_modules/rtlcss/node_modules/postcss": {
-      "version": "6.0.23",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
-      "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
-      "dependencies": {
-        "chalk": "^2.4.1",
-        "source-map": "^0.6.1",
-        "supports-color": "^5.4.0"
-      },
-      "engines": {
-        "node": ">=4.0.0"
-      }
-    },
-    "node_modules/rtlcss/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/run-async": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz",
-      "integrity": "sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==",
-      "engines": {
-        "node": ">=0.12.0"
-      }
-    },
-    "node_modules/run-parallel": {
-      "version": "1.1.9",
-      "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.1.9.tgz",
-      "integrity": "sha512-DEqnSRTDw/Tc3FXf49zedI638Z9onwUotBMiUFKmrO2sdFKIbXamXGQ3Axd4qgphxKB4kw/qP1w5kTxnfU1B9Q=="
-    },
-    "node_modules/run-queue": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/run-queue/-/run-queue-1.0.3.tgz",
-      "integrity": "sha1-6Eg5bwV9Ij8kOGkkYY4laUFh7Ec=",
-      "dependencies": {
-        "aproba": "^1.1.1"
-      }
-    },
-    "node_modules/rxjs": {
-      "version": "6.5.5",
-      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.5.5.tgz",
-      "integrity": "sha512-WfQI+1gohdf0Dai/Bbmk5L5ItH5tYqm3ki2c5GdWhKjalzjg93N3avFjVStyZZz+A2Em+ZxKH5bNghw9UeylGQ==",
-      "dependencies": {
-        "tslib": "^1.9.0"
-      },
-      "engines": {
-        "npm": ">=2.0.0"
-      }
-    },
-    "node_modules/safe-buffer": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
-    },
-    "node_modules/safe-regex": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz",
-      "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=",
-      "dependencies": {
-        "ret": "~0.1.10"
-      }
-    },
-    "node_modules/safer-buffer": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
-    },
-    "node_modules/sax": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
-      "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="
-    },
-    "node_modules/schema-utils": {
-      "version": "2.6.6",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.6.6.tgz",
-      "integrity": "sha512-wHutF/WPSbIi9x6ctjGGk2Hvl0VOz5l3EKEuKbjPlB30mKZUzb9A5k9yEXRX3pwyqVLPvpfZZEllaFq/M718hA==",
-      "dependencies": {
-        "ajv": "^6.12.0",
-        "ajv-keywords": "^3.4.1"
-      },
-      "engines": {
-        "node": ">= 8.9.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      }
-    },
-    "node_modules/script-loader": {
-      "version": "0.7.2",
-      "resolved": "https://registry.npmjs.org/script-loader/-/script-loader-0.7.2.tgz",
-      "integrity": "sha512-UMNLEvgOAQuzK8ji8qIscM3GIrRCWN6MmMXGD4SD5l6cSycgGsCo0tX5xRnfQcoghqct0tjHjcykgI1PyBE2aA==",
-      "dev": true,
-      "dependencies": {
-        "raw-loader": "~0.5.1"
-      }
-    },
-    "node_modules/select": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/select/-/select-1.1.2.tgz",
-      "integrity": "sha1-DnNQrN7ICxEIUoeG7B1EGNEbOW0="
-    },
-    "node_modules/semver": {
-      "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
-      "bin": {
-        "semver": "bin/semver"
-      }
-    },
-    "node_modules/semver-greatest-satisfied-range": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/semver-greatest-satisfied-range/-/semver-greatest-satisfied-range-1.1.0.tgz",
-      "integrity": "sha1-E+jCZYq5aRywzXEJMkAoDTb3els=",
-      "dependencies": {
-        "sver-compat": "^1.5.0"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/serialize-error": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/serialize-error/-/serialize-error-2.1.0.tgz",
-      "integrity": "sha1-ULZ51WNc34Rme9yOWa9OW4HV9go=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/serialize-javascript": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-3.1.0.tgz",
-      "integrity": "sha512-JIJT1DGiWmIKhzRsG91aS6Ze4sFUrYbltlkg2onR5OrnNM02Kl/hnY/T4FN2omvyeBbQmMJv+K4cPOpGzOTFBg==",
-      "dependencies": {
-        "randombytes": "^2.1.0"
-      }
-    },
-    "node_modules/set-blocking": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
-      "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc="
-    },
-    "node_modules/set-value": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz",
-      "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==",
-      "dependencies": {
-        "extend-shallow": "^2.0.1",
-        "is-extendable": "^0.1.1",
-        "is-plain-object": "^2.0.3",
-        "split-string": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/set-value/node_modules/extend-shallow": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-      "dependencies": {
-        "is-extendable": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/set-value/node_modules/is-plain-object": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
-      "dependencies": {
-        "isobject": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/set-value/node_modules/isobject": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/setimmediate": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz",
-      "integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU="
-    },
-    "node_modules/sha.js": {
-      "version": "2.4.11",
-      "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz",
-      "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==",
-      "dependencies": {
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.0.1"
-      },
-      "bin": {
-        "sha.js": "bin.js"
-      }
-    },
-    "node_modules/shebang-command": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
-      "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
-      "dependencies": {
-        "shebang-regex": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/shebang-regex": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
-      "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/shellwords": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/shellwords/-/shellwords-0.1.1.tgz",
-      "integrity": "sha512-vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww=="
-    },
-    "node_modules/sigmund": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz",
-      "integrity": "sha1-P/IfGYytIXX587eBhT/ZTQ0ZtZA="
-    },
-    "node_modules/signal-exit": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz",
-      "integrity": "sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA=="
-    },
-    "node_modules/simple-swizzle": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz",
-      "integrity": "sha1-pNprY1/8zMoz9w0Xy5JZLeleVXo=",
-      "dependencies": {
-        "is-arrayish": "^0.3.1"
-      }
-    },
-    "node_modules/simple-swizzle/node_modules/is-arrayish": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz",
-      "integrity": "sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ=="
-    },
-    "node_modules/slash": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
-      "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/slice-ansi": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-2.1.0.tgz",
-      "integrity": "sha512-Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^3.2.0",
-        "astral-regex": "^1.0.0",
-        "is-fullwidth-code-point": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/slice-ansi/node_modules/is-fullwidth-code-point": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-      "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/snapdragon": {
-      "version": "0.8.2",
-      "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
-      "integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
-      "dependencies": {
-        "base": "^0.11.1",
-        "debug": "^2.2.0",
-        "define-property": "^0.2.5",
-        "extend-shallow": "^2.0.1",
-        "map-cache": "^0.2.2",
-        "source-map": "^0.5.6",
-        "source-map-resolve": "^0.5.0",
-        "use": "^3.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/snapdragon-node": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz",
-      "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==",
-      "dependencies": {
-        "define-property": "^1.0.0",
-        "isobject": "^3.0.0",
-        "snapdragon-util": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/snapdragon-node/node_modules/define-property": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-      "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-      "dependencies": {
-        "is-descriptor": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/snapdragon-node/node_modules/is-accessor-descriptor": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-      "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
-      "dependencies": {
-        "kind-of": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/snapdragon-node/node_modules/is-data-descriptor": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-      "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
-      "dependencies": {
-        "kind-of": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/snapdragon-node/node_modules/is-descriptor": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-      "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-      "dependencies": {
-        "is-accessor-descriptor": "^1.0.0",
-        "is-data-descriptor": "^1.0.0",
-        "kind-of": "^6.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/snapdragon-node/node_modules/isobject": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/snapdragon-util": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz",
-      "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==",
-      "dependencies": {
-        "kind-of": "^3.2.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/snapdragon-util/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/snapdragon/node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "dependencies": {
-        "ms": "2.0.0"
-      }
-    },
-    "node_modules/snapdragon/node_modules/define-property": {
-      "version": "0.2.5",
-      "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-      "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-      "dependencies": {
-        "is-descriptor": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/snapdragon/node_modules/extend-shallow": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-      "dependencies": {
-        "is-extendable": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/snapdragon/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
-    },
-    "node_modules/sort-keys": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/sort-keys/-/sort-keys-1.1.2.tgz",
-      "integrity": "sha1-RBttTTRnmPG05J6JIK37oOVD+a0=",
-      "dependencies": {
-        "is-plain-obj": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/source-list-map": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz",
-      "integrity": "sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw=="
-    },
-    "node_modules/source-map": {
-      "version": "0.5.7",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-      "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/source-map-resolve": {
-      "version": "0.5.3",
-      "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.3.tgz",
-      "integrity": "sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==",
-      "deprecated": "See https://github.com/lydell/source-map-resolve#deprecated",
-      "dependencies": {
-        "atob": "^2.1.2",
-        "decode-uri-component": "^0.2.0",
-        "resolve-url": "^0.2.1",
-        "source-map-url": "^0.4.0",
-        "urix": "^0.1.0"
-      }
-    },
-    "node_modules/source-map-support": {
-      "version": "0.5.19",
-      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.19.tgz",
-      "integrity": "sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==",
-      "dependencies": {
-        "buffer-from": "^1.0.0",
-        "source-map": "^0.6.0"
-      }
-    },
-    "node_modules/source-map-support/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/source-map-url": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz",
-      "integrity": "sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=",
-      "deprecated": "See https://github.com/lydell/source-map-url#deprecated"
-    },
-    "node_modules/spark-md5": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/spark-md5/-/spark-md5-3.0.1.tgz",
-      "integrity": "sha512-0tF3AGSD1ppQeuffsLDIOWlKUd3lS92tFxcsrh5Pe3ZphhnoK+oXIBTzOAThZCiuINZLvpiLH/1VS1/ANEJVig=="
-    },
-    "node_modules/sparkles": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/sparkles/-/sparkles-1.0.1.tgz",
-      "integrity": "sha512-dSO0DDYUahUt/0/pD/Is3VIm5TGJjludZ0HVymmhYF6eNA53PVLhnUk0znSYbH8IYBuJdCE+1luR22jNLMaQdw==",
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/spdx-correct": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.0.tgz",
-      "integrity": "sha512-lr2EZCctC2BNR7j7WzJ2FpDznxky1sjfxvvYEyzxNyb6lZXHODmEoJeFu4JupYlkfha1KZpJyoqiJ7pgA1qq8Q==",
-      "dependencies": {
-        "spdx-expression-parse": "^3.0.0",
-        "spdx-license-ids": "^3.0.0"
-      }
-    },
-    "node_modules/spdx-exceptions": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz",
-      "integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A=="
-    },
-    "node_modules/spdx-expression-parse": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz",
-      "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==",
-      "dependencies": {
-        "spdx-exceptions": "^2.1.0",
-        "spdx-license-ids": "^3.0.0"
-      }
-    },
-    "node_modules/spdx-license-ids": {
-      "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz",
-      "integrity": "sha512-J+FWzZoynJEXGphVIS+XEh3kFSjZX/1i9gFBaWQcB+/tmpe2qUsSBABpcxqxnAxFdiUFEgAX1bjYGQvIZmoz9Q=="
-    },
-    "node_modules/specificity": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/specificity/-/specificity-0.4.1.tgz",
-      "integrity": "sha512-1klA3Gi5PD1Wv9Q0wUoOQN1IWAuPu0D1U03ThXTr0cJ20+/iq2tHSDnK7Kk/0LXJ1ztUB2/1Os0wKmfyNgUQfg==",
-      "dev": true,
-      "bin": {
-        "specificity": "bin/specificity"
-      }
-    },
-    "node_modules/split-string": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz",
-      "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==",
-      "dependencies": {
-        "extend-shallow": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/sprintf-js": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
-      "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw="
-    },
-    "node_modules/ssf": {
-      "version": "0.11.2",
-      "resolved": "https://registry.nlark.com/ssf/download/ssf-0.11.2.tgz",
-      "integrity": "sha1-C5lpiyN1SNCI/EPN8rcMGnUSwGw=",
-      "dependencies": {
-        "frac": "~1.1.2"
-      },
-      "engines": {
-        "node": ">=0.8"
-      }
-    },
-    "node_modules/sshpk": {
-      "version": "1.16.1",
-      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz",
-      "integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==",
-      "optional": true,
-      "dependencies": {
-        "asn1": "~0.2.3",
-        "assert-plus": "^1.0.0",
-        "bcrypt-pbkdf": "^1.0.0",
-        "dashdash": "^1.12.0",
-        "ecc-jsbn": "~0.1.1",
-        "getpass": "^0.1.1",
-        "jsbn": "~0.1.0",
-        "safer-buffer": "^2.0.2",
-        "tweetnacl": "~0.14.0"
-      },
-      "bin": {
-        "sshpk-conv": "bin/sshpk-conv",
-        "sshpk-sign": "bin/sshpk-sign",
-        "sshpk-verify": "bin/sshpk-verify"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/ssri": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/ssri/-/ssri-8.0.0.tgz",
-      "integrity": "sha512-aq/pz989nxVYwn16Tsbj1TqFpD5LLrQxHf5zaHuieFV+R0Bbr4y8qUsOA45hXT/N4/9UNXTarBjnjVmjSOVaAA==",
-      "dependencies": {
-        "minipass": "^3.1.1"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/stable": {
-      "version": "0.1.8",
-      "resolved": "https://registry.npmjs.org/stable/-/stable-0.1.8.tgz",
-      "integrity": "sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==",
-      "deprecated": "Modern JS already guarantees Array#sort() is a stable sort, so this library is deprecated. See the compatibility table on MDN: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/sort#browser_compatibility"
-    },
-    "node_modules/stack-trace": {
-      "version": "0.0.10",
-      "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz",
-      "integrity": "sha1-VHxws0fo0ytOEI6hoqFZ5f3eGcA=",
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/stat-mode": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/stat-mode/-/stat-mode-0.2.2.tgz",
-      "integrity": "sha1-5sgLYjEj19gM8TLOU480YokHJQI="
-    },
-    "node_modules/state-toggle": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/state-toggle/-/state-toggle-1.0.3.tgz",
-      "integrity": "sha512-d/5Z4/2iiCnHw6Xzghyhb+GcmF89bxwgXG60wjIiZaxnymbyOmI8Hk4VqHXiVVp6u2ysaskFfXg3ekCj4WNftQ==",
-      "dev": true,
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
-      }
-    },
-    "node_modules/static-extend": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz",
-      "integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=",
-      "dependencies": {
-        "define-property": "^0.2.5",
-        "object-copy": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/static-extend/node_modules/define-property": {
-      "version": "0.2.5",
-      "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-      "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-      "dependencies": {
-        "is-descriptor": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/stream": {
-      "version": "0.0.2",
-      "resolved": "https://registry.npmjs.org/stream/-/stream-0.0.2.tgz",
-      "integrity": "sha1-f1Nj8Ff2WSxVlfALyAon9c7B8O8=",
-      "dependencies": {
-        "emitter-component": "^1.1.1"
-      }
-    },
-    "node_modules/stream-browserify": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.2.tgz",
-      "integrity": "sha512-nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg==",
-      "dependencies": {
-        "inherits": "~2.0.1",
-        "readable-stream": "^2.0.2"
-      }
-    },
-    "node_modules/stream-each": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/stream-each/-/stream-each-1.2.3.tgz",
-      "integrity": "sha512-vlMC2f8I2u/bZGqkdfLQW/13Zihpej/7PmSiMQsbYddxuTsJp8vRe2x2FvVExZg7FaOds43ROAuFJwPR4MTZLw==",
-      "dependencies": {
-        "end-of-stream": "^1.1.0",
-        "stream-shift": "^1.0.0"
-      }
-    },
-    "node_modules/stream-exhaust": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/stream-exhaust/-/stream-exhaust-1.0.2.tgz",
-      "integrity": "sha512-b/qaq/GlBK5xaq1yrK9/zFcyRSTNxmcZwFLGSTG0mXgZl/4Z6GgiyYOXOvY7N3eEvFRAG1bkDRz5EPGSvPYQlw=="
-    },
-    "node_modules/stream-http": {
-      "version": "2.8.3",
-      "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-2.8.3.tgz",
-      "integrity": "sha512-+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw==",
-      "dependencies": {
-        "builtin-status-codes": "^3.0.0",
-        "inherits": "^2.0.1",
-        "readable-stream": "^2.3.6",
-        "to-arraybuffer": "^1.0.0",
-        "xtend": "^4.0.0"
-      }
-    },
-    "node_modules/stream-shift": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.1.tgz",
-      "integrity": "sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ=="
-    },
-    "node_modules/streamroller": {
-      "version": "2.2.4",
-      "resolved": "https://registry.npm.taobao.org/streamroller/download/streamroller-2.2.4.tgz",
-      "integrity": "sha1-wZjO1C25QIamGTYIGHzoCl8rDlM=",
-      "deprecated": "2.x is no longer supported. Please upgrade to 3.x or higher.",
-      "dependencies": {
-        "date-format": "^2.1.0",
-        "debug": "^4.1.1",
-        "fs-extra": "^8.1.0"
-      },
-      "engines": {
-        "node": ">=8.0"
-      }
-    },
-    "node_modules/streamroller/node_modules/date-format": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npm.taobao.org/date-format/download/date-format-2.1.0.tgz",
-      "integrity": "sha1-MdW16iEc9f12TNOLr50DPffhJc8=",
-      "deprecated": "2.x is no longer supported. Please upgrade to 4.x or higher.",
-      "engines": {
-        "node": ">=4.0"
-      }
-    },
-    "node_modules/strict-uri-encode": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz",
-      "integrity": "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/string_decoder": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-      "dependencies": {
-        "safe-buffer": "~5.1.0"
-      }
-    },
-    "node_modules/string-width": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
-      "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
-      "dependencies": {
-        "code-point-at": "^1.0.0",
-        "is-fullwidth-code-point": "^1.0.0",
-        "strip-ansi": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/string.prototype.trimend": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz",
-      "integrity": "sha512-LRPxFUaTtpqYsTeNKaFOw3R4bxIzWOnbQ837QfBylo8jIxtcbK/A/sMV7Q+OAV/vWo+7s25pOE10KYSjaSO06g==",
-      "dependencies": {
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.5"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/string.prototype.trimleft": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.2.tgz",
-      "integrity": "sha512-gCA0tza1JBvqr3bfAIFJGqfdRTyPae82+KTnm3coDXkZN9wnuW3HjGgN386D7hfv5CHQYCI022/rJPVlqXyHSw==",
-      "dependencies": {
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.5",
-        "string.prototype.trimstart": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/string.prototype.trimright": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.2.tgz",
-      "integrity": "sha512-ZNRQ7sY3KroTaYjRS6EbNiiHrOkjihL9aQE/8gfQ4DtAC/aEBRHFJa44OmoWxGGqXuJlfKkZW4WcXErGr+9ZFg==",
-      "dependencies": {
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.5",
-        "string.prototype.trimend": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/string.prototype.trimstart": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.1.tgz",
-      "integrity": "sha512-XxZn+QpvrBI1FOcg6dIpxUPgWCPuNXvMD72aaRaUQv1eD4e/Qy8i/hFTe0BUmD60p/QA6bh1avmuPTfNjqVWRw==",
-      "dependencies": {
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.5"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/stringify-entities": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/stringify-entities/-/stringify-entities-3.0.1.tgz",
-      "integrity": "sha512-Lsk3ISA2++eJYqBMPKcr/8eby1I6L0gP0NlxF8Zja6c05yr/yCYyb2c9PwXjd08Ib3If1vn1rbs1H5ZtVuOfvQ==",
-      "dev": true,
-      "dependencies": {
-        "character-entities-html4": "^1.0.0",
-        "character-entities-legacy": "^1.0.0",
-        "is-alphanumerical": "^1.0.0",
-        "is-decimal": "^1.0.2",
-        "is-hexadecimal": "^1.0.0"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
-      }
-    },
-    "node_modules/stringify-object": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/stringify-object/-/stringify-object-3.3.0.tgz",
-      "integrity": "sha512-rHqiFh1elqCQ9WPLIC8I0Q/g/wj5J1eMkyoiD6eoQApWHP0FtlK7rqnhmabL5VUY9JQCcqwwvlOaSuutekgyrw==",
-      "dependencies": {
-        "get-own-enumerable-property-symbols": "^3.0.0",
-        "is-obj": "^1.0.1",
-        "is-regexp": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/stringify-object/node_modules/is-obj": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz",
-      "integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/strip-ansi": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-      "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-      "dependencies": {
-        "ansi-regex": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/strip-bom": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
-      "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
-      "dependencies": {
-        "is-utf8": "^0.2.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/strip-bom-buf": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/strip-bom-buf/-/strip-bom-buf-1.0.0.tgz",
-      "integrity": "sha1-HLRar1dTD0yvhsf3UXnSyaUd1XI=",
-      "dependencies": {
-        "is-utf8": "^0.2.1"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/strip-bom-stream": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/strip-bom-stream/-/strip-bom-stream-3.0.0.tgz",
-      "integrity": "sha1-lWvMXYRDD2klapDtgjdlzYWOFZw=",
-      "dependencies": {
-        "first-chunk-stream": "^2.0.0",
-        "strip-bom-buf": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/strip-eof": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz",
-      "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/strip-indent": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-3.0.0.tgz",
-      "integrity": "sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==",
-      "dev": true,
-      "dependencies": {
-        "min-indent": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/strip-json-comments": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
-      "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/style-search": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/style-search/-/style-search-0.1.0.tgz",
-      "integrity": "sha1-eVjHk+R+MuB9K1yv5cC/jhLneQI=",
-      "dev": true
-    },
-    "node_modules/stylehacks": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/stylehacks/-/stylehacks-4.0.3.tgz",
-      "integrity": "sha512-7GlLk9JwlElY4Y6a/rmbH2MhVlTyVmiJd1PfTCqFaIBEGMYNsrO/v3SeGTdhBThLg4Z+NbOk/qFMwCa+J+3p/g==",
-      "dependencies": {
-        "browserslist": "^4.0.0",
-        "postcss": "^7.0.0",
-        "postcss-selector-parser": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/stylehacks/node_modules/postcss-selector-parser": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-3.1.2.tgz",
-      "integrity": "sha512-h7fJ/5uWuRVyOtkO45pnt1Ih40CEleeyCHzipqAZO2e5H20g25Y48uYnFUiShvY4rZWNJ/Bib/KVPmanaCtOhA==",
-      "dependencies": {
-        "dot-prop": "^5.2.0",
-        "indexes-of": "^1.0.1",
-        "uniq": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/stylelint": {
-      "version": "13.3.3",
-      "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-13.3.3.tgz",
-      "integrity": "sha512-j8Oio2T1YNiJc6iXDaPYd74Jg4zOa1bByNm/g9/Nvnq4tDPsIjMi46jhRZyPPktGPwjJ5FwcmCqIRlH6PVP8mA==",
-      "dev": true,
-      "dependencies": {
-        "@stylelint/postcss-css-in-js": "^0.37.1",
-        "@stylelint/postcss-markdown": "^0.36.1",
-        "autoprefixer": "^9.7.6",
-        "balanced-match": "^1.0.0",
-        "chalk": "^4.0.0",
-        "cosmiconfig": "^6.0.0",
-        "debug": "^4.1.1",
-        "execall": "^2.0.0",
-        "file-entry-cache": "^5.0.1",
-        "get-stdin": "^7.0.0",
-        "global-modules": "^2.0.0",
-        "globby": "^11.0.0",
-        "globjoin": "^0.1.4",
-        "html-tags": "^3.1.0",
-        "ignore": "^5.1.4",
-        "import-lazy": "^4.0.0",
-        "imurmurhash": "^0.1.4",
-        "known-css-properties": "^0.18.0",
-        "leven": "^3.1.0",
-        "lodash": "^4.17.15",
-        "log-symbols": "^3.0.0",
-        "mathml-tag-names": "^2.1.3",
-        "meow": "^6.1.0",
-        "micromatch": "^4.0.2",
-        "normalize-selector": "^0.2.0",
-        "postcss": "^7.0.27",
-        "postcss-html": "^0.36.0",
-        "postcss-less": "^3.1.4",
-        "postcss-media-query-parser": "^0.2.3",
-        "postcss-reporter": "^6.0.1",
-        "postcss-resolve-nested-selector": "^0.1.1",
-        "postcss-safe-parser": "^4.0.2",
-        "postcss-sass": "^0.4.4",
-        "postcss-scss": "^2.0.0",
-        "postcss-selector-parser": "^6.0.2",
-        "postcss-syntax": "^0.36.2",
-        "postcss-value-parser": "^4.0.3",
-        "resolve-from": "^5.0.0",
-        "slash": "^3.0.0",
-        "specificity": "^0.4.1",
-        "string-width": "^4.2.0",
-        "strip-ansi": "^6.0.0",
-        "style-search": "^0.1.0",
-        "sugarss": "^2.0.0",
-        "svg-tags": "^1.0.0",
-        "table": "^5.4.6",
-        "v8-compile-cache": "^2.1.0",
-        "write-file-atomic": "^3.0.3"
-      },
-      "bin": {
-        "stylelint": "bin/stylelint.js"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/stylelint"
-      }
-    },
-    "node_modules/stylelint-config-recommended": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/stylelint-config-recommended/-/stylelint-config-recommended-3.0.0.tgz",
-      "integrity": "sha512-F6yTRuc06xr1h5Qw/ykb2LuFynJ2IxkKfCMf+1xqPffkxh0S09Zc902XCffcsw/XMFq/OzQ1w54fLIDtmRNHnQ==",
-      "dev": true,
-      "peerDependencies": {
-        "stylelint": ">=10.1.0"
-      }
-    },
-    "node_modules/stylelint-config-standard": {
-      "version": "20.0.0",
-      "resolved": "https://registry.npmjs.org/stylelint-config-standard/-/stylelint-config-standard-20.0.0.tgz",
-      "integrity": "sha512-IB2iFdzOTA/zS4jSVav6z+wGtin08qfj+YyExHB3LF9lnouQht//YyB0KZq9gGz5HNPkddHOzcY8HsUey6ZUlA==",
-      "dev": true,
-      "dependencies": {
-        "stylelint-config-recommended": "^3.0.0"
-      },
-      "peerDependencies": {
-        "stylelint": ">=10.1.0"
-      }
-    },
-    "node_modules/stylelint/node_modules/ansi-regex": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-      "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/stylelint/node_modules/ansi-styles": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
-      "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
-      "dev": true,
-      "dependencies": {
-        "@types/color-name": "^1.1.1",
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/stylelint/node_modules/array-union": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
-      "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/stylelint/node_modules/chalk": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.0.0.tgz",
-      "integrity": "sha512-N9oWFcegS0sFr9oh1oz2d7Npos6vNoWW9HvtCg5N1KRFpUhaAhvTv5Y58g880fZaEYSNm3qDz8SU1UrGvp+n7A==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/stylelint/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/stylelint/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/stylelint/node_modules/cosmiconfig": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-6.0.0.tgz",
-      "integrity": "sha512-xb3ZL6+L8b9JLLCx3ZdoZy4+2ECphCMo2PwqgP1tlfVq6M6YReyzBJtvWWtbDSpNr9hn96pkCiZqUcFEc+54Qg==",
-      "dev": true,
-      "dependencies": {
-        "@types/parse-json": "^4.0.0",
-        "import-fresh": "^3.1.0",
-        "parse-json": "^5.0.0",
-        "path-type": "^4.0.0",
-        "yaml": "^1.7.2"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/stylelint/node_modules/emoji-regex": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-      "dev": true
-    },
-    "node_modules/stylelint/node_modules/global-modules": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-2.0.0.tgz",
-      "integrity": "sha512-NGbfmJBp9x8IxyJSd1P+otYK8vonoJactOogrVfFRIAEY1ukil8RSKDz2Yo7wh1oihl51l/r6W4epkeKJHqL8A==",
-      "dev": true,
-      "dependencies": {
-        "global-prefix": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/stylelint/node_modules/global-prefix": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-3.0.0.tgz",
-      "integrity": "sha512-awConJSVCHVGND6x3tmMaKcQvwXLhjdkmomy2W+Goaui8YPgYgXJZewhg3fWC+DlfqqQuWg8AwqjGTD2nAPVWg==",
-      "dev": true,
-      "dependencies": {
-        "ini": "^1.3.5",
-        "kind-of": "^6.0.2",
-        "which": "^1.3.1"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/stylelint/node_modules/globby": {
-      "version": "11.0.0",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-11.0.0.tgz",
-      "integrity": "sha512-iuehFnR3xu5wBBtm4xi0dMe92Ob87ufyu/dHwpDYfbcpYpIbrO5OnS8M1vWvrBhSGEJ3/Ecj7gnX76P8YxpPEg==",
-      "dev": true,
-      "dependencies": {
-        "array-union": "^2.1.0",
-        "dir-glob": "^3.0.1",
-        "fast-glob": "^3.1.1",
-        "ignore": "^5.1.4",
-        "merge2": "^1.3.0",
-        "slash": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/stylelint/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/stylelint/node_modules/ignore": {
-      "version": "5.1.4",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.4.tgz",
-      "integrity": "sha512-MzbUSahkTW1u7JpKKjY7LCARd1fU5W2rLdxlM4kdkayuCwZImjkpluF9CM1aLewYJguPDqewLam18Y6AU69A8A==",
-      "dev": true,
-      "engines": {
-        "node": ">= 4"
-      }
-    },
-    "node_modules/stylelint/node_modules/import-fresh": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.2.1.tgz",
-      "integrity": "sha512-6e1q1cnWP2RXD9/keSkxHScg508CdXqXWgWBaETNhyuBFz+kUZlKboh+ISK+bU++DmbHimVBrOz/zzPe0sZ3sQ==",
-      "dev": true,
-      "dependencies": {
-        "parent-module": "^1.0.0",
-        "resolve-from": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/stylelint/node_modules/import-fresh/node_modules/resolve-from": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
-      "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/stylelint/node_modules/is-fullwidth-code-point": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/stylelint/node_modules/parse-json": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.0.0.tgz",
-      "integrity": "sha512-OOY5b7PAEFV0E2Fir1KOkxchnZNCdowAJgQ5NuxjpBKTRP3pQhwkrkxqQjeoKJ+fO7bCpmIZaogI4eZGDMEGOw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/code-frame": "^7.0.0",
-        "error-ex": "^1.3.1",
-        "json-parse-better-errors": "^1.0.1",
-        "lines-and-columns": "^1.1.6"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/stylelint/node_modules/path-type": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
-      "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/stylelint/node_modules/resolve-from": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
-      "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/stylelint/node_modules/string-width": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz",
-      "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==",
-      "dev": true,
-      "dependencies": {
-        "emoji-regex": "^8.0.0",
-        "is-fullwidth-code-point": "^3.0.0",
-        "strip-ansi": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/stylelint/node_modules/strip-ansi": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
-      "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
-      "dev": true,
-      "dependencies": {
-        "ansi-regex": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/stylelint/node_modules/supports-color": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
-      "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/stylelint/node_modules/v8-compile-cache": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.1.0.tgz",
-      "integrity": "sha512-usZBT3PW+LOjM25wbqIlZwPeJV+3OSz3M1k1Ws8snlW39dZyYL9lOGC5FgPVHfk0jKmjiDV8Z0mIbVQPiwFs7g==",
-      "dev": true
-    },
-    "node_modules/sugarss": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/sugarss/-/sugarss-2.0.0.tgz",
-      "integrity": "sha512-WfxjozUk0UVA4jm+U1d736AUpzSrNsQcIbyOkoE364GrtWmIrFdk5lksEupgWMD4VaT/0kVx1dobpiDumSgmJQ==",
-      "dev": true,
-      "dependencies": {
-        "postcss": "^7.0.2"
-      }
-    },
-    "node_modules/supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-      "dependencies": {
-        "has-flag": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/sver-compat": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/sver-compat/-/sver-compat-1.5.0.tgz",
-      "integrity": "sha1-PPh9/rTQe0o/FIJ7wYaz/QxkXNg=",
-      "dependencies": {
-        "es6-iterator": "^2.0.1",
-        "es6-symbol": "^3.1.1"
-      }
-    },
-    "node_modules/svg-baker": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/svg-baker/-/svg-baker-1.7.0.tgz",
-      "integrity": "sha512-nibslMbkXOIkqKVrfcncwha45f97fGuAOn1G99YwnwTj8kF9YiM6XexPcUso97NxOm6GsP0SIvYVIosBis1xLg==",
-      "dependencies": {
-        "bluebird": "^3.5.0",
-        "clone": "^2.1.1",
-        "he": "^1.1.1",
-        "image-size": "^0.5.1",
-        "loader-utils": "^1.1.0",
-        "merge-options": "1.0.1",
-        "micromatch": "3.1.0",
-        "postcss": "^5.2.17",
-        "postcss-prefix-selector": "^1.6.0",
-        "posthtml-rename-id": "^1.0",
-        "posthtml-svg-mode": "^1.0.3",
-        "query-string": "^4.3.2",
-        "traverse": "^0.6.6"
-      }
-    },
-    "node_modules/svg-baker-runtime": {
-      "version": "1.4.7",
-      "resolved": "https://registry.npmjs.org/svg-baker-runtime/-/svg-baker-runtime-1.4.7.tgz",
-      "integrity": "sha512-Zorfwwj5+lWjk/oxwSMsRdS2sPQQdTmmsvaSpzU+i9ZWi3zugHLt6VckWfnswphQP0LmOel3nggpF5nETbt6xw==",
-      "dependencies": {
-        "deepmerge": "1.3.2",
-        "mitt": "1.1.2",
-        "svg-baker": "^1.7.0"
-      }
-    },
-    "node_modules/svg-baker-runtime/node_modules/deepmerge": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-1.3.2.tgz",
-      "integrity": "sha1-FmNpFinU2/42T6EqKk8KqGqjoFA=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/svg-baker/node_modules/ansi-styles": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-      "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/svg-baker/node_modules/braces": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-      "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-      "dependencies": {
-        "arr-flatten": "^1.1.0",
-        "array-unique": "^0.3.2",
-        "extend-shallow": "^2.0.1",
-        "fill-range": "^4.0.0",
-        "isobject": "^3.0.1",
-        "repeat-element": "^1.1.2",
-        "snapdragon": "^0.8.1",
-        "snapdragon-node": "^2.0.1",
-        "split-string": "^3.0.2",
-        "to-regex": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/svg-baker/node_modules/chalk": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-      "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-      "dependencies": {
-        "ansi-styles": "^2.2.1",
-        "escape-string-regexp": "^1.0.2",
-        "has-ansi": "^2.0.0",
-        "strip-ansi": "^3.0.0",
-        "supports-color": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/svg-baker/node_modules/chalk/node_modules/supports-color": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-      "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
-    "node_modules/svg-baker/node_modules/define-property": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-      "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-      "dependencies": {
-        "is-descriptor": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/svg-baker/node_modules/extend-shallow": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-      "dependencies": {
-        "is-extendable": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/svg-baker/node_modules/fill-range": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-      "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
-      "dependencies": {
-        "extend-shallow": "^2.0.1",
-        "is-number": "^3.0.0",
-        "repeat-string": "^1.6.1",
-        "to-regex-range": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/svg-baker/node_modules/has-flag": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
-      "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/svg-baker/node_modules/is-accessor-descriptor": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-      "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
-      "dependencies": {
-        "kind-of": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/svg-baker/node_modules/is-accessor-descriptor/node_modules/kind-of": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/svg-baker/node_modules/is-data-descriptor": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-      "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
-      "dependencies": {
-        "kind-of": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/svg-baker/node_modules/is-data-descriptor/node_modules/kind-of": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/svg-baker/node_modules/is-descriptor": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-      "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-      "dependencies": {
-        "is-accessor-descriptor": "^1.0.0",
-        "is-data-descriptor": "^1.0.0",
-        "kind-of": "^6.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/svg-baker/node_modules/is-descriptor/node_modules/kind-of": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/svg-baker/node_modules/is-number": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-      "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/svg-baker/node_modules/is-number/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/svg-baker/node_modules/isobject": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/svg-baker/node_modules/kind-of": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-      "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/svg-baker/node_modules/micromatch": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.0.tgz",
-      "integrity": "sha512-3StSelAE+hnRvMs8IdVW7Uhk8CVed5tp+kLLGlBP6WiRAXS21GPGu/Nat4WNPXj2Eoc24B02SaeoyozPMfj0/g==",
-      "dependencies": {
-        "arr-diff": "^4.0.0",
-        "array-unique": "^0.3.2",
-        "braces": "^2.2.2",
-        "define-property": "^1.0.0",
-        "extend-shallow": "^2.0.1",
-        "extglob": "^2.0.2",
-        "fragment-cache": "^0.2.1",
-        "kind-of": "^5.0.2",
-        "nanomatch": "^1.2.1",
-        "object.pick": "^1.3.0",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/svg-baker/node_modules/postcss": {
-      "version": "5.2.18",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz",
-      "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
-      "dependencies": {
-        "chalk": "^1.1.3",
-        "js-base64": "^2.1.9",
-        "source-map": "^0.5.6",
-        "supports-color": "^3.2.3"
-      },
-      "engines": {
-        "node": ">=0.12"
-      }
-    },
-    "node_modules/svg-baker/node_modules/supports-color": {
-      "version": "3.2.3",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
-      "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
-      "dependencies": {
-        "has-flag": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
-    "node_modules/svg-baker/node_modules/to-regex-range": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
-      "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
-      "dependencies": {
-        "is-number": "^3.0.0",
-        "repeat-string": "^1.6.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/svg-sprite-loader": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/svg-sprite-loader/-/svg-sprite-loader-5.0.0.tgz",
-      "integrity": "sha512-/hedkRC2IS0E+kFIb+OUCfqQlbVx72/WEEeRGw2uPsNgOOgJEONXzjfSm+CJ3pB9gOHytlBmPMS8ijMCp5s2Eg==",
-      "dependencies": {
-        "bluebird": "^3.5.0",
-        "deepmerge": "1.3.2",
-        "domready": "1.0.8",
-        "escape-string-regexp": "1.0.5",
-        "html-webpack-plugin": "^3.2.0",
-        "loader-utils": "^1.1.0",
-        "svg-baker": "^1.5.0",
-        "svg-baker-runtime": "^1.4.7",
-        "url-slug": "2.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/svg-sprite-loader/node_modules/deepmerge": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-1.3.2.tgz",
-      "integrity": "sha1-FmNpFinU2/42T6EqKk8KqGqjoFA=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/svg-tags": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/svg-tags/-/svg-tags-1.0.0.tgz",
-      "integrity": "sha1-WPcc7jvVGbWdSyqEO2x95krAR2Q=",
-      "dev": true
-    },
-    "node_modules/svgo": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/svgo/-/svgo-1.3.2.tgz",
-      "integrity": "sha512-yhy/sQYxR5BkC98CY7o31VGsg014AKLEPxdfhora76l36hD9Rdy5NZA/Ocn6yayNPgSamYdtX2rFJdcv07AYVw==",
-      "deprecated": "This SVGO version is no longer supported. Upgrade to v2.x.x.",
-      "dependencies": {
-        "chalk": "^2.4.1",
-        "coa": "^2.0.2",
-        "css-select": "^2.0.0",
-        "css-select-base-adapter": "^0.1.1",
-        "css-tree": "1.0.0-alpha.37",
-        "csso": "^4.0.2",
-        "js-yaml": "^3.13.1",
-        "mkdirp": "~0.5.1",
-        "object.values": "^1.1.0",
-        "sax": "~1.2.4",
-        "stable": "^0.1.8",
-        "unquote": "~1.1.1",
-        "util.promisify": "~1.0.0"
-      },
-      "bin": {
-        "svgo": "bin/svgo"
-      },
-      "engines": {
-        "node": ">=4.0.0"
-      }
-    },
-    "node_modules/svgo-loader": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/svgo-loader/-/svgo-loader-2.2.1.tgz",
-      "integrity": "sha512-9dyz/h6ae04pAVRz7QY8bLXtMbwA19NPpCPfCixgW0qXNDCOlHbDRqvtT5/2gzRxfuibWCUP6ZBQmZWF9rjWhQ==",
-      "dependencies": {
-        "js-yaml": "^3.13.1",
-        "loader-utils": "^1.0.3"
-      },
-      "peerDependencies": {
-        "svgo": "^1.0.0"
-      }
-    },
-    "node_modules/swagger-client": {
-      "version": "3.13.1",
-      "resolved": "https://registry.npmjs.org/swagger-client/-/swagger-client-3.13.1.tgz",
-      "integrity": "sha512-Hmy4+wVVa3kveWzC7PIeUwiAY5qcYbm4XlC4uZ7e5kAePfB2cprXImiqrZHIzL+ndU0YTN7I+9w/ZayTisn3Jg==",
-      "dependencies": {
-        "@babel/runtime-corejs3": "^7.11.2",
-        "btoa": "^1.2.1",
-        "buffer": "^6.0.3",
-        "cookie": "~0.4.1",
-        "cross-fetch": "^3.0.6",
-        "deep-extend": "~0.6.0",
-        "fast-json-patch": "^3.0.0-1",
-        "isomorphic-form-data": "~2.0.0",
-        "js-yaml": "^3.14.0",
-        "lodash": "^4.17.19",
-        "qs": "^6.9.4",
-        "querystring-browser": "^1.0.4",
-        "traverse": "~0.6.6",
-        "url": "~0.11.0"
-      }
-    },
-    "node_modules/swagger-client/node_modules/js-yaml": {
-      "version": "3.14.1",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
-      "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
-      "dependencies": {
-        "argparse": "^1.0.7",
-        "esprima": "^4.0.0"
-      },
-      "bin": {
-        "js-yaml": "bin/js-yaml.js"
-      }
-    },
-    "node_modules/swagger-ui": {
-      "version": "3.25.3",
-      "resolved": "https://registry.npmjs.org/swagger-ui/-/swagger-ui-3.25.3.tgz",
-      "integrity": "sha512-FLlPg8LVq15qZfzVbpEDWqc4iGRAr21vJTK1d82oYrvQ7DtiAEMiEgc7JlEpH5DUoxx+h804QpfH9+ABy5mpkw==",
-      "dependencies": {
-        "@babel/runtime-corejs2": "^7.5.5",
-        "@braintree/sanitize-url": "^4.0.0",
-        "@kyleshockey/object-assign-deep": "^0.4.2",
-        "@kyleshockey/xml": "^1.0.2",
-        "base64-js": "^1.2.0",
-        "classnames": "^2.2.6",
-        "core-js": "^2.5.1",
-        "css.escape": "1.5.1",
-        "deep-extend": "0.6.0",
-        "dompurify": "^2.0.7",
-        "ieee754": "^1.1.13",
-        "immutable": "^3.x.x",
-        "js-file-download": "^0.4.1",
-        "js-yaml": "^3.13.1",
-        "lodash": "^4.17.15",
-        "memoizee": "^0.4.12",
-        "prop-types": "^15.7.2",
-        "randombytes": "^2.1.0",
-        "react": "^15.6.2",
-        "react-debounce-input": "^3.2.0",
-        "react-dom": "^15.6.2",
-        "react-immutable-proptypes": "2.1.0",
-        "react-immutable-pure-component": "^1.1.1",
-        "react-inspector": "^2.3.0",
-        "react-motion": "^0.5.2",
-        "react-redux": "^4.x.x",
-        "redux": "^3.x.x",
-        "redux-immutable": "3.1.0",
-        "remarkable": "^1.7.4",
-        "reselect": "^4.0.0",
-        "serialize-error": "^2.1.0",
-        "sha.js": "^2.4.11",
-        "swagger-client": "^3.10.3",
-        "url-parse": "^1.4.7",
-        "xml-but-prettier": "^1.0.1",
-        "zenscroll": "^4.0.2"
-      }
-    },
-    "node_modules/swagger-ui/node_modules/core-js": {
-      "version": "2.6.11",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.11.tgz",
-      "integrity": "sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg==",
-      "deprecated": "core-js@<3.23.3 is no longer maintained and not recommended for usage due to the number of issues. Because of the V8 engine whims, feature detection in old core-js versions could cause a slowdown up to 100x even if nothing is polyfilled. Some versions have web compatibility issues. Please, upgrade your dependencies to the actual version of core-js.",
-      "hasInstallScript": true
-    },
-    "node_modules/symbol-observable": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.2.0.tgz",
-      "integrity": "sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/table": {
-      "version": "5.4.6",
-      "resolved": "https://registry.npmjs.org/table/-/table-5.4.6.tgz",
-      "integrity": "sha512-wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug==",
-      "dev": true,
-      "dependencies": {
-        "ajv": "^6.10.2",
-        "lodash": "^4.17.14",
-        "slice-ansi": "^2.1.0",
-        "string-width": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/table/node_modules/ansi-regex": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
-      "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/table/node_modules/is-fullwidth-code-point": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-      "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/table/node_modules/string-width": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
-      "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
-      "dev": true,
-      "dependencies": {
-        "emoji-regex": "^7.0.1",
-        "is-fullwidth-code-point": "^2.0.0",
-        "strip-ansi": "^5.1.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/table/node_modules/strip-ansi": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-      "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-regex": "^4.1.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/tapable": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/tapable/-/tapable-1.1.3.tgz",
-      "integrity": "sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/tar": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/tar/-/tar-6.0.2.tgz",
-      "integrity": "sha512-Glo3jkRtPcvpDlAs/0+hozav78yoXKFr+c4wgw62NNMO3oo4AaJdCo21Uu7lcwr55h39W2XD1LMERc64wtbItg==",
-      "dependencies": {
-        "chownr": "^2.0.0",
-        "fs-minipass": "^2.0.0",
-        "minipass": "^3.0.0",
-        "minizlib": "^2.1.0",
-        "mkdirp": "^1.0.3",
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/tar/node_modules/mkdirp": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
-      "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
-      "bin": {
-        "mkdirp": "bin/cmd.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/tar/node_modules/yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
-    },
-    "node_modules/ternary-stream": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/ternary-stream/-/ternary-stream-2.1.1.tgz",
-      "integrity": "sha512-j6ei9hxSoyGlqTmoMjOm+QNvUKDOIY6bNl4Uh1lhBvl6yjPW2iLqxDUYyfDPZknQ4KdRziFl+ec99iT4l7g0cw==",
-      "dependencies": {
-        "duplexify": "^3.5.0",
-        "fork-stream": "^0.0.4",
-        "merge-stream": "^1.0.0",
-        "through2": "^2.0.1"
-      },
-      "engines": {
-        "node": ">= 0.10.0"
-      }
-    },
-    "node_modules/ternary-stream/node_modules/merge-stream": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-1.0.1.tgz",
-      "integrity": "sha1-QEEgLVCKNCugAXQAjfDCUbjBNeE=",
-      "dependencies": {
-        "readable-stream": "^2.0.1"
-      }
-    },
-    "node_modules/terser": {
-      "version": "4.6.13",
-      "resolved": "https://registry.npmjs.org/terser/-/terser-4.6.13.tgz",
-      "integrity": "sha512-wMvqukYgVpQlymbnNbabVZbtM6PN63AzqexpwJL8tbh/mRT9LE5o+ruVduAGL7D6Fpjl+Q+06U5I9Ul82odAhw==",
-      "dependencies": {
-        "commander": "^2.20.0",
-        "source-map": "~0.6.1",
-        "source-map-support": "~0.5.12"
-      },
-      "bin": {
-        "terser": "bin/terser"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/terser-webpack-plugin": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-3.0.1.tgz",
-      "integrity": "sha512-eFDtq8qPUEa9hXcUzTwKXTnugIVtlqc1Z/ZVhG8LmRT3lgRY13+pQTnFLY2N7ATB6TKCHuW/IGjoAnZz9wOIqw==",
-      "dependencies": {
-        "cacache": "^15.0.3",
-        "find-cache-dir": "^3.3.1",
-        "jest-worker": "^26.0.0",
-        "p-limit": "^2.3.0",
-        "schema-utils": "^2.6.6",
-        "serialize-javascript": "^3.0.0",
-        "source-map": "^0.6.1",
-        "terser": "^4.6.13",
-        "webpack-sources": "^1.4.3"
-      },
-      "engines": {
-        "node": ">= 10.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
-      "peerDependencies": {
-        "webpack": "^4.0.0 || ^5.0.0"
-      }
-    },
-    "node_modules/terser-webpack-plugin/node_modules/find-cache-dir": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.1.tgz",
-      "integrity": "sha512-t2GDMt3oGC/v+BMwzmllWDuJF/xcDtE5j/fCGbqDD7OLuJkj0cfh1YSA5VKPvwMeLFLNDBkwOKZ2X85jGLVftQ==",
-      "dependencies": {
-        "commondir": "^1.0.1",
-        "make-dir": "^3.0.2",
-        "pkg-dir": "^4.1.0"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/avajs/find-cache-dir?sponsor=1"
-      }
-    },
-    "node_modules/terser-webpack-plugin/node_modules/find-up": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-      "dependencies": {
-        "locate-path": "^5.0.0",
-        "path-exists": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/terser-webpack-plugin/node_modules/locate-path": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-      "dependencies": {
-        "p-locate": "^4.1.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/terser-webpack-plugin/node_modules/make-dir": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
-      "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
-      "dependencies": {
-        "semver": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/terser-webpack-plugin/node_modules/p-limit": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-      "dependencies": {
-        "p-try": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/terser-webpack-plugin/node_modules/p-locate": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-      "dependencies": {
-        "p-limit": "^2.2.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/terser-webpack-plugin/node_modules/p-try": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/terser-webpack-plugin/node_modules/path-exists": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/terser-webpack-plugin/node_modules/pkg-dir": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
-      "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
-      "dependencies": {
-        "find-up": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/terser-webpack-plugin/node_modules/semver": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-      "bin": {
-        "semver": "bin/semver.js"
-      }
-    },
-    "node_modules/terser-webpack-plugin/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/terser/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/text-table": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
-      "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=",
-      "dev": true
-    },
-    "node_modules/textextensions": {
-      "version": "2.6.0",
-      "resolved": "https://registry.npmjs.org/textextensions/-/textextensions-2.6.0.tgz",
-      "integrity": "sha512-49WtAWS+tcsy93dRt6P0P3AMD2m5PvXRhuEA0kaXos5ZLlujtYmpmFsB+QvWUSxE1ZsstmYXfQ7L40+EcQgpAQ==",
-      "engines": {
-        "node": ">=0.8"
-      },
-      "funding": {
-        "url": "https://bevry.me/fund"
-      }
-    },
-    "node_modules/throttle-debounce": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/throttle-debounce/-/throttle-debounce-1.1.0.tgz",
-      "integrity": "sha512-XH8UiPCQcWNuk2LYePibW/4qL97+ZQ1AN3FNXwZRBNPPowo/NRU5fAlDCSNBJIYCKbioZfuYtMhG4quqoJhVzg==",
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/through": {
-      "version": "2.3.8",
-      "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
-      "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU="
-    },
-    "node_modules/through2": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
-      "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
-      "dependencies": {
-        "readable-stream": "~2.3.6",
-        "xtend": "~4.0.1"
-      }
-    },
-    "node_modules/through2-filter": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/through2-filter/-/through2-filter-3.0.0.tgz",
-      "integrity": "sha512-jaRjI2WxN3W1V8/FMZ9HKIBXixtiqs3SQSX4/YGIiP3gL6djW48VoZq9tDqeCWs3MT8YY5wb/zli8VW8snY1CA==",
-      "dependencies": {
-        "through2": "~2.0.0",
-        "xtend": "~4.0.0"
-      }
-    },
-    "node_modules/tildify": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/tildify/-/tildify-1.2.0.tgz",
-      "integrity": "sha1-3OwD9V3Km3qj5bBPIYF+tW5jWIo=",
-      "dependencies": {
-        "os-homedir": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/time-stamp": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/time-stamp/-/time-stamp-1.1.0.tgz",
-      "integrity": "sha1-dkpaEa9QVhkhsTPztE5hhofg9cM=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/timers-browserify": {
-      "version": "2.0.11",
-      "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.11.tgz",
-      "integrity": "sha512-60aV6sgJ5YEbzUdn9c8kYGIqOubPoUdqQCul3SBAsRCZ40s6Y5cMcrW4dt3/k/EsbLVJNl9n6Vz3fTc+k2GeKQ==",
-      "dependencies": {
-        "setimmediate": "^1.0.4"
-      },
-      "engines": {
-        "node": ">=0.6.0"
-      }
-    },
-    "node_modules/timers-ext": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/timers-ext/-/timers-ext-0.1.7.tgz",
-      "integrity": "sha512-b85NUNzTSdodShTIbky6ZF02e8STtVVfD+fu4aXXShEELpozH+bCpJLYMPZbsABN2wDH7fJpqIoXxJpzbf0NqQ==",
-      "dependencies": {
-        "es5-ext": "~0.10.46",
-        "next-tick": "1"
-      }
-    },
-    "node_modules/timsort": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/timsort/-/timsort-0.3.0.tgz",
-      "integrity": "sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q="
-    },
-    "node_modules/tiny-emitter": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/tiny-emitter/-/tiny-emitter-2.1.0.tgz",
-      "integrity": "sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q=="
-    },
-    "node_modules/tmp": {
-      "version": "0.0.33",
-      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
-      "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
-      "dependencies": {
-        "os-tmpdir": "~1.0.2"
-      },
-      "engines": {
-        "node": ">=0.6.0"
-      }
-    },
-    "node_modules/to-absolute-glob": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/to-absolute-glob/-/to-absolute-glob-2.0.2.tgz",
-      "integrity": "sha1-GGX0PZ50sIItufFFt4z/fQ98hJs=",
-      "dependencies": {
-        "is-absolute": "^1.0.0",
-        "is-negated-glob": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/to-arraybuffer": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz",
-      "integrity": "sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M="
-    },
-    "node_modules/to-fast-properties": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
-      "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=",
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/to-object-path": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz",
-      "integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=",
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/to-object-path/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/to-regex": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz",
-      "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==",
-      "dependencies": {
-        "define-property": "^2.0.2",
-        "extend-shallow": "^3.0.2",
-        "regex-not": "^1.0.2",
-        "safe-regex": "^1.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/to-regex-range": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-      "dependencies": {
-        "is-number": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=8.0"
-      }
-    },
-    "node_modules/to-through": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/to-through/-/to-through-2.0.0.tgz",
-      "integrity": "sha1-/JKtq6ByZHvAtn1rA2ZKoZUJOvY=",
-      "dependencies": {
-        "through2": "^2.0.3"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/toposort": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/toposort/-/toposort-1.0.7.tgz",
-      "integrity": "sha1-LmhELZ9k7HILjMieZEOsbKqVACk="
-    },
-    "node_modules/tough-cookie": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz",
-      "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==",
-      "optional": true,
-      "dependencies": {
-        "psl": "^1.1.28",
-        "punycode": "^2.1.1"
-      },
-      "engines": {
-        "node": ">=0.8"
-      }
-    },
-    "node_modules/traverse": {
-      "version": "0.6.6",
-      "resolved": "https://registry.npmjs.org/traverse/-/traverse-0.6.6.tgz",
-      "integrity": "sha1-y99WD9e5r2MlAv7UD5GMFX6pcTc="
-    },
-    "node_modules/trim": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/trim/-/trim-0.0.1.tgz",
-      "integrity": "sha1-WFhUf2spB1fulczMZm+1AITEYN0=",
-      "dev": true
-    },
-    "node_modules/trim-newlines": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-3.0.0.tgz",
-      "integrity": "sha512-C4+gOpvmxaSMKuEf9Qc134F1ZuOHVXKRbtEflf4NTtuuJDEIJ9p5PXsalL8SkeRw+qit1Mo+yuvMPAKwWg/1hA==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/trim-trailing-lines": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/trim-trailing-lines/-/trim-trailing-lines-1.1.3.tgz",
-      "integrity": "sha512-4ku0mmjXifQcTVfYDfR5lpgV7zVqPg6zV9rdZmwOPqq0+Zq19xDqEgagqVbc4pOOShbncuAOIs59R3+3gcF3ZA==",
-      "dev": true,
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
-      }
-    },
-    "node_modules/trough": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/trough/-/trough-1.0.5.tgz",
-      "integrity": "sha512-rvuRbTarPXmMb79SmzEp8aqXNKcK+y0XaB298IXueQ8I2PsrATcPBCSPyK/dDNa2iWOhKlfNnOjdAOTBU/nkFA==",
-      "dev": true,
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
-      }
-    },
-    "node_modules/ts-loader": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/ts-loader/-/ts-loader-4.0.0.tgz",
-      "integrity": "sha512-iissbnuJkqbB3YAmnWyEbmdNcGcoiiXopKHKyqdoCrFQVi9pnplXeveQDXJnQOCYNNcb2pjT2zzSYTX6c9QtAA==",
-      "dev": true,
-      "dependencies": {
-        "chalk": "^2.3.0",
-        "enhanced-resolve": "^4.0.0",
-        "loader-utils": "^1.0.2",
-        "micromatch": "^3.1.4",
-        "semver": "^5.0.1"
-      },
-      "engines": {
-        "node": ">=6.11.5"
-      }
-    },
-    "node_modules/ts-loader/node_modules/braces": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-      "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-      "dev": true,
-      "dependencies": {
-        "arr-flatten": "^1.1.0",
-        "array-unique": "^0.3.2",
-        "extend-shallow": "^2.0.1",
-        "fill-range": "^4.0.0",
-        "isobject": "^3.0.1",
-        "repeat-element": "^1.1.2",
-        "snapdragon": "^0.8.1",
-        "snapdragon-node": "^2.0.1",
-        "split-string": "^3.0.2",
-        "to-regex": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/ts-loader/node_modules/braces/node_modules/extend-shallow": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-      "dev": true,
-      "dependencies": {
-        "is-extendable": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/ts-loader/node_modules/fill-range": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-      "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
-      "dev": true,
-      "dependencies": {
-        "extend-shallow": "^2.0.1",
-        "is-number": "^3.0.0",
-        "repeat-string": "^1.6.1",
-        "to-regex-range": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/ts-loader/node_modules/fill-range/node_modules/extend-shallow": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-      "dev": true,
-      "dependencies": {
-        "is-extendable": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/ts-loader/node_modules/is-number": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-      "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/ts-loader/node_modules/is-number/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-      "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/ts-loader/node_modules/isobject": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/ts-loader/node_modules/micromatch": {
-      "version": "3.1.10",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-      "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
-      "dev": true,
-      "dependencies": {
-        "arr-diff": "^4.0.0",
-        "array-unique": "^0.3.2",
-        "braces": "^2.3.1",
-        "define-property": "^2.0.2",
-        "extend-shallow": "^3.0.2",
-        "extglob": "^2.0.4",
-        "fragment-cache": "^0.2.1",
-        "kind-of": "^6.0.2",
-        "nanomatch": "^1.2.9",
-        "object.pick": "^1.3.0",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/ts-loader/node_modules/to-regex-range": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
-      "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
-      "dev": true,
-      "dependencies": {
-        "is-number": "^3.0.0",
-        "repeat-string": "^1.6.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/tslib": {
-      "version": "1.13.0",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz",
-      "integrity": "sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q=="
-    },
-    "node_modules/tty-browserify": {
-      "version": "0.0.0",
-      "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz",
-      "integrity": "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY="
-    },
-    "node_modules/tunnel-agent": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
-      "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
-      "optional": true,
-      "dependencies": {
-        "safe-buffer": "^5.0.1"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/tweetnacl": {
-      "version": "0.14.5",
-      "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
-      "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=",
-      "optional": true
-    },
-    "node_modules/type": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/type/-/type-1.2.0.tgz",
-      "integrity": "sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg=="
-    },
-    "node_modules/type-check": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
-      "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
-      "dev": true,
-      "dependencies": {
-        "prelude-ls": "~1.1.2"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/type-fest": {
-      "version": "0.8.1",
-      "resolved": "https://registry.npm.taobao.org/type-fest/download/type-fest-0.8.1.tgz",
-      "integrity": "sha1-CeJJ696FHTseSNJ8EFREZn8XuD0=",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/typedarray": {
-      "version": "0.0.6",
-      "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
-      "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c="
-    },
-    "node_modules/typedarray-to-buffer": {
-      "version": "3.1.5",
-      "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz",
-      "integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==",
-      "dev": true,
-      "dependencies": {
-        "is-typedarray": "^1.0.0"
-      }
-    },
-    "node_modules/typescript": {
-      "version": "4.5.5",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.5.5.tgz",
-      "integrity": "sha512-TCTIul70LyWe6IJWT8QSYeA54WQe8EjQFU4wY52Fasj5UKx88LNYKCgBEHcOMOrFF1rKGbD8v/xcNWVUq9SymA==",
-      "dev": true,
-      "bin": {
-        "tsc": "bin/tsc",
-        "tsserver": "bin/tsserver"
-      },
-      "engines": {
-        "node": ">=4.2.0"
-      }
-    },
-    "node_modules/ua-parser-js": {
-      "version": "0.7.21",
-      "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.21.tgz",
-      "integrity": "sha512-+O8/qh/Qj8CgC6eYBVBykMrNtp5Gebn4dlGD/kKXVkJNDwyrAwSIqwz8CDf+tsAIWVycKcku6gIXJ0qwx/ZXaQ==",
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/uglify-js": {
-      "version": "2.8.29",
-      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.29.tgz",
-      "integrity": "sha1-KcVzMUgFe7Th913zW3qcty5qWd0=",
-      "dependencies": {
-        "source-map": "~0.5.1",
-        "yargs": "~3.10.0"
-      },
-      "bin": {
-        "uglifyjs": "bin/uglifyjs"
-      },
-      "engines": {
-        "node": ">=0.8.0"
-      },
-      "optionalDependencies": {
-        "uglify-to-browserify": "~1.0.0"
-      }
-    },
-    "node_modules/uglify-js/node_modules/camelcase": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz",
-      "integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/uglify-js/node_modules/cliui": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz",
-      "integrity": "sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=",
-      "dependencies": {
-        "center-align": "^0.1.1",
-        "right-align": "^0.1.1",
-        "wordwrap": "0.0.2"
-      }
-    },
-    "node_modules/uglify-js/node_modules/yargs": {
-      "version": "3.10.0",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz",
-      "integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=",
-      "dependencies": {
-        "camelcase": "^1.0.2",
-        "cliui": "^2.1.0",
-        "decamelize": "^1.0.0",
-        "window-size": "0.1.0"
-      }
-    },
-    "node_modules/uglify-to-browserify": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz",
-      "integrity": "sha1-bgkk1r2mta/jSeOabWMoUKD4grc=",
-      "optional": true
-    },
-    "node_modules/unc-path-regex": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/unc-path-regex/-/unc-path-regex-0.1.2.tgz",
-      "integrity": "sha1-5z3T17DXxe2G+6xrCufYxqadUPo=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/undertaker": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/undertaker/-/undertaker-1.2.1.tgz",
-      "integrity": "sha512-71WxIzDkgYk9ZS+spIB8iZXchFhAdEo2YU8xYqBYJ39DIUIqziK78ftm26eecoIY49X0J2MLhG4hr18Yp6/CMA==",
-      "dependencies": {
-        "arr-flatten": "^1.0.1",
-        "arr-map": "^2.0.0",
-        "bach": "^1.0.0",
-        "collection-map": "^1.0.0",
-        "es6-weak-map": "^2.0.1",
-        "last-run": "^1.1.0",
-        "object.defaults": "^1.0.0",
-        "object.reduce": "^1.0.0",
-        "undertaker-registry": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/undertaker-registry": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/undertaker-registry/-/undertaker-registry-1.0.1.tgz",
-      "integrity": "sha1-XkvaMI5KiirlhPm5pDWaSZglzFA=",
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/unherit": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/unherit/-/unherit-1.1.3.tgz",
-      "integrity": "sha512-Ft16BJcnapDKp0+J/rqFC3Rrk6Y/Ng4nzsC028k2jdDII/rdZ7Wd3pPT/6+vIIxRagwRc9K0IUX0Ra4fKvw+WQ==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.0",
-        "xtend": "^4.0.0"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
-      }
-    },
-    "node_modules/unicode-canonical-property-names-ecmascript": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz",
-      "integrity": "sha512-jDrNnXWHd4oHiTZnx/ZG7gtUTVp+gCcTTKr8L0HjlwphROEW3+Him+IpvC+xcJEFegapiMZyZe02CyuOnRmbnQ==",
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/unicode-match-property-ecmascript": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-1.0.4.tgz",
-      "integrity": "sha512-L4Qoh15vTfntsn4P1zqnHulG0LdXgjSO035fEpdtp6YxXhMT51Q6vgM5lYdG/5X3MjS+k/Y9Xw4SFCY9IkR0rg==",
-      "dependencies": {
-        "unicode-canonical-property-names-ecmascript": "^1.0.4",
-        "unicode-property-aliases-ecmascript": "^1.0.4"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/unicode-match-property-value-ecmascript": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.2.0.tgz",
-      "integrity": "sha512-wjuQHGQVofmSJv1uVISKLE5zO2rNGzM/KCYZch/QQvez7C1hUhBIuZ701fYXExuufJFMPhv2SyL8CyoIfMLbIQ==",
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/unicode-property-aliases-ecmascript": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.1.0.tgz",
-      "integrity": "sha512-PqSoPh/pWetQ2phoj5RLiaqIk4kCNwoV3CI+LfGmWLKI3rE3kl1h59XpX2BjgDrmbxD9ARtQobPGU1SguCYuQg==",
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/unidecode": {
-      "version": "0.1.8",
-      "resolved": "https://registry.npmjs.org/unidecode/-/unidecode-0.1.8.tgz",
-      "integrity": "sha1-77swFTi8RSRqmsjFWdcvAVMFBT4=",
-      "engines": {
-        "node": ">= 0.4.12"
-      }
-    },
-    "node_modules/unified": {
-      "version": "9.0.0",
-      "resolved": "https://registry.npmjs.org/unified/-/unified-9.0.0.tgz",
-      "integrity": "sha512-ssFo33gljU3PdlWLjNp15Inqb77d6JnJSfyplGJPT/a+fNRNyCBeveBAYJdO5khKdF6WVHa/yYCC7Xl6BDwZUQ==",
-      "dev": true,
-      "dependencies": {
-        "bail": "^1.0.0",
-        "extend": "^3.0.0",
-        "is-buffer": "^2.0.0",
-        "is-plain-obj": "^2.0.0",
-        "trough": "^1.0.0",
-        "vfile": "^4.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      }
-    },
-    "node_modules/unified/node_modules/is-buffer": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.4.tgz",
-      "integrity": "sha512-Kq1rokWXOPXWuaMAqZiJW4XxsmD9zGx9q4aePabbn3qCRGedtH7Cm+zV8WETitMfu1wdh+Rvd6w5egwSngUX2A==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/unified/node_modules/is-plain-obj": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz",
-      "integrity": "sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/union-value": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz",
-      "integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==",
-      "dependencies": {
-        "arr-union": "^3.1.0",
-        "get-value": "^2.0.6",
-        "is-extendable": "^0.1.1",
-        "set-value": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/uniq": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/uniq/-/uniq-1.0.1.tgz",
-      "integrity": "sha1-sxxa6CVIRKOoKBVBzisEuGWnNP8="
-    },
-    "node_modules/uniqs": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/uniqs/-/uniqs-2.0.0.tgz",
-      "integrity": "sha1-/+3ks2slKQaW5uFl1KWe25mOawI="
-    },
-    "node_modules/unique-filename": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.1.tgz",
-      "integrity": "sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==",
-      "dependencies": {
-        "unique-slug": "^2.0.0"
-      }
-    },
-    "node_modules/unique-slug": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.2.tgz",
-      "integrity": "sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w==",
-      "dependencies": {
-        "imurmurhash": "^0.1.4"
-      }
-    },
-    "node_modules/unique-stream": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/unique-stream/-/unique-stream-2.3.1.tgz",
-      "integrity": "sha512-2nY4TnBE70yoxHkDli7DMazpWiP7xMdCYqU2nBRO0UB+ZpEkGsSija7MvmvnZFUeC+mrgiUfcHSr3LmRFIg4+A==",
-      "dependencies": {
-        "json-stable-stringify-without-jsonify": "^1.0.1",
-        "through2-filter": "^3.0.0"
-      }
-    },
-    "node_modules/unist-util-find-all-after": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/unist-util-find-all-after/-/unist-util-find-all-after-3.0.1.tgz",
-      "integrity": "sha512-0GICgc++sRJesLwEYDjFVJPJttBpVQaTNgc6Jw0Jhzvfs+jtKePEMu+uD+PqkRUrAvGQqwhpDwLGWo1PK8PDEw==",
-      "dev": true,
-      "dependencies": {
-        "unist-util-is": "^4.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      }
-    },
-    "node_modules/unist-util-is": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/unist-util-is/-/unist-util-is-4.0.2.tgz",
-      "integrity": "sha512-Ofx8uf6haexJwI1gxWMGg6I/dLnF2yE+KibhD3/diOqY2TinLcqHXCV6OI5gFVn3xQqDH+u0M625pfKwIwgBKQ==",
-      "dev": true,
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      }
-    },
-    "node_modules/unist-util-remove-position": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/unist-util-remove-position/-/unist-util-remove-position-2.0.1.tgz",
-      "integrity": "sha512-fDZsLYIe2uT+oGFnuZmy73K6ZxOPG/Qcm+w7jbEjaFcJgbQ6cqjs/eSPzXhsmGpAsWPkqZM9pYjww5QTn3LHMA==",
-      "dev": true,
-      "dependencies": {
-        "unist-util-visit": "^2.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      }
-    },
-    "node_modules/unist-util-stringify-position": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-2.0.3.tgz",
-      "integrity": "sha512-3faScn5I+hy9VleOq/qNbAd6pAx7iH5jYBMS9I1HgQVijz/4mv5Bvw5iw1sC/90CODiKo81G/ps8AJrISn687g==",
-      "dev": true,
-      "dependencies": {
-        "@types/unist": "^2.0.2"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      }
-    },
-    "node_modules/unist-util-visit": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-2.0.2.tgz",
-      "integrity": "sha512-HoHNhGnKj6y+Sq+7ASo2zpVdfdRifhTgX2KTU3B/sO/TTlZchp7E3S4vjRzDJ7L60KmrCPsQkVK3lEF3cz36XQ==",
-      "dev": true,
-      "dependencies": {
-        "@types/unist": "^2.0.0",
-        "unist-util-is": "^4.0.0",
-        "unist-util-visit-parents": "^3.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      }
-    },
-    "node_modules/unist-util-visit-parents": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/unist-util-visit-parents/-/unist-util-visit-parents-3.0.2.tgz",
-      "integrity": "sha512-yJEfuZtzFpQmg1OSCyS9M5NJRrln/9FbYosH3iW0MG402QbdbaB8ZESwUv9RO6nRfLAKvWcMxCwdLWOov36x/g==",
-      "dev": true,
-      "dependencies": {
-        "@types/unist": "^2.0.0",
-        "unist-util-is": "^4.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      }
-    },
-    "node_modules/universal-user-agent": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-4.0.1.tgz",
-      "integrity": "sha512-LnST3ebHwVL2aNe4mejI9IQh2HfZ1RLo8Io2HugSif8ekzD1TlWpHpColOB/eh8JHMLkGH3Akqf040I+4ylNxg==",
-      "dependencies": {
-        "os-name": "^3.1.0"
-      }
-    },
-    "node_modules/universalify": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npm.taobao.org/universalify/download/universalify-0.1.2.tgz?cache=0&sync_timestamp=1603179967633&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Funiversalify%2Fdownload%2Funiversalify-0.1.2.tgz",
-      "integrity": "sha1-tkb2m+OULavOzJ1mOcgNwQXvqmY=",
-      "engines": {
-        "node": ">= 4.0.0"
-      }
-    },
-    "node_modules/unquote": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/unquote/-/unquote-1.1.1.tgz",
-      "integrity": "sha1-j97XMk7G6IoP+LkF58CYzcCG1UQ="
-    },
-    "node_modules/unset-value": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz",
-      "integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=",
-      "dependencies": {
-        "has-value": "^0.3.1",
-        "isobject": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/unset-value/node_modules/has-value": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz",
-      "integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=",
-      "dependencies": {
-        "get-value": "^2.0.3",
-        "has-values": "^0.1.4",
-        "isobject": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/unset-value/node_modules/has-value/node_modules/isobject": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
-      "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=",
-      "dependencies": {
-        "isarray": "1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/unset-value/node_modules/has-values": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz",
-      "integrity": "sha1-bWHeldkd/Km5oCCJrThL/49it3E=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/unset-value/node_modules/isobject": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/upath": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/upath/-/upath-1.2.0.tgz",
-      "integrity": "sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==",
-      "engines": {
-        "node": ">=4",
-        "yarn": "*"
-      }
-    },
-    "node_modules/updates": {
-      "version": "10.2.11",
-      "resolved": "https://registry.npmjs.org/updates/-/updates-10.2.11.tgz",
-      "integrity": "sha512-xXWp3lqSuGEpS3PszJ2qP5hwvBF0E1GoYXwYrts1s/MehRdNirPeTUHc6nr0rkz9ZBnwNUkEW5pajQet9qtIaA==",
-      "dev": true,
-      "bin": {
-        "updates": "updates"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/upper-case": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/upper-case/-/upper-case-1.1.3.tgz",
-      "integrity": "sha1-9rRQHC7EzdJrp4vnIilh3ndiFZg="
-    },
-    "node_modules/uri-js": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz",
-      "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==",
-      "dependencies": {
-        "punycode": "^2.1.0"
-      }
-    },
-    "node_modules/urijs": {
-      "version": "1.19.6",
-      "resolved": "https://registry.npmjs.org/urijs/-/urijs-1.19.6.tgz",
-      "integrity": "sha512-eSXsXZ2jLvGWeLYlQA3Gh36BcjF+0amo92+wHPyN1mdR8Nxf75fuEuYTd9c0a+m/vhCjRK0ESlE9YNLW+E1VEw=="
-    },
-    "node_modules/urix": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz",
-      "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=",
-      "deprecated": "Please see https://github.com/lydell/urix#deprecated"
-    },
-    "node_modules/url": {
-      "version": "0.11.0",
-      "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz",
-      "integrity": "sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=",
-      "dependencies": {
-        "punycode": "1.3.2",
-        "querystring": "0.2.0"
-      }
-    },
-    "node_modules/url-parse": {
-      "version": "1.4.7",
-      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.4.7.tgz",
-      "integrity": "sha512-d3uaVyzDB9tQoSXFvuSUNFibTd9zxd2bkVrDRvF5TmvWWQwqE4lgYJ5m+x1DbecWkw+LK4RNl2CU1hHuOKPVlg==",
-      "dependencies": {
-        "querystringify": "^2.1.1",
-        "requires-port": "^1.0.0"
-      }
-    },
-    "node_modules/url-regex": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/url-regex/-/url-regex-3.2.0.tgz",
-      "integrity": "sha1-260eDJ4p4QXdCx8J9oYvf9tIJyQ=",
-      "dependencies": {
-        "ip-regex": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/url-slug": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/url-slug/-/url-slug-2.0.0.tgz",
-      "integrity": "sha1-p4nVrtSZXA2VrzM3etHVxo1NcCc=",
-      "dependencies": {
-        "unidecode": "0.1.8"
-      }
-    },
-    "node_modules/url/node_modules/punycode": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
-      "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0="
-    },
-    "node_modules/use": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz",
-      "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/util": {
-      "version": "0.11.1",
-      "resolved": "https://registry.npmjs.org/util/-/util-0.11.1.tgz",
-      "integrity": "sha512-HShAsny+zS2TZfaXxD9tYj4HQGlBezXZMZuM/S5PKLLoZkShZiGk9o5CzukI1LVHZvjdvZ2Sj1aW/Ndn2NB/HQ==",
-      "dependencies": {
-        "inherits": "2.0.3"
-      }
-    },
-    "node_modules/util-deprecate": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
-    },
-    "node_modules/util.promisify": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.1.tgz",
-      "integrity": "sha512-g9JpC/3He3bm38zsLupWryXHoEcS22YHthuPQSJdMy6KNrzIRzWqcsHzD/WUnqe45whVou4VIsPew37DoXWNrA==",
-      "dependencies": {
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.2",
-        "has-symbols": "^1.0.1",
-        "object.getownpropertydescriptors": "^2.1.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/util/node_modules/inherits": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
-    },
-    "node_modules/utila": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/utila/-/utila-0.4.0.tgz",
-      "integrity": "sha1-ihagXURWV6Oupe7MWxKk+lN5dyw="
-    },
-    "node_modules/uuid": {
-      "version": "3.4.0",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
-      "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
-      "deprecated": "Please upgrade  to version 7 or higher.  Older versions may use Math.random() in certain circumstances, which is known to be problematic.  See https://v8.dev/blog/math-random for details.",
-      "optional": true,
-      "bin": {
-        "uuid": "bin/uuid"
-      }
-    },
-    "node_modules/v-tooltip": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/v-tooltip/-/v-tooltip-2.0.3.tgz",
-      "integrity": "sha512-KZZY3s+dcijzZmV2qoDH4rYmjMZ9YKGBVoUznZKQX0e3c2GjpJm3Sldzz8HHH2Ud87JqhZPB4+4gyKZ6m98cKQ==",
-      "dependencies": {
-        "lodash": "^4.17.15",
-        "popper.js": "^1.16.0",
-        "vue-resize": "^0.4.5"
-      }
-    },
-    "node_modules/v8-compile-cache": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.0.3.tgz",
-      "integrity": "sha512-CNmdbwQMBjwr9Gsmohvm0pbL954tJrNzf6gWL3K+QMQf00PF7ERGrEiLgjuU3mKreLC2MeGhUsNV9ybTbLgd3w=="
-    },
-    "node_modules/v8flags": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/v8flags/-/v8flags-3.1.3.tgz",
-      "integrity": "sha512-amh9CCg3ZxkzQ48Mhcb8iX7xpAfYJgePHxWMQCBWECpOSqJUXgY26ncA61UTV0BkPqfhcy6mzwCIoP4ygxpW8w==",
-      "dependencies": {
-        "homedir-polyfill": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/validate-npm-package-license": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
-      "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
-      "dependencies": {
-        "spdx-correct": "^3.0.0",
-        "spdx-expression-parse": "^3.0.0"
-      }
-    },
-    "node_modules/value-or-function": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/value-or-function/-/value-or-function-3.0.0.tgz",
-      "integrity": "sha1-HCQ6ULWVwb5Up1S/7OhWO5/42BM=",
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/vendors": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/vendors/-/vendors-1.0.4.tgz",
-      "integrity": "sha512-/juG65kTL4Cy2su4P8HjtkTxk6VmJDiOPBufWniqQ6wknac6jNiXS9vU+hO3wgusiyqWlzTbVHi0dyJqRONg3w==",
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
-      }
-    },
-    "node_modules/verror": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
-      "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
-      "engines": [
-        "node >=0.6.0"
-      ],
-      "optional": true,
-      "dependencies": {
-        "assert-plus": "^1.0.0",
-        "core-util-is": "1.0.2",
-        "extsprintf": "^1.2.0"
-      }
-    },
-    "node_modules/vfile": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/vfile/-/vfile-4.1.0.tgz",
-      "integrity": "sha512-BaTPalregj++64xbGK6uIlsurN3BCRNM/P2Pg8HezlGzKd1O9PrwIac6bd9Pdx2uTb0QHoioZ+rXKolbVXEgJg==",
-      "dev": true,
-      "dependencies": {
-        "@types/unist": "^2.0.0",
-        "is-buffer": "^2.0.0",
-        "replace-ext": "1.0.0",
-        "unist-util-stringify-position": "^2.0.0",
-        "vfile-message": "^2.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      }
-    },
-    "node_modules/vfile-location": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/vfile-location/-/vfile-location-3.0.1.tgz",
-      "integrity": "sha512-yYBO06eeN/Ki6Kh1QAkgzYpWT1d3Qln+ZCtSbJqFExPl1S3y2qqotJQXoh6qEvl/jDlgpUJolBn3PItVnnZRqQ==",
-      "dev": true,
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      }
-    },
-    "node_modules/vfile-message": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/vfile-message/-/vfile-message-2.0.4.tgz",
-      "integrity": "sha512-DjssxRGkMvifUOJre00juHoP9DPWuzjxKuMDrhNbk2TdaYYBNMStsNhEOt3idrtI12VQYM/1+iM0KOzXi4pxwQ==",
-      "dev": true,
-      "dependencies": {
-        "@types/unist": "^2.0.0",
-        "unist-util-stringify-position": "^2.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      }
-    },
-    "node_modules/vfile/node_modules/is-buffer": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.4.tgz",
-      "integrity": "sha512-Kq1rokWXOPXWuaMAqZiJW4XxsmD9zGx9q4aePabbn3qCRGedtH7Cm+zV8WETitMfu1wdh+Rvd6w5egwSngUX2A==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/vfile/node_modules/replace-ext": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.0.tgz",
-      "integrity": "sha1-3mMSg3P8v3w8z6TeWkgMRaZ5WOs=",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/vinyl": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-2.2.0.tgz",
-      "integrity": "sha512-MBH+yP0kC/GQ5GwBqrTPTzEfiiLjta7hTtvQtbxBgTeSXsmKQRQecjibMbxIXzVT3Y9KJK+drOz1/k+vsu8Nkg==",
-      "dependencies": {
-        "clone": "^2.1.1",
-        "clone-buffer": "^1.0.0",
-        "clone-stats": "^1.0.0",
-        "cloneable-readable": "^1.0.0",
-        "remove-trailing-separator": "^1.0.1",
-        "replace-ext": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/vinyl-fs": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-3.0.3.tgz",
-      "integrity": "sha512-vIu34EkyNyJxmP0jscNzWBSygh7VWhqun6RmqVfXePrOwi9lhvRs//dOaGOTRUQr4tx7/zd26Tk5WeSVZitgng==",
-      "dependencies": {
-        "fs-mkdirp-stream": "^1.0.0",
-        "glob-stream": "^6.1.0",
-        "graceful-fs": "^4.0.0",
-        "is-valid-glob": "^1.0.0",
-        "lazystream": "^1.0.0",
-        "lead": "^1.0.0",
-        "object.assign": "^4.0.4",
-        "pumpify": "^1.3.5",
-        "readable-stream": "^2.3.3",
-        "remove-bom-buffer": "^3.0.0",
-        "remove-bom-stream": "^1.2.0",
-        "resolve-options": "^1.1.0",
-        "through2": "^2.0.0",
-        "to-through": "^2.0.0",
-        "value-or-function": "^3.0.0",
-        "vinyl": "^2.0.0",
-        "vinyl-sourcemap": "^1.1.0"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/vinyl-sourcemap": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/vinyl-sourcemap/-/vinyl-sourcemap-1.1.0.tgz",
-      "integrity": "sha1-kqgAWTo4cDqM2xHYswCtS+Y7PhY=",
-      "dependencies": {
-        "append-buffer": "^1.0.2",
-        "convert-source-map": "^1.5.0",
-        "graceful-fs": "^4.1.6",
-        "normalize-path": "^2.1.1",
-        "now-and-later": "^2.0.0",
-        "remove-bom-buffer": "^3.0.0",
-        "vinyl": "^2.0.0"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/vinyl-sourcemap/node_modules/normalize-path": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
-      "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
-      "dependencies": {
-        "remove-trailing-separator": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/vinyl-sourcemaps-apply": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/vinyl-sourcemaps-apply/-/vinyl-sourcemaps-apply-0.2.1.tgz",
-      "integrity": "sha1-q2VJ1h0XLCsbh75cUI0jnI74dwU=",
-      "dependencies": {
-        "source-map": "^0.5.1"
-      }
-    },
-    "node_modules/vm-browserify": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.2.tgz",
-      "integrity": "sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ=="
-    },
-    "node_modules/vue": {
-      "version": "2.6.11",
-      "resolved": "https://registry.npmjs.org/vue/-/vue-2.6.11.tgz",
-      "integrity": "sha512-VfPwgcGABbGAue9+sfrD4PuwFar7gPb1yl1UK1MwXoQPAw0BKSqWfoYCT/ThFrdEVWoI51dBuyCoiNU9bZDZxQ=="
-    },
-    "node_modules/vue-bar-graph": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/vue-bar-graph/-/vue-bar-graph-1.2.0.tgz",
-      "integrity": "sha512-vqe2KZPlm0JpKMxDlgTwGDYnLvN32dSLrGm4EC2ivuiZ2FJ8T8/mqi67XEeM0zkFKi9jmp7U09zKCYkg1ag+WQ==",
-      "dependencies": {
-        "core-js": "^3.6.1",
-        "gsap": "^3.0.4",
-        "vue": "^2.6.11"
-      }
-    },
-    "node_modules/vue-calendar-heatmap": {
-      "version": "0.8.4",
-      "resolved": "https://registry.npmjs.org/vue-calendar-heatmap/-/vue-calendar-heatmap-0.8.4.tgz",
-      "integrity": "sha512-Hx7OYBY1ghUIxKmFIIzpLT4XlcrwnI3WpadJEj/sKj5quoxwEuSDKmf94v0zWOHeQ/2CrB1G66geaKR/O56+OQ==",
-      "dependencies": {
-        "v-tooltip": "^2.0.0-rc.32"
-      }
-    },
-    "node_modules/vue-eslint-parser": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npm.taobao.org/vue-eslint-parser/download/vue-eslint-parser-7.1.0.tgz?cache=0&sync_timestamp=1589684321779&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fvue-eslint-parser%2Fdownload%2Fvue-eslint-parser-7.1.0.tgz",
-      "integrity": "sha1-nNvMgj5lawh1B6GRFzK4Z6wQHoM=",
-      "dev": true,
-      "dependencies": {
-        "debug": "^4.1.1",
-        "eslint-scope": "^5.0.0",
-        "eslint-visitor-keys": "^1.1.0",
-        "espree": "^6.2.1",
-        "esquery": "^1.0.1",
-        "lodash": "^4.17.15"
-      },
-      "engines": {
-        "node": ">=8.10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/mysticatea"
-      },
-      "peerDependencies": {
-        "eslint": ">=5.0.0"
-      }
-    },
-    "node_modules/vue-eslint-parser/node_modules/eslint-scope": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npm.taobao.org/eslint-scope/download/eslint-scope-5.1.0.tgz?cache=0&sync_timestamp=1591269986906&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Feslint-scope%2Fdownload%2Feslint-scope-5.1.0.tgz",
-      "integrity": "sha1-0Plx3+WcaeDK2mhLI9Sdv4JgDOU=",
-      "dev": true,
-      "dependencies": {
-        "esrecurse": "^4.1.0",
-        "estraverse": "^4.1.1"
-      },
-      "engines": {
-        "node": ">=8.0.0"
-      }
-    },
-    "node_modules/vue-hot-reload-api": {
-      "version": "2.3.4",
-      "resolved": "https://registry.npmjs.org/vue-hot-reload-api/-/vue-hot-reload-api-2.3.4.tgz",
-      "integrity": "sha512-BXq3jwIagosjgNVae6tkHzzIk6a8MHFtzAdwhnV5VlvPTFxDCvIttgSiHWjdGoTJvXtmRu5HacExfdarRcFhog=="
-    },
-    "node_modules/vue-i18n": {
-      "version": "6.1.3",
-      "resolved": "https://registry.npmjs.org/vue-i18n/-/vue-i18n-6.1.3.tgz",
-      "integrity": "sha512-rfqrU0M28dmzSbdPb1GvGj0xKHZ57tlwwlpIAOibzoZFT6prjXdfQi9jZbbIq1MVuNDCrvVLVD+S/67S/0UxKw=="
-    },
-    "node_modules/vue-loader": {
-      "version": "15.9.2",
-      "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-15.9.2.tgz",
-      "integrity": "sha512-oXBubaY//CYEISBlHX+c2YPJbmOH68xXPXjFv4MAgPqQvUsnjrBAjCJi8HXZ/r/yfn0tPL5VZj1Zcp8mJPI8VA==",
-      "dependencies": {
-        "@vue/component-compiler-utils": "^3.1.0",
-        "hash-sum": "^1.0.2",
-        "loader-utils": "^1.1.0",
-        "vue-hot-reload-api": "^2.3.0",
-        "vue-style-loader": "^4.1.0"
-      },
-      "peerDependencies": {
-        "css-loader": "*",
-        "webpack": "^3.0.0 || ^4.1.0 || ^5.0.0-0"
-      },
-      "peerDependenciesMeta": {
-        "cache-loader": {
-          "optional": true
-        },
-        "vue-template-compiler": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/vue-resize": {
-      "version": "0.4.5",
-      "resolved": "https://registry.npmjs.org/vue-resize/-/vue-resize-0.4.5.tgz",
-      "integrity": "sha512-bhP7MlgJQ8TIkZJXAfDf78uJO+mEI3CaLABLjv0WNzr4CcGRGPIAItyWYnP6LsPA4Oq0WE+suidNs6dgpO4RHg==",
-      "peerDependencies": {
-        "vue": "^2.3.0"
-      }
-    },
-    "node_modules/vue-router": {
-      "version": "3.3.4",
-      "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-3.3.4.tgz",
-      "integrity": "sha512-SdKRBeoXUjaZ9R/8AyxsdTqkOfMcI5tWxPZOUX5Ie1BTL5rPSZ0O++pbiZCeYeythiZIdLEfkDiQPKIaWk5hDg=="
-    },
-    "node_modules/vue-style-loader": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/vue-style-loader/-/vue-style-loader-4.1.2.tgz",
-      "integrity": "sha512-0ip8ge6Gzz/Bk0iHovU9XAUQaFt/G2B61bnWa2tCcqqdgfHs1lF9xXorFbE55Gmy92okFT+8bfmySuUOu13vxQ==",
-      "dependencies": {
-        "hash-sum": "^1.0.2",
-        "loader-utils": "^1.0.2"
-      }
-    },
-    "node_modules/vue-template-compiler": {
-      "version": "2.6.11",
-      "resolved": "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.6.11.tgz",
-      "integrity": "sha512-KIq15bvQDrcCjpGjrAhx4mUlyyHfdmTaoNfeoATHLAiWB+MU3cx4lOzMwrnUh9cCxy0Lt1T11hAFY6TQgroUAA==",
-      "dependencies": {
-        "de-indent": "^1.0.2",
-        "he": "^1.1.0"
-      }
-    },
-    "node_modules/vue-template-es2015-compiler": {
-      "version": "1.9.1",
-      "resolved": "https://registry.npmjs.org/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.9.1.tgz",
-      "integrity": "sha512-4gDntzrifFnCEvyoO8PqyJDmguXgVPxKiIxrBKjIowvL9l+N66196+72XVYR8BBf1Uv1Fgt3bGevJ+sEmxfZzw=="
-    },
-    "node_modules/watchpack": {
-      "version": "1.6.1",
-      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.6.1.tgz",
-      "integrity": "sha512-+IF9hfUFOrYOOaKyfaI7h7dquUIOgyEMoQMLA7OP5FxegKA2+XdXThAZ9TU2kucfhDH7rfMHs1oPYziVGWRnZA==",
-      "dependencies": {
-        "chokidar": "^2.1.8",
-        "graceful-fs": "^4.1.2",
-        "neo-async": "^2.5.0"
-      }
-    },
-    "node_modules/webpack": {
-      "version": "4.43.0",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.43.0.tgz",
-      "integrity": "sha512-GW1LjnPipFW2Y78OOab8NJlCflB7EFskMih2AHdvjbpKMeDJqEgSx24cXXXiPS65+WSwVyxtDsJH6jGX2czy+g==",
-      "dependencies": {
-        "@webassemblyjs/ast": "1.9.0",
-        "@webassemblyjs/helper-module-context": "1.9.0",
-        "@webassemblyjs/wasm-edit": "1.9.0",
-        "@webassemblyjs/wasm-parser": "1.9.0",
-        "acorn": "^6.4.1",
-        "ajv": "^6.10.2",
-        "ajv-keywords": "^3.4.1",
-        "chrome-trace-event": "^1.0.2",
-        "enhanced-resolve": "^4.1.0",
-        "eslint-scope": "^4.0.3",
-        "json-parse-better-errors": "^1.0.2",
-        "loader-runner": "^2.4.0",
-        "loader-utils": "^1.2.3",
-        "memory-fs": "^0.4.1",
-        "micromatch": "^3.1.10",
-        "mkdirp": "^0.5.3",
-        "neo-async": "^2.6.1",
-        "node-libs-browser": "^2.2.1",
-        "schema-utils": "^1.0.0",
-        "tapable": "^1.1.3",
-        "terser-webpack-plugin": "^1.4.3",
-        "watchpack": "^1.6.1",
-        "webpack-sources": "^1.4.1"
-      },
-      "bin": {
-        "webpack": "bin/webpack.js"
-      },
-      "engines": {
-        "node": ">=6.11.5"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      }
-    },
-    "node_modules/webpack-cli": {
-      "version": "3.3.11",
-      "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-3.3.11.tgz",
-      "integrity": "sha512-dXlfuml7xvAFwYUPsrtQAA9e4DOe58gnzSxhgrO/ZM/gyXTBowrsYeubyN4mqGhYdpXMFNyQ6emjJS9M7OBd4g==",
-      "dependencies": {
-        "chalk": "2.4.2",
-        "cross-spawn": "6.0.5",
-        "enhanced-resolve": "4.1.0",
-        "findup-sync": "3.0.0",
-        "global-modules": "2.0.0",
-        "import-local": "2.0.0",
-        "interpret": "1.2.0",
-        "loader-utils": "1.2.3",
-        "supports-color": "6.1.0",
-        "v8-compile-cache": "2.0.3",
-        "yargs": "13.2.4"
-      },
-      "bin": {
-        "webpack-cli": "bin/cli.js"
-      },
-      "engines": {
-        "node": ">=6.11.5"
-      },
-      "peerDependencies": {
-        "webpack": "4.x.x"
-      }
-    },
-    "node_modules/webpack-cli/node_modules/ansi-regex": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
-      "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/webpack-cli/node_modules/cliui": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",
-      "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==",
-      "dependencies": {
-        "string-width": "^3.1.0",
-        "strip-ansi": "^5.2.0",
-        "wrap-ansi": "^5.1.0"
-      }
-    },
-    "node_modules/webpack-cli/node_modules/emojis-list": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-2.1.0.tgz",
-      "integrity": "sha1-TapNnbAPmBmIDHn6RXrlsJof04k=",
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/webpack-cli/node_modules/enhanced-resolve": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-4.1.0.tgz",
-      "integrity": "sha512-F/7vkyTtyc/llOIn8oWclcB25KdRaiPBpZYDgJHgh/UHtpgT2p2eldQgtQnLtUvfMKPKxbRaQM/hHkvLHt1Vng==",
-      "dependencies": {
-        "graceful-fs": "^4.1.2",
-        "memory-fs": "^0.4.0",
-        "tapable": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/webpack-cli/node_modules/find-up": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
-      "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
-      "dependencies": {
-        "locate-path": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/webpack-cli/node_modules/get-caller-file": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
-      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
-      "engines": {
-        "node": "6.* || 8.* || >= 10.*"
-      }
-    },
-    "node_modules/webpack-cli/node_modules/global-modules": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-2.0.0.tgz",
-      "integrity": "sha512-NGbfmJBp9x8IxyJSd1P+otYK8vonoJactOogrVfFRIAEY1ukil8RSKDz2Yo7wh1oihl51l/r6W4epkeKJHqL8A==",
-      "dependencies": {
-        "global-prefix": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/webpack-cli/node_modules/global-prefix": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-3.0.0.tgz",
-      "integrity": "sha512-awConJSVCHVGND6x3tmMaKcQvwXLhjdkmomy2W+Goaui8YPgYgXJZewhg3fWC+DlfqqQuWg8AwqjGTD2nAPVWg==",
-      "dependencies": {
-        "ini": "^1.3.5",
-        "kind-of": "^6.0.2",
-        "which": "^1.3.1"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/webpack-cli/node_modules/invert-kv": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-2.0.0.tgz",
-      "integrity": "sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA==",
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/webpack-cli/node_modules/is-fullwidth-code-point": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-      "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/webpack-cli/node_modules/json5": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
-      "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
-      "dependencies": {
-        "minimist": "^1.2.0"
-      },
-      "bin": {
-        "json5": "lib/cli.js"
-      }
-    },
-    "node_modules/webpack-cli/node_modules/lcid": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/lcid/-/lcid-2.0.0.tgz",
-      "integrity": "sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==",
-      "dependencies": {
-        "invert-kv": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/webpack-cli/node_modules/loader-utils": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.2.3.tgz",
-      "integrity": "sha512-fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA==",
-      "dependencies": {
-        "big.js": "^5.2.2",
-        "emojis-list": "^2.0.0",
-        "json5": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=4.0.0"
-      }
-    },
-    "node_modules/webpack-cli/node_modules/locate-path": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
-      "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
-      "dependencies": {
-        "p-locate": "^3.0.0",
-        "path-exists": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/webpack-cli/node_modules/os-locale": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-3.1.0.tgz",
-      "integrity": "sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==",
-      "dependencies": {
-        "execa": "^1.0.0",
-        "lcid": "^2.0.0",
-        "mem": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/webpack-cli/node_modules/p-limit": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-      "dependencies": {
-        "p-try": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/webpack-cli/node_modules/p-locate": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
-      "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
-      "dependencies": {
-        "p-limit": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/webpack-cli/node_modules/p-try": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/webpack-cli/node_modules/require-main-filename": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
-      "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg=="
-    },
-    "node_modules/webpack-cli/node_modules/string-width": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
-      "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
-      "dependencies": {
-        "emoji-regex": "^7.0.1",
-        "is-fullwidth-code-point": "^2.0.0",
-        "strip-ansi": "^5.1.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/webpack-cli/node_modules/strip-ansi": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-      "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
-      "dependencies": {
-        "ansi-regex": "^4.1.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/webpack-cli/node_modules/supports-color": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
-      "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
-      "dependencies": {
-        "has-flag": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/webpack-cli/node_modules/which-module": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
-      "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho="
-    },
-    "node_modules/webpack-cli/node_modules/wrap-ansi": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz",
-      "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==",
-      "dependencies": {
-        "ansi-styles": "^3.2.0",
-        "string-width": "^3.0.0",
-        "strip-ansi": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/webpack-cli/node_modules/y18n": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz",
-      "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w=="
-    },
-    "node_modules/webpack-cli/node_modules/yargs": {
-      "version": "13.2.4",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.2.4.tgz",
-      "integrity": "sha512-HG/DWAJa1PAnHT9JAhNa8AbAv3FPaiLzioSjCcmuXXhP8MlpHO5vwls4g4j6n30Z74GVQj8Xa62dWVx1QCGklg==",
-      "dependencies": {
-        "cliui": "^5.0.0",
-        "find-up": "^3.0.0",
-        "get-caller-file": "^2.0.1",
-        "os-locale": "^3.1.0",
-        "require-directory": "^2.1.1",
-        "require-main-filename": "^2.0.0",
-        "set-blocking": "^2.0.0",
-        "string-width": "^3.0.0",
-        "which-module": "^2.0.0",
-        "y18n": "^4.0.0",
-        "yargs-parser": "^13.1.0"
-      }
-    },
-    "node_modules/webpack-cli/node_modules/yargs-parser": {
-      "version": "13.1.2",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz",
-      "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==",
-      "dependencies": {
-        "camelcase": "^5.0.0",
-        "decamelize": "^1.2.0"
-      }
-    },
-    "node_modules/webpack-fix-style-only-entries": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/webpack-fix-style-only-entries/-/webpack-fix-style-only-entries-0.4.0.tgz",
-      "integrity": "sha512-6TDa56V/xSOw6CBVlhFm6J+xXY2oJzx7CEgH0dmex2Xe1rwb95KkLl3rXvSNpO4wyahwD3YnYqffDNR0LH1BNQ=="
-    },
-    "node_modules/webpack-sources": {
-      "version": "1.4.3",
-      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz",
-      "integrity": "sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==",
-      "dependencies": {
-        "source-list-map": "^2.0.0",
-        "source-map": "~0.6.1"
-      }
-    },
-    "node_modules/webpack-sources/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/webpack/node_modules/braces": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-      "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-      "dependencies": {
-        "arr-flatten": "^1.1.0",
-        "array-unique": "^0.3.2",
-        "extend-shallow": "^2.0.1",
-        "fill-range": "^4.0.0",
-        "isobject": "^3.0.1",
-        "repeat-element": "^1.1.2",
-        "snapdragon": "^0.8.1",
-        "snapdragon-node": "^2.0.1",
-        "split-string": "^3.0.2",
-        "to-regex": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/webpack/node_modules/braces/node_modules/extend-shallow": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-      "dependencies": {
-        "is-extendable": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/webpack/node_modules/cacache": {
-      "version": "12.0.4",
-      "resolved": "https://registry.npmjs.org/cacache/-/cacache-12.0.4.tgz",
-      "integrity": "sha512-a0tMB40oefvuInr4Cwb3GerbL9xTj1D5yg0T5xrjGCGyfvbxseIXX7BAO/u/hIXdafzOI5JC3wDwHyf24buOAQ==",
-      "dependencies": {
-        "bluebird": "^3.5.5",
-        "chownr": "^1.1.1",
-        "figgy-pudding": "^3.5.1",
-        "glob": "^7.1.4",
-        "graceful-fs": "^4.1.15",
-        "infer-owner": "^1.0.3",
-        "lru-cache": "^5.1.1",
-        "mississippi": "^3.0.0",
-        "mkdirp": "^0.5.1",
-        "move-concurrently": "^1.0.1",
-        "promise-inflight": "^1.0.1",
-        "rimraf": "^2.6.3",
-        "ssri": "^6.0.1",
-        "unique-filename": "^1.1.1",
-        "y18n": "^4.0.0"
-      }
-    },
-    "node_modules/webpack/node_modules/cacache/node_modules/figgy-pudding": {
-      "version": "3.5.2",
-      "resolved": "https://registry.npmjs.org/figgy-pudding/-/figgy-pudding-3.5.2.tgz",
-      "integrity": "sha512-0btnI/H8f2pavGMN8w40mlSKOfTK2SVJmBfBeVIj3kNw0swwgzyRq0d5TJVOwodFmtvpPeWPN/MCcfuWF0Ezbw=="
-    },
-    "node_modules/webpack/node_modules/cacache/node_modules/mississippi": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/mississippi/-/mississippi-3.0.0.tgz",
-      "integrity": "sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==",
-      "dependencies": {
-        "concat-stream": "^1.5.0",
-        "duplexify": "^3.4.2",
-        "end-of-stream": "^1.1.0",
-        "flush-write-stream": "^1.0.0",
-        "from2": "^2.1.0",
-        "parallel-transform": "^1.1.0",
-        "pump": "^3.0.0",
-        "pumpify": "^1.3.3",
-        "stream-each": "^1.1.0",
-        "through2": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=4.0.0"
-      }
-    },
-    "node_modules/webpack/node_modules/cacache/node_modules/move-concurrently": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz",
-      "integrity": "sha1-viwAX9oy4LKa8fBdfEszIUxwH5I=",
-      "dependencies": {
-        "aproba": "^1.1.1",
-        "copy-concurrently": "^1.0.0",
-        "fs-write-stream-atomic": "^1.0.8",
-        "mkdirp": "^0.5.1",
-        "rimraf": "^2.5.4",
-        "run-queue": "^1.0.3"
-      }
-    },
-    "node_modules/webpack/node_modules/chownr": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
-      "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg=="
-    },
-    "node_modules/webpack/node_modules/fill-range": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-      "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
-      "dependencies": {
-        "extend-shallow": "^2.0.1",
-        "is-number": "^3.0.0",
-        "repeat-string": "^1.6.1",
-        "to-regex-range": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/webpack/node_modules/fill-range/node_modules/extend-shallow": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-      "dependencies": {
-        "is-extendable": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/webpack/node_modules/is-number": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-      "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/webpack/node_modules/is-number/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/webpack/node_modules/isobject": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/webpack/node_modules/lru-cache": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
-      "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
-      "dependencies": {
-        "yallist": "^3.0.2"
-      }
-    },
-    "node_modules/webpack/node_modules/micromatch": {
-      "version": "3.1.10",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-      "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
-      "dependencies": {
-        "arr-diff": "^4.0.0",
-        "array-unique": "^0.3.2",
-        "braces": "^2.3.1",
-        "define-property": "^2.0.2",
-        "extend-shallow": "^3.0.2",
-        "extglob": "^2.0.4",
-        "fragment-cache": "^0.2.1",
-        "kind-of": "^6.0.2",
-        "nanomatch": "^1.2.9",
-        "object.pick": "^1.3.0",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/webpack/node_modules/schema-utils": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
-      "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
-      "dependencies": {
-        "ajv": "^6.1.0",
-        "ajv-errors": "^1.0.0",
-        "ajv-keywords": "^3.1.0"
-      },
-      "engines": {
-        "node": ">= 4"
-      }
-    },
-    "node_modules/webpack/node_modules/serialize-javascript": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-4.0.0.tgz",
-      "integrity": "sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw==",
-      "dependencies": {
-        "randombytes": "^2.1.0"
-      }
-    },
-    "node_modules/webpack/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/webpack/node_modules/ssri": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz",
-      "integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==",
-      "dependencies": {
-        "figgy-pudding": "^3.5.1"
-      }
-    },
-    "node_modules/webpack/node_modules/ssri/node_modules/figgy-pudding": {
-      "version": "3.5.2",
-      "resolved": "https://registry.npmjs.org/figgy-pudding/-/figgy-pudding-3.5.2.tgz",
-      "integrity": "sha512-0btnI/H8f2pavGMN8w40mlSKOfTK2SVJmBfBeVIj3kNw0swwgzyRq0d5TJVOwodFmtvpPeWPN/MCcfuWF0Ezbw=="
-    },
-    "node_modules/webpack/node_modules/terser-webpack-plugin": {
-      "version": "1.4.5",
-      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.4.5.tgz",
-      "integrity": "sha512-04Rfe496lN8EYruwi6oPQkG0vo8C+HT49X687FZnpPF0qMAIHONI6HEXYPKDOE8e5HjXTyKfqRd/agHtH0kOtw==",
-      "dependencies": {
-        "cacache": "^12.0.2",
-        "find-cache-dir": "^2.1.0",
-        "is-wsl": "^1.1.0",
-        "schema-utils": "^1.0.0",
-        "serialize-javascript": "^4.0.0",
-        "source-map": "^0.6.1",
-        "terser": "^4.1.2",
-        "webpack-sources": "^1.4.0",
-        "worker-farm": "^1.7.0"
-      },
-      "engines": {
-        "node": ">= 6.9.0"
-      },
-      "peerDependencies": {
-        "webpack": "^4.0.0"
-      }
-    },
-    "node_modules/webpack/node_modules/terser-webpack-plugin/node_modules/worker-farm": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/worker-farm/-/worker-farm-1.7.0.tgz",
-      "integrity": "sha512-rvw3QTZc8lAxyVrqcSGVm5yP/IJ2UcB3U0graE3LCFoZ0Yn2x4EoVSqJKdB/T5M+FLcRPjz4TDacRf3OCfNUzw==",
-      "dependencies": {
-        "errno": "~0.1.7"
-      }
-    },
-    "node_modules/webpack/node_modules/to-regex-range": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
-      "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
-      "dependencies": {
-        "is-number": "^3.0.0",
-        "repeat-string": "^1.6.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/webpack/node_modules/y18n": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.1.tgz",
-      "integrity": "sha512-wNcy4NvjMYL8gogWWYAO7ZFWFfHcbdbE57tZO8e4cbpj8tfUcwrwqSl3ad8HxpYWCdXcJUCeKKZS62Av1affwQ=="
-    },
-    "node_modules/webpack/node_modules/yallist": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
-      "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g=="
-    },
-    "node_modules/whatwg-fetch": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.0.0.tgz",
-      "integrity": "sha512-9GSJUgz1D4MfyKU7KRqwOjXCXTqWdFNvEr7eUBYchQiVc744mqK/MzXPNR2WsPkmkOa4ywfg8C2n8h+13Bey1Q=="
-    },
-    "node_modules/when": {
-      "version": "3.7.8",
-      "resolved": "https://registry.npmjs.org/when/-/when-3.7.8.tgz",
-      "integrity": "sha1-xxMLan6gRpPoQs3J56Hyqjmjn4I="
-    },
-    "node_modules/which": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
-      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
-      "dependencies": {
-        "isexe": "^2.0.0"
-      },
-      "bin": {
-        "which": "bin/which"
-      }
-    },
-    "node_modules/which-module": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz",
-      "integrity": "sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8="
-    },
-    "node_modules/window-size": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz",
-      "integrity": "sha1-VDjNLqk7IC76Ohn+iIeu58lPnJ0=",
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/windows-release": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/windows-release/-/windows-release-3.3.0.tgz",
-      "integrity": "sha512-2HetyTg1Y+R+rUgrKeUEhAG/ZuOmTrI1NBb3ZyAGQMYmOJjBBPe4MTodghRkmLJZHwkuPi02anbeGP+Zf401LQ==",
-      "dependencies": {
-        "execa": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/wmf": {
-      "version": "1.0.2",
-      "resolved": "https://registry.nlark.com/wmf/download/wmf-1.0.2.tgz",
-      "integrity": "sha1-fRnWIQcaCMK9xrfmiKnENSmMwto=",
-      "engines": {
-        "node": ">=0.8"
-      }
-    },
-    "node_modules/word": {
-      "version": "0.3.0",
-      "resolved": "https://registry.nlark.com/word/download/word-0.3.0.tgz",
-      "integrity": "sha1-hUIVfk+OhJ9KNjooiZLUdhLbmWE=",
-      "engines": {
-        "node": ">=0.8"
-      }
-    },
-    "node_modules/word-wrap": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npm.taobao.org/word-wrap/download/word-wrap-1.2.3.tgz?cache=0&sync_timestamp=1589683603678&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fword-wrap%2Fdownload%2Fword-wrap-1.2.3.tgz",
-      "integrity": "sha1-YQY29rH3A4kb00dxzLF/uTtHB5w=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/wordwrap": {
-      "version": "0.0.2",
-      "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz",
-      "integrity": "sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8=",
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/worker-loader": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/worker-loader/-/worker-loader-2.0.0.tgz",
-      "integrity": "sha512-tnvNp4K3KQOpfRnD20m8xltE3eWh89Ye+5oj7wXEEHKac1P4oZ6p9oTj8/8ExqoSBnk9nu5Pr4nKfQ1hn2APJw==",
-      "dependencies": {
-        "loader-utils": "^1.0.0",
-        "schema-utils": "^0.4.0"
-      },
-      "engines": {
-        "node": ">= 6.9.0 || >= 8.9.0"
-      },
-      "peerDependencies": {
-        "webpack": "^3.0.0 || ^4.0.0-alpha.0 || ^4.0.0"
-      }
-    },
-    "node_modules/worker-loader/node_modules/schema-utils": {
-      "version": "0.4.7",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-0.4.7.tgz",
-      "integrity": "sha512-v/iwU6wvwGK8HbU9yi3/nhGzP0yGSuhQMzL6ySiec1FSrZZDkhm4noOSWzrNFo/jEc+SJY6jRTwuwbSXJPDUnQ==",
-      "dependencies": {
-        "ajv": "^6.1.0",
-        "ajv-keywords": "^3.1.0"
-      },
-      "engines": {
-        "node": ">= 4"
-      }
-    },
-    "node_modules/wrap-ansi": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
-      "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=",
-      "dependencies": {
-        "string-width": "^1.0.1",
-        "strip-ansi": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/wrappy": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
-    },
-    "node_modules/wrench-sui": {
-      "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/wrench-sui/-/wrench-sui-0.0.3.tgz",
-      "integrity": "sha1-1hoSAwwf2NZxs90VqmyeD83E4sg=",
-      "engines": {
-        "node": ">=0.1.97"
-      }
-    },
-    "node_modules/write": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/write/-/write-1.0.3.tgz",
-      "integrity": "sha512-/lg70HAjtkUgWPVZhZcm+T4hkL8Zbtp1nFNOn3lRrxnlv50SRBv7cR7RqR+GMsd3hUXy9hWBo4CHTbFTcOYwig==",
-      "dev": true,
-      "dependencies": {
-        "mkdirp": "^0.5.1"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/write-file-atomic": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz",
-      "integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==",
-      "dev": true,
-      "dependencies": {
-        "imurmurhash": "^0.1.4",
-        "is-typedarray": "^1.0.0",
-        "signal-exit": "^3.0.2",
-        "typedarray-to-buffer": "^3.1.5"
-      }
-    },
-    "node_modules/xlsx": {
-      "version": "0.17.3",
-      "resolved": "https://registry.npmmirror.com/xlsx/download/xlsx-0.17.3.tgz?cache=0&sync_timestamp=1634109868571&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fxlsx%2Fdownload%2Fxlsx-0.17.3.tgz",
-      "integrity": "sha1-HC3Tb/HOyw6995uk8mjpRdAHCEk=",
-      "dependencies": {
-        "adler-32": "~1.2.0",
-        "cfb": "^1.1.4",
-        "codepage": "~1.15.0",
-        "commander": "~2.17.1",
-        "crc-32": "~1.2.0",
-        "exit-on-epipe": "~1.0.1",
-        "fflate": "^0.7.1",
-        "ssf": "~0.11.2",
-        "wmf": "~1.0.1",
-        "word": "~0.3.0"
-      },
-      "bin": {
-        "xlsx": "bin/xlsx.njs"
-      },
-      "engines": {
-        "node": ">=0.8"
-      }
-    },
-    "node_modules/xlsx/node_modules/commander": {
-      "version": "2.17.1",
-      "resolved": "https://registry.npmmirror.com/commander/download/commander-2.17.1.tgz?cache=0&sync_timestamp=1634886396986&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fcommander%2Fdownload%2Fcommander-2.17.1.tgz",
-      "integrity": "sha1-vXerfebelCBc6sxy8XFtKfIKd78="
-    },
-    "node_modules/xml-but-prettier": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/xml-but-prettier/-/xml-but-prettier-1.0.1.tgz",
-      "integrity": "sha1-9aMyZ+1CzNTjVcYlV6XjmwH7QPM=",
-      "dependencies": {
-        "repeat-string": "^1.5.2"
-      }
-    },
-    "node_modules/xml2js": {
-      "version": "0.4.23",
-      "resolved": "https://registry.npm.taobao.org/xml2js/download/xml2js-0.4.23.tgz?cache=0&sync_timestamp=1599054229598&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fxml2js%2Fdownload%2Fxml2js-0.4.23.tgz",
-      "integrity": "sha1-oMaVFnUkIesqx1juTUzPWIQ+rGY=",
-      "dependencies": {
-        "sax": ">=0.6.0",
-        "xmlbuilder": "~11.0.0"
-      },
-      "engines": {
-        "node": ">=4.0.0"
-      }
-    },
-    "node_modules/xmlbuilder": {
-      "version": "11.0.1",
-      "resolved": "https://registry.npm.taobao.org/xmlbuilder/download/xmlbuilder-11.0.1.tgz",
-      "integrity": "sha1-vpuuHIoEbnazESdyY0fQrXACvrM=",
-      "engines": {
-        "node": ">=4.0"
-      }
-    },
-    "node_modules/xtend": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
-      "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",
-      "engines": {
-        "node": ">=0.4"
-      }
-    },
-    "node_modules/y18n": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz",
-      "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE="
-    },
-    "node_modules/yallist": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
-      "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI="
-    },
-    "node_modules/yaml": {
-      "version": "1.9.2",
-      "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.9.2.tgz",
-      "integrity": "sha512-HPT7cGGI0DuRcsO51qC1j9O16Dh1mZ2bnXwsi0jrSpsLz0WxOLSLXfkABVl6bZO629py3CU+OMJtpNHDLB97kg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/runtime": "^7.9.2"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/yamljs": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/yamljs/-/yamljs-0.3.0.tgz",
-      "integrity": "sha512-C/FsVVhht4iPQYXOInoxUM/1ELSf9EsgKH34FofQOp6hwCPrW4vG4w5++TED3xRUo8gD7l0P1J1dLlDYzODsTQ==",
-      "dependencies": {
-        "argparse": "^1.0.7",
-        "glob": "^7.0.5"
-      },
-      "bin": {
-        "json2yaml": "bin/json2yaml",
-        "yaml2json": "bin/yaml2json"
-      }
-    },
-    "node_modules/yargs": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-7.1.0.tgz",
-      "integrity": "sha1-a6MY6xaWFyf10oT46gA+jWFU0Mg=",
-      "dependencies": {
-        "camelcase": "^3.0.0",
-        "cliui": "^3.2.0",
-        "decamelize": "^1.1.1",
-        "get-caller-file": "^1.0.1",
-        "os-locale": "^1.4.0",
-        "read-pkg-up": "^1.0.1",
-        "require-directory": "^2.1.1",
-        "require-main-filename": "^1.0.1",
-        "set-blocking": "^2.0.0",
-        "string-width": "^1.0.2",
-        "which-module": "^1.0.0",
-        "y18n": "^3.2.1",
-        "yargs-parser": "^5.0.0"
-      }
-    },
-    "node_modules/yargs-parser": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-5.0.0.tgz",
-      "integrity": "sha1-J17PDX/+Bcd+ZOfIbkzZS/DhIoo=",
-      "dependencies": {
-        "camelcase": "^3.0.0"
-      }
-    },
-    "node_modules/yargs-parser/node_modules/camelcase": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz",
-      "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/yargs/node_modules/camelcase": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz",
-      "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/zenscroll": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/zenscroll/-/zenscroll-4.0.2.tgz",
-      "integrity": "sha1-6NV3TRwHOKR7z6hynzcS4t7d6yU="
-    },
-    "node_modules/zrender": {
-      "version": "3.7.4",
-      "resolved": "https://registry.nlark.com/zrender/download/zrender-3.7.4.tgz",
-      "integrity": "sha1-+EfVOUhIHvbUKQbR6prux6y+/fI="
-    }
-  },
+  "lockfileVersion": 1,
   "dependencies": {
     "@babel/code-frame": {
       "version": "7.8.3",
@@ -20190,6 +869,11 @@
       "resolved": "https://registry.npmjs.org/@csstools/convert-colors/-/convert-colors-1.4.0.tgz",
       "integrity": "sha512-5a6wqoJV/xEdbRNKVo6I4hO3VjyDq//8q2f9I6PBAvMesJHFauXDorcNCsr9RzvsZnaWi5NYCcfyqP1QeFHFbw=="
     },
+    "@fancyapps/ui": {
+      "version": "4.0.31",
+      "resolved": "https://registry.npmjs.org/@fancyapps/ui/-/ui-4.0.31.tgz",
+      "integrity": "sha512-D7+PMIloxSOFJyY+lXcNlVDhmssOmDT6PT5fqQUIiws2hT7PH29r0EKZxERmACSQpm6qrFkP7rSguzXWvRJduQ=="
+    },
     "@kyleshockey/object-assign-deep": {
       "version": "0.4.2",
       "resolved": "https://registry.npmjs.org/@kyleshockey/object-assign-deep/-/object-assign-deep-0.4.2.tgz",
@@ -20666,8 +1350,7 @@
       "version": "5.2.0",
       "resolved": "https://registry.npm.taobao.org/acorn-jsx/download/acorn-jsx-5.2.0.tgz?cache=0&sync_timestamp=1589684116279&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Facorn-jsx%2Fdownload%2Facorn-jsx-5.2.0.tgz",
       "integrity": "sha1-TGYGkXPW/daO2FI5/CViJhgrLr4=",
-      "dev": true,
-      "requires": {}
+      "dev": true
     },
     "adler-32": {
       "version": "1.2.0",
@@ -20701,14 +1384,12 @@
     "ajv-errors": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/ajv-errors/-/ajv-errors-1.0.1.tgz",
-      "integrity": "sha512-DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ==",
-      "requires": {}
+      "integrity": "sha512-DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ=="
     },
     "ajv-keywords": {
       "version": "3.4.1",
       "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.4.1.tgz",
-      "integrity": "sha512-RO1ibKvd27e6FEShVFfPALuHI3WjSVNeK5FIsmme/LYRNxjKuNj+Dt7bucLa6NdSv3JcVTyMlm9kGR84z1XpaQ==",
-      "requires": {}
+      "integrity": "sha512-RO1ibKvd27e6FEShVFfPALuHI3WjSVNeK5FIsmme/LYRNxjKuNj+Dt7bucLa6NdSv3JcVTyMlm9kGR84z1XpaQ=="
     },
     "align-text": {
       "version": "0.1.4",
@@ -26935,8 +7616,7 @@
     "is-typedarray": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
-      "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=",
-      "devOptional": true
+      "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo="
     },
     "is-unc-path": {
       "version": "1.0.0",
@@ -30243,8 +10923,7 @@
       "version": "0.36.2",
       "resolved": "https://registry.npmjs.org/postcss-syntax/-/postcss-syntax-0.36.2.tgz",
       "integrity": "sha512-nBRg/i7E3SOHWxF3PpF5WnJM/jQ1YpY9000OaVXlAQj6Zp/kIqJxEDWIZ67tAd7NLuk7zqN4yqe9nc0oNAOs1w==",
-      "dev": true,
-      "requires": {}
+      "dev": true
     },
     "postcss-unique-selectors": {
       "version": "4.0.1",
@@ -30595,8 +11274,7 @@
     "react-immutable-proptypes": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/react-immutable-proptypes/-/react-immutable-proptypes-2.1.0.tgz",
-      "integrity": "sha1-Aj1vObsVyXwHHp5g0A0TbqxfoLQ=",
-      "requires": {}
+      "integrity": "sha1-Aj1vObsVyXwHHp5g0A0TbqxfoLQ="
     },
     "react-immutable-pure-component": {
       "version": "1.2.3",
@@ -31966,14 +12644,6 @@
       "resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz",
       "integrity": "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM="
     },
-    "string_decoder": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-      "requires": {
-        "safe-buffer": "~5.1.0"
-      }
-    },
     "string-width": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
@@ -32022,6 +12692,14 @@
         "es-abstract": "^1.17.5"
       }
     },
+    "string_decoder": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+      "requires": {
+        "safe-buffer": "~5.1.0"
+      }
+    },
     "stringify-entities": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/stringify-entities/-/stringify-entities-3.0.1.tgz",
@@ -32389,8 +13067,7 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/stylelint-config-recommended/-/stylelint-config-recommended-3.0.0.tgz",
       "integrity": "sha512-F6yTRuc06xr1h5Qw/ykb2LuFynJ2IxkKfCMf+1xqPffkxh0S09Zc902XCffcsw/XMFq/OzQ1w54fLIDtmRNHnQ==",
-      "dev": true,
-      "requires": {}
+      "dev": true
     },
     "stylelint-config-standard": {
       "version": "20.0.0",
@@ -34069,8 +14746,7 @@
     "vue-resize": {
       "version": "0.4.5",
       "resolved": "https://registry.npmjs.org/vue-resize/-/vue-resize-0.4.5.tgz",
-      "integrity": "sha512-bhP7MlgJQ8TIkZJXAfDf78uJO+mEI3CaLABLjv0WNzr4CcGRGPIAItyWYnP6LsPA4Oq0WE+suidNs6dgpO4RHg==",
-      "requires": {}
+      "integrity": "sha512-bhP7MlgJQ8TIkZJXAfDf78uJO+mEI3CaLABLjv0WNzr4CcGRGPIAItyWYnP6LsPA4Oq0WE+suidNs6dgpO4RHg=="
     },
     "vue-router": {
       "version": "3.3.4",
diff --git a/package.json b/package.json
index 7748f3de3..b04acfff6 100644
--- a/package.json
+++ b/package.json
@@ -10,6 +10,7 @@
     "@babel/plugin-transform-runtime": "7.9.6",
     "@babel/preset-env": "7.9.6",
     "@babel/runtime": "7.9.6",
+    "@fancyapps/ui": "4.0.31",
     "@primer/octicons": "9.6.0",
     "axios": "0.21.1",
     "babel-loader": "8.1.0",
diff --git a/templates/custom/max_log.tmpl b/templates/custom/max_log.tmpl
index 8dabb65b1..2268891e4 100644
--- a/templates/custom/max_log.tmpl
+++ b/templates/custom/max_log.tmpl
@@ -29,7 +29,7 @@
             <div class="ui message message-max{{.VersionName}}" style="display: none;">
                 <div id="header"></div>
             </div>
-            <div class="log-scroll-max" id="log-max{{.VersionName}}" data-version="{{.VersionName}}" style="overflow: auto;max-height: 100%;">
+            <div class="log-scroll-max" id="log-max{{.VersionName}}" data-version="{{.VersionName}}" style="overflow: auto;max-height: 100%;height: 100%">
                 <div class="ui inverted active dimmer">
                     <div class="ui loader"></div>
                 </div>
diff --git a/templates/repo/modelsafety/show.tmpl b/templates/repo/modelsafety/show.tmpl
index dfd5dc923..dfd1bd5b9 100644
--- a/templates/repo/modelsafety/show.tmpl
+++ b/templates/repo/modelsafety/show.tmpl
@@ -863,6 +863,7 @@
           }
           var oLogHref = $('#-log-down').attr('href');
           $('#-log-down').attr('href', oLogHref + `/${res.ID}/download_log_file`);
+          $('.full-log-dialog').attr('data-href', oLogHref + `/${res.ID}/download_log_file`);
           if (res.ResultJson) {
             try {
               resultData = JSON.parse(res.ResultJson);
diff --git a/templates/repo/view_file.tmpl b/templates/repo/view_file.tmpl
index 72446c3fe..2a15aa6d0 100755
--- a/templates/repo/view_file.tmpl
+++ b/templates/repo/view_file.tmpl
@@ -1,4 +1,43 @@
-<div class="{{TabSizeClass .Editorconfig .FileName}} non-diff-file-content">
+<style>
+img {
+  cursor: zoom-in;
+}
+
+.fancybox__container {
+  --fancybox-bg: rgba(193, 201, 210, 0.7);
+}
+
+.fancybox-zoomOut {
+  animation: 0.2s ease-in-out fancybox-zoomOut both;
+}
+
+.fancybox-zoomIn {
+  animation: 0.25s ease-in-out fancybox-zoomIn both;
+}
+
+@keyframes fancybox-zoomIn {
+  from {
+    opacity: 0;
+    transform: scale3d(0.8, 0.8, 0.8);
+  }
+
+  100% {
+    opacity: 1;
+  }
+}
+
+@keyframes fancybox-zoomOut {
+  from {
+    opacity: 1;
+  }
+
+  to {
+    opacity: 0;
+    transform: scale3d(0.8, 0.8, 0.8);
+  }
+}
+</style>
+<div class="{{TabSizeClass .Editorconfig .FileName}} non-diff-file-content gallery">
 	<h4 class="file-header ui top attached header">
 		<div class="file-header-left">
 			{{if .ReadmeInList}}
diff --git a/web_src/js/components/images/Images.vue b/web_src/js/components/images/Images.vue
index 7df7ee14d..d947582c4 100755
--- a/web_src/js/components/images/Images.vue
+++ b/web_src/js/components/images/Images.vue
@@ -120,13 +120,13 @@
                   </template>
                 </el-table-column>
                 <el-table-column
-                  prop="createdUnix"
+                  prop="updatedUnix"
                   label="创建时间"
                   align="center"
                   min-width="14%"
                 >
                   <template slot-scope="scope">
-                    {{ scope.row.createdUnix | transformTimestamp }}
+                    {{ scope.row.updatedUnix | transformTimestamp }}
                   </template>
                 </el-table-column>
                 <el-table-column align="center" min-width="21%" label="操作">
@@ -369,13 +369,13 @@
                   </template>
                 </el-table-column>
                 <el-table-column
-                  prop="createdUnix"
+                  prop="updatedUnix"
                   label="创建时间"
                   align="center"
                   min-width="14%"
                 >
                   <template slot-scope="scope">
-                    {{ scope.row.createdUnix | transformTimestamp }}
+                    {{ scope.row.updatedUnix | transformTimestamp }}
                   </template>
                 </el-table-column>
                 <el-table-column align="center" min-width="21%" label="操作">
@@ -595,13 +595,13 @@
                   </template>
                 </el-table-column>
                 <el-table-column
-                  prop="createdUnix"
+                  prop="updatedUnix"
                   label="创建时间"
                   align="center"
                   min-width="14%"
                 >
                   <template slot-scope="scope">
-                    {{ scope.row.createdUnix | transformTimestamp }}
+                    {{ scope.row.updatedUnix | transformTimestamp }}
                   </template>
                 </el-table-column>
                 <el-table-column align="center" min-width="21%" label="操作">
diff --git a/web_src/js/components/images/adminImages.vue b/web_src/js/components/images/adminImages.vue
index c3a943bda..c8b55aeb3 100644
--- a/web_src/js/components/images/adminImages.vue
+++ b/web_src/js/components/images/adminImages.vue
@@ -75,9 +75,9 @@
                                     </a>
                                 </template>
                             </el-table-column>
-                            <el-table-column prop="createdUnix" label="创建时间" align="center" min-width="13%">
+                            <el-table-column prop="updatedUnix" label="创建时间" align="center" min-width="13%">
                                 <template slot-scope="scope">
-                                    {{scope.row.createdUnix | transformTimestamp}}
+                                    {{scope.row.updatedUnix | transformTimestamp}}
                                 </template>
                             </el-table-column>
                             <el-table-column align="center" min-width="23%" label="操作">
diff --git a/web_src/js/index.js b/web_src/js/index.js
index a781261a9..710b2d231 100755
--- a/web_src/js/index.js
+++ b/web_src/js/index.js
@@ -53,6 +53,8 @@ import { Message } from "element-ui";
 
 import { i18nVue } from "./features/i18nVue.js";
 import './features/ad.js';
+import { Fancybox } from "@fancyapps/ui";
+
 
 Vue.use(ElementUI);
 Vue.prototype.$axios = axios;
@@ -5177,3 +5179,31 @@ function initChartsNpu() {
 }
 
 initChartsNpu();
+
+Fancybox.bind('.gallery img', {
+  // Do not create a gallery
+  groupAttr: null,
+
+  // Do not hide page scrollbars
+  hideScrollbar: false,
+
+  // Disable drag to close guesture
+  dragToClose: false,
+
+  // Hide close button
+  closeButton: false,
+
+  // Disable toolbar
+  Toolbar: false,
+
+  // Disable zoom animation; close on click and wheel events
+  Image: {
+    zoom: false,
+    click: "close",
+    wheel: "close",
+  },
+
+  // Custom animations
+  showClass: "fancybox-zoomIn",
+  hideClass: "fancybox-zoomOut",
+});
\ No newline at end of file
diff --git a/web_src/less/index.less b/web_src/less/index.less
index 3f57930e4..fc351b066 100644
--- a/web_src/less/index.less
+++ b/web_src/less/index.less
@@ -18,3 +18,4 @@
 @import "_explore";
 @import "_review";
 @import "openi";
+@import "@fancyapps/ui/dist/fancybox.css";
\ No newline at end of file

From 6d1f468fdef3cc4411cddaea230e011058c96f25 Mon Sep 17 00:00:00 2001
From: zhoupzh <zhoupzh@pcl.ac.cn>
Date: Mon, 7 Nov 2022 11:09:40 +0800
Subject: [PATCH 076/187] fix issue

---
 web_src/less/index.less | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web_src/less/index.less b/web_src/less/index.less
index fc351b066..27b11bb7f 100644
--- a/web_src/less/index.less
+++ b/web_src/less/index.less
@@ -18,4 +18,4 @@
 @import "_explore";
 @import "_review";
 @import "openi";
-@import "@fancyapps/ui/dist/fancybox.css";
\ No newline at end of file
+@import "~@fancyapps/ui/dist/fancybox.css";
\ No newline at end of file

From b6ab2ea158bc18701eaca9858d30970cea58c17f Mon Sep 17 00:00:00 2001
From: zhoupzh <zhoupzh@pcl.ac.cn>
Date: Mon, 7 Nov 2022 11:12:19 +0800
Subject: [PATCH 077/187] fix issue

---
 web_src/js/index.js     | 2 +-
 web_src/less/index.less | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/web_src/js/index.js b/web_src/js/index.js
index 710b2d231..1ec78b02d 100755
--- a/web_src/js/index.js
+++ b/web_src/js/index.js
@@ -54,7 +54,7 @@ import { Message } from "element-ui";
 import { i18nVue } from "./features/i18nVue.js";
 import './features/ad.js';
 import { Fancybox } from "@fancyapps/ui";
-
+import "@fancyapps/ui/dist/fancybox.css";
 
 Vue.use(ElementUI);
 Vue.prototype.$axios = axios;
diff --git a/web_src/less/index.less b/web_src/less/index.less
index 27b11bb7f..3f57930e4 100644
--- a/web_src/less/index.less
+++ b/web_src/less/index.less
@@ -18,4 +18,3 @@
 @import "_explore";
 @import "_review";
 @import "openi";
-@import "~@fancyapps/ui/dist/fancybox.css";
\ No newline at end of file

From 39ab507c33aaef8e90d1223e651ff474e8c7a829 Mon Sep 17 00:00:00 2001
From: zhoupzh <zhoupzh@pcl.ac.cn>
Date: Mon, 7 Nov 2022 11:22:05 +0800
Subject: [PATCH 078/187] fix issue

---
 web_src/js/index.js              |   2 +-
 web_src/less/index.less          |   1 +
 web_src/less/vendor/fancyapp.css | 856 +++++++++++++++++++++++++++++++
 3 files changed, 858 insertions(+), 1 deletion(-)
 create mode 100644 web_src/less/vendor/fancyapp.css

diff --git a/web_src/js/index.js b/web_src/js/index.js
index 1ec78b02d..710b2d231 100755
--- a/web_src/js/index.js
+++ b/web_src/js/index.js
@@ -54,7 +54,7 @@ import { Message } from "element-ui";
 import { i18nVue } from "./features/i18nVue.js";
 import './features/ad.js';
 import { Fancybox } from "@fancyapps/ui";
-import "@fancyapps/ui/dist/fancybox.css";
+
 
 Vue.use(ElementUI);
 Vue.prototype.$axios = axios;
diff --git a/web_src/less/index.less b/web_src/less/index.less
index 3f57930e4..100eca93f 100644
--- a/web_src/less/index.less
+++ b/web_src/less/index.less
@@ -1,5 +1,6 @@
 @import "~highlight.js/styles/github.css";
 @import "./vendor/gitGraph.css";
+@import "./vendor/fancyapp.css";
 // @import "~/remixicon/fonts/remixicon.css";
 @import "_svg";
 @import "_tribute";
diff --git a/web_src/less/vendor/fancyapp.css b/web_src/less/vendor/fancyapp.css
new file mode 100644
index 000000000..5ea496785
--- /dev/null
+++ b/web_src/less/vendor/fancyapp.css
@@ -0,0 +1,856 @@
+.carousel {
+    position  : relative;
+    box-sizing: border-box
+}
+
+.carousel *,
+.carousel *:before,
+.carousel *:after {
+    box-sizing: inherit
+}
+
+.carousel.is-draggable {
+    cursor: move;
+    cursor: grab
+}
+
+.carousel.is-dragging {
+    cursor: move;
+    cursor: grabbing
+}
+
+.carousel__viewport {
+    position  : relative;
+    overflow  : hidden;
+    max-width : 100%;
+    max-height: 100%
+}
+
+.carousel__track {
+    display: flex
+}
+
+.carousel__slide {
+    flex               : 0 0 auto;
+    width              : var(--carousel-slide-width, 60%);
+    max-width          : 100%;
+    padding            : 1rem;
+    position           : relative;
+    overflow-x         : hidden;
+    overflow-y         : auto;
+    overscroll-behavior: contain
+}
+
+.has-dots {
+    margin-bottom: calc(0.5rem + 22px)
+}
+
+.carousel__dots {
+    margin         : 0 auto;
+    padding        : 0;
+    position       : absolute;
+    top            : calc(100% + 0.5rem);
+    left           : 0;
+    right          : 0;
+    display        : flex;
+    justify-content: center;
+    list-style     : none;
+    user-select    : none
+}
+
+.carousel__dots .carousel__dot {
+    margin  : 0;
+    padding : 0;
+    display : block;
+    position: relative;
+    width   : 22px;
+    height  : 22px;
+    cursor  : pointer
+}
+
+.carousel__dots .carousel__dot:after {
+    content         : "";
+    width           : 8px;
+    height          : 8px;
+    border-radius   : 50%;
+    position        : absolute;
+    top             : 50%;
+    left            : 50%;
+    transform       : translate(-50%, -50%);
+    background-color: currentColor;
+    opacity         : .25;
+    transition      : opacity .15s ease-in-out
+}
+
+.carousel__dots .carousel__dot.is-selected:after {
+    opacity: 1
+}
+
+.carousel__button {
+    width          : var(--carousel-button-width, 48px);
+    height         : var(--carousel-button-height, 48px);
+    padding        : 0;
+    border         : 0;
+    display        : flex;
+    justify-content: center;
+    align-items    : center;
+    pointer-events : all;
+    cursor         : pointer;
+    color          : var(--carousel-button-color, currentColor);
+    background     : var(--carousel-button-bg, transparent);
+    border-radius  : var(--carousel-button-border-radius, 50%);
+    box-shadow     : var(--carousel-button-shadow, none);
+    transition     : opacity .15s ease
+}
+
+.carousel__button.is-prev,
+.carousel__button.is-next {
+    position : absolute;
+    top      : 50%;
+    transform: translateY(-50%)
+}
+
+.carousel__button.is-prev {
+    left: 10px
+}
+
+.carousel__button.is-next {
+    right: 10px
+}
+
+.carousel__button[disabled] {
+    cursor : default;
+    opacity: .3
+}
+
+.carousel__button svg {
+    width          : var(--carousel-button-svg-width, 50%);
+    height         : var(--carousel-button-svg-height, 50%);
+    fill           : none;
+    stroke         : currentColor;
+    stroke-width   : var(--carousel-button-svg-stroke-width, 1.5);
+    stroke-linejoin: bevel;
+    stroke-linecap : round;
+    filter         : var(--carousel-button-svg-filter, none);
+    pointer-events : none
+}
+
+html.with-fancybox {
+    scroll-behavior: auto
+}
+
+body.compensate-for-scrollbar {
+    overflow    : hidden !important;
+    touch-action: none
+}
+
+.fancybox__container {
+    position                          : fixed;
+    top                               : 0;
+    left                              : 0;
+    bottom                            : 0;
+    right                             : 0;
+    direction                         : ltr;
+    margin                            : 0;
+    padding                           : env(safe-area-inset-top, 0px) env(safe-area-inset-right, 0px) env(safe-area-inset-bottom, 0px) env(safe-area-inset-left, 0px);
+    box-sizing                        : border-box;
+    display                           : flex;
+    flex-direction                    : column;
+    color                             : var(--fancybox-color, #fff);
+    -webkit-tap-highlight-color       : rgba(0, 0, 0, 0);
+    overflow                          : hidden;
+    z-index                           : 1050;
+    outline                           : none;
+    transform-origin                  : top left;
+    --carousel-button-width           : 48px;
+    --carousel-button-height          : 48px;
+    --carousel-button-svg-width       : 24px;
+    --carousel-button-svg-height      : 24px;
+    --carousel-button-svg-stroke-width: 2.5;
+    --carousel-button-svg-filter      : drop-shadow(1px 1px 1px rgba(0, 0, 0, 0.4))
+}
+
+.fancybox__container *,
+.fancybox__container *::before,
+.fancybox__container *::after {
+    box-sizing: inherit
+}
+
+.fancybox__container :focus {
+    outline: none
+}
+
+body:not(.is-using-mouse) .fancybox__container :focus {
+    box-shadow: 0 0 0 1px #fff, 0 0 0 2px var(--fancybox-accent-color, rgba(1, 210, 232, 0.94))
+}
+
+@media all and (min-width: 1024px) {
+    .fancybox__container {
+        --carousel-button-width     : 48px;
+        --carousel-button-height    : 48px;
+        --carousel-button-svg-width : 27px;
+        --carousel-button-svg-height: 27px
+    }
+}
+
+.fancybox__backdrop {
+    position  : absolute;
+    top       : 0;
+    right     : 0;
+    bottom    : 0;
+    left      : 0;
+    z-index   : -1;
+    background: var(--fancybox-bg, rgba(24, 24, 27, 0.92))
+}
+
+.fancybox__carousel {
+    position  : relative;
+    flex      : 1 1 auto;
+    min-height: 0;
+    height    : 100%;
+    z-index   : 10
+}
+
+.fancybox__carousel.has-dots {
+    margin-bottom: calc(0.5rem + 22px)
+}
+
+.fancybox__viewport {
+    position: relative;
+    width   : 100%;
+    height  : 100%;
+    overflow: visible;
+    cursor  : default
+}
+
+.fancybox__track {
+    display: flex;
+    height : 100%
+}
+
+.fancybox__slide {
+    flex                        : 0 0 auto;
+    width                       : 100%;
+    max-width                   : 100%;
+    margin                      : 0;
+    padding                     : 48px 8px 8px 8px;
+    position                    : relative;
+    overscroll-behavior         : contain;
+    display                     : flex;
+    flex-direction              : column;
+    outline                     : 0;
+    overflow                    : auto;
+    --carousel-button-width     : 36px;
+    --carousel-button-height    : 36px;
+    --carousel-button-svg-width : 22px;
+    --carousel-button-svg-height: 22px
+}
+
+.fancybox__slide::before,
+.fancybox__slide::after {
+    content: "";
+    flex   : 0 0 0;
+    margin : auto
+}
+
+@media all and (min-width: 1024px) {
+    .fancybox__slide {
+        padding: 64px 100px
+    }
+}
+
+.fancybox__content {
+    margin        : 0 env(safe-area-inset-right, 0px) 0 env(safe-area-inset-left, 0px);
+    padding       : 36px;
+    color         : var(--fancybox-content-color, #374151);
+    background    : var(--fancybox-content-bg, #fff);
+    position      : relative;
+    align-self    : center;
+    display       : flex;
+    flex-direction: column;
+    z-index       : 20
+}
+
+.fancybox__content :focus:not(.carousel__button.is-close) {
+    outline   : thin dotted;
+    box-shadow: none
+}
+
+.fancybox__caption {
+    align-self   : center;
+    max-width    : 100%;
+    margin       : 0;
+    padding      : 1rem 0 0 0;
+    line-height  : 1.375;
+    color        : var(--fancybox-color, currentColor);
+    visibility   : visible;
+    cursor       : auto;
+    flex-shrink  : 0;
+    overflow-wrap: anywhere
+}
+
+.is-loading .fancybox__caption {
+    visibility: hidden
+}
+
+.fancybox__container>.carousel__dots {
+    top  : 100%;
+    color: var(--fancybox-color, #fff)
+}
+
+.fancybox__nav .carousel__button {
+    z-index: 40
+}
+
+.fancybox__nav .carousel__button.is-next {
+    right: 8px
+}
+
+@media all and (min-width: 1024px) {
+    .fancybox__nav .carousel__button.is-next {
+        right: 40px
+    }
+}
+
+.fancybox__nav .carousel__button.is-prev {
+    left: 8px
+}
+
+@media all and (min-width: 1024px) {
+    .fancybox__nav .carousel__button.is-prev {
+        left: 40px
+    }
+}
+
+.carousel__button.is-close {
+    position: absolute;
+    top     : 8px;
+    right   : 8px;
+    top     : calc(env(safe-area-inset-top, 0px) + 8px);
+    right   : calc(env(safe-area-inset-right, 0px) + 8px);
+    z-index : 40
+}
+
+@media all and (min-width: 1024px) {
+    .carousel__button.is-close {
+        right: 40px
+    }
+}
+
+.fancybox__content>.carousel__button.is-close {
+    position: absolute;
+    top     : -40px;
+    right   : 0;
+    color   : var(--fancybox-color, #fff)
+}
+
+.fancybox__no-click,
+.fancybox__no-click button {
+    pointer-events: none
+}
+
+.fancybox__spinner {
+    position : absolute;
+    top      : 50%;
+    left     : 50%;
+    transform: translate(-50%, -50%);
+    width    : 50px;
+    height   : 50px;
+    color    : var(--fancybox-color, currentColor)
+}
+
+.fancybox__slide .fancybox__spinner {
+    cursor : pointer;
+    z-index: 1053
+}
+
+.fancybox__spinner svg {
+    animation       : fancybox-rotate 2s linear infinite;
+    transform-origin: center center;
+    position        : absolute;
+    top             : 0;
+    right           : 0;
+    bottom          : 0;
+    left            : 0;
+    margin          : auto;
+    width           : 100%;
+    height          : 100%
+}
+
+.fancybox__spinner svg circle {
+    fill             : none;
+    stroke-width     : 2.75;
+    stroke-miterlimit: 10;
+    stroke-dasharray : 1, 200;
+    stroke-dashoffset: 0;
+    animation        : fancybox-dash 1.5s ease-in-out infinite;
+    stroke-linecap   : round;
+    stroke           : currentColor
+}
+
+@keyframes fancybox-rotate {
+    100% {
+        transform: rotate(360deg)
+    }
+}
+
+@keyframes fancybox-dash {
+    0% {
+        stroke-dasharray : 1, 200;
+        stroke-dashoffset: 0
+    }
+
+    50% {
+        stroke-dasharray : 89, 200;
+        stroke-dashoffset: -35px
+    }
+
+    100% {
+        stroke-dasharray : 89, 200;
+        stroke-dashoffset: -124px
+    }
+}
+
+.fancybox__backdrop,
+.fancybox__caption,
+.fancybox__nav,
+.carousel__dots,
+.carousel__button.is-close {
+    opacity: var(--fancybox-opacity, 1)
+}
+
+.fancybox__container.is-animated[aria-hidden=false] .fancybox__backdrop,
+.fancybox__container.is-animated[aria-hidden=false] .fancybox__caption,
+.fancybox__container.is-animated[aria-hidden=false] .fancybox__nav,
+.fancybox__container.is-animated[aria-hidden=false] .carousel__dots,
+.fancybox__container.is-animated[aria-hidden=false] .carousel__button.is-close {
+    animation: .15s ease backwards fancybox-fadeIn
+}
+
+.fancybox__container.is-animated.is-closing .fancybox__backdrop,
+.fancybox__container.is-animated.is-closing .fancybox__caption,
+.fancybox__container.is-animated.is-closing .fancybox__nav,
+.fancybox__container.is-animated.is-closing .carousel__dots,
+.fancybox__container.is-animated.is-closing .carousel__button.is-close {
+    animation: .15s ease both fancybox-fadeOut
+}
+
+.fancybox-fadeIn {
+    animation: .15s ease both fancybox-fadeIn
+}
+
+.fancybox-fadeOut {
+    animation: .1s ease both fancybox-fadeOut
+}
+
+.fancybox-zoomInUp {
+    animation: .2s ease both fancybox-zoomInUp
+}
+
+.fancybox-zoomOutDown {
+    animation: .15s ease both fancybox-zoomOutDown
+}
+
+.fancybox-throwOutUp {
+    animation: .15s ease both fancybox-throwOutUp
+}
+
+.fancybox-throwOutDown {
+    animation: .15s ease both fancybox-throwOutDown
+}
+
+@keyframes fancybox-fadeIn {
+    from {
+        opacity: 0
+    }
+
+    to {
+        opacity: 1
+    }
+}
+
+@keyframes fancybox-fadeOut {
+    to {
+        opacity: 0
+    }
+}
+
+@keyframes fancybox-zoomInUp {
+    from {
+        transform: scale(0.97) translate3d(0, 16px, 0);
+        opacity  : 0
+    }
+
+    to {
+        transform: scale(1) translate3d(0, 0, 0);
+        opacity  : 1
+    }
+}
+
+@keyframes fancybox-zoomOutDown {
+    to {
+        transform: scale(0.97) translate3d(0, 16px, 0);
+        opacity  : 0
+    }
+}
+
+@keyframes fancybox-throwOutUp {
+    to {
+        transform: translate3d(0, -30%, 0);
+        opacity  : 0
+    }
+}
+
+@keyframes fancybox-throwOutDown {
+    to {
+        transform: translate3d(0, 30%, 0);
+        opacity  : 0
+    }
+}
+
+.fancybox__carousel .carousel__slide {
+    scrollbar-width: thin;
+    scrollbar-color: #ccc rgba(255, 255, 255, .1)
+}
+
+.fancybox__carousel .carousel__slide::-webkit-scrollbar {
+    width : 8px;
+    height: 8px
+}
+
+.fancybox__carousel .carousel__slide::-webkit-scrollbar-track {
+    background-color: rgba(255, 255, 255, .1)
+}
+
+.fancybox__carousel .carousel__slide::-webkit-scrollbar-thumb {
+    background-color: #ccc;
+    border-radius   : 2px;
+    box-shadow      : inset 0 0 4px rgba(0, 0, 0, .2)
+}
+
+.fancybox__carousel.is-draggable .fancybox__slide,
+.fancybox__carousel.is-draggable .fancybox__slide .fancybox__content {
+    cursor: move;
+    cursor: grab
+}
+
+.fancybox__carousel.is-dragging .fancybox__slide,
+.fancybox__carousel.is-dragging .fancybox__slide .fancybox__content {
+    cursor: move;
+    cursor: grabbing
+}
+
+.fancybox__carousel .fancybox__slide .fancybox__content {
+    cursor: auto
+}
+
+.fancybox__carousel .fancybox__slide.can-zoom_in .fancybox__content {
+    cursor: zoom-in
+}
+
+.fancybox__carousel .fancybox__slide.can-zoom_out .fancybox__content {
+    cursor: zoom-out
+}
+
+.fancybox__carousel .fancybox__slide.is-draggable .fancybox__content {
+    cursor: move;
+    cursor: grab
+}
+
+.fancybox__carousel .fancybox__slide.is-dragging .fancybox__content {
+    cursor: move;
+    cursor: grabbing
+}
+
+.fancybox__image {
+    transform-origin: 0 0;
+    user-select     : none;
+    transition      : none
+}
+
+.has-image .fancybox__content {
+    padding   : 0;
+    background: rgba(0, 0, 0, 0);
+    min-height: 1px
+}
+
+.is-closing .has-image .fancybox__content {
+    overflow: visible
+}
+
+.has-image[data-image-fit=contain] {
+    overflow    : visible;
+    touch-action: none
+}
+
+.has-image[data-image-fit=contain] .fancybox__content {
+    flex-direction: row;
+    flex-wrap     : wrap
+}
+
+.has-image[data-image-fit=contain] .fancybox__image {
+    max-width : 100%;
+    max-height: 100%;
+    object-fit: contain
+}
+
+.has-image[data-image-fit=contain-w] {
+    overflow-x: hidden;
+    overflow-y: auto
+}
+
+.has-image[data-image-fit=contain-w] .fancybox__content {
+    min-height: auto
+}
+
+.has-image[data-image-fit=contain-w] .fancybox__image {
+    max-width: 100%;
+    height   : auto
+}
+
+.has-image[data-image-fit=cover] {
+    overflow    : visible;
+    touch-action: none
+}
+
+.has-image[data-image-fit=cover] .fancybox__content {
+    width : 100%;
+    height: 100%
+}
+
+.has-image[data-image-fit=cover] .fancybox__image {
+    width     : 100%;
+    height    : 100%;
+    object-fit: cover
+}
+
+.fancybox__carousel .fancybox__slide.has-iframe .fancybox__content,
+.fancybox__carousel .fancybox__slide.has-map .fancybox__content,
+.fancybox__carousel .fancybox__slide.has-pdf .fancybox__content,
+.fancybox__carousel .fancybox__slide.has-video .fancybox__content,
+.fancybox__carousel .fancybox__slide.has-html5video .fancybox__content {
+    max-width  : 100%;
+    flex-shrink: 1;
+    min-height : 1px;
+    overflow   : visible
+}
+
+.fancybox__carousel .fancybox__slide.has-iframe .fancybox__content,
+.fancybox__carousel .fancybox__slide.has-map .fancybox__content,
+.fancybox__carousel .fancybox__slide.has-pdf .fancybox__content {
+    width : 100%;
+    height: 80%
+}
+
+.fancybox__carousel .fancybox__slide.has-video .fancybox__content,
+.fancybox__carousel .fancybox__slide.has-html5video .fancybox__content {
+    width     : 960px;
+    height    : 540px;
+    max-width : 100%;
+    max-height: 100%
+}
+
+.fancybox__carousel .fancybox__slide.has-map .fancybox__content,
+.fancybox__carousel .fancybox__slide.has-pdf .fancybox__content,
+.fancybox__carousel .fancybox__slide.has-video .fancybox__content,
+.fancybox__carousel .fancybox__slide.has-html5video .fancybox__content {
+    padding   : 0;
+    background: rgba(24, 24, 27, .9);
+    color     : #fff
+}
+
+.fancybox__carousel .fancybox__slide.has-map .fancybox__content {
+    background: #e5e3df
+}
+
+.fancybox__html5video,
+.fancybox__iframe {
+    border    : 0;
+    display   : block;
+    height    : 100%;
+    width     : 100%;
+    background: rgba(0, 0, 0, 0)
+}
+
+.fancybox-placeholder {
+    position    : absolute;
+    width       : 1px;
+    height      : 1px;
+    padding     : 0;
+    margin      : -1px;
+    overflow    : hidden;
+    clip        : rect(0, 0, 0, 0);
+    white-space : nowrap;
+    border-width: 0
+}
+
+.fancybox__thumbs {
+    flex    : 0 0 auto;
+    position: relative;
+    padding : 0px 3px;
+    opacity : var(--fancybox-opacity, 1)
+}
+
+.fancybox__container.is-animated[aria-hidden=false] .fancybox__thumbs {
+    animation: .15s ease-in backwards fancybox-fadeIn
+}
+
+.fancybox__container.is-animated.is-closing .fancybox__thumbs {
+    opacity: 0
+}
+
+.fancybox__thumbs .carousel__slide {
+    flex           : 0 0 auto;
+    width          : var(--fancybox-thumbs-width, 96px);
+    margin         : 0;
+    padding        : 8px 3px;
+    box-sizing     : content-box;
+    display        : flex;
+    align-items    : center;
+    justify-content: center;
+    overflow       : visible;
+    cursor         : pointer
+}
+
+.fancybox__thumbs .carousel__slide .fancybox__thumb::after {
+    content      : "";
+    position     : absolute;
+    top          : 0;
+    left         : 0;
+    right        : 0;
+    bottom       : 0;
+    border-width : 5px;
+    border-style : solid;
+    border-color : var(--fancybox-accent-color, rgba(34, 213, 233, 0.96));
+    opacity      : 0;
+    transition   : opacity .15s ease;
+    border-radius: var(--fancybox-thumbs-border-radius, 4px)
+}
+
+.fancybox__thumbs .carousel__slide.is-nav-selected .fancybox__thumb::after {
+    opacity: .92
+}
+
+.fancybox__thumbs .carousel__slide>* {
+    pointer-events: none;
+    user-select   : none
+}
+
+.fancybox__thumb {
+    position           : relative;
+    width              : 100%;
+    padding-top        : calc(100%/(var(--fancybox-thumbs-ratio, 1.5)));
+    background-size    : cover;
+    background-position: center center;
+    background-color   : rgba(255, 255, 255, .1);
+    background-repeat  : no-repeat;
+    border-radius      : var(--fancybox-thumbs-border-radius, 4px)
+}
+
+.fancybox__toolbar {
+    position                    : absolute;
+    top                         : 0;
+    right                       : 0;
+    left                        : 0;
+    z-index                     : 20;
+    background                  : linear-gradient(to top, hsla(0deg, 0%, 0%, 0) 0%, hsla(0deg, 0%, 0%, 0.006) 8.1%, hsla(0deg, 0%, 0%, 0.021) 15.5%, hsla(0deg, 0%, 0%, 0.046) 22.5%, hsla(0deg, 0%, 0%, 0.077) 29%, hsla(0deg, 0%, 0%, 0.114) 35.3%, hsla(0deg, 0%, 0%, 0.155) 41.2%, hsla(0deg, 0%, 0%, 0.198) 47.1%, hsla(0deg, 0%, 0%, 0.242) 52.9%, hsla(0deg, 0%, 0%, 0.285) 58.8%, hsla(0deg, 0%, 0%, 0.326) 64.7%, hsla(0deg, 0%, 0%, 0.363) 71%, hsla(0deg, 0%, 0%, 0.394) 77.5%, hsla(0deg, 0%, 0%, 0.419) 84.5%, hsla(0deg, 0%, 0%, 0.434) 91.9%, hsla(0deg, 0%, 0%, 0.44) 100%);
+    padding                     : 0;
+    touch-action                : none;
+    display                     : flex;
+    justify-content             : space-between;
+    --carousel-button-svg-width : 20px;
+    --carousel-button-svg-height: 20px;
+    opacity                     : var(--fancybox-opacity, 1);
+    text-shadow                 : var(--fancybox-toolbar-text-shadow, 1px 1px 1px rgba(0, 0, 0, 0.4))
+}
+
+@media all and (min-width: 1024px) {
+    .fancybox__toolbar {
+        padding: 8px
+    }
+}
+
+.fancybox__container.is-animated[aria-hidden=false] .fancybox__toolbar {
+    animation: .15s ease-in backwards fancybox-fadeIn
+}
+
+.fancybox__container.is-animated.is-closing .fancybox__toolbar {
+    opacity: 0
+}
+
+.fancybox__toolbar__items {
+    display: flex
+}
+
+.fancybox__toolbar__items--left {
+    margin-right: auto
+}
+
+.fancybox__toolbar__items--center {
+    position : absolute;
+    left     : 50%;
+    transform: translateX(-50%)
+}
+
+.fancybox__toolbar__items--right {
+    margin-left: auto
+}
+
+@media(max-width: 640px) {
+    .fancybox__toolbar__items--center:not(:last-child) {
+        display: none
+    }
+}
+
+.fancybox__counter {
+    min-width             : 72px;
+    padding               : 0 10px;
+    line-height           : var(--carousel-button-height, 48px);
+    text-align            : center;
+    font-size             : 17px;
+    font-variant-numeric  : tabular-nums;
+    -webkit-font-smoothing: subpixel-antialiased
+}
+
+.fancybox__progress {
+    background                : var(--fancybox-accent-color, rgba(34, 213, 233, 0.96));
+    height                    : 3px;
+    left                      : 0;
+    position                  : absolute;
+    right                     : 0;
+    top                       : 0;
+    transform                 : scaleX(0);
+    transform-origin          : 0;
+    transition-property       : transform;
+    transition-timing-function: linear;
+    z-index                   : 30;
+    user-select               : none
+}
+
+.fancybox__container:fullscreen::backdrop {
+    opacity: 0
+}
+
+.fancybox__button--fullscreen g:nth-child(2) {
+    display: none
+}
+
+.fancybox__container:fullscreen .fancybox__button--fullscreen g:nth-child(1) {
+    display: none
+}
+
+.fancybox__container:fullscreen .fancybox__button--fullscreen g:nth-child(2) {
+    display: block
+}
+
+.fancybox__button--slideshow g:nth-child(2) {
+    display: none
+}
+
+.fancybox__container.has-slideshow .fancybox__button--slideshow g:nth-child(1) {
+    display: none
+}
+
+.fancybox__container.has-slideshow .fancybox__button--slideshow g:nth-child(2) {
+    display: block
+}
\ No newline at end of file

From 83dfb36ad5f99fba63f57b06af9cbeb572993c3c Mon Sep 17 00:00:00 2001
From: zhoupzh <zhoupzh@pcl.ac.cn>
Date: Mon, 7 Nov 2022 11:27:25 +0800
Subject: [PATCH 079/187] fix issue

---
 web_src/less/vendor/fancyapp.css | 857 +------------------------------
 1 file changed, 1 insertion(+), 856 deletions(-)

diff --git a/web_src/less/vendor/fancyapp.css b/web_src/less/vendor/fancyapp.css
index 5ea496785..43b5537b1 100644
--- a/web_src/less/vendor/fancyapp.css
+++ b/web_src/less/vendor/fancyapp.css
@@ -1,856 +1 @@
-.carousel {
-    position  : relative;
-    box-sizing: border-box
-}
-
-.carousel *,
-.carousel *:before,
-.carousel *:after {
-    box-sizing: inherit
-}
-
-.carousel.is-draggable {
-    cursor: move;
-    cursor: grab
-}
-
-.carousel.is-dragging {
-    cursor: move;
-    cursor: grabbing
-}
-
-.carousel__viewport {
-    position  : relative;
-    overflow  : hidden;
-    max-width : 100%;
-    max-height: 100%
-}
-
-.carousel__track {
-    display: flex
-}
-
-.carousel__slide {
-    flex               : 0 0 auto;
-    width              : var(--carousel-slide-width, 60%);
-    max-width          : 100%;
-    padding            : 1rem;
-    position           : relative;
-    overflow-x         : hidden;
-    overflow-y         : auto;
-    overscroll-behavior: contain
-}
-
-.has-dots {
-    margin-bottom: calc(0.5rem + 22px)
-}
-
-.carousel__dots {
-    margin         : 0 auto;
-    padding        : 0;
-    position       : absolute;
-    top            : calc(100% + 0.5rem);
-    left           : 0;
-    right          : 0;
-    display        : flex;
-    justify-content: center;
-    list-style     : none;
-    user-select    : none
-}
-
-.carousel__dots .carousel__dot {
-    margin  : 0;
-    padding : 0;
-    display : block;
-    position: relative;
-    width   : 22px;
-    height  : 22px;
-    cursor  : pointer
-}
-
-.carousel__dots .carousel__dot:after {
-    content         : "";
-    width           : 8px;
-    height          : 8px;
-    border-radius   : 50%;
-    position        : absolute;
-    top             : 50%;
-    left            : 50%;
-    transform       : translate(-50%, -50%);
-    background-color: currentColor;
-    opacity         : .25;
-    transition      : opacity .15s ease-in-out
-}
-
-.carousel__dots .carousel__dot.is-selected:after {
-    opacity: 1
-}
-
-.carousel__button {
-    width          : var(--carousel-button-width, 48px);
-    height         : var(--carousel-button-height, 48px);
-    padding        : 0;
-    border         : 0;
-    display        : flex;
-    justify-content: center;
-    align-items    : center;
-    pointer-events : all;
-    cursor         : pointer;
-    color          : var(--carousel-button-color, currentColor);
-    background     : var(--carousel-button-bg, transparent);
-    border-radius  : var(--carousel-button-border-radius, 50%);
-    box-shadow     : var(--carousel-button-shadow, none);
-    transition     : opacity .15s ease
-}
-
-.carousel__button.is-prev,
-.carousel__button.is-next {
-    position : absolute;
-    top      : 50%;
-    transform: translateY(-50%)
-}
-
-.carousel__button.is-prev {
-    left: 10px
-}
-
-.carousel__button.is-next {
-    right: 10px
-}
-
-.carousel__button[disabled] {
-    cursor : default;
-    opacity: .3
-}
-
-.carousel__button svg {
-    width          : var(--carousel-button-svg-width, 50%);
-    height         : var(--carousel-button-svg-height, 50%);
-    fill           : none;
-    stroke         : currentColor;
-    stroke-width   : var(--carousel-button-svg-stroke-width, 1.5);
-    stroke-linejoin: bevel;
-    stroke-linecap : round;
-    filter         : var(--carousel-button-svg-filter, none);
-    pointer-events : none
-}
-
-html.with-fancybox {
-    scroll-behavior: auto
-}
-
-body.compensate-for-scrollbar {
-    overflow    : hidden !important;
-    touch-action: none
-}
-
-.fancybox__container {
-    position                          : fixed;
-    top                               : 0;
-    left                              : 0;
-    bottom                            : 0;
-    right                             : 0;
-    direction                         : ltr;
-    margin                            : 0;
-    padding                           : env(safe-area-inset-top, 0px) env(safe-area-inset-right, 0px) env(safe-area-inset-bottom, 0px) env(safe-area-inset-left, 0px);
-    box-sizing                        : border-box;
-    display                           : flex;
-    flex-direction                    : column;
-    color                             : var(--fancybox-color, #fff);
-    -webkit-tap-highlight-color       : rgba(0, 0, 0, 0);
-    overflow                          : hidden;
-    z-index                           : 1050;
-    outline                           : none;
-    transform-origin                  : top left;
-    --carousel-button-width           : 48px;
-    --carousel-button-height          : 48px;
-    --carousel-button-svg-width       : 24px;
-    --carousel-button-svg-height      : 24px;
-    --carousel-button-svg-stroke-width: 2.5;
-    --carousel-button-svg-filter      : drop-shadow(1px 1px 1px rgba(0, 0, 0, 0.4))
-}
-
-.fancybox__container *,
-.fancybox__container *::before,
-.fancybox__container *::after {
-    box-sizing: inherit
-}
-
-.fancybox__container :focus {
-    outline: none
-}
-
-body:not(.is-using-mouse) .fancybox__container :focus {
-    box-shadow: 0 0 0 1px #fff, 0 0 0 2px var(--fancybox-accent-color, rgba(1, 210, 232, 0.94))
-}
-
-@media all and (min-width: 1024px) {
-    .fancybox__container {
-        --carousel-button-width     : 48px;
-        --carousel-button-height    : 48px;
-        --carousel-button-svg-width : 27px;
-        --carousel-button-svg-height: 27px
-    }
-}
-
-.fancybox__backdrop {
-    position  : absolute;
-    top       : 0;
-    right     : 0;
-    bottom    : 0;
-    left      : 0;
-    z-index   : -1;
-    background: var(--fancybox-bg, rgba(24, 24, 27, 0.92))
-}
-
-.fancybox__carousel {
-    position  : relative;
-    flex      : 1 1 auto;
-    min-height: 0;
-    height    : 100%;
-    z-index   : 10
-}
-
-.fancybox__carousel.has-dots {
-    margin-bottom: calc(0.5rem + 22px)
-}
-
-.fancybox__viewport {
-    position: relative;
-    width   : 100%;
-    height  : 100%;
-    overflow: visible;
-    cursor  : default
-}
-
-.fancybox__track {
-    display: flex;
-    height : 100%
-}
-
-.fancybox__slide {
-    flex                        : 0 0 auto;
-    width                       : 100%;
-    max-width                   : 100%;
-    margin                      : 0;
-    padding                     : 48px 8px 8px 8px;
-    position                    : relative;
-    overscroll-behavior         : contain;
-    display                     : flex;
-    flex-direction              : column;
-    outline                     : 0;
-    overflow                    : auto;
-    --carousel-button-width     : 36px;
-    --carousel-button-height    : 36px;
-    --carousel-button-svg-width : 22px;
-    --carousel-button-svg-height: 22px
-}
-
-.fancybox__slide::before,
-.fancybox__slide::after {
-    content: "";
-    flex   : 0 0 0;
-    margin : auto
-}
-
-@media all and (min-width: 1024px) {
-    .fancybox__slide {
-        padding: 64px 100px
-    }
-}
-
-.fancybox__content {
-    margin        : 0 env(safe-area-inset-right, 0px) 0 env(safe-area-inset-left, 0px);
-    padding       : 36px;
-    color         : var(--fancybox-content-color, #374151);
-    background    : var(--fancybox-content-bg, #fff);
-    position      : relative;
-    align-self    : center;
-    display       : flex;
-    flex-direction: column;
-    z-index       : 20
-}
-
-.fancybox__content :focus:not(.carousel__button.is-close) {
-    outline   : thin dotted;
-    box-shadow: none
-}
-
-.fancybox__caption {
-    align-self   : center;
-    max-width    : 100%;
-    margin       : 0;
-    padding      : 1rem 0 0 0;
-    line-height  : 1.375;
-    color        : var(--fancybox-color, currentColor);
-    visibility   : visible;
-    cursor       : auto;
-    flex-shrink  : 0;
-    overflow-wrap: anywhere
-}
-
-.is-loading .fancybox__caption {
-    visibility: hidden
-}
-
-.fancybox__container>.carousel__dots {
-    top  : 100%;
-    color: var(--fancybox-color, #fff)
-}
-
-.fancybox__nav .carousel__button {
-    z-index: 40
-}
-
-.fancybox__nav .carousel__button.is-next {
-    right: 8px
-}
-
-@media all and (min-width: 1024px) {
-    .fancybox__nav .carousel__button.is-next {
-        right: 40px
-    }
-}
-
-.fancybox__nav .carousel__button.is-prev {
-    left: 8px
-}
-
-@media all and (min-width: 1024px) {
-    .fancybox__nav .carousel__button.is-prev {
-        left: 40px
-    }
-}
-
-.carousel__button.is-close {
-    position: absolute;
-    top     : 8px;
-    right   : 8px;
-    top     : calc(env(safe-area-inset-top, 0px) + 8px);
-    right   : calc(env(safe-area-inset-right, 0px) + 8px);
-    z-index : 40
-}
-
-@media all and (min-width: 1024px) {
-    .carousel__button.is-close {
-        right: 40px
-    }
-}
-
-.fancybox__content>.carousel__button.is-close {
-    position: absolute;
-    top     : -40px;
-    right   : 0;
-    color   : var(--fancybox-color, #fff)
-}
-
-.fancybox__no-click,
-.fancybox__no-click button {
-    pointer-events: none
-}
-
-.fancybox__spinner {
-    position : absolute;
-    top      : 50%;
-    left     : 50%;
-    transform: translate(-50%, -50%);
-    width    : 50px;
-    height   : 50px;
-    color    : var(--fancybox-color, currentColor)
-}
-
-.fancybox__slide .fancybox__spinner {
-    cursor : pointer;
-    z-index: 1053
-}
-
-.fancybox__spinner svg {
-    animation       : fancybox-rotate 2s linear infinite;
-    transform-origin: center center;
-    position        : absolute;
-    top             : 0;
-    right           : 0;
-    bottom          : 0;
-    left            : 0;
-    margin          : auto;
-    width           : 100%;
-    height          : 100%
-}
-
-.fancybox__spinner svg circle {
-    fill             : none;
-    stroke-width     : 2.75;
-    stroke-miterlimit: 10;
-    stroke-dasharray : 1, 200;
-    stroke-dashoffset: 0;
-    animation        : fancybox-dash 1.5s ease-in-out infinite;
-    stroke-linecap   : round;
-    stroke           : currentColor
-}
-
-@keyframes fancybox-rotate {
-    100% {
-        transform: rotate(360deg)
-    }
-}
-
-@keyframes fancybox-dash {
-    0% {
-        stroke-dasharray : 1, 200;
-        stroke-dashoffset: 0
-    }
-
-    50% {
-        stroke-dasharray : 89, 200;
-        stroke-dashoffset: -35px
-    }
-
-    100% {
-        stroke-dasharray : 89, 200;
-        stroke-dashoffset: -124px
-    }
-}
-
-.fancybox__backdrop,
-.fancybox__caption,
-.fancybox__nav,
-.carousel__dots,
-.carousel__button.is-close {
-    opacity: var(--fancybox-opacity, 1)
-}
-
-.fancybox__container.is-animated[aria-hidden=false] .fancybox__backdrop,
-.fancybox__container.is-animated[aria-hidden=false] .fancybox__caption,
-.fancybox__container.is-animated[aria-hidden=false] .fancybox__nav,
-.fancybox__container.is-animated[aria-hidden=false] .carousel__dots,
-.fancybox__container.is-animated[aria-hidden=false] .carousel__button.is-close {
-    animation: .15s ease backwards fancybox-fadeIn
-}
-
-.fancybox__container.is-animated.is-closing .fancybox__backdrop,
-.fancybox__container.is-animated.is-closing .fancybox__caption,
-.fancybox__container.is-animated.is-closing .fancybox__nav,
-.fancybox__container.is-animated.is-closing .carousel__dots,
-.fancybox__container.is-animated.is-closing .carousel__button.is-close {
-    animation: .15s ease both fancybox-fadeOut
-}
-
-.fancybox-fadeIn {
-    animation: .15s ease both fancybox-fadeIn
-}
-
-.fancybox-fadeOut {
-    animation: .1s ease both fancybox-fadeOut
-}
-
-.fancybox-zoomInUp {
-    animation: .2s ease both fancybox-zoomInUp
-}
-
-.fancybox-zoomOutDown {
-    animation: .15s ease both fancybox-zoomOutDown
-}
-
-.fancybox-throwOutUp {
-    animation: .15s ease both fancybox-throwOutUp
-}
-
-.fancybox-throwOutDown {
-    animation: .15s ease both fancybox-throwOutDown
-}
-
-@keyframes fancybox-fadeIn {
-    from {
-        opacity: 0
-    }
-
-    to {
-        opacity: 1
-    }
-}
-
-@keyframes fancybox-fadeOut {
-    to {
-        opacity: 0
-    }
-}
-
-@keyframes fancybox-zoomInUp {
-    from {
-        transform: scale(0.97) translate3d(0, 16px, 0);
-        opacity  : 0
-    }
-
-    to {
-        transform: scale(1) translate3d(0, 0, 0);
-        opacity  : 1
-    }
-}
-
-@keyframes fancybox-zoomOutDown {
-    to {
-        transform: scale(0.97) translate3d(0, 16px, 0);
-        opacity  : 0
-    }
-}
-
-@keyframes fancybox-throwOutUp {
-    to {
-        transform: translate3d(0, -30%, 0);
-        opacity  : 0
-    }
-}
-
-@keyframes fancybox-throwOutDown {
-    to {
-        transform: translate3d(0, 30%, 0);
-        opacity  : 0
-    }
-}
-
-.fancybox__carousel .carousel__slide {
-    scrollbar-width: thin;
-    scrollbar-color: #ccc rgba(255, 255, 255, .1)
-}
-
-.fancybox__carousel .carousel__slide::-webkit-scrollbar {
-    width : 8px;
-    height: 8px
-}
-
-.fancybox__carousel .carousel__slide::-webkit-scrollbar-track {
-    background-color: rgba(255, 255, 255, .1)
-}
-
-.fancybox__carousel .carousel__slide::-webkit-scrollbar-thumb {
-    background-color: #ccc;
-    border-radius   : 2px;
-    box-shadow      : inset 0 0 4px rgba(0, 0, 0, .2)
-}
-
-.fancybox__carousel.is-draggable .fancybox__slide,
-.fancybox__carousel.is-draggable .fancybox__slide .fancybox__content {
-    cursor: move;
-    cursor: grab
-}
-
-.fancybox__carousel.is-dragging .fancybox__slide,
-.fancybox__carousel.is-dragging .fancybox__slide .fancybox__content {
-    cursor: move;
-    cursor: grabbing
-}
-
-.fancybox__carousel .fancybox__slide .fancybox__content {
-    cursor: auto
-}
-
-.fancybox__carousel .fancybox__slide.can-zoom_in .fancybox__content {
-    cursor: zoom-in
-}
-
-.fancybox__carousel .fancybox__slide.can-zoom_out .fancybox__content {
-    cursor: zoom-out
-}
-
-.fancybox__carousel .fancybox__slide.is-draggable .fancybox__content {
-    cursor: move;
-    cursor: grab
-}
-
-.fancybox__carousel .fancybox__slide.is-dragging .fancybox__content {
-    cursor: move;
-    cursor: grabbing
-}
-
-.fancybox__image {
-    transform-origin: 0 0;
-    user-select     : none;
-    transition      : none
-}
-
-.has-image .fancybox__content {
-    padding   : 0;
-    background: rgba(0, 0, 0, 0);
-    min-height: 1px
-}
-
-.is-closing .has-image .fancybox__content {
-    overflow: visible
-}
-
-.has-image[data-image-fit=contain] {
-    overflow    : visible;
-    touch-action: none
-}
-
-.has-image[data-image-fit=contain] .fancybox__content {
-    flex-direction: row;
-    flex-wrap     : wrap
-}
-
-.has-image[data-image-fit=contain] .fancybox__image {
-    max-width : 100%;
-    max-height: 100%;
-    object-fit: contain
-}
-
-.has-image[data-image-fit=contain-w] {
-    overflow-x: hidden;
-    overflow-y: auto
-}
-
-.has-image[data-image-fit=contain-w] .fancybox__content {
-    min-height: auto
-}
-
-.has-image[data-image-fit=contain-w] .fancybox__image {
-    max-width: 100%;
-    height   : auto
-}
-
-.has-image[data-image-fit=cover] {
-    overflow    : visible;
-    touch-action: none
-}
-
-.has-image[data-image-fit=cover] .fancybox__content {
-    width : 100%;
-    height: 100%
-}
-
-.has-image[data-image-fit=cover] .fancybox__image {
-    width     : 100%;
-    height    : 100%;
-    object-fit: cover
-}
-
-.fancybox__carousel .fancybox__slide.has-iframe .fancybox__content,
-.fancybox__carousel .fancybox__slide.has-map .fancybox__content,
-.fancybox__carousel .fancybox__slide.has-pdf .fancybox__content,
-.fancybox__carousel .fancybox__slide.has-video .fancybox__content,
-.fancybox__carousel .fancybox__slide.has-html5video .fancybox__content {
-    max-width  : 100%;
-    flex-shrink: 1;
-    min-height : 1px;
-    overflow   : visible
-}
-
-.fancybox__carousel .fancybox__slide.has-iframe .fancybox__content,
-.fancybox__carousel .fancybox__slide.has-map .fancybox__content,
-.fancybox__carousel .fancybox__slide.has-pdf .fancybox__content {
-    width : 100%;
-    height: 80%
-}
-
-.fancybox__carousel .fancybox__slide.has-video .fancybox__content,
-.fancybox__carousel .fancybox__slide.has-html5video .fancybox__content {
-    width     : 960px;
-    height    : 540px;
-    max-width : 100%;
-    max-height: 100%
-}
-
-.fancybox__carousel .fancybox__slide.has-map .fancybox__content,
-.fancybox__carousel .fancybox__slide.has-pdf .fancybox__content,
-.fancybox__carousel .fancybox__slide.has-video .fancybox__content,
-.fancybox__carousel .fancybox__slide.has-html5video .fancybox__content {
-    padding   : 0;
-    background: rgba(24, 24, 27, .9);
-    color     : #fff
-}
-
-.fancybox__carousel .fancybox__slide.has-map .fancybox__content {
-    background: #e5e3df
-}
-
-.fancybox__html5video,
-.fancybox__iframe {
-    border    : 0;
-    display   : block;
-    height    : 100%;
-    width     : 100%;
-    background: rgba(0, 0, 0, 0)
-}
-
-.fancybox-placeholder {
-    position    : absolute;
-    width       : 1px;
-    height      : 1px;
-    padding     : 0;
-    margin      : -1px;
-    overflow    : hidden;
-    clip        : rect(0, 0, 0, 0);
-    white-space : nowrap;
-    border-width: 0
-}
-
-.fancybox__thumbs {
-    flex    : 0 0 auto;
-    position: relative;
-    padding : 0px 3px;
-    opacity : var(--fancybox-opacity, 1)
-}
-
-.fancybox__container.is-animated[aria-hidden=false] .fancybox__thumbs {
-    animation: .15s ease-in backwards fancybox-fadeIn
-}
-
-.fancybox__container.is-animated.is-closing .fancybox__thumbs {
-    opacity: 0
-}
-
-.fancybox__thumbs .carousel__slide {
-    flex           : 0 0 auto;
-    width          : var(--fancybox-thumbs-width, 96px);
-    margin         : 0;
-    padding        : 8px 3px;
-    box-sizing     : content-box;
-    display        : flex;
-    align-items    : center;
-    justify-content: center;
-    overflow       : visible;
-    cursor         : pointer
-}
-
-.fancybox__thumbs .carousel__slide .fancybox__thumb::after {
-    content      : "";
-    position     : absolute;
-    top          : 0;
-    left         : 0;
-    right        : 0;
-    bottom       : 0;
-    border-width : 5px;
-    border-style : solid;
-    border-color : var(--fancybox-accent-color, rgba(34, 213, 233, 0.96));
-    opacity      : 0;
-    transition   : opacity .15s ease;
-    border-radius: var(--fancybox-thumbs-border-radius, 4px)
-}
-
-.fancybox__thumbs .carousel__slide.is-nav-selected .fancybox__thumb::after {
-    opacity: .92
-}
-
-.fancybox__thumbs .carousel__slide>* {
-    pointer-events: none;
-    user-select   : none
-}
-
-.fancybox__thumb {
-    position           : relative;
-    width              : 100%;
-    padding-top        : calc(100%/(var(--fancybox-thumbs-ratio, 1.5)));
-    background-size    : cover;
-    background-position: center center;
-    background-color   : rgba(255, 255, 255, .1);
-    background-repeat  : no-repeat;
-    border-radius      : var(--fancybox-thumbs-border-radius, 4px)
-}
-
-.fancybox__toolbar {
-    position                    : absolute;
-    top                         : 0;
-    right                       : 0;
-    left                        : 0;
-    z-index                     : 20;
-    background                  : linear-gradient(to top, hsla(0deg, 0%, 0%, 0) 0%, hsla(0deg, 0%, 0%, 0.006) 8.1%, hsla(0deg, 0%, 0%, 0.021) 15.5%, hsla(0deg, 0%, 0%, 0.046) 22.5%, hsla(0deg, 0%, 0%, 0.077) 29%, hsla(0deg, 0%, 0%, 0.114) 35.3%, hsla(0deg, 0%, 0%, 0.155) 41.2%, hsla(0deg, 0%, 0%, 0.198) 47.1%, hsla(0deg, 0%, 0%, 0.242) 52.9%, hsla(0deg, 0%, 0%, 0.285) 58.8%, hsla(0deg, 0%, 0%, 0.326) 64.7%, hsla(0deg, 0%, 0%, 0.363) 71%, hsla(0deg, 0%, 0%, 0.394) 77.5%, hsla(0deg, 0%, 0%, 0.419) 84.5%, hsla(0deg, 0%, 0%, 0.434) 91.9%, hsla(0deg, 0%, 0%, 0.44) 100%);
-    padding                     : 0;
-    touch-action                : none;
-    display                     : flex;
-    justify-content             : space-between;
-    --carousel-button-svg-width : 20px;
-    --carousel-button-svg-height: 20px;
-    opacity                     : var(--fancybox-opacity, 1);
-    text-shadow                 : var(--fancybox-toolbar-text-shadow, 1px 1px 1px rgba(0, 0, 0, 0.4))
-}
-
-@media all and (min-width: 1024px) {
-    .fancybox__toolbar {
-        padding: 8px
-    }
-}
-
-.fancybox__container.is-animated[aria-hidden=false] .fancybox__toolbar {
-    animation: .15s ease-in backwards fancybox-fadeIn
-}
-
-.fancybox__container.is-animated.is-closing .fancybox__toolbar {
-    opacity: 0
-}
-
-.fancybox__toolbar__items {
-    display: flex
-}
-
-.fancybox__toolbar__items--left {
-    margin-right: auto
-}
-
-.fancybox__toolbar__items--center {
-    position : absolute;
-    left     : 50%;
-    transform: translateX(-50%)
-}
-
-.fancybox__toolbar__items--right {
-    margin-left: auto
-}
-
-@media(max-width: 640px) {
-    .fancybox__toolbar__items--center:not(:last-child) {
-        display: none
-    }
-}
-
-.fancybox__counter {
-    min-width             : 72px;
-    padding               : 0 10px;
-    line-height           : var(--carousel-button-height, 48px);
-    text-align            : center;
-    font-size             : 17px;
-    font-variant-numeric  : tabular-nums;
-    -webkit-font-smoothing: subpixel-antialiased
-}
-
-.fancybox__progress {
-    background                : var(--fancybox-accent-color, rgba(34, 213, 233, 0.96));
-    height                    : 3px;
-    left                      : 0;
-    position                  : absolute;
-    right                     : 0;
-    top                       : 0;
-    transform                 : scaleX(0);
-    transform-origin          : 0;
-    transition-property       : transform;
-    transition-timing-function: linear;
-    z-index                   : 30;
-    user-select               : none
-}
-
-.fancybox__container:fullscreen::backdrop {
-    opacity: 0
-}
-
-.fancybox__button--fullscreen g:nth-child(2) {
-    display: none
-}
-
-.fancybox__container:fullscreen .fancybox__button--fullscreen g:nth-child(1) {
-    display: none
-}
-
-.fancybox__container:fullscreen .fancybox__button--fullscreen g:nth-child(2) {
-    display: block
-}
-
-.fancybox__button--slideshow g:nth-child(2) {
-    display: none
-}
-
-.fancybox__container.has-slideshow .fancybox__button--slideshow g:nth-child(1) {
-    display: none
-}
-
-.fancybox__container.has-slideshow .fancybox__button--slideshow g:nth-child(2) {
-    display: block
-}
\ No newline at end of file
+.carousel{position:relative;box-sizing:border-box}.carousel *,.carousel *:before,.carousel *:after{box-sizing:inherit}.carousel.is-draggable{cursor:move;cursor:grab}.carousel.is-dragging{cursor:move;cursor:grabbing}.carousel__viewport{position:relative;overflow:hidden;max-width:100%;max-height:100%}.carousel__track{display:flex}.carousel__slide{flex:0 0 auto;width:var(--carousel-slide-width, 60%);max-width:100%;padding:1rem;position:relative;overflow-x:hidden;overflow-y:auto;overscroll-behavior:contain}.has-dots{margin-bottom:calc(0.5rem + 22px)}.carousel__dots{margin:0 auto;padding:0;position:absolute;top:calc(100% + 0.5rem);left:0;right:0;display:flex;justify-content:center;list-style:none;user-select:none}.carousel__dots .carousel__dot{margin:0;padding:0;display:block;position:relative;width:22px;height:22px;cursor:pointer}.carousel__dots .carousel__dot:after{content:"";width:8px;height:8px;border-radius:50%;position:absolute;top:50%;left:50%;transform:translate(-50%, -50%);background-color:currentColor;opacity:.25;transition:opacity .15s ease-in-out}.carousel__dots .carousel__dot.is-selected:after{opacity:1}.carousel__button{width:var(--carousel-button-width, 48px);height:var(--carousel-button-height, 48px);padding:0;border:0;display:flex;justify-content:center;align-items:center;pointer-events:all;cursor:pointer;color:var(--carousel-button-color, currentColor);background:var(--carousel-button-bg, transparent);border-radius:var(--carousel-button-border-radius, 50%);box-shadow:var(--carousel-button-shadow, none);transition:opacity .15s ease}.carousel__button.is-prev,.carousel__button.is-next{position:absolute;top:50%;transform:translateY(-50%)}.carousel__button.is-prev{left:10px}.carousel__button.is-next{right:10px}.carousel__button[disabled]{cursor:default;opacity:.3}.carousel__button svg{width:var(--carousel-button-svg-width, 50%);height:var(--carousel-button-svg-height, 50%);fill:none;stroke:currentColor;stroke-width:var(--carousel-button-svg-stroke-width, 1.5);stroke-linejoin:bevel;stroke-linecap:round;filter:var(--carousel-button-svg-filter, none);pointer-events:none}html.with-fancybox{scroll-behavior:auto}body.compensate-for-scrollbar{overflow:hidden !important;touch-action:none}.fancybox__container{position:fixed;top:0;left:0;bottom:0;right:0;direction:ltr;margin:0;padding:env(safe-area-inset-top, 0px) env(safe-area-inset-right, 0px) env(safe-area-inset-bottom, 0px) env(safe-area-inset-left, 0px);box-sizing:border-box;display:flex;flex-direction:column;color:var(--fancybox-color, #fff);-webkit-tap-highlight-color:rgba(0,0,0,0);overflow:hidden;z-index:1050;outline:none;transform-origin:top left;--carousel-button-width: 48px;--carousel-button-height: 48px;--carousel-button-svg-width: 24px;--carousel-button-svg-height: 24px;--carousel-button-svg-stroke-width: 2.5;--carousel-button-svg-filter: drop-shadow(1px 1px 1px rgba(0, 0, 0, 0.4))}.fancybox__container *,.fancybox__container *::before,.fancybox__container *::after{box-sizing:inherit}.fancybox__container :focus{outline:none}body:not(.is-using-mouse) .fancybox__container :focus{box-shadow:0 0 0 1px #fff,0 0 0 2px var(--fancybox-accent-color, rgba(1, 210, 232, 0.94))}@media all and (min-width: 1024px){.fancybox__container{--carousel-button-width:48px;--carousel-button-height:48px;--carousel-button-svg-width:27px;--carousel-button-svg-height:27px}}.fancybox__backdrop{position:absolute;top:0;right:0;bottom:0;left:0;z-index:-1;background:var(--fancybox-bg, rgba(24, 24, 27, 0.92))}.fancybox__carousel{position:relative;flex:1 1 auto;min-height:0;height:100%;z-index:10}.fancybox__carousel.has-dots{margin-bottom:calc(0.5rem + 22px)}.fancybox__viewport{position:relative;width:100%;height:100%;overflow:visible;cursor:default}.fancybox__track{display:flex;height:100%}.fancybox__slide{flex:0 0 auto;width:100%;max-width:100%;margin:0;padding:48px 8px 8px 8px;position:relative;overscroll-behavior:contain;display:flex;flex-direction:column;outline:0;overflow:auto;--carousel-button-width: 36px;--carousel-button-height: 36px;--carousel-button-svg-width: 22px;--carousel-button-svg-height: 22px}.fancybox__slide::before,.fancybox__slide::after{content:"";flex:0 0 0;margin:auto}@media all and (min-width: 1024px){.fancybox__slide{padding:64px 100px}}.fancybox__content{margin:0 env(safe-area-inset-right, 0px) 0 env(safe-area-inset-left, 0px);padding:36px;color:var(--fancybox-content-color, #374151);background:var(--fancybox-content-bg, #fff);position:relative;align-self:center;display:flex;flex-direction:column;z-index:20}.fancybox__content :focus:not(.carousel__button.is-close){outline:thin dotted;box-shadow:none}.fancybox__caption{align-self:center;max-width:100%;margin:0;padding:1rem 0 0 0;line-height:1.375;color:var(--fancybox-color, currentColor);visibility:visible;cursor:auto;flex-shrink:0;overflow-wrap:anywhere}.is-loading .fancybox__caption{visibility:hidden}.fancybox__container>.carousel__dots{top:100%;color:var(--fancybox-color, #fff)}.fancybox__nav .carousel__button{z-index:40}.fancybox__nav .carousel__button.is-next{right:8px}@media all and (min-width: 1024px){.fancybox__nav .carousel__button.is-next{right:40px}}.fancybox__nav .carousel__button.is-prev{left:8px}@media all and (min-width: 1024px){.fancybox__nav .carousel__button.is-prev{left:40px}}.carousel__button.is-close{position:absolute;top:8px;right:8px;top:calc(env(safe-area-inset-top, 0px) + 8px);right:calc(env(safe-area-inset-right, 0px) + 8px);z-index:40}@media all and (min-width: 1024px){.carousel__button.is-close{right:40px}}.fancybox__content>.carousel__button.is-close{position:absolute;top:-40px;right:0;color:var(--fancybox-color, #fff)}.fancybox__no-click,.fancybox__no-click button{pointer-events:none}.fancybox__spinner{position:absolute;top:50%;left:50%;transform:translate(-50%, -50%);width:50px;height:50px;color:var(--fancybox-color, currentColor)}.fancybox__slide .fancybox__spinner{cursor:pointer;z-index:1053}.fancybox__spinner svg{animation:fancybox-rotate 2s linear infinite;transform-origin:center center;position:absolute;top:0;right:0;bottom:0;left:0;margin:auto;width:100%;height:100%}.fancybox__spinner svg circle{fill:none;stroke-width:2.75;stroke-miterlimit:10;stroke-dasharray:1,200;stroke-dashoffset:0;animation:fancybox-dash 1.5s ease-in-out infinite;stroke-linecap:round;stroke:currentColor}@keyframes fancybox-rotate{100%{transform:rotate(360deg)}}@keyframes fancybox-dash{0%{stroke-dasharray:1,200;stroke-dashoffset:0}50%{stroke-dasharray:89,200;stroke-dashoffset:-35px}100%{stroke-dasharray:89,200;stroke-dashoffset:-124px}}.fancybox__backdrop,.fancybox__caption,.fancybox__nav,.carousel__dots,.carousel__button.is-close{opacity:var(--fancybox-opacity, 1)}.fancybox__container.is-animated[aria-hidden=false] .fancybox__backdrop,.fancybox__container.is-animated[aria-hidden=false] .fancybox__caption,.fancybox__container.is-animated[aria-hidden=false] .fancybox__nav,.fancybox__container.is-animated[aria-hidden=false] .carousel__dots,.fancybox__container.is-animated[aria-hidden=false] .carousel__button.is-close{animation:.15s ease backwards fancybox-fadeIn}.fancybox__container.is-animated.is-closing .fancybox__backdrop,.fancybox__container.is-animated.is-closing .fancybox__caption,.fancybox__container.is-animated.is-closing .fancybox__nav,.fancybox__container.is-animated.is-closing .carousel__dots,.fancybox__container.is-animated.is-closing .carousel__button.is-close{animation:.15s ease both fancybox-fadeOut}.fancybox-fadeIn{animation:.15s ease both fancybox-fadeIn}.fancybox-fadeOut{animation:.1s ease both fancybox-fadeOut}.fancybox-zoomInUp{animation:.2s ease both fancybox-zoomInUp}.fancybox-zoomOutDown{animation:.15s ease both fancybox-zoomOutDown}.fancybox-throwOutUp{animation:.15s ease both fancybox-throwOutUp}.fancybox-throwOutDown{animation:.15s ease both fancybox-throwOutDown}@keyframes fancybox-fadeIn{from{opacity:0}to{opacity:1}}@keyframes fancybox-fadeOut{to{opacity:0}}@keyframes fancybox-zoomInUp{from{transform:scale(0.97) translate3d(0, 16px, 0);opacity:0}to{transform:scale(1) translate3d(0, 0, 0);opacity:1}}@keyframes fancybox-zoomOutDown{to{transform:scale(0.97) translate3d(0, 16px, 0);opacity:0}}@keyframes fancybox-throwOutUp{to{transform:translate3d(0, -30%, 0);opacity:0}}@keyframes fancybox-throwOutDown{to{transform:translate3d(0, 30%, 0);opacity:0}}.fancybox__carousel .carousel__slide{scrollbar-width:thin;scrollbar-color:#ccc rgba(255,255,255,.1)}.fancybox__carousel .carousel__slide::-webkit-scrollbar{width:8px;height:8px}.fancybox__carousel .carousel__slide::-webkit-scrollbar-track{background-color:rgba(255,255,255,.1)}.fancybox__carousel .carousel__slide::-webkit-scrollbar-thumb{background-color:#ccc;border-radius:2px;box-shadow:inset 0 0 4px rgba(0,0,0,.2)}.fancybox__carousel.is-draggable .fancybox__slide,.fancybox__carousel.is-draggable .fancybox__slide .fancybox__content{cursor:move;cursor:grab}.fancybox__carousel.is-dragging .fancybox__slide,.fancybox__carousel.is-dragging .fancybox__slide .fancybox__content{cursor:move;cursor:grabbing}.fancybox__carousel .fancybox__slide .fancybox__content{cursor:auto}.fancybox__carousel .fancybox__slide.can-zoom_in .fancybox__content{cursor:zoom-in}.fancybox__carousel .fancybox__slide.can-zoom_out .fancybox__content{cursor:zoom-out}.fancybox__carousel .fancybox__slide.is-draggable .fancybox__content{cursor:move;cursor:grab}.fancybox__carousel .fancybox__slide.is-dragging .fancybox__content{cursor:move;cursor:grabbing}.fancybox__image{transform-origin:0 0;user-select:none;transition:none}.has-image .fancybox__content{padding:0;background:rgba(0,0,0,0);min-height:1px}.is-closing .has-image .fancybox__content{overflow:visible}.has-image[data-image-fit=contain]{overflow:visible;touch-action:none}.has-image[data-image-fit=contain] .fancybox__content{flex-direction:row;flex-wrap:wrap}.has-image[data-image-fit=contain] .fancybox__image{max-width:100%;max-height:100%;object-fit:contain}.has-image[data-image-fit=contain-w]{overflow-x:hidden;overflow-y:auto}.has-image[data-image-fit=contain-w] .fancybox__content{min-height:auto}.has-image[data-image-fit=contain-w] .fancybox__image{max-width:100%;height:auto}.has-image[data-image-fit=cover]{overflow:visible;touch-action:none}.has-image[data-image-fit=cover] .fancybox__content{width:100%;height:100%}.has-image[data-image-fit=cover] .fancybox__image{width:100%;height:100%;object-fit:cover}.fancybox__carousel .fancybox__slide.has-iframe .fancybox__content,.fancybox__carousel .fancybox__slide.has-map .fancybox__content,.fancybox__carousel .fancybox__slide.has-pdf .fancybox__content,.fancybox__carousel .fancybox__slide.has-video .fancybox__content,.fancybox__carousel .fancybox__slide.has-html5video .fancybox__content{max-width:100%;flex-shrink:1;min-height:1px;overflow:visible}.fancybox__carousel .fancybox__slide.has-iframe .fancybox__content,.fancybox__carousel .fancybox__slide.has-map .fancybox__content,.fancybox__carousel .fancybox__slide.has-pdf .fancybox__content{width:100%;height:80%}.fancybox__carousel .fancybox__slide.has-video .fancybox__content,.fancybox__carousel .fancybox__slide.has-html5video .fancybox__content{width:960px;height:540px;max-width:100%;max-height:100%}.fancybox__carousel .fancybox__slide.has-map .fancybox__content,.fancybox__carousel .fancybox__slide.has-pdf .fancybox__content,.fancybox__carousel .fancybox__slide.has-video .fancybox__content,.fancybox__carousel .fancybox__slide.has-html5video .fancybox__content{padding:0;background:rgba(24,24,27,.9);color:#fff}.fancybox__carousel .fancybox__slide.has-map .fancybox__content{background:#e5e3df}.fancybox__html5video,.fancybox__iframe{border:0;display:block;height:100%;width:100%;background:rgba(0,0,0,0)}.fancybox-placeholder{position:absolute;width:1px;height:1px;padding:0;margin:-1px;overflow:hidden;clip:rect(0, 0, 0, 0);white-space:nowrap;border-width:0}.fancybox__thumbs{flex:0 0 auto;position:relative;padding:0px 3px;opacity:var(--fancybox-opacity, 1)}.fancybox__container.is-animated[aria-hidden=false] .fancybox__thumbs{animation:.15s ease-in backwards fancybox-fadeIn}.fancybox__container.is-animated.is-closing .fancybox__thumbs{opacity:0}.fancybox__thumbs .carousel__slide{flex:0 0 auto;width:var(--fancybox-thumbs-width, 96px);margin:0;padding:8px 3px;box-sizing:content-box;display:flex;align-items:center;justify-content:center;overflow:visible;cursor:pointer}.fancybox__thumbs .carousel__slide .fancybox__thumb::after{content:"";position:absolute;top:0;left:0;right:0;bottom:0;border-width:5px;border-style:solid;border-color:var(--fancybox-accent-color, rgba(34, 213, 233, 0.96));opacity:0;transition:opacity .15s ease;border-radius:var(--fancybox-thumbs-border-radius, 4px)}.fancybox__thumbs .carousel__slide.is-nav-selected .fancybox__thumb::after{opacity:.92}.fancybox__thumbs .carousel__slide>*{pointer-events:none;user-select:none}.fancybox__thumb{position:relative;width:100%;padding-top:calc(100%/(var(--fancybox-thumbs-ratio, 1.5)));background-size:cover;background-position:center center;background-color:rgba(255,255,255,.1);background-repeat:no-repeat;border-radius:var(--fancybox-thumbs-border-radius, 4px)}.fancybox__toolbar{position:absolute;top:0;right:0;left:0;z-index:20;background:linear-gradient(to top, hsla(0deg, 0%, 0%, 0) 0%, hsla(0deg, 0%, 0%, 0.006) 8.1%, hsla(0deg, 0%, 0%, 0.021) 15.5%, hsla(0deg, 0%, 0%, 0.046) 22.5%, hsla(0deg, 0%, 0%, 0.077) 29%, hsla(0deg, 0%, 0%, 0.114) 35.3%, hsla(0deg, 0%, 0%, 0.155) 41.2%, hsla(0deg, 0%, 0%, 0.198) 47.1%, hsla(0deg, 0%, 0%, 0.242) 52.9%, hsla(0deg, 0%, 0%, 0.285) 58.8%, hsla(0deg, 0%, 0%, 0.326) 64.7%, hsla(0deg, 0%, 0%, 0.363) 71%, hsla(0deg, 0%, 0%, 0.394) 77.5%, hsla(0deg, 0%, 0%, 0.419) 84.5%, hsla(0deg, 0%, 0%, 0.434) 91.9%, hsla(0deg, 0%, 0%, 0.44) 100%);padding:0;touch-action:none;display:flex;justify-content:space-between;--carousel-button-svg-width: 20px;--carousel-button-svg-height: 20px;opacity:var(--fancybox-opacity, 1);text-shadow:var(--fancybox-toolbar-text-shadow, 1px 1px 1px rgba(0, 0, 0, 0.4))}@media all and (min-width: 1024px){.fancybox__toolbar{padding:8px}}.fancybox__container.is-animated[aria-hidden=false] .fancybox__toolbar{animation:.15s ease-in backwards fancybox-fadeIn}.fancybox__container.is-animated.is-closing .fancybox__toolbar{opacity:0}.fancybox__toolbar__items{display:flex}.fancybox__toolbar__items--left{margin-right:auto}.fancybox__toolbar__items--center{position:absolute;left:50%;transform:translateX(-50%)}.fancybox__toolbar__items--right{margin-left:auto}@media(max-width: 640px){.fancybox__toolbar__items--center:not(:last-child){display:none}}.fancybox__counter{min-width:72px;padding:0 10px;line-height:var(--carousel-button-height, 48px);text-align:center;font-size:17px;font-variant-numeric:tabular-nums;-webkit-font-smoothing:subpixel-antialiased}.fancybox__progress{background:var(--fancybox-accent-color, rgba(34, 213, 233, 0.96));height:3px;left:0;position:absolute;right:0;top:0;transform:scaleX(0);transform-origin:0;transition-property:transform;transition-timing-function:linear;z-index:30;user-select:none}.fancybox__container:fullscreen::backdrop{opacity:0}.fancybox__button--fullscreen g:nth-child(2){display:none}.fancybox__container:fullscreen .fancybox__button--fullscreen g:nth-child(1){display:none}.fancybox__container:fullscreen .fancybox__button--fullscreen g:nth-child(2){display:block}.fancybox__button--slideshow g:nth-child(2){display:none}.fancybox__container.has-slideshow .fancybox__button--slideshow g:nth-child(1){display:none}.fancybox__container.has-slideshow .fancybox__button--slideshow g:nth-child(2){display:block}
\ No newline at end of file

From 12a38c2f9699a2e9dbd6f1cda0fcf0050c30f2a2 Mon Sep 17 00:00:00 2001
From: zhoupzh <zhoupzh@pcl.ac.cn>
Date: Mon, 7 Nov 2022 11:30:58 +0800
Subject: [PATCH 080/187] fix issue

---
 web_src/less/vendor/fancyapp.css | 731 ++++++++++++++++++++++++++++++-
 1 file changed, 730 insertions(+), 1 deletion(-)

diff --git a/web_src/less/vendor/fancyapp.css b/web_src/less/vendor/fancyapp.css
index 43b5537b1..740919a0c 100644
--- a/web_src/less/vendor/fancyapp.css
+++ b/web_src/less/vendor/fancyapp.css
@@ -1 +1,730 @@
-.carousel{position:relative;box-sizing:border-box}.carousel *,.carousel *:before,.carousel *:after{box-sizing:inherit}.carousel.is-draggable{cursor:move;cursor:grab}.carousel.is-dragging{cursor:move;cursor:grabbing}.carousel__viewport{position:relative;overflow:hidden;max-width:100%;max-height:100%}.carousel__track{display:flex}.carousel__slide{flex:0 0 auto;width:var(--carousel-slide-width, 60%);max-width:100%;padding:1rem;position:relative;overflow-x:hidden;overflow-y:auto;overscroll-behavior:contain}.has-dots{margin-bottom:calc(0.5rem + 22px)}.carousel__dots{margin:0 auto;padding:0;position:absolute;top:calc(100% + 0.5rem);left:0;right:0;display:flex;justify-content:center;list-style:none;user-select:none}.carousel__dots .carousel__dot{margin:0;padding:0;display:block;position:relative;width:22px;height:22px;cursor:pointer}.carousel__dots .carousel__dot:after{content:"";width:8px;height:8px;border-radius:50%;position:absolute;top:50%;left:50%;transform:translate(-50%, -50%);background-color:currentColor;opacity:.25;transition:opacity .15s ease-in-out}.carousel__dots .carousel__dot.is-selected:after{opacity:1}.carousel__button{width:var(--carousel-button-width, 48px);height:var(--carousel-button-height, 48px);padding:0;border:0;display:flex;justify-content:center;align-items:center;pointer-events:all;cursor:pointer;color:var(--carousel-button-color, currentColor);background:var(--carousel-button-bg, transparent);border-radius:var(--carousel-button-border-radius, 50%);box-shadow:var(--carousel-button-shadow, none);transition:opacity .15s ease}.carousel__button.is-prev,.carousel__button.is-next{position:absolute;top:50%;transform:translateY(-50%)}.carousel__button.is-prev{left:10px}.carousel__button.is-next{right:10px}.carousel__button[disabled]{cursor:default;opacity:.3}.carousel__button svg{width:var(--carousel-button-svg-width, 50%);height:var(--carousel-button-svg-height, 50%);fill:none;stroke:currentColor;stroke-width:var(--carousel-button-svg-stroke-width, 1.5);stroke-linejoin:bevel;stroke-linecap:round;filter:var(--carousel-button-svg-filter, none);pointer-events:none}html.with-fancybox{scroll-behavior:auto}body.compensate-for-scrollbar{overflow:hidden !important;touch-action:none}.fancybox__container{position:fixed;top:0;left:0;bottom:0;right:0;direction:ltr;margin:0;padding:env(safe-area-inset-top, 0px) env(safe-area-inset-right, 0px) env(safe-area-inset-bottom, 0px) env(safe-area-inset-left, 0px);box-sizing:border-box;display:flex;flex-direction:column;color:var(--fancybox-color, #fff);-webkit-tap-highlight-color:rgba(0,0,0,0);overflow:hidden;z-index:1050;outline:none;transform-origin:top left;--carousel-button-width: 48px;--carousel-button-height: 48px;--carousel-button-svg-width: 24px;--carousel-button-svg-height: 24px;--carousel-button-svg-stroke-width: 2.5;--carousel-button-svg-filter: drop-shadow(1px 1px 1px rgba(0, 0, 0, 0.4))}.fancybox__container *,.fancybox__container *::before,.fancybox__container *::after{box-sizing:inherit}.fancybox__container :focus{outline:none}body:not(.is-using-mouse) .fancybox__container :focus{box-shadow:0 0 0 1px #fff,0 0 0 2px var(--fancybox-accent-color, rgba(1, 210, 232, 0.94))}@media all and (min-width: 1024px){.fancybox__container{--carousel-button-width:48px;--carousel-button-height:48px;--carousel-button-svg-width:27px;--carousel-button-svg-height:27px}}.fancybox__backdrop{position:absolute;top:0;right:0;bottom:0;left:0;z-index:-1;background:var(--fancybox-bg, rgba(24, 24, 27, 0.92))}.fancybox__carousel{position:relative;flex:1 1 auto;min-height:0;height:100%;z-index:10}.fancybox__carousel.has-dots{margin-bottom:calc(0.5rem + 22px)}.fancybox__viewport{position:relative;width:100%;height:100%;overflow:visible;cursor:default}.fancybox__track{display:flex;height:100%}.fancybox__slide{flex:0 0 auto;width:100%;max-width:100%;margin:0;padding:48px 8px 8px 8px;position:relative;overscroll-behavior:contain;display:flex;flex-direction:column;outline:0;overflow:auto;--carousel-button-width: 36px;--carousel-button-height: 36px;--carousel-button-svg-width: 22px;--carousel-button-svg-height: 22px}.fancybox__slide::before,.fancybox__slide::after{content:"";flex:0 0 0;margin:auto}@media all and (min-width: 1024px){.fancybox__slide{padding:64px 100px}}.fancybox__content{margin:0 env(safe-area-inset-right, 0px) 0 env(safe-area-inset-left, 0px);padding:36px;color:var(--fancybox-content-color, #374151);background:var(--fancybox-content-bg, #fff);position:relative;align-self:center;display:flex;flex-direction:column;z-index:20}.fancybox__content :focus:not(.carousel__button.is-close){outline:thin dotted;box-shadow:none}.fancybox__caption{align-self:center;max-width:100%;margin:0;padding:1rem 0 0 0;line-height:1.375;color:var(--fancybox-color, currentColor);visibility:visible;cursor:auto;flex-shrink:0;overflow-wrap:anywhere}.is-loading .fancybox__caption{visibility:hidden}.fancybox__container>.carousel__dots{top:100%;color:var(--fancybox-color, #fff)}.fancybox__nav .carousel__button{z-index:40}.fancybox__nav .carousel__button.is-next{right:8px}@media all and (min-width: 1024px){.fancybox__nav .carousel__button.is-next{right:40px}}.fancybox__nav .carousel__button.is-prev{left:8px}@media all and (min-width: 1024px){.fancybox__nav .carousel__button.is-prev{left:40px}}.carousel__button.is-close{position:absolute;top:8px;right:8px;top:calc(env(safe-area-inset-top, 0px) + 8px);right:calc(env(safe-area-inset-right, 0px) + 8px);z-index:40}@media all and (min-width: 1024px){.carousel__button.is-close{right:40px}}.fancybox__content>.carousel__button.is-close{position:absolute;top:-40px;right:0;color:var(--fancybox-color, #fff)}.fancybox__no-click,.fancybox__no-click button{pointer-events:none}.fancybox__spinner{position:absolute;top:50%;left:50%;transform:translate(-50%, -50%);width:50px;height:50px;color:var(--fancybox-color, currentColor)}.fancybox__slide .fancybox__spinner{cursor:pointer;z-index:1053}.fancybox__spinner svg{animation:fancybox-rotate 2s linear infinite;transform-origin:center center;position:absolute;top:0;right:0;bottom:0;left:0;margin:auto;width:100%;height:100%}.fancybox__spinner svg circle{fill:none;stroke-width:2.75;stroke-miterlimit:10;stroke-dasharray:1,200;stroke-dashoffset:0;animation:fancybox-dash 1.5s ease-in-out infinite;stroke-linecap:round;stroke:currentColor}@keyframes fancybox-rotate{100%{transform:rotate(360deg)}}@keyframes fancybox-dash{0%{stroke-dasharray:1,200;stroke-dashoffset:0}50%{stroke-dasharray:89,200;stroke-dashoffset:-35px}100%{stroke-dasharray:89,200;stroke-dashoffset:-124px}}.fancybox__backdrop,.fancybox__caption,.fancybox__nav,.carousel__dots,.carousel__button.is-close{opacity:var(--fancybox-opacity, 1)}.fancybox__container.is-animated[aria-hidden=false] .fancybox__backdrop,.fancybox__container.is-animated[aria-hidden=false] .fancybox__caption,.fancybox__container.is-animated[aria-hidden=false] .fancybox__nav,.fancybox__container.is-animated[aria-hidden=false] .carousel__dots,.fancybox__container.is-animated[aria-hidden=false] .carousel__button.is-close{animation:.15s ease backwards fancybox-fadeIn}.fancybox__container.is-animated.is-closing .fancybox__backdrop,.fancybox__container.is-animated.is-closing .fancybox__caption,.fancybox__container.is-animated.is-closing .fancybox__nav,.fancybox__container.is-animated.is-closing .carousel__dots,.fancybox__container.is-animated.is-closing .carousel__button.is-close{animation:.15s ease both fancybox-fadeOut}.fancybox-fadeIn{animation:.15s ease both fancybox-fadeIn}.fancybox-fadeOut{animation:.1s ease both fancybox-fadeOut}.fancybox-zoomInUp{animation:.2s ease both fancybox-zoomInUp}.fancybox-zoomOutDown{animation:.15s ease both fancybox-zoomOutDown}.fancybox-throwOutUp{animation:.15s ease both fancybox-throwOutUp}.fancybox-throwOutDown{animation:.15s ease both fancybox-throwOutDown}@keyframes fancybox-fadeIn{from{opacity:0}to{opacity:1}}@keyframes fancybox-fadeOut{to{opacity:0}}@keyframes fancybox-zoomInUp{from{transform:scale(0.97) translate3d(0, 16px, 0);opacity:0}to{transform:scale(1) translate3d(0, 0, 0);opacity:1}}@keyframes fancybox-zoomOutDown{to{transform:scale(0.97) translate3d(0, 16px, 0);opacity:0}}@keyframes fancybox-throwOutUp{to{transform:translate3d(0, -30%, 0);opacity:0}}@keyframes fancybox-throwOutDown{to{transform:translate3d(0, 30%, 0);opacity:0}}.fancybox__carousel .carousel__slide{scrollbar-width:thin;scrollbar-color:#ccc rgba(255,255,255,.1)}.fancybox__carousel .carousel__slide::-webkit-scrollbar{width:8px;height:8px}.fancybox__carousel .carousel__slide::-webkit-scrollbar-track{background-color:rgba(255,255,255,.1)}.fancybox__carousel .carousel__slide::-webkit-scrollbar-thumb{background-color:#ccc;border-radius:2px;box-shadow:inset 0 0 4px rgba(0,0,0,.2)}.fancybox__carousel.is-draggable .fancybox__slide,.fancybox__carousel.is-draggable .fancybox__slide .fancybox__content{cursor:move;cursor:grab}.fancybox__carousel.is-dragging .fancybox__slide,.fancybox__carousel.is-dragging .fancybox__slide .fancybox__content{cursor:move;cursor:grabbing}.fancybox__carousel .fancybox__slide .fancybox__content{cursor:auto}.fancybox__carousel .fancybox__slide.can-zoom_in .fancybox__content{cursor:zoom-in}.fancybox__carousel .fancybox__slide.can-zoom_out .fancybox__content{cursor:zoom-out}.fancybox__carousel .fancybox__slide.is-draggable .fancybox__content{cursor:move;cursor:grab}.fancybox__carousel .fancybox__slide.is-dragging .fancybox__content{cursor:move;cursor:grabbing}.fancybox__image{transform-origin:0 0;user-select:none;transition:none}.has-image .fancybox__content{padding:0;background:rgba(0,0,0,0);min-height:1px}.is-closing .has-image .fancybox__content{overflow:visible}.has-image[data-image-fit=contain]{overflow:visible;touch-action:none}.has-image[data-image-fit=contain] .fancybox__content{flex-direction:row;flex-wrap:wrap}.has-image[data-image-fit=contain] .fancybox__image{max-width:100%;max-height:100%;object-fit:contain}.has-image[data-image-fit=contain-w]{overflow-x:hidden;overflow-y:auto}.has-image[data-image-fit=contain-w] .fancybox__content{min-height:auto}.has-image[data-image-fit=contain-w] .fancybox__image{max-width:100%;height:auto}.has-image[data-image-fit=cover]{overflow:visible;touch-action:none}.has-image[data-image-fit=cover] .fancybox__content{width:100%;height:100%}.has-image[data-image-fit=cover] .fancybox__image{width:100%;height:100%;object-fit:cover}.fancybox__carousel .fancybox__slide.has-iframe .fancybox__content,.fancybox__carousel .fancybox__slide.has-map .fancybox__content,.fancybox__carousel .fancybox__slide.has-pdf .fancybox__content,.fancybox__carousel .fancybox__slide.has-video .fancybox__content,.fancybox__carousel .fancybox__slide.has-html5video .fancybox__content{max-width:100%;flex-shrink:1;min-height:1px;overflow:visible}.fancybox__carousel .fancybox__slide.has-iframe .fancybox__content,.fancybox__carousel .fancybox__slide.has-map .fancybox__content,.fancybox__carousel .fancybox__slide.has-pdf .fancybox__content{width:100%;height:80%}.fancybox__carousel .fancybox__slide.has-video .fancybox__content,.fancybox__carousel .fancybox__slide.has-html5video .fancybox__content{width:960px;height:540px;max-width:100%;max-height:100%}.fancybox__carousel .fancybox__slide.has-map .fancybox__content,.fancybox__carousel .fancybox__slide.has-pdf .fancybox__content,.fancybox__carousel .fancybox__slide.has-video .fancybox__content,.fancybox__carousel .fancybox__slide.has-html5video .fancybox__content{padding:0;background:rgba(24,24,27,.9);color:#fff}.fancybox__carousel .fancybox__slide.has-map .fancybox__content{background:#e5e3df}.fancybox__html5video,.fancybox__iframe{border:0;display:block;height:100%;width:100%;background:rgba(0,0,0,0)}.fancybox-placeholder{position:absolute;width:1px;height:1px;padding:0;margin:-1px;overflow:hidden;clip:rect(0, 0, 0, 0);white-space:nowrap;border-width:0}.fancybox__thumbs{flex:0 0 auto;position:relative;padding:0px 3px;opacity:var(--fancybox-opacity, 1)}.fancybox__container.is-animated[aria-hidden=false] .fancybox__thumbs{animation:.15s ease-in backwards fancybox-fadeIn}.fancybox__container.is-animated.is-closing .fancybox__thumbs{opacity:0}.fancybox__thumbs .carousel__slide{flex:0 0 auto;width:var(--fancybox-thumbs-width, 96px);margin:0;padding:8px 3px;box-sizing:content-box;display:flex;align-items:center;justify-content:center;overflow:visible;cursor:pointer}.fancybox__thumbs .carousel__slide .fancybox__thumb::after{content:"";position:absolute;top:0;left:0;right:0;bottom:0;border-width:5px;border-style:solid;border-color:var(--fancybox-accent-color, rgba(34, 213, 233, 0.96));opacity:0;transition:opacity .15s ease;border-radius:var(--fancybox-thumbs-border-radius, 4px)}.fancybox__thumbs .carousel__slide.is-nav-selected .fancybox__thumb::after{opacity:.92}.fancybox__thumbs .carousel__slide>*{pointer-events:none;user-select:none}.fancybox__thumb{position:relative;width:100%;padding-top:calc(100%/(var(--fancybox-thumbs-ratio, 1.5)));background-size:cover;background-position:center center;background-color:rgba(255,255,255,.1);background-repeat:no-repeat;border-radius:var(--fancybox-thumbs-border-radius, 4px)}.fancybox__toolbar{position:absolute;top:0;right:0;left:0;z-index:20;background:linear-gradient(to top, hsla(0deg, 0%, 0%, 0) 0%, hsla(0deg, 0%, 0%, 0.006) 8.1%, hsla(0deg, 0%, 0%, 0.021) 15.5%, hsla(0deg, 0%, 0%, 0.046) 22.5%, hsla(0deg, 0%, 0%, 0.077) 29%, hsla(0deg, 0%, 0%, 0.114) 35.3%, hsla(0deg, 0%, 0%, 0.155) 41.2%, hsla(0deg, 0%, 0%, 0.198) 47.1%, hsla(0deg, 0%, 0%, 0.242) 52.9%, hsla(0deg, 0%, 0%, 0.285) 58.8%, hsla(0deg, 0%, 0%, 0.326) 64.7%, hsla(0deg, 0%, 0%, 0.363) 71%, hsla(0deg, 0%, 0%, 0.394) 77.5%, hsla(0deg, 0%, 0%, 0.419) 84.5%, hsla(0deg, 0%, 0%, 0.434) 91.9%, hsla(0deg, 0%, 0%, 0.44) 100%);padding:0;touch-action:none;display:flex;justify-content:space-between;--carousel-button-svg-width: 20px;--carousel-button-svg-height: 20px;opacity:var(--fancybox-opacity, 1);text-shadow:var(--fancybox-toolbar-text-shadow, 1px 1px 1px rgba(0, 0, 0, 0.4))}@media all and (min-width: 1024px){.fancybox__toolbar{padding:8px}}.fancybox__container.is-animated[aria-hidden=false] .fancybox__toolbar{animation:.15s ease-in backwards fancybox-fadeIn}.fancybox__container.is-animated.is-closing .fancybox__toolbar{opacity:0}.fancybox__toolbar__items{display:flex}.fancybox__toolbar__items--left{margin-right:auto}.fancybox__toolbar__items--center{position:absolute;left:50%;transform:translateX(-50%)}.fancybox__toolbar__items--right{margin-left:auto}@media(max-width: 640px){.fancybox__toolbar__items--center:not(:last-child){display:none}}.fancybox__counter{min-width:72px;padding:0 10px;line-height:var(--carousel-button-height, 48px);text-align:center;font-size:17px;font-variant-numeric:tabular-nums;-webkit-font-smoothing:subpixel-antialiased}.fancybox__progress{background:var(--fancybox-accent-color, rgba(34, 213, 233, 0.96));height:3px;left:0;position:absolute;right:0;top:0;transform:scaleX(0);transform-origin:0;transition-property:transform;transition-timing-function:linear;z-index:30;user-select:none}.fancybox__container:fullscreen::backdrop{opacity:0}.fancybox__button--fullscreen g:nth-child(2){display:none}.fancybox__container:fullscreen .fancybox__button--fullscreen g:nth-child(1){display:none}.fancybox__container:fullscreen .fancybox__button--fullscreen g:nth-child(2){display:block}.fancybox__button--slideshow g:nth-child(2){display:none}.fancybox__container.has-slideshow .fancybox__button--slideshow g:nth-child(1){display:none}.fancybox__container.has-slideshow .fancybox__button--slideshow g:nth-child(2){display:block}
\ No newline at end of file
+.carousel {
+    position:relative;
+    box-sizing:border-box
+   }
+   .carousel *,
+   .carousel *:before,
+   .carousel *:after {
+    box-sizing:inherit
+   }
+   .carousel.is-draggable {
+    cursor:move;
+    cursor:grab
+   }
+   .carousel.is-dragging {
+    cursor:move;
+    cursor:grabbing
+   }
+   .carousel__viewport {
+    position:relative;
+    overflow:hidden;
+    max-width:100%;
+    max-height:100%
+   }
+   .carousel__track {
+    display:flex
+   }
+   .carousel__slide {
+    flex:0 0 auto;
+    width:var(--carousel-slide-width, 60%);
+    max-width:100%;
+    padding:1rem;
+    position:relative;
+    overflow-x:hidden;
+    overflow-y:auto;
+    overscroll-behavior:contain
+   }
+   .has-dots {
+    margin-bottom:calc(0.5rem + 22px)
+   }
+   .carousel__dots {
+    margin:0 auto;
+    padding:0;
+    position:absolute;
+    top:calc(100% + 0.5rem);
+    left:0;
+    right:0;
+    display:flex;
+    justify-content:center;
+    list-style:none;
+    user-select:none
+   }
+   .carousel__dots .carousel__dot {
+    margin:0;
+    padding:0;
+    display:block;
+    position:relative;
+    width:22px;
+    height:22px;
+    cursor:pointer
+   }
+   .carousel__dots .carousel__dot:after {
+    content:"";
+    width:8px;
+    height:8px;
+    border-radius:50%;
+    position:absolute;
+    top:50%;
+    left:50%;
+    transform:translate(-50%, -50%);
+    background-color:currentColor;
+    opacity:.25;
+    transition:opacity .15s ease-in-out
+   }
+   .carousel__dots .carousel__dot.is-selected:after {
+    opacity:1
+   }
+   .carousel__button {
+    width:var(--carousel-button-width, 48px);
+    height:var(--carousel-button-height, 48px);
+    padding:0;
+    border:0;
+    display:flex;
+    justify-content:center;
+    align-items:center;
+    pointer-events:all;
+    cursor:pointer;
+    color:var(--carousel-button-color, currentColor);
+    background:var(--carousel-button-bg, transparent);
+    border-radius:var(--carousel-button-border-radius, 50%);
+    box-shadow:var(--carousel-button-shadow, none);
+    transition:opacity .15s ease
+   }
+   .carousel__button.is-prev,
+   .carousel__button.is-next {
+    position:absolute;
+    top:50%;
+    transform:translateY(-50%)
+   }
+   .carousel__button.is-prev {
+    left:10px
+   }
+   .carousel__button.is-next {
+    right:10px
+   }
+   .carousel__button[disabled] {
+    cursor:default;
+    opacity:.3
+   }
+   .carousel__button svg {
+    width:var(--carousel-button-svg-width, 50%);
+    height:var(--carousel-button-svg-height, 50%);
+    fill:none;
+    stroke:currentColor;
+    stroke-width:var(--carousel-button-svg-stroke-width, 1.5);
+    stroke-linejoin:bevel;
+    stroke-linecap:round;
+    filter:var(--carousel-button-svg-filter, none);
+    pointer-events:none
+   }
+   html.with-fancybox {
+    scroll-behavior:auto
+   }
+   body.compensate-for-scrollbar {
+    overflow:hidden !important;
+    touch-action:none
+   }
+   .fancybox__container {
+    position:fixed;
+    top:0;
+    left:0;
+    bottom:0;
+    right:0;
+    direction:ltr;
+    margin:0;
+    padding:env(safe-area-inset-top, 0px) env(safe-area-inset-right, 0px) env(safe-area-inset-bottom, 0px) env(safe-area-inset-left, 0px);
+    box-sizing:border-box;
+    display:flex;
+    flex-direction:column;
+    color:var(--fancybox-color, #fff);
+    -webkit-tap-highlight-color:rgba(0,0,0,0);
+    overflow:hidden;
+    z-index:1050;
+    outline:none;
+    transform-origin:top left;
+    --carousel-button-width: 48px;
+    --carousel-button-height: 48px;
+    --carousel-button-svg-width: 24px;
+    --carousel-button-svg-height: 24px;
+    --carousel-button-svg-stroke-width: 2.5;
+    --carousel-button-svg-filter: drop-shadow(1px 1px 1px rgba(0, 0, 0, 0.4))
+   }
+   .fancybox__container *,
+   .fancybox__container *::before,
+   .fancybox__container *::after {
+    box-sizing:inherit
+   }
+   .fancybox__container :focus {
+    outline:none
+   }
+   body:not(.is-using-mouse) .fancybox__container :focus {
+    box-shadow:0 0 0 1px #fff,0 0 0 2px var(--fancybox-accent-color, rgba(1, 210, 232, 0.94))
+   }
+   @media all and (min-width: 1024px) {
+    .fancybox__container {
+     --carousel-button-width:48px;
+     --carousel-button-height:48px;
+     --carousel-button-svg-width:27px;
+     --carousel-button-svg-height:27px
+    }
+   }
+   .fancybox__backdrop {
+    position:absolute;
+    top:0;
+    right:0;
+    bottom:0;
+    left:0;
+    z-index:-1;
+    background:var(--fancybox-bg, rgba(24, 24, 27, 0.92))
+   }
+   .fancybox__carousel {
+    position:relative;
+    flex:1 1 auto;
+    min-height:0;
+    height:100%;
+    z-index:10
+   }
+   .fancybox__carousel.has-dots {
+    margin-bottom:calc(0.5rem + 22px)
+   }
+   .fancybox__viewport {
+    position:relative;
+    width:100%;
+    height:100%;
+    overflow:visible;
+    cursor:default
+   }
+   .fancybox__track {
+    display:flex;
+    height:100%
+   }
+   .fancybox__slide {
+    flex:0 0 auto;
+    width:100%;
+    max-width:100%;
+    margin:0;
+    padding:48px 8px 8px 8px;
+    position:relative;
+    overscroll-behavior:contain;
+    display:flex;
+    flex-direction:column;
+    outline:0;
+    overflow:auto;
+    --carousel-button-width: 36px;
+    --carousel-button-height: 36px;
+    --carousel-button-svg-width: 22px;
+    --carousel-button-svg-height: 22px
+   }
+   .fancybox__slide::before,
+   .fancybox__slide::after {
+    content:"";
+    flex:0 0 0;
+    margin:auto
+   }
+   @media all and (min-width: 1024px) {
+    .fancybox__slide {
+     padding:64px 100px
+    }
+   }
+   .fancybox__content {
+    margin:0 env(safe-area-inset-right, 0px) 0 env(safe-area-inset-left, 0px);
+    padding:36px;
+    color:var(--fancybox-content-color, #374151);
+    background:var(--fancybox-content-bg, #fff);
+    position:relative;
+    align-self:center;
+    display:flex;
+    flex-direction:column;
+    z-index:20
+   }
+   .fancybox__content :focus:not(.carousel__button.is-close) {
+    outline:thin dotted;
+    box-shadow:none
+   }
+   .fancybox__caption {
+    align-self:center;
+    max-width:100%;
+    margin:0;
+    padding:1rem 0 0 0;
+    line-height:1.375;
+    color:var(--fancybox-color, currentColor);
+    visibility:visible;
+    cursor:auto;
+    flex-shrink:0;
+    overflow-wrap:anywhere
+   }
+   .is-loading .fancybox__caption {
+    visibility:hidden
+   }
+   .fancybox__container>.carousel__dots {
+    top:100%;
+    color:var(--fancybox-color, #fff)
+   }
+   .fancybox__nav .carousel__button {
+    z-index:40
+   }
+   .fancybox__nav .carousel__button.is-next {
+    right:8px
+   }
+   @media all and (min-width: 1024px) {
+    .fancybox__nav .carousel__button.is-next {
+     right:40px
+    }
+   }
+   .fancybox__nav .carousel__button.is-prev {
+    left:8px
+   }
+   @media all and (min-width: 1024px) {
+    .fancybox__nav .carousel__button.is-prev {
+     left:40px
+    }
+   }
+   .carousel__button.is-close {
+    position:absolute;
+    top:8px;
+    right:8px;
+    top:calc(env(safe-area-inset-top, 0px) + 8px);
+    right:calc(env(safe-area-inset-right, 0px) + 8px);
+    z-index:40
+   }
+   @media all and (min-width: 1024px) {
+    .carousel__button.is-close {
+     right:40px
+    }
+   }
+   .fancybox__content>.carousel__button.is-close {
+    position:absolute;
+    top:-40px;
+    right:0;
+    color:var(--fancybox-color, #fff)
+   }
+   .fancybox__no-click,
+   .fancybox__no-click button {
+    pointer-events:none
+   }
+   .fancybox__spinner {
+    position:absolute;
+    top:50%;
+    left:50%;
+    transform:translate(-50%, -50%);
+    width:50px;
+    height:50px;
+    color:var(--fancybox-color, currentColor)
+   }
+   .fancybox__slide .fancybox__spinner {
+    cursor:pointer;
+    z-index:1053
+   }
+   .fancybox__spinner svg {
+    animation:fancybox-rotate 2s linear infinite;
+    transform-origin:center center;
+    position:absolute;
+    top:0;
+    right:0;
+    bottom:0;
+    left:0;
+    margin:auto;
+    width:100%;
+    height:100%
+   }
+   .fancybox__spinner svg circle {
+    fill:none;
+    stroke-width:2.75;
+    stroke-miterlimit:10;
+    stroke-dasharray:1,200;
+    stroke-dashoffset:0;
+    animation:fancybox-dash 1.5s ease-in-out infinite;
+    stroke-linecap:round;
+    stroke:currentColor
+   }
+   @keyframes fancybox-rotate {
+    100% {
+     transform:rotate(360deg)
+    }
+   }
+   @keyframes fancybox-dash {
+    0% {
+     stroke-dasharray:1,200;
+     stroke-dashoffset:0
+    }
+    50% {
+     stroke-dasharray:89,200;
+     stroke-dashoffset:-35px
+    }
+    100% {
+     stroke-dasharray:89,200;
+     stroke-dashoffset:-124px
+    }
+   }
+   .fancybox__backdrop,
+   .fancybox__caption,
+   .fancybox__nav,
+   .carousel__dots,
+   .carousel__button.is-close {
+    opacity:var(--fancybox-opacity, 1)
+   }
+   .fancybox__container.is-animated[aria-hidden=false] .fancybox__backdrop,
+   .fancybox__container.is-animated[aria-hidden=false] .fancybox__caption,
+   .fancybox__container.is-animated[aria-hidden=false] .fancybox__nav,
+   .fancybox__container.is-animated[aria-hidden=false] .carousel__dots,
+   .fancybox__container.is-animated[aria-hidden=false] .carousel__button.is-close {
+    animation:.15s ease backwards fancybox-fadeIn
+   }
+   .fancybox__container.is-animated.is-closing .fancybox__backdrop,
+   .fancybox__container.is-animated.is-closing .fancybox__caption,
+   .fancybox__container.is-animated.is-closing .fancybox__nav,
+   .fancybox__container.is-animated.is-closing .carousel__dots,
+   .fancybox__container.is-animated.is-closing .carousel__button.is-close {
+    animation:.15s ease both fancybox-fadeOut
+   }
+   .fancybox-fadeIn {
+    animation:.15s ease both fancybox-fadeIn
+   }
+   .fancybox-fadeOut {
+    animation:.1s ease both fancybox-fadeOut
+   }
+   .fancybox-zoomInUp {
+    animation:.2s ease both fancybox-zoomInUp
+   }
+   .fancybox-zoomOutDown {
+    animation:.15s ease both fancybox-zoomOutDown
+   }
+   .fancybox-throwOutUp {
+    animation:.15s ease both fancybox-throwOutUp
+   }
+   .fancybox-throwOutDown {
+    animation:.15s ease both fancybox-throwOutDown
+   }
+   @keyframes fancybox-fadeIn {
+    from {
+     opacity:0
+    }
+    to {
+     opacity:1
+    }
+   }
+   @keyframes fancybox-fadeOut {
+    to {
+     opacity:0
+    }
+   }
+   @keyframes fancybox-zoomInUp {
+    from {
+     transform:scale(0.97) translate3d(0, 16px, 0);
+     opacity:0
+    }
+    to {
+     transform:scale(1) translate3d(0, 0, 0);
+     opacity:1
+    }
+   }
+   @keyframes fancybox-zoomOutDown {
+    to {
+     transform:scale(0.97) translate3d(0, 16px, 0);
+     opacity:0
+    }
+   }
+   @keyframes fancybox-throwOutUp {
+    to {
+     transform:translate3d(0, -30%, 0);
+     opacity:0
+    }
+   }
+   @keyframes fancybox-throwOutDown {
+    to {
+     transform:translate3d(0, 30%, 0);
+     opacity:0
+    }
+   }
+   .fancybox__carousel .carousel__slide {
+    scrollbar-width:thin;
+    scrollbar-color:#ccc rgba(255,255,255,.1)
+   }
+   .fancybox__carousel .carousel__slide::-webkit-scrollbar {
+    width:8px;
+    height:8px
+   }
+   .fancybox__carousel .carousel__slide::-webkit-scrollbar-track {
+    background-color:rgba(255,255,255,.1)
+   }
+   .fancybox__carousel .carousel__slide::-webkit-scrollbar-thumb {
+    background-color:#ccc;
+    border-radius:2px;
+    box-shadow:inset 0 0 4px rgba(0,0,0,.2)
+   }
+   .fancybox__carousel.is-draggable .fancybox__slide,
+   .fancybox__carousel.is-draggable .fancybox__slide .fancybox__content {
+    cursor:move;
+    cursor:grab
+   }
+   .fancybox__carousel.is-dragging .fancybox__slide,
+   .fancybox__carousel.is-dragging .fancybox__slide .fancybox__content {
+    cursor:move;
+    cursor:grabbing
+   }
+   .fancybox__carousel .fancybox__slide .fancybox__content {
+    cursor:auto
+   }
+   .fancybox__carousel .fancybox__slide.can-zoom_in .fancybox__content {
+    cursor:zoom-in
+   }
+   .fancybox__carousel .fancybox__slide.can-zoom_out .fancybox__content {
+    cursor:zoom-out
+   }
+   .fancybox__carousel .fancybox__slide.is-draggable .fancybox__content {
+    cursor:move;
+    cursor:grab
+   }
+   .fancybox__carousel .fancybox__slide.is-dragging .fancybox__content {
+    cursor:move;
+    cursor:grabbing
+   }
+   .fancybox__image {
+    transform-origin:0 0;
+    user-select:none;
+    transition:none
+   }
+   .has-image .fancybox__content {
+    padding:0;
+    background:rgba(0,0,0,0);
+    min-height:1px
+   }
+   .is-closing .has-image .fancybox__content {
+    overflow:visible
+   }
+   .has-image[data-image-fit=contain] {
+    overflow:visible;
+    touch-action:none
+   }
+   .has-image[data-image-fit=contain] .fancybox__content {
+    flex-direction:row;
+    flex-wrap:wrap
+   }
+   .has-image[data-image-fit=contain] .fancybox__image {
+    max-width:100%;
+    max-height:100%;
+    object-fit:contain
+   }
+   .has-image[data-image-fit=contain-w] {
+    overflow-x:hidden;
+    overflow-y:auto
+   }
+   .has-image[data-image-fit=contain-w] .fancybox__content {
+    min-height:auto
+   }
+   .has-image[data-image-fit=contain-w] .fancybox__image {
+    max-width:100%;
+    height:auto
+   }
+   .has-image[data-image-fit=cover] {
+    overflow:visible;
+    touch-action:none
+   }
+   .has-image[data-image-fit=cover] .fancybox__content {
+    width:100%;
+    height:100%
+   }
+   .has-image[data-image-fit=cover] .fancybox__image {
+    width:100%;
+    height:100%;
+    object-fit:cover
+   }
+   .fancybox__carousel .fancybox__slide.has-iframe .fancybox__content,
+   .fancybox__carousel .fancybox__slide.has-map .fancybox__content,
+   .fancybox__carousel .fancybox__slide.has-pdf .fancybox__content,
+   .fancybox__carousel .fancybox__slide.has-video .fancybox__content,
+   .fancybox__carousel .fancybox__slide.has-html5video .fancybox__content {
+    max-width:100%;
+    flex-shrink:1;
+    min-height:1px;
+    overflow:visible
+   }
+   .fancybox__carousel .fancybox__slide.has-iframe .fancybox__content,
+   .fancybox__carousel .fancybox__slide.has-map .fancybox__content,
+   .fancybox__carousel .fancybox__slide.has-pdf .fancybox__content {
+    width:100%;
+    height:80%
+   }
+   .fancybox__carousel .fancybox__slide.has-video .fancybox__content,
+   .fancybox__carousel .fancybox__slide.has-html5video .fancybox__content {
+    width:960px;
+    height:540px;
+    max-width:100%;
+    max-height:100%
+   }
+   .fancybox__carousel .fancybox__slide.has-map .fancybox__content,
+   .fancybox__carousel .fancybox__slide.has-pdf .fancybox__content,
+   .fancybox__carousel .fancybox__slide.has-video .fancybox__content,
+   .fancybox__carousel .fancybox__slide.has-html5video .fancybox__content {
+    padding:0;
+    background:rgba(24,24,27,.9);
+    color:#fff
+   }
+   .fancybox__carousel .fancybox__slide.has-map .fancybox__content {
+    background:#e5e3df
+   }
+   .fancybox__html5video,
+   .fancybox__iframe {
+    border:0;
+    display:block;
+    height:100%;
+    width:100%;
+    background:rgba(0,0,0,0)
+   }
+   .fancybox-placeholder {
+    position:absolute;
+    width:1px;
+    height:1px;
+    padding:0;
+    margin:-1px;
+    overflow:hidden;
+    clip:rect(0, 0, 0, 0);
+    white-space:nowrap;
+    border-width:0
+   }
+   .fancybox__thumbs {
+    flex:0 0 auto;
+    position:relative;
+    padding:0px 3px;
+    opacity:var(--fancybox-opacity, 1)
+   }
+   .fancybox__container.is-animated[aria-hidden=false] .fancybox__thumbs {
+    animation:.15s ease-in backwards fancybox-fadeIn
+   }
+   .fancybox__container.is-animated.is-closing .fancybox__thumbs {
+    opacity:0
+   }
+   .fancybox__thumbs .carousel__slide {
+    flex:0 0 auto;
+    width:var(--fancybox-thumbs-width, 96px);
+    margin:0;
+    padding:8px 3px;
+    box-sizing:content-box;
+    display:flex;
+    align-items:center;
+    justify-content:center;
+    overflow:visible;
+    cursor:pointer
+   }
+   .fancybox__thumbs .carousel__slide .fancybox__thumb::after {
+    content:"";
+    position:absolute;
+    top:0;
+    left:0;
+    right:0;
+    bottom:0;
+    border-width:5px;
+    border-style:solid;
+    border-color:var(--fancybox-accent-color, rgba(34, 213, 233, 0.96));
+    opacity:0;
+    transition:opacity .15s ease;
+    border-radius:var(--fancybox-thumbs-border-radius, 4px)
+   }
+   .fancybox__thumbs .carousel__slide.is-nav-selected .fancybox__thumb::after {
+    opacity:.92
+   }
+   .fancybox__thumbs .carousel__slide>* {
+    pointer-events:none;
+    user-select:none
+   }
+   .fancybox__thumb {
+    position:relative;
+    width:100%;
+    padding-top:calc(100%/(var(--fancybox-thumbs-ratio, 1.5)));
+    background-size:cover;
+    background-position:center center;
+    background-color:rgba(255,255,255,.1);
+    background-repeat:no-repeat;
+    border-radius:var(--fancybox-thumbs-border-radius, 4px)
+   }
+   .fancybox__toolbar {
+    position:absolute;
+    top:0;
+    right:0;
+    left:0;
+    z-index:20;
+    background:linear-gradient(to top, hsla(0deg, 0%, 0%, 0) 0%, hsla(0deg, 0%, 0%, 0.006) 8.1%, hsla(0deg, 0%, 0%, 0.021) 15.5%, hsla(0deg, 0%, 0%, 0.046) 22.5%, hsla(0deg, 0%, 0%, 0.077) 29%, hsla(0deg, 0%, 0%, 0.114) 35.3%, hsla(0deg, 0%, 0%, 0.155) 41.2%, hsla(0deg, 0%, 0%, 0.198) 47.1%, hsla(0deg, 0%, 0%, 0.242) 52.9%, hsla(0deg, 0%, 0%, 0.285) 58.8%, hsla(0deg, 0%, 0%, 0.326) 64.7%, hsla(0deg, 0%, 0%, 0.363) 71%, hsla(0deg, 0%, 0%, 0.394) 77.5%, hsla(0deg, 0%, 0%, 0.419) 84.5%, hsla(0deg, 0%, 0%, 0.434) 91.9%, hsla(0deg, 0%, 0%, 0.44) 100%);
+    padding:0;
+    touch-action:none;
+    display:flex;
+    justify-content:space-between;
+    --carousel-button-svg-width: 20px;
+    --carousel-button-svg-height: 20px;
+    opacity:var(--fancybox-opacity, 1);
+    text-shadow:var(--fancybox-toolbar-text-shadow, 1px 1px 1px rgba(0, 0, 0, 0.4))
+   }
+   @media all and (min-width: 1024px) {
+    .fancybox__toolbar {
+     padding:8px
+    }
+   }
+   .fancybox__container.is-animated[aria-hidden=false] .fancybox__toolbar {
+    animation:.15s ease-in backwards fancybox-fadeIn
+   }
+   .fancybox__container.is-animated.is-closing .fancybox__toolbar {
+    opacity:0
+   }
+   .fancybox__toolbar__items {
+    display:flex
+   }
+   .fancybox__toolbar__items--left {
+    margin-right:auto
+   }
+   .fancybox__toolbar__items--center {
+    position:absolute;
+    left:50%;
+    transform:translateX(-50%)
+   }
+   .fancybox__toolbar__items--right {
+    margin-left:auto
+   }
+   @media(max-width: 640px) {
+    .fancybox__toolbar__items--center:not(:last-child) {
+     display:none
+    }
+   }
+   .fancybox__counter {
+    min-width:72px;
+    padding:0 10px;
+    line-height:var(--carousel-button-height, 48px);
+    text-align:center;
+    font-size:17px;
+    font-variant-numeric:tabular-nums;
+    -webkit-font-smoothing:subpixel-antialiased
+   }
+   .fancybox__progress {
+    background:var(--fancybox-accent-color, rgba(34, 213, 233, 0.96));
+    height:3px;
+    left:0;
+    position:absolute;
+    right:0;
+    top:0;
+    transform:scaleX(0);
+    transform-origin:0;
+    transition-property:transform;
+    transition-timing-function:linear;
+    z-index:30;
+    user-select:none
+   }
+   .fancybox__container:fullscreen::backdrop {
+    opacity:0
+   }
+   .fancybox__button--fullscreen g:nth-child(2) {
+    display:none
+   }
+   .fancybox__container:fullscreen .fancybox__button--fullscreen g:nth-child(1) {
+    display:none
+   }
+   .fancybox__container:fullscreen .fancybox__button--fullscreen g:nth-child(2) {
+    display:block
+   }
+   .fancybox__button--slideshow g:nth-child(2) {
+    display:none
+   }
+   .fancybox__container.has-slideshow .fancybox__button--slideshow g:nth-child(1) {
+    display:none
+   }
+   .fancybox__container.has-slideshow .fancybox__button--slideshow g:nth-child(2) {
+    display:block
+   }
+   
\ No newline at end of file

From d1ca956187fb4a5b42050bfd95e97ff02e66e0b5 Mon Sep 17 00:00:00 2001
From: zhoupzh <zhoupzh@pcl.ac.cn>
Date: Mon, 7 Nov 2022 11:39:49 +0800
Subject: [PATCH 081/187] fix issue

---
 web_src/less/vendor/fancyapp.css |  2 +-
 webpack.config.js                | 10 +++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/web_src/less/vendor/fancyapp.css b/web_src/less/vendor/fancyapp.css
index 740919a0c..bbc8924a4 100644
--- a/web_src/less/vendor/fancyapp.css
+++ b/web_src/less/vendor/fancyapp.css
@@ -147,7 +147,7 @@
     --carousel-button-svg-width: 24px;
     --carousel-button-svg-height: 24px;
     --carousel-button-svg-stroke-width: 2.5;
-    --carousel-button-svg-filter: drop-shadow(1px 1px 1px rgba(0, 0, 0, 0.4))
+    --carousel-button-svg-filter: drop-shadow(1px 1px 1px rgba(0, 0, 0, 0.4));
    }
    .fancybox__container *,
    .fancybox__container *::before,
diff --git a/webpack.config.js b/webpack.config.js
index 917abf62a..dae0ddc5e 100755
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -175,7 +175,15 @@ module.exports = {
         ],
       },
       {
-        test: /\.(less|css)$/i,
+        test: /\.css$/,
+        use: [
+            MiniCssExtractPlugin.loader,
+            "css-loader",
+          ],
+      },
+
+      {
+        test: /\.(less)$/i,
         use: [
           {
             loader: MiniCssExtractPlugin.loader,

From 911c40f8d122c910fede0891b0e719ff8cce7fa8 Mon Sep 17 00:00:00 2001
From: zhoupzh <zhoupzh@pcl.ac.cn>
Date: Mon, 7 Nov 2022 11:44:11 +0800
Subject: [PATCH 082/187] fix issue

---
 web_src/less/vendor/{fancyapp.css => fancyapp.less} |  0
 webpack.config.js                                   | 10 +---------
 2 files changed, 1 insertion(+), 9 deletions(-)
 rename web_src/less/vendor/{fancyapp.css => fancyapp.less} (100%)

diff --git a/web_src/less/vendor/fancyapp.css b/web_src/less/vendor/fancyapp.less
similarity index 100%
rename from web_src/less/vendor/fancyapp.css
rename to web_src/less/vendor/fancyapp.less
diff --git a/webpack.config.js b/webpack.config.js
index dae0ddc5e..917abf62a 100755
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -175,15 +175,7 @@ module.exports = {
         ],
       },
       {
-        test: /\.css$/,
-        use: [
-            MiniCssExtractPlugin.loader,
-            "css-loader",
-          ],
-      },
-
-      {
-        test: /\.(less)$/i,
+        test: /\.(less|css)$/i,
         use: [
           {
             loader: MiniCssExtractPlugin.loader,

From 2ac228b59ddbb24c76991abf618d65e9d40cb594 Mon Sep 17 00:00:00 2001
From: zhoupzh <zhoupzh@pcl.ac.cn>
Date: Mon, 7 Nov 2022 11:46:30 +0800
Subject: [PATCH 083/187] fix issue

---
 web_src/less/index.less | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web_src/less/index.less b/web_src/less/index.less
index 100eca93f..fbc9a80fd 100644
--- a/web_src/less/index.less
+++ b/web_src/less/index.less
@@ -1,6 +1,6 @@
 @import "~highlight.js/styles/github.css";
 @import "./vendor/gitGraph.css";
-@import "./vendor/fancyapp.css";
+@import "./vendor/fancyapp.less";
 // @import "~/remixicon/fonts/remixicon.css";
 @import "_svg";
 @import "_tribute";

From 0ee2816ffce1f2350a617e37d7e72134fb005014 Mon Sep 17 00:00:00 2001
From: zhoupzh <zhoupzh@pcl.ac.cn>
Date: Mon, 7 Nov 2022 11:58:35 +0800
Subject: [PATCH 084/187] fix issue

---
 templates/repo/view_file.tmpl | 730 ++++++++++++++++++++++++++++++++++
 web_src/less/index.less       |   2 +-
 2 files changed, 731 insertions(+), 1 deletion(-)

diff --git a/templates/repo/view_file.tmpl b/templates/repo/view_file.tmpl
index 2a15aa6d0..8f48dd8b7 100755
--- a/templates/repo/view_file.tmpl
+++ b/templates/repo/view_file.tmpl
@@ -36,6 +36,736 @@ img {
     transform: scale3d(0.8, 0.8, 0.8);
   }
 }
+.carousel {
+ position:relative;
+ box-sizing:border-box
+}
+.carousel *,
+.carousel *:before,
+.carousel *:after {
+ box-sizing:inherit
+}
+.carousel.is-draggable {
+ cursor:move;
+ cursor:grab
+}
+.carousel.is-dragging {
+ cursor:move;
+ cursor:grabbing
+}
+.carousel__viewport {
+ position:relative;
+ overflow:hidden;
+ max-width:100%;
+ max-height:100%
+}
+.carousel__track {
+ display:flex
+}
+.carousel__slide {
+ flex:0 0 auto;
+ width:var(--carousel-slide-width, 60%);
+ max-width:100%;
+ padding:1rem;
+ position:relative;
+ overflow-x:hidden;
+ overflow-y:auto;
+ overscroll-behavior:contain
+}
+.has-dots {
+ margin-bottom:calc(0.5rem + 22px)
+}
+.carousel__dots {
+ margin:0 auto;
+ padding:0;
+ position:absolute;
+ top:calc(100% + 0.5rem);
+ left:0;
+ right:0;
+ display:flex;
+ justify-content:center;
+ list-style:none;
+ user-select:none
+}
+.carousel__dots .carousel__dot {
+ margin:0;
+ padding:0;
+ display:block;
+ position:relative;
+ width:22px;
+ height:22px;
+ cursor:pointer
+}
+.carousel__dots .carousel__dot:after {
+ content:"";
+ width:8px;
+ height:8px;
+ border-radius:50%;
+ position:absolute;
+ top:50%;
+ left:50%;
+ transform:translate(-50%, -50%);
+ background-color:currentColor;
+ opacity:.25;
+ transition:opacity .15s ease-in-out
+}
+.carousel__dots .carousel__dot.is-selected:after {
+ opacity:1
+}
+.carousel__button {
+ width:var(--carousel-button-width, 48px);
+ height:var(--carousel-button-height, 48px);
+ padding:0;
+ border:0;
+ display:flex;
+ justify-content:center;
+ align-items:center;
+ pointer-events:all;
+ cursor:pointer;
+ color:var(--carousel-button-color, currentColor);
+ background:var(--carousel-button-bg, transparent);
+ border-radius:var(--carousel-button-border-radius, 50%);
+ box-shadow:var(--carousel-button-shadow, none);
+ transition:opacity .15s ease
+}
+.carousel__button.is-prev,
+.carousel__button.is-next {
+ position:absolute;
+ top:50%;
+ transform:translateY(-50%)
+}
+.carousel__button.is-prev {
+ left:10px
+}
+.carousel__button.is-next {
+ right:10px
+}
+.carousel__button[disabled] {
+ cursor:default;
+ opacity:.3
+}
+.carousel__button svg {
+ width:var(--carousel-button-svg-width, 50%);
+ height:var(--carousel-button-svg-height, 50%);
+ fill:none;
+ stroke:currentColor;
+ stroke-width:var(--carousel-button-svg-stroke-width, 1.5);
+ stroke-linejoin:bevel;
+ stroke-linecap:round;
+ filter:var(--carousel-button-svg-filter, none);
+ pointer-events:none
+}
+html.with-fancybox {
+ scroll-behavior:auto
+}
+body.compensate-for-scrollbar {
+ overflow:hidden !important;
+ touch-action:none
+}
+.fancybox__container {
+ position:fixed;
+ top:0;
+ left:0;
+ bottom:0;
+ right:0;
+ direction:ltr;
+ margin:0;
+ padding:env(safe-area-inset-top, 0px) env(safe-area-inset-right, 0px) env(safe-area-inset-bottom, 0px) env(safe-area-inset-left, 0px);
+ box-sizing:border-box;
+ display:flex;
+ flex-direction:column;
+ color:var(--fancybox-color, #fff);
+ -webkit-tap-highlight-color:rgba(0,0,0,0);
+ overflow:hidden;
+ z-index:1050;
+ outline:none;
+ transform-origin:top left;
+ --carousel-button-width: 48px;
+ --carousel-button-height: 48px;
+ --carousel-button-svg-width: 24px;
+ --carousel-button-svg-height: 24px;
+ --carousel-button-svg-stroke-width: 2.5;
+ --carousel-button-svg-filter: drop-shadow(1px 1px 1px rgba(0, 0, 0, 0.4))
+}
+.fancybox__container *,
+.fancybox__container *::before,
+.fancybox__container *::after {
+ box-sizing:inherit
+}
+.fancybox__container :focus {
+ outline:none
+}
+body:not(.is-using-mouse) .fancybox__container :focus {
+ box-shadow:0 0 0 1px #fff,0 0 0 2px var(--fancybox-accent-color, rgba(1, 210, 232, 0.94))
+}
+@media all and (min-width: 1024px) {
+ .fancybox__container {
+  --carousel-button-width:48px;
+  --carousel-button-height:48px;
+  --carousel-button-svg-width:27px;
+  --carousel-button-svg-height:27px
+ }
+}
+.fancybox__backdrop {
+ position:absolute;
+ top:0;
+ right:0;
+ bottom:0;
+ left:0;
+ z-index:-1;
+ background:var(--fancybox-bg, rgba(24, 24, 27, 0.92))
+}
+.fancybox__carousel {
+ position:relative;
+ flex:1 1 auto;
+ min-height:0;
+ height:100%;
+ z-index:10
+}
+.fancybox__carousel.has-dots {
+ margin-bottom:calc(0.5rem + 22px)
+}
+.fancybox__viewport {
+ position:relative;
+ width:100%;
+ height:100%;
+ overflow:visible;
+ cursor:default
+}
+.fancybox__track {
+ display:flex;
+ height:100%
+}
+.fancybox__slide {
+ flex:0 0 auto;
+ width:100%;
+ max-width:100%;
+ margin:0;
+ padding:48px 8px 8px 8px;
+ position:relative;
+ overscroll-behavior:contain;
+ display:flex;
+ flex-direction:column;
+ outline:0;
+ overflow:auto;
+ --carousel-button-width: 36px;
+ --carousel-button-height: 36px;
+ --carousel-button-svg-width: 22px;
+ --carousel-button-svg-height: 22px
+}
+.fancybox__slide::before,
+.fancybox__slide::after {
+ content:"";
+ flex:0 0 0;
+ margin:auto
+}
+@media all and (min-width: 1024px) {
+ .fancybox__slide {
+  padding:64px 100px
+ }
+}
+.fancybox__content {
+ margin:0 env(safe-area-inset-right, 0px) 0 env(safe-area-inset-left, 0px);
+ padding:36px;
+ color:var(--fancybox-content-color, #374151);
+ background:var(--fancybox-content-bg, #fff);
+ position:relative;
+ align-self:center;
+ display:flex;
+ flex-direction:column;
+ z-index:20
+}
+.fancybox__content :focus:not(.carousel__button.is-close) {
+ outline:thin dotted;
+ box-shadow:none
+}
+.fancybox__caption {
+ align-self:center;
+ max-width:100%;
+ margin:0;
+ padding:1rem 0 0 0;
+ line-height:1.375;
+ color:var(--fancybox-color, currentColor);
+ visibility:visible;
+ cursor:auto;
+ flex-shrink:0;
+ overflow-wrap:anywhere
+}
+.is-loading .fancybox__caption {
+ visibility:hidden
+}
+.fancybox__container>.carousel__dots {
+ top:100%;
+ color:var(--fancybox-color, #fff)
+}
+.fancybox__nav .carousel__button {
+ z-index:40
+}
+.fancybox__nav .carousel__button.is-next {
+ right:8px
+}
+@media all and (min-width: 1024px) {
+ .fancybox__nav .carousel__button.is-next {
+  right:40px
+ }
+}
+.fancybox__nav .carousel__button.is-prev {
+ left:8px
+}
+@media all and (min-width: 1024px) {
+ .fancybox__nav .carousel__button.is-prev {
+  left:40px
+ }
+}
+.carousel__button.is-close {
+ position:absolute;
+ top:8px;
+ right:8px;
+ top:calc(env(safe-area-inset-top, 0px) + 8px);
+ right:calc(env(safe-area-inset-right, 0px) + 8px);
+ z-index:40
+}
+@media all and (min-width: 1024px) {
+ .carousel__button.is-close {
+  right:40px
+ }
+}
+.fancybox__content>.carousel__button.is-close {
+ position:absolute;
+ top:-40px;
+ right:0;
+ color:var(--fancybox-color, #fff)
+}
+.fancybox__no-click,
+.fancybox__no-click button {
+ pointer-events:none
+}
+.fancybox__spinner {
+ position:absolute;
+ top:50%;
+ left:50%;
+ transform:translate(-50%, -50%);
+ width:50px;
+ height:50px;
+ color:var(--fancybox-color, currentColor)
+}
+.fancybox__slide .fancybox__spinner {
+ cursor:pointer;
+ z-index:1053
+}
+.fancybox__spinner svg {
+ animation:fancybox-rotate 2s linear infinite;
+ transform-origin:center center;
+ position:absolute;
+ top:0;
+ right:0;
+ bottom:0;
+ left:0;
+ margin:auto;
+ width:100%;
+ height:100%
+}
+.fancybox__spinner svg circle {
+ fill:none;
+ stroke-width:2.75;
+ stroke-miterlimit:10;
+ stroke-dasharray:1,200;
+ stroke-dashoffset:0;
+ animation:fancybox-dash 1.5s ease-in-out infinite;
+ stroke-linecap:round;
+ stroke:currentColor
+}
+@keyframes fancybox-rotate {
+ 100% {
+  transform:rotate(360deg)
+ }
+}
+@keyframes fancybox-dash {
+ 0% {
+  stroke-dasharray:1,200;
+  stroke-dashoffset:0
+ }
+ 50% {
+  stroke-dasharray:89,200;
+  stroke-dashoffset:-35px
+ }
+ 100% {
+  stroke-dasharray:89,200;
+  stroke-dashoffset:-124px
+ }
+}
+.fancybox__backdrop,
+.fancybox__caption,
+.fancybox__nav,
+.carousel__dots,
+.carousel__button.is-close {
+ opacity:var(--fancybox-opacity, 1)
+}
+.fancybox__container.is-animated[aria-hidden=false] .fancybox__backdrop,
+.fancybox__container.is-animated[aria-hidden=false] .fancybox__caption,
+.fancybox__container.is-animated[aria-hidden=false] .fancybox__nav,
+.fancybox__container.is-animated[aria-hidden=false] .carousel__dots,
+.fancybox__container.is-animated[aria-hidden=false] .carousel__button.is-close {
+ animation:.15s ease backwards fancybox-fadeIn
+}
+.fancybox__container.is-animated.is-closing .fancybox__backdrop,
+.fancybox__container.is-animated.is-closing .fancybox__caption,
+.fancybox__container.is-animated.is-closing .fancybox__nav,
+.fancybox__container.is-animated.is-closing .carousel__dots,
+.fancybox__container.is-animated.is-closing .carousel__button.is-close {
+ animation:.15s ease both fancybox-fadeOut
+}
+.fancybox-fadeIn {
+ animation:.15s ease both fancybox-fadeIn
+}
+.fancybox-fadeOut {
+ animation:.1s ease both fancybox-fadeOut
+}
+.fancybox-zoomInUp {
+ animation:.2s ease both fancybox-zoomInUp
+}
+.fancybox-zoomOutDown {
+ animation:.15s ease both fancybox-zoomOutDown
+}
+.fancybox-throwOutUp {
+ animation:.15s ease both fancybox-throwOutUp
+}
+.fancybox-throwOutDown {
+ animation:.15s ease both fancybox-throwOutDown
+}
+@keyframes fancybox-fadeIn {
+ from {
+  opacity:0
+ }
+ to {
+  opacity:1
+ }
+}
+@keyframes fancybox-fadeOut {
+ to {
+  opacity:0
+ }
+}
+@keyframes fancybox-zoomInUp {
+ from {
+  transform:scale(0.97) translate3d(0, 16px, 0);
+  opacity:0
+ }
+ to {
+  transform:scale(1) translate3d(0, 0, 0);
+  opacity:1
+ }
+}
+@keyframes fancybox-zoomOutDown {
+ to {
+  transform:scale(0.97) translate3d(0, 16px, 0);
+  opacity:0
+ }
+}
+@keyframes fancybox-throwOutUp {
+ to {
+  transform:translate3d(0, -30%, 0);
+  opacity:0
+ }
+}
+@keyframes fancybox-throwOutDown {
+ to {
+  transform:translate3d(0, 30%, 0);
+  opacity:0
+ }
+}
+.fancybox__carousel .carousel__slide {
+ scrollbar-width:thin;
+ scrollbar-color:#ccc rgba(255,255,255,.1)
+}
+.fancybox__carousel .carousel__slide::-webkit-scrollbar {
+ width:8px;
+ height:8px
+}
+.fancybox__carousel .carousel__slide::-webkit-scrollbar-track {
+ background-color:rgba(255,255,255,.1)
+}
+.fancybox__carousel .carousel__slide::-webkit-scrollbar-thumb {
+ background-color:#ccc;
+ border-radius:2px;
+ box-shadow:inset 0 0 4px rgba(0,0,0,.2)
+}
+.fancybox__carousel.is-draggable .fancybox__slide,
+.fancybox__carousel.is-draggable .fancybox__slide .fancybox__content {
+ cursor:move;
+ cursor:grab
+}
+.fancybox__carousel.is-dragging .fancybox__slide,
+.fancybox__carousel.is-dragging .fancybox__slide .fancybox__content {
+ cursor:move;
+ cursor:grabbing
+}
+.fancybox__carousel .fancybox__slide .fancybox__content {
+ cursor:auto
+}
+.fancybox__carousel .fancybox__slide.can-zoom_in .fancybox__content {
+ cursor:zoom-in
+}
+.fancybox__carousel .fancybox__slide.can-zoom_out .fancybox__content {
+ cursor:zoom-out
+}
+.fancybox__carousel .fancybox__slide.is-draggable .fancybox__content {
+ cursor:move;
+ cursor:grab
+}
+.fancybox__carousel .fancybox__slide.is-dragging .fancybox__content {
+ cursor:move;
+ cursor:grabbing
+}
+.fancybox__image {
+ transform-origin:0 0;
+ user-select:none;
+ transition:none
+}
+.has-image .fancybox__content {
+ padding:0;
+ background:rgba(0,0,0,0);
+ min-height:1px
+}
+.is-closing .has-image .fancybox__content {
+ overflow:visible
+}
+.has-image[data-image-fit=contain] {
+ overflow:visible;
+ touch-action:none
+}
+.has-image[data-image-fit=contain] .fancybox__content {
+ flex-direction:row;
+ flex-wrap:wrap
+}
+.has-image[data-image-fit=contain] .fancybox__image {
+ max-width:100%;
+ max-height:100%;
+ object-fit:contain
+}
+.has-image[data-image-fit=contain-w] {
+ overflow-x:hidden;
+ overflow-y:auto
+}
+.has-image[data-image-fit=contain-w] .fancybox__content {
+ min-height:auto
+}
+.has-image[data-image-fit=contain-w] .fancybox__image {
+ max-width:100%;
+ height:auto
+}
+.has-image[data-image-fit=cover] {
+ overflow:visible;
+ touch-action:none
+}
+.has-image[data-image-fit=cover] .fancybox__content {
+ width:100%;
+ height:100%
+}
+.has-image[data-image-fit=cover] .fancybox__image {
+ width:100%;
+ height:100%;
+ object-fit:cover
+}
+.fancybox__carousel .fancybox__slide.has-iframe .fancybox__content,
+.fancybox__carousel .fancybox__slide.has-map .fancybox__content,
+.fancybox__carousel .fancybox__slide.has-pdf .fancybox__content,
+.fancybox__carousel .fancybox__slide.has-video .fancybox__content,
+.fancybox__carousel .fancybox__slide.has-html5video .fancybox__content {
+ max-width:100%;
+ flex-shrink:1;
+ min-height:1px;
+ overflow:visible
+}
+.fancybox__carousel .fancybox__slide.has-iframe .fancybox__content,
+.fancybox__carousel .fancybox__slide.has-map .fancybox__content,
+.fancybox__carousel .fancybox__slide.has-pdf .fancybox__content {
+ width:100%;
+ height:80%
+}
+.fancybox__carousel .fancybox__slide.has-video .fancybox__content,
+.fancybox__carousel .fancybox__slide.has-html5video .fancybox__content {
+ width:960px;
+ height:540px;
+ max-width:100%;
+ max-height:100%
+}
+.fancybox__carousel .fancybox__slide.has-map .fancybox__content,
+.fancybox__carousel .fancybox__slide.has-pdf .fancybox__content,
+.fancybox__carousel .fancybox__slide.has-video .fancybox__content,
+.fancybox__carousel .fancybox__slide.has-html5video .fancybox__content {
+ padding:0;
+ background:rgba(24,24,27,.9);
+ color:#fff
+}
+.fancybox__carousel .fancybox__slide.has-map .fancybox__content {
+ background:#e5e3df
+}
+.fancybox__html5video,
+.fancybox__iframe {
+ border:0;
+ display:block;
+ height:100%;
+ width:100%;
+ background:rgba(0,0,0,0)
+}
+.fancybox-placeholder {
+ position:absolute;
+ width:1px;
+ height:1px;
+ padding:0;
+ margin:-1px;
+ overflow:hidden;
+ clip:rect(0, 0, 0, 0);
+ white-space:nowrap;
+ border-width:0
+}
+.fancybox__thumbs {
+ flex:0 0 auto;
+ position:relative;
+ padding:0px 3px;
+ opacity:var(--fancybox-opacity, 1)
+}
+.fancybox__container.is-animated[aria-hidden=false] .fancybox__thumbs {
+ animation:.15s ease-in backwards fancybox-fadeIn
+}
+.fancybox__container.is-animated.is-closing .fancybox__thumbs {
+ opacity:0
+}
+.fancybox__thumbs .carousel__slide {
+ flex:0 0 auto;
+ width:var(--fancybox-thumbs-width, 96px);
+ margin:0;
+ padding:8px 3px;
+ box-sizing:content-box;
+ display:flex;
+ align-items:center;
+ justify-content:center;
+ overflow:visible;
+ cursor:pointer
+}
+.fancybox__thumbs .carousel__slide .fancybox__thumb::after {
+ content:"";
+ position:absolute;
+ top:0;
+ left:0;
+ right:0;
+ bottom:0;
+ border-width:5px;
+ border-style:solid;
+ border-color:var(--fancybox-accent-color, rgba(34, 213, 233, 0.96));
+ opacity:0;
+ transition:opacity .15s ease;
+ border-radius:var(--fancybox-thumbs-border-radius, 4px)
+}
+.fancybox__thumbs .carousel__slide.is-nav-selected .fancybox__thumb::after {
+ opacity:.92
+}
+.fancybox__thumbs .carousel__slide>* {
+ pointer-events:none;
+ user-select:none
+}
+.fancybox__thumb {
+ position:relative;
+ width:100%;
+ padding-top:calc(100%/(var(--fancybox-thumbs-ratio, 1.5)));
+ background-size:cover;
+ background-position:center center;
+ background-color:rgba(255,255,255,.1);
+ background-repeat:no-repeat;
+ border-radius:var(--fancybox-thumbs-border-radius, 4px)
+}
+.fancybox__toolbar {
+ position:absolute;
+ top:0;
+ right:0;
+ left:0;
+ z-index:20;
+ background:linear-gradient(to top, hsla(0deg, 0%, 0%, 0) 0%, hsla(0deg, 0%, 0%, 0.006) 8.1%, hsla(0deg, 0%, 0%, 0.021) 15.5%, hsla(0deg, 0%, 0%, 0.046) 22.5%, hsla(0deg, 0%, 0%, 0.077) 29%, hsla(0deg, 0%, 0%, 0.114) 35.3%, hsla(0deg, 0%, 0%, 0.155) 41.2%, hsla(0deg, 0%, 0%, 0.198) 47.1%, hsla(0deg, 0%, 0%, 0.242) 52.9%, hsla(0deg, 0%, 0%, 0.285) 58.8%, hsla(0deg, 0%, 0%, 0.326) 64.7%, hsla(0deg, 0%, 0%, 0.363) 71%, hsla(0deg, 0%, 0%, 0.394) 77.5%, hsla(0deg, 0%, 0%, 0.419) 84.5%, hsla(0deg, 0%, 0%, 0.434) 91.9%, hsla(0deg, 0%, 0%, 0.44) 100%);
+ padding:0;
+ touch-action:none;
+ display:flex;
+ justify-content:space-between;
+ --carousel-button-svg-width: 20px;
+ --carousel-button-svg-height: 20px;
+ opacity:var(--fancybox-opacity, 1);
+ text-shadow:var(--fancybox-toolbar-text-shadow, 1px 1px 1px rgba(0, 0, 0, 0.4))
+}
+@media all and (min-width: 1024px) {
+ .fancybox__toolbar {
+  padding:8px
+ }
+}
+.fancybox__container.is-animated[aria-hidden=false] .fancybox__toolbar {
+ animation:.15s ease-in backwards fancybox-fadeIn
+}
+.fancybox__container.is-animated.is-closing .fancybox__toolbar {
+ opacity:0
+}
+.fancybox__toolbar__items {
+ display:flex
+}
+.fancybox__toolbar__items--left {
+ margin-right:auto
+}
+.fancybox__toolbar__items--center {
+ position:absolute;
+ left:50%;
+ transform:translateX(-50%)
+}
+.fancybox__toolbar__items--right {
+ margin-left:auto
+}
+@media(max-width: 640px) {
+ .fancybox__toolbar__items--center:not(:last-child) {
+  display:none
+ }
+}
+.fancybox__counter {
+ min-width:72px;
+ padding:0 10px;
+ line-height:var(--carousel-button-height, 48px);
+ text-align:center;
+ font-size:17px;
+ font-variant-numeric:tabular-nums;
+ -webkit-font-smoothing:subpixel-antialiased
+}
+.fancybox__progress {
+ background:var(--fancybox-accent-color, rgba(34, 213, 233, 0.96));
+ height:3px;
+ left:0;
+ position:absolute;
+ right:0;
+ top:0;
+ transform:scaleX(0);
+ transform-origin:0;
+ transition-property:transform;
+ transition-timing-function:linear;
+ z-index:30;
+ user-select:none
+}
+.fancybox__container:fullscreen::backdrop {
+ opacity:0
+}
+.fancybox__button--fullscreen g:nth-child(2) {
+ display:none
+}
+.fancybox__container:fullscreen .fancybox__button--fullscreen g:nth-child(1) {
+ display:none
+}
+.fancybox__container:fullscreen .fancybox__button--fullscreen g:nth-child(2) {
+ display:block
+}
+.fancybox__button--slideshow g:nth-child(2) {
+ display:none
+}
+.fancybox__container.has-slideshow .fancybox__button--slideshow g:nth-child(1) {
+ display:none
+}
+.fancybox__container.has-slideshow .fancybox__button--slideshow g:nth-child(2) {
+ display:block
+}
+
 </style>
 <div class="{{TabSizeClass .Editorconfig .FileName}} non-diff-file-content gallery">
 	<h4 class="file-header ui top attached header">
diff --git a/web_src/less/index.less b/web_src/less/index.less
index fbc9a80fd..d3ff37781 100644
--- a/web_src/less/index.less
+++ b/web_src/less/index.less
@@ -1,6 +1,6 @@
 @import "~highlight.js/styles/github.css";
 @import "./vendor/gitGraph.css";
-@import "./vendor/fancyapp.less";
+// @import "./vendor/fancyapp.less";
 // @import "~/remixicon/fonts/remixicon.css";
 @import "_svg";
 @import "_tribute";

From eb7aa8836c7e60c85540a886de716f837a913d05 Mon Sep 17 00:00:00 2001
From: zhoupzh <zhoupzh@pcl.ac.cn>
Date: Mon, 7 Nov 2022 12:28:16 +0800
Subject: [PATCH 085/187] fix issue

---
 package-lock.json                 |    5 -
 package.json                      |    1 -
 templates/repo/view_file.tmpl     |  730 ---------------
 web_src/js/index.js               |    2 +-
 web_src/js/vendor/fancybox.esm.js |    2 +
 web_src/less/index.less           |    2 +-
 web_src/less/vendor/fancyapp.less | 1383 +++++++++++++++--------------
 7 files changed, 707 insertions(+), 1418 deletions(-)
 create mode 100644 web_src/js/vendor/fancybox.esm.js

diff --git a/package-lock.json b/package-lock.json
index c7b2f49b3..7dc42d04c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -869,11 +869,6 @@
       "resolved": "https://registry.npmjs.org/@csstools/convert-colors/-/convert-colors-1.4.0.tgz",
       "integrity": "sha512-5a6wqoJV/xEdbRNKVo6I4hO3VjyDq//8q2f9I6PBAvMesJHFauXDorcNCsr9RzvsZnaWi5NYCcfyqP1QeFHFbw=="
     },
-    "@fancyapps/ui": {
-      "version": "4.0.31",
-      "resolved": "https://registry.npmjs.org/@fancyapps/ui/-/ui-4.0.31.tgz",
-      "integrity": "sha512-D7+PMIloxSOFJyY+lXcNlVDhmssOmDT6PT5fqQUIiws2hT7PH29r0EKZxERmACSQpm6qrFkP7rSguzXWvRJduQ=="
-    },
     "@kyleshockey/object-assign-deep": {
       "version": "0.4.2",
       "resolved": "https://registry.npmjs.org/@kyleshockey/object-assign-deep/-/object-assign-deep-0.4.2.tgz",
diff --git a/package.json b/package.json
index b04acfff6..7748f3de3 100644
--- a/package.json
+++ b/package.json
@@ -10,7 +10,6 @@
     "@babel/plugin-transform-runtime": "7.9.6",
     "@babel/preset-env": "7.9.6",
     "@babel/runtime": "7.9.6",
-    "@fancyapps/ui": "4.0.31",
     "@primer/octicons": "9.6.0",
     "axios": "0.21.1",
     "babel-loader": "8.1.0",
diff --git a/templates/repo/view_file.tmpl b/templates/repo/view_file.tmpl
index 8f48dd8b7..2a15aa6d0 100755
--- a/templates/repo/view_file.tmpl
+++ b/templates/repo/view_file.tmpl
@@ -36,736 +36,6 @@ img {
     transform: scale3d(0.8, 0.8, 0.8);
   }
 }
-.carousel {
- position:relative;
- box-sizing:border-box
-}
-.carousel *,
-.carousel *:before,
-.carousel *:after {
- box-sizing:inherit
-}
-.carousel.is-draggable {
- cursor:move;
- cursor:grab
-}
-.carousel.is-dragging {
- cursor:move;
- cursor:grabbing
-}
-.carousel__viewport {
- position:relative;
- overflow:hidden;
- max-width:100%;
- max-height:100%
-}
-.carousel__track {
- display:flex
-}
-.carousel__slide {
- flex:0 0 auto;
- width:var(--carousel-slide-width, 60%);
- max-width:100%;
- padding:1rem;
- position:relative;
- overflow-x:hidden;
- overflow-y:auto;
- overscroll-behavior:contain
-}
-.has-dots {
- margin-bottom:calc(0.5rem + 22px)
-}
-.carousel__dots {
- margin:0 auto;
- padding:0;
- position:absolute;
- top:calc(100% + 0.5rem);
- left:0;
- right:0;
- display:flex;
- justify-content:center;
- list-style:none;
- user-select:none
-}
-.carousel__dots .carousel__dot {
- margin:0;
- padding:0;
- display:block;
- position:relative;
- width:22px;
- height:22px;
- cursor:pointer
-}
-.carousel__dots .carousel__dot:after {
- content:"";
- width:8px;
- height:8px;
- border-radius:50%;
- position:absolute;
- top:50%;
- left:50%;
- transform:translate(-50%, -50%);
- background-color:currentColor;
- opacity:.25;
- transition:opacity .15s ease-in-out
-}
-.carousel__dots .carousel__dot.is-selected:after {
- opacity:1
-}
-.carousel__button {
- width:var(--carousel-button-width, 48px);
- height:var(--carousel-button-height, 48px);
- padding:0;
- border:0;
- display:flex;
- justify-content:center;
- align-items:center;
- pointer-events:all;
- cursor:pointer;
- color:var(--carousel-button-color, currentColor);
- background:var(--carousel-button-bg, transparent);
- border-radius:var(--carousel-button-border-radius, 50%);
- box-shadow:var(--carousel-button-shadow, none);
- transition:opacity .15s ease
-}
-.carousel__button.is-prev,
-.carousel__button.is-next {
- position:absolute;
- top:50%;
- transform:translateY(-50%)
-}
-.carousel__button.is-prev {
- left:10px
-}
-.carousel__button.is-next {
- right:10px
-}
-.carousel__button[disabled] {
- cursor:default;
- opacity:.3
-}
-.carousel__button svg {
- width:var(--carousel-button-svg-width, 50%);
- height:var(--carousel-button-svg-height, 50%);
- fill:none;
- stroke:currentColor;
- stroke-width:var(--carousel-button-svg-stroke-width, 1.5);
- stroke-linejoin:bevel;
- stroke-linecap:round;
- filter:var(--carousel-button-svg-filter, none);
- pointer-events:none
-}
-html.with-fancybox {
- scroll-behavior:auto
-}
-body.compensate-for-scrollbar {
- overflow:hidden !important;
- touch-action:none
-}
-.fancybox__container {
- position:fixed;
- top:0;
- left:0;
- bottom:0;
- right:0;
- direction:ltr;
- margin:0;
- padding:env(safe-area-inset-top, 0px) env(safe-area-inset-right, 0px) env(safe-area-inset-bottom, 0px) env(safe-area-inset-left, 0px);
- box-sizing:border-box;
- display:flex;
- flex-direction:column;
- color:var(--fancybox-color, #fff);
- -webkit-tap-highlight-color:rgba(0,0,0,0);
- overflow:hidden;
- z-index:1050;
- outline:none;
- transform-origin:top left;
- --carousel-button-width: 48px;
- --carousel-button-height: 48px;
- --carousel-button-svg-width: 24px;
- --carousel-button-svg-height: 24px;
- --carousel-button-svg-stroke-width: 2.5;
- --carousel-button-svg-filter: drop-shadow(1px 1px 1px rgba(0, 0, 0, 0.4))
-}
-.fancybox__container *,
-.fancybox__container *::before,
-.fancybox__container *::after {
- box-sizing:inherit
-}
-.fancybox__container :focus {
- outline:none
-}
-body:not(.is-using-mouse) .fancybox__container :focus {
- box-shadow:0 0 0 1px #fff,0 0 0 2px var(--fancybox-accent-color, rgba(1, 210, 232, 0.94))
-}
-@media all and (min-width: 1024px) {
- .fancybox__container {
-  --carousel-button-width:48px;
-  --carousel-button-height:48px;
-  --carousel-button-svg-width:27px;
-  --carousel-button-svg-height:27px
- }
-}
-.fancybox__backdrop {
- position:absolute;
- top:0;
- right:0;
- bottom:0;
- left:0;
- z-index:-1;
- background:var(--fancybox-bg, rgba(24, 24, 27, 0.92))
-}
-.fancybox__carousel {
- position:relative;
- flex:1 1 auto;
- min-height:0;
- height:100%;
- z-index:10
-}
-.fancybox__carousel.has-dots {
- margin-bottom:calc(0.5rem + 22px)
-}
-.fancybox__viewport {
- position:relative;
- width:100%;
- height:100%;
- overflow:visible;
- cursor:default
-}
-.fancybox__track {
- display:flex;
- height:100%
-}
-.fancybox__slide {
- flex:0 0 auto;
- width:100%;
- max-width:100%;
- margin:0;
- padding:48px 8px 8px 8px;
- position:relative;
- overscroll-behavior:contain;
- display:flex;
- flex-direction:column;
- outline:0;
- overflow:auto;
- --carousel-button-width: 36px;
- --carousel-button-height: 36px;
- --carousel-button-svg-width: 22px;
- --carousel-button-svg-height: 22px
-}
-.fancybox__slide::before,
-.fancybox__slide::after {
- content:"";
- flex:0 0 0;
- margin:auto
-}
-@media all and (min-width: 1024px) {
- .fancybox__slide {
-  padding:64px 100px
- }
-}
-.fancybox__content {
- margin:0 env(safe-area-inset-right, 0px) 0 env(safe-area-inset-left, 0px);
- padding:36px;
- color:var(--fancybox-content-color, #374151);
- background:var(--fancybox-content-bg, #fff);
- position:relative;
- align-self:center;
- display:flex;
- flex-direction:column;
- z-index:20
-}
-.fancybox__content :focus:not(.carousel__button.is-close) {
- outline:thin dotted;
- box-shadow:none
-}
-.fancybox__caption {
- align-self:center;
- max-width:100%;
- margin:0;
- padding:1rem 0 0 0;
- line-height:1.375;
- color:var(--fancybox-color, currentColor);
- visibility:visible;
- cursor:auto;
- flex-shrink:0;
- overflow-wrap:anywhere
-}
-.is-loading .fancybox__caption {
- visibility:hidden
-}
-.fancybox__container>.carousel__dots {
- top:100%;
- color:var(--fancybox-color, #fff)
-}
-.fancybox__nav .carousel__button {
- z-index:40
-}
-.fancybox__nav .carousel__button.is-next {
- right:8px
-}
-@media all and (min-width: 1024px) {
- .fancybox__nav .carousel__button.is-next {
-  right:40px
- }
-}
-.fancybox__nav .carousel__button.is-prev {
- left:8px
-}
-@media all and (min-width: 1024px) {
- .fancybox__nav .carousel__button.is-prev {
-  left:40px
- }
-}
-.carousel__button.is-close {
- position:absolute;
- top:8px;
- right:8px;
- top:calc(env(safe-area-inset-top, 0px) + 8px);
- right:calc(env(safe-area-inset-right, 0px) + 8px);
- z-index:40
-}
-@media all and (min-width: 1024px) {
- .carousel__button.is-close {
-  right:40px
- }
-}
-.fancybox__content>.carousel__button.is-close {
- position:absolute;
- top:-40px;
- right:0;
- color:var(--fancybox-color, #fff)
-}
-.fancybox__no-click,
-.fancybox__no-click button {
- pointer-events:none
-}
-.fancybox__spinner {
- position:absolute;
- top:50%;
- left:50%;
- transform:translate(-50%, -50%);
- width:50px;
- height:50px;
- color:var(--fancybox-color, currentColor)
-}
-.fancybox__slide .fancybox__spinner {
- cursor:pointer;
- z-index:1053
-}
-.fancybox__spinner svg {
- animation:fancybox-rotate 2s linear infinite;
- transform-origin:center center;
- position:absolute;
- top:0;
- right:0;
- bottom:0;
- left:0;
- margin:auto;
- width:100%;
- height:100%
-}
-.fancybox__spinner svg circle {
- fill:none;
- stroke-width:2.75;
- stroke-miterlimit:10;
- stroke-dasharray:1,200;
- stroke-dashoffset:0;
- animation:fancybox-dash 1.5s ease-in-out infinite;
- stroke-linecap:round;
- stroke:currentColor
-}
-@keyframes fancybox-rotate {
- 100% {
-  transform:rotate(360deg)
- }
-}
-@keyframes fancybox-dash {
- 0% {
-  stroke-dasharray:1,200;
-  stroke-dashoffset:0
- }
- 50% {
-  stroke-dasharray:89,200;
-  stroke-dashoffset:-35px
- }
- 100% {
-  stroke-dasharray:89,200;
-  stroke-dashoffset:-124px
- }
-}
-.fancybox__backdrop,
-.fancybox__caption,
-.fancybox__nav,
-.carousel__dots,
-.carousel__button.is-close {
- opacity:var(--fancybox-opacity, 1)
-}
-.fancybox__container.is-animated[aria-hidden=false] .fancybox__backdrop,
-.fancybox__container.is-animated[aria-hidden=false] .fancybox__caption,
-.fancybox__container.is-animated[aria-hidden=false] .fancybox__nav,
-.fancybox__container.is-animated[aria-hidden=false] .carousel__dots,
-.fancybox__container.is-animated[aria-hidden=false] .carousel__button.is-close {
- animation:.15s ease backwards fancybox-fadeIn
-}
-.fancybox__container.is-animated.is-closing .fancybox__backdrop,
-.fancybox__container.is-animated.is-closing .fancybox__caption,
-.fancybox__container.is-animated.is-closing .fancybox__nav,
-.fancybox__container.is-animated.is-closing .carousel__dots,
-.fancybox__container.is-animated.is-closing .carousel__button.is-close {
- animation:.15s ease both fancybox-fadeOut
-}
-.fancybox-fadeIn {
- animation:.15s ease both fancybox-fadeIn
-}
-.fancybox-fadeOut {
- animation:.1s ease both fancybox-fadeOut
-}
-.fancybox-zoomInUp {
- animation:.2s ease both fancybox-zoomInUp
-}
-.fancybox-zoomOutDown {
- animation:.15s ease both fancybox-zoomOutDown
-}
-.fancybox-throwOutUp {
- animation:.15s ease both fancybox-throwOutUp
-}
-.fancybox-throwOutDown {
- animation:.15s ease both fancybox-throwOutDown
-}
-@keyframes fancybox-fadeIn {
- from {
-  opacity:0
- }
- to {
-  opacity:1
- }
-}
-@keyframes fancybox-fadeOut {
- to {
-  opacity:0
- }
-}
-@keyframes fancybox-zoomInUp {
- from {
-  transform:scale(0.97) translate3d(0, 16px, 0);
-  opacity:0
- }
- to {
-  transform:scale(1) translate3d(0, 0, 0);
-  opacity:1
- }
-}
-@keyframes fancybox-zoomOutDown {
- to {
-  transform:scale(0.97) translate3d(0, 16px, 0);
-  opacity:0
- }
-}
-@keyframes fancybox-throwOutUp {
- to {
-  transform:translate3d(0, -30%, 0);
-  opacity:0
- }
-}
-@keyframes fancybox-throwOutDown {
- to {
-  transform:translate3d(0, 30%, 0);
-  opacity:0
- }
-}
-.fancybox__carousel .carousel__slide {
- scrollbar-width:thin;
- scrollbar-color:#ccc rgba(255,255,255,.1)
-}
-.fancybox__carousel .carousel__slide::-webkit-scrollbar {
- width:8px;
- height:8px
-}
-.fancybox__carousel .carousel__slide::-webkit-scrollbar-track {
- background-color:rgba(255,255,255,.1)
-}
-.fancybox__carousel .carousel__slide::-webkit-scrollbar-thumb {
- background-color:#ccc;
- border-radius:2px;
- box-shadow:inset 0 0 4px rgba(0,0,0,.2)
-}
-.fancybox__carousel.is-draggable .fancybox__slide,
-.fancybox__carousel.is-draggable .fancybox__slide .fancybox__content {
- cursor:move;
- cursor:grab
-}
-.fancybox__carousel.is-dragging .fancybox__slide,
-.fancybox__carousel.is-dragging .fancybox__slide .fancybox__content {
- cursor:move;
- cursor:grabbing
-}
-.fancybox__carousel .fancybox__slide .fancybox__content {
- cursor:auto
-}
-.fancybox__carousel .fancybox__slide.can-zoom_in .fancybox__content {
- cursor:zoom-in
-}
-.fancybox__carousel .fancybox__slide.can-zoom_out .fancybox__content {
- cursor:zoom-out
-}
-.fancybox__carousel .fancybox__slide.is-draggable .fancybox__content {
- cursor:move;
- cursor:grab
-}
-.fancybox__carousel .fancybox__slide.is-dragging .fancybox__content {
- cursor:move;
- cursor:grabbing
-}
-.fancybox__image {
- transform-origin:0 0;
- user-select:none;
- transition:none
-}
-.has-image .fancybox__content {
- padding:0;
- background:rgba(0,0,0,0);
- min-height:1px
-}
-.is-closing .has-image .fancybox__content {
- overflow:visible
-}
-.has-image[data-image-fit=contain] {
- overflow:visible;
- touch-action:none
-}
-.has-image[data-image-fit=contain] .fancybox__content {
- flex-direction:row;
- flex-wrap:wrap
-}
-.has-image[data-image-fit=contain] .fancybox__image {
- max-width:100%;
- max-height:100%;
- object-fit:contain
-}
-.has-image[data-image-fit=contain-w] {
- overflow-x:hidden;
- overflow-y:auto
-}
-.has-image[data-image-fit=contain-w] .fancybox__content {
- min-height:auto
-}
-.has-image[data-image-fit=contain-w] .fancybox__image {
- max-width:100%;
- height:auto
-}
-.has-image[data-image-fit=cover] {
- overflow:visible;
- touch-action:none
-}
-.has-image[data-image-fit=cover] .fancybox__content {
- width:100%;
- height:100%
-}
-.has-image[data-image-fit=cover] .fancybox__image {
- width:100%;
- height:100%;
- object-fit:cover
-}
-.fancybox__carousel .fancybox__slide.has-iframe .fancybox__content,
-.fancybox__carousel .fancybox__slide.has-map .fancybox__content,
-.fancybox__carousel .fancybox__slide.has-pdf .fancybox__content,
-.fancybox__carousel .fancybox__slide.has-video .fancybox__content,
-.fancybox__carousel .fancybox__slide.has-html5video .fancybox__content {
- max-width:100%;
- flex-shrink:1;
- min-height:1px;
- overflow:visible
-}
-.fancybox__carousel .fancybox__slide.has-iframe .fancybox__content,
-.fancybox__carousel .fancybox__slide.has-map .fancybox__content,
-.fancybox__carousel .fancybox__slide.has-pdf .fancybox__content {
- width:100%;
- height:80%
-}
-.fancybox__carousel .fancybox__slide.has-video .fancybox__content,
-.fancybox__carousel .fancybox__slide.has-html5video .fancybox__content {
- width:960px;
- height:540px;
- max-width:100%;
- max-height:100%
-}
-.fancybox__carousel .fancybox__slide.has-map .fancybox__content,
-.fancybox__carousel .fancybox__slide.has-pdf .fancybox__content,
-.fancybox__carousel .fancybox__slide.has-video .fancybox__content,
-.fancybox__carousel .fancybox__slide.has-html5video .fancybox__content {
- padding:0;
- background:rgba(24,24,27,.9);
- color:#fff
-}
-.fancybox__carousel .fancybox__slide.has-map .fancybox__content {
- background:#e5e3df
-}
-.fancybox__html5video,
-.fancybox__iframe {
- border:0;
- display:block;
- height:100%;
- width:100%;
- background:rgba(0,0,0,0)
-}
-.fancybox-placeholder {
- position:absolute;
- width:1px;
- height:1px;
- padding:0;
- margin:-1px;
- overflow:hidden;
- clip:rect(0, 0, 0, 0);
- white-space:nowrap;
- border-width:0
-}
-.fancybox__thumbs {
- flex:0 0 auto;
- position:relative;
- padding:0px 3px;
- opacity:var(--fancybox-opacity, 1)
-}
-.fancybox__container.is-animated[aria-hidden=false] .fancybox__thumbs {
- animation:.15s ease-in backwards fancybox-fadeIn
-}
-.fancybox__container.is-animated.is-closing .fancybox__thumbs {
- opacity:0
-}
-.fancybox__thumbs .carousel__slide {
- flex:0 0 auto;
- width:var(--fancybox-thumbs-width, 96px);
- margin:0;
- padding:8px 3px;
- box-sizing:content-box;
- display:flex;
- align-items:center;
- justify-content:center;
- overflow:visible;
- cursor:pointer
-}
-.fancybox__thumbs .carousel__slide .fancybox__thumb::after {
- content:"";
- position:absolute;
- top:0;
- left:0;
- right:0;
- bottom:0;
- border-width:5px;
- border-style:solid;
- border-color:var(--fancybox-accent-color, rgba(34, 213, 233, 0.96));
- opacity:0;
- transition:opacity .15s ease;
- border-radius:var(--fancybox-thumbs-border-radius, 4px)
-}
-.fancybox__thumbs .carousel__slide.is-nav-selected .fancybox__thumb::after {
- opacity:.92
-}
-.fancybox__thumbs .carousel__slide>* {
- pointer-events:none;
- user-select:none
-}
-.fancybox__thumb {
- position:relative;
- width:100%;
- padding-top:calc(100%/(var(--fancybox-thumbs-ratio, 1.5)));
- background-size:cover;
- background-position:center center;
- background-color:rgba(255,255,255,.1);
- background-repeat:no-repeat;
- border-radius:var(--fancybox-thumbs-border-radius, 4px)
-}
-.fancybox__toolbar {
- position:absolute;
- top:0;
- right:0;
- left:0;
- z-index:20;
- background:linear-gradient(to top, hsla(0deg, 0%, 0%, 0) 0%, hsla(0deg, 0%, 0%, 0.006) 8.1%, hsla(0deg, 0%, 0%, 0.021) 15.5%, hsla(0deg, 0%, 0%, 0.046) 22.5%, hsla(0deg, 0%, 0%, 0.077) 29%, hsla(0deg, 0%, 0%, 0.114) 35.3%, hsla(0deg, 0%, 0%, 0.155) 41.2%, hsla(0deg, 0%, 0%, 0.198) 47.1%, hsla(0deg, 0%, 0%, 0.242) 52.9%, hsla(0deg, 0%, 0%, 0.285) 58.8%, hsla(0deg, 0%, 0%, 0.326) 64.7%, hsla(0deg, 0%, 0%, 0.363) 71%, hsla(0deg, 0%, 0%, 0.394) 77.5%, hsla(0deg, 0%, 0%, 0.419) 84.5%, hsla(0deg, 0%, 0%, 0.434) 91.9%, hsla(0deg, 0%, 0%, 0.44) 100%);
- padding:0;
- touch-action:none;
- display:flex;
- justify-content:space-between;
- --carousel-button-svg-width: 20px;
- --carousel-button-svg-height: 20px;
- opacity:var(--fancybox-opacity, 1);
- text-shadow:var(--fancybox-toolbar-text-shadow, 1px 1px 1px rgba(0, 0, 0, 0.4))
-}
-@media all and (min-width: 1024px) {
- .fancybox__toolbar {
-  padding:8px
- }
-}
-.fancybox__container.is-animated[aria-hidden=false] .fancybox__toolbar {
- animation:.15s ease-in backwards fancybox-fadeIn
-}
-.fancybox__container.is-animated.is-closing .fancybox__toolbar {
- opacity:0
-}
-.fancybox__toolbar__items {
- display:flex
-}
-.fancybox__toolbar__items--left {
- margin-right:auto
-}
-.fancybox__toolbar__items--center {
- position:absolute;
- left:50%;
- transform:translateX(-50%)
-}
-.fancybox__toolbar__items--right {
- margin-left:auto
-}
-@media(max-width: 640px) {
- .fancybox__toolbar__items--center:not(:last-child) {
-  display:none
- }
-}
-.fancybox__counter {
- min-width:72px;
- padding:0 10px;
- line-height:var(--carousel-button-height, 48px);
- text-align:center;
- font-size:17px;
- font-variant-numeric:tabular-nums;
- -webkit-font-smoothing:subpixel-antialiased
-}
-.fancybox__progress {
- background:var(--fancybox-accent-color, rgba(34, 213, 233, 0.96));
- height:3px;
- left:0;
- position:absolute;
- right:0;
- top:0;
- transform:scaleX(0);
- transform-origin:0;
- transition-property:transform;
- transition-timing-function:linear;
- z-index:30;
- user-select:none
-}
-.fancybox__container:fullscreen::backdrop {
- opacity:0
-}
-.fancybox__button--fullscreen g:nth-child(2) {
- display:none
-}
-.fancybox__container:fullscreen .fancybox__button--fullscreen g:nth-child(1) {
- display:none
-}
-.fancybox__container:fullscreen .fancybox__button--fullscreen g:nth-child(2) {
- display:block
-}
-.fancybox__button--slideshow g:nth-child(2) {
- display:none
-}
-.fancybox__container.has-slideshow .fancybox__button--slideshow g:nth-child(1) {
- display:none
-}
-.fancybox__container.has-slideshow .fancybox__button--slideshow g:nth-child(2) {
- display:block
-}
-
 </style>
 <div class="{{TabSizeClass .Editorconfig .FileName}} non-diff-file-content gallery">
 	<h4 class="file-header ui top attached header">
diff --git a/web_src/js/index.js b/web_src/js/index.js
index 710b2d231..bc3de08b5 100755
--- a/web_src/js/index.js
+++ b/web_src/js/index.js
@@ -53,7 +53,7 @@ import { Message } from "element-ui";
 
 import { i18nVue } from "./features/i18nVue.js";
 import './features/ad.js';
-import { Fancybox } from "@fancyapps/ui";
+import { Fancybox } from "./vendor/fancybox.esm.js";
 
 
 Vue.use(ElementUI);
diff --git a/web_src/js/vendor/fancybox.esm.js b/web_src/js/vendor/fancybox.esm.js
new file mode 100644
index 000000000..9d7a73b55
--- /dev/null
+++ b/web_src/js/vendor/fancybox.esm.js
@@ -0,0 +1,2 @@
+// @fancyapps/ui/Fancybox v4.0.31
+const t=t=>"object"==typeof t&&null!==t&&t.constructor===Object&&"[object Object]"===Object.prototype.toString.call(t),e=(...i)=>{let s=!1;"boolean"==typeof i[0]&&(s=i.shift());let o=i[0];if(!o||"object"!=typeof o)throw new Error("extendee must be an object");const n=i.slice(1),a=n.length;for(let i=0;i<a;i++){const a=n[i];for(let i in a)if(a.hasOwnProperty(i)){const n=a[i];if(s&&(Array.isArray(n)||t(n))){const t=Array.isArray(n)?[]:{};o[i]=e(!0,o.hasOwnProperty(i)?o[i]:t,n)}else o[i]=n}}return o},i=(t,e=1e4)=>(t=parseFloat(t)||0,Math.round((t+Number.EPSILON)*e)/e),s=function(t){return!!(t&&"object"==typeof t&&t instanceof Element&&t!==document.body)&&(!t.__Panzoom&&(function(t){const e=getComputedStyle(t)["overflow-y"],i=getComputedStyle(t)["overflow-x"],s=("scroll"===e||"auto"===e)&&Math.abs(t.scrollHeight-t.clientHeight)>1,o=("scroll"===i||"auto"===i)&&Math.abs(t.scrollWidth-t.clientWidth)>1;return s||o}(t)?t:s(t.parentNode)))},o="undefined"!=typeof window&&window.ResizeObserver||class{constructor(t){this.observables=[],this.boundCheck=this.check.bind(this),this.boundCheck(),this.callback=t}observe(t){if(this.observables.some((e=>e.el===t)))return;const e={el:t,size:{height:t.clientHeight,width:t.clientWidth}};this.observables.push(e)}unobserve(t){this.observables=this.observables.filter((e=>e.el!==t))}disconnect(){this.observables=[]}check(){const t=this.observables.filter((t=>{const e=t.el.clientHeight,i=t.el.clientWidth;if(t.size.height!==e||t.size.width!==i)return t.size.height=e,t.size.width=i,!0})).map((t=>t.el));t.length>0&&this.callback(t),window.requestAnimationFrame(this.boundCheck)}};class n{constructor(t){this.id=self.Touch&&t instanceof Touch?t.identifier:-1,this.pageX=t.pageX,this.pageY=t.pageY,this.clientX=t.clientX,this.clientY=t.clientY}}const a=(t,e)=>e?Math.sqrt((e.clientX-t.clientX)**2+(e.clientY-t.clientY)**2):0,r=(t,e)=>e?{clientX:(t.clientX+e.clientX)/2,clientY:(t.clientY+e.clientY)/2}:t;class h{constructor(t,{start:e=(()=>!0),move:i=(()=>{}),end:s=(()=>{})}={}){this._element=t,this.startPointers=[],this.currentPointers=[],this._pointerStart=t=>{if(t.buttons>0&&0!==t.button)return;const e=new n(t);this.currentPointers.some((t=>t.id===e.id))||this._triggerPointerStart(e,t)&&(window.addEventListener("mousemove",this._move),window.addEventListener("mouseup",this._pointerEnd))},this._touchStart=t=>{for(const e of Array.from(t.changedTouches||[]))this._triggerPointerStart(new n(e),t)},this._move=t=>{const e=this.currentPointers.slice(),i=(t=>"changedTouches"in t)(t)?Array.from(t.changedTouches).map((t=>new n(t))):[new n(t)];for(const t of i){const e=this.currentPointers.findIndex((e=>e.id===t.id));e<0||(this.currentPointers[e]=t)}this._moveCallback(e,this.currentPointers.slice(),t)},this._triggerPointerEnd=(t,e)=>{const i=this.currentPointers.findIndex((e=>e.id===t.id));return!(i<0)&&(this.currentPointers.splice(i,1),this.startPointers.splice(i,1),this._endCallback(t,e),!0)},this._pointerEnd=t=>{t.buttons>0&&0!==t.button||this._triggerPointerEnd(new n(t),t)&&(window.removeEventListener("mousemove",this._move,{passive:!1}),window.removeEventListener("mouseup",this._pointerEnd,{passive:!1}))},this._touchEnd=t=>{for(const e of Array.from(t.changedTouches||[]))this._triggerPointerEnd(new n(e),t)},this._startCallback=e,this._moveCallback=i,this._endCallback=s,this._element.addEventListener("mousedown",this._pointerStart,{passive:!1}),this._element.addEventListener("touchstart",this._touchStart,{passive:!1}),this._element.addEventListener("touchmove",this._move,{passive:!1}),this._element.addEventListener("touchend",this._touchEnd),this._element.addEventListener("touchcancel",this._touchEnd)}stop(){this._element.removeEventListener("mousedown",this._pointerStart,{passive:!1}),this._element.removeEventListener("touchstart",this._touchStart,{passive:!1}),this._element.removeEventListener("touchmove",this._move,{passive:!1}),this._element.removeEventListener("touchend",this._touchEnd),this._element.removeEventListener("touchcancel",this._touchEnd),window.removeEventListener("mousemove",this._move),window.removeEventListener("mouseup",this._pointerEnd)}_triggerPointerStart(t,e){return!!this._startCallback(t,e)&&(this.currentPointers.push(t),this.startPointers.push(t),!0)}}class l{constructor(t={}){this.options=e(!0,{},t),this.plugins=[],this.events={};for(const t of["on","once"])for(const e of Object.entries(this.options[t]||{}))this[t](...e)}option(t,e,...i){t=String(t);let s=(o=t,n=this.options,o.split(".").reduce((function(t,e){return t&&t[e]}),n));var o,n;return"function"==typeof s&&(s=s.call(this,this,...i)),void 0===s?e:s}localize(t,e=[]){return t=(t=String(t).replace(/\{\{(\w+).?(\w+)?\}\}/g,((t,i,s)=>{let o="";s?o=this.option(`${i[0]+i.toLowerCase().substring(1)}.l10n.${s}`):i&&(o=this.option(`l10n.${i}`)),o||(o=t);for(let t=0;t<e.length;t++)o=o.split(e[t][0]).join(e[t][1]);return o}))).replace(/\{\{(.*)\}\}/,((t,e)=>e))}on(e,i){if(t(e)){for(const t of Object.entries(e))this.on(...t);return this}return String(e).split(" ").forEach((t=>{const e=this.events[t]=this.events[t]||[];-1==e.indexOf(i)&&e.push(i)})),this}once(e,i){if(t(e)){for(const t of Object.entries(e))this.once(...t);return this}return String(e).split(" ").forEach((t=>{const e=(...s)=>{this.off(t,e),i.call(this,this,...s)};e._=i,this.on(t,e)})),this}off(e,i){if(!t(e))return e.split(" ").forEach((t=>{const e=this.events[t];if(!e||!e.length)return this;let s=-1;for(let t=0,o=e.length;t<o;t++){const o=e[t];if(o&&(o===i||o._===i)){s=t;break}}-1!=s&&e.splice(s,1)})),this;for(const t of Object.entries(e))this.off(...t)}trigger(t,...e){for(const i of[...this.events[t]||[]].slice())if(i&&!1===i.call(this,this,...e))return!1;for(const i of[...this.events["*"]||[]].slice())if(i&&!1===i.call(this,t,this,...e))return!1;return!0}attachPlugins(t){const i={};for(const[s,o]of Object.entries(t||{}))!1===this.options[s]||this.plugins[s]||(this.options[s]=e({},o.defaults||{},this.options[s]),i[s]=new o(this));for(const[t,e]of Object.entries(i))e.attach(this);return this.plugins=Object.assign({},this.plugins,i),this}detachPlugins(){for(const t in this.plugins){let e;(e=this.plugins[t])&&"function"==typeof e.detach&&e.detach(this)}return this.plugins={},this}}const c={touch:!0,zoom:!0,pinchToZoom:!0,panOnlyZoomed:!1,lockAxis:!1,friction:.64,decelFriction:.88,zoomFriction:.74,bounceForce:.2,baseScale:1,minScale:1,maxScale:2,step:.5,textSelection:!1,click:"toggleZoom",wheel:"zoom",wheelFactor:42,wheelLimit:5,draggableClass:"is-draggable",draggingClass:"is-dragging",ratio:1};class d extends l{constructor(t,i={}){super(e(!0,{},c,i)),this.state="init",this.$container=t;for(const t of["onLoad","onWheel","onClick"])this[t]=this[t].bind(this);this.initLayout(),this.resetValues(),this.attachPlugins(d.Plugins),this.trigger("init"),this.updateMetrics(),this.attachEvents(),this.trigger("ready"),!1===this.option("centerOnStart")?this.state="ready":this.panTo({friction:0}),t.__Panzoom=this}initLayout(){const t=this.$container;if(!(t instanceof HTMLElement))throw new Error("Panzoom: Container not found");const e=this.option("content")||t.querySelector(".panzoom__content");if(!e)throw new Error("Panzoom: Content not found");this.$content=e;let i=this.option("viewport")||t.querySelector(".panzoom__viewport");i||!1===this.option("wrapInner")||(i=document.createElement("div"),i.classList.add("panzoom__viewport"),i.append(...t.childNodes),t.appendChild(i)),this.$viewport=i||e.parentNode}resetValues(){this.updateRate=this.option("updateRate",/iPhone|iPad|iPod|Android/i.test(navigator.userAgent)?250:24),this.container={width:0,height:0},this.viewport={width:0,height:0},this.content={origWidth:0,origHeight:0,width:0,height:0,x:this.option("x",0),y:this.option("y",0),scale:this.option("baseScale")},this.transform={x:0,y:0,scale:1},this.resetDragPosition()}onLoad(t){this.updateMetrics(),this.panTo({scale:this.option("baseScale"),friction:0}),this.trigger("load",t)}onClick(t){if(t.defaultPrevented)return;if(document.activeElement&&document.activeElement.closest("[contenteditable]"))return;if(this.option("textSelection")&&window.getSelection().toString().length&&(!t.target||!t.target.hasAttribute("data-fancybox-close")))return void t.stopPropagation();const e=this.$content.getClientRects()[0];if("ready"!==this.state&&(this.dragPosition.midPoint||Math.abs(e.top-this.dragStart.rect.top)>1||Math.abs(e.left-this.dragStart.rect.left)>1))return t.preventDefault(),void t.stopPropagation();!1!==this.trigger("click",t)&&this.option("zoom")&&"toggleZoom"===this.option("click")&&(t.preventDefault(),t.stopPropagation(),this.zoomWithClick(t))}onWheel(t){!1!==this.trigger("wheel",t)&&this.option("zoom")&&this.option("wheel")&&this.zoomWithWheel(t)}zoomWithWheel(t){void 0===this.changedDelta&&(this.changedDelta=0);const e=Math.max(-1,Math.min(1,-t.deltaY||-t.deltaX||t.wheelDelta||-t.detail)),i=this.content.scale;let s=i*(100+e*this.option("wheelFactor"))/100;if(e<0&&Math.abs(i-this.option("minScale"))<.01||e>0&&Math.abs(i-this.option("maxScale"))<.01?(this.changedDelta+=Math.abs(e),s=i):(this.changedDelta=0,s=Math.max(Math.min(s,this.option("maxScale")),this.option("minScale"))),this.changedDelta>this.option("wheelLimit"))return;if(t.preventDefault(),s===i)return;const o=this.$content.getBoundingClientRect(),n=t.clientX-o.left,a=t.clientY-o.top;this.zoomTo(s,{x:n,y:a})}zoomWithClick(t){const e=this.$content.getClientRects()[0],i=t.clientX-e.left,s=t.clientY-e.top;this.toggleZoom({x:i,y:s})}attachEvents(){this.$content.addEventListener("load",this.onLoad),this.$container.addEventListener("wheel",this.onWheel,{passive:!1}),this.$container.addEventListener("click",this.onClick,{passive:!1}),this.initObserver();const t=new h(this.$container,{start:(e,i)=>{if(!this.option("touch"))return!1;if(this.velocity.scale<0)return!1;const o=i.composedPath()[0];if(!t.currentPointers.length){if(-1!==["BUTTON","TEXTAREA","OPTION","INPUT","SELECT","VIDEO"].indexOf(o.nodeName))return!1;if(this.option("textSelection")&&((t,e,i)=>{const s=t.childNodes,o=document.createRange();for(let t=0;t<s.length;t++){const n=s[t];if(n.nodeType!==Node.TEXT_NODE)continue;o.selectNodeContents(n);const a=o.getBoundingClientRect();if(e>=a.left&&i>=a.top&&e<=a.right&&i<=a.bottom)return n}return!1})(o,e.clientX,e.clientY))return!1}return!s(o)&&(!1!==this.trigger("touchStart",i)&&("mousedown"===i.type&&i.preventDefault(),this.state="pointerdown",this.resetDragPosition(),this.dragPosition.midPoint=null,this.dragPosition.time=Date.now(),!0))},move:(e,i,s)=>{if("pointerdown"!==this.state)return;if(!1===this.trigger("touchMove",s))return void s.preventDefault();if(i.length<2&&!0===this.option("panOnlyZoomed")&&this.content.width<=this.viewport.width&&this.content.height<=this.viewport.height&&this.transform.scale<=this.option("baseScale"))return;if(i.length>1&&(!this.option("zoom")||!1===this.option("pinchToZoom")))return;const o=r(e[0],e[1]),n=r(i[0],i[1]),h=n.clientX-o.clientX,l=n.clientY-o.clientY,c=a(e[0],e[1]),d=a(i[0],i[1]),u=c&&d?d/c:1;this.dragOffset.x+=h,this.dragOffset.y+=l,this.dragOffset.scale*=u,this.dragOffset.time=Date.now()-this.dragPosition.time;const f=1===this.dragStart.scale&&this.option("lockAxis");if(f&&!this.lockAxis){if(Math.abs(this.dragOffset.x)<6&&Math.abs(this.dragOffset.y)<6)return void s.preventDefault();const t=Math.abs(180*Math.atan2(this.dragOffset.y,this.dragOffset.x)/Math.PI);this.lockAxis=t>45&&t<135?"y":"x"}if("xy"===f||"y"!==this.lockAxis){if(s.preventDefault(),s.stopPropagation(),s.stopImmediatePropagation(),this.lockAxis&&(this.dragOffset["x"===this.lockAxis?"y":"x"]=0),this.$container.classList.add(this.option("draggingClass")),this.transform.scale===this.option("baseScale")&&"y"===this.lockAxis||(this.dragPosition.x=this.dragStart.x+this.dragOffset.x),this.transform.scale===this.option("baseScale")&&"x"===this.lockAxis||(this.dragPosition.y=this.dragStart.y+this.dragOffset.y),this.dragPosition.scale=this.dragStart.scale*this.dragOffset.scale,i.length>1){const e=r(t.startPointers[0],t.startPointers[1]),i=e.clientX-this.dragStart.rect.x,s=e.clientY-this.dragStart.rect.y,{deltaX:o,deltaY:a}=this.getZoomDelta(this.content.scale*this.dragOffset.scale,i,s);this.dragPosition.x-=o,this.dragPosition.y-=a,this.dragPosition.midPoint=n}else this.setDragResistance();this.transform={x:this.dragPosition.x,y:this.dragPosition.y,scale:this.dragPosition.scale},this.startAnimation()}},end:(e,i)=>{if("pointerdown"!==this.state)return;if(this._dragOffset={...this.dragOffset},t.currentPointers.length)return void this.resetDragPosition();if(this.state="decel",this.friction=this.option("decelFriction"),this.recalculateTransform(),this.$container.classList.remove(this.option("draggingClass")),!1===this.trigger("touchEnd",i))return;if("decel"!==this.state)return;const s=this.option("minScale");if(this.transform.scale<s)return void this.zoomTo(s,{friction:.64});const o=this.option("maxScale");if(this.transform.scale-o>.01){const t=this.dragPosition.midPoint||e,i=this.$content.getClientRects()[0];this.zoomTo(o,{friction:.64,x:t.clientX-i.left,y:t.clientY-i.top})}else;}});this.pointerTracker=t}initObserver(){this.resizeObserver||(this.resizeObserver=new o((()=>{this.updateTimer||(this.updateTimer=setTimeout((()=>{const t=this.$container.getBoundingClientRect();t.width&&t.height?((Math.abs(t.width-this.container.width)>1||Math.abs(t.height-this.container.height)>1)&&(this.isAnimating()&&this.endAnimation(!0),this.updateMetrics(),this.panTo({x:this.content.x,y:this.content.y,scale:this.option("baseScale"),friction:0})),this.updateTimer=null):this.updateTimer=null}),this.updateRate))})),this.resizeObserver.observe(this.$container))}resetDragPosition(){this.lockAxis=null,this.friction=this.option("friction"),this.velocity={x:0,y:0,scale:0};const{x:t,y:e,scale:i}=this.content;this.dragStart={rect:this.$content.getBoundingClientRect(),x:t,y:e,scale:i},this.dragPosition={...this.dragPosition,x:t,y:e,scale:i},this.dragOffset={x:0,y:0,scale:1,time:0}}updateMetrics(t){!0!==t&&this.trigger("beforeUpdate");const e=this.$container,s=this.$content,o=this.$viewport,n=s instanceof HTMLImageElement,a=this.option("zoom"),r=this.option("resizeParent",a);let h=this.option("width"),l=this.option("height"),c=h||(d=s,Math.max(parseFloat(d.naturalWidth||0),parseFloat(d.width&&d.width.baseVal&&d.width.baseVal.value||0),parseFloat(d.offsetWidth||0),parseFloat(d.scrollWidth||0)));var d;let u=l||(t=>Math.max(parseFloat(t.naturalHeight||0),parseFloat(t.height&&t.height.baseVal&&t.height.baseVal.value||0),parseFloat(t.offsetHeight||0),parseFloat(t.scrollHeight||0)))(s);Object.assign(s.style,{width:h?`${h}px`:"",height:l?`${l}px`:"",maxWidth:"",maxHeight:""}),r&&Object.assign(o.style,{width:"",height:""});const f=this.option("ratio");c=i(c*f),u=i(u*f),h=c,l=u;const g=s.getBoundingClientRect(),p=o.getBoundingClientRect(),m=o==e?p:e.getBoundingClientRect();let y=Math.max(o.offsetWidth,i(p.width)),v=Math.max(o.offsetHeight,i(p.height)),b=window.getComputedStyle(o);if(y-=parseFloat(b.paddingLeft)+parseFloat(b.paddingRight),v-=parseFloat(b.paddingTop)+parseFloat(b.paddingBottom),this.viewport.width=y,this.viewport.height=v,a){if(Math.abs(c-g.width)>.1||Math.abs(u-g.height)>.1){const t=((t,e,i,s)=>{const o=Math.min(i/t||0,s/e);return{width:t*o||0,height:e*o||0}})(c,u,Math.min(c,g.width),Math.min(u,g.height));h=i(t.width),l=i(t.height)}Object.assign(s.style,{width:`${h}px`,height:`${l}px`,transform:""})}if(r&&(Object.assign(o.style,{width:`${h}px`,height:`${l}px`}),this.viewport={...this.viewport,width:h,height:l}),n&&a&&"function"!=typeof this.options.maxScale){const t=this.option("maxScale");this.options.maxScale=function(){return this.content.origWidth>0&&this.content.fitWidth>0?this.content.origWidth/this.content.fitWidth:t}}this.content={...this.content,origWidth:c,origHeight:u,fitWidth:h,fitHeight:l,width:h,height:l,scale:1,isZoomable:a},this.container={width:m.width,height:m.height},!0!==t&&this.trigger("afterUpdate")}zoomIn(t){this.zoomTo(this.content.scale+(t||this.option("step")))}zoomOut(t){this.zoomTo(this.content.scale-(t||this.option("step")))}toggleZoom(t={}){const e=this.option("maxScale"),i=this.option("baseScale"),s=this.content.scale>i+.5*(e-i)?i:e;this.zoomTo(s,t)}zoomTo(t=this.option("baseScale"),{x:e=null,y:s=null}={}){t=Math.max(Math.min(t,this.option("maxScale")),this.option("minScale"));const o=i(this.content.scale/(this.content.width/this.content.fitWidth),1e7);null===e&&(e=this.content.width*o*.5),null===s&&(s=this.content.height*o*.5);const{deltaX:n,deltaY:a}=this.getZoomDelta(t,e,s);e=this.content.x-n,s=this.content.y-a,this.panTo({x:e,y:s,scale:t,friction:this.option("zoomFriction")})}getZoomDelta(t,e=0,i=0){const s=this.content.fitWidth*this.content.scale,o=this.content.fitHeight*this.content.scale,n=e>0&&s?e/s:0,a=i>0&&o?i/o:0;return{deltaX:(this.content.fitWidth*t-s)*n,deltaY:(this.content.fitHeight*t-o)*a}}panTo({x:t=this.content.x,y:e=this.content.y,scale:i,friction:s=this.option("friction"),ignoreBounds:o=!1}={}){if(i=i||this.content.scale||1,!o){const{boundX:s,boundY:o}=this.getBounds(i);s&&(t=Math.max(Math.min(t,s.to),s.from)),o&&(e=Math.max(Math.min(e,o.to),o.from))}this.friction=s,this.transform={...this.transform,x:t,y:e,scale:i},s?(this.state="panning",this.velocity={x:(1/this.friction-1)*(t-this.content.x),y:(1/this.friction-1)*(e-this.content.y),scale:(1/this.friction-1)*(i-this.content.scale)},this.startAnimation()):this.endAnimation()}startAnimation(){this.rAF?cancelAnimationFrame(this.rAF):this.trigger("startAnimation"),this.rAF=requestAnimationFrame((()=>this.animate()))}animate(){if(this.setEdgeForce(),this.setDragForce(),this.velocity.x*=this.friction,this.velocity.y*=this.friction,this.velocity.scale*=this.friction,this.content.x+=this.velocity.x,this.content.y+=this.velocity.y,this.content.scale+=this.velocity.scale,this.isAnimating())this.setTransform();else if("pointerdown"!==this.state)return void this.endAnimation();this.rAF=requestAnimationFrame((()=>this.animate()))}getBounds(t){let e=this.boundX,s=this.boundY;if(void 0!==e&&void 0!==s)return{boundX:e,boundY:s};e={from:0,to:0},s={from:0,to:0},t=t||this.transform.scale;const o=this.content.fitWidth*t,n=this.content.fitHeight*t,a=this.viewport.width,r=this.viewport.height;if(o<a){const t=i(.5*(a-o));e.from=t,e.to=t}else e.from=i(a-o);if(n<r){const t=.5*(r-n);s.from=t,s.to=t}else s.from=i(r-n);return{boundX:e,boundY:s}}setEdgeForce(){if("decel"!==this.state)return;const t=this.option("bounceForce"),{boundX:e,boundY:i}=this.getBounds(Math.max(this.transform.scale,this.content.scale));let s,o,n,a;if(e&&(s=this.content.x<e.from,o=this.content.x>e.to),i&&(n=this.content.y<i.from,a=this.content.y>i.to),s||o){let i=((s?e.from:e.to)-this.content.x)*t;const o=this.content.x+(this.velocity.x+i)/this.friction;o>=e.from&&o<=e.to&&(i+=this.velocity.x),this.velocity.x=i,this.recalculateTransform()}if(n||a){let e=((n?i.from:i.to)-this.content.y)*t;const s=this.content.y+(e+this.velocity.y)/this.friction;s>=i.from&&s<=i.to&&(e+=this.velocity.y),this.velocity.y=e,this.recalculateTransform()}}setDragResistance(){if("pointerdown"!==this.state)return;const{boundX:t,boundY:e}=this.getBounds(this.dragPosition.scale);let i,s,o,n;if(t&&(i=this.dragPosition.x<t.from,s=this.dragPosition.x>t.to),e&&(o=this.dragPosition.y<e.from,n=this.dragPosition.y>e.to),(i||s)&&(!i||!s)){const e=i?t.from:t.to,s=e-this.dragPosition.x;this.dragPosition.x=e-.3*s}if((o||n)&&(!o||!n)){const t=o?e.from:e.to,i=t-this.dragPosition.y;this.dragPosition.y=t-.3*i}}setDragForce(){"pointerdown"===this.state&&(this.velocity.x=this.dragPosition.x-this.content.x,this.velocity.y=this.dragPosition.y-this.content.y,this.velocity.scale=this.dragPosition.scale-this.content.scale)}recalculateTransform(){this.transform.x=this.content.x+this.velocity.x/(1/this.friction-1),this.transform.y=this.content.y+this.velocity.y/(1/this.friction-1),this.transform.scale=this.content.scale+this.velocity.scale/(1/this.friction-1)}isAnimating(){return!(!this.friction||!(Math.abs(this.velocity.x)>.05||Math.abs(this.velocity.y)>.05||Math.abs(this.velocity.scale)>.05))}setTransform(t){let e,s,o;if(t?(e=i(this.transform.x),s=i(this.transform.y),o=this.transform.scale,this.content={...this.content,x:e,y:s,scale:o}):(e=i(this.content.x),s=i(this.content.y),o=this.content.scale/(this.content.width/this.content.fitWidth),this.content={...this.content,x:e,y:s}),this.trigger("beforeTransform"),e=i(this.content.x),s=i(this.content.y),t&&this.option("zoom")){let t,n;t=i(this.content.fitWidth*o),n=i(this.content.fitHeight*o),this.content.width=t,this.content.height=n,this.transform={...this.transform,width:t,height:n,scale:o},Object.assign(this.$content.style,{width:`${t}px`,height:`${n}px`,maxWidth:"none",maxHeight:"none",transform:`translate3d(${e}px, ${s}px, 0) scale(1)`})}else this.$content.style.transform=`translate3d(${e}px, ${s}px, 0) scale(${o})`;this.trigger("afterTransform")}endAnimation(t){cancelAnimationFrame(this.rAF),this.rAF=null,this.velocity={x:0,y:0,scale:0},this.setTransform(!0),this.state="ready",this.handleCursor(),!0!==t&&this.trigger("endAnimation")}handleCursor(){const t=this.option("draggableClass");t&&this.option("touch")&&(1==this.option("panOnlyZoomed")&&this.content.width<=this.viewport.width&&this.content.height<=this.viewport.height&&this.transform.scale<=this.option("baseScale")?this.$container.classList.remove(t):this.$container.classList.add(t))}detachEvents(){this.$content.removeEventListener("load",this.onLoad),this.$container.removeEventListener("wheel",this.onWheel,{passive:!1}),this.$container.removeEventListener("click",this.onClick,{passive:!1}),this.pointerTracker&&(this.pointerTracker.stop(),this.pointerTracker=null),this.resizeObserver&&(this.resizeObserver.disconnect(),this.resizeObserver=null)}destroy(){"destroy"!==this.state&&(this.state="destroy",clearTimeout(this.updateTimer),this.updateTimer=null,cancelAnimationFrame(this.rAF),this.rAF=null,this.detachEvents(),this.detachPlugins(),this.resetDragPosition())}}d.version="4.0.31",d.Plugins={};const u=(t,e)=>{let i=0;return function(...s){const o=(new Date).getTime();if(!(o-i<e))return i=o,t(...s)}};class f{constructor(t){this.$container=null,this.$prev=null,this.$next=null,this.carousel=t,this.onRefresh=this.onRefresh.bind(this)}option(t){return this.carousel.option(`Navigation.${t}`)}createButton(t){const e=document.createElement("button");e.setAttribute("title",this.carousel.localize(`{{${t.toUpperCase()}}}`));const i=this.option("classNames.button")+" "+this.option(`classNames.${t}`);return e.classList.add(...i.split(" ")),e.setAttribute("tabindex","0"),e.innerHTML=this.carousel.localize(this.option(`${t}Tpl`)),e.addEventListener("click",(e=>{e.preventDefault(),e.stopPropagation(),this.carousel["slide"+("next"===t?"Next":"Prev")]()})),e}build(){this.$container||(this.$container=document.createElement("div"),this.$container.classList.add(...this.option("classNames.main").split(" ")),this.carousel.$container.appendChild(this.$container)),this.$next||(this.$next=this.createButton("next"),this.$container.appendChild(this.$next)),this.$prev||(this.$prev=this.createButton("prev"),this.$container.appendChild(this.$prev))}onRefresh(){const t=this.carousel.pages.length;t<=1||t>1&&this.carousel.elemDimWidth<this.carousel.wrapDimWidth&&!Number.isInteger(this.carousel.option("slidesPerPage"))?this.cleanup():(this.build(),this.$prev.removeAttribute("disabled"),this.$next.removeAttribute("disabled"),this.carousel.option("infiniteX",this.carousel.option("infinite"))||(this.carousel.page<=0&&this.$prev.setAttribute("disabled",""),this.carousel.page>=t-1&&this.$next.setAttribute("disabled","")))}cleanup(){this.$prev&&this.$prev.remove(),this.$prev=null,this.$next&&this.$next.remove(),this.$next=null,this.$container&&this.$container.remove(),this.$container=null}attach(){this.carousel.on("refresh change",this.onRefresh)}detach(){this.carousel.off("refresh change",this.onRefresh),this.cleanup()}}f.defaults={prevTpl:'<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" tabindex="-1"><path d="M15 3l-9 9 9 9"/></svg>',nextTpl:'<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" tabindex="-1"><path d="M9 3l9 9-9 9"/></svg>',classNames:{main:"carousel__nav",button:"carousel__button",next:"is-next",prev:"is-prev"}};class g{constructor(t){this.carousel=t,this.selectedIndex=null,this.friction=0,this.onNavReady=this.onNavReady.bind(this),this.onNavClick=this.onNavClick.bind(this),this.onNavCreateSlide=this.onNavCreateSlide.bind(this),this.onTargetChange=this.onTargetChange.bind(this)}addAsTargetFor(t){this.target=this.carousel,this.nav=t,this.attachEvents()}addAsNavFor(t){this.target=t,this.nav=this.carousel,this.attachEvents()}attachEvents(){this.nav.options.initialSlide=this.target.options.initialPage,this.nav.on("ready",this.onNavReady),this.nav.on("createSlide",this.onNavCreateSlide),this.nav.on("Panzoom.click",this.onNavClick),this.target.on("change",this.onTargetChange),this.target.on("Panzoom.afterUpdate",this.onTargetChange)}onNavReady(){this.onTargetChange(!0)}onNavClick(t,e,i){const s=i.target.closest(".carousel__slide");if(!s)return;i.stopPropagation();const o=parseInt(s.dataset.index,10),n=this.target.findPageForSlide(o);this.target.page!==n&&this.target.slideTo(n,{friction:this.friction}),this.markSelectedSlide(o)}onNavCreateSlide(t,e){e.index===this.selectedIndex&&this.markSelectedSlide(e.index)}onTargetChange(){const t=this.target.pages[this.target.page].indexes[0],e=this.nav.findPageForSlide(t);this.nav.slideTo(e),this.markSelectedSlide(t)}markSelectedSlide(t){this.selectedIndex=t,[...this.nav.slides].filter((t=>t.$el&&t.$el.classList.remove("is-nav-selected")));const e=this.nav.slides[t];e&&e.$el&&e.$el.classList.add("is-nav-selected")}attach(t){const e=t.options.Sync;(e.target||e.nav)&&(e.target?this.addAsNavFor(e.target):e.nav&&this.addAsTargetFor(e.nav),this.friction=e.friction)}detach(){this.nav&&(this.nav.off("ready",this.onNavReady),this.nav.off("Panzoom.click",this.onNavClick),this.nav.off("createSlide",this.onNavCreateSlide)),this.target&&(this.target.off("Panzoom.afterUpdate",this.onTargetChange),this.target.off("change",this.onTargetChange))}}g.defaults={friction:.92};const p={Navigation:f,Dots:class{constructor(t){this.carousel=t,this.$list=null,this.events={change:this.onChange.bind(this),refresh:this.onRefresh.bind(this)}}buildList(){if(this.carousel.pages.length<this.carousel.option("Dots.minSlideCount"))return;const t=document.createElement("ol");return t.classList.add("carousel__dots"),t.addEventListener("click",(t=>{if(!("page"in t.target.dataset))return;t.preventDefault(),t.stopPropagation();const e=parseInt(t.target.dataset.page,10),i=this.carousel;e!==i.page&&(i.pages.length<3&&i.option("infinite")?i[0==e?"slidePrev":"slideNext"]():i.slideTo(e))})),this.$list=t,this.carousel.$container.appendChild(t),this.carousel.$container.classList.add("has-dots"),t}removeList(){this.$list&&(this.$list.parentNode.removeChild(this.$list),this.$list=null),this.carousel.$container.classList.remove("has-dots")}rebuildDots(){let t=this.$list;const e=!!t,i=this.carousel.pages.length;if(i<2)return void(e&&this.removeList());e||(t=this.buildList());const s=this.$list.children.length;if(s>i)for(let t=i;t<s;t++)this.$list.removeChild(this.$list.lastChild);else{for(let t=s;t<i;t++){const e=document.createElement("li");e.classList.add("carousel__dot"),e.dataset.page=t,e.setAttribute("role","button"),e.setAttribute("tabindex","0"),e.setAttribute("title",this.carousel.localize("{{GOTO}}",[["%d",t+1]])),e.addEventListener("keydown",(t=>{const i=t.code;let s;"Enter"===i||"NumpadEnter"===i?s=e:"ArrowRight"===i?s=e.nextSibling:"ArrowLeft"===i&&(s=e.previousSibling),s&&s.click()})),this.$list.appendChild(e)}this.setActiveDot()}}setActiveDot(){if(!this.$list)return;this.$list.childNodes.forEach((t=>{t.classList.remove("is-selected")}));const t=this.$list.childNodes[this.carousel.page];t&&t.classList.add("is-selected")}onChange(){this.setActiveDot()}onRefresh(){this.rebuildDots()}attach(){this.carousel.on(this.events)}detach(){this.removeList(),this.carousel.off(this.events),this.carousel=null}},Sync:g};const m={slides:[],preload:0,slidesPerPage:"auto",initialPage:null,initialSlide:null,friction:.92,center:!0,infinite:!0,fill:!0,dragFree:!1,prefix:"",classNames:{viewport:"carousel__viewport",track:"carousel__track",slide:"carousel__slide",slideSelected:"is-selected"},l10n:{NEXT:"Next slide",PREV:"Previous slide",GOTO:"Go to slide #%d"}};class y extends l{constructor(t,i={}){if(super(i=e(!0,{},m,i)),this.state="init",this.$container=t,!(this.$container instanceof HTMLElement))throw new Error("No root element provided");this.slideNext=u(this.slideNext.bind(this),250),this.slidePrev=u(this.slidePrev.bind(this),250),this.init(),t.__Carousel=this}init(){this.pages=[],this.page=this.pageIndex=null,this.prevPage=this.prevPageIndex=null,this.attachPlugins(y.Plugins),this.trigger("init"),this.initLayout(),this.initSlides(),this.updateMetrics(),this.$track&&this.pages.length&&(this.$track.style.transform=`translate3d(${-1*this.pages[this.page].left}px, 0px, 0) scale(1)`),this.manageSlideVisiblity(),this.initPanzoom(),this.state="ready",this.trigger("ready")}initLayout(){const t=this.option("prefix"),e=this.option("classNames");this.$viewport=this.option("viewport")||this.$container.querySelector(`.${t}${e.viewport}`),this.$viewport||(this.$viewport=document.createElement("div"),this.$viewport.classList.add(...(t+e.viewport).split(" ")),this.$viewport.append(...this.$container.childNodes),this.$container.appendChild(this.$viewport)),this.$track=this.option("track")||this.$container.querySelector(`.${t}${e.track}`),this.$track||(this.$track=document.createElement("div"),this.$track.classList.add(...(t+e.track).split(" ")),this.$track.append(...this.$viewport.childNodes),this.$viewport.appendChild(this.$track))}initSlides(){this.slides=[];this.$viewport.querySelectorAll(`.${this.option("prefix")}${this.option("classNames.slide")}`).forEach((t=>{const e={$el:t,isDom:!0};this.slides.push(e),this.trigger("createSlide",e,this.slides.length)})),Array.isArray(this.options.slides)&&(this.slides=e(!0,[...this.slides],this.options.slides))}updateMetrics(){let t,e=0,s=[];this.slides.forEach(((i,o)=>{const n=i.$el,a=i.isDom||!t?this.getSlideMetrics(n):t;i.index=o,i.width=a,i.left=e,t=a,e+=a,s.push(o)}));let o=Math.max(this.$track.offsetWidth,i(this.$track.getBoundingClientRect().width)),n=getComputedStyle(this.$track);o-=parseFloat(n.paddingLeft)+parseFloat(n.paddingRight),this.contentWidth=e,this.viewportWidth=o;const a=[],r=this.option("slidesPerPage");if(Number.isInteger(r)&&e>o)for(let t=0;t<this.slides.length;t+=r)a.push({indexes:s.slice(t,t+r),slides:this.slides.slice(t,t+r)});else{let t=0,e=0;for(let i=0;i<this.slides.length;i+=1){let s=this.slides[i];(!a.length||e+s.width>o)&&(a.push({indexes:[],slides:[]}),t=a.length-1,e=0),e+=s.width,a[t].indexes.push(i),a[t].slides.push(s)}}const h=this.option("center"),l=this.option("fill");a.forEach(((t,i)=>{t.index=i,t.width=t.slides.reduce(((t,e)=>t+e.width),0),t.left=t.slides[0].left,h&&(t.left+=.5*(o-t.width)*-1),l&&!this.option("infiniteX",this.option("infinite"))&&e>o&&(t.left=Math.max(t.left,0),t.left=Math.min(t.left,e-o))}));const c=[];let d;a.forEach((t=>{const e={...t};d&&e.left===d.left?(d.width+=e.width,d.slides=[...d.slides,...e.slides],d.indexes=[...d.indexes,...e.indexes]):(e.index=c.length,d=e,c.push(e))})),this.pages=c;let u=this.page;if(null===u){const t=this.option("initialSlide");u=null!==t?this.findPageForSlide(t):parseInt(this.option("initialPage",0),10)||0,c[u]||(u=c.length&&u>c.length?c[c.length-1].index:0),this.page=u,this.pageIndex=u}this.updatePanzoom(),this.trigger("refresh")}getSlideMetrics(t){if(!t){const e=this.slides[0];(t=document.createElement("div")).dataset.isTestEl=1,t.style.visibility="hidden",t.classList.add(...(this.option("prefix")+this.option("classNames.slide")).split(" ")),e.customClass&&t.classList.add(...e.customClass.split(" ")),this.$track.prepend(t)}let e=Math.max(t.offsetWidth,i(t.getBoundingClientRect().width));const s=t.currentStyle||window.getComputedStyle(t);return e=e+(parseFloat(s.marginLeft)||0)+(parseFloat(s.marginRight)||0),t.dataset.isTestEl&&t.remove(),e}findPageForSlide(t){t=parseInt(t,10)||0;const e=this.pages.find((e=>e.indexes.indexOf(t)>-1));return e?e.index:null}slideNext(){this.slideTo(this.pageIndex+1)}slidePrev(){this.slideTo(this.pageIndex-1)}slideTo(t,e={}){const{x:i=-1*this.setPage(t,!0),y:s=0,friction:o=this.option("friction")}=e;this.Panzoom.content.x===i&&!this.Panzoom.velocity.x&&o||(this.Panzoom.panTo({x:i,y:s,friction:o,ignoreBounds:!0}),"ready"===this.state&&"ready"===this.Panzoom.state&&this.trigger("settle"))}initPanzoom(){this.Panzoom&&this.Panzoom.destroy();const t=e(!0,{},{content:this.$track,wrapInner:!1,resizeParent:!1,zoom:!1,click:!1,lockAxis:"x",x:this.pages.length?-1*this.pages[this.page].left:0,centerOnStart:!1,textSelection:()=>this.option("textSelection",!1),panOnlyZoomed:function(){return this.content.width<=this.viewport.width}},this.option("Panzoom"));this.Panzoom=new d(this.$container,t),this.Panzoom.on({"*":(t,...e)=>this.trigger(`Panzoom.${t}`,...e),afterUpdate:()=>{this.updatePage()},beforeTransform:this.onBeforeTransform.bind(this),touchEnd:this.onTouchEnd.bind(this),endAnimation:()=>{this.trigger("settle")}}),this.updateMetrics(),this.manageSlideVisiblity()}updatePanzoom(){this.Panzoom&&(this.Panzoom.content={...this.Panzoom.content,fitWidth:this.contentWidth,origWidth:this.contentWidth,width:this.contentWidth},this.pages.length>1&&this.option("infiniteX",this.option("infinite"))?this.Panzoom.boundX=null:this.pages.length&&(this.Panzoom.boundX={from:-1*this.pages[this.pages.length-1].left,to:-1*this.pages[0].left}),this.option("infiniteY",this.option("infinite"))?this.Panzoom.boundY=null:this.Panzoom.boundY={from:0,to:0},this.Panzoom.handleCursor())}manageSlideVisiblity(){const t=this.contentWidth,e=this.viewportWidth;let i=this.Panzoom?-1*this.Panzoom.content.x:this.pages.length?this.pages[this.page].left:0;const s=this.option("preload"),o=this.option("infiniteX",this.option("infinite")),n=parseFloat(getComputedStyle(this.$viewport,null).getPropertyValue("padding-left")),a=parseFloat(getComputedStyle(this.$viewport,null).getPropertyValue("padding-right"));this.slides.forEach((r=>{let h,l,c=0;h=i-n,l=i+e+a,h-=s*(e+n+a),l+=s*(e+n+a);const d=r.left+r.width>h&&r.left<l;h=i+t-n,l=i+t+e+a,h-=s*(e+n+a);const u=o&&r.left+r.width>h&&r.left<l;h=i-t-n,l=i-t+e+a,h-=s*(e+n+a);const f=o&&r.left+r.width>h&&r.left<l;u||d||f?(this.createSlideEl(r),d&&(c=0),u&&(c=-1),f&&(c=1),r.left+r.width>i&&r.left<=i+e+a&&(c=0)):this.removeSlideEl(r),r.hasDiff=c}));let r=0,h=0;this.slides.forEach(((e,i)=>{let s=0;e.$el?(i!==r||e.hasDiff?s=h+e.hasDiff*t:h=0,e.$el.style.left=Math.abs(s)>.1?`${h+e.hasDiff*t}px`:"",r++):h+=e.width})),this.markSelectedSlides()}createSlideEl(t){if(!t)return;if(t.$el){let e=t.$el.dataset.index;if(!e||parseInt(e,10)!==t.index){let e;t.$el.dataset.index=t.index,t.$el.querySelectorAll("[data-lazy-srcset]").forEach((t=>{t.srcset=t.dataset.lazySrcset})),t.$el.querySelectorAll("[data-lazy-src]").forEach((t=>{let e=t.dataset.lazySrc;t instanceof HTMLImageElement?t.src=e:t.style.backgroundImage=`url('${e}')`})),(e=t.$el.dataset.lazySrc)&&(t.$el.style.backgroundImage=`url('${e}')`),t.state="ready"}return}const e=document.createElement("div");e.dataset.index=t.index,e.classList.add(...(this.option("prefix")+this.option("classNames.slide")).split(" ")),t.customClass&&e.classList.add(...t.customClass.split(" ")),t.html&&(e.innerHTML=t.html);const i=[];this.slides.forEach(((t,e)=>{t.$el&&i.push(e)}));const s=t.index;let o=null;if(i.length){let t=i.reduce(((t,e)=>Math.abs(e-s)<Math.abs(t-s)?e:t));o=this.slides[t]}return this.$track.insertBefore(e,o&&o.$el?o.index<t.index?o.$el.nextSibling:o.$el:null),t.$el=e,this.trigger("createSlide",t,s),t}removeSlideEl(t){t.$el&&!t.isDom&&(this.trigger("removeSlide",t),t.$el.remove(),t.$el=null)}markSelectedSlides(){const t=this.option("classNames.slideSelected"),e="aria-hidden";this.slides.forEach(((i,s)=>{const o=i.$el;if(!o)return;const n=this.pages[this.page];n&&n.indexes&&n.indexes.indexOf(s)>-1?(t&&!o.classList.contains(t)&&(o.classList.add(t),this.trigger("selectSlide",i)),o.removeAttribute(e)):(t&&o.classList.contains(t)&&(o.classList.remove(t),this.trigger("unselectSlide",i)),o.setAttribute(e,!0))}))}updatePage(){this.updateMetrics(),this.slideTo(this.page,{friction:0})}onBeforeTransform(){this.option("infiniteX",this.option("infinite"))&&this.manageInfiniteTrack(),this.manageSlideVisiblity()}manageInfiniteTrack(){const t=this.contentWidth,e=this.viewportWidth;if(!this.option("infiniteX",this.option("infinite"))||this.pages.length<2||t<e)return;const i=this.Panzoom;let s=!1;return i.content.x<-1*(t-e)&&(i.content.x+=t,this.pageIndex=this.pageIndex-this.pages.length,s=!0),i.content.x>e&&(i.content.x-=t,this.pageIndex=this.pageIndex+this.pages.length,s=!0),s&&"pointerdown"===i.state&&i.resetDragPosition(),s}onTouchEnd(t,e){const i=this.option("dragFree");if(!i&&this.pages.length>1&&t.dragOffset.time<350&&Math.abs(t.dragOffset.y)<1&&Math.abs(t.dragOffset.x)>5)this[t.dragOffset.x<0?"slideNext":"slidePrev"]();else if(i){const[,e]=this.getPageFromPosition(-1*t.transform.x);this.setPage(e)}else this.slideToClosest()}slideToClosest(t={}){let[,e]=this.getPageFromPosition(-1*this.Panzoom.content.x);this.slideTo(e,t)}getPageFromPosition(t){const e=this.pages.length;this.option("center")&&(t+=.5*this.viewportWidth);const i=Math.floor(t/this.contentWidth);t-=i*this.contentWidth;let s=this.slides.find((e=>e.left<=t&&e.left+e.width>t));if(s){let t=this.findPageForSlide(s.index);return[t,t+i*e]}return[0,0]}setPage(t,e){let i=0,s=parseInt(t,10)||0;const o=this.page,n=this.pageIndex,a=this.pages.length,r=this.contentWidth,h=this.viewportWidth;if(t=(s%a+a)%a,this.option("infiniteX",this.option("infinite"))&&r>h){const o=Math.floor(s/a)||0,n=r;if(i=this.pages[t].left+o*n,!0===e&&a>2){let t=-1*this.Panzoom.content.x;const e=i-n,o=i+n,r=Math.abs(t-i),h=Math.abs(t-e),l=Math.abs(t-o);l<r&&l<=h?(i=o,s+=a):h<r&&h<l&&(i=e,s-=a)}}else t=s=Math.max(0,Math.min(s,a-1)),i=this.pages.length?this.pages[t].left:0;return this.page=t,this.pageIndex=s,null!==o&&t!==o&&(this.prevPage=o,this.prevPageIndex=n,this.trigger("change",t,o)),i}destroy(){this.state="destroy",this.slides.forEach((t=>{this.removeSlideEl(t)})),this.slides=[],this.Panzoom.destroy(),this.detachPlugins()}}y.version="4.0.31",y.Plugins=p;const v=!("undefined"==typeof window||!window.document||!window.document.createElement);let b=null;const x=["a[href]","area[href]",'input:not([disabled]):not([type="hidden"]):not([aria-hidden])',"select:not([disabled]):not([aria-hidden])","textarea:not([disabled]):not([aria-hidden])","button:not([disabled]):not([aria-hidden])","iframe","object","embed","video","audio","[contenteditable]",'[tabindex]:not([tabindex^="-"]):not([disabled]):not([aria-hidden])'],w=t=>{if(t&&v){null===b&&document.createElement("div").focus({get preventScroll(){return b=!0,!1}});try{if(t.setActive)t.setActive();else if(b)t.focus({preventScroll:!0});else{const e=window.pageXOffset||document.body.scrollTop,i=window.pageYOffset||document.body.scrollLeft;t.focus(),document.body.scrollTo({top:e,left:i,behavior:"auto"})}}catch(t){}}};const $={minSlideCount:2,minScreenHeight:500,autoStart:!0,key:"t",Carousel:{},tpl:'<div class="fancybox__thumb" style="background-image:url(\'{{src}}\')"></div>'};class C{constructor(t){this.fancybox=t,this.$container=null,this.state="init";for(const t of["onPrepare","onClosing","onKeydown"])this[t]=this[t].bind(this);this.events={prepare:this.onPrepare,closing:this.onClosing,keydown:this.onKeydown}}onPrepare(){this.getSlides().length<this.fancybox.option("Thumbs.minSlideCount")?this.state="disabled":!0===this.fancybox.option("Thumbs.autoStart")&&this.fancybox.Carousel.Panzoom.content.height>=this.fancybox.option("Thumbs.minScreenHeight")&&this.build()}onClosing(){this.Carousel&&this.Carousel.Panzoom.detachEvents()}onKeydown(t,e){e===t.option("Thumbs.key")&&this.toggle()}build(){if(this.$container)return;const t=document.createElement("div");t.classList.add("fancybox__thumbs"),this.fancybox.$carousel.parentNode.insertBefore(t,this.fancybox.$carousel.nextSibling),this.Carousel=new y(t,e(!0,{Dots:!1,Navigation:!1,Sync:{friction:0},infinite:!1,center:!0,fill:!0,dragFree:!0,slidesPerPage:1,preload:1},this.fancybox.option("Thumbs.Carousel"),{Sync:{target:this.fancybox.Carousel},slides:this.getSlides()})),this.Carousel.Panzoom.on("wheel",((t,e)=>{e.preventDefault(),this.fancybox[e.deltaY<0?"prev":"next"]()})),this.$container=t,this.state="visible"}getSlides(){const t=[];for(const e of this.fancybox.items){const i=e.thumb;i&&t.push({html:this.fancybox.option("Thumbs.tpl").replace(/\{\{src\}\}/gi,i),customClass:`has-thumb has-${e.type||"image"}`})}return t}toggle(){"visible"===this.state?this.hide():"hidden"===this.state?this.show():this.build()}show(){"hidden"===this.state&&(this.$container.style.display="",this.Carousel.Panzoom.attachEvents(),this.state="visible")}hide(){"visible"===this.state&&(this.Carousel.Panzoom.detachEvents(),this.$container.style.display="none",this.state="hidden")}cleanup(){this.Carousel&&(this.Carousel.destroy(),this.Carousel=null),this.$container&&(this.$container.remove(),this.$container=null),this.state="init"}attach(){this.fancybox.on(this.events)}detach(){this.fancybox.off(this.events),this.cleanup()}}C.defaults=$;const S=(t,e)=>{const i=new URL(t),s=new URLSearchParams(i.search);let o=new URLSearchParams;for(const[t,i]of[...s,...Object.entries(e)])"t"===t?o.set("start",parseInt(i)):o.set(t,i);o=o.toString();let n=t.match(/#t=((.*)?\d+s)/);return n&&(o+=`#t=${n[1]}`),o},E={video:{autoplay:!0,ratio:16/9},youtube:{autohide:1,fs:1,rel:0,hd:1,wmode:"transparent",enablejsapi:1,html5:1},vimeo:{hd:1,show_title:1,show_byline:1,show_portrait:0,fullscreen:1},html5video:{tpl:'<video class="fancybox__html5video" playsinline controls controlsList="nodownload" poster="{{poster}}">\n  <source src="{{src}}" type="{{format}}" />Sorry, your browser doesn\'t support embedded videos.</video>',format:""}};class P{constructor(t){this.fancybox=t;for(const t of["onInit","onReady","onCreateSlide","onRemoveSlide","onSelectSlide","onUnselectSlide","onRefresh","onMessage"])this[t]=this[t].bind(this);this.events={init:this.onInit,ready:this.onReady,"Carousel.createSlide":this.onCreateSlide,"Carousel.removeSlide":this.onRemoveSlide,"Carousel.selectSlide":this.onSelectSlide,"Carousel.unselectSlide":this.onUnselectSlide,"Carousel.refresh":this.onRefresh}}onInit(){for(const t of this.fancybox.items)this.processType(t)}processType(t){if(t.html)return t.src=t.html,t.type="html",void delete t.html;const i=t.src||"";let s=t.type||this.fancybox.options.type,o=null;if(!i||"string"==typeof i){if(o=i.match(/(?:youtube\.com|youtu\.be|youtube\-nocookie\.com)\/(?:watch\?(?:.*&)?v=|v\/|u\/|embed\/?)?(videoseries\?list=(?:.*)|[\w-]{11}|\?listType=(?:.*)&list=(?:.*))(?:.*)/i)){const e=S(i,this.fancybox.option("Html.youtube")),n=encodeURIComponent(o[1]);t.videoId=n,t.src=`https://www.youtube-nocookie.com/embed/${n}?${e}`,t.thumb=t.thumb||`https://i.ytimg.com/vi/${n}/mqdefault.jpg`,t.vendor="youtube",s="video"}else if(o=i.match(/^.+vimeo.com\/(?:\/)?([\d]+)(.*)?/)){const e=S(i,this.fancybox.option("Html.vimeo")),n=encodeURIComponent(o[1]);t.videoId=n,t.src=`https://player.vimeo.com/video/${n}?${e}`,t.vendor="vimeo",s="video"}else(o=i.match(/(?:maps\.)?google\.([a-z]{2,3}(?:\.[a-z]{2})?)\/(?:(?:(?:maps\/(?:place\/(?:.*)\/)?\@(.*),(\d+.?\d+?)z))|(?:\?ll=))(.*)?/i))?(t.src=`//maps.google.${o[1]}/?ll=${(o[2]?o[2]+"&z="+Math.floor(o[3])+(o[4]?o[4].replace(/^\//,"&"):""):o[4]+"").replace(/\?/,"&")}&output=${o[4]&&o[4].indexOf("layer=c")>0?"svembed":"embed"}`,s="map"):(o=i.match(/(?:maps\.)?google\.([a-z]{2,3}(?:\.[a-z]{2})?)\/(?:maps\/search\/)(.*)/i))&&(t.src=`//maps.google.${o[1]}/maps?q=${o[2].replace("query=","q=").replace("api=1","")}&output=embed`,s="map");s||("#"===i.charAt(0)?s="inline":(o=i.match(/\.(mp4|mov|ogv|webm)((\?|#).*)?$/i))?(s="html5video",t.format=t.format||"video/"+("ogv"===o[1]?"ogg":o[1])):i.match(/(^data:image\/[a-z0-9+\/=]*,)|(\.(jp(e|g|eg)|gif|png|bmp|webp|svg|ico)((\?|#).*)?$)/i)?s="image":i.match(/\.(pdf)((\?|#).*)?$/i)&&(s="pdf")),t.type=s||this.fancybox.option("defaultType","image"),"html5video"!==s&&"video"!==s||(t.video=e({},this.fancybox.option("Html.video"),t.video),t._width&&t._height?t.ratio=parseFloat(t._width)/parseFloat(t._height):t.ratio=t.ratio||t.video.ratio||E.video.ratio)}}onReady(){this.fancybox.Carousel.slides.forEach((t=>{t.$el&&(this.setContent(t),t.index===this.fancybox.getSlide().index&&this.playVideo(t))}))}onCreateSlide(t,e,i){"ready"===this.fancybox.state&&this.setContent(i)}loadInlineContent(t){let e;if(t.src instanceof HTMLElement)e=t.src;else if("string"==typeof t.src){const i=t.src.split("#",2),s=2===i.length&&""===i[0]?i[1]:i[0];e=document.getElementById(s)}if(e){if("clone"===t.type||e.$placeHolder){e=e.cloneNode(!0);let i=e.getAttribute("id");i=i?`${i}--clone`:`clone-${this.fancybox.id}-${t.index}`,e.setAttribute("id",i)}else{const t=document.createElement("div");t.classList.add("fancybox-placeholder"),e.parentNode.insertBefore(t,e),e.$placeHolder=t}this.fancybox.setContent(t,e)}else this.fancybox.setError(t,"{{ELEMENT_NOT_FOUND}}")}loadAjaxContent(t){const e=this.fancybox,i=new XMLHttpRequest;e.showLoading(t),i.onreadystatechange=function(){i.readyState===XMLHttpRequest.DONE&&"ready"===e.state&&(e.hideLoading(t),200===i.status?e.setContent(t,i.responseText):e.setError(t,404===i.status?"{{AJAX_NOT_FOUND}}":"{{AJAX_FORBIDDEN}}"))};const s=t.ajax||null;i.open(s?"POST":"GET",t.src),i.setRequestHeader("Content-Type","application/x-www-form-urlencoded"),i.setRequestHeader("X-Requested-With","XMLHttpRequest"),i.send(s),t.xhr=i}loadIframeContent(t){const e=this.fancybox,i=document.createElement("iframe");if(i.className="fancybox__iframe",i.setAttribute("id",`fancybox__iframe_${e.id}_${t.index}`),i.setAttribute("allow","autoplay; fullscreen"),i.setAttribute("scrolling","auto"),t.$iframe=i,"iframe"!==t.type||!1===t.preload)return i.setAttribute("src",t.src),this.fancybox.setContent(t,i),void this.resizeIframe(t);e.showLoading(t);const s=document.createElement("div");s.style.visibility="hidden",this.fancybox.setContent(t,s),s.appendChild(i),i.onerror=()=>{e.setError(t,"{{IFRAME_ERROR}}")},i.onload=()=>{e.hideLoading(t);let s=!1;i.isReady||(i.isReady=!0,s=!0),i.src.length&&(i.parentNode.style.visibility="",this.resizeIframe(t),s&&e.revealContent(t))},i.setAttribute("src",t.src)}setAspectRatio(t){const e=t.$content,i=t.ratio;if(!e)return;let s=t._width,o=t._height;if(i||s&&o){Object.assign(e.style,{width:s&&o?"100%":"",height:s&&o?"100%":"",maxWidth:"",maxHeight:""});let t=e.offsetWidth,n=e.offsetHeight;if(s=s||t,o=o||n,s>t||o>n){let e=Math.min(t/s,n/o);s*=e,o*=e}Math.abs(s/o-i)>.01&&(i<s/o?s=o*i:o=s/i),Object.assign(e.style,{width:`${s}px`,height:`${o}px`})}}resizeIframe(t){const e=t.$iframe;if(!e)return;let i=t._width||0,s=t._height||0;i&&s&&(t.autoSize=!1);const o=e.parentNode,n=o&&o.style;if(!1!==t.preload&&!1!==t.autoSize&&n)try{const t=window.getComputedStyle(o),a=parseFloat(t.paddingLeft)+parseFloat(t.paddingRight),r=parseFloat(t.paddingTop)+parseFloat(t.paddingBottom),h=e.contentWindow.document,l=h.getElementsByTagName("html")[0],c=h.body;n.width="",c.style.overflow="hidden",i=i||l.scrollWidth+a,n.width=`${i}px`,c.style.overflow="",n.flex="0 0 auto",n.height=`${c.scrollHeight}px`,s=l.scrollHeight+r}catch(t){}if(i||s){const t={flex:"0 1 auto"};i&&(t.width=`${i}px`),s&&(t.height=`${s}px`),Object.assign(n,t)}}onRefresh(t,e){e.slides.forEach((t=>{t.$el&&(t.$iframe&&this.resizeIframe(t),t.ratio&&this.setAspectRatio(t))}))}setContent(t){if(t&&!t.isDom){switch(t.type){case"html":this.fancybox.setContent(t,t.src);break;case"html5video":this.fancybox.setContent(t,this.fancybox.option("Html.html5video.tpl").replace(/\{\{src\}\}/gi,t.src).replace("{{format}}",t.format||t.html5video&&t.html5video.format||"").replace("{{poster}}",t.poster||t.thumb||""));break;case"inline":case"clone":this.loadInlineContent(t);break;case"ajax":this.loadAjaxContent(t);break;case"pdf":case"video":case"map":t.preload=!1;case"iframe":this.loadIframeContent(t)}t.ratio&&this.setAspectRatio(t)}}onSelectSlide(t,e,i){"ready"===t.state&&this.playVideo(i)}playVideo(t){if("html5video"===t.type&&t.video.autoplay)try{const e=t.$el.querySelector("video");if(e){const t=e.play();void 0!==t&&t.then((()=>{})).catch((t=>{e.muted=!0,e.play()}))}}catch(t){}if("video"!==t.type||!t.$iframe||!t.$iframe.contentWindow)return;const e=()=>{if("done"===t.state&&t.$iframe&&t.$iframe.contentWindow){let e;if(t.$iframe.isReady)return t.video&&t.video.autoplay&&(e="youtube"==t.vendor?{event:"command",func:"playVideo"}:{method:"play",value:"true"}),void(e&&t.$iframe.contentWindow.postMessage(JSON.stringify(e),"*"));"youtube"===t.vendor&&(e={event:"listening",id:t.$iframe.getAttribute("id")},t.$iframe.contentWindow.postMessage(JSON.stringify(e),"*"))}t.poller=setTimeout(e,250)};e()}onUnselectSlide(t,e,i){if("html5video"===i.type){try{i.$el.querySelector("video").pause()}catch(t){}return}let s=!1;"vimeo"==i.vendor?s={method:"pause",value:"true"}:"youtube"===i.vendor&&(s={event:"command",func:"pauseVideo"}),s&&i.$iframe&&i.$iframe.contentWindow&&i.$iframe.contentWindow.postMessage(JSON.stringify(s),"*"),clearTimeout(i.poller)}onRemoveSlide(t,e,i){i.xhr&&(i.xhr.abort(),i.xhr=null),i.$iframe&&(i.$iframe.onload=i.$iframe.onerror=null,i.$iframe.src="//about:blank",i.$iframe=null);const s=i.$content;"inline"===i.type&&s&&(s.classList.remove("fancybox__content"),"none"!==s.style.display&&(s.style.display="none")),i.$closeButton&&(i.$closeButton.remove(),i.$closeButton=null);const o=s&&s.$placeHolder;o&&(o.parentNode.insertBefore(s,o),o.remove(),s.$placeHolder=null)}onMessage(t){try{let e=JSON.parse(t.data);if("https://player.vimeo.com"===t.origin){if("ready"===e.event)for(let e of document.getElementsByClassName("fancybox__iframe"))e.contentWindow===t.source&&(e.isReady=1)}else"https://www.youtube-nocookie.com"===t.origin&&"onReady"===e.event&&(document.getElementById(e.id).isReady=1)}catch(t){}}attach(){this.fancybox.on(this.events),window.addEventListener("message",this.onMessage,!1)}detach(){this.fancybox.off(this.events),window.removeEventListener("message",this.onMessage,!1)}}P.defaults=E;class T{constructor(t){this.fancybox=t;for(const t of["onReady","onClosing","onDone","onPageChange","onCreateSlide","onRemoveSlide","onImageStatusChange"])this[t]=this[t].bind(this);this.events={ready:this.onReady,closing:this.onClosing,done:this.onDone,"Carousel.change":this.onPageChange,"Carousel.createSlide":this.onCreateSlide,"Carousel.removeSlide":this.onRemoveSlide}}onReady(){this.fancybox.Carousel.slides.forEach((t=>{t.$el&&this.setContent(t)}))}onDone(t,e){this.handleCursor(e)}onClosing(t){clearTimeout(this.clickTimer),this.clickTimer=null,t.Carousel.slides.forEach((t=>{t.$image&&(t.state="destroy"),t.Panzoom&&t.Panzoom.detachEvents()})),"closing"===this.fancybox.state&&this.canZoom(t.getSlide())&&this.zoomOut()}onCreateSlide(t,e,i){"ready"===this.fancybox.state&&this.setContent(i)}onRemoveSlide(t,e,i){i.$image&&(i.$el.classList.remove(t.option("Image.canZoomInClass")),i.$image.remove(),i.$image=null),i.Panzoom&&(i.Panzoom.destroy(),i.Panzoom=null),i.$el&&i.$el.dataset&&delete i.$el.dataset.imageFit}setContent(t){if(t.isDom||t.html||t.type&&"image"!==t.type)return;if(t.$image)return;t.type="image",t.state="loading";const e=document.createElement("div");e.style.visibility="hidden";const i=document.createElement("img");i.addEventListener("load",(e=>{e.stopImmediatePropagation(),this.onImageStatusChange(t)})),i.addEventListener("error",(()=>{this.onImageStatusChange(t)})),i.src=t.src,i.alt="",i.draggable=!1,i.classList.add("fancybox__image"),t.srcset&&i.setAttribute("srcset",t.srcset),t.sizes&&i.setAttribute("sizes",t.sizes),t.$image=i;const s=this.fancybox.option("Image.wrap");if(s){const o=document.createElement("div");o.classList.add("string"==typeof s?s:"fancybox__image-wrap"),o.appendChild(i),e.appendChild(o),t.$wrap=o}else e.appendChild(i);t.$el.dataset.imageFit=this.fancybox.option("Image.fit"),this.fancybox.setContent(t,e),i.complete||i.error?this.onImageStatusChange(t):this.fancybox.showLoading(t)}onImageStatusChange(t){const e=t.$image;e&&"loading"===t.state&&(e.complete&&e.naturalWidth&&e.naturalHeight?(this.fancybox.hideLoading(t),"contain"===this.fancybox.option("Image.fit")&&this.initSlidePanzoom(t),t.$el.addEventListener("wheel",(e=>this.onWheel(t,e)),{passive:!1}),t.$content.addEventListener("click",(e=>this.onClick(t,e)),{passive:!1}),this.revealContent(t)):this.fancybox.setError(t,"{{IMAGE_ERROR}}"))}initSlidePanzoom(t){t.Panzoom||(t.Panzoom=new d(t.$el,e(!0,this.fancybox.option("Image.Panzoom",{}),{viewport:t.$wrap,content:t.$image,width:t._width,height:t._height,wrapInner:!1,textSelection:!0,touch:this.fancybox.option("Image.touch"),panOnlyZoomed:!0,click:!1,wheel:!1})),t.Panzoom.on("startAnimation",(()=>{this.fancybox.trigger("Image.startAnimation",t)})),t.Panzoom.on("endAnimation",(()=>{"zoomIn"===t.state&&this.fancybox.done(t),this.handleCursor(t),this.fancybox.trigger("Image.endAnimation",t)})),t.Panzoom.on("afterUpdate",(()=>{this.handleCursor(t),this.fancybox.trigger("Image.afterUpdate",t)})))}revealContent(t){null===this.fancybox.Carousel.prevPage&&t.index===this.fancybox.options.startIndex&&this.canZoom(t)?this.zoomIn():this.fancybox.revealContent(t)}getZoomInfo(t){const e=t.$thumb.getBoundingClientRect(),i=e.width,s=e.height,o=t.$content.getBoundingClientRect(),n=o.width,a=o.height,r=o.top-e.top,h=o.left-e.left;let l=this.fancybox.option("Image.zoomOpacity");return"auto"===l&&(l=Math.abs(i/s-n/a)>.1),{top:r,left:h,scale:n&&i?i/n:1,opacity:l}}canZoom(t){const e=this.fancybox,i=e.$container;if(window.visualViewport&&1!==window.visualViewport.scale)return!1;if(t.Panzoom&&!t.Panzoom.content.width)return!1;if(!e.option("Image.zoom")||"contain"!==e.option("Image.fit"))return!1;const s=t.$thumb;if(!s||"loading"===t.state)return!1;i.classList.add("fancybox__no-click");const o=s.getBoundingClientRect();let n;if(this.fancybox.option("Image.ignoreCoveredThumbnail")){const t=document.elementFromPoint(o.left+1,o.top+1)===s,e=document.elementFromPoint(o.right-1,o.bottom-1)===s;n=t&&e}else n=document.elementFromPoint(o.left+.5*o.width,o.top+.5*o.height)===s;return i.classList.remove("fancybox__no-click"),n}zoomIn(){const t=this.fancybox,e=t.getSlide(),i=e.Panzoom,{top:s,left:o,scale:n,opacity:a}=this.getZoomInfo(e);t.trigger("reveal",e),i.panTo({x:-1*o,y:-1*s,scale:n,friction:0,ignoreBounds:!0}),e.$content.style.visibility="",e.state="zoomIn",!0===a&&i.on("afterTransform",(t=>{"zoomIn"!==e.state&&"zoomOut"!==e.state||(t.$content.style.opacity=Math.min(1,1-(1-t.content.scale)/(1-n)))})),i.panTo({x:0,y:0,scale:1,friction:this.fancybox.option("Image.zoomFriction")})}zoomOut(){const t=this.fancybox,e=t.getSlide(),i=e.Panzoom;if(!i)return;e.state="zoomOut",t.state="customClosing",e.$caption&&(e.$caption.style.visibility="hidden");let s=this.fancybox.option("Image.zoomFriction");const o=t=>{const{top:o,left:n,scale:a,opacity:r}=this.getZoomInfo(e);t||r||(s*=.82),i.panTo({x:-1*n,y:-1*o,scale:a,friction:s,ignoreBounds:!0}),s*=.98};window.addEventListener("scroll",o),i.once("endAnimation",(()=>{window.removeEventListener("scroll",o),t.destroy()})),o()}handleCursor(t){if("image"!==t.type||!t.$el)return;const e=t.Panzoom,i=this.fancybox.option("Image.click",!1,t),s=this.fancybox.option("Image.touch"),o=t.$el.classList,n=this.fancybox.option("Image.canZoomInClass"),a=this.fancybox.option("Image.canZoomOutClass");if(o.remove(a),o.remove(n),e&&"toggleZoom"===i){e&&1===e.content.scale&&e.option("maxScale")-e.content.scale>.01?o.add(n):e.content.scale>1&&!s&&o.add(a)}else"close"===i&&o.add(a)}onWheel(t,e){if("ready"===this.fancybox.state&&!1!==this.fancybox.trigger("Image.wheel",e))switch(this.fancybox.option("Image.wheel")){case"zoom":"done"===t.state&&t.Panzoom&&t.Panzoom.zoomWithWheel(e);break;case"close":this.fancybox.close();break;case"slide":this.fancybox[e.deltaY<0?"prev":"next"]()}}onClick(t,e){if("ready"!==this.fancybox.state)return;const i=t.Panzoom;if(i&&(i.dragPosition.midPoint||0!==i.dragOffset.x||0!==i.dragOffset.y||1!==i.dragOffset.scale))return;if(this.fancybox.Carousel.Panzoom.lockAxis)return!1;const s=i=>{switch(i){case"toggleZoom":e.stopPropagation(),t.Panzoom&&t.Panzoom.zoomWithClick(e);break;case"close":this.fancybox.close();break;case"next":e.stopPropagation(),this.fancybox.next()}},o=this.fancybox.option("Image.click"),n=this.fancybox.option("Image.doubleClick");n?this.clickTimer?(clearTimeout(this.clickTimer),this.clickTimer=null,s(n)):this.clickTimer=setTimeout((()=>{this.clickTimer=null,s(o)}),300):s(o)}onPageChange(t,e){const i=t.getSlide();e.slides.forEach((t=>{t.Panzoom&&"done"===t.state&&t.index!==i.index&&t.Panzoom.panTo({x:0,y:0,scale:1,friction:.8})}))}attach(){this.fancybox.on(this.events)}detach(){this.fancybox.off(this.events)}}T.defaults={canZoomInClass:"can-zoom_in",canZoomOutClass:"can-zoom_out",zoom:!0,zoomOpacity:"auto",zoomFriction:.82,ignoreCoveredThumbnail:!1,touch:!0,click:"toggleZoom",doubleClick:null,wheel:"zoom",fit:"contain",wrap:!1,Panzoom:{ratio:1}};class L{constructor(t){this.fancybox=t;for(const t of["onChange","onClosing"])this[t]=this[t].bind(this);this.events={initCarousel:this.onChange,"Carousel.change":this.onChange,closing:this.onClosing},this.hasCreatedHistory=!1,this.origHash="",this.timer=null}onChange(t){const e=t.Carousel;this.timer&&clearTimeout(this.timer);const i=null===e.prevPage,s=t.getSlide(),o=new URL(document.URL).hash;let n=!1;if(s.slug)n="#"+s.slug;else{const i=s.$trigger&&s.$trigger.dataset,o=t.option("slug")||i&&i.fancybox;o&&o.length&&"true"!==o&&(n="#"+o+(e.slides.length>1?"-"+(s.index+1):""))}i&&(this.origHash=o!==n?o:""),n&&o!==n&&(this.timer=setTimeout((()=>{try{window.history[i?"pushState":"replaceState"]({},document.title,window.location.pathname+window.location.search+n),i&&(this.hasCreatedHistory=!0)}catch(t){}}),300))}onClosing(){if(this.timer&&clearTimeout(this.timer),!0!==this.hasSilentClose)try{return void window.history.replaceState({},document.title,window.location.pathname+window.location.search+(this.origHash||""))}catch(t){}}attach(t){t.on(this.events)}detach(t){t.off(this.events)}static startFromUrl(){const t=L.Fancybox;if(!t||t.getInstance()||!1===t.defaults.Hash)return;const{hash:e,slug:i,index:s}=L.getParsedURL();if(!i)return;let o=document.querySelector(`[data-slug="${e}"]`);if(o&&o.dispatchEvent(new CustomEvent("click",{bubbles:!0,cancelable:!0})),t.getInstance())return;const n=document.querySelectorAll(`[data-fancybox="${i}"]`);n.length&&(null===s&&1===n.length?o=n[0]:s&&(o=n[s-1]),o&&o.dispatchEvent(new CustomEvent("click",{bubbles:!0,cancelable:!0})))}static onHashChange(){const{slug:t,index:e}=L.getParsedURL(),i=L.Fancybox,s=i&&i.getInstance();if(s&&s.plugins.Hash){if(t){const i=s.Carousel;if(t===s.option("slug"))return i.slideTo(e-1);for(let e of i.slides)if(e.slug&&e.slug===t)return i.slideTo(e.index);const o=s.getSlide(),n=o.$trigger&&o.$trigger.dataset;if(n&&n.fancybox===t)return i.slideTo(e-1)}s.plugins.Hash.hasSilentClose=!0,s.close()}L.startFromUrl()}static create(t){function e(){window.addEventListener("hashchange",L.onHashChange,!1),L.startFromUrl()}L.Fancybox=t,v&&window.requestAnimationFrame((()=>{/complete|interactive|loaded/.test(document.readyState)?e():document.addEventListener("DOMContentLoaded",e)}))}static destroy(){window.removeEventListener("hashchange",L.onHashChange,!1)}static getParsedURL(){const t=window.location.hash.substr(1),e=t.split("-"),i=e.length>1&&/^\+?\d+$/.test(e[e.length-1])&&parseInt(e.pop(-1),10)||null;return{hash:t,slug:e.join("-"),index:i}}}const _={pageXOffset:0,pageYOffset:0,element:()=>document.fullscreenElement||document.mozFullScreenElement||document.webkitFullscreenElement,activate(t){_.pageXOffset=window.pageXOffset,_.pageYOffset=window.pageYOffset,t.requestFullscreen?t.requestFullscreen():t.mozRequestFullScreen?t.mozRequestFullScreen():t.webkitRequestFullscreen?t.webkitRequestFullscreen():t.msRequestFullscreen&&t.msRequestFullscreen()},deactivate(){document.exitFullscreen?document.exitFullscreen():document.mozCancelFullScreen?document.mozCancelFullScreen():document.webkitExitFullscreen&&document.webkitExitFullscreen()}};class A{constructor(t){this.fancybox=t,this.active=!1,this.handleVisibilityChange=this.handleVisibilityChange.bind(this)}isActive(){return this.active}setTimer(){if(!this.active||this.timer)return;const t=this.fancybox.option("slideshow.delay",3e3);this.timer=setTimeout((()=>{this.timer=null,this.fancybox.option("infinite")||this.fancybox.getSlide().index!==this.fancybox.Carousel.slides.length-1?this.fancybox.next():this.fancybox.jumpTo(0,{friction:0})}),t);let e=this.$progress;e||(e=document.createElement("div"),e.classList.add("fancybox__progress"),this.fancybox.$carousel.parentNode.insertBefore(e,this.fancybox.$carousel),this.$progress=e,e.offsetHeight),e.style.transitionDuration=`${t}ms`,e.style.transform="scaleX(1)"}clearTimer(){clearTimeout(this.timer),this.timer=null,this.$progress&&(this.$progress.style.transitionDuration="",this.$progress.style.transform="",this.$progress.offsetHeight)}activate(){this.active||(this.active=!0,this.fancybox.$container.classList.add("has-slideshow"),"done"===this.fancybox.getSlide().state&&this.setTimer(),document.addEventListener("visibilitychange",this.handleVisibilityChange,!1))}handleVisibilityChange(){this.deactivate()}deactivate(){this.active=!1,this.clearTimer(),this.fancybox.$container.classList.remove("has-slideshow"),document.removeEventListener("visibilitychange",this.handleVisibilityChange,!1)}toggle(){this.active?this.deactivate():this.fancybox.Carousel.slides.length>1&&this.activate()}}const z={display:["counter","zoom","slideshow","fullscreen","thumbs","close"],autoEnable:!0,items:{counter:{position:"left",type:"div",class:"fancybox__counter",html:'<span data-fancybox-index=""></span>&nbsp;/&nbsp;<span data-fancybox-count=""></span>',attr:{tabindex:-1}},prev:{type:"button",class:"fancybox__button--prev",label:"PREV",html:'<svg viewBox="0 0 24 24"><path d="M15 4l-8 8 8 8"/></svg>',attr:{"data-fancybox-prev":""}},next:{type:"button",class:"fancybox__button--next",label:"NEXT",html:'<svg viewBox="0 0 24 24"><path d="M8 4l8 8-8 8"/></svg>',attr:{"data-fancybox-next":""}},fullscreen:{type:"button",class:"fancybox__button--fullscreen",label:"TOGGLE_FULLSCREEN",html:'<svg viewBox="0 0 24 24">\n                <g><path d="M3 8 V3h5"></path><path d="M21 8V3h-5"></path><path d="M8 21H3v-5"></path><path d="M16 21h5v-5"></path></g>\n                <g><path d="M7 2v5H2M17 2v5h5M2 17h5v5M22 17h-5v5"/></g>\n            </svg>',click:function(t){t.preventDefault(),_.element()?_.deactivate():_.activate(this.fancybox.$container)}},slideshow:{type:"button",class:"fancybox__button--slideshow",label:"TOGGLE_SLIDESHOW",html:'<svg viewBox="0 0 24 24">\n                <g><path d="M6 4v16"/><path d="M20 12L6 20"/><path d="M20 12L6 4"/></g>\n                <g><path d="M7 4v15M17 4v15"/></g>\n            </svg>',click:function(t){t.preventDefault(),this.Slideshow.toggle()}},zoom:{type:"button",class:"fancybox__button--zoom",label:"TOGGLE_ZOOM",html:'<svg viewBox="0 0 24 24"><circle cx="10" cy="10" r="7"></circle><path d="M16 16 L21 21"></svg>',click:function(t){t.preventDefault();const e=this.fancybox.getSlide().Panzoom;e&&e.toggleZoom()}},download:{type:"link",label:"DOWNLOAD",class:"fancybox__button--download",html:'<svg viewBox="0 0 24 24"><path d="M12 15V3m0 12l-4-4m4 4l4-4M2 17l.62 2.48A2 2 0 004.56 21h14.88a2 2 0 001.94-1.51L22 17"/></svg>',click:function(t){t.stopPropagation()}},thumbs:{type:"button",label:"TOGGLE_THUMBS",class:"fancybox__button--thumbs",html:'<svg viewBox="0 0 24 24"><circle cx="4" cy="4" r="1" /><circle cx="12" cy="4" r="1" transform="rotate(90 12 4)"/><circle cx="20" cy="4" r="1" transform="rotate(90 20 4)"/><circle cx="4" cy="12" r="1" transform="rotate(90 4 12)"/><circle cx="12" cy="12" r="1" transform="rotate(90 12 12)"/><circle cx="20" cy="12" r="1" transform="rotate(90 20 12)"/><circle cx="4" cy="20" r="1" transform="rotate(90 4 20)"/><circle cx="12" cy="20" r="1" transform="rotate(90 12 20)"/><circle cx="20" cy="20" r="1" transform="rotate(90 20 20)"/></svg>',click:function(t){t.stopPropagation();const e=this.fancybox.plugins.Thumbs;e&&e.toggle()}},close:{type:"button",label:"CLOSE",class:"fancybox__button--close",html:'<svg viewBox="0 0 24 24"><path d="M20 20L4 4m16 0L4 20"></path></svg>',attr:{"data-fancybox-close":"",tabindex:0}}}};class k{constructor(t){this.fancybox=t,this.$container=null,this.state="init";for(const t of["onInit","onPrepare","onDone","onKeydown","onClosing","onChange","onSettle","onRefresh"])this[t]=this[t].bind(this);this.events={init:this.onInit,prepare:this.onPrepare,done:this.onDone,keydown:this.onKeydown,closing:this.onClosing,"Carousel.change":this.onChange,"Carousel.settle":this.onSettle,"Carousel.Panzoom.touchStart":()=>this.onRefresh(),"Image.startAnimation":(t,e)=>this.onRefresh(e),"Image.afterUpdate":(t,e)=>this.onRefresh(e)}}onInit(){if(this.fancybox.option("Toolbar.autoEnable")){let t=!1;for(const e of this.fancybox.items)if("image"===e.type){t=!0;break}if(!t)return void(this.state="disabled")}for(const e of this.fancybox.option("Toolbar.display")){if("close"===(t(e)?e.id:e)){this.fancybox.options.closeButton=!1;break}}}onPrepare(){const t=this.fancybox;if("init"===this.state&&(this.build(),this.update(),this.Slideshow=new A(t),!t.Carousel.prevPage&&(t.option("slideshow.autoStart")&&this.Slideshow.activate(),t.option("fullscreen.autoStart")&&!_.element())))try{_.activate(t.$container)}catch(t){}}onFsChange(){window.scrollTo(_.pageXOffset,_.pageYOffset)}onSettle(){const t=this.fancybox,e=this.Slideshow;e&&e.isActive()&&(t.getSlide().index!==t.Carousel.slides.length-1||t.option("infinite")?"done"===t.getSlide().state&&e.setTimer():e.deactivate())}onChange(){this.update(),this.Slideshow&&this.Slideshow.isActive()&&this.Slideshow.clearTimer()}onDone(t,e){const i=this.Slideshow;e.index===t.getSlide().index&&(this.update(),i&&i.isActive()&&(t.option("infinite")||e.index!==t.Carousel.slides.length-1?i.setTimer():i.deactivate()))}onRefresh(t){t&&t.index!==this.fancybox.getSlide().index||(this.update(),!this.Slideshow||!this.Slideshow.isActive()||t&&"done"!==t.state||this.Slideshow.deactivate())}onKeydown(t,e,i){" "===e&&this.Slideshow&&(this.Slideshow.toggle(),i.preventDefault())}onClosing(){this.Slideshow&&this.Slideshow.deactivate(),document.removeEventListener("fullscreenchange",this.onFsChange)}createElement(t){let e;"div"===t.type?e=document.createElement("div"):(e=document.createElement("link"===t.type?"a":"button"),e.classList.add("carousel__button")),e.innerHTML=t.html,e.setAttribute("tabindex",t.tabindex||0),t.class&&e.classList.add(...t.class.split(" "));for(const i in t.attr)e.setAttribute(i,t.attr[i]);t.label&&e.setAttribute("title",this.fancybox.localize(`{{${t.label}}}`)),t.click&&e.addEventListener("click",t.click.bind(this)),"prev"===t.id&&e.setAttribute("data-fancybox-prev",""),"next"===t.id&&e.setAttribute("data-fancybox-next","");const i=e.querySelector("svg");return i&&(i.setAttribute("role","img"),i.setAttribute("tabindex","-1"),i.setAttribute("xmlns","http://www.w3.org/2000/svg")),e}build(){this.cleanup();const i=this.fancybox.option("Toolbar.items"),s=[{position:"left",items:[]},{position:"center",items:[]},{position:"right",items:[]}],o=this.fancybox.plugins.Thumbs;for(const n of this.fancybox.option("Toolbar.display")){let a,r;if(t(n)?(a=n.id,r=e({},i[a],n)):(a=n,r=i[a]),["counter","next","prev","slideshow"].includes(a)&&this.fancybox.items.length<2)continue;if("fullscreen"===a){if(!document.fullscreenEnabled||window.fullScreen)continue;document.addEventListener("fullscreenchange",this.onFsChange)}if("thumbs"===a&&(!o||"disabled"===o.state))continue;if(!r)continue;let h=r.position||"right",l=s.find((t=>t.position===h));l&&l.items.push(r)}const n=document.createElement("div");n.classList.add("fancybox__toolbar");for(const t of s)if(t.items.length){const e=document.createElement("div");e.classList.add("fancybox__toolbar__items"),e.classList.add(`fancybox__toolbar__items--${t.position}`);for(const i of t.items)e.appendChild(this.createElement(i));n.appendChild(e)}this.fancybox.$carousel.parentNode.insertBefore(n,this.fancybox.$carousel),this.$container=n}update(){const t=this.fancybox.getSlide(),e=t.index,i=this.fancybox.items.length,s=t.downloadSrc||("image"!==t.type||t.error?null:t.src);for(const t of this.fancybox.$container.querySelectorAll("a.fancybox__button--download"))s?(t.removeAttribute("disabled"),t.removeAttribute("tabindex"),t.setAttribute("href",s),t.setAttribute("download",s),t.setAttribute("target","_blank")):(t.setAttribute("disabled",""),t.setAttribute("tabindex",-1),t.removeAttribute("href"),t.removeAttribute("download"));const o=t.Panzoom,n=o&&o.option("maxScale")>o.option("baseScale");for(const t of this.fancybox.$container.querySelectorAll(".fancybox__button--zoom"))n?t.removeAttribute("disabled"):t.setAttribute("disabled","");for(const e of this.fancybox.$container.querySelectorAll("[data-fancybox-index]"))e.innerHTML=t.index+1;for(const t of this.fancybox.$container.querySelectorAll("[data-fancybox-count]"))t.innerHTML=i;if(!this.fancybox.option("infinite")){for(const t of this.fancybox.$container.querySelectorAll("[data-fancybox-prev]"))0===e?t.setAttribute("disabled",""):t.removeAttribute("disabled");for(const t of this.fancybox.$container.querySelectorAll("[data-fancybox-next]"))e===i-1?t.setAttribute("disabled",""):t.removeAttribute("disabled")}}cleanup(){this.Slideshow&&this.Slideshow.isActive()&&this.Slideshow.clearTimer(),this.$container&&this.$container.remove(),this.$container=null}attach(){this.fancybox.on(this.events)}detach(){this.fancybox.off(this.events),this.cleanup()}}k.defaults=z;const O={ScrollLock:class{constructor(t){this.fancybox=t,this.viewport=null,this.pendingUpdate=null;for(const t of["onReady","onResize","onTouchstart","onTouchmove"])this[t]=this[t].bind(this)}onReady(){const t=window.visualViewport;t&&(this.viewport=t,this.startY=0,t.addEventListener("resize",this.onResize),this.updateViewport()),window.addEventListener("touchstart",this.onTouchstart,{passive:!1}),window.addEventListener("touchmove",this.onTouchmove,{passive:!1}),window.addEventListener("wheel",this.onWheel,{passive:!1})}onResize(){this.updateViewport()}updateViewport(){const t=this.fancybox,e=this.viewport,i=e.scale||1,s=t.$container;if(!s)return;let o="",n="",a="";i-1>.1&&(o=e.width*i+"px",n=e.height*i+"px",a=`translate3d(${e.offsetLeft}px, ${e.offsetTop}px, 0) scale(${1/i})`),s.style.width=o,s.style.height=n,s.style.transform=a}onTouchstart(t){this.startY=t.touches?t.touches[0].screenY:t.screenY}onTouchmove(t){const e=this.startY,i=window.innerWidth/window.document.documentElement.clientWidth;if(!t.cancelable)return;if(t.touches.length>1||1!==i)return;const o=s(t.composedPath()[0]);if(!o)return void t.preventDefault();const n=window.getComputedStyle(o),a=parseInt(n.getPropertyValue("height"),10),r=t.touches?t.touches[0].screenY:t.screenY,h=e<=r&&0===o.scrollTop,l=e>=r&&o.scrollHeight-o.scrollTop===a;(h||l)&&t.preventDefault()}onWheel(t){s(t.composedPath()[0])||t.preventDefault()}cleanup(){this.pendingUpdate&&(cancelAnimationFrame(this.pendingUpdate),this.pendingUpdate=null);const t=this.viewport;t&&(t.removeEventListener("resize",this.onResize),this.viewport=null),window.removeEventListener("touchstart",this.onTouchstart,!1),window.removeEventListener("touchmove",this.onTouchmove,!1),window.removeEventListener("wheel",this.onWheel,{passive:!1})}attach(){this.fancybox.on("initLayout",this.onReady)}detach(){this.fancybox.off("initLayout",this.onReady),this.cleanup()}},Thumbs:C,Html:P,Toolbar:k,Image:T,Hash:L};const M={startIndex:0,preload:1,infinite:!0,showClass:"fancybox-zoomInUp",hideClass:"fancybox-fadeOut",animated:!0,hideScrollbar:!0,parentEl:null,mainClass:null,autoFocus:!0,trapFocus:!0,placeFocusBack:!0,click:"close",closeButton:"inside",dragToClose:!0,keyboard:{Escape:"close",Delete:"close",Backspace:"close",PageUp:"next",PageDown:"prev",ArrowUp:"next",ArrowDown:"prev",ArrowRight:"next",ArrowLeft:"prev"},template:{closeButton:'<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" tabindex="-1"><path d="M20 20L4 4m16 0L4 20"/></svg>',spinner:'<svg xmlns="http://www.w3.org/2000/svg" width="50" height="50" viewBox="25 25 50 50" tabindex="-1"><circle cx="50" cy="50" r="20"/></svg>',main:null},l10n:{CLOSE:"Close",NEXT:"Next",PREV:"Previous",MODAL:"You can close this modal content with the ESC key",ERROR:"Something Went Wrong, Please Try Again Later",IMAGE_ERROR:"Image Not Found",ELEMENT_NOT_FOUND:"HTML Element Not Found",AJAX_NOT_FOUND:"Error Loading AJAX : Not Found",AJAX_FORBIDDEN:"Error Loading AJAX : Forbidden",IFRAME_ERROR:"Error Loading Page",TOGGLE_ZOOM:"Toggle zoom level",TOGGLE_THUMBS:"Toggle thumbnails",TOGGLE_SLIDESHOW:"Toggle slideshow",TOGGLE_FULLSCREEN:"Toggle full-screen mode",DOWNLOAD:"Download"}},I=new Map;let F=0;class R extends l{constructor(t,i={}){t=t.map((t=>(t.width&&(t._width=t.width),t.height&&(t._height=t.height),t))),super(e(!0,{},M,i)),this.bindHandlers(),this.state="init",this.setItems(t),this.attachPlugins(R.Plugins),this.trigger("init"),!0===this.option("hideScrollbar")&&this.hideScrollbar(),this.initLayout(),this.initCarousel(),this.attachEvents(),I.set(this.id,this),this.trigger("prepare"),this.state="ready",this.trigger("ready"),this.$container.setAttribute("aria-hidden","false"),this.option("trapFocus")&&this.focus()}option(t,...e){const i=this.getSlide();let s=i?i[t]:void 0;return void 0!==s?("function"==typeof s&&(s=s.call(this,this,...e)),s):super.option(t,...e)}bindHandlers(){for(const t of["onMousedown","onKeydown","onClick","onFocus","onCreateSlide","onSettle","onTouchMove","onTouchEnd","onTransform"])this[t]=this[t].bind(this)}attachEvents(){document.addEventListener("mousedown",this.onMousedown),document.addEventListener("keydown",this.onKeydown,!0),this.option("trapFocus")&&document.addEventListener("focus",this.onFocus,!0),this.$container.addEventListener("click",this.onClick)}detachEvents(){document.removeEventListener("mousedown",this.onMousedown),document.removeEventListener("keydown",this.onKeydown,!0),document.removeEventListener("focus",this.onFocus,!0),this.$container.removeEventListener("click",this.onClick)}initLayout(){this.$root=this.option("parentEl")||document.body;let t=this.option("template.main");t&&(this.$root.insertAdjacentHTML("beforeend",this.localize(t)),this.$container=this.$root.querySelector(".fancybox__container")),this.$container||(this.$container=document.createElement("div"),this.$root.appendChild(this.$container)),this.$container.onscroll=()=>(this.$container.scrollLeft=0,!1),Object.entries({class:"fancybox__container",role:"dialog",tabIndex:"-1","aria-modal":"true","aria-hidden":"true","aria-label":this.localize("{{MODAL}}")}).forEach((t=>this.$container.setAttribute(...t))),this.option("animated")&&this.$container.classList.add("is-animated"),this.$backdrop=this.$container.querySelector(".fancybox__backdrop"),this.$backdrop||(this.$backdrop=document.createElement("div"),this.$backdrop.classList.add("fancybox__backdrop"),this.$container.appendChild(this.$backdrop)),this.$carousel=this.$container.querySelector(".fancybox__carousel"),this.$carousel||(this.$carousel=document.createElement("div"),this.$carousel.classList.add("fancybox__carousel"),this.$container.appendChild(this.$carousel)),this.$container.Fancybox=this,this.id=this.$container.getAttribute("id"),this.id||(this.id=this.options.id||++F,this.$container.setAttribute("id","fancybox-"+this.id));const e=this.option("mainClass");return e&&this.$container.classList.add(...e.split(" ")),document.documentElement.classList.add("with-fancybox"),this.trigger("initLayout"),this}setItems(t){const e=[];for(const i of t){const t=i.$trigger;if(t){const e=t.dataset||{};i.src=e.src||t.getAttribute("href")||i.src,i.type=e.type||i.type,!i.src&&t instanceof HTMLImageElement&&(i.src=t.currentSrc||i.$trigger.src)}let s=i.$thumb;if(!s){let t=i.$trigger&&i.$trigger.origTarget;t&&(s=t instanceof HTMLImageElement?t:t.querySelector("img:not([aria-hidden])")),!s&&i.$trigger&&(s=i.$trigger instanceof HTMLImageElement?i.$trigger:i.$trigger.querySelector("img:not([aria-hidden])"))}i.$thumb=s||null;let o=i.thumb;!o&&s&&(o=s.currentSrc||s.src,!o&&s.dataset&&(o=s.dataset.lazySrc||s.dataset.src)),o||"image"!==i.type||(o=i.src),i.thumb=o||null,i.caption=i.caption||"",e.push(i)}this.items=e}initCarousel(){return this.Carousel=new y(this.$carousel,e(!0,{},{prefix:"",classNames:{viewport:"fancybox__viewport",track:"fancybox__track",slide:"fancybox__slide"},textSelection:!0,preload:this.option("preload"),friction:.88,slides:this.items,initialPage:this.options.startIndex,slidesPerPage:1,infiniteX:this.option("infinite"),infiniteY:!0,l10n:this.option("l10n"),Dots:!1,Navigation:{classNames:{main:"fancybox__nav",button:"carousel__button",next:"is-next",prev:"is-prev"}},Panzoom:{textSelection:!0,panOnlyZoomed:()=>this.Carousel&&this.Carousel.pages&&this.Carousel.pages.length<2&&!this.option("dragToClose"),lockAxis:()=>{if(this.Carousel){let t="x";return this.option("dragToClose")&&(t+="y"),t}}},on:{"*":(t,...e)=>this.trigger(`Carousel.${t}`,...e),init:t=>this.Carousel=t,createSlide:this.onCreateSlide,settle:this.onSettle}},this.option("Carousel"))),this.option("dragToClose")&&this.Carousel.Panzoom.on({touchMove:this.onTouchMove,afterTransform:this.onTransform,touchEnd:this.onTouchEnd}),this.trigger("initCarousel"),this}onCreateSlide(t,e){let i=e.caption||"";if("function"==typeof this.options.caption&&(i=this.options.caption.call(this,this,this.Carousel,e)),"string"==typeof i&&i.length){const t=document.createElement("div"),s=`fancybox__caption_${this.id}_${e.index}`;t.className="fancybox__caption",t.innerHTML=i,t.setAttribute("id",s),e.$caption=e.$el.appendChild(t),e.$el.classList.add("has-caption"),e.$el.setAttribute("aria-labelledby",s)}}onSettle(){this.option("autoFocus")&&this.focus()}onFocus(t){this.isTopmost()&&this.focus(t)}onClick(t){if(t.defaultPrevented)return;let e=t.composedPath()[0];if(e.matches("[data-fancybox-close]"))return t.preventDefault(),void R.close(!1,t);if(e.matches("[data-fancybox-next]"))return t.preventDefault(),void R.next();if(e.matches("[data-fancybox-prev]"))return t.preventDefault(),void R.prev();const i=document.activeElement;if(i){if(i.closest("[contenteditable]"))return;e.matches(x)||i.blur()}if(e.closest(".fancybox__content"))return;if(getSelection().toString().length)return;if(!1===this.trigger("click",t))return;switch(this.option("click")){case"close":this.close();break;case"next":this.next()}}onTouchMove(){const t=this.getSlide().Panzoom;return!t||1===t.content.scale}onTouchEnd(t){const e=t.dragOffset.y;Math.abs(e)>=150||Math.abs(e)>=35&&t.dragOffset.time<350?(this.option("hideClass")&&(this.getSlide().hideClass="fancybox-throwOut"+(t.content.y<0?"Up":"Down")),this.close()):"y"===t.lockAxis&&t.panTo({y:0})}onTransform(t){if(this.$backdrop){const e=Math.abs(t.content.y),i=e<1?"":Math.max(.33,Math.min(1,1-e/t.content.fitHeight*1.5));this.$container.style.setProperty("--fancybox-ts",i?"0s":""),this.$container.style.setProperty("--fancybox-opacity",i)}}onMousedown(){"ready"===this.state&&document.body.classList.add("is-using-mouse")}onKeydown(t){if(!this.isTopmost())return;document.body.classList.remove("is-using-mouse");const e=t.key,i=this.option("keyboard");if(!i||t.ctrlKey||t.altKey||t.shiftKey)return;const s=t.composedPath()[0],o=document.activeElement&&document.activeElement.classList,n=o&&o.contains("carousel__button");if("Escape"!==e&&!n){if(t.target.isContentEditable||-1!==["BUTTON","TEXTAREA","OPTION","INPUT","SELECT","VIDEO"].indexOf(s.nodeName))return}if(!1===this.trigger("keydown",e,t))return;const a=i[e];"function"==typeof this[a]&&this[a]()}getSlide(){const t=this.Carousel;if(!t)return null;const e=null===t.page?t.option("initialPage"):t.page,i=t.pages||[];return i.length&&i[e]?i[e].slides[0]:null}focus(t){if(R.ignoreFocusChange)return;if(["init","closing","customClosing","destroy"].indexOf(this.state)>-1)return;const e=this.$container,i=this.getSlide(),s="done"===i.state?i.$el:null;if(s&&s.contains(document.activeElement))return;t&&t.preventDefault(),R.ignoreFocusChange=!0;const o=Array.from(e.querySelectorAll(x));let n,a=[];for(let t of o){const e=t.offsetParent,i=s&&s.contains(t),o=!this.Carousel.$viewport.contains(t);e&&(i||o)?(a.push(t),void 0!==t.dataset.origTabindex&&(t.tabIndex=t.dataset.origTabindex,t.removeAttribute("data-orig-tabindex")),(t.hasAttribute("autoFocus")||!n&&i&&!t.classList.contains("carousel__button"))&&(n=t)):(t.dataset.origTabindex=void 0===t.dataset.origTabindex?t.getAttribute("tabindex"):t.dataset.origTabindex,t.tabIndex=-1)}t?a.indexOf(t.target)>-1?this.lastFocus=t.target:this.lastFocus===e?w(a[a.length-1]):w(e):this.option("autoFocus")&&n?w(n):a.indexOf(document.activeElement)<0&&w(e),this.lastFocus=document.activeElement,R.ignoreFocusChange=!1}hideScrollbar(){if(!v)return;const t=window.innerWidth-document.documentElement.getBoundingClientRect().width,e="fancybox-style-noscroll";let i=document.getElementById(e);i||t>0&&(i=document.createElement("style"),i.id=e,i.type="text/css",i.innerHTML=`.compensate-for-scrollbar {padding-right: ${t}px;}`,document.getElementsByTagName("head")[0].appendChild(i),document.body.classList.add("compensate-for-scrollbar"))}revealScrollbar(){document.body.classList.remove("compensate-for-scrollbar");const t=document.getElementById("fancybox-style-noscroll");t&&t.remove()}clearContent(t){this.Carousel.trigger("removeSlide",t),t.$content&&(t.$content.remove(),t.$content=null),t.$closeButton&&(t.$closeButton.remove(),t.$closeButton=null),t._className&&t.$el.classList.remove(t._className)}setContent(t,e,i={}){let s;const o=t.$el;if(e instanceof HTMLElement)["img","iframe","video","audio"].indexOf(e.nodeName.toLowerCase())>-1?(s=document.createElement("div"),s.appendChild(e)):s=e;else{const t=document.createRange().createContextualFragment(e);s=document.createElement("div"),s.appendChild(t)}if(t.filter&&!t.error&&(s=s.querySelector(t.filter)),s instanceof Element)return t._className=`has-${i.suffix||t.type||"unknown"}`,o.classList.add(t._className),s.classList.add("fancybox__content"),"none"!==s.style.display&&"none"!==getComputedStyle(s).getPropertyValue("display")||(s.style.display=t.display||this.option("defaultDisplay")||"flex"),t.id&&s.setAttribute("id",t.id),t.$content=s,o.prepend(s),this.manageCloseButton(t),"loading"!==t.state&&this.revealContent(t),s;this.setError(t,"{{ELEMENT_NOT_FOUND}}")}manageCloseButton(t){const e=void 0===t.closeButton?this.option("closeButton"):t.closeButton;if(!e||"top"===e&&this.$closeButton)return;const i=document.createElement("button");i.classList.add("carousel__button","is-close"),i.setAttribute("title",this.options.l10n.CLOSE),i.innerHTML=this.option("template.closeButton"),i.addEventListener("click",(t=>this.close(t))),"inside"===e?(t.$closeButton&&t.$closeButton.remove(),t.$closeButton=t.$content.appendChild(i)):this.$closeButton=this.$container.insertBefore(i,this.$container.firstChild)}revealContent(t){this.trigger("reveal",t),t.$content.style.visibility="";let e=!1;t.error||"loading"===t.state||null!==this.Carousel.prevPage||t.index!==this.options.startIndex||(e=void 0===t.showClass?this.option("showClass"):t.showClass),e?(t.state="animating",this.animateCSS(t.$content,e,(()=>{this.done(t)}))):this.done(t)}animateCSS(t,e,i){if(t&&t.dispatchEvent(new CustomEvent("animationend",{bubbles:!0,cancelable:!0})),!t||!e)return void("function"==typeof i&&i());const s=function(o){o.currentTarget===this&&(t.removeEventListener("animationend",s),i&&i(),t.classList.remove(e))};t.addEventListener("animationend",s),t.classList.add(e)}done(t){t.state="done",this.trigger("done",t);const e=this.getSlide();e&&t.index===e.index&&this.option("autoFocus")&&this.focus()}setError(t,e){t.error=e,this.hideLoading(t),this.clearContent(t);const i=document.createElement("div");i.classList.add("fancybox-error"),i.innerHTML=this.localize(e||"<p>{{ERROR}}</p>"),this.setContent(t,i,{suffix:"error"})}showLoading(t){t.state="loading",t.$el.classList.add("is-loading");let e=t.$el.querySelector(".fancybox__spinner");e||(e=document.createElement("div"),e.classList.add("fancybox__spinner"),e.innerHTML=this.option("template.spinner"),e.addEventListener("click",(()=>{this.Carousel.Panzoom.velocity||this.close()})),t.$el.prepend(e))}hideLoading(t){const e=t.$el&&t.$el.querySelector(".fancybox__spinner");e&&(e.remove(),t.$el.classList.remove("is-loading")),"loading"===t.state&&(this.trigger("load",t),t.state="ready")}next(){const t=this.Carousel;t&&t.pages.length>1&&t.slideNext()}prev(){const t=this.Carousel;t&&t.pages.length>1&&t.slidePrev()}jumpTo(...t){this.Carousel&&this.Carousel.slideTo(...t)}isClosing(){return["closing","customClosing","destroy"].includes(this.state)}isTopmost(){return R.getInstance().id==this.id}close(t){if(t&&t.preventDefault(),this.isClosing())return;if(!1===this.trigger("shouldClose",t))return;if(this.state="closing",this.Carousel.Panzoom.destroy(),this.detachEvents(),this.trigger("closing",t),"destroy"===this.state)return;this.$container.setAttribute("aria-hidden","true"),this.$container.classList.add("is-closing");const e=this.getSlide();if(this.Carousel.slides.forEach((t=>{t.$content&&t.index!==e.index&&this.Carousel.trigger("removeSlide",t)})),"closing"===this.state){const t=void 0===e.hideClass?this.option("hideClass"):e.hideClass;this.animateCSS(e.$content,t,(()=>{this.destroy()}),!0)}}destroy(){if("destroy"===this.state)return;this.state="destroy",this.trigger("destroy");const t=this.option("placeFocusBack")?this.option("triggerTarget",this.getSlide().$trigger):null;this.Carousel.destroy(),this.detachPlugins(),this.Carousel=null,this.options={},this.events={},this.$container.remove(),this.$container=this.$backdrop=this.$carousel=null,t&&w(t),I.delete(this.id);const e=R.getInstance();e?e.focus():(document.documentElement.classList.remove("with-fancybox"),document.body.classList.remove("is-using-mouse"),this.revealScrollbar())}static show(t,e={}){return new R(t,e)}static fromEvent(t,e={}){if(t.defaultPrevented)return;if(t.button&&0!==t.button)return;if(t.ctrlKey||t.metaKey||t.shiftKey)return;const i=t.composedPath()[0];let s,o,n,a=i;if((a.matches("[data-fancybox-trigger]")||(a=a.closest("[data-fancybox-trigger]")))&&(e.triggerTarget=a,s=a&&a.dataset&&a.dataset.fancyboxTrigger),s){const t=document.querySelectorAll(`[data-fancybox="${s}"]`),e=parseInt(a.dataset.fancyboxIndex,10)||0;a=t.length?t[e]:a}Array.from(R.openers.keys()).reverse().some((e=>{n=a||i;let s=!1;try{n instanceof Element&&("string"==typeof e||e instanceof String)&&(s=n.matches(e)||(n=n.closest(e)))}catch(t){}return!!s&&(t.preventDefault(),o=e,!0)}));let r=!1;if(o){e.event=t,e.target=n,n.origTarget=i,r=R.fromOpener(o,e);const s=R.getInstance();s&&"ready"===s.state&&t.detail&&document.body.classList.add("is-using-mouse")}return r}static fromOpener(t,i={}){let s=[],o=i.startIndex||0,n=i.target||null;const a=void 0!==(i=e({},i,R.openers.get(t))).groupAll&&i.groupAll,r=void 0===i.groupAttr?"data-fancybox":i.groupAttr,h=r&&n?n.getAttribute(`${r}`):"";if(!n||h||a){const e=i.root||(n?n.getRootNode():document.body);s=[].slice.call(e.querySelectorAll(t))}if(n&&!a&&(s=h?s.filter((t=>t.getAttribute(`${r}`)===h)):[n]),!s.length)return!1;const l=R.getInstance();return!(l&&s.indexOf(l.options.$trigger)>-1)&&(o=n?s.indexOf(n):o,s=s.map((function(t){const e=["false","0","no","null","undefined"],i=["true","1","yes"],s=Object.assign({},t.dataset),o={};for(let[t,n]of Object.entries(s))if("fancybox"!==t)if("width"===t||"height"===t)o[`_${t}`]=n;else if("string"==typeof n||n instanceof String)if(e.indexOf(n)>-1)o[t]=!1;else if(i.indexOf(o[t])>-1)o[t]=!0;else try{o[t]=JSON.parse(n)}catch(e){o[t]=n}else o[t]=n;return t instanceof Element&&(o.$trigger=t),o})),new R(s,e({},i,{startIndex:o,$trigger:n})))}static bind(t,e={}){function i(){document.body.addEventListener("click",R.fromEvent,!1)}v&&(R.openers.size||(/complete|interactive|loaded/.test(document.readyState)?i():document.addEventListener("DOMContentLoaded",i)),R.openers.set(t,e))}static unbind(t){R.openers.delete(t),R.openers.size||R.destroy()}static destroy(){let t;for(;t=R.getInstance();)t.destroy();R.openers=new Map,document.body.removeEventListener("click",R.fromEvent,!1)}static getInstance(t){if(t)return I.get(t);return Array.from(I.values()).reverse().find((t=>!t.isClosing()&&t))||null}static close(t=!0,e){if(t)for(const t of I.values())t.close(e);else{const t=R.getInstance();t&&t.close(e)}}static next(){const t=R.getInstance();t&&t.next()}static prev(){const t=R.getInstance();t&&t.prev()}}R.version="4.0.31",R.defaults=M,R.openers=new Map,R.Plugins=O,R.bind("[data-fancybox]");for(const[t,e]of Object.entries(R.Plugins||{}))"function"==typeof e.create&&e.create(R);export{y as Carousel,R as Fancybox,d as Panzoom};
diff --git a/web_src/less/index.less b/web_src/less/index.less
index d3ff37781..fbc9a80fd 100644
--- a/web_src/less/index.less
+++ b/web_src/less/index.less
@@ -1,6 +1,6 @@
 @import "~highlight.js/styles/github.css";
 @import "./vendor/gitGraph.css";
-// @import "./vendor/fancyapp.less";
+@import "./vendor/fancyapp.less";
 // @import "~/remixicon/fonts/remixicon.css";
 @import "_svg";
 @import "_tribute";
diff --git a/web_src/less/vendor/fancyapp.less b/web_src/less/vendor/fancyapp.less
index bbc8924a4..b4558441e 100644
--- a/web_src/less/vendor/fancyapp.less
+++ b/web_src/less/vendor/fancyapp.less
@@ -1,730 +1,753 @@
 .carousel {
-    position:relative;
-    box-sizing:border-box
-   }
-   .carousel *,
-   .carousel *:before,
-   .carousel *:after {
-    box-sizing:inherit
-   }
-   .carousel.is-draggable {
-    cursor:move;
-    cursor:grab
-   }
-   .carousel.is-dragging {
-    cursor:move;
-    cursor:grabbing
-   }
-   .carousel__viewport {
-    position:relative;
-    overflow:hidden;
-    max-width:100%;
-    max-height:100%
-   }
-   .carousel__track {
-    display:flex
-   }
-   .carousel__slide {
-    flex:0 0 auto;
-    width:var(--carousel-slide-width, 60%);
-    max-width:100%;
-    padding:1rem;
-    position:relative;
-    overflow-x:hidden;
-    overflow-y:auto;
-    overscroll-behavior:contain
-   }
-   .has-dots {
-    margin-bottom:calc(0.5rem + 22px)
-   }
-   .carousel__dots {
-    margin:0 auto;
-    padding:0;
-    position:absolute;
-    top:calc(100% + 0.5rem);
-    left:0;
-    right:0;
-    display:flex;
-    justify-content:center;
-    list-style:none;
-    user-select:none
-   }
-   .carousel__dots .carousel__dot {
-    margin:0;
-    padding:0;
-    display:block;
-    position:relative;
-    width:22px;
-    height:22px;
-    cursor:pointer
-   }
-   .carousel__dots .carousel__dot:after {
-    content:"";
-    width:8px;
-    height:8px;
-    border-radius:50%;
-    position:absolute;
-    top:50%;
-    left:50%;
-    transform:translate(-50%, -50%);
-    background-color:currentColor;
-    opacity:.25;
-    transition:opacity .15s ease-in-out
-   }
-   .carousel__dots .carousel__dot.is-selected:after {
-    opacity:1
-   }
-   .carousel__button {
-    width:var(--carousel-button-width, 48px);
-    height:var(--carousel-button-height, 48px);
-    padding:0;
-    border:0;
-    display:flex;
-    justify-content:center;
-    align-items:center;
-    pointer-events:all;
-    cursor:pointer;
-    color:var(--carousel-button-color, currentColor);
-    background:var(--carousel-button-bg, transparent);
-    border-radius:var(--carousel-button-border-radius, 50%);
-    box-shadow:var(--carousel-button-shadow, none);
-    transition:opacity .15s ease
-   }
-   .carousel__button.is-prev,
-   .carousel__button.is-next {
-    position:absolute;
-    top:50%;
-    transform:translateY(-50%)
-   }
-   .carousel__button.is-prev {
-    left:10px
-   }
-   .carousel__button.is-next {
-    right:10px
-   }
-   .carousel__button[disabled] {
-    cursor:default;
-    opacity:.3
-   }
-   .carousel__button svg {
-    width:var(--carousel-button-svg-width, 50%);
-    height:var(--carousel-button-svg-height, 50%);
-    fill:none;
-    stroke:currentColor;
-    stroke-width:var(--carousel-button-svg-stroke-width, 1.5);
-    stroke-linejoin:bevel;
-    stroke-linecap:round;
-    filter:var(--carousel-button-svg-filter, none);
-    pointer-events:none
-   }
-   html.with-fancybox {
-    scroll-behavior:auto
-   }
-   body.compensate-for-scrollbar {
-    overflow:hidden !important;
-    touch-action:none
-   }
-   .fancybox__container {
-    position:fixed;
-    top:0;
-    left:0;
-    bottom:0;
-    right:0;
-    direction:ltr;
-    margin:0;
-    padding:env(safe-area-inset-top, 0px) env(safe-area-inset-right, 0px) env(safe-area-inset-bottom, 0px) env(safe-area-inset-left, 0px);
-    box-sizing:border-box;
-    display:flex;
-    flex-direction:column;
-    color:var(--fancybox-color, #fff);
-    -webkit-tap-highlight-color:rgba(0,0,0,0);
-    overflow:hidden;
-    z-index:1050;
-    outline:none;
-    transform-origin:top left;
+    position: relative;
+    box-sizing: border-box;
+}
+.carousel *,
+.carousel *:before,
+.carousel *:after {
+    box-sizing: inherit;
+}
+.carousel.is-draggable {
+    cursor: move;
+    cursor: grab;
+}
+.carousel.is-dragging {
+    cursor: move;
+    cursor: grabbing;
+}
+.carousel__viewport {
+    position: relative;
+    overflow: hidden;
+    max-width: 100%;
+    max-height: 100%;
+}
+.carousel__track {
+    display: flex;
+}
+.carousel__slide {
+    flex: 0 0 auto;
+    width: var(--carousel-slide-width, 60%);
+    max-width: 100%;
+    padding: 1rem;
+    position: relative;
+    overflow-x: hidden;
+    overflow-y: auto;
+    overscroll-behavior: contain;
+}
+.has-dots {
+    margin-bottom: calc(0.5rem + 22px);
+}
+.carousel__dots {
+    margin: 0 auto;
+    padding: 0;
+    position: absolute;
+    top: calc(100% + 0.5rem);
+    left: 0;
+    right: 0;
+    display: flex;
+    justify-content: center;
+    list-style: none;
+    user-select: none;
+}
+.carousel__dots .carousel__dot {
+    margin: 0;
+    padding: 0;
+    display: block;
+    position: relative;
+    width: 22px;
+    height: 22px;
+    cursor: pointer;
+}
+.carousel__dots .carousel__dot:after {
+    content: "";
+    width: 8px;
+    height: 8px;
+    border-radius: 50%;
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    transform: translate(-50%, -50%);
+    background-color: currentColor;
+    opacity: 0.25;
+    transition: opacity 0.15s ease-in-out;
+}
+.carousel__dots .carousel__dot.is-selected:after {
+    opacity: 1;
+}
+.carousel__button {
+    width: var(--carousel-button-width, 48px);
+    height: var(--carousel-button-height, 48px);
+    padding: 0;
+    border: 0;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    pointer-events: all;
+    cursor: pointer;
+    color: var(--carousel-button-color, currentColor);
+    background: var(--carousel-button-bg, transparent);
+    border-radius: var(--carousel-button-border-radius, 50%);
+    box-shadow: var(--carousel-button-shadow, none);
+    transition: opacity 0.15s ease;
+}
+.carousel__button.is-prev,
+.carousel__button.is-next {
+    position: absolute;
+    top: 50%;
+    transform: translateY(-50%);
+}
+.carousel__button.is-prev {
+    left: 10px;
+}
+.carousel__button.is-next {
+    right: 10px;
+}
+.carousel__button[disabled] {
+    cursor: default;
+    opacity: 0.3;
+}
+.carousel__button svg {
+    width: var(--carousel-button-svg-width, 50%);
+    height: var(--carousel-button-svg-height, 50%);
+    fill: none;
+    stroke: currentColor;
+    stroke-width: var(--carousel-button-svg-stroke-width, 1.5);
+    stroke-linejoin: bevel;
+    stroke-linecap: round;
+    filter: var(--carousel-button-svg-filter, none);
+    pointer-events: none;
+}
+html.with-fancybox {
+    scroll-behavior: auto;
+}
+body.compensate-for-scrollbar {
+    overflow: hidden !important;
+    touch-action: none;
+}
+.fancybox__container {
+    position: fixed;
+    top: 0;
+    left: 0;
+    bottom: 0;
+    right: 0;
+    direction: ltr;
+    margin: 0;
+    padding: env(safe-area-inset-top, 0px) env(safe-area-inset-right, 0px)
+        env(safe-area-inset-bottom, 0px) env(safe-area-inset-left, 0px);
+    box-sizing: border-box;
+    display: flex;
+    flex-direction: column;
+    color: var(--fancybox-color, #fff);
+    -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
+    overflow: hidden;
+    z-index: 1050;
+    outline: none;
+    transform-origin: top left;
     --carousel-button-width: 48px;
     --carousel-button-height: 48px;
     --carousel-button-svg-width: 24px;
     --carousel-button-svg-height: 24px;
     --carousel-button-svg-stroke-width: 2.5;
     --carousel-button-svg-filter: drop-shadow(1px 1px 1px rgba(0, 0, 0, 0.4));
-   }
-   .fancybox__container *,
-   .fancybox__container *::before,
-   .fancybox__container *::after {
-    box-sizing:inherit
-   }
-   .fancybox__container :focus {
-    outline:none
-   }
-   body:not(.is-using-mouse) .fancybox__container :focus {
-    box-shadow:0 0 0 1px #fff,0 0 0 2px var(--fancybox-accent-color, rgba(1, 210, 232, 0.94))
-   }
-   @media all and (min-width: 1024px) {
+}
+.fancybox__container *,
+.fancybox__container *::before,
+.fancybox__container *::after {
+    box-sizing: inherit;
+}
+.fancybox__container :focus {
+    outline: none;
+}
+body:not(.is-using-mouse) .fancybox__container :focus {
+    box-shadow: 0 0 0 1px #fff,
+        0 0 0 2px var(--fancybox-accent-color, rgba(1, 210, 232, 0.94));
+}
+@media all and (min-width: 1024px) {
     .fancybox__container {
-     --carousel-button-width:48px;
-     --carousel-button-height:48px;
-     --carousel-button-svg-width:27px;
-     --carousel-button-svg-height:27px
+        --carousel-button-width: 48px;
+        --carousel-button-height: 48px;
+        --carousel-button-svg-width: 27px;
+        --carousel-button-svg-height: 27px;
     }
-   }
-   .fancybox__backdrop {
-    position:absolute;
-    top:0;
-    right:0;
-    bottom:0;
-    left:0;
-    z-index:-1;
-    background:var(--fancybox-bg, rgba(24, 24, 27, 0.92))
-   }
-   .fancybox__carousel {
-    position:relative;
-    flex:1 1 auto;
-    min-height:0;
-    height:100%;
-    z-index:10
-   }
-   .fancybox__carousel.has-dots {
-    margin-bottom:calc(0.5rem + 22px)
-   }
-   .fancybox__viewport {
-    position:relative;
-    width:100%;
-    height:100%;
-    overflow:visible;
-    cursor:default
-   }
-   .fancybox__track {
-    display:flex;
-    height:100%
-   }
-   .fancybox__slide {
-    flex:0 0 auto;
-    width:100%;
-    max-width:100%;
-    margin:0;
-    padding:48px 8px 8px 8px;
-    position:relative;
-    overscroll-behavior:contain;
-    display:flex;
-    flex-direction:column;
-    outline:0;
-    overflow:auto;
+}
+.fancybox__backdrop {
+    position: absolute;
+    top: 0;
+    right: 0;
+    bottom: 0;
+    left: 0;
+    z-index: -1;
+    background: var(--fancybox-bg, rgba(24, 24, 27, 0.92));
+}
+.fancybox__carousel {
+    position: relative;
+    flex: 1 1 auto;
+    min-height: 0;
+    height: 100%;
+    z-index: 10;
+}
+.fancybox__carousel.has-dots {
+    margin-bottom: calc(0.5rem + 22px);
+}
+.fancybox__viewport {
+    position: relative;
+    width: 100%;
+    height: 100%;
+    overflow: visible;
+    cursor: default;
+}
+.fancybox__track {
+    display: flex;
+    height: 100%;
+}
+.fancybox__slide {
+    flex: 0 0 auto;
+    width: 100%;
+    max-width: 100%;
+    margin: 0;
+    padding: 48px 8px 8px 8px;
+    position: relative;
+    overscroll-behavior: contain;
+    display: flex;
+    flex-direction: column;
+    outline: 0;
+    overflow: auto;
     --carousel-button-width: 36px;
     --carousel-button-height: 36px;
     --carousel-button-svg-width: 22px;
-    --carousel-button-svg-height: 22px
-   }
-   .fancybox__slide::before,
-   .fancybox__slide::after {
-    content:"";
-    flex:0 0 0;
-    margin:auto
-   }
-   @media all and (min-width: 1024px) {
+    --carousel-button-svg-height: 22px;
+}
+.fancybox__slide::before,
+.fancybox__slide::after {
+    content: "";
+    flex: 0 0 0;
+    margin: auto;
+}
+@media all and (min-width: 1024px) {
     .fancybox__slide {
-     padding:64px 100px
+        padding: 64px 100px;
     }
-   }
-   .fancybox__content {
-    margin:0 env(safe-area-inset-right, 0px) 0 env(safe-area-inset-left, 0px);
-    padding:36px;
-    color:var(--fancybox-content-color, #374151);
-    background:var(--fancybox-content-bg, #fff);
-    position:relative;
-    align-self:center;
-    display:flex;
-    flex-direction:column;
-    z-index:20
-   }
-   .fancybox__content :focus:not(.carousel__button.is-close) {
-    outline:thin dotted;
-    box-shadow:none
-   }
-   .fancybox__caption {
-    align-self:center;
-    max-width:100%;
-    margin:0;
-    padding:1rem 0 0 0;
-    line-height:1.375;
-    color:var(--fancybox-color, currentColor);
-    visibility:visible;
-    cursor:auto;
-    flex-shrink:0;
-    overflow-wrap:anywhere
-   }
-   .is-loading .fancybox__caption {
-    visibility:hidden
-   }
-   .fancybox__container>.carousel__dots {
-    top:100%;
-    color:var(--fancybox-color, #fff)
-   }
-   .fancybox__nav .carousel__button {
-    z-index:40
-   }
-   .fancybox__nav .carousel__button.is-next {
-    right:8px
-   }
-   @media all and (min-width: 1024px) {
+}
+.fancybox__content {
+    margin: 0 env(safe-area-inset-right, 0px) 0 env(safe-area-inset-left, 0px);
+    padding: 36px;
+    color: var(--fancybox-content-color, #374151);
+    background: var(--fancybox-content-bg, #fff);
+    position: relative;
+    align-self: center;
+    display: flex;
+    flex-direction: column;
+    z-index: 20;
+}
+.fancybox__content :focus:not(.carousel__button.is-close) {
+    outline: thin dotted;
+    box-shadow: none;
+}
+.fancybox__caption {
+    align-self: center;
+    max-width: 100%;
+    margin: 0;
+    padding: 1rem 0 0 0;
+    line-height: 1.375;
+    color: var(--fancybox-color, currentColor);
+    visibility: visible;
+    cursor: auto;
+    flex-shrink: 0;
+    overflow-wrap: anywhere;
+}
+.is-loading .fancybox__caption {
+    visibility: hidden;
+}
+.fancybox__container > .carousel__dots {
+    top: 100%;
+    color: var(--fancybox-color, #fff);
+}
+.fancybox__nav .carousel__button {
+    z-index: 40;
+}
+.fancybox__nav .carousel__button.is-next {
+    right: 8px;
+}
+@media all and (min-width: 1024px) {
     .fancybox__nav .carousel__button.is-next {
-     right:40px
+        right: 40px;
     }
-   }
-   .fancybox__nav .carousel__button.is-prev {
-    left:8px
-   }
-   @media all and (min-width: 1024px) {
+}
+.fancybox__nav .carousel__button.is-prev {
+    left: 8px;
+}
+@media all and (min-width: 1024px) {
     .fancybox__nav .carousel__button.is-prev {
-     left:40px
+        left: 40px;
     }
-   }
-   .carousel__button.is-close {
-    position:absolute;
-    top:8px;
-    right:8px;
-    top:calc(env(safe-area-inset-top, 0px) + 8px);
-    right:calc(env(safe-area-inset-right, 0px) + 8px);
-    z-index:40
-   }
-   @media all and (min-width: 1024px) {
+}
+.carousel__button.is-close {
+    position: absolute;
+    top: 8px;
+    right: 8px;
+    top: calc(env(safe-area-inset-top, 0px) + 8px);
+    right: calc(env(safe-area-inset-right, 0px) + 8px);
+    z-index: 40;
+}
+@media all and (min-width: 1024px) {
     .carousel__button.is-close {
-     right:40px
+        right: 40px;
     }
-   }
-   .fancybox__content>.carousel__button.is-close {
-    position:absolute;
-    top:-40px;
-    right:0;
-    color:var(--fancybox-color, #fff)
-   }
-   .fancybox__no-click,
-   .fancybox__no-click button {
-    pointer-events:none
-   }
-   .fancybox__spinner {
-    position:absolute;
-    top:50%;
-    left:50%;
-    transform:translate(-50%, -50%);
-    width:50px;
-    height:50px;
-    color:var(--fancybox-color, currentColor)
-   }
-   .fancybox__slide .fancybox__spinner {
-    cursor:pointer;
-    z-index:1053
-   }
-   .fancybox__spinner svg {
-    animation:fancybox-rotate 2s linear infinite;
-    transform-origin:center center;
-    position:absolute;
-    top:0;
-    right:0;
-    bottom:0;
-    left:0;
-    margin:auto;
-    width:100%;
-    height:100%
-   }
-   .fancybox__spinner svg circle {
-    fill:none;
-    stroke-width:2.75;
-    stroke-miterlimit:10;
-    stroke-dasharray:1,200;
-    stroke-dashoffset:0;
-    animation:fancybox-dash 1.5s ease-in-out infinite;
-    stroke-linecap:round;
-    stroke:currentColor
-   }
-   @keyframes fancybox-rotate {
+}
+.fancybox__content > .carousel__button.is-close {
+    position: absolute;
+    top: -40px;
+    right: 0;
+    color: var(--fancybox-color, #fff);
+}
+.fancybox__no-click,
+.fancybox__no-click button {
+    pointer-events: none;
+}
+.fancybox__spinner {
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    transform: translate(-50%, -50%);
+    width: 50px;
+    height: 50px;
+    color: var(--fancybox-color, currentColor);
+}
+.fancybox__slide .fancybox__spinner {
+    cursor: pointer;
+    z-index: 1053;
+}
+.fancybox__spinner svg {
+    animation: fancybox-rotate 2s linear infinite;
+    transform-origin: center center;
+    position: absolute;
+    top: 0;
+    right: 0;
+    bottom: 0;
+    left: 0;
+    margin: auto;
+    width: 100%;
+    height: 100%;
+}
+.fancybox__spinner svg circle {
+    fill: none;
+    stroke-width: 2.75;
+    stroke-miterlimit: 10;
+    stroke-dasharray: 1, 200;
+    stroke-dashoffset: 0;
+    animation: fancybox-dash 1.5s ease-in-out infinite;
+    stroke-linecap: round;
+    stroke: currentColor;
+}
+@keyframes fancybox-rotate {
     100% {
-     transform:rotate(360deg)
+        transform: rotate(360deg);
     }
-   }
-   @keyframes fancybox-dash {
+}
+@keyframes fancybox-dash {
     0% {
-     stroke-dasharray:1,200;
-     stroke-dashoffset:0
+        stroke-dasharray: 1, 200;
+        stroke-dashoffset: 0;
     }
     50% {
-     stroke-dasharray:89,200;
-     stroke-dashoffset:-35px
+        stroke-dasharray: 89, 200;
+        stroke-dashoffset: -35px;
     }
     100% {
-     stroke-dasharray:89,200;
-     stroke-dashoffset:-124px
+        stroke-dasharray: 89, 200;
+        stroke-dashoffset: -124px;
     }
-   }
-   .fancybox__backdrop,
-   .fancybox__caption,
-   .fancybox__nav,
-   .carousel__dots,
-   .carousel__button.is-close {
-    opacity:var(--fancybox-opacity, 1)
-   }
-   .fancybox__container.is-animated[aria-hidden=false] .fancybox__backdrop,
-   .fancybox__container.is-animated[aria-hidden=false] .fancybox__caption,
-   .fancybox__container.is-animated[aria-hidden=false] .fancybox__nav,
-   .fancybox__container.is-animated[aria-hidden=false] .carousel__dots,
-   .fancybox__container.is-animated[aria-hidden=false] .carousel__button.is-close {
-    animation:.15s ease backwards fancybox-fadeIn
-   }
-   .fancybox__container.is-animated.is-closing .fancybox__backdrop,
-   .fancybox__container.is-animated.is-closing .fancybox__caption,
-   .fancybox__container.is-animated.is-closing .fancybox__nav,
-   .fancybox__container.is-animated.is-closing .carousel__dots,
-   .fancybox__container.is-animated.is-closing .carousel__button.is-close {
-    animation:.15s ease both fancybox-fadeOut
-   }
-   .fancybox-fadeIn {
-    animation:.15s ease both fancybox-fadeIn
-   }
-   .fancybox-fadeOut {
-    animation:.1s ease both fancybox-fadeOut
-   }
-   .fancybox-zoomInUp {
-    animation:.2s ease both fancybox-zoomInUp
-   }
-   .fancybox-zoomOutDown {
-    animation:.15s ease both fancybox-zoomOutDown
-   }
-   .fancybox-throwOutUp {
-    animation:.15s ease both fancybox-throwOutUp
-   }
-   .fancybox-throwOutDown {
-    animation:.15s ease both fancybox-throwOutDown
-   }
-   @keyframes fancybox-fadeIn {
+}
+.fancybox__backdrop,
+.fancybox__caption,
+.fancybox__nav,
+.carousel__dots,
+.carousel__button.is-close {
+    opacity: var(--fancybox-opacity, 1);
+}
+.fancybox__container.is-animated[aria-hidden="false"] .fancybox__backdrop,
+.fancybox__container.is-animated[aria-hidden="false"] .fancybox__caption,
+.fancybox__container.is-animated[aria-hidden="false"] .fancybox__nav,
+.fancybox__container.is-animated[aria-hidden="false"] .carousel__dots,
+.fancybox__container.is-animated[aria-hidden="false"]
+    .carousel__button.is-close {
+    animation: 0.15s ease backwards fancybox-fadeIn;
+}
+.fancybox__container.is-animated.is-closing .fancybox__backdrop,
+.fancybox__container.is-animated.is-closing .fancybox__caption,
+.fancybox__container.is-animated.is-closing .fancybox__nav,
+.fancybox__container.is-animated.is-closing .carousel__dots,
+.fancybox__container.is-animated.is-closing .carousel__button.is-close {
+    animation: 0.15s ease both fancybox-fadeOut;
+}
+.fancybox-fadeIn {
+    animation: 0.15s ease both fancybox-fadeIn;
+}
+.fancybox-fadeOut {
+    animation: 0.1s ease both fancybox-fadeOut;
+}
+.fancybox-zoomInUp {
+    animation: 0.2s ease both fancybox-zoomInUp;
+}
+.fancybox-zoomOutDown {
+    animation: 0.15s ease both fancybox-zoomOutDown;
+}
+.fancybox-throwOutUp {
+    animation: 0.15s ease both fancybox-throwOutUp;
+}
+.fancybox-throwOutDown {
+    animation: 0.15s ease both fancybox-throwOutDown;
+}
+@keyframes fancybox-fadeIn {
     from {
-     opacity:0
+        opacity: 0;
     }
     to {
-     opacity:1
+        opacity: 1;
     }
-   }
-   @keyframes fancybox-fadeOut {
+}
+@keyframes fancybox-fadeOut {
     to {
-     opacity:0
+        opacity: 0;
     }
-   }
-   @keyframes fancybox-zoomInUp {
+}
+@keyframes fancybox-zoomInUp {
     from {
-     transform:scale(0.97) translate3d(0, 16px, 0);
-     opacity:0
+        transform: scale(0.97) translate3d(0, 16px, 0);
+        opacity: 0;
     }
     to {
-     transform:scale(1) translate3d(0, 0, 0);
-     opacity:1
+        transform: scale(1) translate3d(0, 0, 0);
+        opacity: 1;
     }
-   }
-   @keyframes fancybox-zoomOutDown {
+}
+@keyframes fancybox-zoomOutDown {
     to {
-     transform:scale(0.97) translate3d(0, 16px, 0);
-     opacity:0
+        transform: scale(0.97) translate3d(0, 16px, 0);
+        opacity: 0;
     }
-   }
-   @keyframes fancybox-throwOutUp {
+}
+@keyframes fancybox-throwOutUp {
     to {
-     transform:translate3d(0, -30%, 0);
-     opacity:0
+        transform: translate3d(0, -30%, 0);
+        opacity: 0;
     }
-   }
-   @keyframes fancybox-throwOutDown {
+}
+@keyframes fancybox-throwOutDown {
     to {
-     transform:translate3d(0, 30%, 0);
-     opacity:0
+        transform: translate3d(0, 30%, 0);
+        opacity: 0;
     }
-   }
-   .fancybox__carousel .carousel__slide {
-    scrollbar-width:thin;
-    scrollbar-color:#ccc rgba(255,255,255,.1)
-   }
-   .fancybox__carousel .carousel__slide::-webkit-scrollbar {
-    width:8px;
-    height:8px
-   }
-   .fancybox__carousel .carousel__slide::-webkit-scrollbar-track {
-    background-color:rgba(255,255,255,.1)
-   }
-   .fancybox__carousel .carousel__slide::-webkit-scrollbar-thumb {
-    background-color:#ccc;
-    border-radius:2px;
-    box-shadow:inset 0 0 4px rgba(0,0,0,.2)
-   }
-   .fancybox__carousel.is-draggable .fancybox__slide,
-   .fancybox__carousel.is-draggable .fancybox__slide .fancybox__content {
-    cursor:move;
-    cursor:grab
-   }
-   .fancybox__carousel.is-dragging .fancybox__slide,
-   .fancybox__carousel.is-dragging .fancybox__slide .fancybox__content {
-    cursor:move;
-    cursor:grabbing
-   }
-   .fancybox__carousel .fancybox__slide .fancybox__content {
-    cursor:auto
-   }
-   .fancybox__carousel .fancybox__slide.can-zoom_in .fancybox__content {
-    cursor:zoom-in
-   }
-   .fancybox__carousel .fancybox__slide.can-zoom_out .fancybox__content {
-    cursor:zoom-out
-   }
-   .fancybox__carousel .fancybox__slide.is-draggable .fancybox__content {
-    cursor:move;
-    cursor:grab
-   }
-   .fancybox__carousel .fancybox__slide.is-dragging .fancybox__content {
-    cursor:move;
-    cursor:grabbing
-   }
-   .fancybox__image {
-    transform-origin:0 0;
-    user-select:none;
-    transition:none
-   }
-   .has-image .fancybox__content {
-    padding:0;
-    background:rgba(0,0,0,0);
-    min-height:1px
-   }
-   .is-closing .has-image .fancybox__content {
-    overflow:visible
-   }
-   .has-image[data-image-fit=contain] {
-    overflow:visible;
-    touch-action:none
-   }
-   .has-image[data-image-fit=contain] .fancybox__content {
-    flex-direction:row;
-    flex-wrap:wrap
-   }
-   .has-image[data-image-fit=contain] .fancybox__image {
-    max-width:100%;
-    max-height:100%;
-    object-fit:contain
-   }
-   .has-image[data-image-fit=contain-w] {
-    overflow-x:hidden;
-    overflow-y:auto
-   }
-   .has-image[data-image-fit=contain-w] .fancybox__content {
-    min-height:auto
-   }
-   .has-image[data-image-fit=contain-w] .fancybox__image {
-    max-width:100%;
-    height:auto
-   }
-   .has-image[data-image-fit=cover] {
-    overflow:visible;
-    touch-action:none
-   }
-   .has-image[data-image-fit=cover] .fancybox__content {
-    width:100%;
-    height:100%
-   }
-   .has-image[data-image-fit=cover] .fancybox__image {
-    width:100%;
-    height:100%;
-    object-fit:cover
-   }
-   .fancybox__carousel .fancybox__slide.has-iframe .fancybox__content,
-   .fancybox__carousel .fancybox__slide.has-map .fancybox__content,
-   .fancybox__carousel .fancybox__slide.has-pdf .fancybox__content,
-   .fancybox__carousel .fancybox__slide.has-video .fancybox__content,
-   .fancybox__carousel .fancybox__slide.has-html5video .fancybox__content {
-    max-width:100%;
-    flex-shrink:1;
-    min-height:1px;
-    overflow:visible
-   }
-   .fancybox__carousel .fancybox__slide.has-iframe .fancybox__content,
-   .fancybox__carousel .fancybox__slide.has-map .fancybox__content,
-   .fancybox__carousel .fancybox__slide.has-pdf .fancybox__content {
-    width:100%;
-    height:80%
-   }
-   .fancybox__carousel .fancybox__slide.has-video .fancybox__content,
-   .fancybox__carousel .fancybox__slide.has-html5video .fancybox__content {
-    width:960px;
-    height:540px;
-    max-width:100%;
-    max-height:100%
-   }
-   .fancybox__carousel .fancybox__slide.has-map .fancybox__content,
-   .fancybox__carousel .fancybox__slide.has-pdf .fancybox__content,
-   .fancybox__carousel .fancybox__slide.has-video .fancybox__content,
-   .fancybox__carousel .fancybox__slide.has-html5video .fancybox__content {
-    padding:0;
-    background:rgba(24,24,27,.9);
-    color:#fff
-   }
-   .fancybox__carousel .fancybox__slide.has-map .fancybox__content {
-    background:#e5e3df
-   }
-   .fancybox__html5video,
-   .fancybox__iframe {
-    border:0;
-    display:block;
-    height:100%;
-    width:100%;
-    background:rgba(0,0,0,0)
-   }
-   .fancybox-placeholder {
-    position:absolute;
-    width:1px;
-    height:1px;
-    padding:0;
-    margin:-1px;
-    overflow:hidden;
-    clip:rect(0, 0, 0, 0);
-    white-space:nowrap;
-    border-width:0
-   }
-   .fancybox__thumbs {
-    flex:0 0 auto;
-    position:relative;
-    padding:0px 3px;
-    opacity:var(--fancybox-opacity, 1)
-   }
-   .fancybox__container.is-animated[aria-hidden=false] .fancybox__thumbs {
-    animation:.15s ease-in backwards fancybox-fadeIn
-   }
-   .fancybox__container.is-animated.is-closing .fancybox__thumbs {
-    opacity:0
-   }
-   .fancybox__thumbs .carousel__slide {
-    flex:0 0 auto;
-    width:var(--fancybox-thumbs-width, 96px);
-    margin:0;
-    padding:8px 3px;
-    box-sizing:content-box;
-    display:flex;
-    align-items:center;
-    justify-content:center;
-    overflow:visible;
-    cursor:pointer
-   }
-   .fancybox__thumbs .carousel__slide .fancybox__thumb::after {
-    content:"";
-    position:absolute;
-    top:0;
-    left:0;
-    right:0;
-    bottom:0;
-    border-width:5px;
-    border-style:solid;
-    border-color:var(--fancybox-accent-color, rgba(34, 213, 233, 0.96));
-    opacity:0;
-    transition:opacity .15s ease;
-    border-radius:var(--fancybox-thumbs-border-radius, 4px)
-   }
-   .fancybox__thumbs .carousel__slide.is-nav-selected .fancybox__thumb::after {
-    opacity:.92
-   }
-   .fancybox__thumbs .carousel__slide>* {
-    pointer-events:none;
-    user-select:none
-   }
-   .fancybox__thumb {
-    position:relative;
-    width:100%;
-    padding-top:calc(100%/(var(--fancybox-thumbs-ratio, 1.5)));
-    background-size:cover;
-    background-position:center center;
-    background-color:rgba(255,255,255,.1);
-    background-repeat:no-repeat;
-    border-radius:var(--fancybox-thumbs-border-radius, 4px)
-   }
-   .fancybox__toolbar {
-    position:absolute;
-    top:0;
-    right:0;
-    left:0;
-    z-index:20;
-    background:linear-gradient(to top, hsla(0deg, 0%, 0%, 0) 0%, hsla(0deg, 0%, 0%, 0.006) 8.1%, hsla(0deg, 0%, 0%, 0.021) 15.5%, hsla(0deg, 0%, 0%, 0.046) 22.5%, hsla(0deg, 0%, 0%, 0.077) 29%, hsla(0deg, 0%, 0%, 0.114) 35.3%, hsla(0deg, 0%, 0%, 0.155) 41.2%, hsla(0deg, 0%, 0%, 0.198) 47.1%, hsla(0deg, 0%, 0%, 0.242) 52.9%, hsla(0deg, 0%, 0%, 0.285) 58.8%, hsla(0deg, 0%, 0%, 0.326) 64.7%, hsla(0deg, 0%, 0%, 0.363) 71%, hsla(0deg, 0%, 0%, 0.394) 77.5%, hsla(0deg, 0%, 0%, 0.419) 84.5%, hsla(0deg, 0%, 0%, 0.434) 91.9%, hsla(0deg, 0%, 0%, 0.44) 100%);
-    padding:0;
-    touch-action:none;
-    display:flex;
-    justify-content:space-between;
+}
+.fancybox__carousel .carousel__slide {
+    scrollbar-width: thin;
+    scrollbar-color: #ccc rgba(255, 255, 255, 0.1);
+}
+.fancybox__carousel .carousel__slide::-webkit-scrollbar {
+    width: 8px;
+    height: 8px;
+}
+.fancybox__carousel .carousel__slide::-webkit-scrollbar-track {
+    background-color: rgba(255, 255, 255, 0.1);
+}
+.fancybox__carousel .carousel__slide::-webkit-scrollbar-thumb {
+    background-color: #ccc;
+    border-radius: 2px;
+    box-shadow: inset 0 0 4px rgba(0, 0, 0, 0.2);
+}
+.fancybox__carousel.is-draggable .fancybox__slide,
+.fancybox__carousel.is-draggable .fancybox__slide .fancybox__content {
+    cursor: move;
+    cursor: grab;
+}
+.fancybox__carousel.is-dragging .fancybox__slide,
+.fancybox__carousel.is-dragging .fancybox__slide .fancybox__content {
+    cursor: move;
+    cursor: grabbing;
+}
+.fancybox__carousel .fancybox__slide .fancybox__content {
+    cursor: auto;
+}
+.fancybox__carousel .fancybox__slide.can-zoom_in .fancybox__content {
+    cursor: zoom-in;
+}
+.fancybox__carousel .fancybox__slide.can-zoom_out .fancybox__content {
+    cursor: zoom-out;
+}
+.fancybox__carousel .fancybox__slide.is-draggable .fancybox__content {
+    cursor: move;
+    cursor: grab;
+}
+.fancybox__carousel .fancybox__slide.is-dragging .fancybox__content {
+    cursor: move;
+    cursor: grabbing;
+}
+.fancybox__image {
+    transform-origin: 0 0;
+    user-select: none;
+    transition: none;
+}
+.has-image .fancybox__content {
+    padding: 0;
+    background: rgba(0, 0, 0, 0);
+    min-height: 1px;
+}
+.is-closing .has-image .fancybox__content {
+    overflow: visible;
+}
+.has-image[data-image-fit="contain"] {
+    overflow: visible;
+    touch-action: none;
+}
+.has-image[data-image-fit="contain"] .fancybox__content {
+    flex-direction: row;
+    flex-wrap: wrap;
+}
+.has-image[data-image-fit="contain"] .fancybox__image {
+    max-width: 100%;
+    max-height: 100%;
+    object-fit: contain;
+}
+.has-image[data-image-fit="contain-w"] {
+    overflow-x: hidden;
+    overflow-y: auto;
+}
+.has-image[data-image-fit="contain-w"] .fancybox__content {
+    min-height: auto;
+}
+.has-image[data-image-fit="contain-w"] .fancybox__image {
+    max-width: 100%;
+    height: auto;
+}
+.has-image[data-image-fit="cover"] {
+    overflow: visible;
+    touch-action: none;
+}
+.has-image[data-image-fit="cover"] .fancybox__content {
+    width: 100%;
+    height: 100%;
+}
+.has-image[data-image-fit="cover"] .fancybox__image {
+    width: 100%;
+    height: 100%;
+    object-fit: cover;
+}
+.fancybox__carousel .fancybox__slide.has-iframe .fancybox__content,
+.fancybox__carousel .fancybox__slide.has-map .fancybox__content,
+.fancybox__carousel .fancybox__slide.has-pdf .fancybox__content,
+.fancybox__carousel .fancybox__slide.has-video .fancybox__content,
+.fancybox__carousel .fancybox__slide.has-html5video .fancybox__content {
+    max-width: 100%;
+    flex-shrink: 1;
+    min-height: 1px;
+    overflow: visible;
+}
+.fancybox__carousel .fancybox__slide.has-iframe .fancybox__content,
+.fancybox__carousel .fancybox__slide.has-map .fancybox__content,
+.fancybox__carousel .fancybox__slide.has-pdf .fancybox__content {
+    width: 100%;
+    height: 80%;
+}
+.fancybox__carousel .fancybox__slide.has-video .fancybox__content,
+.fancybox__carousel .fancybox__slide.has-html5video .fancybox__content {
+    width: 960px;
+    height: 540px;
+    max-width: 100%;
+    max-height: 100%;
+}
+.fancybox__carousel .fancybox__slide.has-map .fancybox__content,
+.fancybox__carousel .fancybox__slide.has-pdf .fancybox__content,
+.fancybox__carousel .fancybox__slide.has-video .fancybox__content,
+.fancybox__carousel .fancybox__slide.has-html5video .fancybox__content {
+    padding: 0;
+    background: rgba(24, 24, 27, 0.9);
+    color: #fff;
+}
+.fancybox__carousel .fancybox__slide.has-map .fancybox__content {
+    background: #e5e3df;
+}
+.fancybox__html5video,
+.fancybox__iframe {
+    border: 0;
+    display: block;
+    height: 100%;
+    width: 100%;
+    background: rgba(0, 0, 0, 0);
+}
+.fancybox-placeholder {
+    position: absolute;
+    width: 1px;
+    height: 1px;
+    padding: 0;
+    margin: -1px;
+    overflow: hidden;
+    clip: rect(0, 0, 0, 0);
+    white-space: nowrap;
+    border-width: 0;
+}
+.fancybox__thumbs {
+    flex: 0 0 auto;
+    position: relative;
+    padding: 0px 3px;
+    opacity: var(--fancybox-opacity, 1);
+}
+.fancybox__container.is-animated[aria-hidden="false"] .fancybox__thumbs {
+    animation: 0.15s ease-in backwards fancybox-fadeIn;
+}
+.fancybox__container.is-animated.is-closing .fancybox__thumbs {
+    opacity: 0;
+}
+.fancybox__thumbs .carousel__slide {
+    flex: 0 0 auto;
+    width: var(--fancybox-thumbs-width, 96px);
+    margin: 0;
+    padding: 8px 3px;
+    box-sizing: content-box;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    overflow: visible;
+    cursor: pointer;
+}
+.fancybox__thumbs .carousel__slide .fancybox__thumb::after {
+    content: "";
+    position: absolute;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    border-width: 5px;
+    border-style: solid;
+    border-color: var(--fancybox-accent-color, rgba(34, 213, 233, 0.96));
+    opacity: 0;
+    transition: opacity 0.15s ease;
+    border-radius: var(--fancybox-thumbs-border-radius, 4px);
+}
+.fancybox__thumbs .carousel__slide.is-nav-selected .fancybox__thumb::after {
+    opacity: 0.92;
+}
+.fancybox__thumbs .carousel__slide > * {
+    pointer-events: none;
+    user-select: none;
+}
+.fancybox__thumb {
+    position: relative;
+    width: 100%;
+    padding-top: calc(100% / (var(--fancybox-thumbs-ratio, 1.5)));
+    background-size: cover;
+    background-position: center center;
+    background-color: rgba(255, 255, 255, 0.1);
+    background-repeat: no-repeat;
+    border-radius: var(--fancybox-thumbs-border-radius, 4px);
+}
+.fancybox__toolbar {
+    position: absolute;
+    top: 0;
+    right: 0;
+    left: 0;
+    z-index: 20;
+    background: linear-gradient(
+        to top,
+        hsla(0deg, 0%, 0%, 0) 0%,
+        hsla(0deg, 0%, 0%, 0.006) 8.1%,
+        hsla(0deg, 0%, 0%, 0.021) 15.5%,
+        hsla(0deg, 0%, 0%, 0.046) 22.5%,
+        hsla(0deg, 0%, 0%, 0.077) 29%,
+        hsla(0deg, 0%, 0%, 0.114) 35.3%,
+        hsla(0deg, 0%, 0%, 0.155) 41.2%,
+        hsla(0deg, 0%, 0%, 0.198) 47.1%,
+        hsla(0deg, 0%, 0%, 0.242) 52.9%,
+        hsla(0deg, 0%, 0%, 0.285) 58.8%,
+        hsla(0deg, 0%, 0%, 0.326) 64.7%,
+        hsla(0deg, 0%, 0%, 0.363) 71%,
+        hsla(0deg, 0%, 0%, 0.394) 77.5%,
+        hsla(0deg, 0%, 0%, 0.419) 84.5%,
+        hsla(0deg, 0%, 0%, 0.434) 91.9%,
+        hsla(0deg, 0%, 0%, 0.44) 100%
+    );
+    padding: 0;
+    touch-action: none;
+    display: flex;
+    justify-content: space-between;
     --carousel-button-svg-width: 20px;
     --carousel-button-svg-height: 20px;
-    opacity:var(--fancybox-opacity, 1);
-    text-shadow:var(--fancybox-toolbar-text-shadow, 1px 1px 1px rgba(0, 0, 0, 0.4))
-   }
-   @media all and (min-width: 1024px) {
+    opacity: var(--fancybox-opacity, 1);
+    text-shadow: var(
+        --fancybox-toolbar-text-shadow,
+        1px 1px 1px rgba(0, 0, 0, 0.4)
+    );
+}
+@media all and (min-width: 1024px) {
     .fancybox__toolbar {
-     padding:8px
+        padding: 8px;
     }
-   }
-   .fancybox__container.is-animated[aria-hidden=false] .fancybox__toolbar {
-    animation:.15s ease-in backwards fancybox-fadeIn
-   }
-   .fancybox__container.is-animated.is-closing .fancybox__toolbar {
-    opacity:0
-   }
-   .fancybox__toolbar__items {
-    display:flex
-   }
-   .fancybox__toolbar__items--left {
-    margin-right:auto
-   }
-   .fancybox__toolbar__items--center {
-    position:absolute;
-    left:50%;
-    transform:translateX(-50%)
-   }
-   .fancybox__toolbar__items--right {
-    margin-left:auto
-   }
-   @media(max-width: 640px) {
+}
+.fancybox__container.is-animated[aria-hidden="false"] .fancybox__toolbar {
+    animation: 0.15s ease-in backwards fancybox-fadeIn;
+}
+.fancybox__container.is-animated.is-closing .fancybox__toolbar {
+    opacity: 0;
+}
+.fancybox__toolbar__items {
+    display: flex;
+}
+.fancybox__toolbar__items--left {
+    margin-right: auto;
+}
+.fancybox__toolbar__items--center {
+    position: absolute;
+    left: 50%;
+    transform: translateX(-50%);
+}
+.fancybox__toolbar__items--right {
+    margin-left: auto;
+}
+@media (max-width: 640px) {
     .fancybox__toolbar__items--center:not(:last-child) {
-     display:none
+        display: none;
     }
-   }
-   .fancybox__counter {
-    min-width:72px;
-    padding:0 10px;
-    line-height:var(--carousel-button-height, 48px);
-    text-align:center;
-    font-size:17px;
-    font-variant-numeric:tabular-nums;
-    -webkit-font-smoothing:subpixel-antialiased
-   }
-   .fancybox__progress {
-    background:var(--fancybox-accent-color, rgba(34, 213, 233, 0.96));
-    height:3px;
-    left:0;
-    position:absolute;
-    right:0;
-    top:0;
-    transform:scaleX(0);
-    transform-origin:0;
-    transition-property:transform;
-    transition-timing-function:linear;
-    z-index:30;
-    user-select:none
-   }
-   .fancybox__container:fullscreen::backdrop {
-    opacity:0
-   }
-   .fancybox__button--fullscreen g:nth-child(2) {
-    display:none
-   }
-   .fancybox__container:fullscreen .fancybox__button--fullscreen g:nth-child(1) {
-    display:none
-   }
-   .fancybox__container:fullscreen .fancybox__button--fullscreen g:nth-child(2) {
-    display:block
-   }
-   .fancybox__button--slideshow g:nth-child(2) {
-    display:none
-   }
-   .fancybox__container.has-slideshow .fancybox__button--slideshow g:nth-child(1) {
-    display:none
-   }
-   .fancybox__container.has-slideshow .fancybox__button--slideshow g:nth-child(2) {
-    display:block
-   }
-   
\ No newline at end of file
+}
+.fancybox__counter {
+    min-width: 72px;
+    padding: 0 10px;
+    line-height: var(--carousel-button-height, 48px);
+    text-align: center;
+    font-size: 17px;
+    font-variant-numeric: tabular-nums;
+    -webkit-font-smoothing: subpixel-antialiased;
+}
+.fancybox__progress {
+    background: var(--fancybox-accent-color, rgba(34, 213, 233, 0.96));
+    height: 3px;
+    left: 0;
+    position: absolute;
+    right: 0;
+    top: 0;
+    transform: scaleX(0);
+    transform-origin: 0;
+    transition-property: transform;
+    transition-timing-function: linear;
+    z-index: 30;
+    user-select: none;
+}
+.fancybox__container:fullscreen::backdrop {
+    opacity: 0;
+}
+.fancybox__button--fullscreen g:nth-child(2) {
+    display: none;
+}
+.fancybox__container:fullscreen .fancybox__button--fullscreen g:nth-child(1) {
+    display: none;
+}
+.fancybox__container:fullscreen .fancybox__button--fullscreen g:nth-child(2) {
+    display: block;
+}
+.fancybox__button--slideshow g:nth-child(2) {
+    display: none;
+}
+.fancybox__container.has-slideshow .fancybox__button--slideshow g:nth-child(1) {
+    display: none;
+}
+.fancybox__container.has-slideshow .fancybox__button--slideshow g:nth-child(2) {
+    display: block;
+}

From 4c36d5456b32d92d7a9db00a2c1cf5f14bffc0f3 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Mon, 7 Nov 2022 15:02:24 +0800
Subject: [PATCH 086/187] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=EF=BC=8C=E5=88=A4=E6=96=AD=E5=BD=93=E5=89=8D?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=90=8D=E7=A7=B0=E9=80=BB=E8=BE=91=E6=9C=89?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/repo/ai_model_manage.go | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/routers/repo/ai_model_manage.go b/routers/repo/ai_model_manage.go
index 3a25c37d2..0cac858ed 100644
--- a/routers/repo/ai_model_manage.go
+++ b/routers/repo/ai_model_manage.go
@@ -1057,9 +1057,17 @@ func ModifyModelInfo(ctx *context.Context) {
 		engine := ctx.QueryInt("engine")
 		aimodels := models.QueryModelByName(name, task.RepoId)
 		if aimodels != nil && len(aimodels) > 0 {
-			re["msg"] = ctx.Tr("repo.model.manage.create_error")
-			ctx.JSON(200, re)
-			return
+			if len(aimodels) == 1 {
+				if aimodels[0].ID != task.ID {
+					re["msg"] = ctx.Tr("repo.model.manage.create_error")
+					ctx.JSON(200, re)
+					return
+				}
+			} else {
+				re["msg"] = ctx.Tr("repo.model.manage.create_error")
+				ctx.JSON(200, re)
+				return
+			}
 		}
 		err = models.ModifyLocalModel(id, name, label, description, engine)
 

From 994737ffaaf5d50dad8cab7a571e937f17189692 Mon Sep 17 00:00:00 2001
From: zhoupzh <zhoupzh@pcl.ac.cn>
Date: Mon, 7 Nov 2022 16:18:22 +0800
Subject: [PATCH 087/187] fix issue

---
 templates/repo/view_file.tmpl     | 38 -------------------------------
 web_src/less/vendor/fancyapp.less | 38 +++++++++++++++++++++++++++++++
 2 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/templates/repo/view_file.tmpl b/templates/repo/view_file.tmpl
index 2a15aa6d0..b259409eb 100755
--- a/templates/repo/view_file.tmpl
+++ b/templates/repo/view_file.tmpl
@@ -1,42 +1,4 @@
-<style>
-img {
-  cursor: zoom-in;
-}
-
-.fancybox__container {
-  --fancybox-bg: rgba(193, 201, 210, 0.7);
-}
-
-.fancybox-zoomOut {
-  animation: 0.2s ease-in-out fancybox-zoomOut both;
-}
-
-.fancybox-zoomIn {
-  animation: 0.25s ease-in-out fancybox-zoomIn both;
-}
-
-@keyframes fancybox-zoomIn {
-  from {
-    opacity: 0;
-    transform: scale3d(0.8, 0.8, 0.8);
-  }
-
-  100% {
-    opacity: 1;
-  }
-}
 
-@keyframes fancybox-zoomOut {
-  from {
-    opacity: 1;
-  }
-
-  to {
-    opacity: 0;
-    transform: scale3d(0.8, 0.8, 0.8);
-  }
-}
-</style>
 <div class="{{TabSizeClass .Editorconfig .FileName}} non-diff-file-content gallery">
 	<h4 class="file-header ui top attached header">
 		<div class="file-header-left">
diff --git a/web_src/less/vendor/fancyapp.less b/web_src/less/vendor/fancyapp.less
index b4558441e..0c579e0bb 100644
--- a/web_src/less/vendor/fancyapp.less
+++ b/web_src/less/vendor/fancyapp.less
@@ -751,3 +751,41 @@ body:not(.is-using-mouse) .fancybox__container :focus {
 .fancybox__container.has-slideshow .fancybox__button--slideshow g:nth-child(2) {
     display: block;
 }
+
+.gallery img {
+    cursor: zoom-in;
+}
+
+.fancybox__container {
+    --fancybox-bg: rgba(193, 201, 210, 0.7);
+}
+
+.fancybox-zoomOut {
+    animation: 0.2s ease-in-out fancybox-zoomOut both;
+}
+
+.fancybox-zoomIn {
+    animation: 0.25s ease-in-out fancybox-zoomIn both;
+}
+
+@keyframes fancybox-zoomIn {
+    from {
+        opacity: 0;
+        transform: scale3d(0.8, 0.8, 0.8);
+    }
+
+    100% {
+        opacity: 1;
+    }
+}
+
+@keyframes fancybox-zoomOut {
+    from {
+        opacity: 1;
+    }
+
+    to {
+        opacity: 0;
+        transform: scale3d(0.8, 0.8, 0.8);
+    }
+}

From fdec16f22e6237ec3885ccbc03fce1dae62f8b7c Mon Sep 17 00:00:00 2001
From: chenshihai <chenshh@pcl.ac.cn>
Date: Mon, 7 Nov 2022 18:23:24 +0800
Subject: [PATCH 088/187] model manage

---
 web_src/vuepages/apis/modules/fileupload.js   |   4 +-
 web_src/vuepages/apis/modules/modelmanage.js  |  12 +
 .../local/modelmanage-local-create-1.vue      |   7 +-
 .../local/modelmanage-local-create-2.vue      | 331 ++++++++++++------
 4 files changed, 249 insertions(+), 105 deletions(-)

diff --git a/web_src/vuepages/apis/modules/fileupload.js b/web_src/vuepages/apis/modules/fileupload.js
index 9936e27ec..31a0fa565 100644
--- a/web_src/vuepages/apis/modules/fileupload.js
+++ b/web_src/vuepages/apis/modules/fileupload.js
@@ -1,4 +1,5 @@
 import service from "../service";
+import Qs from 'qs';
 
 // 上传文件1: 获取文件chunks信息
 // params: { md5, type: 0-CPU/GPU,1-NPU, file_name, scene: ''-数据集,'model'-模型 }
@@ -42,7 +43,8 @@ export const setCompleteMultipart = (data) => {
   return service({
     url: `/attachments/complete_multipart`,
     method: 'post',
+    headers: { 'Content-type': 'application/x-www-form-urlencoded' },
     params: {},
-    data,
+    data: Qs.stringify(data),
   });
 };
diff --git a/web_src/vuepages/apis/modules/modelmanage.js b/web_src/vuepages/apis/modules/modelmanage.js
index f096eec3f..c025d0554 100644
--- a/web_src/vuepages/apis/modules/modelmanage.js
+++ b/web_src/vuepages/apis/modules/modelmanage.js
@@ -12,6 +12,18 @@ export const saveLocalModel = (data) => {
   });
 };
 
+// 修改模型
+// data: {id,type,name,version,engine,label,description:}
+export const modifyModel = (data) => {
+  return service({
+    url: `${data.repo}/modelmanage/modify_model`,
+    method: 'put',
+    headers: { 'Content-type': 'application/x-www-form-urlencoded' },
+    params: {},
+    data: Qs.stringify(data),
+  });
+};
+
 // 求模型信息
 export const getModelInfoByName = (params) => {
   return service({
diff --git a/web_src/vuepages/pages/modelmanage/local/modelmanage-local-create-1.vue b/web_src/vuepages/pages/modelmanage/local/modelmanage-local-create-1.vue
index 9bf281fc6..b63a30278 100644
--- a/web_src/vuepages/pages/modelmanage/local/modelmanage-local-create-1.vue
+++ b/web_src/vuepages/pages/modelmanage/local/modelmanage-local-create-1.vue
@@ -103,7 +103,7 @@
 
 <script>
 
-import { saveLocalModel, getModelInfoByName } from '~/apis/modules/modelmanage';
+import { saveLocalModel, getModelInfoByName, modifyModel } from '~/apis/modules/modelmanage';
 // import { CLUSTERS, COMPUTER_RESOURCES, ACC_CARD_TYPE } from '~/const';
 import { getUrlSearchParams } from '~/utils';
 // import { formatDate } from 'element-ui/lib/utils/date-util';
@@ -137,7 +137,8 @@ export default {
         });
         return;
       }
-      saveLocalModel({
+      const submintApi = this.type == '1' ? modifyModel : saveLocalModel;
+      submintApi({
         repo: location.pathname.split('/').slice(0, 3).join('/'),
         ...this.state,
       }).then(res => {
@@ -154,7 +155,7 @@ export default {
         } else {
           this.$message({
             type: 'error',
-            message: '模型保存失败',
+            message: this.type == '1' ? '模型修改失败' : '保存模型失败',
           });
         }
       }).catch(err => {
diff --git a/web_src/vuepages/pages/modelmanage/local/modelmanage-local-create-2.vue b/web_src/vuepages/pages/modelmanage/local/modelmanage-local-create-2.vue
index 745e88d72..ac7857ad7 100644
--- a/web_src/vuepages/pages/modelmanage/local/modelmanage-local-create-2.vue
+++ b/web_src/vuepages/pages/modelmanage/local/modelmanage-local-create-2.vue
@@ -3,7 +3,7 @@
     <div class="header">
       <span class="title">{{ type == '1' ? '增加模型文件' : '上传模型文件' }}</span>
     </div>
-    <div class="content">
+    <div class="content ui form">
       <div class="guide-c" v-if="type != '1'">
         <div class="step">
           <div class="num">1</div>
@@ -26,22 +26,50 @@
         <div class="row" style="align-items:flex-start;">
           <div class="r-title"><label class="required">文件上传</label></div>
           <div class="r-content">
-            <div>
-              <form class="dropzone" ref="dropzoneRef"></form>
+            <div style="position:relative">
+              <form class="dropzone" ref="dropzoneRef" @click="">
+                <div class="dropzon-err-tips ui red message" v-show="showUploadErr" style="display:none;margin:2.5rem">
+                  {{ uploadErrTxt }}</div>
+              </form>
+              <div class="not-allowed-placeholder" v-show="uploading"></div>
             </div>
           </div>
         </div>
         <div class="row" style="margin-top:10px">
           <div class="r-title"><label></label></div>
           <div class="r-content">
-            <el-button size="medium" class="green" @click="submit">上传</el-button>
+            <el-button size="medium" class="green" @click="submit" :disabled="uploading">上传</el-button>
             <el-button size="medium" @click="cancel">取消</el-button>
           </div>
         </div>
         <div class="row" style="align-items:flex-start;">
           <div class="r-title"><label>上传状态：</label></div>
           <div class="r-content">
-
+            <div v-for="(item, index) in uploadFiles" :key="item.upload.uuid" class="datast-upload-progress">
+              <span class="dataset-name nowrap" :title="item.name">{{ item.name }}</span>
+              <div class="dataset-progress">
+                <el-progress :text-inside="true" :stroke-width="14" :percentage="uploadProgressList[index].progress">
+                </el-progress>
+              </div>
+              <div class="dataset-status nowrap">
+                <div class="status-flex">
+                  <i v-if="
+                    uploadProgressList[index].infoCode === 1 ||
+                    uploadProgressList[index].infoCode === 2
+                  " class="ri-close-circle-line failed"></i>
+                  <i v-if="uploadProgressList[index].infoCode === 0" class="ri-checkbox-circle-line success">
+                  </i>
+                  <span>{{ uploadProgressList[index].status }}</span>
+                  <el-tooltip v-if="uploadProgressList[index].infoCode === 1" class="item" effect="dark"
+                    placement="top">
+                    <div slot="content">
+                      {{ uploadProgressList[index].failedInfo }}
+                    </div>
+                    <i style="font-size: 16px; margin-left: 0.5rem; cursor: pointer" class="ri-question-fill"></i>
+                  </el-tooltip>
+                </div>
+              </div>
+            </div>
           </div>
         </div>
       </div>
@@ -53,10 +81,7 @@
 
 import { getModelInfoByName } from '~/apis/modules/modelmanage';
 import { getChunks, getNewMultipart, getMultipartUrl, setCompleteMultipart } from '~/apis/modules/fileupload';
-// import { CLUSTERS, COMPUTER_RESOURCES, ACC_CARD_TYPE } from '~/const';
 import { getUrlSearchParams } from '~/utils';
-// import { formatDate } from 'element-ui/lib/utils/date-util';
-
 import 'dropzone/dist/dropzone.css';
 import Dropzone from 'dropzone';
 import SparkMD5 from "spark-md5";
@@ -65,6 +90,8 @@ Dropzone.autoDiscover = false;
 
 const uploadChunkSize = 1024 * 1024 * 64;
 const md5ChunkSize = 1024 * 1024 * 64;
+const maxFileSize = 10;
+const maxModelFilesSize = 200 * 1024 * 1024 * 1024; // 200 GB
 
 export default {
   data() {
@@ -80,35 +107,77 @@ export default {
         label: '',
         description: '',
         size: '',
-      }
+      },
+      originData: null,
+      showUploadErr: false,
+      uploadErrTxt: '',
+      defaultErrTxt: '单次最多上传10个文件，模型总文件大小不超过200G',
+
+      uploadFiles: [],
+      uploadLength: 0,
+      uploadProgressList: [],
+
+      uploading: false,
     };
   },
-  components: { /*QueueDialog*/ },
+  components: {},
   methods: {
     initDropZone() {
       this.dropzoneHandler = new Dropzone(this.$refs.dropzoneRef, {
         url: '/',
+        maxFiles: 10,
         parallelUploads: 20,
         uploadMultiple: true,
-        maxFilesize: 2048,
+        maxFilesize: maxModelFilesSize,
         timeout: 0,
         addRemoveLinks: true,
         autoProcessQueue: false,
         dictDefaultMessage: '点击添加文件或直接拖拽文件到此处',
-        dictInvalidFileType: 'dictInvalidFileType',
         dictFileTooBig: 'dictFileTooBig',
-        dictRemoveFile: 'dictRemoveFile',
+        dictRemoveFile: '移除文件',
+        dictMaxFilesExceeded: this.defaultErrTxt,
       });
       this.dropzoneHandler.on("addedfile", file => {
-        console.log(`File added: ${file.name}`);
-        console.log(file);
-        // this.calcFileMd5(file);
+        this.checkFiles(file);
       });
-      this.dropzoneHandler.on("removedfile", file => {
-        console.log(`File removedfile: ${file.name}`);
+      this.dropzoneHandler.on("removedfile", file => {        
+        this.checkFiles();
       });
-      this.dropzoneHandler.on("maxfilesexceeded", file => {
-        console.log(`File removedfile: ${file.name}`);
+    },
+    showUploadErrInfo(state, info) {
+      if (state) {
+        this.uploadErrTxt = info;
+        this.showUploadErr = true;
+      } else {
+        this.uploadErrTxt = '';
+        this.showUploadErr = false;
+      }
+    },
+    checkFiles(file) {
+      const fileList = this.dropzoneHandler.getAcceptedFiles();
+      const filesSize = fileList.reduce((acc, item, index) => acc + item.size, 0) + (file ? file.size : 0);
+      const filesCount = fileList.length + (file ? 1 : 0);
+      const allfilesSize = filesSize + this.state.size;
+      if (filesCount > maxFileSize || allfilesSize > maxModelFilesSize) {
+        this.showUploadErrInfo(true, this.defaultErrTxt);
+        return false;
+      }
+      this.showUploadErrInfo(false);
+      return true;
+    },
+    resetFileStatus() {
+      this.uploadFiles = [];
+      this.uploadLength = 0;
+      this.uploadProgressList = [];
+    },
+    updateProgress(file, status, progress, infoCode, failedInfo = "") { // updateFileStatus
+      this.uploadProgressList.forEach((item, index) => {
+        if (item.uploadUuid === file.upload.uuid) {
+          this.uploadProgressList[index].status = status;
+          this.uploadProgressList[index].progress = progress;
+          this.uploadProgressList[index].infoCode = infoCode;
+          this.uploadProgressList[index].failedInfo = failedInfo;
+        }
       });
     },
     calcFileMd5(file) {
@@ -122,16 +191,20 @@ export default {
         file.totalChunkCounts = 1;
       }
       let currentChunk = 0;
+      this.uploadProgressList.push({
+        uploadUuid: file.upload.uuid,
+        name: file.name,
+        status: '计算文件MD5...',
+        progress: 0,
+        infoCode: 3,
+      });
       return new Promise((resolve, reject) => {
         fileReader.onload = function (e) {
-          console.log(file.name + ': read chunk nr', currentChunk + 1, 'of', chunks);
           spark.append(e.target.result);
           currentChunk++;
           if (currentChunk < chunks) {
             loadNext();
           } else {
-            console.log(file.name + ': finished loading');
-            console.info(file.name + ': computed hash', spark.end());
             const md5 = spark.end();
             spark.destroy();
             file.uniqueIdentifier = md5;
@@ -139,7 +212,7 @@ export default {
           }
         };
         fileReader.onerror = function (e) {
-          console.warn(file.name + ': oops, calcFileMd5 went wrong.');
+          console.warn(file.name + ': calcFileMd5 went wrong.');
           reject(e);
         };
 
@@ -151,33 +224,6 @@ export default {
         loadNext();
       });
     },
-    async _getChunksInfo(file) {
-      const params = {
-        params: {
-          md5: file.uniqueIdentifier,
-          type: this.state.type,
-          file_name: file.name,
-          _csrf: csrf,
-        },
-      };
-      try {
-        // const response = axios.get("/attachments/get_chunks", params);
-        const response = await getChunks(params);
-        file.uploadID = response.data.uploadID;
-        file.uuid = response.data.uuid;
-        file.uploaded = response.data.uploaded;
-        file.chunks = response.data.chunks;
-        file.attachID = response.data.attachID;
-        file.datasetID = response.data.datasetID;
-        file.datasetName = response.data.datasetName;
-        file.realName = response.data.fileName;
-        return file;
-      } catch (error) {
-        this.emitDropzoneFailed(file);
-        console.log("getChunksInfo catch: ", error);
-        return null;
-      }
-    },
     getChunksInfo(file) {
       return getChunks({
         md5: file.uniqueIdentifier,
@@ -191,10 +237,8 @@ export default {
         file.uploaded = data.uploaded;
         file.chunks = data.chunks;
         file.attachID = data.attachID;
-        // file.datasetID = data.datasetID;
-        // file.datasetName = data.datasetName;
-        file.modelUuid = data.modeluuid;
-        file.modelName = data.modelName;
+        file.modelUuid = data.modeluuid || file.modelUuid;
+        file.modelName = data.modelName || file.modelName;
         file.realName = data.fileName;
         return file;
       }).catch(err => {
@@ -202,21 +246,6 @@ export default {
         return err;
       });
     },
-    async _newUpload(file) {
-      const res = await axios.get("/attachments/new_multipart", {
-        params: {
-          totalChunkCounts: file.totalChunkCounts,
-          md5: file.uniqueIdentifier,
-          size: file.size,
-          fileType: file.type,
-          type: this.uploadtype,
-          file_name: file.name,
-          _csrf: csrf,
-        },
-      });
-      file.uploadID = res.data.uploadID;
-      file.uuid = res.data.uuid;
-    },
     newUpload(file) {
       return getNewMultipart({
         totalChunkCounts: file.totalChunkCounts,
@@ -234,19 +263,24 @@ export default {
         if (file.uploadID && file.uuid) {
           file.chunks = '';
           this.breakpointUpload(file);
+        } else {
+          this.uploadError(file, info);
+          this.updateProgress(file, "上传失败", 0, 2);
         }
         return file;
       }).catch(err => {
         console.log('getNewMultipart', err);
+        this.uploadError(file, info);
+        this.updateProgress(file, "上传失败", 0, 2);
         return err;
       });
     },
     breakpointUpload(file) {
       const blobSlice = File.prototype.slice || File.prototype.mozSlice || File.prototype.webkitSlice;
-      const chunks = Math.ceil(file.size / chunkSize);
       const fileReader = new FileReader();
       const time = new Date().getTime();
       const chunkSize = uploadChunkSize;
+      const chunks = Math.ceil(file.size / chunkSize);
       const _this = this;
       let currentChunk = 0;
       const successChunks = [];
@@ -256,7 +290,7 @@ export default {
       }
       const urls = [];
       const etags = [];
-      function checkSuccessChunks() {
+      const checkSuccessChunks = () => {
         const index = successChunks.indexOf((currentChunk + 1).toString());
         if (index == -1) {
           return false;
@@ -264,7 +298,7 @@ export default {
         return true;
       }
 
-      async function getUploadChunkUrl(currentChunk, partSize) {
+      const getUploadChunkUrl = async (currentChunk, partSize) => {
         const res = await getMultipartUrl({
           uuid: file.uuid,
           uploadID: file.uploadID,
@@ -275,9 +309,9 @@ export default {
           scene: 'model',
         });
         urls[currentChunk] = res.data.url;
-      }
+      };
 
-      async function uploadMinioNewMethod(url, e) {
+      const uploadMinioNewMethod = async (url, e) => {
         const xhr = new XMLHttpRequest();
         xhr.open("PUT", url, false);
         if (_this.state.type == 0) {
@@ -293,7 +327,7 @@ export default {
         }
       }
 
-      async function uploadChunk(e) {
+      const uploadChunk = async (e) => {
         try {
           if (!checkSuccessChunks()) {
             const start = currentChunk * chunkSize;
@@ -315,7 +349,7 @@ export default {
         }
       }
 
-      async function completeUpload() {
+      const completeUpload = async () => {
         return await setCompleteMultipart({
           uuid: file.uuid,
           uploadID: file.uploadID,
@@ -339,68 +373,106 @@ export default {
           fileReader.abort();
           currentChunk++;
           if (currentChunk < chunks) {
-            console.log(`第${currentChunk}个分片上传完成, 开始第${currentChunk + 1}/${chunks}个分片上传`);
-            // this.progress = Math.ceil((currentChunk / chunks) * 100);
-            // this.updateProgress(file, this.dropzoneParams.data("uploading"), Number(((currentChunk / chunks) * 100).toFixed(2)), 3);
-            // this.status = `${this.dropzoneParams.data("uploading")} ${((currentChunk / chunks) * 100).toFixed(2)}%`;
+            console.log(`第${currentChunk}个分片上传完成, 开始第${currentChunk + 1}/${chunks}个分片上传`);            
+            this.updateProgress(file, '上传中...', Number(((currentChunk / chunks) * 100).toFixed(2)), 3); 
             loadNext();
           } else {
             try {
               await completeUpload();
               console.log(`文件上传完成：${file.name} \n分片：${chunks} 大小:${file.size} 用时：${(new Date().getTime() - time) / 1000} s`);
-              // this.uploadLength++;
-              // this.allUploadLength++;
-              // this.updateProgress(file, "上传成功", 100, 0);          
-              // this.finishUpload(file);
+              this.uploadLength++;
+              this.updateProgress(file, "上传成功", 100, 0);
+              this.uploadSuccess(file);
             } catch (err) {
               const info = "上传失败";
               console.log(info, file)
-              // this.allUploadLength++;
-              // this.uploadError(file, info);
-              // this.updateProgress(file, info, Number(((currentChunk / chunks) * 100).toFixed(2)) - 1, 2);
+              this.uploadLength++;
+              this.uploadError(file, info);
+              this.updateProgress(file, info, Number(((currentChunk / chunks) * 100).toFixed(2)) - 1, 2);
             }
           }
         } catch (err) {
           console.log(err);
+          const info = "上传失败";
+          console.log(info, file)
+          this.uploadLength++;
+          this.uploadError(file, info);
+          this.updateProgress(file, info, Number(((currentChunk / chunks) * 100).toFixed(2)) - 1, 2);
         }
       };
       console.log("上传分片...");
       loadNext();
     },
+    uploadError(file, info) {      
+      file.previewTemplate.querySelector('.dz-success-mark').style.opacity = 0;
+      file.previewTemplate.querySelector('.dz-error-mark').style.opacity = 1;
+      file.previewTemplate.querySelector('.dz-error-message span').innerHTML = info;
+      file.previewTemplate.querySelector(".dz-error-message").style.display = 'block';
+      file.previewTemplate.querySelector(".dz-details").onmouseover = () => {
+        file.previewTemplate.querySelector('.dz-error-message').style.opacity = 1;
+      };
+      file.previewTemplate.querySelector(".dz-details").onmouseout = () => {
+        file.previewTemplate.querySelector('.dz-error-message').style.opacity = 0;
+      };
+      this.uploadFinishCheck(file);
+    },
+    uploadSuccess(file) {
+      file.previewTemplate.querySelector('.dz-error-mark').style.opacity = 0;
+      file.previewTemplate.querySelector('.dz-error-message span').innerHTML = '';
+      file.previewTemplate.querySelector('.dz-success-mark').style.opacity = 1;
+      file.previewTemplate.querySelector(".dz-error-message").style.display = 'none';
+      file.previewTemplate.querySelector(".dz-details").onmouseover = null;
+      file.previewTemplate.querySelector(".dz-details").onmouseout = null;
+      this.uploadFinishCheck(file);
+    },
+    uploadFinishCheck(file) {
+      console.log('uploadFinishCheck', file, this.uploadLength, '/', this.uploadFiles.length);
+      if (this.uploadLength === this.uploadFiles.length) {
+        console.log('All file has finish');
+        this.uploading = false;
+      }
+    },
     submit() {
-      console.log(this.dropzoneHandler);
       const fileList = this.dropzoneHandler.getAcceptedFiles();
       if (!fileList.length) return;
+      this.resetFileStatus();
+      this.uploadFiles = fileList;
+      this.uploading = true;
       for (let i = 0, iLen = fileList.length; i < iLen; i++) {
         const file = fileList[i];
+        file.modelUuid = this.state.id;
+        file.modelName = this.state.name;
         this.calcFileMd5(file).then(res => { // 计算MD5
           this.getChunksInfo(file).then(res => { // 获取Chunk信息
             if (file.uploadID == '' || file.uuid == '') { // 未上传过
               this.newUpload(file);
-            } else if (file.uploaded == '1') { // 已上传成功 秒传          
+            } else if (file.uploaded == '1') { // 已上传成功 秒传
               if (file.attachID == '0') { // 删除数据集记录，未删除文件                
                 // await addAttachment(file);
                 console.log(`file.attachID == '0'`);
               }
               // 同一模型上传同一个文件
-              if (file.modelUuid != '') {
-                if (file.modelName != '' && file.realName != '') {
-                  let info = `该文件已上传在模型: ${file.modelName}`;
-                  console.log(info);
-                  // this.uploadError(file, info);
-                  // this.allUploadLength++;
-                  // this.updateProgress(file, "上传失败", 0, 1, info);                  
-                }
+              if (file.modelUuid != '' && file.modelName != '' && file.realName != '') {
+                const info = `该文件已上传在模型: ${file.modelName}`;
+                this.uploadLength++;
+                this.uploadError(file, info);                  
+                this.updateProgress(file, "上传失败", 0, 1, info);
               }
-              console.log('文件上传处理完成');
+              console.log(file.name, '文件处理完成');
             } else { // 断点续传
               this.breakpointUpload(file);
             }
           }).catch(err => {
             console.info('getChunksInfo', err);
+            this.uploadLength++;
+            this.uploadError(file, "上传失败");
+            this.updateProgress(file, "上传失败", 0, 2);
           });
         }).catch(err => {
           console.info('calcFileMd5', err);
+          this.uploadLength++;
+          this.uploadError(file, '上传失败');
+          this.updateProgress(file, "上传失败", 0, 2);
         });
       }
     },
@@ -434,7 +506,10 @@ export default {
           this.state.engine = data.engine.toString();
           this.state.label = data.label;
           this.state.description = data.description;
-          this.state.size = data.size;
+          this.state.size = data.size || 0;
+          this.originData = data;
+        } else {
+          this.cancel();
         }
       }).catch(err => {
         this.loading = false;
@@ -529,7 +604,6 @@ export default {
     justify-content: center;
     flex-direction: column;
     margin: 0 auto;
-    width: 80%;
 
     .row {
       width: 100%;
@@ -593,6 +667,27 @@ export default {
   }
 }
 
+.not-allowed-placeholder {
+  position: absolute;
+  width: 100%;
+  height: 100%;
+  z-index: 20;
+  cursor: no-drop;
+  top: 0;
+}
+
+.dropzone {
+  min-height: 186px !important;
+
+  /deep/ .dz-default.dz-message {
+    margin: 76px 0 !important;
+  }
+
+  /deep/ .dz-remove {
+    margin-top: 10px !important;
+  }
+}
+
 .input-disabled {
   /deep/ .el-input__inner {
     background-color: #f5f5f6 !important;
@@ -604,6 +699,40 @@ export default {
   display: none;
 }
 
+.success {
+  color: #21ba45;
+  font-size: 16px;
+  margin-right: 0.5rem;
+}
+.failed {
+  color: red;
+  font-size: 16px;
+  margin-right: 0.5rem;
+}
+.datast-upload-progress {
+  display: flex;
+  align-items: center;
+}
+.datast-upload-progress .dataset-name {
+  text-align: right;
+  width: 200px;
+  margin-right: 1rem;
+}
+.datast-upload-progress .dataset-progress {
+  flex: 1;
+}
+.datast-upload-progress .dataset-status {
+  width: 100px;
+  margin-left: 1rem;
+}
+.datast-upload-progress .dataset-status .status-flex {
+  display: flex;
+  align-items: center;
+}
+/deep/ .el-progress-bar__inner {
+  background-color: #21ba45;
+}
+
 .el-select-dropdown__item.selected {
   color: #85b7d9;
 }

From bb33d6e9331f17415102a577198f11118af6d84c Mon Sep 17 00:00:00 2001
From: chenshihai <chenshh@pcl.ac.cn>
Date: Tue, 8 Nov 2022 09:48:34 +0800
Subject: [PATCH 089/187] model manage

---
 templates/repo/modelmanage/showinfo.tmpl      | 10 +-
 .../local/modelmanage-local-create-1.vue      |  2 +-
 .../local/modelmanage-local-create-2.vue      | 94 ++++++++++---------
 3 files changed, 57 insertions(+), 49 deletions(-)

diff --git a/templates/repo/modelmanage/showinfo.tmpl b/templates/repo/modelmanage/showinfo.tmpl
index 0a29375f1..4fdf007ed 100644
--- a/templates/repo/modelmanage/showinfo.tmpl
+++ b/templates/repo/modelmanage/showinfo.tmpl
@@ -263,11 +263,11 @@ function loadInfo(){
 }
 function transObj(data){
     let {id,name,version,label,size,description,createdUnix,accuracy,codeBranch,codeCommitID,trainTaskInfo} = data[0]
-    let modelAcc = JSON.parse(accuracy)
-    trainTaskInfo = JSON.parse(trainTaskInfo)
+    let modelAcc = JSON.parse(accuracy || '{}')
+    trainTaskInfo = JSON.parse(trainTaskInfo || '{}')
     let engineName = getEngineName(data[0])
-    parameters = JSON.parse(trainTaskInfo.Parameters)
-    parameters = parameters.parameter.length === 0 ? '--':parameters.parameter
+    parameters = JSON.parse(trainTaskInfo.Parameters || '{}')
+    parameters = parameters.parameter && parameters.parameter.length === 0 ? '--':parameters.parameter
     size = tranSize(size) 
     let time = transTime(createdUnix)
     let initObj = {
@@ -400,7 +400,7 @@ function renderInfo(obj,accObj,id){
             if(obj[key]==='--'){
                 $(`#${key}`).text(obj[key])
             }else{
-                const parameterArray = obj[key].map(element => {
+                const parameterArray = (obj[key] || []).map(element => {
                 let labelValue = `${element.label}=${element.value}` 
                 return labelValue
                 });
diff --git a/web_src/vuepages/pages/modelmanage/local/modelmanage-local-create-1.vue b/web_src/vuepages/pages/modelmanage/local/modelmanage-local-create-1.vue
index b63a30278..e5417c094 100644
--- a/web_src/vuepages/pages/modelmanage/local/modelmanage-local-create-1.vue
+++ b/web_src/vuepages/pages/modelmanage/local/modelmanage-local-create-1.vue
@@ -151,7 +151,7 @@ export default {
           const list = window.location.href.split('/');
           list.pop();
           list.push('create_local_model_tmpl2');
-          window.location.href = list.join('/') + '?type=0name=' + this.state.name + '&id=' + res.id;
+          window.location.href = list.join('/') + '?type=0&name=' + this.state.name + '&id=' + res.id;
         } else {
           this.$message({
             type: 'error',
diff --git a/web_src/vuepages/pages/modelmanage/local/modelmanage-local-create-2.vue b/web_src/vuepages/pages/modelmanage/local/modelmanage-local-create-2.vue
index ac7857ad7..95fecd055 100644
--- a/web_src/vuepages/pages/modelmanage/local/modelmanage-local-create-2.vue
+++ b/web_src/vuepages/pages/modelmanage/local/modelmanage-local-create-2.vue
@@ -48,23 +48,17 @@
             <div v-for="(item, index) in uploadFiles" :key="item.upload.uuid" class="datast-upload-progress">
               <span class="dataset-name nowrap" :title="item.name">{{ item.name }}</span>
               <div class="dataset-progress">
-                <el-progress :text-inside="true" :stroke-width="14" :percentage="uploadProgressList[index].progress">
+                <el-progress :text-inside="true" :stroke-width="14" :percentage="uploadStatusList[index].progress">
                 </el-progress>
               </div>
               <div class="dataset-status nowrap">
                 <div class="status-flex">
-                  <i v-if="
-                    uploadProgressList[index].infoCode === 1 ||
-                    uploadProgressList[index].infoCode === 2
-                  " class="ri-close-circle-line failed"></i>
-                  <i v-if="uploadProgressList[index].infoCode === 0" class="ri-checkbox-circle-line success">
-                  </i>
-                  <span>{{ uploadProgressList[index].status }}</span>
-                  <el-tooltip v-if="uploadProgressList[index].infoCode === 1" class="item" effect="dark"
-                    placement="top">
-                    <div slot="content">
-                      {{ uploadProgressList[index].failedInfo }}
-                    </div>
+                  <i v-if="uploadStatusList[index].infoCode === 1 || uploadStatusList[index].infoCode === 2"
+                    class="ri-close-circle-line failed"></i>
+                  <i v-if="uploadStatusList[index].infoCode === 0" class="ri-checkbox-circle-line success"></i>
+                  <span>{{ uploadStatusList[index].status }}</span>
+                  <el-tooltip v-if="uploadStatusList[index].infoCode === 1" class="item" effect="dark" placement="top">
+                    <div slot="content"> {{ uploadStatusList[index].failedInfo }} </div>
                     <i style="font-size: 16px; margin-left: 0.5rem; cursor: pointer" class="ri-question-fill"></i>
                   </el-tooltip>
                 </div>
@@ -79,12 +73,12 @@
 
 <script>
 
-import { getModelInfoByName } from '~/apis/modules/modelmanage';
-import { getChunks, getNewMultipart, getMultipartUrl, setCompleteMultipart } from '~/apis/modules/fileupload';
-import { getUrlSearchParams } from '~/utils';
 import 'dropzone/dist/dropzone.css';
 import Dropzone from 'dropzone';
 import SparkMD5 from "spark-md5";
+import { getModelInfoByName } from '~/apis/modules/modelmanage';
+import { getChunks, getNewMultipart, getMultipartUrl, setCompleteMultipart } from '~/apis/modules/fileupload';
+import { getUrlSearchParams } from '~/utils';
 
 Dropzone.autoDiscover = false;
 
@@ -115,7 +109,8 @@ export default {
 
       uploadFiles: [],
       uploadLength: 0,
-      uploadProgressList: [],
+      uploadSuccessLength: 0,
+      uploadStatusList: [],
 
       uploading: false,
     };
@@ -133,14 +128,14 @@ export default {
         addRemoveLinks: true,
         autoProcessQueue: false,
         dictDefaultMessage: '点击添加文件或直接拖拽文件到此处',
-        dictFileTooBig: 'dictFileTooBig',
+        dictFileTooBig: '文件太大',
         dictRemoveFile: '移除文件',
         dictMaxFilesExceeded: this.defaultErrTxt,
       });
       this.dropzoneHandler.on("addedfile", file => {
         this.checkFiles(file);
       });
-      this.dropzoneHandler.on("removedfile", file => {        
+      this.dropzoneHandler.on("removedfile", file => {
         this.checkFiles();
       });
     },
@@ -168,15 +163,16 @@ export default {
     resetFileStatus() {
       this.uploadFiles = [];
       this.uploadLength = 0;
-      this.uploadProgressList = [];
+      this.uploadSuccessLength = 0;
+      this.uploadStatusList = [];
     },
-    updateProgress(file, status, progress, infoCode, failedInfo = "") { // updateFileStatus
-      this.uploadProgressList.forEach((item, index) => {
+    updateFileStatus(file, status, progress, infoCode, failedInfo = "") {
+      this.uploadStatusList.forEach((item, index) => {
         if (item.uploadUuid === file.upload.uuid) {
-          this.uploadProgressList[index].status = status;
-          this.uploadProgressList[index].progress = progress;
-          this.uploadProgressList[index].infoCode = infoCode;
-          this.uploadProgressList[index].failedInfo = failedInfo;
+          this.uploadStatusList[index].status = status;
+          this.uploadStatusList[index].progress = progress;
+          this.uploadStatusList[index].infoCode = infoCode;
+          this.uploadStatusList[index].failedInfo = failedInfo;
         }
       });
     },
@@ -191,7 +187,7 @@ export default {
         file.totalChunkCounts = 1;
       }
       let currentChunk = 0;
-      this.uploadProgressList.push({
+      this.uploadStatusList.push({
         uploadUuid: file.upload.uuid,
         name: file.name,
         status: '计算文件MD5...',
@@ -265,13 +261,13 @@ export default {
           this.breakpointUpload(file);
         } else {
           this.uploadError(file, info);
-          this.updateProgress(file, "上传失败", 0, 2);
+          this.updateFileStatus(file, "上传失败", 0, 2);
         }
         return file;
       }).catch(err => {
         console.log('getNewMultipart', err);
         this.uploadError(file, info);
-        this.updateProgress(file, "上传失败", 0, 2);
+        this.updateFileStatus(file, "上传失败", 0, 2);
         return err;
       });
     },
@@ -373,22 +369,23 @@ export default {
           fileReader.abort();
           currentChunk++;
           if (currentChunk < chunks) {
-            console.log(`第${currentChunk}个分片上传完成, 开始第${currentChunk + 1}/${chunks}个分片上传`);            
-            this.updateProgress(file, '上传中...', Number(((currentChunk / chunks) * 100).toFixed(2)), 3); 
+            console.log(`第${currentChunk}个分片上传完成, 开始第${currentChunk + 1}/${chunks}个分片上传`);
+            this.updateFileStatus(file, '上传中...', Number(((currentChunk / chunks) * 100).toFixed(2)), 3);
             loadNext();
           } else {
             try {
               await completeUpload();
               console.log(`文件上传完成：${file.name} \n分片：${chunks} 大小:${file.size} 用时：${(new Date().getTime() - time) / 1000} s`);
               this.uploadLength++;
-              this.updateProgress(file, "上传成功", 100, 0);
+              this.uploadSuccessLength++;
+              this.updateFileStatus(file, "上传成功", 100, 0);
               this.uploadSuccess(file);
             } catch (err) {
               const info = "上传失败";
               console.log(info, file)
               this.uploadLength++;
               this.uploadError(file, info);
-              this.updateProgress(file, info, Number(((currentChunk / chunks) * 100).toFixed(2)) - 1, 2);
+              this.updateFileStatus(file, info, Number(((currentChunk / chunks) * 100).toFixed(2)) - 1, 2);
             }
           }
         } catch (err) {
@@ -397,13 +394,13 @@ export default {
           console.log(info, file)
           this.uploadLength++;
           this.uploadError(file, info);
-          this.updateProgress(file, info, Number(((currentChunk / chunks) * 100).toFixed(2)) - 1, 2);
+          this.updateFileStatus(file, info, Number(((currentChunk / chunks) * 100).toFixed(2)) - 1, 2);
         }
       };
       console.log("上传分片...");
       loadNext();
     },
-    uploadError(file, info) {      
+    uploadError(file, info) {
       file.previewTemplate.querySelector('.dz-success-mark').style.opacity = 0;
       file.previewTemplate.querySelector('.dz-error-mark').style.opacity = 1;
       file.previewTemplate.querySelector('.dz-error-message span').innerHTML = info;
@@ -428,8 +425,14 @@ export default {
     uploadFinishCheck(file) {
       console.log('uploadFinishCheck', file, this.uploadLength, '/', this.uploadFiles.length);
       if (this.uploadLength === this.uploadFiles.length) {
-        console.log('All file has finish');
+        console.log('All file has finish, success ' + this.uploadSuccessLength);
         this.uploading = false;
+        if (this.uploadSuccessLength == this.uploadLength) {
+          const list = window.location.href.split('/');
+          list.pop();
+          list.push('show_model_info');
+          window.location.href = list.join('/') + '?name=' + this.state.name;
+        }
       }
     },
     submit() {
@@ -447,7 +450,7 @@ export default {
             if (file.uploadID == '' || file.uuid == '') { // 未上传过
               this.newUpload(file);
             } else if (file.uploaded == '1') { // 已上传成功 秒传
-              if (file.attachID == '0') { // 删除数据集记录，未删除文件                
+              if (file.attachID == '0') { // 删除数据集记录，未删除文件
                 // await addAttachment(file);
                 console.log(`file.attachID == '0'`);
               }
@@ -455,8 +458,8 @@ export default {
               if (file.modelUuid != '' && file.modelName != '' && file.realName != '') {
                 const info = `该文件已上传在模型: ${file.modelName}`;
                 this.uploadLength++;
-                this.uploadError(file, info);                  
-                this.updateProgress(file, "上传失败", 0, 1, info);
+                this.uploadError(file, info);
+                this.updateFileStatus(file, "上传失败", 0, 1, info);
               }
               console.log(file.name, '文件处理完成');
             } else { // 断点续传
@@ -466,13 +469,13 @@ export default {
             console.info('getChunksInfo', err);
             this.uploadLength++;
             this.uploadError(file, "上传失败");
-            this.updateProgress(file, "上传失败", 0, 2);
+            this.updateFileStatus(file, "上传失败", 0, 2);
           });
         }).catch(err => {
           console.info('calcFileMd5', err);
           this.uploadLength++;
           this.uploadError(file, '上传失败');
-          this.updateProgress(file, "上传失败", 0, 2);
+          this.updateFileStatus(file, "上传失败", 0, 2);
         });
       }
     },
@@ -648,8 +651,6 @@ export default {
             margin-right: 5px;
           }
 
-          .txt {}
-
           &.focused {
             border-color: rgb(50, 145, 248);
             color: rgb(50, 145, 248);
@@ -704,31 +705,38 @@ export default {
   font-size: 16px;
   margin-right: 0.5rem;
 }
+
 .failed {
   color: red;
   font-size: 16px;
   margin-right: 0.5rem;
 }
+
 .datast-upload-progress {
   display: flex;
   align-items: center;
 }
+
 .datast-upload-progress .dataset-name {
   text-align: right;
   width: 200px;
   margin-right: 1rem;
 }
+
 .datast-upload-progress .dataset-progress {
   flex: 1;
 }
+
 .datast-upload-progress .dataset-status {
   width: 100px;
   margin-left: 1rem;
 }
+
 .datast-upload-progress .dataset-status .status-flex {
   display: flex;
   align-items: center;
 }
+
 /deep/ .el-progress-bar__inner {
   background-color: #21ba45;
 }

From 25c0c625a217cfcda4f6f0cbb1935f70b0ba685d Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Tue, 8 Nov 2022 09:49:49 +0800
Subject: [PATCH 090/187] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=B9=B4=E5=BA=A6?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=87=86=E5=A4=87=E4=BB=A3=E7=A0=81=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 models/user_business_analysis.go | 68 ++++++++++++++++++++++++--------
 models/user_business_struct.go   | 21 ++++++++++
 2 files changed, 73 insertions(+), 16 deletions(-)

diff --git a/models/user_business_analysis.go b/models/user_business_analysis.go
index e99927e18..bb6084a5b 100644
--- a/models/user_business_analysis.go
+++ b/models/user_business_analysis.go
@@ -519,7 +519,7 @@ func QueryUserStaticDataForUserDefine(opts *UserBusinessAnalysisQueryOptions, wi
 	}
 	CommitDatasetSizeMap, CommitDatasetNumMap := queryDatasetSize(start_unix, end_unix)
 	SolveIssueCountMap := querySolveIssue(start_unix, end_unix)
-	CreateRepoCountMap := queryUserCreateRepo(start_unix, end_unix)
+	CreateRepoCountMap, _, _ := queryUserCreateRepo(start_unix, end_unix)
 	LoginCountMap := queryLoginCount(start_unix, end_unix)
 	OpenIIndexMap := queryUserRepoOpenIIndex(start_unix, end_unix)
 	CloudBrainTaskMap, CloudBrainTaskItemMap := queryCloudBrainTask(start_unix, end_unix)
@@ -770,7 +770,7 @@ func refreshUserStaticTable(wikiCountMap map[string]int, tableName string, pageS
 	//CommitCodeSizeMap := queryCommitCodeSize(StartTimeNextDay.Unix(), EndTimeNextDay.Unix())
 	CommitDatasetSizeMap, CommitDatasetNumMap := queryDatasetSize(start_unix, end_unix)
 	SolveIssueCountMap := querySolveIssue(start_unix, end_unix)
-	CreateRepoCountMap := queryUserCreateRepo(start_unix, end_unix)
+	CreateRepoCountMap, DetailInfoMap, MostDownloadMap := queryUserCreateRepo(start_unix, end_unix)
 	LoginCountMap := queryLoginCount(start_unix, end_unix)
 
 	OpenIIndexMap := queryUserRepoOpenIIndex(startTime.Unix(), end_unix)
@@ -883,6 +883,11 @@ func refreshUserStaticTable(wikiCountMap map[string]int, tableName string, pageS
 					userMetrics["TotalHasActivityUser"] = getMapKeyStringValue("TotalHasActivityUser", userMetrics) + 1
 				}
 			}
+			if tableName == "user_business_analysis_current_year" {
+				//年度数据
+				log.Info(fmt.Sprint(len(DetailInfoMap)))
+				log.Info(fmt.Sprint(len(MostDownloadMap)))
+			}
 		}
 		if len(dateRecordBatch) > 0 {
 			err := insertTable(dateRecordBatch, tableName, statictisSess)
@@ -1015,7 +1020,7 @@ func CounDataByDateAndReCount(wikiCountMap map[string]int, startTime time.Time,
 	}
 	CommitDatasetSizeMap, CommitDatasetNumMap := queryDatasetSize(start_unix, end_unix)
 	SolveIssueCountMap := querySolveIssue(start_unix, end_unix)
-	CreateRepoCountMap := queryUserCreateRepo(start_unix, end_unix)
+	CreateRepoCountMap, _, _ := queryUserCreateRepo(start_unix, end_unix)
 	LoginCountMap := queryLoginCount(start_unix, end_unix)
 	OpenIIndexMap := queryUserRepoOpenIIndex(start_unix, end_unix)
 	CloudBrainTaskMap, CloudBrainTaskItemMap := queryCloudBrainTask(start_unix, end_unix)
@@ -1494,14 +1499,15 @@ func queryCommitAction(start_unix int64, end_unix int64, actionType int64) map[i
 	sess := x.NewSession()
 	defer sess.Close()
 	resultMap := make(map[int64]int)
-
-	cond := "user_id=act_user_id and op_type=" + fmt.Sprint(actionType) + " and created_unix>=" + fmt.Sprint(start_unix) + " and created_unix<=" + fmt.Sprint(end_unix)
+	mostActiveMap := make(map[int64]map[string]int)
+	cond := "user_id=act_user_id  and created_unix>=" + fmt.Sprint(start_unix) + " and created_unix<=" + fmt.Sprint(end_unix)
 
 	count, err := sess.Where(cond).Count(new(Action))
 	if err != nil {
 		log.Info("query action error. return.")
 		return resultMap
 	}
+
 	var indexTotal int64
 	indexTotal = 0
 	for {
@@ -1511,13 +1517,22 @@ func queryCommitAction(start_unix int64, end_unix int64, actionType int64) map[i
 
 		log.Info("query action size=" + fmt.Sprint(len(actionList)))
 		for _, actionRecord := range actionList {
-			if _, ok := resultMap[actionRecord.UserID]; !ok {
-				resultMap[actionRecord.UserID] = 1
+			if int64(actionRecord.OpType) == actionType {
+				if _, ok := resultMap[actionRecord.UserID]; !ok {
+					resultMap[actionRecord.UserID] = 1
+				} else {
+					resultMap[actionRecord.UserID] += 1
+				}
+			}
+			if _, ok := mostActiveMap[actionRecord.UserID]; !ok {
+				mostActiveMap[actionRecord.UserID] = 1
 			} else {
-				resultMap[actionRecord.UserID] += 1
+				key := getDate(actionRecord.CreatedUnix)
+
+				mostActiveMap[actionRecord.UserID][key] = getMapKeyStringValue(key, mostActiveMap[actionRecord.UserID]) + 1
 			}
-		}
 
+		}
 		indexTotal += PAGE_SIZE
 		if indexTotal >= count {
 			break
@@ -1526,6 +1541,9 @@ func queryCommitAction(start_unix int64, end_unix int64, actionType int64) map[i
 
 	return resultMap
 }
+func getDate(createTime timeutil.TimeStamp) string {
+	return ""
+}
 
 func queryCreateIssue(start_unix int64, end_unix int64) map[int64]int {
 
@@ -1961,29 +1979,47 @@ func queryDatasetSize(start_unix int64, end_unix int64) (map[int64]int, map[int6
 	return resultSizeMap, resultNumMap
 }
 
-func queryUserCreateRepo(start_unix int64, end_unix int64) map[int64]int {
+func queryUserCreateRepo(start_unix int64, end_unix int64) (map[int64]int, map[string]int, map[int64]string) {
 	sess := x.NewSession()
 	defer sess.Close()
 	resultMap := make(map[int64]int)
 
+	detailInfoMap := make(map[string]int)
+	mostDownloadMap := make(map[int64]string)
+
 	cond := "is_fork=false and created_unix>=" + fmt.Sprint(start_unix) + " and created_unix<=" + fmt.Sprint(end_unix)
 	count, err := sess.Where(cond).Count(new(Repository))
 	if err != nil {
 		log.Info("query Repository error. return.")
-		return resultMap
+		return resultMap, detailInfoMap, mostDownloadMap
 	}
 	var indexTotal int64
 	indexTotal = 0
 	for {
-		sess.Select("id,owner_id,name").Table("repository").Where(cond).OrderBy("id asc").Limit(PAGE_SIZE, int(indexTotal))
+		sess.Select("id,owner_id,name,is_private,clone_cnt").Table("repository").Where(cond).OrderBy("id asc").Limit(PAGE_SIZE, int(indexTotal))
 		repoList := make([]*Repository, 0)
 		sess.Find(&repoList)
 		log.Info("query Repository size=" + fmt.Sprint(len(repoList)))
 		for _, repoRecord := range repoList {
-			if _, ok := resultMap[repoRecord.OwnerID]; !ok {
-				resultMap[repoRecord.OwnerID] = 1
+			resultMap[repoRecord.OwnerID] = getMapValue(repoRecord.OwnerID, resultMap) + 1
+
+			key := fmt.Sprint(repoRecord.OwnerID) + "_total"
+			detailInfoMap[key] = getMapKeyStringValue(key, detailInfoMap) + 1
+
+			if repoRecord.IsPrivate {
+				key := fmt.Sprint(repoRecord.OwnerID) + "_is_private"
+				detailInfoMap[key] = getMapKeyStringValue(key, detailInfoMap) + 1
 			} else {
-				resultMap[repoRecord.OwnerID] += 1
+				key := fmt.Sprint(repoRecord.OwnerID) + "_is_public"
+				detailInfoMap[key] = getMapKeyStringValue(key, detailInfoMap) + 1
+			}
+			key = fmt.Sprint(repoRecord.OwnerID) + "_total_download"
+			detailInfoMap[key] = getMapKeyStringValue(key, detailInfoMap) + int(repoRecord.CloneCnt)
+
+			key = fmt.Sprint(repoRecord.OwnerID) + "_most_download"
+			if int(repoRecord.CloneCnt) > getMapKeyStringValue(key, detailInfoMap) {
+				detailInfoMap[key] = int(repoRecord.CloneCnt)
+				mostDownloadMap[repoRecord.OwnerID] = repoRecord.DisplayName()
 			}
 		}
 		indexTotal += PAGE_SIZE
@@ -1992,7 +2028,7 @@ func queryUserCreateRepo(start_unix int64, end_unix int64) map[int64]int {
 		}
 	}
 
-	return resultMap
+	return resultMap, detailInfoMap, mostDownloadMap
 }
 
 func queryUserRepoOpenIIndex(start_unix int64, end_unix int64) map[int64]float64 {
diff --git a/models/user_business_struct.go b/models/user_business_struct.go
index fe98be760..4c9037226 100644
--- a/models/user_business_struct.go
+++ b/models/user_business_struct.go
@@ -2,6 +2,27 @@ package models
 
 import "code.gitea.io/gitea/modules/timeutil"
 
+type UserSummaryCurrentYear struct {
+	ID    int64  `xorm:"pk"`
+	Email string `xorm:"NOT NULL"`
+	//user
+	Name  string `xorm:"NOT NULL"`
+	Phone string `xorm:"NULL"`
+	//user
+	RegistDate timeutil.TimeStamp `xorm:"NOT NULL"`
+
+	DateCount      int    `xorm:"NOT NULL DEFAULT 0"`
+	MostActiveDay  string `xorm:" NULL "`        //08.05
+	RepoInfo       string `xorm:"varchar(1000)"` //创建了XX 个项目，公开项目XX 个，私有项目XX 个累计被下载XXX 次，其中《XXXXXXX 》项目，获得了最高XXX 次下载
+	DataSetInfo    string `xorm:"varchar(500)"`  //创建了XX 个数据集，上传了XX 个数据集文件，累计被下载XX 次，被收藏XX 次
+	CodeInfo       string `xorm:"varchar(500)"`  //代码提交次数，提交总代码行数，最晚的提交时间
+	CloudBrainInfo string `xorm:"varchar(1000)"` //，创建了XX 个云脑任务，调试任务XX 个，训练任务XX 个，推理任务XX 个，累计运行了XXXX 卡时，累计节省xxxxx 元
+	//这些免费的算力资源分别有，XX% 来自鹏城云脑1，XX% 来自鹏城云脑2，XX% 来自智算网络
+	PlayARoll string `xorm:"varchar(500)"` //你参加了XX 次“我为开源打榜狂”活动，累计上榜XX 次，总共获得了社区XXX 元的激励
+
+	Label string `xorm:"varchar(500)"`
+}
+
 type UserBusinessAnalysisCurrentYear struct {
 	ID        int64 `xorm:"pk"`
 	CountDate int64 `xorm:"pk"`

From eee4c303b4f7c366a56e4625680e0313d0734283 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Tue, 8 Nov 2022 09:50:11 +0800
Subject: [PATCH 091/187] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 models/user_business_analysis.go | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/models/user_business_analysis.go b/models/user_business_analysis.go
index bb6084a5b..3130da905 100644
--- a/models/user_business_analysis.go
+++ b/models/user_business_analysis.go
@@ -1524,14 +1524,14 @@ func queryCommitAction(start_unix int64, end_unix int64, actionType int64) map[i
 					resultMap[actionRecord.UserID] += 1
 				}
 			}
+			key := getDate(actionRecord.CreatedUnix)
 			if _, ok := mostActiveMap[actionRecord.UserID]; !ok {
-				mostActiveMap[actionRecord.UserID] = 1
+				tmpMap := make(map[string]int)
+				tmpMap[key] = 1
+				mostActiveMap[actionRecord.UserID] = tmpMap
 			} else {
-				key := getDate(actionRecord.CreatedUnix)
-
 				mostActiveMap[actionRecord.UserID][key] = getMapKeyStringValue(key, mostActiveMap[actionRecord.UserID]) + 1
 			}
-
 		}
 		indexTotal += PAGE_SIZE
 		if indexTotal >= count {
@@ -1542,7 +1542,7 @@ func queryCommitAction(start_unix int64, end_unix int64, actionType int64) map[i
 	return resultMap
 }
 func getDate(createTime timeutil.TimeStamp) string {
-	return ""
+	return createTime.Format("2006-01-02")
 }
 
 func queryCreateIssue(start_unix int64, end_unix int64) map[int64]int {

From c77fba413845fd1b8e074416c072e44c72dfb9d6 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Tue, 8 Nov 2022 10:08:11 +0800
Subject: [PATCH 092/187] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E6=94=B9Bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/repo/ai_model_manage.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/routers/repo/ai_model_manage.go b/routers/repo/ai_model_manage.go
index 0cac858ed..a5496117d 100644
--- a/routers/repo/ai_model_manage.go
+++ b/routers/repo/ai_model_manage.go
@@ -220,10 +220,10 @@ func SaveLocalModel(ctx *context.Context) {
 	modelActualPath := ""
 	if taskType == models.TypeCloudBrainOne {
 		destKeyNamePrefix := Model_prefix + models.AttachmentRelativePath(id) + "/"
-		modelActualPath = setting.Bucket + "/" + destKeyNamePrefix
+		modelActualPath = setting.Attachment.Minio.Bucket + "/" + destKeyNamePrefix
 	} else if taskType == models.TypeCloudBrainTwo {
 		destKeyNamePrefix := Model_prefix + models.AttachmentRelativePath(id) + "/"
-		modelActualPath = setting.Attachment.Minio.Bucket + "/" + destKeyNamePrefix
+		modelActualPath = setting.Bucket + "/" + destKeyNamePrefix
 	} else {
 		re["msg"] = "type is error."
 		ctx.JSON(200, re)

From 8d3070a3796df331cadc607f8a0cbeef7b1db003 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Tue, 8 Nov 2022 10:18:08 +0800
Subject: [PATCH 093/187] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E6=94=B9Bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/repo/ai_model_manage.go | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/routers/repo/ai_model_manage.go b/routers/repo/ai_model_manage.go
index a5496117d..4a9705d58 100644
--- a/routers/repo/ai_model_manage.go
+++ b/routers/repo/ai_model_manage.go
@@ -307,8 +307,8 @@ func UpdateModelSize(modeluuid string) {
 	model, err := models.QueryModelById(modeluuid)
 	if err == nil {
 		if model.Type == models.TypeCloudBrainOne {
-			if strings.HasPrefix(model.Path, setting.Bucket+"/"+Model_prefix) {
-				files, err := storage.GetAllObjectByBucketAndPrefixMinio(setting.Bucket, model.Path[len(setting.Bucket)+1:])
+			if strings.HasPrefix(model.Path, setting.Attachment.Minio.Bucket+"/"+Model_prefix) {
+				files, err := storage.GetAllObjectByBucketAndPrefixMinio(setting.Attachment.Minio.Bucket, model.Path[len(setting.Attachment.Minio.Bucket)+1:])
 				if err != nil {
 					log.Info("Failed to query model size from minio. id=" + modeluuid)
 				}
@@ -325,6 +325,8 @@ func UpdateModelSize(modeluuid string) {
 				models.ModifyModelSize(modeluuid, size)
 			}
 		}
+	} else {
+		log.Info("not found model,uuid=" + modeluuid)
 	}
 }
 

From c961c837dac74aa64ee71f1a9c92f9282675b5cc Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Tue, 8 Nov 2022 10:28:11 +0800
Subject: [PATCH 094/187] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=EF=BC=8C=E5=88=A0=E9=99=A4=E6=A8=A1=E5=9E=8B=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/repo/ai_model_manage.go | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/routers/repo/ai_model_manage.go b/routers/repo/ai_model_manage.go
index 4a9705d58..c1d9490c6 100644
--- a/routers/repo/ai_model_manage.go
+++ b/routers/repo/ai_model_manage.go
@@ -458,16 +458,19 @@ func deleteModelByID(ctx *context.Context, id string) error {
 		return errors.New(ctx.Tr("repo.model_noright"))
 	}
 	if err == nil {
-		log.Info("bucket=" + setting.Bucket + " path=" + model.Path)
+
 		if model.Type == models.TypeCloudBrainOne {
-			if strings.HasPrefix(model.Path, setting.Bucket+"/"+Model_prefix) {
-				err := storage.Attachments.DeleteDir(model.Path[len(setting.Bucket)+1:])
+			bucketName := setting.Attachment.Minio.Bucket
+			log.Info("bucket=" + bucketName + " path=" + model.Path)
+			if strings.HasPrefix(model.Path, bucketName+"/"+Model_prefix) {
+				err := storage.Attachments.DeleteDir(model.Path[len(bucketName)+1:])
 				if err != nil {
 					log.Info("Failed to delete model. id=" + id)
 					return err
 				}
 			}
 		} else if model.Type == models.TypeCloudBrainTwo {
+			log.Info("bucket=" + setting.Bucket + " path=" + model.Path)
 			if strings.HasPrefix(model.Path, setting.Bucket+"/"+Model_prefix) {
 				err := storage.ObsRemoveObject(setting.Bucket, model.Path[len(setting.Bucket)+1:])
 				if err != nil {

From 1bd99e190c4f8b572f56532172fa37ffee1abdaf Mon Sep 17 00:00:00 2001
From: chenshihai <chenshh@pcl.ac.cn>
Date: Tue, 8 Nov 2022 10:54:17 +0800
Subject: [PATCH 095/187] model manage

---
 .../repo/modelmanage/create_local_1.tmpl      |  2 -
 .../repo/modelmanage/create_local_2.tmpl      |  2 -
 web_src/vuepages/apis/modules/fileupload.js   | 50 ----------------
 web_src/vuepages/apis/modules/modelmanage.js  | 60 +++++++++++++++++++
 web_src/vuepages/const/index.js               |  3 +
 .../local/modelmanage-local-create-1.vue      | 10 +---
 .../local/modelmanage-local-create-2.vue      |  4 +-
 web_src/vuepages/utils/index.js               |  2 +-
 8 files changed, 69 insertions(+), 64 deletions(-)
 delete mode 100644 web_src/vuepages/apis/modules/fileupload.js

diff --git a/templates/repo/modelmanage/create_local_1.tmpl b/templates/repo/modelmanage/create_local_1.tmpl
index 5d017c256..965221335 100644
--- a/templates/repo/modelmanage/create_local_1.tmpl
+++ b/templates/repo/modelmanage/create_local_1.tmpl
@@ -1,7 +1,5 @@
 {{template "base/head" .}}
 <link rel="stylesheet" href="{{StaticUrlPrefix}}/css/vp-modelmanage-local-create-1.css?v={{MD5 AppVer}}" />
-<style></style>
-{{$repository := .Repository.ID}}
 <div class="repository release dataset-list view">
     {{template "repo/header" .}}
     <div class="ui container">
diff --git a/templates/repo/modelmanage/create_local_2.tmpl b/templates/repo/modelmanage/create_local_2.tmpl
index 575b64a6d..6510f5498 100644
--- a/templates/repo/modelmanage/create_local_2.tmpl
+++ b/templates/repo/modelmanage/create_local_2.tmpl
@@ -1,7 +1,5 @@
 {{template "base/head" .}}
 <link rel="stylesheet" href="{{StaticUrlPrefix}}/css/vp-modelmanage-local-create-2.css?v={{MD5 AppVer}}" />
-<style></style>
-{{$repository := .Repository.ID}}
 <div class="repository release dataset-list view">
     {{template "repo/header" .}}
     <div class="ui container">
diff --git a/web_src/vuepages/apis/modules/fileupload.js b/web_src/vuepages/apis/modules/fileupload.js
deleted file mode 100644
index 31a0fa565..000000000
--- a/web_src/vuepages/apis/modules/fileupload.js
+++ /dev/null
@@ -1,50 +0,0 @@
-import service from "../service";
-import Qs from 'qs';
-
-// 上传文件1: 获取文件chunks信息
-// params: { md5, type: 0-CPU/GPU,1-NPU, file_name, scene: ''-数据集,'model'-模型 }
-// return: uploadID, uuid, uploaded, chunks, attachID, datasetID(), datasetName(), fileName
-export const getChunks = (params) => {
-  return service({
-    url: `/attachments/get_chunks`,
-    method: 'get',
-    params,
-    data: {},
-  });
-};
-
-// 上传文件2: 上传新文件
-// params: { totalChunkCounts, md5, size, fileType, type, file_name, scene=model, modeluuid=xxxx }
-// return: uploadID, uuid
-export const getNewMultipart = (params) => {
-  return service({
-    url: `/attachments/new_multipart`,
-    method: 'get',
-    params,
-    data: {},
-  });
-};
-
-// 上传文件3: 获取分片上传地址
-// params: { uuid, uploadID, size, chunkNumber, type, file_name, scene=model }
-// return: url
-export const getMultipartUrl = (params) => {
-  return service({
-    url: `/attachments/get_multipart_url`,
-    method: 'get',
-    params,
-    data: {},
-  });
-};
-
-// 上传文件4: 完成上传后
-// data: { uuid, uploadID, size, type, file_name, dataset_id, description, scene=model, modeluuid=xxxx }
-export const setCompleteMultipart = (data) => {
-  return service({
-    url: `/attachments/complete_multipart`,
-    method: 'post',
-    headers: { 'Content-type': 'application/x-www-form-urlencoded' },
-    params: {},
-    data: Qs.stringify(data),
-  });
-};
diff --git a/web_src/vuepages/apis/modules/modelmanage.js b/web_src/vuepages/apis/modules/modelmanage.js
index c025d0554..5ca069728 100644
--- a/web_src/vuepages/apis/modules/modelmanage.js
+++ b/web_src/vuepages/apis/modules/modelmanage.js
@@ -33,3 +33,63 @@ export const getModelInfoByName = (params) => {
     data: {},
   });
 };
+
+// 求模型中文件列表
+// params {repo, ID, parentDir}
+export const getModelFiles = (params) => {
+  return service({
+    url: `${params.repo}/modelmanage/query_onelevel_modelfile`,
+    method: 'get',
+    params,
+    data: {},
+  });
+};
+
+/* 文件上传相关 */
+// 上传文件1: 获取文件chunks信息
+// params: { md5, type: 0-CPU/GPU,1-NPU, file_name, scene: 'model', modeluuid }
+// return: uploadID, uuid, uploaded, chunks, attachID, modeluuid, modelName, fileName
+export const getChunks = (params) => {
+  return service({
+    url: `/attachments/get_chunks`,
+    method: 'get',
+    params,
+    data: {},
+  });
+};
+
+// 上传文件2: 上传新文件
+// params: { totalChunkCounts, md5, size, fileType, type, file_name, scene=model, modeluuid=xxxx }
+// return: uploadID, uuid
+export const getNewMultipart = (params) => {
+  return service({
+    url: `/attachments/new_multipart`,
+    method: 'get',
+    params,
+    data: {},
+  });
+};
+
+// 上传文件3: 获取分片上传地址
+// params: { uuid, uploadID, size, chunkNumber, type, file_name, scene=model }
+// return: url
+export const getMultipartUrl = (params) => {
+  return service({
+    url: `/attachments/get_multipart_url`,
+    method: 'get',
+    params,
+    data: {},
+  });
+};
+
+// 上传文件4: 完成上传后
+// data: { uuid, uploadID, size, type, file_name, dataset_id, description, scene=model, modeluuid=xxxx }
+export const setCompleteMultipart = (data) => {
+  return service({
+    url: `/attachments/complete_multipart`,
+    method: 'post',
+    headers: { 'Content-type': 'application/x-www-form-urlencoded' },
+    params: {},
+    data: Qs.stringify(data),
+  });
+};
diff --git a/web_src/vuepages/const/index.js b/web_src/vuepages/const/index.js
index 4051dbb17..7ca6326f0 100644
--- a/web_src/vuepages/const/index.js
+++ b/web_src/vuepages/const/index.js
@@ -14,3 +14,6 @@ export const AI_CENTER = [{ k: 'OpenIOne', v: i18n.t('resourcesManagement.OpenIO
 export const COMPUTER_RESOURCES = [{ k: 'GPU', v: 'GPU' }, { k: 'NPU', v: 'NPU' }, { k: 'MLU', v: 'MLU' }];
 export const ACC_CARD_TYPE = [{ k: 'T4', v: 'T4' }, { k: 'A100', v: 'A100' }, { k: 'V100', v: 'V100' }, { k: 'ASCEND910', v: 'Ascend 910' }, { k: 'MLU270', v: 'MLU270' }, { k: 'RTX3080', v: 'RTX3080' }];
 export const SPECIFICATION_STATUS = [{ k: '1', v: i18n.t('resourcesManagement.willOnShelf') }, { k: '2', v: i18n.t('resourcesManagement.onShelf') }, { k: '3', v: i18n.t('resourcesManagement.offShelf') }];
+
+// 模型
+export const MODEL_ENGINES = [{ k: '0', v: 'PyTorch' }, { k: '1', v: 'TensorFlow' }, { k: '2', v: 'MindSpore' }, { k: '4', v: 'PaddlePaddle' }, { k: '5', v: 'OneFlow' }, { k: '6', v: 'MXNet' }, { k: '3', v: 'Other' }];
diff --git a/web_src/vuepages/pages/modelmanage/local/modelmanage-local-create-1.vue b/web_src/vuepages/pages/modelmanage/local/modelmanage-local-create-1.vue
index e5417c094..2a1895c16 100644
--- a/web_src/vuepages/pages/modelmanage/local/modelmanage-local-create-1.vue
+++ b/web_src/vuepages/pages/modelmanage/local/modelmanage-local-create-1.vue
@@ -104,9 +104,8 @@
 <script>
 
 import { saveLocalModel, getModelInfoByName, modifyModel } from '~/apis/modules/modelmanage';
-// import { CLUSTERS, COMPUTER_RESOURCES, ACC_CARD_TYPE } from '~/const';
 import { getUrlSearchParams } from '~/utils';
-// import { formatDate } from 'element-ui/lib/utils/date-util';
+import { MODEL_ENGINES } from '~/const'
 
 const REPO_NAME = location.pathname.split('/')[2];
 
@@ -123,13 +122,12 @@ export default {
         label: '',
         description: '',
       },
-      engineList: [{ k: '0', v: 'PyTorch' }, { k: '1', v: 'TensorFlow' }, { k: '2', v: 'MindSpore' }, { k: '4', v: 'PaddlePaddle' }, { k: '5', v: 'OneFlow' }, { k: '6', v: 'MXNet' }, { k: '3', v: 'Other' }],
+      engineList: MODEL_ENGINES,
     };
   },
-  components: { /*QueueDialog*/ },
+  components: {},
   methods: {
     submit() {
-      console.log(this.state);
       if (!this.state.name) {
         this.$message({
           type: 'info',
@@ -327,8 +325,6 @@ export default {
             margin-right: 5px;
           }
 
-          .txt {}
-
           &.focused {
             border-color: rgb(50, 145, 248);
             color: rgb(50, 145, 248);
diff --git a/web_src/vuepages/pages/modelmanage/local/modelmanage-local-create-2.vue b/web_src/vuepages/pages/modelmanage/local/modelmanage-local-create-2.vue
index 95fecd055..98a5fd58e 100644
--- a/web_src/vuepages/pages/modelmanage/local/modelmanage-local-create-2.vue
+++ b/web_src/vuepages/pages/modelmanage/local/modelmanage-local-create-2.vue
@@ -76,8 +76,7 @@
 import 'dropzone/dist/dropzone.css';
 import Dropzone from 'dropzone';
 import SparkMD5 from "spark-md5";
-import { getModelInfoByName } from '~/apis/modules/modelmanage';
-import { getChunks, getNewMultipart, getMultipartUrl, setCompleteMultipart } from '~/apis/modules/fileupload';
+import { getModelInfoByName, getChunks, getNewMultipart, getMultipartUrl, setCompleteMultipart } from '~/apis/modules/modelmanage';
 import { getUrlSearchParams } from '~/utils';
 
 Dropzone.autoDiscover = false;
@@ -224,6 +223,7 @@ export default {
       return getChunks({
         md5: file.uniqueIdentifier,
         type: this.state.type,
+        modeluuid: this.state.id,
         file_name: file.name,
         scene: 'model',
       }).then(res => {
diff --git a/web_src/vuepages/utils/index.js b/web_src/vuepages/utils/index.js
index bec5a084e..8a8604eca 100644
--- a/web_src/vuepages/utils/index.js
+++ b/web_src/vuepages/utils/index.js
@@ -3,7 +3,7 @@ export const getListValueWithKey = (list, key, k = 'k', v = 'v') => {
     const listI = list[i];
     if (listI[k] === key) return listI[v];
   }
-  return '';
+  return key;
 };
 
 export const getUrlSearchParams = () => {

From 667633835d4ef735416453da38b16d84b56de52e Mon Sep 17 00:00:00 2001
From: chenyifan01 <cyf_uestc@outlook.com>
Date: Tue, 8 Nov 2022 11:08:23 +0800
Subject: [PATCH 096/187] #3168 update

---
 routers/admin/resources.go | 20 ++++++++++++++++++++
 routers/routes/routes.go   |  1 +
 2 files changed, 21 insertions(+)

diff --git a/routers/admin/resources.go b/routers/admin/resources.go
index 20638553b..f6689acd4 100644
--- a/routers/admin/resources.go
+++ b/routers/admin/resources.go
@@ -136,6 +136,26 @@ func GetResourceSpecificationList(ctx *context.Context) {
 	ctx.JSON(http.StatusOK, response.SuccessWithData(list))
 }
 
+func GetAllResourceSpecificationList(ctx *context.Context) {
+	queue := ctx.QueryInt64("queue")
+	status := ctx.QueryInt("status")
+	cluster := ctx.Query("cluster")
+	available := ctx.QueryInt("available")
+	list, err := resource.GetResourceSpecificationList(models.SearchResourceSpecificationOptions{
+		ListOptions:   models.ListOptions{Page: 1, PageSize: 1000},
+		QueueId:       queue,
+		Status:        status,
+		Cluster:       cluster,
+		AvailableCode: available,
+	})
+	if err != nil {
+		log.Error("GetResourceSpecificationList error.%v", err)
+		ctx.JSON(http.StatusOK, response.ServerError(err.Error()))
+		return
+	}
+	ctx.JSON(http.StatusOK, response.SuccessWithData(list))
+}
+
 func GetResourceSpecificationScenes(ctx *context.Context) {
 	specId := ctx.ParamsInt64(":id")
 	list, err := resource.GetResourceSpecificationScenes(specId)
diff --git a/routers/routes/routes.go b/routers/routes/routes.go
index 322f746f4..b121f69de 100755
--- a/routers/routes/routes.go
+++ b/routers/routes/routes.go
@@ -645,6 +645,7 @@ func RegisterRoutes(m *macaron.Macaron) {
 			m.Group("/specification", func() {
 				m.Get("", admin.GetSpecificationPage)
 				m.Get("/list", admin.GetResourceSpecificationList)
+				m.Get("/list/all", admin.GetAllResourceSpecificationList)
 				m.Get("/scenes/:id", admin.GetResourceSpecificationScenes)
 				m.Post("/grampus/sync", admin.SyncGrampusSpecs)
 				m.Post("/add", binding.Bind(models.ResourceSpecificationReq{}), admin.AddResourceSpecification)

From 26567e319f8959d06f613b1b02f60a735571dad6 Mon Sep 17 00:00:00 2001
From: chenshihai <chenshh@pcl.ac.cn>
Date: Tue, 8 Nov 2022 11:30:47 +0800
Subject: [PATCH 097/187] =?UTF-8?q?#3168=20=E8=B5=84=E6=BA=90=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E6=96=B0=E5=BB=BA=E5=BA=94=E7=94=A8=E5=9C=BA=E6=99=AF?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E9=80=89=E5=85=A8=E9=83=A8=E8=B5=84=E6=BA=90?=
 =?UTF-8?q?=E6=B1=A0=E9=98=9F=E5=88=97=E6=97=B6=E5=BA=94=E5=8C=85=E5=90=AB?=
 =?UTF-8?q?=E6=89=80=E6=9C=89=E8=B5=84=E6=BA=90=E8=A7=84=E6=A0=BC=E4=B8=94?=
 =?UTF-8?q?=E4=B8=8D=E9=87=8D=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web_src/vuepages/apis/modules/resources.js          | 13 +++++++++++++
 .../pages/resources/components/SceneDialog.vue      |  6 +++---
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/web_src/vuepages/apis/modules/resources.js b/web_src/vuepages/apis/modules/resources.js
index 32a87c53f..965d5ae04 100644
--- a/web_src/vuepages/apis/modules/resources.js
+++ b/web_src/vuepages/apis/modules/resources.js
@@ -110,6 +110,19 @@ export const getResSpecificationList = (params) => {
   });
 }
 
+// 查询资源规格列表(所有)
+// cluster 所属集群 ：OpenI 启智集群，C2Net 智算集群
+// queue 所属队列id
+// status 状态 ： 1 待审核 2已上架 3已下架
+export const getResSpecificationListAll = (params) => {
+  return service({
+    url: '/admin/resources/specification/list/all',
+    method: 'get',
+    params,
+    data: {},
+  });
+}
+
 // 同步智算网络资源池（队列）
 export const syncResSpecification = () => {
   return service({
diff --git a/web_src/vuepages/pages/resources/components/SceneDialog.vue b/web_src/vuepages/pages/resources/components/SceneDialog.vue
index cadfb1db1..fed3f8db0 100644
--- a/web_src/vuepages/pages/resources/components/SceneDialog.vue
+++ b/web_src/vuepages/pages/resources/components/SceneDialog.vue
@@ -89,7 +89,7 @@
 </template>
 <script>
 import BaseDialog from '~/components/BaseDialog.vue';
-import { getResQueueCode, getResSpecificationList, addResScene, updateResScene } from '~/apis/modules/resources';
+import { getResQueueCode, getResSpecificationListAll, addResScene, updateResScene } from '~/apis/modules/resources';
 import { JOB_TYPE, CLUSTERS, ACC_CARD_TYPE, SPECIFICATION_STATUS } from '~/const';
 import { getListValueWithKey } from '~/utils';
 
@@ -170,9 +170,9 @@ export default {
         cluster: this.dataInfo.Cluster,
         queue: this.dataInfo.QueueId === '-1' ? '' : this.dataInfo.QueueId,
         // status: 2,
-        page: 1,
+        // page: 1,
       };
-      return getResSpecificationList(params).then(res => {
+      return getResSpecificationListAll(params).then(res => {
         res = res.data;
         if (res.Code === 0) {
           const list = res.Data.List;

From 5b978311f2e8bc3b0fdd6bc4c03cf7a6d0234144 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Tue, 8 Nov 2022 11:46:05 +0800
Subject: [PATCH 098/187] =?UTF-8?q?=E6=A8=A1=E5=9E=8B=E5=85=81=E8=AE=B8?=
 =?UTF-8?q?=E9=87=8D=E5=A4=8D=E4=B8=8A=E4=BC=A0=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 modules/storage/minio_ext.go | 17 ++++++++++++
 modules/storage/obs.go       |  6 ++--
 routers/repo/attachment.go   | 54 +++++++++++++++++++++++++++---------
 3 files changed, 61 insertions(+), 16 deletions(-)

diff --git a/modules/storage/minio_ext.go b/modules/storage/minio_ext.go
index 69151b11e..d4a8abba5 100755
--- a/modules/storage/minio_ext.go
+++ b/modules/storage/minio_ext.go
@@ -267,6 +267,23 @@ func MinioCopyFiles(bucketName string, srcPath string, destPath string, Files []
 	return fileTotalSize, nil
 }
 
+func MinioCopyAFile(srcBucketName, srcObjectName, destBucketName, destObjectName string) (int64, error) {
+	_, core, err := getClients()
+	var fileTotalSize int64
+	fileTotalSize = 0
+	if err != nil {
+		log.Error("getClients failed:", err.Error())
+		return fileTotalSize, err
+	}
+	meta, err := core.StatObject(srcBucketName, srcObjectName, miniov6.StatObjectOptions{})
+	if err != nil {
+		log.Info("Get file error:" + err.Error())
+	}
+	core.CopyObject(srcBucketName, srcObjectName, destBucketName, destObjectName, meta.UserMetadata)
+	fileTotalSize = meta.Size
+	return fileTotalSize, nil
+}
+
 func MinioPathCopy(bucketName string, srcPath string, destPath string) (int64, error) {
 	_, core, err := getClients()
 	var fileTotalSize int64
diff --git a/modules/storage/obs.go b/modules/storage/obs.go
index affdfc475..83b03ed44 100755
--- a/modules/storage/obs.go
+++ b/modules/storage/obs.go
@@ -294,7 +294,7 @@ func ObsCopyManyFile(srcBucket string, srcPath string, destBucket string, destPa
 			log.Info("Get File error, error=" + err.Error())
 			continue
 		}
-		obsCopyFile(srcBucket, srcKey, destBucket, destKey)
+		ObsCopyFile(srcBucket, srcKey, destBucket, destKey)
 		fileTotalSize += out.ContentLength
 	}
 
@@ -318,7 +318,7 @@ func ObsCopyAllFile(srcBucket string, srcPath string, destBucket string, destPat
 			index++
 			for _, val := range output.Contents {
 				destKey := destPath + val.Key[length:]
-				obsCopyFile(srcBucket, val.Key, destBucket, destKey)
+				ObsCopyFile(srcBucket, val.Key, destBucket, destKey)
 				fileTotalSize += val.Size
 			}
 			if output.IsTruncated {
@@ -337,7 +337,7 @@ func ObsCopyAllFile(srcBucket string, srcPath string, destBucket string, destPat
 	return fileTotalSize, nil
 }
 
-func obsCopyFile(srcBucket string, srcKeyName string, destBucket string, destKeyName string) error {
+func ObsCopyFile(srcBucket string, srcKeyName string, destBucket string, destKeyName string) error {
 	input := &obs.CopyObjectInput{}
 	input.Bucket = destBucket
 	input.Key = destKeyName
diff --git a/routers/repo/attachment.go b/routers/repo/attachment.go
index 271183e65..b65b6cfce 100755
--- a/routers/repo/attachment.go
+++ b/routers/repo/attachment.go
@@ -551,6 +551,7 @@ func GetSuccessChunks(ctx *context.Context) {
 	typeCloudBrain := ctx.QueryInt("type")
 	fileName := ctx.Query("file_name")
 	scene := ctx.Query("scene")
+	modeluuid := ctx.Query("modeluuid")
 	log.Info("scene=" + scene)
 	var chunks string
 
@@ -664,24 +665,47 @@ func GetSuccessChunks(ctx *context.Context) {
 	}
 	if scene == Attachment_model {
 		//使用description存储模型信息
-		modeluuid := attach.Description
+		dbmodeluuid := attach.Description
 		modelname := ""
-		if modeluuid != "" {
-			model, err := models.QueryModelById(modeluuid)
+		if dbmodeluuid != modeluuid {
+			model, err := models.QueryModelById(dbmodeluuid)
+			if err == nil {
+				modelname = model.Name
+			}
+			//copy
+			srcObjectName := fileChunk.ObjectName
+			destObjectName := getObjectName(fileName, modeluuid)
+			if typeCloudBrain == models.TypeCloudBrainOne {
+				bucketName := setting.Attachment.Minio.Bucket
+				storage.MinioCopyAFile(bucketName, srcObjectName, bucketName, destObjectName)
+			} else {
+				bucketName := setting.Bucket
+				storage.ObsCopyFile(bucketName, srcObjectName, bucketName, destObjectName)
+			}
+			ctx.JSON(200, map[string]string{
+				"uuid":     fileChunk.UUID,
+				"uploaded": strconv.Itoa(fileChunk.IsUploaded),
+				"uploadID": fileChunk.UploadID,
+				"chunks":   string(chunks),
+				"attachID": strconv.Itoa(int(attachID)),
+				"fileName": attach.Name,
+			})
+		} else {
+			model, err := models.QueryModelById(dbmodeluuid)
 			if err == nil {
 				modelname = model.Name
 			}
+			ctx.JSON(200, map[string]string{
+				"uuid":      fileChunk.UUID,
+				"uploaded":  strconv.Itoa(fileChunk.IsUploaded),
+				"uploadID":  fileChunk.UploadID,
+				"chunks":    string(chunks),
+				"attachID":  strconv.Itoa(int(attachID)),
+				"modeluuid": dbmodeluuid,
+				"fileName":  attach.Name,
+				"modelName": modelname,
+			})
 		}
-		ctx.JSON(200, map[string]string{
-			"uuid":      fileChunk.UUID,
-			"uploaded":  strconv.Itoa(fileChunk.IsUploaded),
-			"uploadID":  fileChunk.UploadID,
-			"chunks":    string(chunks),
-			"attachID":  strconv.Itoa(int(attachID)),
-			"modeluuid": modeluuid,
-			"fileName":  attach.Name,
-			"modelName": modelname,
-		})
 	} else {
 		dataset, err := models.GetDatasetByID(attach.DatasetID)
 		if err != nil {
@@ -702,6 +726,10 @@ func GetSuccessChunks(ctx *context.Context) {
 	}
 }
 
+func getObjectName(filename string, modeluuid string) string {
+	return strings.TrimPrefix(path.Join(Model_prefix, path.Join(modeluuid[0:1], modeluuid[1:2], modeluuid, filename)), "/")
+}
+
 func getMinioInitObjectName(scene string, uuid, modeluuid string, filename string) string {
 	if scene == Attachment_model {
 		return strings.TrimPrefix(path.Join(Model_prefix, path.Join(modeluuid[0:1], modeluuid[1:2], modeluuid, filename)), "/")

From f829bd5f800b37be1f7c707c5f070c6152f0d665 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Tue, 8 Nov 2022 14:21:39 +0800
Subject: [PATCH 099/187] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/repo/attachment.go | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/routers/repo/attachment.go b/routers/repo/attachment.go
index b65b6cfce..de1869f1f 100755
--- a/routers/repo/attachment.go
+++ b/routers/repo/attachment.go
@@ -682,6 +682,7 @@ func GetSuccessChunks(ctx *context.Context) {
 				bucketName := setting.Bucket
 				storage.ObsCopyFile(bucketName, srcObjectName, bucketName, destObjectName)
 			}
+			UpdateModelSize(modeluuid)
 			ctx.JSON(200, map[string]string{
 				"uuid":     fileChunk.UUID,
 				"uploaded": strconv.Itoa(fileChunk.IsUploaded),
@@ -690,6 +691,7 @@ func GetSuccessChunks(ctx *context.Context) {
 				"attachID": strconv.Itoa(int(attachID)),
 				"fileName": attach.Name,
 			})
+			return
 		} else {
 			model, err := models.QueryModelById(dbmodeluuid)
 			if err == nil {
@@ -705,6 +707,7 @@ func GetSuccessChunks(ctx *context.Context) {
 				"fileName":  attach.Name,
 				"modelName": modelname,
 			})
+			return
 		}
 	} else {
 		dataset, err := models.GetDatasetByID(attach.DatasetID)

From 901d8ffc043477ff125bd2bfe1c27bb430d9c3ca Mon Sep 17 00:00:00 2001
From: chenshihai <chenshh@pcl.ac.cn>
Date: Tue, 8 Nov 2022 14:37:32 +0800
Subject: [PATCH 100/187] model manage

---
 .../modelmanage/local/modelmanage-local-create-2.vue   | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/web_src/vuepages/pages/modelmanage/local/modelmanage-local-create-2.vue b/web_src/vuepages/pages/modelmanage/local/modelmanage-local-create-2.vue
index 98a5fd58e..8227b7b11 100644
--- a/web_src/vuepages/pages/modelmanage/local/modelmanage-local-create-2.vue
+++ b/web_src/vuepages/pages/modelmanage/local/modelmanage-local-create-2.vue
@@ -449,17 +449,21 @@ export default {
           this.getChunksInfo(file).then(res => { // 获取Chunk信息
             if (file.uploadID == '' || file.uuid == '') { // 未上传过
               this.newUpload(file);
-            } else if (file.uploaded == '1') { // 已上传成功 秒传
+            } else if (file.uploaded == '1') { // 已上传成功 
               if (file.attachID == '0') { // 删除数据集记录，未删除文件
                 // await addAttachment(file);
                 console.log(`file.attachID == '0'`);
               }
+              this.uploadLength++;
               // 同一模型上传同一个文件
-              if (file.modelUuid != '' && file.modelName != '' && file.realName != '') {
+              if (file.modelUuid != '') {
                 const info = `该文件已上传在模型: ${file.modelName}`;
-                this.uploadLength++;
                 this.uploadError(file, info);
                 this.updateFileStatus(file, "上传失败", 0, 1, info);
+              } else { // 秒传
+                this.uploadSuccessLength++;
+                this.updateFileStatus(file, "上传成功", 100, 0);
+                this.uploadSuccess(file);
               }
               console.log(file.name, '文件处理完成');
             } else { // 断点续传

From cf4b8e06f84e643f05b2972e99a9438d19911458 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Tue, 8 Nov 2022 15:06:12 +0800
Subject: [PATCH 101/187] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E6=A8=A1=E5=9E=8B=E6=96=87=E4=BB=B6=E6=8E=A5=E5=8F=A3=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/repo/ai_model_manage.go | 47 ++++++++++++++++++++++++++++++++-
 1 file changed, 46 insertions(+), 1 deletion(-)

diff --git a/routers/repo/ai_model_manage.go b/routers/repo/ai_model_manage.go
index c1d9490c6..7ef9045f5 100644
--- a/routers/repo/ai_model_manage.go
+++ b/routers/repo/ai_model_manage.go
@@ -247,7 +247,7 @@ func SaveLocalModel(ctx *context.Context) {
 	model := &models.AiModelManage{
 		ID:            id,
 		Version:       version,
-		ModelType:     1,
+		ModelType:     MODEL_LOCAL_TYPE,
 		VersionCount:  len(aimodels) + 1,
 		Label:         label,
 		Name:          name,
@@ -433,6 +433,51 @@ func downloadModelFromCloudBrainOne(modelUUID string, jobName string, parentDir
 		return "", 0, nil
 	}
 }
+func DeleteModelFile(ctx *context.Context) {
+	log.Info("delete model start.")
+	id := ctx.Query("id")
+	fileName := ctx.Query("fileName")
+	model, err := models.QueryModelById(id)
+	if err == nil {
+		if model.ModelType == MODEL_LOCAL_TYPE {
+			if model.Type == models.TypeCloudBrainOne {
+				bucketName := setting.Attachment.Minio.Bucket
+				log.Info("bucket=" + bucketName + " path=" + model.Path[len(bucketName)+1:] + fileName)
+				if strings.HasPrefix(model.Path, bucketName+"/"+Model_prefix) {
+					err := storage.Attachments.DeleteDir(model.Path[len(bucketName)+1:] + fileName)
+					if err != nil {
+						log.Info("Failed to delete model. id=" + id)
+					} else {
+						re := map[string]string{
+							"code": "-1",
+						}
+						re["msg"] = err.Error()
+						ctx.JSON(200, re)
+						return
+					}
+				}
+			} else if model.Type == models.TypeCloudBrainTwo {
+				log.Info("bucket=" + setting.Bucket + " path=" + model.Path[len(setting.Bucket)+1:] + fileName)
+				if strings.HasPrefix(model.Path, setting.Bucket+"/"+Model_prefix) {
+					err := storage.ObsRemoveObject(setting.Bucket, model.Path[len(setting.Bucket)+1:]+fileName)
+					if err != nil {
+						log.Info("Failed to delete model. id=" + id)
+					} else {
+						re := map[string]string{
+							"code": "-1",
+						}
+						re["msg"] = err.Error()
+						ctx.JSON(200, re)
+						return
+					}
+				}
+			}
+		}
+	}
+	ctx.JSON(200, map[string]string{
+		"code": "0",
+	})
+}
 
 func DeleteModel(ctx *context.Context) {
 	log.Info("delete model start.")

From 55d88691fc92e01b50d9295662dbfa14464fa55f Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Tue, 8 Nov 2022 15:14:36 +0800
Subject: [PATCH 102/187] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E6=A8=A1=E5=9E=8B=E6=96=87=E4=BB=B6=E6=8E=A5=E5=8F=A3=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/repo/ai_model_manage.go | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/routers/repo/ai_model_manage.go b/routers/repo/ai_model_manage.go
index 7ef9045f5..a71203b40 100644
--- a/routers/repo/ai_model_manage.go
+++ b/routers/repo/ai_model_manage.go
@@ -447,13 +447,14 @@ func DeleteModelFile(ctx *context.Context) {
 					err := storage.Attachments.DeleteDir(model.Path[len(bucketName)+1:] + fileName)
 					if err != nil {
 						log.Info("Failed to delete model. id=" + id)
-					} else {
 						re := map[string]string{
 							"code": "-1",
 						}
 						re["msg"] = err.Error()
 						ctx.JSON(200, re)
 						return
+					} else {
+						UpdateModelSize(id)
 					}
 				}
 			} else if model.Type == models.TypeCloudBrainTwo {
@@ -462,13 +463,14 @@ func DeleteModelFile(ctx *context.Context) {
 					err := storage.ObsRemoveObject(setting.Bucket, model.Path[len(setting.Bucket)+1:]+fileName)
 					if err != nil {
 						log.Info("Failed to delete model. id=" + id)
-					} else {
 						re := map[string]string{
 							"code": "-1",
 						}
 						re["msg"] = err.Error()
 						ctx.JSON(200, re)
 						return
+					} else {
+						UpdateModelSize(id)
 					}
 				}
 			}

From 04b054ef1f7be2276c505e5aa0111feee8b4cfdd Mon Sep 17 00:00:00 2001
From: chenyifan01 <cyf_uestc@outlook.com>
Date: Tue, 8 Nov 2022 15:38:49 +0800
Subject: [PATCH 103/187] #3168 update

---
 routers/routes/routes.go | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/routers/routes/routes.go b/routers/routes/routes.go
index b121f69de..9d19d6c5e 100755
--- a/routers/routes/routes.go
+++ b/routers/routes/routes.go
@@ -1488,6 +1488,12 @@ func RegisterRoutes(m *macaron.Macaron) {
 		m.Get("/record/list", point.GetPointRecordList)
 	}, reqSignIn)
 
+	m.Group("/resources", func() {
+		m.Group("/queue", func() {
+			m.Get("/centers", admin.GetResourceAiCenters)
+		})
+	})
+
 	if setting.API.EnableSwagger {
 		m.Get("/swagger.v1.json", templates.JSONRenderer(), routers.SwaggerV1Json)
 	}

From 8dcb33ff280112f888185aefc329de79c1d44f64 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Tue, 8 Nov 2022 16:56:57 +0800
Subject: [PATCH 104/187] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E6=A8=A1=E5=9E=8B=E6=96=87=E4=BB=B6=E6=8E=A5=E5=8F=A3=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/routes/routes.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/routers/routes/routes.go b/routers/routes/routes.go
index 4270245cd..48fedadc9 100755
--- a/routers/routes/routes.go
+++ b/routers/routes/routes.go
@@ -1236,6 +1236,7 @@ func RegisterRoutes(m *macaron.Macaron) {
 			m.Get("/create_local_model_tmpl2", repo.CreateLocalModelForUpload)
 			m.Get("/create_online_model_tmpl", repo.CreateOnlineModel)
 			m.Post("/create_local_model", repo.SaveLocalModel)
+			m.Delete("/delete_model_file", repo.DeleteModelFile)
 
 			m.Post("/create_model", repo.SaveModel)
 			m.Post("/create_model_convert", reqWechatBind, reqRepoModelManageWriter, repo.SaveModelConvert)

From 5f7aeee50812507af4efa4b3faca8f1df7e0570d Mon Sep 17 00:00:00 2001
From: liuzx <liuzx@pcl.ac.cn>
Date: Tue, 8 Nov 2022 17:15:41 +0800
Subject: [PATCH 105/187] fix-3173

---
 routers/repo/grampus.go | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/routers/repo/grampus.go b/routers/repo/grampus.go
index 0620350f6..bd10d167a 100755
--- a/routers/repo/grampus.go
+++ b/routers/repo/grampus.go
@@ -1,7 +1,6 @@
 package repo
 
 import (
-	"code.gitea.io/gitea/modules/urfs_client/urchin"
 	"encoding/json"
 	"errors"
 	"fmt"
@@ -13,6 +12,8 @@ import (
 	"strings"
 	"time"
 
+	"code.gitea.io/gitea/modules/urfs_client/urchin"
+
 	"code.gitea.io/gitea/services/cloudbrain/cloudbrainTask"
 
 	"code.gitea.io/gitea/modules/dataset"
@@ -863,10 +864,10 @@ func GrampusTrainJobShow(ctx *context.Context) {
 						}
 					}
 				}
-				err = models.UpdateJob(task)
-				if err != nil {
-					log.Error("UpdateJob failed:" + err.Error())
-				}
+			}
+			err = models.UpdateJob(task)
+			if err != nil {
+				log.Error("UpdateJob failed:" + err.Error())
 			}
 		}
 	}

From c2568fea41bb351b395158b2584305e3ac7261b4 Mon Sep 17 00:00:00 2001
From: chenyifan01 <cyf_uestc@outlook.com>
Date: Tue, 8 Nov 2022 17:39:10 +0800
Subject: [PATCH 106/187] #3168 fix bug

---
 routers/admin/resources.go                    |  4 +-
 .../resource/resource_specification.go        | 40 ++++++++++++++++++-
 2 files changed, 41 insertions(+), 3 deletions(-)

diff --git a/routers/admin/resources.go b/routers/admin/resources.go
index f6689acd4..026c37e52 100644
--- a/routers/admin/resources.go
+++ b/routers/admin/resources.go
@@ -141,8 +141,7 @@ func GetAllResourceSpecificationList(ctx *context.Context) {
 	status := ctx.QueryInt("status")
 	cluster := ctx.Query("cluster")
 	available := ctx.QueryInt("available")
-	list, err := resource.GetResourceSpecificationList(models.SearchResourceSpecificationOptions{
-		ListOptions:   models.ListOptions{Page: 1, PageSize: 1000},
+	list, err := resource.GetAllDistinctResourceSpecification(models.SearchResourceSpecificationOptions{
 		QueueId:       queue,
 		Status:        status,
 		Cluster:       cluster,
@@ -153,6 +152,7 @@ func GetAllResourceSpecificationList(ctx *context.Context) {
 		ctx.JSON(http.StatusOK, response.ServerError(err.Error()))
 		return
 	}
+
 	ctx.JSON(http.StatusOK, response.SuccessWithData(list))
 }
 
diff --git a/services/cloudbrain/resource/resource_specification.go b/services/cloudbrain/resource/resource_specification.go
index c3c75419f..d23fd3aad 100644
--- a/services/cloudbrain/resource/resource_specification.go
+++ b/services/cloudbrain/resource/resource_specification.go
@@ -130,10 +130,48 @@ func GetResourceSpecificationList(opts models.SearchResourceSpecificationOptions
 	if err != nil {
 		return nil, err
 	}
-
 	return models.NewResourceSpecAndQueueListRes(n, r), nil
 }
 
+//GetAllDistinctResourceSpecification returns specification and queue after distinct
+//totalSize is always 0 here
+func GetAllDistinctResourceSpecification(opts models.SearchResourceSpecificationOptions) (*models.ResourceSpecAndQueueListRes, error) {
+	opts.Page = 0
+	opts.PageSize = 1000
+	_, r, err := models.SearchResourceSpecification(opts)
+	if err != nil {
+		return nil, err
+	}
+	nr := distinctResourceSpecAndQueue(r)
+	return models.NewResourceSpecAndQueueListRes(0, nr), nil
+}
+
+func distinctResourceSpecAndQueue(r []models.ResourceSpecAndQueue) []models.ResourceSpecAndQueue {
+	specs := make([]models.ResourceSpecAndQueue, 0, len(r))
+	sourceSpecIdMap := make(map[string]models.ResourceSpecAndQueue, 0)
+	for i := 0; i < len(r); i++ {
+		spec := r[i]
+		if spec.SourceSpecId == "" {
+			specs = append(specs, spec)
+			continue
+		}
+		if _, has := sourceSpecIdMap[spec.SourceSpecId]; has {
+			//prefer to use on-shelf spec
+			if sourceSpecIdMap[spec.SourceSpecId].Status != spec.Status && spec.Status == models.SpecOnShelf {
+				for k, v := range specs {
+					if v.ResourceSpecification.ID == sourceSpecIdMap[spec.SourceSpecId].ResourceSpecification.ID {
+						specs[k] = spec
+					}
+				}
+			}
+			continue
+		}
+		specs = append(specs, spec)
+		sourceSpecIdMap[spec.SourceSpecId] = spec
+	}
+	return specs
+}
+
 func GetResourceSpecificationScenes(specId int64) ([]models.ResourceSceneBriefRes, error) {
 	r, err := models.GetSpecScenes(specId)
 	if err != nil {

From 39aca553f7497ef072fa0e51be472fdbad5c518f Mon Sep 17 00:00:00 2001
From: liuzx <liuzx@pcl.ac.cn>
Date: Tue, 8 Nov 2022 18:03:48 +0800
Subject: [PATCH 107/187] fix-3173

---
 models/cloudbrain.go        |  7 +++++++
 routers/private/internal.go |  4 +++-
 routers/repo/cloudbrain.go  |  3 ++-
 routers/repo/grampus.go     | 36 ++++++++++++++++++++++++++++++++++++
 4 files changed, 48 insertions(+), 2 deletions(-)

diff --git a/models/cloudbrain.go b/models/cloudbrain.go
index dacb1b03a..a9182b7b8 100755
--- a/models/cloudbrain.go
+++ b/models/cloudbrain.go
@@ -2030,6 +2030,13 @@ func GetStoppedJobWithNoStartTimeEndTime() ([]*Cloudbrain, error) {
 	cloudbrains := make([]*Cloudbrain, 0)
 	return cloudbrains, x.SQL("select * from cloudbrain where status in (?,?,?,?,?,?,?) and (start_time is null or end_time is null) limit 100", ModelArtsTrainJobCompleted, ModelArtsTrainJobFailed, ModelArtsTrainJobKilled, ModelArtsStopped, JobStopped, JobFailed, JobSucceeded).Find(&cloudbrains)
 }
+func GetC2NetWithAiCenterWrongJob() ([]*Cloudbrain, error) {
+	cloudbrains := make([]*Cloudbrain, 0)
+	return cloudbrains, x.
+		In("status", ModelArtsTrainJobFailed, ModelArtsTrainJobKilled, ModelArtsStopped, JobStopped, JobFailed).
+		Where("type = 2 ").
+		Find(&cloudbrains)
+}
 
 func GetModelSafetyTestTask() ([]*Cloudbrain, error) {
 	cloudbrains := make([]*Cloudbrain, 0)
diff --git a/routers/private/internal.go b/routers/private/internal.go
index 3e2eeab31..3d67afe8f 100755
--- a/routers/private/internal.go
+++ b/routers/private/internal.go
@@ -6,9 +6,10 @@
 package private
 
 import (
-	"code.gitea.io/gitea/routers/admin"
 	"strings"
 
+	"code.gitea.io/gitea/routers/admin"
+
 	"code.gitea.io/gitea/routers/repo"
 
 	"code.gitea.io/gitea/modules/log"
@@ -52,6 +53,7 @@ func RegisterRoutes(m *macaron.Macaron) {
 		m.Get("/tool/org_stat", OrgStatisticManually)
 		m.Post("/tool/update_repo_visit/:date", UpdateRepoVisit)
 		m.Post("/task/history_handle/duration", repo.HandleTaskWithNoDuration)
+		m.Post("/task/history_handle/aicenter", repo.HandleTaskWithAiCenter)
 		m.Post("/resources/specification/handle_historical_task", admin.RefreshHistorySpec)
 
 	}, CheckInternalToken)
diff --git a/routers/repo/cloudbrain.go b/routers/repo/cloudbrain.go
index 61c2925b8..7d96d1b58 100755
--- a/routers/repo/cloudbrain.go
+++ b/routers/repo/cloudbrain.go
@@ -2,7 +2,6 @@ package repo
 
 import (
 	"bufio"
-	"code.gitea.io/gitea/modules/urfs_client/urchin"
 	"encoding/json"
 	"errors"
 	"fmt"
@@ -16,6 +15,8 @@ import (
 	"time"
 	"unicode/utf8"
 
+	"code.gitea.io/gitea/modules/urfs_client/urchin"
+
 	"code.gitea.io/gitea/modules/dataset"
 
 	"code.gitea.io/gitea/services/cloudbrain/cloudbrainTask"
diff --git a/routers/repo/grampus.go b/routers/repo/grampus.go
index bd10d167a..ae4ad8a76 100755
--- a/routers/repo/grampus.go
+++ b/routers/repo/grampus.go
@@ -13,6 +13,7 @@ import (
 	"time"
 
 	"code.gitea.io/gitea/modules/urfs_client/urchin"
+	"code.gitea.io/gitea/routers/response"
 
 	"code.gitea.io/gitea/services/cloudbrain/cloudbrainTask"
 
@@ -1103,3 +1104,38 @@ func downloadZipCode(ctx *context.Context, codePath, branchName string) error {
 
 	return nil
 }
+func HandleTaskWithAiCenter(ctx *context.Context) {
+	log.Info("HandleTaskWithAiCenter start")
+	updateCounts := 0
+	cloudBrains, err := models.GetC2NetWithAiCenterWrongJob()
+	if err != nil {
+		log.Error("GetC2NetWithAiCenterWrongJob failed:" + err.Error())
+		return
+	}
+	if len(cloudBrains) == 0 {
+		log.Info("HandleC2NetWithAiCenterWrongJob:no task need handle")
+		return
+	}
+	cloudBrainCounts := len(cloudBrains)
+	for _, task := range cloudBrains {
+		result, err := grampus.GetJob(task.JobID)
+		if err != nil {
+			log.Error("GetJob failed:" + err.Error())
+			continue
+		}
+		if result != nil {
+			if len(result.JobInfo.Tasks[0].CenterID) == 1 && len(result.JobInfo.Tasks[0].CenterName) == 1 {
+				task.AiCenter = result.JobInfo.Tasks[0].CenterID[0] + "+" + result.JobInfo.Tasks[0].CenterName[0]
+			}
+			err = models.UpdateJob(task)
+			if err != nil {
+				log.Error("UpdateJob failed:" + err.Error())
+			}
+			updateCounts++
+		}
+	}
+	r := make(map[string]interface{}, 0)
+	r["cloudBrainCounts"] = cloudBrainCounts
+	r["updateCounts"] = updateCounts
+	ctx.JSON(http.StatusOK, response.SuccessWithData(r))
+}

From d3093501df42643be0f670d807108abc7afb89f8 Mon Sep 17 00:00:00 2001
From: chenyifan01 <cyf_uestc@outlook.com>
Date: Tue, 8 Nov 2022 18:04:17 +0800
Subject: [PATCH 108/187] #3163 fix bug

---
 models/resource_queue.go                       | 3 +++
 services/cloudbrain/resource/resource_queue.go | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/models/resource_queue.go b/models/resource_queue.go
index fc0dd8cb5..1f00a8759 100644
--- a/models/resource_queue.go
+++ b/models/resource_queue.go
@@ -143,6 +143,9 @@ func InsertResourceQueue(queue ResourceQueue) (int64, error) {
 func UpdateResourceQueueById(queueId int64, queue ResourceQueue) (int64, error) {
 	return x.ID(queueId).Update(&queue)
 }
+func UpdateResourceCardsTotalNum(queueId int64, queue ResourceQueue) (int64, error) {
+	return x.ID(queueId).Cols("cards_total_num", "remark").Update(&queue)
+}
 
 func SearchResourceQueue(opts SearchResourceQueueOptions) (int64, []ResourceQueue, error) {
 	var cond = builder.NewCond()
diff --git a/services/cloudbrain/resource/resource_queue.go b/services/cloudbrain/resource/resource_queue.go
index 2798a2b11..4e2dac8de 100644
--- a/services/cloudbrain/resource/resource_queue.go
+++ b/services/cloudbrain/resource/resource_queue.go
@@ -16,7 +16,7 @@ func AddResourceQueue(req models.ResourceQueueReq) error {
 }
 
 func UpdateResourceQueue(queueId int64, req models.ResourceQueueReq) error {
-	if _, err := models.UpdateResourceQueueById(queueId, models.ResourceQueue{
+	if _, err := models.UpdateResourceCardsTotalNum(queueId, models.ResourceQueue{
 		CardsTotalNum: req.CardsTotalNum,
 		Remark:        req.Remark,
 	}); err != nil {

From b94db568c7f6fe44012e111e6519182cfd97400c Mon Sep 17 00:00:00 2001
From: chenshihai <chenshh@pcl.ac.cn>
Date: Tue, 8 Nov 2022 18:06:59 +0800
Subject: [PATCH 109/187] model manage

---
 templates/repo/modelmanage/showinfo.tmpl      | 533 +-----------------
 web_src/vuepages/apis/modules/modelmanage.js  |  11 +
 .../common/modelmanage-common-detail.vue      | 482 ++++++++++++++++
 .../common/vp-modelmanage-common-detail.js    |  17 +
 .../local/modelmanage-local-create-2.vue      |  12 +-
 web_src/vuepages/utils/index.js               |  11 +
 6 files changed, 533 insertions(+), 533 deletions(-)
 create mode 100644 web_src/vuepages/pages/modelmanage/common/modelmanage-common-detail.vue
 create mode 100644 web_src/vuepages/pages/modelmanage/common/vp-modelmanage-common-detail.js

diff --git a/templates/repo/modelmanage/showinfo.tmpl b/templates/repo/modelmanage/showinfo.tmpl
index 4fdf007ed..1b153bb45 100644
--- a/templates/repo/modelmanage/showinfo.tmpl
+++ b/templates/repo/modelmanage/showinfo.tmpl
@@ -1,533 +1,10 @@
 {{template "base/head" .}}
-<div class="repository">
+<link rel="stylesheet" href="{{StaticUrlPrefix}}/css/vp-modelmanage-common-detail.css?v={{MD5 AppVer}}" />
+<div class="repository release dataset-list view">
     {{template "repo/header" .}}
-    <style>
-    .model_header_text{
-        font-size: 14px;
-        color: #101010;
-        font-weight: bold;
-    }
-    .ti_form{
-        text-align: left;
-        max-width: 100%;
-        vertical-align: middle;
-    }
-    .ti-text-form-label {
-        padding-bottom: 20px;
-        padding-right: 20px;
-        color: #8a8e99;
-        font-size: 14px;
-        white-space: nowrap !important;
-        width: 80px;
-        line-height: 30px;
-    }
-    .ti-text-form-content {
-        line-height: 30px;
-        padding-bottom: 20px;
-        width: 100%;
-    }
-    .change-version{
-        min-width: auto !important;
-        border: 1px solid rgba(187, 187, 187, 100) !important;
-        border-radius: .38571429rem !important;
-        margin-left: 1.5em;
-    }
-    .title-word-elipsis{
-        overflow: hidden;
-        text-overflow: ellipsis;
-        white-space: nowrap;
-        width: 30%;
-    }
-    .word-elipsis{
-        overflow: hidden;
-        text-overflow: ellipsis;
-        white-space: nowrap;
-        padding-right: 80px;
-    }
-    .half-table{
-        width: 50%;
-        float: left;
-    }
-    .text-width80 {
-    width: 100px;
-    line-height: 30px;
-    }
-    .tableStyle{
-        width:100%;
-        table-layout: fixed;
-    }
-    .iword-elipsis{
-        display: inline-block;
-        width: 80%;
-        overflow: hidden;
-        text-overflow: ellipsis;
-        white-space: nowrap;
-    }
-    </style>
     <div class="ui container">
-        <h4 class="ui header" id="vertical-segment">
-                <!-- <a href="javascript:window.history.back();"><i class="arrow left icon"></i>返回</a> -->
-            <div class="ui breadcrumb">
-                <a class="section" href="{{$.RepoLink}}/modelmanage/show_model">
-                    {{$.i18n.Tr "repo.model.manage.model_manage"}}
-                </a>
-                <div class="divider"> / </div>
-                <div class="active section">{{.name}}</div>
-            </div>
-            <select class="ui dropdown tiny change-version" id="dropdown" onchange="changeInfo(this.value)">
-            </select>
-        </h4>
-        <div id="showInfo" style="border:1px solid #e2e2e2;padding: 20px 60px;margin-top:24px">
-            <div class="ui pointing secondary menu" style="border-bottom: 1px solid rgba(34,36,38,.15);">
-                
-                <a class="active item" data-tab="first">{{$.i18n.Tr "repo.modelarts.train_job.config"}}</a>
-                
-                <a class="item" data-tab="second">{{$.i18n.Tr "repo.model_download"}}</a>
-            </div>
-            <div class="ui tab active" data-tab="first">
-                <div class="half-table">
-                    <span class="model_header_text">{{$.i18n.Tr "repo.model.manage.baseinfo"}}</span>
-                    <table class="tableStyle" style="margin-top:20px;">
-                        <tbody>
-                            <tr>
-                                <td class="ti-text-form-label text-width80">{{$.i18n.Tr "repo.model.manage.model_name"}}</td>
-                                <td class="ti-text-form-content word-elipsis"><span id="modelName" title=""></span></td>
-                            </tr>
-                            <tr>
-                                <td class="ti-text-form-label text-width80">{{$.i18n.Tr "repo.model.manage.version"}}</td>
-                                <td class="ti-text-form-content word-elipsis"><span id="version" title=""></span></td>
-                            </tr>
-                            <tr>
-                                <td class="ti-text-form-label text-width80">{{$.i18n.Tr "repo.migrate_items_labels"}}</td>
-                                <td class="ti-text-form-content">
-                                    <div id="label" style="overflow: hidden;width: 95%;">
-                                        
-                                    </div>
-                                    
-    
-                                </td>
-                            </tr>
-                            <tr>
-                                <td class="ti-text-form-label text-width80">{{$.i18n.Tr "repo.modelarts.model_size"}}</td>
-                                <td class="ti-text-form-content word-elipsis"><span id="size" title=""></span></td>
-                            </tr>
-                            <tr>
-                                <td class="ti-text-form-label text-width80">{{$.i18n.Tr "repo.modelarts.createtime"}}</td>
-                                <td class="ti-text-form-content word-elipsis"><span id="createTime" title=""></span></td>
-                            </tr>
-                            <tr>
-                                <td class="ti-text-form-label text-width80">{{$.i18n.Tr "repo.model.manage.description"}}</td>
-                                <td class="ti-text-form-content" >
-                                    <div id="edit-td" style="display:flex">
-                                        <span id="description" title="" class="iword-elipsis"></span>
-                                        <i id="edit-pencil" data-id="" data-desc="" class="pencil alternate icon" style="cursor:pointer;vertical-align: top;" id="editor" onclick="editorFn(this)"></i>
-                                    </div>
-                                </td>
-                            </tr>
-                            <tr>
-                                <td class="ti-text-form-label text-width80">{{$.i18n.Tr "repo.modelarts.train_job"}}</td>
-                                <td class="ti-text-form-content word-elipsis">
-                                  <a id="displayJobNameHref" class="title" style="font-size: 14px;" target="_blank">
-                                        <span id="displayJobName" class="fitted" style="width: 90%;vertical-align: middle;"></span>
-                                  </a>
-                                </td>
-                            </tr>
-                            <tr>
-                                <td class="ti-text-form-label text-width80">{{$.i18n.Tr "repo.modelarts.code_version"}}</td>
-                                <td class="ti-text-form-content word-elipsis"><span id="codeBranch" title=""></span></td>
-                            </tr>
-                            <tr>
-                                <td class="ti-text-form-label text-width80">{{$.i18n.Tr "repo.modelarts.train_job.start_file"}}</td>
-                                <td class="ti-text-form-content word-elipsis"><span id="bootFile" title=""></span></td>
-                            </tr>
-                            <tr>
-                                <td class="ti-text-form-label text-width80">{{$.i18n.Tr "repo.modelarts.train_job.train_dataset"}}</td>
-                                <td class="ti-text-form-content word-elipsis"><span id="datasetName" title=""></span></td>
-                            </tr>
-                            <tr>
-                                <td class="ti-text-form-label text-width80">{{$.i18n.Tr "repo.modelarts.train_job.run_parameter"}}</td>
-                                <td class="ti-text-form-content word-elipsis"><span id="parameters" title=""></span></td>
-                            </tr>
-                            <tr>
-                                <td class="ti-text-form-label text-width80">{{$.i18n.Tr "repo.modelarts.train_job.AI_Engine"}}</td>
-                                <td class="ti-text-form-content word-elipsis"><span id="engineName" title=""></span></td>
-                            </tr>
-                            <tr>
-                                <td class="ti-text-form-label text-width80">{{$.i18n.Tr "repo.modelarts.train_job.standard"}}</td>
-                                <td class="ti-text-form-content word-elipsis"><span id="flavorName" title=""></span></td>
-                            </tr>
-                            <tr>
-                                <td class="ti-text-form-label text-width80">{{$.i18n.Tr "repo.modelarts.train_job.compute_node"}}</td>
-                                <td class="ti-text-form-content word-elipsis"><span id="workServerNumber" title=""></span></td>
-                            </tr>
-                        </tbody>
-                    </table>
-                </div>
-                <div class="half-table">
-                    <span class="model_header_text">{{$.i18n.Tr "repo.model.manage.model_accuracy"}}</span>
-                    <table class="tableStyle" style="margin-top:20px;">
-                        <tbody>
-                            <tr>
-                                <td class="ti-text-form-label text-width80">{{$.i18n.Tr "repo.model.manage.Accuracy"}}</td>
-                                <td class="ti-text-form-content word-elipsis"><span id="Accuracy" title=""></span></td>
-                            </tr>
-                            <tr>
-                                <td class="ti-text-form-label text-width80">F1</td>
-                                <td class="ti-text-form-content word-elipsis"><span id="F1" title=""></span></td>
-                            </tr>
-                            <tr>
-                                <td class="ti-text-form-label text-width80">{{$.i18n.Tr "repo.model.manage.Precision"}}</td>
-                                <td class="ti-text-form-content word-elipsis"><span id="Precision" title=""></span></td>
-                            </tr>
-                            <tr>
-                                <td class="ti-text-form-label text-width80">{{$.i18n.Tr "repo.model.manage.Recall"}}</td>
-                                <td class="ti-text-form-content word-elipsis"><span id="Recall" title=""></span></td>
-                            </tr>
-                        </tbody>
-                    </table>
-                </div>
-                <div style="clear: both;"></div>
-            </div>
-            <div class="ui tab" data-tab="second">
-                <input type="hidden" name="model" value="-1">
-                <input type="hidden" name="modelback" value="-1">
-                <div class='ui breadcrumb model_file_bread' id='file_breadcrumb'>
-                    <div class="active section"></div>
-                    <div class="divider"> / </div>
-                </div>
-                <div id="dir_list">
-                    
-                </div>
-            </div>
-        </div>
-    </div>
+        <div id="__vue-root"></div>
+    </div>    
 </div>
+<script src="{{StaticUrlPrefix}}/js/vp-modelmanage-common-detail.js?v={{MD5 AppVer}}"></script>
 {{template "base/footer" .}}
-<script>
-let url = location.href.split('show_model')[0]
-let trainJobUrl =url.split('modelmanage')[0]
-let ID = location.search.split('?name=').pop()
-$(document).ready(function(){
-    $('.secondary.menu .item').tab();
-});
-$(document).ready(loadInfo);
-function changeInfo(version){
-    $.get(`${url}show_model_info_api?name=${ID}`,(data)=>{
-        let versionData = data.filter((item)=>{
-            return item.version === version
-        })
-        let returnArray = []
-        returnArray = transObj(versionData)
-        let [initObj,initModelAcc,id] = returnArray
-        editorCancel('','')
-        renderInfo(initObj,initModelAcc,id)
-        loadModelFile(versionData[0].id,versionData[0].version,'','','init')
-    })
-}
-function loadInfo(){
-    $.get(`${url}show_model_info_api?name=${ID}`,(data)=>{
-        let html = ''
-        for (let i=0;i<data.length;i++){
-            if(!data[i].isCanOper){
-                $("#edit-pencil").css("display","none")
-            }
-            html += `<option value="${data[i].version}">${data[i].version}</option>`
-        }
-        $('#dropdown').append(html)
-        let returnArray = []
-        returnArray = transObj(data)
-        let [initObj,initModelAcc,id] = returnArray
-        renderInfo(initObj,initModelAcc,id)
-        loadModelFile(data[0].id,data[0].version,'','','init')
-    })
-}
- function getEngineName(model){
-        if(model.engine == 0){
-            return "PyTorch";
-        }else  if(model.engine == 1 || model.engine == 121 || model.engine == 38){
-            return "TensorFlow";
-        }else  if(model.engine == 2 || model.engine == 122 || model.engine == 35 || model.engine == 37){
-            return "MindSpore";
-        }else  if(model.engine == 3){
-            return "Other";
-        }else  if(model.engine == 4){
-            return "PaddlePaddle";
-        }else  if(model.engine == 5){
-            return "OneFlow";
-        }else  if(model.engine == 6){
-            return "MXNet";
-        }
-        else{
-            return "Other"
-        }
-}
-function transObj(data){
-    let {id,name,version,label,size,description,createdUnix,accuracy,codeBranch,codeCommitID,trainTaskInfo} = data[0]
-    let modelAcc = JSON.parse(accuracy || '{}')
-    trainTaskInfo = JSON.parse(trainTaskInfo || '{}')
-    let engineName = getEngineName(data[0])
-    parameters = JSON.parse(trainTaskInfo.Parameters || '{}')
-    parameters = parameters.parameter && parameters.parameter.length === 0 ? '--':parameters.parameter
-    size = tranSize(size) 
-    let time = transTime(createdUnix)
-    let initObj = {
-        modelName:name || '--',
-        version:version,
-        label:label || '--',
-        size:size,
-        createTime:time,
-        description:description || '--',
-        codeBranch:codeBranch || '--',
-        codeCommitID:codeCommitID || '--',
-        bootFile:trainTaskInfo.BootFile || '--',
-        datasetName:trainTaskInfo.DatasetName || '--',
-        parameters:trainTaskInfo.Parameters || '--',
-        flavorName:trainTaskInfo.FlavorName || '--',
-        workServerNumber:trainTaskInfo.WorkServerNumber || '--',
-        parameters:parameters,
-        engineName:engineName,
-        displayJobName:trainTaskInfo.DisplayJobName || '--',
-        trainJobVersionName:trainTaskInfo.VersionName || '',
-        cloudBrainJobID:trainTaskInfo.JobID|| '',
-        cloudBrainType:trainTaskInfo.Type,
-    }
-    let initModelAcc = {
-        Accuracy: modelAcc.Accuracy || '--',
-        F1: modelAcc.F1 || '--',
-        Precision:modelAcc.Precision || '--',
-        Recall: modelAcc.Recall || '--'
-    }
-    return [initObj,initModelAcc,id]
-        
-}
-function transTime(time){
-    let date = new Date(time * 1000);//时间戳为10位需*1000，时间戳为13位的话不需乘1000
-    let Y = date.getFullYear() + '-';
-    let M = (date.getMonth()+1 < 10 ? '0'+(date.getMonth()+1):date.getMonth()+1) + '-';
-    let D = (date.getDate()< 10 ? '0'+date.getDate():date.getDate())+ ' ';
-    let h = (date.getHours() < 10 ? '0'+date.getHours():date.getHours())+ ':';
-    let m = (date.getMinutes() < 10 ? '0'+date.getMinutes():date.getMinutes()) + ':';
-    let s = date.getSeconds() < 10 ? '0'+date.getSeconds():date.getSeconds();
-    return Y+M+D+h+m+s;
-}
-function tranSize(value){
-    if(null==value||value==''){
-        return "0 Bytes";
-    }
-    var unitArr = new Array("Bytes","KB","MB","GB","TB","PB","EB","ZB","YB");
-    var index=0;
-    var srcsize = parseFloat(value);
-    index=Math.floor(Math.log(srcsize)/Math.log(1024));
-    var size =srcsize/Math.pow(1024,index);
-    size=size.toFixed(2);//保留的小数位数
-    return size+unitArr[index];
-}
-function editorFn(context){
-    let id= context.dataset.id
-    let text = context.dataset.desc
-    let textValue = text.replace(/enter;/g,'\r\n')
-    $('#edit-td').replaceWith(`<div id='edit-div' style='width:80%;display: inline-block;'><textarea id='textarea-value' value='' rows='3' maxlength='255' style='width:80%;white-space: nowrap;' id='edit-text'>${textValue}</textarea><i class='check icon' style='color: #50d4ab;' onclick='editorSure("${text}","${id}")'></i><i class='times icon' style='color: #f66f6a;' onclick='editorCancel("${text}","${id}")'></i></div>`);
-}
-function editorCancel(text,id){
-    let objkey = text.replace(/enter;/g,'\r\n')
-    $('#edit-div').replaceWith(`<div id="edit-td" style="display:flex;"><span id="Description" title="${objkey}" class="iword-elipsis">${objkey}</span><i id="edit-pencil" data-id="${id}" data-desc="${text}" class="pencil alternate icon" style="cursor:pointer;vertical-align: top;" id="editor" onclick="editorFn(this)"></div>`)
-}
-function editorSure(text,id){
-    let description=$('#textarea-value').val()
-    let sourcetext = $('#textarea-value').val().replace(/\n/g,'enter;')
-    let data = {
-        id:id,
-        description:description
-    }
-    $.ajax({
-        url:`${url}modify_model`,
-        type:'PUT',
-        data:data
-    }).done((res)=>{
-        $('#edit-div').replaceWith(`<div id="edit-td" style="display:flex;"><span id="Description" title="${description}" class="iword-elipsis">${description}</span><i id="edit-pencil" data-id="${id}" data-desc="${sourcetext}" class="pencil alternate icon" style="cursor:pointer;vertical-align: top;" id="editor" onclick="editorFn(this)"></div>`)
-    })
-}
-function renderInfo(obj,accObj,id){
-    for(let key in obj){
-        if(key==="description"){
-            let descriptionText=obj[key].replace(/\r\n|\n/g,'enter;')
-            $(`#${key}`).text(obj[key])
-            $(`#${key}`).attr("title",obj[key])
-            $('#edit-pencil').attr("data-id",id)
-            $('#edit-pencil').attr("data-desc",descriptionText)
-        }
-        else if(key==="label"){
-            $('#Label').empty()
-            if(obj[key]==='--'){
-                $('#Label').text(obj[key])
-            }else{
-                
-                let labelArray = obj[key].trim().replace(/ +/g,' ').split(' ')
-                let html=''
-                for(let i=0;i<labelArray.length;i++){
-                    html += `<a class="ui label" title="${labelArray[i]}">${labelArray[i]}</a>`
-                }
-                $('#Label').append(html)
-            }
-        }
-        else if(key==="codeCommitID"){
-            let codeCommit = obj[key].slice(0,10)
-            let html = `<a style="margin-left:1rem" class="ui label" title="${codeCommit}">${codeCommit}</a>`
-            $('#CodeBranch').append(html)
-
-        }
-         else if(key==="displayJobName"){
-           let type=obj["cloudBrainType"]
-           let href=""
-           if(type==1){
-                href=trainJobUrl + "modelarts/train-job/" + obj["cloudBrainJobID"]
-           }else if(type==0){
-                href=trainJobUrl + "cloudbrain/train-job/" + obj["cloudBrainJobID"]
-           }else if(type==2){
-                href=trainJobUrl + "grampus/train-job/" + obj["CloudBrainJobID"]
-           }
-           $(`#displayJobNameHref`).attr("href",href)
-           $(`#displayJobNameHref`).attr("title",obj[key])
-           $(`#${key}`).text(obj[key])
-
-           let versionName = obj["trainJobVersionName"]
-           if(versionName!=""){
-                let html = `<span style="margin-left:1rem" class="ui label">${versionName}</span>`
-                $('#displayJobName').append(html)
-           }
-        }
-        else if(key==="parameters"){
-            if(obj[key]==='--'){
-                $(`#${key}`).text(obj[key])
-            }else{
-                const parameterArray = (obj[key] || []).map(element => {
-                let labelValue = `${element.label}=${element.value}` 
-                return labelValue
-                });
-                const parameter = parameterArray.join(';  ')
-                $(`#${key}`).text(parameter)
-                $(`#${key}`).attr("title",parameter)
-            }
-        }
-        else{
-            $(`#${key}`).text(obj[key])
-            $(`#${key}`).attr("title",obj[key])
-        }
-        
-    }
-    for(let key in accObj){
-        $(`#${key}`).text(accObj[key])
-        $(`#${key}`).attr("title",accObj[key])
-    }
-}
-
-function loadModelFile(ID,version_name,parents,filename,init){
-    $.get(`${url}query_onelevel_modelfile?ID=${ID}&parentDir=${parents}`, (data) => {
-        $('#dir_list').empty()
-        renderDir(data,ID,version_name)
-        if(init==="init"){
-            $('input[name=model]').val("")
-            $('input[name=modelback]').val(version_name)
-            $('#file_breadcrumb').empty()
-            let htmlBread = ""
-            htmlBread += `<div class='active section'>${version_name}</div>`
-            htmlBread += "<div class='divider'> / </div>" 
-            $('#file_breadcrumb').append(htmlBread)
-        }else{
-            renderBrend(ID,version_name,parents,filename,init)
-        }
-    })
-}
-function renderSize(value){
-    if(null==value||value==''){
-        return "0 Bytes";
-    }
-    var unitArr = new Array("Bytes","KB","MB","GB","TB","PB","EB","ZB","YB");
-    var index=0;
-    var srcsize = parseFloat(value);
-    index=Math.floor(Math.log(srcsize)/Math.log(1024));
-    var size =srcsize/Math.pow(1024,index);
-    size=size.toFixed(2);//保留的小数位数
-    return size+unitArr[index];
-}
-
-function renderBrend(ID,version_name,parents,filename,init){
-    if(init=="folder"){
-        let htmlBrend = ""
-        let sectionName=$('#file_breadcrumb .active.section').text()
-        let parents1 = $('input[name=model]').val()
-        let filename1 = $('input[name=modelback]').val()
-        if(parents1===""){
-            $('#file_breadcrumb .active.section').replaceWith(`<a class='section' onclick="loadModelFile('${ID}','${version_name}','${parents1}','','init')">${sectionName}</a>`)
-        }else{
-            $('#file_breadcrumb .active.section').replaceWith(`<a class='section' onclick="loadModelFile('${ID}','${version_name}','${parents1}','${filename1}')">${sectionName}</a>`)
-        }
-        
-        htmlBrend += `<div class='active section'>${filename}</div>`
-        htmlBrend += "<div class='divider'> / </div>" 
-        $('#file_breadcrumb').append(htmlBrend)
-        $('input[name=model]').val(parents)
-        $('input[name=modelback]').val(filename)
-    }else{
-        $('input[name=model]').val(parents)
-        $('input[name=modelback]').val(filename)
-        let selectEle = $('#file_breadcrumb a.section').filter(
-            (index, item) => {
-            return item.text == filename;
-            }
-        );
-        selectEle.nextAll().remove();
-        selectEle.after("<div class='divider'> / </div>");
-        selectEle.replaceWith(`<div class='active section'>${filename}</div>`);
-    }
-    
-}
-function renderDir(data,ID,version_name){
-    let html=""
-        html += "<div class='ui grid' style='margin:0;'>"
-        html += "<div class='row' style='padding: 0;'>"
-        html += "<div class='ui sixteen wide column' style='padding:1rem;'>"
-        html += "<div class='dir list'>"
-        html += "<table id='repo-files-table' class='ui single line table pad20'>"
-        html += '<tbody>'
-        for(let i=0;i<data.length;i++){
-            let dirs_size = renderSize(data[i].Size)
-            html += "<tr>"
-            html += "<td class='name six wid'>"
-            html += "<span class='truncate'>"
-            html += "<span class='octicon octicon-file-directory'>"
-            html += "</span>"
-            if(data[i].IsDir){
-                html += `<a  onclick="loadModelFile('${ID}','${version_name}','${data[i].ParenDir}','${data[i].FileName}','folder')">`
-                html += "<span class='fitted'><i class='folder icon' width='16' height='16' aria-hidden='true'></i>" + data[i].FileName + "</span>"
-            }else{
-                html += `<a href="${url}${ID}/downloadsingle?parentDir=${data[i].ParenDir}&fileName=${data[i].FileName}">`
-                html += "<span class='fitted'><i class='file icon' width='16' height='16' aria-hidden='true'></i>" + data[i].FileName + "</span>"
-            }
-            html += '</a>'
-            html += "</span>"
-            html += "</td>"
-            html += "<td class='message seven wide'>"
-            if(data[i].IsDir){
-                html += "<span class='truncate has-emoji'></span>"
-            }else{
-                html += "<span class='truncate has-emoji'>"+ `${dirs_size}` + "</span>"
-            }
-            
-            html += "</td>"
-
-            html += "<td class='text right age three wide'>"
-            html += "<span class='truncate has-emoji'>" + data[i].ModTime + "</span>"
-            html += "</td>"
-            html += "</tr>"
-            
-        }
-        html += "</tbody>"
-        html += "</table>"
-        html += "</div>"
-        html += "</div>"
-        html += "</div>"
-        html += "</div>"
-        $('#dir_list').append(html)
-}
-</script>
\ No newline at end of file
diff --git a/web_src/vuepages/apis/modules/modelmanage.js b/web_src/vuepages/apis/modules/modelmanage.js
index 5ca069728..62c782405 100644
--- a/web_src/vuepages/apis/modules/modelmanage.js
+++ b/web_src/vuepages/apis/modules/modelmanage.js
@@ -45,6 +45,17 @@ export const getModelFiles = (params) => {
   });
 };
 
+// 删除模型文件
+// params {repo, id, fileName}
+export const deleteModelFile = (params) => {
+  return service({
+    url: `${params.repo}/modelmanage/delete_model_file`,
+    method: 'delete',
+    params,
+    data: {},
+  });
+};
+
 /* 文件上传相关 */
 // 上传文件1: 获取文件chunks信息
 // params: { md5, type: 0-CPU/GPU,1-NPU, file_name, scene: 'model', modeluuid }
diff --git a/web_src/vuepages/pages/modelmanage/common/modelmanage-common-detail.vue b/web_src/vuepages/pages/modelmanage/common/modelmanage-common-detail.vue
new file mode 100644
index 000000000..997722807
--- /dev/null
+++ b/web_src/vuepages/pages/modelmanage/common/modelmanage-common-detail.vue
@@ -0,0 +1,482 @@
+<template>
+  <div>
+    <div class="ui header">
+      <div class="ui breadcrumb">
+        <a class="section" :href="`${repo}/modelmanage/show_model`">模型管理</a>
+        <div class="divider"> / </div>
+        <div class="active section">{{ this.state.name }}</div>
+      </div>
+      <div class="version">
+        <el-select v-model="curVersion" @change="changeVersion" placeholder="">
+          <el-option v-for="item in modelList" :value="item.version" :key="item.version" :label="item.version">
+          </el-option>
+        </el-select>
+      </div>
+    </div>
+    <div class="content">
+      <div class="detail-info">
+        <div class="title">基本信息：</div>
+        <div class="area-c">
+          <div class="area">
+            <div class="row">
+              <div class="tit">可用集群：</div>
+              <div class="val">
+                <div class="txt-wrap" :title="state.type == 0 ? 'CPU/GPU' : 'NPU'">
+                  {{ state.type == 0 ? 'CPU/GPU' : 'NPU' }}
+                </div>
+              </div>
+            </div>
+            <div v-show="isExpanded" class="row">
+              <div class="tit">模型大小：</div>
+              <div class="val">
+                <div class="txt-wrap" :title="state.modelSize">{{ state.modelSize }}</div>
+              </div>
+            </div>
+            <div v-show="isExpanded" class="row">
+              <div class="tit">描述：</div>
+              <div class="val">
+                <div class="txt-wrap" :title="state.description">{{ state.description }}</div>
+              </div>
+            </div>
+          </div>
+          <div class="area">
+            <div class="row">
+              <div class="tit">模型框架：</div>
+              <div class="val">
+                <div class="txt-wrap" :title="state.engineName">{{ state.engineName }}</div>
+              </div>
+            </div>
+            <div v-show="isExpanded" class="row">
+              <div class="tit">创建时间：</div>
+              <div class="val">
+                <div class="txt-wrap" :title="state.createTime">{{ state.createTime }}</div>
+              </div>
+            </div>
+            <div v-show="isExpanded" class="row">
+              <div class="tit">标签：</div>
+              <div class="val">
+                <div class="txt-wrap" :title="state.label">{{ state.label }}</div>
+              </div>
+            </div>
+          </div>
+        </div>
+        <div v-show="isExpanded" style="margin-top:8px;" class="title">训练相关信息：</div>
+        <div v-show="isExpanded" class="area-c">
+          <div class="area">
+            <div class="row">
+              <div class="tit">训练任务：</div>
+              <div class="val">
+                <div class="txt-wrap" :title="state.displayJobName">{{ state.displayJobName }}</div>
+              </div>
+            </div>
+            <div class="row">
+              <div class="tit">代码分支：</div>
+              <div class="val">
+                <div class="txt-wrap" :title="state.branchName">{{ state.branchName }}</div>
+              </div>
+            </div>
+            <div class="row">
+              <div class="tit">启动文件：</div>
+              <div class="val">
+                <div class="txt-wrap" :title="state.bootFile">{{ state.bootFile }}</div>
+              </div>
+            </div>
+            <div class="row">
+              <div class="tit">训练数据集：</div>
+              <div class="val">
+                <div class="txt-wrap" :title="state.datasetName">{{ state.datasetName }}</div>
+              </div>
+            </div>
+          </div>
+          <div class="area">
+            <div class="row">
+              <div class="tit">规格：</div>
+              <div class="val">
+                <div class="txt-wrap" :title="state.specStr">{{ state.specStr }}</div>
+              </div>
+            </div>
+            <div class="row">
+              <div class="tit">计算节点：</div>
+              <div class="val">
+                <div class="txt-wrap" :title="state.workServerNumber">{{ state.workServerNumber }}</div>
+              </div>
+            </div>
+            <div class="row">
+              <div class="tit">运行参数：</div>
+              <div class="val">
+                <div class="txt-wrap" :title="state.parameters">{{ state.parameters }}</div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="expand-line">
+        <div class="line"></div>
+        <div class="expand-btn" @click="isExpanded = !isExpanded">
+          <i class="icon chevron circle down" :class="isExpanded ? 'up' : ''"></i>
+          <span>{{ isExpanded ? '折叠详细信息' : '查看更多信息' }}</span>
+        </div>
+        <div class="line"></div>
+      </div>
+      <div class="files-info">
+        <div class="top">
+          <div>
+            <div class="title">模型文件列表：</div>
+            <div class="title" style="margin-top:8px"><span class="version">{{ state.version }}</span>
+              <span style="color:rgba(0,0,0,.4);" class="divider"> / </span>
+            </div>
+          </div>
+          <div>
+            <el-button v-if="modelType == 1 && canOperate" type="primary" icon="el-icon-upload" @click="goUploadPage">
+              上传模型文件
+            </el-button>
+          </div>
+        </div>
+        <div class="table-container">
+          <el-table :data="filesList" row-key="sn" style="width: 100%" v-loading="loading" stripe>
+            <el-table-column column-key="FileName" prop="FileName" label="文件名称" align="left" header-align="left">
+              <template slot-scope="scope">
+                <div class="tbl-file-name">
+                  <span class="octicon octicon-file-directory"></span>
+                  <a :href="`${repo}/modelmanage/${state.id}/downloadsingle?parentDir=&fileName=${scope.row.FileName}`">
+                    <div class="fitted" :title="scope.row.FileName">
+                      <i class="file icon" width="16" height="16" aria-hidden="true"></i>
+                      {{ scope.row.FileName }}
+                    </div>
+                  </a>
+                </div>
+              </template>
+            </el-table-column>
+            <el-table-column column-key="SizeShow" prop="SizeShow" label="文件大小" align="center" header-align="center"
+              width="200">
+            </el-table-column>
+            <el-table-column column-key="ModTime" prop="ModTime" label="更新时间" align="center" header-align="center"
+              width="200">
+            </el-table-column>
+            <el-table-column v-if="modelType == 1 && canOperate" column-key="operate" prop="operate" label="操作"
+              align="center" header-align="center" width="200">
+              <template slot-scope="scope">
+                <span class="btn-del" @click="deleteFile(scope.row)">删除</span>
+              </template>
+            </el-table-column>
+          </el-table>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+
+import { getModelInfoByName, modifyModel, getModelFiles, deleteModelFile } from '~/apis/modules/modelmanage';
+import { getUrlSearchParams, getListValueWithKey, transFileSize } from '~/utils';
+import { MODEL_ENGINES } from '~/const';
+import { formatDate } from 'element-ui/lib/utils/date-util';
+
+const REPO_NAME = location.pathname.split('/')[2];
+
+export default {
+  data() {
+    return {
+      modelType: '0', // 1-本地, 0-线上
+      canOperate: false,
+      isExpanded: false,
+      loading: false,
+      repo: location.pathname.split('/').slice(0, 3).join('/'),
+      state: {
+        type: 0,
+        id: '',
+        name: '',
+        version: '0.0.1',
+        engine: '0',
+        label: '',
+        description: '',
+      },
+      engineList: MODEL_ENGINES,
+      curVersion: '',
+      modelList: [],
+      filesList: [],
+    };
+  },
+  components: {},
+  methods: {
+    changeVersion(version) {
+      const data = this.modelList.filter((model) => model.version == version)[0];
+      this.modelType = data.modelType;
+      this.canOperate = data.isCanOper;
+      this.state.type = data.type;
+      this.state.id = data.id;
+      this.state.name = data.name;
+      this.state.version = data.version;
+      this.state.engine = data.engine.toString();
+      this.state.engineName = getListValueWithKey(MODEL_ENGINES, data.engine.toString());
+      this.state.modelSize = transFileSize(data.size);
+      this.state.label = data.label || '--';
+      this.state.description = data.description || '--';
+      this.state.createTime = formatDate(new Date(data.createdUnix * 1000), 'yyyy-MM-dd HH:mm:ss');
+
+      const trainTaskInfo = data.trainTaskInfo ? JSON.parse(data.trainTaskInfo) : '';
+      Object.assign(this.state, {
+        displayJobName: '--',
+        branchName: '--',
+        bootFile: '--',
+        datasetName: '--',
+        parameters: '--',
+        workServerNumber: '--',
+        specStr: '--',
+      });
+      if (trainTaskInfo) {
+        const parameters = trainTaskInfo.Parameters ? JSON.parse(trainTaskInfo.Parameters).parameter : [];
+        const parametersStr = parameters.map((item) => { return item.label + '=' + item.value }).join('; ');
+        Object.assign(this.state, {
+          displayJobName: trainTaskInfo.DisplayJobName,
+          branchName: trainTaskInfo.BranchName,
+          bootFile: trainTaskInfo.BootFile,
+          datasetName: trainTaskInfo.DatasetName,
+          parameters: parametersStr || '--',
+          workServerNumber: trainTaskInfo.WorkServerNumber || '--',
+          specStr: trainTaskInfo.Spec ? trainTaskInfo.Spec.toString() : '--'
+        });
+      }
+      this.curVersion = version;
+      getModelFiles({
+        repo: this.repo,
+        ID: this.state.id,
+        parentDir: '',
+      }).then(res => {
+        const list = res.data || [];
+        list.forEach(item => {
+          item.SizeShow = transFileSize(item.Size);
+        })
+        this.filesList = list;
+      }).catch(err => {
+        console.log(err);
+      })
+    },
+    goUploadPage() {
+      window.location.href = `${this.repo}/modelmanage/create_local_model_tmpl2?type=0&name=${this.state.name}&id=${this.state.id}`;
+    },
+    deleteFile(file) {
+      this.$confirm('请确认是否删除当前模型文件？', this.$t('tips'), {
+        confirmButtonText: this.$t('confirm1'),
+        cancelButtonText: this.$t('cancel'),
+        type: 'warning',
+        lockScroll: false,
+      }).then(() => {
+        deleteModelFile({
+          repo: this.repo,
+          id: this.state.id,
+          fileName: file.FileName,
+        }).then(res => {
+          res = res.data;
+          if (res.code == '0') {
+            this.changeVersion(this.curVersion);
+          } else {
+            this.$message({
+              type: 'error',
+              message: '模型文件删除失败',
+            });
+          }
+        }).catch(err => {
+          console.log(err);
+          this.$message({
+            type: 'error',
+            message: '模型文件删除失败',
+          });
+        });
+      }).catch(() => { });
+    }
+  },
+  mounted() {
+    const urlParams = getUrlSearchParams();
+    if (urlParams.name) {
+      this.state.name = urlParams.name;
+      this.loading = true;
+      getModelInfoByName({
+        repo: this.repo,
+        name: urlParams.name,
+      }).then(res => {
+        this.loading = false;
+        const list = res.data || [];
+        this.modelList = list;
+        if (list && list.length) {
+          const data = list[0];
+          this.changeVersion(data.version);
+        }
+      }).catch(err => {
+        this.loading = false;
+        console.log(err);
+        this.cancel();
+      });
+    } else {
+      this.cancel();
+    }
+  },
+  beforeDestroy() {
+  },
+};
+</script>
+
+<style scoped lang="less">
+.header {
+  display: flex;
+  align-items: center;
+
+  .version {
+    margin-left: 16px;
+    width: 90px;
+  }
+}
+
+.content {
+  .title {
+    font-weight: 550;
+    font-size: 14px;
+    color: rgb(16, 16, 16);
+  }
+
+  .detail-info {
+    border: 1px solid rgb(232, 232, 232);
+    border-bottom: none;
+    padding: 22px;
+    padding-bottom: 1px;
+
+    .area-c {
+      display: flex;
+
+      .area {
+        flex: 1;
+
+        .row {
+          display: flex;
+          height: 32px;
+          align-items: center;
+          margin-bottom: 4px;
+
+          .tit {
+            width: 160px;
+            text-align: right;
+            color: rgb(136, 136, 136);
+          }
+
+          .val {
+            flex: 1;
+            color: rgb(16, 16, 16);
+            position: relative;
+            height: 20px;
+
+            .txt-wrap {
+              position: absolute;
+              overflow: hidden;
+              text-overflow: ellipsis;
+              white-space: nowrap;
+              width: 100%;
+            }
+          }
+        }
+      }
+    }
+  }
+
+  .expand-line {
+    display: flex;
+    align-items: center;
+    border: 1px solid rgb(232, 232, 232);
+    border-top: none;
+    border-bottom: none;
+    padding: 16px 0;
+
+    .line {
+      flex: 1;
+      height: 1px;
+      background-color: rgb(232, 232, 232);
+      margin: 0 22px;
+    }
+
+    .expand-btn {
+      color: rgba(22, 132, 252, 1);
+      cursor: pointer;
+
+      .icon {
+        margin-right: 2px;
+        font-size: 14px;
+        color: rgba(22, 132, 252, 0.8),
+      }
+    }
+  }
+
+
+  .files-info {
+    border: 1px solid rgb(232, 232, 232);
+    border-top: none;
+    border-bottom: none;
+
+    .top {
+      padding: 0 22px 8px 22px;
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+    }
+
+    .table-container {
+      /deep/ .el-table__header {
+        th {
+          background: rgb(245, 245, 246);
+          color: rgb(16, 16, 16);
+          font-weight: 400;
+          font-size: 14px;
+        }
+      }
+
+      /deep/ .el-table__body {
+        td {
+          color: rgb(16, 16, 16);
+          font-weight: 400;
+          font-size: 14px;
+        }
+      }
+
+      .tbl-file-name {
+        height: 32px;
+        display: flex;
+        align-items: center;
+        overflow: hidden;
+        font-size: 16px;
+        font-weight: 500;
+      }
+
+      .btn-del {
+        color: rgb(255, 51, 51);
+        cursor: pointer;
+      }
+    }
+  }
+}
+
+
+.el-select-dropdown__item.selected {
+  color: rgba(0, 0, 0, .95);
+}
+
+/deep/ .el-select {
+  .is-focus {
+    .el-input__inner {
+      border-color: #85b7d9;
+    }
+  }
+}
+
+/deep/ .el-input__inner {
+  font-weight: 600;
+
+  &:focus {
+    border-color: #85b7d9;
+  }
+}
+
+/deep/ .el-textarea__inner {
+  &:focus {
+    border-color: #85b7d9;
+  }
+}
+</style>
diff --git a/web_src/vuepages/pages/modelmanage/common/vp-modelmanage-common-detail.js b/web_src/vuepages/pages/modelmanage/common/vp-modelmanage-common-detail.js
new file mode 100644
index 000000000..13814a369
--- /dev/null
+++ b/web_src/vuepages/pages/modelmanage/common/vp-modelmanage-common-detail.js
@@ -0,0 +1,17 @@
+import Vue from 'vue';
+import ElementUI from 'element-ui';
+import 'element-ui/lib/theme-chalk/index.css';
+import localeEn from 'element-ui/lib/locale/lang/en';
+import localeZh from 'element-ui/lib/locale/lang/zh-CN';
+import { i18n, lang } from '~/langs';
+import App from './modelmanage-common-detail.vue';
+
+Vue.use(ElementUI, {
+  locale: lang === 'zh-CN' ? localeZh : localeEn,
+  size: 'small',
+});
+
+new Vue({
+  i18n,
+  render: (h) => h(App),
+}).$mount('#__vue-root');
diff --git a/web_src/vuepages/pages/modelmanage/local/modelmanage-local-create-2.vue b/web_src/vuepages/pages/modelmanage/local/modelmanage-local-create-2.vue
index 8227b7b11..7eb3aeb2e 100644
--- a/web_src/vuepages/pages/modelmanage/local/modelmanage-local-create-2.vue
+++ b/web_src/vuepages/pages/modelmanage/local/modelmanage-local-create-2.vue
@@ -233,8 +233,8 @@ export default {
         file.uploaded = data.uploaded;
         file.chunks = data.chunks;
         file.attachID = data.attachID;
-        file.modelUuid = data.modeluuid || file.modelUuid;
-        file.modelName = data.modelName || file.modelName;
+        file._modelUuid = data.modeluuid;
+        file._modelName = data.modelName;
         file.realName = data.fileName;
         return file;
       }).catch(err => {
@@ -431,7 +431,9 @@ export default {
           const list = window.location.href.split('/');
           list.pop();
           list.push('show_model_info');
-          window.location.href = list.join('/') + '?name=' + this.state.name;
+          window.setTimeout(() => {
+            window.location.href = list.join('/') + '?name=' + this.state.name;
+          }, 1000);
         }
       }
     },
@@ -456,8 +458,8 @@ export default {
               }
               this.uploadLength++;
               // 同一模型上传同一个文件
-              if (file.modelUuid != '') {
-                const info = `该文件已上传在模型: ${file.modelName}`;
+              if (file._modelUuid) {
+                const info = `该文件已上传在模型: ${file._modelName}`;
                 this.uploadError(file, info);
                 this.updateFileStatus(file, "上传失败", 0, 1, info);
               } else { // 秒传
diff --git a/web_src/vuepages/utils/index.js b/web_src/vuepages/utils/index.js
index 8a8604eca..3962bb76f 100644
--- a/web_src/vuepages/utils/index.js
+++ b/web_src/vuepages/utils/index.js
@@ -14,3 +14,14 @@ export const getUrlSearchParams = () => {
   });
   return obj;
 };
+
+export const transFileSize = (srcSize) => {
+  if (null == srcSize || srcSize == '') {
+    return '0 Bytes';
+  }
+  const unitArr = ['Bytes', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'];
+  srcSize = parseFloat(srcSize);
+  const index = Math.floor(Math.log(srcSize) / Math.log(1024));
+  const size = (srcSize / Math.pow(1024, index)).toFixed(2);
+  return size + unitArr[index];
+};

From 774635486b6d67f7ce5eee8eae8c624b9ea29eb4 Mon Sep 17 00:00:00 2001
From: chenshihai <chenshh@pcl.ac.cn>
Date: Wed, 9 Nov 2022 08:41:35 +0800
Subject: [PATCH 110/187] update lang

---
 web_src/vuepages/langs/config/en-US.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web_src/vuepages/langs/config/en-US.js b/web_src/vuepages/langs/config/en-US.js
index bcd1cfe43..6ea201cb2 100644
--- a/web_src/vuepages/langs/config/en-US.js
+++ b/web_src/vuepages/langs/config/en-US.js
@@ -187,7 +187,7 @@ const en = {
   onlyFace:'Only face',
   onlyLicensePlate:'Only license plate',
   dragThePictureHere:'Drag the picture here',
-  or:'or',
+  or:' or ',
   clickUpload:'Click upload',
   dataDesensitizationModelExperience:'Data desensitization model experience',
   dataDesensitizationModelDesc:'Use AI technology to desensitize the face and license plate number in the picture. For more information about this model, please visit the project',

From d56b071581597c8256baa435bf636d933b868294 Mon Sep 17 00:00:00 2001
From: chenshihai <chenshh@pcl.ac.cn>
Date: Wed, 9 Nov 2022 08:57:31 +0800
Subject: [PATCH 111/187] =?UTF-8?q?#3058=20=E8=8B=B1=E6=96=87'or'=E5=89=8D?=
 =?UTF-8?q?=E5=90=8E=E5=8A=A0=E7=A9=BA=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web_src/vuepages/pages/model/tuomin/index.vue | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/web_src/vuepages/pages/model/tuomin/index.vue b/web_src/vuepages/pages/model/tuomin/index.vue
index 6c7813977..f97787198 100644
--- a/web_src/vuepages/pages/model/tuomin/index.vue
+++ b/web_src/vuepages/pages/model/tuomin/index.vue
@@ -33,11 +33,9 @@
               drag
             >
               <div class="el-upload__text">
-                {{ $t("dragThePictureHere")
-                }}<span style="color: rgba(136, 136, 136, 0.87)">{{
-                  $t("or")
-                }}</span
-                >{{ $t("clickUpload") }}
+                <span>
+                  <span>{{ $t("dragThePictureHere") }}</span><span style="color: rgba(136, 136, 136, 0.87)">{{ $t("or") }}</span><span>{{ $t("clickUpload") }}</span>
+                </span>
               </div>
             </el-upload>
 

From b2351a9196cc8b0ab2dc9b35845946d1b715c6c8 Mon Sep 17 00:00:00 2001
From: zhoupzh <zhoupzh@pcl.ac.cn>
Date: Wed, 9 Nov 2022 10:46:05 +0800
Subject: [PATCH 112/187] fix issue

---
 templates/repo/modelsafety/show.tmpl | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/templates/repo/modelsafety/show.tmpl b/templates/repo/modelsafety/show.tmpl
index dfd1bd5b9..a46077443 100644
--- a/templates/repo/modelsafety/show.tmpl
+++ b/templates/repo/modelsafety/show.tmpl
@@ -861,7 +861,8 @@
             $('td.ti-text-form-content.spec div').text(specStr);
             SPEC && $('td.ti-text-form-content.resorce_type div').text(getListValueWithKey(ACC_CARD_TYPE, SPEC.AccCardType));
           }
-          var oLogHref = $('#-log-down').attr('href');
+          var repoPath = {{$.RepoRelPath}};
+          var oLogHref = `/api/v1/repos/${repoPath}/cloudbrain`;
           $('#-log-down').attr('href', oLogHref + `/${res.ID}/download_log_file`);
           $('.full-log-dialog').attr('data-href', oLogHref + `/${res.ID}/download_log_file`);
           if (res.ResultJson) {

From 91b21891cfc77784ae1d505b24c8387d25d52467 Mon Sep 17 00:00:00 2001
From: liuzx <liuzx@pcl.ac.cn>
Date: Wed, 9 Nov 2022 11:05:00 +0800
Subject: [PATCH 113/187] fix-3173

---
 models/cloudbrain.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/models/cloudbrain.go b/models/cloudbrain.go
index a9182b7b8..d53da511b 100755
--- a/models/cloudbrain.go
+++ b/models/cloudbrain.go
@@ -2034,13 +2034,13 @@ func GetC2NetWithAiCenterWrongJob() ([]*Cloudbrain, error) {
 	cloudbrains := make([]*Cloudbrain, 0)
 	return cloudbrains, x.
 		In("status", ModelArtsTrainJobFailed, ModelArtsTrainJobKilled, ModelArtsStopped, JobStopped, JobFailed).
-		Where("type = 2 ").
+		Where("type = ?", TypeC2Net).
 		Find(&cloudbrains)
 }
 
 func GetModelSafetyTestTask() ([]*Cloudbrain, error) {
 	cloudbrains := make([]*Cloudbrain, 0)
-	sess := x.Where("job_type = ?", string(JobTypeModelSafety))
+	sess := x.Where("job_type=?", string(JobTypeModelSafety))
 	err := sess.Find(&cloudbrains)
 	return cloudbrains, err
 }

From e2f673c943a9b500daf27886289f33e57cf00bee Mon Sep 17 00:00:00 2001
From: chenyifan01 <cyf_uestc@outlook.com>
Date: Wed, 9 Nov 2022 11:07:53 +0800
Subject: [PATCH 114/187] #3157 fix bug

---
 routers/api/v1/repo/cloudbrain.go | 13 ++++++++++---
 routers/api/v1/repo/modelarts.go  | 26 ++++++++++++++++----------
 2 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/routers/api/v1/repo/cloudbrain.go b/routers/api/v1/repo/cloudbrain.go
index 2e25fdefe..68d2923a4 100755
--- a/routers/api/v1/repo/cloudbrain.go
+++ b/routers/api/v1/repo/cloudbrain.go
@@ -634,7 +634,7 @@ func CloudbrainGetLog(ctx *context.APIContext) {
 				endLine += 1
 			}
 		}
-		
+
 		result = getLogFromModelDir(job.JobName, startLine, endLine, resultPath)
 		if result == nil {
 			log.Error("GetJobLog failed: %v", err, ctx.Data["MsgID"])
@@ -649,14 +649,21 @@ func CloudbrainGetLog(ctx *context.APIContext) {
 	if ctx.Data["existStr"] != nil && result["Lines"].(int) < 50 {
 		content = content + ctx.Data["existStr"].(string)
 	}
+	logFileName := result["FileName"]
+
+	//Logs can only be downloaded if the file exists
+	//and the current user is an administrator or the creator of the task
+	canLogDownload := logFileName != nil && logFileName != "" &&
+		(ctx.IsSigned && (ctx.IsUserSiteAdmin() || ctx.User.ID == job.UserID))
+
 	re := map[string]interface{}{
 		"JobID":          ID,
-		"LogFileName":    result["FileName"],
+		"LogFileName":    logFileName,
 		"StartLine":      result["StartLine"],
 		"EndLine":        result["EndLine"],
 		"Content":        content,
 		"Lines":          result["Lines"],
-		"CanLogDownload": result["FileName"] != "",
+		"CanLogDownload": canLogDownload,
 		"StartTime":      job.StartTime,
 	}
 	//result := CloudbrainGetLogByJobId(job.JobID, job.JobName)
diff --git a/routers/api/v1/repo/modelarts.go b/routers/api/v1/repo/modelarts.go
index cd129dd5f..9f9e67ccc 100755
--- a/routers/api/v1/repo/modelarts.go
+++ b/routers/api/v1/repo/modelarts.go
@@ -281,15 +281,6 @@ func TrainJobGetLog(ctx *context.APIContext) {
 		return
 	}
 
-	prefix := strings.TrimPrefix(path.Join(setting.TrainJobModelPath, task.JobName, modelarts.LogPath, versionName), "/") + "/job"
-	_, err = storage.GetObsLogFileName(prefix)
-	var canLogDownload bool
-	if err != nil {
-		canLogDownload = false
-	} else {
-		canLogDownload = true
-	}
-
 	ctx.Data["log_file_name"] = resultLogFile.LogFileList[0]
 
 	ctx.JSON(http.StatusOK, map[string]interface{}{
@@ -299,11 +290,26 @@ func TrainJobGetLog(ctx *context.APIContext) {
 		"EndLine":        result.EndLine,
 		"Content":        result.Content,
 		"Lines":          result.Lines,
-		"CanLogDownload": canLogDownload,
+		"CanLogDownload": canLogDownload(ctx.User, task),
 		"StartTime":      task.StartTime,
 	})
 }
 
+func canLogDownload(user *models.User, task *models.Cloudbrain) bool {
+	if user == nil {
+		return false
+	}
+	if !user.IsAdmin && user.ID != task.UserID {
+		return false
+	}
+	prefix := strings.TrimPrefix(path.Join(setting.TrainJobModelPath, task.JobName, modelarts.LogPath, task.VersionName), "/") + "/job"
+	_, err := storage.GetObsLogFileName(prefix)
+	if err != nil {
+		return false
+	}
+	return true
+}
+
 func trainJobGetLogContent(jobID string, versionID int64, baseLine string, order string, lines int) (*models.GetTrainJobLogFileNamesResult, *models.GetTrainJobLogResult, error) {
 
 	resultLogFile, err := modelarts.GetTrainJobLogFileNames(jobID, strconv.FormatInt(versionID, 10))

From dc30a93f943d8e7a91495ed51202ae9b015de857 Mon Sep 17 00:00:00 2001
From: chenyifan01 <cyf_uestc@outlook.com>
Date: Wed, 9 Nov 2022 14:32:15 +0800
Subject: [PATCH 115/187] #3157 fix bug

---
 models/cloudbrain.go              | 7 +++++++
 routers/api/v1/repo/cloudbrain.go | 3 +--
 routers/api/v1/repo/modelarts.go  | 5 +----
 routers/repo/grampus.go           | 7 +------
 4 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/models/cloudbrain.go b/models/cloudbrain.go
index dacb1b03a..f536895a2 100755
--- a/models/cloudbrain.go
+++ b/models/cloudbrain.go
@@ -291,6 +291,13 @@ func (task *Cloudbrain) IsRunning() bool {
 		status == string(JobRunning) || status == GrampusStatusRunning
 }
 
+func (task *Cloudbrain) IsUserHasRight(user *User) bool {
+	if user == nil {
+		return false
+	}
+	return user.IsAdmin || user.ID == task.UserID
+}
+
 func ConvertDurationToStr(duration int64) string {
 	if duration <= 0 {
 		return DURATION_STR_ZERO
diff --git a/routers/api/v1/repo/cloudbrain.go b/routers/api/v1/repo/cloudbrain.go
index 68d2923a4..7022dc011 100755
--- a/routers/api/v1/repo/cloudbrain.go
+++ b/routers/api/v1/repo/cloudbrain.go
@@ -653,8 +653,7 @@ func CloudbrainGetLog(ctx *context.APIContext) {
 
 	//Logs can only be downloaded if the file exists
 	//and the current user is an administrator or the creator of the task
-	canLogDownload := logFileName != nil && logFileName != "" &&
-		(ctx.IsSigned && (ctx.IsUserSiteAdmin() || ctx.User.ID == job.UserID))
+	canLogDownload := logFileName != nil && logFileName != "" && job.IsUserHasRight(ctx.User)
 
 	re := map[string]interface{}{
 		"JobID":          ID,
diff --git a/routers/api/v1/repo/modelarts.go b/routers/api/v1/repo/modelarts.go
index 9f9e67ccc..16e4997a3 100755
--- a/routers/api/v1/repo/modelarts.go
+++ b/routers/api/v1/repo/modelarts.go
@@ -296,10 +296,7 @@ func TrainJobGetLog(ctx *context.APIContext) {
 }
 
 func canLogDownload(user *models.User, task *models.Cloudbrain) bool {
-	if user == nil {
-		return false
-	}
-	if !user.IsAdmin && user.ID != task.UserID {
+	if task == nil || !task.IsUserHasRight(user) {
 		return false
 	}
 	prefix := strings.TrimPrefix(path.Join(setting.TrainJobModelPath, task.JobName, modelarts.LogPath, task.VersionName), "/") + "/job"
diff --git a/routers/repo/grampus.go b/routers/repo/grampus.go
index 0620350f6..e16d39a00 100755
--- a/routers/repo/grampus.go
+++ b/routers/repo/grampus.go
@@ -941,12 +941,7 @@ func GrampusGetLog(ctx *context.Context) {
 		ctx.ServerError(err.Error(), err)
 		return
 	}
-	var canLogDownload bool
-	if err != nil {
-		canLogDownload = false
-	} else {
-		canLogDownload = true
-	}
+	canLogDownload := err == nil && job.IsUserHasRight(ctx.User)
 	ctx.JSON(http.StatusOK, map[string]interface{}{
 		"JobName":        job.JobName,
 		"Content":        content,

From 3aca1dc0749ccbe1af32063a2a621fe721f6bb01 Mon Sep 17 00:00:00 2001
From: chenyifan01 <cyf_uestc@outlook.com>
Date: Wed, 9 Nov 2022 15:12:54 +0800
Subject: [PATCH 116/187] #3157 fix bug

---
 routers/api/v1/repo/cloudbrain.go | 23 +++++++++++++++++++----
 routers/api/v1/repo/modelarts.go  | 22 +++++++++++++++++-----
 routers/repo/grampus.go           | 12 ++++++++++--
 3 files changed, 46 insertions(+), 11 deletions(-)

diff --git a/routers/api/v1/repo/cloudbrain.go b/routers/api/v1/repo/cloudbrain.go
index 7022dc011..9da1251e4 100755
--- a/routers/api/v1/repo/cloudbrain.go
+++ b/routers/api/v1/repo/cloudbrain.go
@@ -607,6 +607,24 @@ func CloudbrainGetLog(ctx *context.APIContext) {
 	lines := ctx.QueryInt("lines")
 	baseLine := ctx.Query("base_line")
 	order := ctx.Query("order")
+
+	//Logs can only be downloaded if the file exists
+	//and the current user is an administrator or the creator of the task
+	if !job.IsUserHasRight(ctx.User) {
+		re := map[string]interface{}{
+			"JobID":          ID,
+			"LogFileName":    "",
+			"StartLine":      0,
+			"EndLine":        0,
+			"Content":        "",
+			"Lines":          0,
+			"CanLogDownload": false,
+			"StartTime":      job.StartTime,
+		}
+		ctx.JSON(http.StatusOK, re)
+		return
+	}
+
 	var result map[string]interface{}
 	resultPath := "/model"
 	if job.JobType == string(models.JobTypeInference) || job.JobType == string(models.JobTypeModelSafety) {
@@ -650,10 +668,7 @@ func CloudbrainGetLog(ctx *context.APIContext) {
 		content = content + ctx.Data["existStr"].(string)
 	}
 	logFileName := result["FileName"]
-
-	//Logs can only be downloaded if the file exists
-	//and the current user is an administrator or the creator of the task
-	canLogDownload := logFileName != nil && logFileName != "" && job.IsUserHasRight(ctx.User)
+	canLogDownload := logFileName != nil && logFileName != ""
 
 	re := map[string]interface{}{
 		"JobID":          ID,
diff --git a/routers/api/v1/repo/modelarts.go b/routers/api/v1/repo/modelarts.go
index 16e4997a3..00cdea0ef 100755
--- a/routers/api/v1/repo/modelarts.go
+++ b/routers/api/v1/repo/modelarts.go
@@ -274,6 +274,21 @@ func TrainJobGetLog(ctx *context.APIContext) {
 		log.Error("GetCloudbrainByJobID(%s) failed:%v", jobID, err.Error())
 		return
 	}
+
+	if !task.IsUserHasRight(ctx.User) {
+		ctx.JSON(http.StatusOK, map[string]interface{}{
+			"JobID":          jobID,
+			"LogFileName":    "",
+			"StartLine":      0,
+			"EndLine":        0,
+			"Content":        "",
+			"Lines":          0,
+			"CanLogDownload": false,
+			"StartTime":      task.StartTime,
+		})
+		return
+	}
+
 	resultLogFile, result, err := trainJobGetLogContent(jobID, task.VersionID, baseLine, order, lines_int)
 	if err != nil {
 		log.Error("trainJobGetLog(%s) failed:%v", jobID, err.Error())
@@ -290,15 +305,12 @@ func TrainJobGetLog(ctx *context.APIContext) {
 		"EndLine":        result.EndLine,
 		"Content":        result.Content,
 		"Lines":          result.Lines,
-		"CanLogDownload": canLogDownload(ctx.User, task),
+		"CanLogDownload": canLogDownload(task),
 		"StartTime":      task.StartTime,
 	})
 }
 
-func canLogDownload(user *models.User, task *models.Cloudbrain) bool {
-	if task == nil || !task.IsUserHasRight(user) {
-		return false
-	}
+func canLogDownload(task *models.Cloudbrain) bool {
 	prefix := strings.TrimPrefix(path.Join(setting.TrainJobModelPath, task.JobName, modelarts.LogPath, task.VersionName), "/") + "/job"
 	_, err := storage.GetObsLogFileName(prefix)
 	if err != nil {
diff --git a/routers/repo/grampus.go b/routers/repo/grampus.go
index e16d39a00..a2a021a43 100755
--- a/routers/repo/grampus.go
+++ b/routers/repo/grampus.go
@@ -935,17 +935,25 @@ func GrampusGetLog(ctx *context.Context) {
 		return
 	}
 
+	if !job.IsUserHasRight(ctx.User) {
+		ctx.JSON(http.StatusOK, map[string]interface{}{
+			"JobName":        job.JobName,
+			"Content":        "",
+			"CanLogDownload": false,
+		})
+		return
+	}
+
 	content, err := grampus.GetTrainJobLog(job.JobID)
 	if err != nil {
 		log.Error("GetTrainJobLog failed: %v", err, ctx.Data["MsgID"])
 		ctx.ServerError(err.Error(), err)
 		return
 	}
-	canLogDownload := err == nil && job.IsUserHasRight(ctx.User)
 	ctx.JSON(http.StatusOK, map[string]interface{}{
 		"JobName":        job.JobName,
 		"Content":        content,
-		"CanLogDownload": canLogDownload,
+		"CanLogDownload": true,
 	})
 
 	return

From 15f4e72680ee5186a4596a2c3f8f6015b50b40e5 Mon Sep 17 00:00:00 2001
From: chenshihai <chenshh@pcl.ac.cn>
Date: Wed, 9 Nov 2022 15:27:31 +0800
Subject: [PATCH 117/187] model manage

---
 templates/repo/modelmanage/create_online.tmpl | 582 +++++++++++++++++-
 templates/repo/modelmanage/index.tmpl         |   2 +-
 .../common/modelmanage-common-detail.vue      | 137 ++++-
 3 files changed, 699 insertions(+), 22 deletions(-)

diff --git a/templates/repo/modelmanage/create_online.tmpl b/templates/repo/modelmanage/create_online.tmpl
index 5d017c256..db3ca6cf9 100644
--- a/templates/repo/modelmanage/create_online.tmpl
+++ b/templates/repo/modelmanage/create_online.tmpl
@@ -1,12 +1,584 @@
 {{template "base/head" .}}
-<link rel="stylesheet" href="{{StaticUrlPrefix}}/css/vp-modelmanage-local-create-1.css?v={{MD5 AppVer}}" />
-<style></style>
+<link rel="stylesheet" href="/self/ztree/css/zTreeStyle/zTreeStyle.css" type="text/css">
+<style>
+    #newmodel .header {
+        height: 45px;
+        border: 1px solid #d4d4d5;
+        border-radius: 5px 5px 0 0;
+        font-size: 14px;
+        background: #f0f0f0;
+        display: flex;
+        align-items: center;
+    }
+    #newmodel .content {        
+        margin-top: -1px;        
+        border: 1px solid #d4d4d5;
+        border-top: none;
+    }
+    .inline.fields .right.aligned label{ 
+        width: 100% !important;
+        text-align: right;
+    }
+    .inline .ui.dropdown .text {
+        color: rgba(0, 0, 0, .87) !important;
+        max-width: 360px;
+    }
+    .newtext{
+        margin-left: 12px !important
+    }
+    .menuContent{
+        position: absolute;
+        background: #ffffff;
+        left: 0;
+        right: 26px;
+        top: 36px;
+        z-index:999;
+        border: 1px solid #96c8da;
+        border-top: 0;
+        border-bottom-right-radius: 4px;
+        border-bottom-left-radius: 4px;
+        box-shadow: 0 2px 3px 0 rgb(34 36 38 / 15%);
+    }
+</style>
+<div id="mask">
+    <div id="loadingPage">
+        <div class="rect1"></div>
+        <div class="rect2"></div>
+        <div class="rect3"></div>
+        <div class="rect4"></div>
+        <div class="rect5"></div>
+    </div>
+</div>
 {{$repository := .Repository.ID}}
 <div class="repository release dataset-list view">
     {{template "repo/header" .}}
     <div class="ui container">
-        <div id="__vue-root"></div>
-    </div>    
+        <div id="newmodel">
+            <div class="ui second">
+                <div class="header" style="padding: 1rem;background-color: rgba(240, 240, 240, 100);">
+                    <h4 id="model_header"></h4>
+                </div>
+                <div class="content content-padding">
+                    <form id="formId" class="ui form dirty">
+                        <input class="ays-ignore" type="hidden" name="initModel" value="{{$.MODEL_COUNT}}">
+                        <div class="ui error message"></div>
+                        <input class="ays-ignore" type="hidden" name="_csrf" value="">
+                        <div class="inline fields">
+                            <div class="required two wide field right aligned">
+                                <label for="jobId">{{.i18n.Tr "repo.model.manage.select.trainjob"}}</label>
+                            </div>
+                            <div class="required thirteen wide inline field">
+                                <div class="ui dropdown selection search loading" id="choice_model">
+                                    <input class="ays-ignore" type="hidden" id="jobId" name="jobId" required>
+                                    <div class="default text">{{.i18n.Tr "repo.model.manage.select.trainjob"}}</div>
+                                    <i class="dropdown icon"></i>
+                                    <div class="menu" id="job-name">
+                                    </div>
+                                </div>
+                                <label for="versionName">{{.i18n.Tr "repo.model.manage.version"}}</label>
+                                <span>&nbsp;</span>
+                                <div class="ui dropdown selection search" id="choice_version">
+                                    <input class="ays-ignore" type="hidden" id="versionName" name="versionName" required>
+                                    <div class="default text">{{.i18n.Tr "repo.model.manage.select.version"}}</div>
+                                    <i class="dropdown icon"></i>
+                                    <div class="menu" id="job-version">
+
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="required inline fields" id="modelname">
+                            <div class="two wide field right aligned">
+                                <label for="name">{{.i18n.Tr "repo.model.manage.model_name"}}</label>
+                            </div>
+                            <div class="eight wide field">
+                                <input class="ays-ignore" id="name" name="name" required maxlength="25" onkeyup="this.value=this.value.replace(/[, ]/g,'')">
+                            </div>
+                        </div>
+                        <div class="required inline fields" id="verionName">
+                            <div class="two wide field right aligned">
+                                <label for="version">{{.i18n.Tr "repo.model.manage.version"}}</label>
+                            </div>
+                            <div class="eight wide field">
+                                <input class="ays-ignore" id="version" name="version" value="" readonly required maxlength="255">
+                            </div>
+                        </div>
+                        <div class="unite min_title inline fields required">
+                            <div class="two wide field right aligned">
+                                <label for="Engine">{{.i18n.Tr "repo.model.manage.engine"}}</label>
+                            </div>
+                            <div class="ui ten wide field dropdown selection" id="choice_Engine">
+                                <input class="ays-ignore" type="hidden" id="engine" name="engine" required>
+                                <div class="default text newtext">{{.i18n.Tr "repo.model.manage.select.engine"}}</div>
+                                <i class="dropdown icon"></i>
+                                <div class="menu" id="job-Engine">
+
+                                </div>
+                            </div>
+                        </div>
+                        <div class="unite min_title inline fields required">
+                            <div class="two wide field right aligned">
+                                <label for="modelSelectedFile">{{.i18n.Tr "repo.model.manage.modelfile"}}</label>
+                            </div>                    
+                            <div class="thirteen wide field" style="position:relative">
+                                <input class="ays-ignore" id="modelSelectedFile" type="text" readonly required onclick="showMenu();"  name="modelSelectedFile" >
+                                <div id="menuContent" class="menuContent" style="display:none;">
+                                    <ul id="treeDemo" class="ztree"></ul>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="inline fields">
+                            <div class="two wide field right aligned">
+                                <label for="Label">{{.i18n.Tr "repo.model.manage.modellabel"}} &nbsp</label>
+                            </div>
+                            <div class="thirteen wide field">
+                                <input class="ays-ignore" id="label" name="label" maxlength="255" placeholder='{{.i18n.Tr "repo.modelarts.train_job.label_place"}}'>
+                            </div>    
+                        </div>
+                        <div class="inline fields">
+                            <div class="two wide field right aligned">                    
+                                <label for="description">{{.i18n.Tr "repo.model.manage.modeldesc"}} &nbsp</label>
+                            </div>
+                            <div class="thirteen wide field">
+                                <textarea id="description" class="ays-ignore" name="description" rows="3"
+                                    maxlength="255" placeholder='{{.i18n.Tr "repo.modelarts.train_job.new_place"}}'
+                                    onchange="this.value=this.value.substring(0, 255)"
+                                    onkeydown="this.value=this.value.substring(0, 255)"
+                                    onkeyup="this.value=this.value.substring(0, 256)"></textarea>
+                            </div> 
+                        </div>
+                        <div class="inline field" style="margin-left:140px;">
+                            <button id="submitId" type="button" class="ui create_train_job green button" onclick="submitSaveModel()"
+                                style="position: absolute;margin-top:16px;">
+                                {{.i18n.Tr "repo.model.manage.sava_model"}}
+                            </button>
+                        </div>
+                    </form>
+                    <div class="actions" style="display: inline-block;margin-left:252px;margin-top:16px;">
+                        <button class="ui button cancel" onclick="backToModelListPage()">{{.i18n.Tr "repo.cloudbrain.cancel"}}</button>
+                    </div>
+                </div>            
+            </div>
+        </div>
+    </div>
 </div>
-<script src="{{StaticUrlPrefix}}/js/vp-modelmanage-local-create-1.js?v={{MD5 AppVer}}"></script>
 {{template "base/footer" .}}
+<script type="text/javascript" src="/self/ztree/js/jquery.ztree.core.js"></script>
+<script type="text/javascript" src="/self/ztree/js/jquery.ztree.excheck.js"></script>
+<script>
+    ;(function() {
+        var setting = {
+			check: {
+				enable: true,
+				chkboxType: {"Y":"ps", "N":"ps"}
+			},
+			view: {
+				dblClickExpand: false
+			},
+			callback: {
+				beforeClick: beforeClick,
+				onCheck: onCheck
+			}
+		};
+
+		function beforeClick(treeId, treeNode) {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo");
+			zTree.checkNode(treeNode, !treeNode.checked, null, true);
+			return false;
+		}
+		
+		function onCheck(e, treeId, treeNode) {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo"),
+			nodes = zTree.getCheckedNodes(true),
+			v = "";
+			for (var i=0, l=nodes.length; i<l; i++) {
+                if(nodes[i].isParent){
+                   continue;
+                }
+                var pathNodes = nodes[i].getPath();
+                var path ="";
+                for(var j=0;j<pathNodes.length;j++){
+                    if(j ==0){
+                        path +=  pathNodes[j].name;
+                    }else{
+                        path += "/" + pathNodes[j].name;
+                    }
+                }
+				v += path + ";";
+			}
+			if (v.length > 0 ) v = v.substring(0, v.length-1);
+			var cityObj = $("#modelSelectedFile");
+			cityObj.attr("value", v);
+		}
+       
+		function showMenu() {
+			var cityObj = $("#modelSelectedFile");
+			var cityOffset = $("#modelSelectedFile").offset();
+			// $("#menuContent").css({left:cityOffset.left + "px", top:cityOffset.top + cityObj.outerHeight() + "px"}).slideDown("fast");
+            $("#menuContent").slideDown("fast");
+
+			$("body").bind("mousedown", onBodyDown);
+		}
+        window.showMenu = showMenu;
+
+		function hideMenu() {
+			$("#menuContent").fadeOut("fast");
+			$("body").unbind("mousedown", onBodyDown);
+		}
+		function onBodyDown(event) {
+			if (!(event.target.id == "menuBtn" || event.target.id == "modelSelectedFile" || event.target.id == "menuContent" || $(event.target).parents("#menuContent").length>0)) {
+				hideMenu();
+			}
+		}
+
+		$(document).ready(function(){
+			//$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+		});
+	
+	
+        let repolink = {{.RepoLink }}
+        let repoId = {{ $repository }}
+        const { _AppSubUrl, _StaticUrlPrefix, csrf } = window.config;
+        $('input[name="_csrf"]').val(csrf)
+        let modelData;
+        function createModelName() {
+            let repoName = location.pathname.split('/')[2]
+            let modelName = repoName + '_model_' + Math.random().toString(36).substr(2, 4)
+            $('#name').val(modelName)
+            $('#version').val("0.0.1")
+        }
+        let dirKey="isOnlyDir--:&";
+        /*
+        function showcreate(obj) {
+            $('.ui.modal.second')
+                .modal({
+                    centered: false,
+                    onShow: function () {
+                        $('#model_header').text({{.i18n.Tr "repo.model.manage.import_new_model"}})
+                        $('input[name="version"]').addClass('model_disabled')
+                        $('.ui.dimmer').css({ "background-color": "rgb(136, 136, 136,0.7)" })
+                        $("#job-name").empty()
+                        createModelName()
+                        loadTrainList()
+                    },
+                    onHide: function () {
+                        var cityObj = $("#modelSelectedFile");
+			            cityObj.attr("value", "");
+                        document.getElementById("formId").reset();
+                        $('#choice_model').dropdown('clear')
+                        $('#choice_version').dropdown('clear')
+                        $('#choice_Engine').dropdown('clear')
+                        $('.ui.dimmer').css({ "background-color": "" })
+                        $('.ui.error.message').text()
+                        $('.ui.error.message').css('display', 'none')
+
+                    }
+                })
+                .modal('show')
+        }
+        */
+        $('#model_header').text({{.i18n.Tr "repo.model.manage.import_new_model"}})
+        $('input[name="version"]').addClass('model_disabled')
+        $('.ui.dimmer').css({ "background-color": "rgb(136, 136, 136,0.7)" })
+        $("#job-name").empty()
+        createModelName()
+        loadTrainList()
+
+        $(function () {
+            $('#choice_model').dropdown({
+                onChange: function (value) {
+                    $("#choice_version").addClass("loading")
+                    $('#choice_version').dropdown('clear')
+                    $("#job-version").empty()
+                    loadTrainVersion(value)
+                }
+            })
+
+            $('#choice_version').dropdown({
+                onChange: function (value) {
+                    console.log("model version:" + value);
+                    if (modelData != null) {
+                        for (var i = 0; i < modelData.length; i++) {
+                            if (modelData[i].VersionName == value) {
+                                setEngine(modelData[i]);
+                                loadModelFile(modelData[i]);
+                                break;
+                            }
+                        }
+                    }
+                }
+            })
+        });
+
+        function versionAdd(version) {
+            let versionArray = version.split('.')
+            if (versionArray[2] == '9') {
+                if (versionArray[1] == '9') {
+                    versionArray[0] = String(Number(versionArray[1]) + 1)
+                    versionArray[1] = '0'
+                } else {
+                    versionArray[1] = String(Number(versionArray[1]) + 1)
+                }
+                versionArray[2] = '0'
+            } else {
+                versionArray[2] = String(Number(versionArray[2]) + 1)
+            }
+            return versionArray.join('.')
+        }
+
+        function loadTrainList() {
+            $.get(`${repolink}/modelmanage/query_train_job?repoId=${repoId}`, (data) => {
+
+                const n_length = data.length
+                if(n_length > 0){
+                    let train_html = ''
+                    for (let i = 0; i < n_length; i++) {
+                        train_html += `<div class="item" data-value="${data[i].JobID}">${data[i].DisplayJobName}</div>`
+                        train_html += '</div>'
+                    }
+                    $("#job-name").append(train_html)
+                    $("#choice_model").removeClass("loading")
+                    $('#choice_model .default.text').text(data[0].DisplayJobName)
+                    $('#choice_model input[name="jobId"]').val(data[0].JobID)
+                    loadTrainVersion()
+                }else{
+                    $("#choice_model").removeClass("loading")
+                }
+            })
+        }
+
+        function loadTrainVersion(value) {
+            let tmp = $('#choice_model input[name="jobId"]').val();
+            let jobId = !value ? $('#choice_model input[name="jobId"]').val() : value
+            $.get(`${repolink}/modelmanage/query_train_job_version?jobId=${jobId}`, (data) => {
+                const n_length = data.length
+                let train_html = '';
+                modelData = data;
+                for (let i = 0; i < n_length; i++) {
+                    train_html += `<div class="item" data-value="${data[i].VersionName}">${data[i].VersionName}</div>`
+                    train_html += '</div>'
+                }
+                if (data.length) {
+                    $("#job-version").append(train_html)
+                    $("#choice_version").removeClass("loading")
+                    var versionName = data[0].VersionName;
+                    if (versionName == null || versionName == "") {
+                        versionName = "V0001";
+                    }
+                    $('#choice_version .default.text').text(versionName)
+                    $('#choice_version input[name="versionName"]').val(versionName)
+                    setEngine(data[0])
+                    loadModelFile(data[0])
+                }
+
+            })
+        }
+
+        function loadModelFile(trainJob){
+            console.log("trainJob=", trainJob);
+            $('#choice_file').dropdown('clear')
+            $("#model-file").empty()
+            if(trainJob ==null || trainJob ==""){
+                console.log("trainJob is null");
+            }else{
+                let type = trainJob.Type;
+                if(type == 2){
+                    if(trainJob.ComputeResource=="NPU"){
+                        type=1;
+                    }else{
+                        type=0;
+                    }
+                }
+                $.get(`${repolink}/modelmanage/query_train_model?jobName=${trainJob.JobName}&type=${type}&versionName=${trainJob.VersionName}`, (data) => {
+                    var cityObj = $("#modelSelectedFile");
+			        cityObj.attr("value", "");
+                    const n_length = data.length
+                    let file_html=''
+                    let firstFileName =''
+                    var zNodes=[];
+                    var nodesMap={};
+                    for (let i=0;i<n_length;i++){
+                        var parentNodeMap = nodesMap;
+                        var fileSplits = data[i].FileName.split("/");
+                        for(let j=0;j < fileSplits.length;j++){
+                            if(fileSplits[j] == ""){
+                                break;
+                            }
+                            if(parentNodeMap[fileSplits[j]] == null){
+                                parentNodeMap[fileSplits[j]] = {};
+                            }
+                            parentNodeMap = parentNodeMap[fileSplits[j]];
+                        }
+                    }
+                    for (let i=0;i<n_length;i++){
+                        var parentNodeMap = nodesMap;
+                        var fileSplits = data[i].FileName.split("/");
+                        for(let j=0;j < fileSplits.length;j++){
+                            if(fileSplits[j] == ""){
+                                if(data[i].FileName[data[i].FileName.length -1] =="/"){
+                                    if(Object.keys(parentNodeMap).length ==0){
+                                        parentNodeMap[dirKey]="true";
+                                    }
+                                }
+                                break;
+                            }
+                            parentNodeMap = parentNodeMap[fileSplits[j]];
+                        }
+                    }
+                    convertToNode(zNodes,nodesMap);
+                    $.fn.zTree.init($("#treeDemo"), setting, zNodes);
+                })
+            }
+        }
+
+        function convertToNode(nodeList,nodesMap){
+            var keyList = Object.keys(nodesMap);
+            keyList.sort(function(a,b){
+	            return a-b;
+            });
+            var isFirst = true;
+            for(var i=0; i<keyList.length;i++){
+                var node = {};
+                node["name"] = keyList[i];
+                nodeList.push(node);
+                if(nodesMap[keyList[i]] != null && Object.keys(nodesMap[keyList[i]]).length >0){
+                    if(nodesMap[keyList[i]][dirKey] != null){
+                        node["open"] = false;
+                        node["isParent"] = true;
+                    }else{
+                        node["children"]=[];
+                        if(isFirst){
+                            node["open"] = true;
+                            isFirst= false;
+                        }
+                        convertToNode(node["children"],nodesMap[keyList[i]]);
+                    }
+                    
+                }
+            }
+        }
+
+        function setEngine(trainJob) {
+            console.log("trainJob=", trainJob);
+            $('#choice_Engine').dropdown('clear')
+            $("#job-Engine").empty()
+            if (trainJob.EngineName != null && trainJob.EngineName != "") {
+                srcEngine = trainJob.EngineName.split('-')[0]
+                srcEngine = srcEngine.trim().toLowerCase();
+                let selectedText = "PyTorch";
+                let selectedValue = 0;
+                let itemHtml = "<option class=\"item\" data-value=\"0\">PyTorch</option>";
+                if (srcEngine == 'tensorflow') {
+                    selectedText = "TensorFlow";
+                    selectedValue = 1;
+                    itemHtml += "<option class=\"active item\" data-value=\"1\">TensorFlow</option>";
+                } else {
+                    itemHtml += "<option class=\"item\" data-value=\"1\">TensorFlow</option>";
+                }
+                if (srcEngine == 'mindspore') {
+                    selectedText = "MindSpore";
+                    selectedValue = 2;
+                    itemHtml += "<option class=\"active item\" data-value=\"2\">MindSpore</option>";
+                } else {
+                    itemHtml += "<option class=\"item\" data-value=\"2\">MindSpore</option>";
+                }
+                itemHtml += "<option class=\"item\" data-value=\"4\">PaddlePaddle</option>"
+                itemHtml += "<option class=\"item\" data-value=\"5\">OneFlow</option>"
+                itemHtml += "<option class=\"item\" data-value=\"6\">MXNet</option>"
+                itemHtml += "<option class=\"item\" data-value=\"3\">Other</option>"
+
+                $('#choice_Engine .default.text').text(selectedText)
+                $('#choice_Engine input[name="engine"]').val(selectedValue)
+                $("#job-Engine").append(itemHtml);
+                $("#choice_Engine").removeClass('disabled');
+            } else {
+                let itemHtml = "<option class=\"active item\" data-value=\"0\">PyTorch</option>";
+                itemHtml += "<option class=\"item\" data-value=\"1\">TensorFlow</option>"
+                itemHtml += "<option class=\"item\" data-value=\"2\">MindSpore</option>"
+                itemHtml += "<option class=\"item\" data-value=\"4\">PaddlePaddle</option>"
+                itemHtml += "<option class=\"item\" data-value=\"5\">OneFlow</option>"
+                itemHtml += "<option class=\"item\" data-value=\"6\">MXNet</option>"
+                itemHtml += "<option class=\"item\" data-value=\"3\">Other</option>"
+                $('#choice_Engine .default.text').text("PyTorch");
+                $('#choice_Engine input[name="engine"]').val(0)
+                $("#job-Engine").append(itemHtml);
+                $("#choice_Engine").removeClass('disabled');
+            }
+        }
+
+        function check() {
+            let jobid = document.getElementById("jobId").value;
+            let versionname = document.getElementById("versionName").value;
+            let name = document.getElementById("name").value;
+            let version = document.getElementById("version").value;
+            let modelSelectedFile = document.getElementById("modelSelectedFile").value;            
+            if (name == "") {
+                $("#modelname").closest('.required').addClass("error");
+                return false;
+            } else {
+                $("#modelname").closest('.required').removeClass("error");
+            }
+            if (versionname == "") {
+                $("#verionname").closest('.required').addClass("error");
+                return false;
+            } else {
+                $("#verionname").closest('.required').removeClass("error");
+            }
+            if (jobid == "") {
+                 $("#jobId").closest('.required').addClass("error");
+                return false;
+            } else {
+                $("#jobId").closest('.required').removeClass("error");
+            }
+            if (modelSelectedFile == "") {
+                $("#modelSelectedFile").closest('.required').addClass("error");
+                return false;
+            } else {
+                $("#modelSelectedFile").closest('.required').removeClass("error");
+            }
+            if (versionname == "") {
+                $("#versionName").closest('.required').addClass("error");
+                return false;
+            } else {
+                $("#versionName").closest('.required').removeClass("error");
+            }
+            return true;
+        }
+
+        function submitSaveModel() {
+            let flag = check();
+            if (!flag) return false;
+            $(".ui.error.message").hide();
+            let cName = $("input[name='name']").val();
+            let version = $("input[name='version']").val();
+            let data = $("#formId").serialize();
+            const initModel = $("input[name='initModel']").val();
+            let url_href = location.href.split("create_online_model_tmpl")[0] + 'create_new_model';
+            $("#mask").css({ display: "block", "z-index": "9999" });
+            $.ajax({
+                url: url_href,
+                type: "POST",
+                data: data,
+                success: function (res) {
+                    backToModelListPage();
+                },
+                error: function (xhr) {
+                    // 隐藏 loading
+                    // 只有请求不正常（状态码不为200）才会执行
+                    $(".ui.error.message").text(xhr.responseText);
+                    $(".ui.error.message").show();
+                },
+                complete: function (xhr) {
+                    $("#mask").css({ display: "none", "z-index": "1" });
+                },
+            });
+        }
+
+        function backToModelListPage() {
+            let url_href = location.href.split("create_online_model_tmpl")[0] + 'show_model';
+            window.location.href = url_href;
+        }
+        window.submitSaveModel = submitSaveModel;
+        window.backToModelListPage = backToModelListPage;
+    })();
+</script>
diff --git a/templates/repo/modelmanage/index.tmpl b/templates/repo/modelmanage/index.tmpl
index 2cced090f..7f21e4053 100644
--- a/templates/repo/modelmanage/index.tmpl
+++ b/templates/repo/modelmanage/index.tmpl
@@ -77,7 +77,7 @@
                 <a class="ui button {{if .Permission.CanWrite $.UnitTypeModelManage}} blue m-blue-btn {{else}} disabled {{end}}"
                     href="{{.RepoLink}}/modelmanage/create_local_model_tmpl1">导入本地模型</a>
                 <a class="ui button {{if .Permission.CanWrite $.UnitTypeModelManage}} green {{else}} disabled {{end}}"
-                    onclick="showcreate(this)">导入线上模型</a>
+                    href="{{.RepoLink}}/modelmanage/create_online_model_tmpl">导入线上模型</a>
             </div>
         </div>
         {{if eq $.MODEL_COUNT 0}}
diff --git a/web_src/vuepages/pages/modelmanage/common/modelmanage-common-detail.vue b/web_src/vuepages/pages/modelmanage/common/modelmanage-common-detail.vue
index 997722807..1aff6d33f 100644
--- a/web_src/vuepages/pages/modelmanage/common/modelmanage-common-detail.vue
+++ b/web_src/vuepages/pages/modelmanage/common/modelmanage-common-detail.vue
@@ -21,8 +21,8 @@
             <div class="row">
               <div class="tit">可用集群：</div>
               <div class="val">
-                <div class="txt-wrap" :title="state.type == 0 ? 'CPU/GPU' : 'NPU'">
-                  {{ state.type == 0 ? 'CPU/GPU' : 'NPU' }}
+                <div class="txt-wrap" :title="state.typeStr">
+                  {{ state.typeStr }}
                 </div>
               </div>
             </div>
@@ -32,10 +32,22 @@
                 <div class="txt-wrap" :title="state.modelSize">{{ state.modelSize }}</div>
               </div>
             </div>
-            <div v-show="isExpanded" class="row">
+            <div v-show="isExpanded" class="row" :class="isEidtDescr ? 'edit-row' : ''">
               <div class="tit">描述：</div>
-              <div class="val">
-                <div class="txt-wrap" :title="state.description">{{ state.description }}</div>
+              <div class="val" :class="isEidtDescr ? 'edit-val' : ''">
+                <div v-if="!isEidtDescr" class="txt-wrap" :title="state.description"
+                  style="max-width:100%;width:unset;padding-right:20px;">
+                  <span>{{ state.description }}</span>
+                  <i v-if="canOperate" style="position:absolute;right:0;top:3px;color:rgb(22, 132, 252);cursor:pointer;"
+                    class="el-icon-edit" @click="editDescr = state._description; isEidtDescr = true;"></i>
+                </div>
+                <div class="txt-edit" v-if="isEidtDescr">
+                  <el-input type="textarea" v-model="editDescr" :maxLength="255" placeholder="描述字数不超过255个字符"></el-input>
+                  <i style="position:absolute;right:-4px;bottom:20px;color:rgb(255, 37, 37);cursor:pointer;"
+                    class="icon times" @click="isEidtDescr = false;"></i>
+                  <i style="position:absolute;right:-5px;bottom:2px;color:rgb(39, 177, 72);cursor:pointer;"
+                    @click="submitEidt('descr')" class="icon check"></i>
+                </div>
               </div>
             </div>
           </div>
@@ -52,10 +64,22 @@
                 <div class="txt-wrap" :title="state.createTime">{{ state.createTime }}</div>
               </div>
             </div>
-            <div v-show="isExpanded" class="row">
+            <div v-show="isExpanded" class="row" :class="isEidtLabel ? 'edit-row' : ''">
               <div class="tit">标签：</div>
-              <div class="val">
-                <div class="txt-wrap" :title="state.label">{{ state.label }}</div>
+              <div class="val" :class="isEidtLabel ? 'edit-val' : ''">
+                <div v-if="!isEidtLabel" class="txt-wrap" :title="state.label"
+                  style="max-width:100%;width:unset;padding-right:20px;">
+                  <span>{{ state.label }}</span>
+                  <i v-if="canOperate" style="position:absolute;right:0;top:3px;color:rgb(22, 132, 252);cursor:pointer;"
+                    class="el-icon-edit" @click="editLabel = state._label; isEidtLabel = true;"></i>
+                </div>
+                <div class="txt-edit" v-if="isEidtLabel">
+                  <el-input v-model="editLabel" :maxLength="255" placeholder="输入标签，多个标签用空格区分"></el-input>
+                  <i style="position:absolute;right:-5px;bottom:20px;color:rgb(255, 37, 37);cursor:pointer;"
+                    class="icon times" @click="isEidtLabel = false;"></i>
+                  <i style="position:absolute;right:-5px;bottom:2px;color:rgb(39, 177, 72);cursor:pointer;"
+                    @click="submitEidt('label')" class="icon check"></i>
+                </div>
               </div>
             </div>
           </div>
@@ -66,13 +90,13 @@
             <div class="row">
               <div class="tit">训练任务：</div>
               <div class="val">
-                <div class="txt-wrap" :title="state.displayJobName">{{ state.displayJobName }}</div>
+                <div class="txt-wrap" v-html="state.displayJobName"></div>
               </div>
             </div>
             <div class="row">
               <div class="tit">代码分支：</div>
               <div class="val">
-                <div class="txt-wrap" :title="state.branchName">{{ state.branchName }}</div>
+                <div class="txt-wrap" v-html="state.branchName"></div>
               </div>
             </div>
             <div class="row">
@@ -192,6 +216,10 @@ export default {
         label: '',
         description: '',
       },
+      editDescr: '',
+      isEidtDescr: false,
+      editLabel: '',
+      isEidtLabel: false,
       engineList: MODEL_ENGINES,
       curVersion: '',
       modelList: [],
@@ -205,6 +233,7 @@ export default {
       this.modelType = data.modelType;
       this.canOperate = data.isCanOper;
       this.state.type = data.type;
+      this.state.typeStr = data.type == 0 ? 'CPU/GPU' : data.type == 1 ? 'NPU' : '';
       this.state.id = data.id;
       this.state.name = data.name;
       this.state.version = data.version;
@@ -212,7 +241,9 @@ export default {
       this.state.engineName = getListValueWithKey(MODEL_ENGINES, data.engine.toString());
       this.state.modelSize = transFileSize(data.size);
       this.state.label = data.label || '--';
+      this.state._label = data.label;
       this.state.description = data.description || '--';
+      this.state._description = data.description;
       this.state.createTime = formatDate(new Date(data.createdUnix * 1000), 'yyyy-MM-dd HH:mm:ss');
 
       const trainTaskInfo = data.trainTaskInfo ? JSON.parse(data.trainTaskInfo) : '';
@@ -228,14 +259,27 @@ export default {
       if (trainTaskInfo) {
         const parameters = trainTaskInfo.Parameters ? JSON.parse(trainTaskInfo.Parameters).parameter : [];
         const parametersStr = parameters.map((item) => { return item.label + '=' + item.value }).join('; ');
+        const taskType = trainTaskInfo.Type;
+        let taskUrl = location.href.split('modelmanage')[0];
+        if (taskType == 0) {
+          taskUrl = taskUrl + 'cloudbrain/train-job/' + trainTaskInfo.JobID;
+        } else if (taskType == 1) {
+          taskUrl = taskUrl + 'modelarts/train-job/' + trainTaskInfo.JobID;
+        } else if (taskType == 2) {
+          taskUrl = taskUrl + 'grampus/train-job/' + trainTaskInfo.JobID;
+        }
+        const versionName = trainTaskInfo.VersionName;
+        const versionHtml = versionName ? `<span class="append-txt" title="${versionName}">${versionName}</span>` : '';
+        const codeCommitID = data.codeCommitID;
+        const codeCommitIDHtml = codeCommitID ? `<span class="append-txt" title="${codeCommitID}">${codeCommitID}</span>` : '';
         Object.assign(this.state, {
-          displayJobName: trainTaskInfo.DisplayJobName,
-          branchName: trainTaskInfo.BranchName,
+          displayJobName: `<a href="${taskUrl}" title="${trainTaskInfo.DisplayJobName}">${trainTaskInfo.DisplayJobName}</a>${versionHtml}`,
+          branchName: `${trainTaskInfo.BranchName}${codeCommitIDHtml}`,
           bootFile: trainTaskInfo.BootFile,
           datasetName: trainTaskInfo.DatasetName,
           parameters: parametersStr || '--',
           workServerNumber: trainTaskInfo.WorkServerNumber || '--',
-          specStr: trainTaskInfo.Spec ? trainTaskInfo.Spec.toString() : '--'
+          specStr: trainTaskInfo.FlavorName || '--',
         });
       }
       this.curVersion = version;
@@ -256,6 +300,43 @@ export default {
     goUploadPage() {
       window.location.href = `${this.repo}/modelmanage/create_local_model_tmpl2?type=0&name=${this.state.name}&id=${this.state.id}`;
     },
+    submitEidt(type) {
+      const obj = {
+        repo: this.repo,
+        type: this.state.type,
+        id: this.state.id,
+        name: this.state.name,
+        version: this.state.version,
+        engine: this.state.engine,
+        label: type == 'label' ? this.editLabel : this.state.label,
+        description: type == 'descr' ? this.editDescr : this.state.description,
+      };
+      modifyModel(obj).then(res => {
+        res = res.data;
+        if (res && res.code == '0') {
+          if (type == 'label') {
+            this.state.label = this.editLabel;
+            this.state._label = this.editLabel;
+            this.isEidtLabel = false;
+          } else if (type == 'descr') {
+            this.state.description = this.editDescr;
+            this.state._description = this.editDescr;
+            this.isEidtDescr = false;
+          }
+        } else {
+          this.$message({
+            type: 'error',
+            message: '信息修改失败',
+          });
+        }
+      }).catch(err => {
+        console.log(err);
+        this.$message({
+          type: 'error',
+          message: '信息修改失败',
+        });
+      });
+    },
     deleteFile(file) {
       this.$confirm('请确认是否删除当前模型文件？', this.$t('tips'), {
         confirmButtonText: this.$t('confirm1'),
@@ -350,8 +431,12 @@ export default {
         .row {
           display: flex;
           height: 32px;
-          align-items: center;
           margin-bottom: 4px;
+          align-items: center;
+
+          &.edit-row {
+            height: unset;
+          }
 
           .tit {
             width: 160px;
@@ -365,14 +450,30 @@ export default {
             position: relative;
             height: 20px;
 
+            &.edit-val {
+              height: unset;
+            }
+
             .txt-wrap {
               position: absolute;
               overflow: hidden;
               text-overflow: ellipsis;
               white-space: nowrap;
               width: 100%;
+
+              /deep/.append-txt {
+                margin-left: 6px;
+                background-color: gainsboro;
+                padding: 2px;
+                border-radius: 2px;
+                font-size: 12px;
+              }
             }
           }
+
+          .txt-edit {
+            padding-right: 20px;
+          }
         }
       }
     }
@@ -466,9 +567,13 @@ export default {
   }
 }
 
-/deep/ .el-input__inner {
-  font-weight: 600;
+.el-select {
+  /deep/ .el-input__inner {
+    font-weight: 600;
+  }
+}
 
+/deep/ .el-input__inner {
   &:focus {
     border-color: #85b7d9;
   }

From 208a99809fb830d1a29e0074bd713623f3c313c7 Mon Sep 17 00:00:00 2001
From: chenyifan01 <cyf_uestc@outlook.com>
Date: Wed, 9 Nov 2022 15:36:01 +0800
Subject: [PATCH 118/187] Revert "#3157"

This reverts commit 3aca1dc0749ccbe1af32063a2a621fe721f6bb01.
---
 routers/api/v1/repo/cloudbrain.go | 23 ++++-------------------
 routers/api/v1/repo/modelarts.go  | 22 +++++-----------------
 routers/repo/grampus.go           | 12 ++----------
 3 files changed, 11 insertions(+), 46 deletions(-)

diff --git a/routers/api/v1/repo/cloudbrain.go b/routers/api/v1/repo/cloudbrain.go
index 9da1251e4..7022dc011 100755
--- a/routers/api/v1/repo/cloudbrain.go
+++ b/routers/api/v1/repo/cloudbrain.go
@@ -607,24 +607,6 @@ func CloudbrainGetLog(ctx *context.APIContext) {
 	lines := ctx.QueryInt("lines")
 	baseLine := ctx.Query("base_line")
 	order := ctx.Query("order")
-
-	//Logs can only be downloaded if the file exists
-	//and the current user is an administrator or the creator of the task
-	if !job.IsUserHasRight(ctx.User) {
-		re := map[string]interface{}{
-			"JobID":          ID,
-			"LogFileName":    "",
-			"StartLine":      0,
-			"EndLine":        0,
-			"Content":        "",
-			"Lines":          0,
-			"CanLogDownload": false,
-			"StartTime":      job.StartTime,
-		}
-		ctx.JSON(http.StatusOK, re)
-		return
-	}
-
 	var result map[string]interface{}
 	resultPath := "/model"
 	if job.JobType == string(models.JobTypeInference) || job.JobType == string(models.JobTypeModelSafety) {
@@ -668,7 +650,10 @@ func CloudbrainGetLog(ctx *context.APIContext) {
 		content = content + ctx.Data["existStr"].(string)
 	}
 	logFileName := result["FileName"]
-	canLogDownload := logFileName != nil && logFileName != ""
+
+	//Logs can only be downloaded if the file exists
+	//and the current user is an administrator or the creator of the task
+	canLogDownload := logFileName != nil && logFileName != "" && job.IsUserHasRight(ctx.User)
 
 	re := map[string]interface{}{
 		"JobID":          ID,
diff --git a/routers/api/v1/repo/modelarts.go b/routers/api/v1/repo/modelarts.go
index 00cdea0ef..16e4997a3 100755
--- a/routers/api/v1/repo/modelarts.go
+++ b/routers/api/v1/repo/modelarts.go
@@ -274,21 +274,6 @@ func TrainJobGetLog(ctx *context.APIContext) {
 		log.Error("GetCloudbrainByJobID(%s) failed:%v", jobID, err.Error())
 		return
 	}
-
-	if !task.IsUserHasRight(ctx.User) {
-		ctx.JSON(http.StatusOK, map[string]interface{}{
-			"JobID":          jobID,
-			"LogFileName":    "",
-			"StartLine":      0,
-			"EndLine":        0,
-			"Content":        "",
-			"Lines":          0,
-			"CanLogDownload": false,
-			"StartTime":      task.StartTime,
-		})
-		return
-	}
-
 	resultLogFile, result, err := trainJobGetLogContent(jobID, task.VersionID, baseLine, order, lines_int)
 	if err != nil {
 		log.Error("trainJobGetLog(%s) failed:%v", jobID, err.Error())
@@ -305,12 +290,15 @@ func TrainJobGetLog(ctx *context.APIContext) {
 		"EndLine":        result.EndLine,
 		"Content":        result.Content,
 		"Lines":          result.Lines,
-		"CanLogDownload": canLogDownload(task),
+		"CanLogDownload": canLogDownload(ctx.User, task),
 		"StartTime":      task.StartTime,
 	})
 }
 
-func canLogDownload(task *models.Cloudbrain) bool {
+func canLogDownload(user *models.User, task *models.Cloudbrain) bool {
+	if task == nil || !task.IsUserHasRight(user) {
+		return false
+	}
 	prefix := strings.TrimPrefix(path.Join(setting.TrainJobModelPath, task.JobName, modelarts.LogPath, task.VersionName), "/") + "/job"
 	_, err := storage.GetObsLogFileName(prefix)
 	if err != nil {
diff --git a/routers/repo/grampus.go b/routers/repo/grampus.go
index a2a021a43..e16d39a00 100755
--- a/routers/repo/grampus.go
+++ b/routers/repo/grampus.go
@@ -935,25 +935,17 @@ func GrampusGetLog(ctx *context.Context) {
 		return
 	}
 
-	if !job.IsUserHasRight(ctx.User) {
-		ctx.JSON(http.StatusOK, map[string]interface{}{
-			"JobName":        job.JobName,
-			"Content":        "",
-			"CanLogDownload": false,
-		})
-		return
-	}
-
 	content, err := grampus.GetTrainJobLog(job.JobID)
 	if err != nil {
 		log.Error("GetTrainJobLog failed: %v", err, ctx.Data["MsgID"])
 		ctx.ServerError(err.Error(), err)
 		return
 	}
+	canLogDownload := err == nil && job.IsUserHasRight(ctx.User)
 	ctx.JSON(http.StatusOK, map[string]interface{}{
 		"JobName":        job.JobName,
 		"Content":        content,
-		"CanLogDownload": true,
+		"CanLogDownload": canLogDownload,
 	})
 
 	return

From ce24e32f900caba3844bbe2fc37bdf21dc4fc44a Mon Sep 17 00:00:00 2001
From: chenyifan01 <cyf_uestc@outlook.com>
Date: Wed, 9 Nov 2022 17:07:11 +0800
Subject: [PATCH 119/187] #3157 fix bug

---
 routers/repo/grampus.go | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/routers/repo/grampus.go b/routers/repo/grampus.go
index e16d39a00..aa3b7ef78 100755
--- a/routers/repo/grampus.go
+++ b/routers/repo/grampus.go
@@ -938,7 +938,11 @@ func GrampusGetLog(ctx *context.Context) {
 	content, err := grampus.GetTrainJobLog(job.JobID)
 	if err != nil {
 		log.Error("GetTrainJobLog failed: %v", err, ctx.Data["MsgID"])
-		ctx.ServerError(err.Error(), err)
+		ctx.JSON(http.StatusOK, map[string]interface{}{
+			"JobName":        job.JobName,
+			"Content":        "",
+			"CanLogDownload": false,
+		})
 		return
 	}
 	canLogDownload := err == nil && job.IsUserHasRight(ctx.User)

From bedb6e63eaf32a527aa7ad2f37820c82a6d7c427 Mon Sep 17 00:00:00 2001
From: ychao_1983 <ychao_1983@sina.com>
Date: Thu, 10 Nov 2022 10:52:42 +0800
Subject: [PATCH 120/187] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20'services/cloudbra?=
 =?UTF-8?q?in/cloudbrainTask/sync=5Fstatus.go'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 services/cloudbrain/cloudbrainTask/sync_status.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/cloudbrain/cloudbrainTask/sync_status.go b/services/cloudbrain/cloudbrainTask/sync_status.go
index 7153a7ec0..67dc4d3b7 100644
--- a/services/cloudbrain/cloudbrainTask/sync_status.go
+++ b/services/cloudbrain/cloudbrainTask/sync_status.go
@@ -14,7 +14,7 @@ import (
 var noteBookOKMap = make(map[int64]int, 20)
 
 //if a task notebook url can get  two times,  the notebook can browser.
-const successfulCount = 2
+const successfulCount = 3
 
 func SyncCloudBrainOneStatus(task *models.Cloudbrain) (*models.Cloudbrain, error) {
 	jobResult, err := cloudbrain.GetJob(task.JobID)

From 9a07c96e53580f5d3e0b1611c0f33cdbdc932804 Mon Sep 17 00:00:00 2001
From: chenshihai <chenshh@pcl.ac.cn>
Date: Thu, 10 Nov 2022 13:08:22 +0800
Subject: [PATCH 121/187] update

---
 options/locale/locale_en-US.ini               |   4 +-
 options/locale/locale_zh-CN.ini               |   4 +-
 templates/repo/modelmanage/create_online.tmpl |  24 ++-
 templates/repo/modelmanage/index.tmpl         |   7 +-
 web_src/js/components/Model.vue               |   4 +-
 web_src/js/components/basic/editDialog.vue    |   2 +-
 web_src/js/features/i18nVue.js                |   6 +
 web_src/js/index.js                           |  12 +-
 web_src/vuepages/langs/config/en-US.js        |  60 +++++++
 web_src/vuepages/langs/config/zh-CN.js        |  60 +++++++
 .../common/modelmanage-common-detail.vue      |  90 ++++++-----
 .../local/modelmanage-local-create-1.vue      |  55 ++++---
 .../local/modelmanage-local-create-2.vue      | 152 ++++++++++--------
 13 files changed, 331 insertions(+), 149 deletions(-)

diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index 955690800..7eac45622 100755
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -1266,11 +1266,13 @@ model.manage.model_accuracy = Model Accuracy
 model.convert=Model Transformation
 model.list=Model List
 model.manage.create_new_convert_task=Create Model Transformation Task
-
+model.manage.import_local_model=Import Local Model
+model.manage.import_online_model=Import Online Model
 model.manage.notcreatemodel=No model has been created
 model.manage.init1=Code version: You have not initialized the code repository, please
 model.manage.init2=initialized first ;
 model.manage.createtrainjob_tip=Training task: you haven't created a training task, please create it first
+model.manage.createmodel_tip=You can import local model or online model. Import online model should create
 model.manage.createtrainjob=Training task.
 model.manage.delete=Delete Model
 model.manage.delete_confirm=Are you sure to delete this model? Once this model is deleted, it cannot be restored.
diff --git a/options/locale/locale_zh-CN.ini b/options/locale/locale_zh-CN.ini
index 63ff87345..afcc50436 100755
--- a/options/locale/locale_zh-CN.ini
+++ b/options/locale/locale_zh-CN.ini
@@ -1281,11 +1281,13 @@ model.manage.model_accuracy = 模型精度
 model.convert=模型转换任务
 model.list=模型列表
 model.manage.create_new_convert_task=创建模型转换任务
-
+model.manage.import_local_model=导入本地模型
+model.manage.import_online_model=导入线上模型
 model.manage.notcreatemodel=未创建过模型
 model.manage.init1=代码版本：您还没有初始化代码仓库，请先
 model.manage.init2=创建代码版本；
 model.manage.createtrainjob_tip=训练任务：您还没创建过训练任务，请先创建
+model.manage.createmodel_tip=您可以导入本地模型或者导入线上模型。导入线上模型需先
 model.manage.createtrainjob=训练任务。
 model.manage.delete=删除模型
 model.manage.delete_confirm=你确认删除该模型么？此模型一旦删除不可恢复。
diff --git a/templates/repo/modelmanage/create_online.tmpl b/templates/repo/modelmanage/create_online.tmpl
index db3ca6cf9..f3334a98a 100644
--- a/templates/repo/modelmanage/create_online.tmpl
+++ b/templates/repo/modelmanage/create_online.tmpl
@@ -56,7 +56,7 @@
         <div id="newmodel">
             <div class="ui second">
                 <div class="header" style="padding: 1rem;background-color: rgba(240, 240, 240, 100);">
-                    <h4 id="model_header"></h4>
+                    <h4 id="model_header">{{.i18n.Tr "repo.model.manage.import_online_model"}}</h4>
                 </div>
                 <div class="content content-padding">
                     <form id="formId" class="ui form dirty">
@@ -95,7 +95,7 @@
                                 <input class="ays-ignore" id="name" name="name" required maxlength="25" onkeyup="this.value=this.value.replace(/[, ]/g,'')">
                             </div>
                         </div>
-                        <div class="required inline fields" id="verionName">
+                        <div class="required inline fields" id="verionName" style="display:none;">
                             <div class="two wide field right aligned">
                                 <label for="version">{{.i18n.Tr "repo.model.manage.version"}}</label>
                             </div>
@@ -146,16 +146,14 @@
                                     onkeydown="this.value=this.value.substring(0, 255)"
                                     onkeyup="this.value=this.value.substring(0, 256)"></textarea>
                             </div> 
-                        </div>
-                        <div class="inline field" style="margin-left:140px;">
-                            <button id="submitId" type="button" class="ui create_train_job green button" onclick="submitSaveModel()"
-                                style="position: absolute;margin-top:16px;">
-                                {{.i18n.Tr "repo.model.manage.sava_model"}}
-                            </button>
-                        </div>
+                        </div>                       
                     </form>
-                    <div class="actions" style="display: inline-block;margin-left:252px;margin-top:16px;">
-                        <button class="ui button cancel" onclick="backToModelListPage()">{{.i18n.Tr "repo.cloudbrain.cancel"}}</button>
+                     <div class="inline field" style="margin-left:140px;margin-top:28px;">
+                        <button id="submitId" type="button" class="ui create_train_job green button" onclick="submitSaveModel()"
+                            style="">
+                            {{.i18n.Tr "repo.model.manage.sava_model"}}
+                        </button>
+                        <button style="margin-left:0px;" class="ui button cancel" onclick="backToModelListPage()">{{.i18n.Tr "repo.cloudbrain.cancel"}}</button>
                     </div>
                 </div>            
             </div>
@@ -253,8 +251,7 @@
             $('.ui.modal.second')
                 .modal({
                     centered: false,
-                    onShow: function () {
-                        $('#model_header').text({{.i18n.Tr "repo.model.manage.import_new_model"}})
+                    onShow: function () {                        
                         $('input[name="version"]').addClass('model_disabled')
                         $('.ui.dimmer').css({ "background-color": "rgb(136, 136, 136,0.7)" })
                         $("#job-name").empty()
@@ -277,7 +274,6 @@
                 .modal('show')
         }
         */
-        $('#model_header').text({{.i18n.Tr "repo.model.manage.import_new_model"}})
         $('input[name="version"]').addClass('model_disabled')
         $('.ui.dimmer').css({ "background-color": "rgb(136, 136, 136,0.7)" })
         $("#job-name").empty()
diff --git a/templates/repo/modelmanage/index.tmpl b/templates/repo/modelmanage/index.tmpl
index 7f21e4053..1befa48ee 100644
--- a/templates/repo/modelmanage/index.tmpl
+++ b/templates/repo/modelmanage/index.tmpl
@@ -75,9 +75,9 @@
             <div class="column right aligned">
                 <!--  -->
                 <a class="ui button {{if .Permission.CanWrite $.UnitTypeModelManage}} blue m-blue-btn {{else}} disabled {{end}}"
-                    href="{{.RepoLink}}/modelmanage/create_local_model_tmpl1">导入本地模型</a>
+                    href="{{.RepoLink}}/modelmanage/create_local_model_tmpl1">{{$.i18n.Tr "repo.model.manage.import_local_model"}}</a>
                 <a class="ui button {{if .Permission.CanWrite $.UnitTypeModelManage}} green {{else}} disabled {{end}}"
-                    href="{{.RepoLink}}/modelmanage/create_online_model_tmpl">导入线上模型</a>
+                    href="{{.RepoLink}}/modelmanage/create_online_model_tmpl">{{$.i18n.Tr "repo.model.manage.import_online_model"}}</a>
             </div>
         </div>
         {{if eq $.MODEL_COUNT 0}}
@@ -85,6 +85,7 @@
             <div class="ui icon header bgtask-header-pic"></div>
             <div class="bgtask-content-header">{{$.i18n.Tr "repo.model.manage.notcreatemodel"}}</div>
             <div class="bgtask-content">
+                <!--
                 {{if $.RepoIsEmpty}}
                 <div class="bgtask-content-txt">{{$.i18n.Tr "repo.model.manage.init1"}}<a href="{{.RepoLink}}">{{$.i18n.Tr "repo.model.manage.init2"}}</a></div>
                 {{end}}
@@ -92,6 +93,8 @@
                 <div class="bgtask-content-txt">{{$.i18n.Tr "repo.model.manage.createtrainjob_tip"}}<a
                         href="{{.RepoLink}}/modelarts/train-job">&nbsp;{{$.i18n.Tr "repo.model.manage.createtrainjob"}}</a></div>
                 {{end}}
+                -->
+                <div class="bgtask-content-txt">{{$.i18n.Tr "repo.model.manage.createmodel_tip"}}<a href="{{.RepoLink}}/modelarts/train-job">&nbsp;{{$.i18n.Tr "repo.model.manage.createtrainjob"}}</a></div>
                 <div class="bgtask-content-txt">{{$.i18n.Tr "repo.platform_instructions1"}}<a href="https://git.openi.org.cn/zeizei/OpenI_Learning">&nbsp;{{$.i18n.Tr "repo.platform_instructions2"}}&nbsp;</a>{{$.i18n.Tr "repo.platform_instructions3"}}</div>
 
             </div>
diff --git a/web_src/js/components/Model.vue b/web_src/js/components/Model.vue
index 62fca9b91..2a179878b 100644
--- a/web_src/js/components/Model.vue
+++ b/web_src/js/components/Model.vue
@@ -23,7 +23,7 @@
                 <i class="el-icon-arrow-right"></i>
               </div>
               <!-- <i class="el-icon-time"></i> -->
-              <span :class="scope.row.modelType == '1' ? 'm-local' : 'm-online'">{{ scope.row.modelType == '1' ? '本地' : '线上' }}</span>
+              <span v-if="!scope.row.Children" :class="scope.row.modelType == '1' ? 'm-local' : 'm-online'">{{ scope.row.modelType == '1' ? i18n.local : i18n.online }}</span>
               <a
                 class="text-over"
                 :href="showinfoHref + scope.row.name"
@@ -155,7 +155,7 @@
                   v-if="scope.row.modelType == 1"
                   :href="url + 'create_local_model_tmpl1?type=1&name=' + scope.row.name + '&id=' + scope.row.id"
                   :class="{ disabled: !scope.row.isCanOper }"
-                  >{{ '修改' }}</a
+                  >{{ i18n.modify }}</a
                 >
                 <a
                   :href="loadhref + scope.row.id"
diff --git a/web_src/js/components/basic/editDialog.vue b/web_src/js/components/basic/editDialog.vue
index 19a68166f..b82b9b569 100644
--- a/web_src/js/components/basic/editDialog.vue
+++ b/web_src/js/components/basic/editDialog.vue
@@ -1,6 +1,6 @@
 <template>
 
-    <el-dialog :close-on-click-modal="!deleteLoading" v-dlg-drag :title="dialogTitle" :visible.sync="deleteDialog">
+    <el-dialog :close-on-click-modal="!deleteLoading" :title="dialogTitle" :visible.sync="deleteDialog">
         
             <div class="message-box__content">
                 
diff --git a/web_src/js/features/i18nVue.js b/web_src/js/features/i18nVue.js
index f6d5a6411..2983b3dc1 100644
--- a/web_src/js/features/i18nVue.js
+++ b/web_src/js/features/i18nVue.js
@@ -105,6 +105,9 @@ export const i18nVue = {
     file_sync_fail:"文件同步失败",
     no_file_to_download:"没有文件可以下载",
     task_not_finished:"任务还未结束，稍后再来看看",
+    local:"本地",
+    online:"线上",
+    modify:"修改",
   },
   US: {
     computer_vision: "computer vision",
@@ -216,5 +219,8 @@ export const i18nVue = {
     file_sync_fail:"File synchronization failed",
     no_file_to_download:"No files can be downloaded",
     task_not_finished:"Task not finished yet, please wait",
+    local:"Local",
+    online:"Online",
+    modify:"Modify",
   },
 };
diff --git a/web_src/js/index.js b/web_src/js/index.js
index a781261a9..5b40d829e 100755
--- a/web_src/js/index.js
+++ b/web_src/js/index.js
@@ -6,8 +6,10 @@ import "./publicpath.js";
 import "./polyfills.js";
 import "./features/letteravatar.js";
 import Vue from "vue";
-import ElementUI from "element-ui";
 import "element-ui/lib/theme-chalk/index.css";
+import localeEn from 'element-ui/lib/locale/lang/en';
+import localeZh from 'element-ui/lib/locale/lang/zh-CN';
+import ElementUI from "element-ui";
 import axios from "axios";
 import qs from "qs";
 import Cookies from "js-cookie";
@@ -54,15 +56,19 @@ import { Message } from "element-ui";
 import { i18nVue } from "./features/i18nVue.js";
 import './features/ad.js';
 
-Vue.use(ElementUI);
 Vue.prototype.$axios = axios;
 Vue.prototype.$Cookies = Cookies;
 Vue.prototype.qs = qs;
 Vue.prototype.$message = Message;
 Vue.prototype.$locale = i18nVue;
-window.i18n = i18nVue[document.querySelector('html').getAttribute('lang') == 'zh-CN' ? 'CN' : 'US'];
+const lang = document.querySelector('html').getAttribute('lang');
+window.i18n = i18nVue[lang == 'zh-CN' ? 'CN' : 'US'];
 const { AppSubUrl, StaticUrlPrefix, csrf } = window.config;
 
+Vue.use(ElementUI, {
+  locale: lang === 'zh-CN' ? localeZh : localeEn,
+});
+
 Object.defineProperty(Vue.prototype, "$echarts", {
   value: echarts,
 });
diff --git a/web_src/vuepages/langs/config/en-US.js b/web_src/vuepages/langs/config/en-US.js
index bcd1cfe43..1c160ee1d 100644
--- a/web_src/vuepages/langs/config/en-US.js
+++ b/web_src/vuepages/langs/config/en-US.js
@@ -193,6 +193,66 @@ const en = {
   dataDesensitizationModelDesc:'Use AI technology to desensitize the face and license plate number in the picture. For more information about this model, please visit the project',
   limitFilesUpload:'Only jpg/jpeg/png files can be uploaded',
   limitSizeUpload:'The size of the uploaded file cannot exceed 20M!',
+  modelManage: {
+    modelManage: 'Model management',
+    modelName: 'Model name',
+    useCluster: 'Available clusters',
+    local: 'Local',
+    online: 'Online',
+    createModel: 'Create Model',
+    importLocalModel: 'Import Lacal Model',
+    importOnlineModel: 'Import Online Model',
+    modifyModelInfo: 'Modify model information',
+    addModelFiles: 'Add model files',
+    uploadModelFiles: 'Upload model files',
+    pleaseInputModelName: 'Please input model name',
+    version: 'Version',
+    modelEngine: 'Model engine',
+    modelLabel: 'Model label',
+    modelLabelInputTips: 'Input labels, multiple labels are separated by spaces',
+    modelDescr: 'Model description',
+    modelDescrInputTips: 'The description should not exceed 256 characters',
+    confirm: 'Confirm',
+    cancel: 'Cancel',
+    modelCreateFailed: 'Model create failed',
+    modelModifyFailed: 'Model modify failed',
+    fileUpload: 'File upload',
+    upload: 'Upload',
+    uploadStatus: 'Upload status',
+    modelFileUploadDefaultTips: 'Click to add files or drag files here directly',
+    modelFileUploadErrTips: 'Up to 10 files can be uploaded at a time, and the total file size of the model does not exceed 200GB',
+    fileIstoBig: 'File is to big',
+    removeFile: 'Rmove file',
+    uploadSuccess: 'upload success',
+    uploadFailed: 'upload failed',
+    calcFileMd5: 'Calculating file MD5...',
+    uploading: 'Uploading...',
+    fileHasAlreadyInTheModel: 'This file has already in the model: ',
+    basicInfo: 'Basic information',
+    modelSize: 'Model size',
+    descr: 'Description',
+    createTime: 'Create Time',
+    label: 'Label',
+    trainTaskInfo: 'Train task information',
+    trainTask: 'Train task',
+    codeBranch: 'Code branch',
+    bootFile: 'Boot file',
+    trainDataset: 'Train dataset',
+    specInfo: 'Specifications',
+    workServerNumber: 'Amount of compute node',
+    runParameters: 'Run parameters',
+    seeMore: 'See more',
+    collapseDetails: 'Collapse details',
+    modelFilesList: 'Mode files list',
+    fileName: 'File name',
+    fileSize: 'File size',
+    updateTime: 'Upate Time',
+    operate: 'Operation',
+    delete: 'Delete',
+    infoModificationFailed: 'Information modify failed',
+    deleteModelFileConfirmTips: 'Are you sure you want to delete the current model file?',
+    modelFileDeleteFailed: 'Model file delete failed',
+  },
 }
 
 export default en;
diff --git a/web_src/vuepages/langs/config/zh-CN.js b/web_src/vuepages/langs/config/zh-CN.js
index 5b8e800d8..2f87c7e15 100644
--- a/web_src/vuepages/langs/config/zh-CN.js
+++ b/web_src/vuepages/langs/config/zh-CN.js
@@ -193,6 +193,66 @@ const zh = {
   dataDesensitizationModelDesc:'利用人工智能AI技术，把图片中的人脸、车牌号码进行脱敏处理。该模型更多信息请访问项目',
   limitFilesUpload:'只能上传 jpg/jpeg/png 格式的文件',
   limitSizeUpload:'上传文件大小不能超过 20M !',
+  modelManage: {
+    modelManage: '模型管理',
+    modelName: '模型名称',
+    useCluster: '可用集群',
+    local: '本地',
+    online: '线上',
+    createModel: '创建模型',
+    importLocalModel: '导入本地模型',
+    importOnlineModel: '导入线上模型',
+    modifyModelInfo: '修改模型信息',
+    addModelFiles: '增加模型文件',
+    uploadModelFiles: '上传模型文件',
+    pleaseInputModelName: '请输入模型名称',
+    version: '版本',
+    modelEngine: '模型框架',
+    modelLabel: '模型标签',
+    modelLabelInputTips: '输入标签，多个标签用空格区分',
+    modelDescr: '模型描述',
+    modelDescrInputTips: '描述字数不超过255个字符',
+    confirm: '确定',
+    cancel: '取消',
+    modelCreateFailed: '模型创建失败',
+    modelModifyFailed: '模型修改失败',
+    fileUpload: '文件上传',
+    upload: '上传',
+    uploadStatus: '上传状态',
+    modelFileUploadDefaultTips: '点击添加文件或直接拖拽文件到此处',
+    modelFileUploadErrTips: '单次最多上传10个文件，模型总文件大小不超过200G',
+    fileIstoBig: '文件太大',
+    removeFile: '移除文件',
+    uploadSuccess: '上传成功',
+    uploadFailed: '上传失败',
+    calcFileMd5: '计算文件MD5...',
+    uploading: '上传中...',
+    fileHasAlreadyInTheModel: '该文件已上传在模型：',
+    basicInfo: '基本信息',
+    modelSize: '模型大小',
+    descr: '描述',
+    createTime: '创建时间',
+    label: '标签',
+    trainTaskInfo: '训练相关信息',
+    trainTask: '训练任务',
+    codeBranch: '代码分支',
+    bootFile: '启动文件',
+    trainDataset: '训练数据集',
+    specInfo: '规格',
+    workServerNumber: '计算节点',
+    runParameters: '运行参数',
+    seeMore: '查看更多信息',
+    collapseDetails: '折叠详细信息',
+    modelFilesList: '模型文件列表',
+    fileName: '文件名称',
+    fileSize: '文件大小',
+    updateTime: '更新时间',
+    operate: '操作',
+    delete: '删除',
+    infoModificationFailed: '信息修改失败',
+    deleteModelFileConfirmTips: '请确认是否删除当前模型文件？',
+    modelFileDeleteFailed: '模型文件删除失败',
+  },
 }
 
 export default zh;
diff --git a/web_src/vuepages/pages/modelmanage/common/modelmanage-common-detail.vue b/web_src/vuepages/pages/modelmanage/common/modelmanage-common-detail.vue
index 1aff6d33f..442db17be 100644
--- a/web_src/vuepages/pages/modelmanage/common/modelmanage-common-detail.vue
+++ b/web_src/vuepages/pages/modelmanage/common/modelmanage-common-detail.vue
@@ -2,7 +2,7 @@
   <div>
     <div class="ui header">
       <div class="ui breadcrumb">
-        <a class="section" :href="`${repo}/modelmanage/show_model`">模型管理</a>
+        <a class="section" :href="`${repo}/modelmanage/show_model`">{{ $t('modelManage.modelManage') }}</a>
         <div class="divider"> / </div>
         <div class="active section">{{ this.state.name }}</div>
       </div>
@@ -15,11 +15,11 @@
     </div>
     <div class="content">
       <div class="detail-info">
-        <div class="title">基本信息：</div>
+        <div class="title">{{ $t('modelManage.basicInfo') }}：</div>
         <div class="area-c">
           <div class="area">
             <div class="row">
-              <div class="tit">可用集群：</div>
+              <div class="tit">{{ $t('modelManage.useCluster') }}：</div>
               <div class="val">
                 <div class="txt-wrap" :title="state.typeStr">
                   {{ state.typeStr }}
@@ -27,13 +27,13 @@
               </div>
             </div>
             <div v-show="isExpanded" class="row">
-              <div class="tit">模型大小：</div>
+              <div class="tit">{{ $t('modelManage.modelSize') }}：</div>
               <div class="val">
                 <div class="txt-wrap" :title="state.modelSize">{{ state.modelSize }}</div>
               </div>
             </div>
             <div v-show="isExpanded" class="row" :class="isEidtDescr ? 'edit-row' : ''">
-              <div class="tit">描述：</div>
+              <div class="tit">{{ $t('modelManage.descr') }}：</div>
               <div class="val" :class="isEidtDescr ? 'edit-val' : ''">
                 <div v-if="!isEidtDescr" class="txt-wrap" :title="state.description"
                   style="max-width:100%;width:unset;padding-right:20px;">
@@ -42,7 +42,8 @@
                     class="el-icon-edit" @click="editDescr = state._description; isEidtDescr = true;"></i>
                 </div>
                 <div class="txt-edit" v-if="isEidtDescr">
-                  <el-input type="textarea" v-model="editDescr" :maxLength="255" placeholder="描述字数不超过255个字符"></el-input>
+                  <el-input type="textarea" v-model="editDescr" :maxLength="255"
+                    :placeholder="$t('modelManage.modelDescrInputTips')"></el-input>
                   <i style="position:absolute;right:-4px;bottom:20px;color:rgb(255, 37, 37);cursor:pointer;"
                     class="icon times" @click="isEidtDescr = false;"></i>
                   <i style="position:absolute;right:-5px;bottom:2px;color:rgb(39, 177, 72);cursor:pointer;"
@@ -53,19 +54,19 @@
           </div>
           <div class="area">
             <div class="row">
-              <div class="tit">模型框架：</div>
+              <div class="tit">{{ $t('modelManage.modelEngine') }}：</div>
               <div class="val">
                 <div class="txt-wrap" :title="state.engineName">{{ state.engineName }}</div>
               </div>
             </div>
             <div v-show="isExpanded" class="row">
-              <div class="tit">创建时间：</div>
+              <div class="tit">{{ $t('modelManage.createTime') }}：</div>
               <div class="val">
                 <div class="txt-wrap" :title="state.createTime">{{ state.createTime }}</div>
               </div>
             </div>
             <div v-show="isExpanded" class="row" :class="isEidtLabel ? 'edit-row' : ''">
-              <div class="tit">标签：</div>
+              <div class="tit">{{ $t('modelManage.label') }}：</div>
               <div class="val" :class="isEidtLabel ? 'edit-val' : ''">
                 <div v-if="!isEidtLabel" class="txt-wrap" :title="state.label"
                   style="max-width:100%;width:unset;padding-right:20px;">
@@ -74,7 +75,8 @@
                     class="el-icon-edit" @click="editLabel = state._label; isEidtLabel = true;"></i>
                 </div>
                 <div class="txt-edit" v-if="isEidtLabel">
-                  <el-input v-model="editLabel" :maxLength="255" placeholder="输入标签，多个标签用空格区分"></el-input>
+                  <el-input v-model="editLabel" :maxLength="255" :placeholder="$t('modelManage.modelLabelInputTips')"
+                    @input="labelInput"></el-input>
                   <i style="position:absolute;right:-5px;bottom:20px;color:rgb(255, 37, 37);cursor:pointer;"
                     class="icon times" @click="isEidtLabel = false;"></i>
                   <i style="position:absolute;right:-5px;bottom:2px;color:rgb(39, 177, 72);cursor:pointer;"
@@ -84,29 +86,29 @@
             </div>
           </div>
         </div>
-        <div v-show="isExpanded" style="margin-top:8px;" class="title">训练相关信息：</div>
+        <div v-show="isExpanded" style="margin-top:8px;" class="title">{{ $t('modelManage.trainTaskInfo') }}：</div>
         <div v-show="isExpanded" class="area-c">
           <div class="area">
             <div class="row">
-              <div class="tit">训练任务：</div>
+              <div class="tit">{{ $t('modelManage.trainTask') }}：</div>
               <div class="val">
                 <div class="txt-wrap" v-html="state.displayJobName"></div>
               </div>
             </div>
             <div class="row">
-              <div class="tit">代码分支：</div>
+              <div class="tit">{{ $t('modelManage.codeBranch') }}：</div>
               <div class="val">
                 <div class="txt-wrap" v-html="state.branchName"></div>
               </div>
             </div>
             <div class="row">
-              <div class="tit">启动文件：</div>
+              <div class="tit">{{ $t('modelManage.bootFile') }}：</div>
               <div class="val">
                 <div class="txt-wrap" :title="state.bootFile">{{ state.bootFile }}</div>
               </div>
             </div>
             <div class="row">
-              <div class="tit">训练数据集：</div>
+              <div class="tit">{{ $t('modelManage.trainDataset') }}：</div>
               <div class="val">
                 <div class="txt-wrap" :title="state.datasetName">{{ state.datasetName }}</div>
               </div>
@@ -114,19 +116,19 @@
           </div>
           <div class="area">
             <div class="row">
-              <div class="tit">规格：</div>
+              <div class="tit">{{ $t('modelManage.specInfo') }}：</div>
               <div class="val">
                 <div class="txt-wrap" :title="state.specStr">{{ state.specStr }}</div>
               </div>
             </div>
             <div class="row">
-              <div class="tit">计算节点：</div>
+              <div class="tit">{{ $t('modelManage.workServerNumber') }}：</div>
               <div class="val">
                 <div class="txt-wrap" :title="state.workServerNumber">{{ state.workServerNumber }}</div>
               </div>
             </div>
             <div class="row">
-              <div class="tit">运行参数：</div>
+              <div class="tit">{{ $t('modelManage.runParameters') }}：</div>
               <div class="val">
                 <div class="txt-wrap" :title="state.parameters">{{ state.parameters }}</div>
               </div>
@@ -138,27 +140,28 @@
         <div class="line"></div>
         <div class="expand-btn" @click="isExpanded = !isExpanded">
           <i class="icon chevron circle down" :class="isExpanded ? 'up' : ''"></i>
-          <span>{{ isExpanded ? '折叠详细信息' : '查看更多信息' }}</span>
+          <span>{{ isExpanded ? $t('modelManage.collapseDetails') : $t('modelManage.seeMore') }}</span>
         </div>
         <div class="line"></div>
       </div>
       <div class="files-info">
         <div class="top">
           <div>
-            <div class="title">模型文件列表：</div>
+            <div class="title">{{ $t('modelManage.modelFilesList') }}：</div>
             <div class="title" style="margin-top:8px"><span class="version">{{ state.version }}</span>
               <span style="color:rgba(0,0,0,.4);" class="divider"> / </span>
             </div>
           </div>
           <div>
             <el-button v-if="modelType == 1 && canOperate" type="primary" icon="el-icon-upload" @click="goUploadPage">
-              上传模型文件
+              {{ $t('modelManage.uploadModelFiles') }}
             </el-button>
           </div>
         </div>
         <div class="table-container">
           <el-table :data="filesList" row-key="sn" style="width: 100%" v-loading="loading" stripe>
-            <el-table-column column-key="FileName" prop="FileName" label="文件名称" align="left" header-align="left">
+            <el-table-column column-key="FileName" prop="FileName" :label="$t('modelManage.fileName')" align="left"
+              header-align="left">
               <template slot-scope="scope">
                 <div class="tbl-file-name">
                   <span class="octicon octicon-file-directory"></span>
@@ -171,16 +174,16 @@
                 </div>
               </template>
             </el-table-column>
-            <el-table-column column-key="SizeShow" prop="SizeShow" label="文件大小" align="center" header-align="center"
-              width="200">
+            <el-table-column column-key="SizeShow" prop="SizeShow" :label="$t('modelManage.fileSize')" align="center"
+              header-align="center" width="200">
             </el-table-column>
-            <el-table-column column-key="ModTime" prop="ModTime" label="更新时间" align="center" header-align="center"
-              width="200">
+            <el-table-column column-key="ModTime" prop="ModTime" :label="$t('modelManage.updateTime')" align="center"
+              header-align="center" width="200">
             </el-table-column>
-            <el-table-column v-if="modelType == 1 && canOperate" column-key="operate" prop="operate" label="操作"
-              align="center" header-align="center" width="200">
+            <el-table-column v-if="modelType == 1 && canOperate" column-key="operate" prop="operate"
+              :label="$t('modelManage.operate')" align="center" header-align="center" width="200">
               <template slot-scope="scope">
-                <span class="btn-del" @click="deleteFile(scope.row)">删除</span>
+                <span class="btn-del" @click="deleteFile(scope.row)">{{ $t('modelManage.delete') }}</span>
               </template>
             </el-table-column>
           </el-table>
@@ -198,6 +201,7 @@ import { MODEL_ENGINES } from '~/const';
 import { formatDate } from 'element-ui/lib/utils/date-util';
 
 const REPO_NAME = location.pathname.split('/')[2];
+const MAX_LABEL_COUNT = 5;
 
 export default {
   data() {
@@ -298,7 +302,18 @@ export default {
       })
     },
     goUploadPage() {
-      window.location.href = `${this.repo}/modelmanage/create_local_model_tmpl2?type=0&name=${this.state.name}&id=${this.state.id}`;
+      window.location.href = `${this.repo}/modelmanage/create_local_model_tmpl2?type=1&name=${this.state.name}&id=${this.state.id}`;
+    },
+    backToModelListPage() {
+      const list = window.location.href.split('/');
+      list.pop();
+      list.push('show_model');
+      window.location.href = list.join('/');
+    },
+    labelInput() {
+      const hasEndSpace = this.editLabel[this.editLabel.length - 1] == ' ';
+      const list = this.editLabel.trim().split(' ').filter(label => label != '');
+      this.editLabel = list.slice(0, MAX_LABEL_COUNT).join(' ') + (hasEndSpace && list.length < MAX_LABEL_COUNT ? ' ' : '');
     },
     submitEidt(type) {
       const obj = {
@@ -326,19 +341,19 @@ export default {
         } else {
           this.$message({
             type: 'error',
-            message: '信息修改失败',
+            message: this.$t('modelManage.infoModificationFailed'),
           });
         }
       }).catch(err => {
         console.log(err);
         this.$message({
           type: 'error',
-          message: '信息修改失败',
+          message: this.$t('modelManage.infoModificationFailed'),
         });
       });
     },
     deleteFile(file) {
-      this.$confirm('请确认是否删除当前模型文件？', this.$t('tips'), {
+      this.$confirm(this.$t('modelManage.deleteModelFileConfirmTips'), this.$t('tips'), {
         confirmButtonText: this.$t('confirm1'),
         cancelButtonText: this.$t('cancel'),
         type: 'warning',
@@ -355,14 +370,14 @@ export default {
           } else {
             this.$message({
               type: 'error',
-              message: '模型文件删除失败',
+              message: this.$t('modelManage.modelFileDeleteFailed'),
             });
           }
         }).catch(err => {
           console.log(err);
           this.$message({
             type: 'error',
-            message: '模型文件删除失败',
+            message: this.$t('modelManage.modelFileDeleteFailed'),
           });
         });
       }).catch(() => { });
@@ -387,10 +402,10 @@ export default {
       }).catch(err => {
         this.loading = false;
         console.log(err);
-        this.cancel();
+        this.backToModelListPage();
       });
     } else {
-      this.cancel();
+      this.backToModelListPage();
     }
   },
   beforeDestroy() {
@@ -414,6 +429,7 @@ export default {
     font-weight: 550;
     font-size: 14px;
     color: rgb(16, 16, 16);
+    margin-bottom: 10px;
   }
 
   .detail-info {
diff --git a/web_src/vuepages/pages/modelmanage/local/modelmanage-local-create-1.vue b/web_src/vuepages/pages/modelmanage/local/modelmanage-local-create-1.vue
index 2a1895c16..3c3b35c58 100644
--- a/web_src/vuepages/pages/modelmanage/local/modelmanage-local-create-1.vue
+++ b/web_src/vuepages/pages/modelmanage/local/modelmanage-local-create-1.vue
@@ -1,23 +1,24 @@
 <template>
   <div>
     <div class="header">
-      <span class="title">{{ type == '1' ? '修改模型信息' : '导入本地模型' }}</span>
+      <span class="title">{{ type == '1' ? $t('modelManage.modifyModelInfo') : $t('modelManage.importLocalModel')
+      }}</span>
     </div>
     <div class="content">
       <div class="guide-c" v-if="type != '1'">
         <div class="step focused">
           <div class="num">1</div>
-          <div class="txt">创建模型</div>
+          <div class="txt">{{ $t('modelManage.createModel') }}</div>
         </div>
         <div class="line"></div>
         <div class="step">
           <div class="num">2</div>
-          <div class="txt">上传模型文件</div>
+          <div class="txt">{{ $t('modelManage.uploadModelFiles') }}</div>
         </div>
       </div>
       <div class="row-c" v-loading="loading">
         <div class="row">
-          <div class="r-title"><label class="required">可用集群</label></div>
+          <div class="r-title"><label class="required">{{ $t('modelManage.useCluster') }}</label></div>
           <div class="r-content" style="display:flex;">
             <div class="cluster-type-btn" v-if="type != 1 || type == 1 && state.type === 0"
               :class="state.type === 0 ? 'focused' : ''"
@@ -54,46 +55,49 @@
           </div>
         </div>
         <div class="row">
-          <div class="r-title"><label class="required">模型名称</label></div>
+          <div class="r-title"><label class="required">{{ $t('modelManage.modelName') }}</label></div>
           <div class="r-content">
-            <el-input size="medium" :maxLength="25" v-model="state.name" placeholder="请输入模型名称"></el-input>
+            <el-input size="medium" :maxLength="25" v-model="state.name" :placeholder="$t('modelManage.pleaseInputModelName')">
+            </el-input>
           </div>
         </div>
-        <div class="row">
-          <div class="r-title"><label class="required">版本</label></div>
+        <div class="row" v-show="isShowVersion">
+          <div class="r-title"><label class="required">{{ $t('modelManage.version') }}</label></div>
           <div class="r-content">
             <el-input class="input-disabled" style="width:288px;" size="medium" v-model="state.version" readonly>
             </el-input>
           </div>
         </div>
         <div class="row">
-          <div class="r-title"><label class="required">模型框架</label></div>
+          <div class="r-title"><label class="required">{{ $t('modelManage.modelEngine') }}</label></div>
           <div class="r-content">
-            <el-select style="width:288px;" size="medium" v-model="state.engine" placeholder="请选择">
+            <el-select style="width:288px;" size="medium" v-model="state.engine" placeholder="">
               <el-option v-for="item in engineList" :key="item.k" :label="item.v" :value="item.k">
               </el-option>
             </el-select>
           </div>
         </div>
         <div class="row">
-          <div class="r-title"><label>模型标签</label></div>
+          <div class="r-title"><label>{{ $t('modelManage.modelLabel') }}</label></div>
           <div class="r-content">
-            <el-input size="medium" :maxLength="255" v-model="state.label" placeholder="输入标签，多个标签用空格区分"></el-input>
+            <el-input size="medium" :maxLength="255" v-model="state.label" :placeholder="$t('modelManage.modelLabelInputTips')"
+              @input="labelInput"></el-input>
           </div>
         </div>
         <div class="row" style="align-items:flex-start;">
-          <div class="r-title"><label>模型描述</label></div>
+          <div class="r-title"><label>{{ $t('modelManage.modelDescr') }}</label></div>
           <div class="r-content">
             <el-input type="textarea" :maxLength="255" size="medium" v-model="state.description" :rows="3"
-              placeholder="描述字数不超过255个字符">
+              :placeholder="$t('modelManage.modelDescrInputTips')">
             </el-input>
           </div>
         </div>
         <div class="row" style="margin-top:20px">
           <div class="r-title"><label></label></div>
           <div class="r-content">
-            <el-button size="medium" class="green" @click="submit">保存模型</el-button>
-            <el-button size="medium" @click="cancel">取消</el-button>
+            <el-button size="medium" class="green" @click="submit">{{ type == '1' ? $t('modelManage.confirm') : $t('modelManage.createModel') }}
+            </el-button>
+            <el-button size="medium" @click="cancel">{{ $t('modelManage.cancel') }}</el-button>
           </div>
         </div>
       </div>
@@ -108,6 +112,7 @@ import { getUrlSearchParams } from '~/utils';
 import { MODEL_ENGINES } from '~/const'
 
 const REPO_NAME = location.pathname.split('/')[2];
+const MAX_LABEL_COUNT = 5;
 
 export default {
   data() {
@@ -122,16 +127,22 @@ export default {
         label: '',
         description: '',
       },
+      isShowVersion: false,
       engineList: MODEL_ENGINES,
     };
   },
   components: {},
   methods: {
+    labelInput() {
+      const hasEndSpace = this.state.label[this.state.label.length - 1] == ' ';
+      const list = this.state.label.trim().split(' ').filter(label => label != '');
+      this.state.label = list.slice(0, MAX_LABEL_COUNT).join(' ') + (hasEndSpace && list.length < MAX_LABEL_COUNT ? ' ' : '');
+    },
     submit() {
       if (!this.state.name) {
         this.$message({
           type: 'info',
-          message: '请输入模型名称',
+          message: this.$t('modelManage.pleaseInputModelName'),
         });
         return;
       }
@@ -143,7 +154,7 @@ export default {
         res = res.data;
         if (res && res.code == '0') {
           if (this.type == '1') {
-            this.cancel();
+            this.goDetail();
             return;
           }
           const list = window.location.href.split('/');
@@ -153,7 +164,7 @@ export default {
         } else {
           this.$message({
             type: 'error',
-            message: this.type == '1' ? '模型修改失败' : '保存模型失败',
+            message: this.type == '1' ? this.$t('modelManage.modelModifyFailed') : this.$t('modelManage.modelCreateFailed'),
           });
         }
       }).catch(err => {
@@ -166,6 +177,12 @@ export default {
       list.push('show_model');
       window.location.href = list.join('/');
     },
+    goDetail() {
+      const list = window.location.href.split('/');
+      list.pop();
+      list.push('show_model_info');
+      window.location.href = list.join('/') + '?name=' + this.state.name;
+    }
   },
   mounted() {
     const urlParams = getUrlSearchParams();
diff --git a/web_src/vuepages/pages/modelmanage/local/modelmanage-local-create-2.vue b/web_src/vuepages/pages/modelmanage/local/modelmanage-local-create-2.vue
index 7eb3aeb2e..b4390c3e0 100644
--- a/web_src/vuepages/pages/modelmanage/local/modelmanage-local-create-2.vue
+++ b/web_src/vuepages/pages/modelmanage/local/modelmanage-local-create-2.vue
@@ -1,33 +1,33 @@
 <template>
   <div>
     <div class="header">
-      <span class="title">{{ type == '1' ? '增加模型文件' : '上传模型文件' }}</span>
+      <span class="title">{{ type == '1' ? $t('modelManage.addModelFiles') : $t('modelManage.uploadModelFiles') }}</span>
     </div>
     <div class="content ui form">
       <div class="guide-c" v-if="type != '1'">
         <div class="step">
           <div class="num">1</div>
-          <div class="txt">创建模型</div>
+          <div class="txt">{{$t('modelManage.createModel')}}</div>
         </div>
         <div class="line"></div>
         <div class="step focused">
           <div class="num">2</div>
-          <div class="txt">上传模型文件</div>
+          <div class="txt">{{$t('modelManage.uploadModelFiles')}}</div>
         </div>
       </div>
       <div class="row-c">
         <div class="row">
-          <div class="r-title"><label class="required">模型名称</label></div>
+          <div class="r-title"><label class="required">{{$t('modelManage.modelName')}}</label></div>
           <div class="r-content">
-            <el-input size="medium" class="input-disabled" v-model="state.name" placeholder="请输入模型名称" readonly>
+            <el-input size="medium" class="input-disabled" v-model="state.name" :placeholder="$t('modelManage.pleaseInputModelName')" readonly>
             </el-input>
           </div>
         </div>
         <div class="row" style="align-items:flex-start;">
-          <div class="r-title"><label class="required">文件上传</label></div>
+          <div class="r-title"><label class="required">{{$t('modelManage.fileUpload')}}</label></div>
           <div class="r-content">
             <div style="position:relative">
-              <form class="dropzone" ref="dropzoneRef" @click="">
+              <form class="dropzone" ref="dropzoneRef">
                 <div class="dropzon-err-tips ui red message" v-show="showUploadErr" style="display:none;margin:2.5rem">
                   {{ uploadErrTxt }}</div>
               </form>
@@ -38,12 +38,12 @@
         <div class="row" style="margin-top:10px">
           <div class="r-title"><label></label></div>
           <div class="r-content">
-            <el-button size="medium" class="green" @click="submit" :disabled="uploading">上传</el-button>
-            <el-button size="medium" @click="cancel">取消</el-button>
+            <el-button size="medium" class="green" @click="submit" :disabled="uploading">{{$t('modelManage.upload')}}</el-button>
+            <el-button size="medium" @click="cancel">{{$t('modelManage.cancel')}}</el-button>
           </div>
         </div>
         <div class="row" style="align-items:flex-start;">
-          <div class="r-title"><label>上传状态：</label></div>
+          <div class="r-title"><label>{{$t('modelManage.uploadStatus')}}：</label></div>
           <div class="r-content">
             <div v-for="(item, index) in uploadFiles" :key="item.upload.uuid" class="datast-upload-progress">
               <span class="dataset-name nowrap" :title="item.name">{{ item.name }}</span>
@@ -104,7 +104,7 @@ export default {
       originData: null,
       showUploadErr: false,
       uploadErrTxt: '',
-      defaultErrTxt: '单次最多上传10个文件，模型总文件大小不超过200G',
+      defaultErrTxt: this.$t('modelManage.modelFileUploadErrTips'),
 
       uploadFiles: [],
       uploadLength: 0,
@@ -116,6 +116,43 @@ export default {
   },
   components: {},
   methods: {
+    initModelData() {
+      const urlParams = getUrlSearchParams();
+      if (urlParams.name && urlParams.id) {
+        this.type = urlParams.type || '0';
+        this.state.name = urlParams.name;
+        this.state.id = urlParams.id;
+        this.loading = true;
+        getModelInfoByName({
+          repo: location.pathname.split('/').slice(0, 3).join('/'),
+          name: urlParams.name,
+          id: urlParams.id
+        }).then(res => {
+          this.loading = false;
+          const list = res.data;
+          if (list && list.length) {
+            const data = list[0];
+            this.state.type = data.type;
+            this.state.id = data.id;
+            this.state.name = data.name;
+            this.state.version = data.version;
+            this.state.engine = data.engine.toString();
+            this.state.label = data.label;
+            this.state.description = data.description;
+            this.state.size = data.size || 0;
+            this.originData = data;
+          } else {
+            this.cancel();
+          }
+        }).catch(err => {
+          this.loading = false;
+          console.log(err);
+          this.cancel();
+        });
+      } else {
+        this.cancel();
+      }
+    },
     initDropZone() {
       this.dropzoneHandler = new Dropzone(this.$refs.dropzoneRef, {
         url: '/',
@@ -126,9 +163,9 @@ export default {
         timeout: 0,
         addRemoveLinks: true,
         autoProcessQueue: false,
-        dictDefaultMessage: '点击添加文件或直接拖拽文件到此处',
-        dictFileTooBig: '文件太大',
-        dictRemoveFile: '移除文件',
+        dictDefaultMessage: this.$t('modelManage.modelFileUploadDefaultTips'),
+        dictFileTooBig: this.$t('modelManage.fileIstoBig'),
+        dictRemoveFile: this.$t('modelManage.removeFile'),
         dictMaxFilesExceeded: this.defaultErrTxt,
       });
       this.dropzoneHandler.on("addedfile", file => {
@@ -189,7 +226,7 @@ export default {
       this.uploadStatusList.push({
         uploadUuid: file.upload.uuid,
         name: file.name,
-        status: '计算文件MD5...',
+        status: this.$t('modelManage.calcFileMd5'),
         progress: 0,
         infoCode: 3,
       });
@@ -261,13 +298,13 @@ export default {
           this.breakpointUpload(file);
         } else {
           this.uploadError(file, info);
-          this.updateFileStatus(file, "上传失败", 0, 2);
+          this.updateFileStatus(file, this.$t('modelManage.uploadFailed'), 0, 2);
         }
         return file;
       }).catch(err => {
         console.log('getNewMultipart', err);
         this.uploadError(file, info);
-        this.updateFileStatus(file, "上传失败", 0, 2);
+        this.updateFileStatus(file, this.$t('modelManage.uploadFailed'), 0, 2);
         return err;
       });
     },
@@ -370,7 +407,7 @@ export default {
           currentChunk++;
           if (currentChunk < chunks) {
             console.log(`第${currentChunk}个分片上传完成, 开始第${currentChunk + 1}/${chunks}个分片上传`);
-            this.updateFileStatus(file, '上传中...', Number(((currentChunk / chunks) * 100).toFixed(2)), 3);
+            this.updateFileStatus(file, this.$t('modelManage.uploading'), Number(((currentChunk / chunks) * 100).toFixed(2)), 3);
             loadNext();
           } else {
             try {
@@ -378,10 +415,10 @@ export default {
               console.log(`文件上传完成：${file.name} \n分片：${chunks} 大小:${file.size} 用时：${(new Date().getTime() - time) / 1000} s`);
               this.uploadLength++;
               this.uploadSuccessLength++;
-              this.updateFileStatus(file, "上传成功", 100, 0);
+              this.updateFileStatus(file, this.$t('modelManage.uploadSuccess'), 100, 0);
               this.uploadSuccess(file);
             } catch (err) {
-              const info = "上传失败";
+              const info = this.$t('modelManage.uploadFailed');
               console.log(info, file)
               this.uploadLength++;
               this.uploadError(file, info);
@@ -390,7 +427,7 @@ export default {
           }
         } catch (err) {
           console.log(err);
-          const info = "上传失败";
+          const info = this.$t('modelManage.uploadFailed');
           console.log(info, file)
           this.uploadLength++;
           this.uploadError(file, info);
@@ -427,19 +464,21 @@ export default {
       if (this.uploadLength === this.uploadFiles.length) {
         console.log('All file has finish, success ' + this.uploadSuccessLength);
         this.uploading = false;
-        if (this.uploadSuccessLength == this.uploadLength) {
-          const list = window.location.href.split('/');
-          list.pop();
-          list.push('show_model_info');
+        if (this.uploadSuccessLength == this.uploadLength) {         
           window.setTimeout(() => {
-            window.location.href = list.join('/') + '?name=' + this.state.name;
+            this.goDetail();
           }, 1000);
+        } else {
+          if (this.uploadSuccessLength > 0) {
+            this.initModelData();
+          }
         }
       }
     },
     submit() {
       const fileList = this.dropzoneHandler.getAcceptedFiles();
       if (!fileList.length) return;
+      if (!this.checkFiles()) return;
       this.resetFileStatus();
       this.uploadFiles = fileList;
       this.uploading = true;
@@ -459,12 +498,12 @@ export default {
               this.uploadLength++;
               // 同一模型上传同一个文件
               if (file._modelUuid) {
-                const info = `该文件已上传在模型: ${file._modelName}`;
+                const info = `${this.$t('modelManage.fileHasAlreadyInTheModel')} ${file._modelName}`;
                 this.uploadError(file, info);
-                this.updateFileStatus(file, "上传失败", 0, 1, info);
+                this.updateFileStatus(file, this.$t('modelManage.uploadFailed'), 0, 1, info);
               } else { // 秒传
                 this.uploadSuccessLength++;
-                this.updateFileStatus(file, "上传成功", 100, 0);
+                this.updateFileStatus(file, this.$t('modelManage.uploadFailed'), 100, 0);
                 this.uploadSuccess(file);
               }
               console.log(file.name, '文件处理完成');
@@ -474,61 +513,36 @@ export default {
           }).catch(err => {
             console.info('getChunksInfo', err);
             this.uploadLength++;
-            this.uploadError(file, "上传失败");
-            this.updateFileStatus(file, "上传失败", 0, 2);
+            this.uploadError(file, this.$t('modelManage.uploadFailed'));
+            this.updateFileStatus(file, this.$t('modelManage.uploadFailed'), 0, 2);
           });
         }).catch(err => {
           console.info('calcFileMd5', err);
           this.uploadLength++;
-          this.uploadError(file, '上传失败');
-          this.updateFileStatus(file, "上传失败", 0, 2);
+          this.uploadError(file, this.$t('modelManage.uploadFailed'));
+          this.updateFileStatus(file, this.$t('modelManage.uploadFailed'), 0, 2);
         });
       }
     },
     cancel() {
+      if (this.type == '1') {
+        this.goDetail();
+        return;
+      }
       const list = window.location.href.split('/');
       list.pop();
       list.push('show_model');
       window.location.href = list.join('/');
     },
+    goDetail() {
+      const list = window.location.href.split('/');
+      list.pop();
+      list.push('show_model_info');
+      window.location.href = list.join('/') + '?name=' + this.state.name;
+    }
   },
   mounted() {
-    const urlParams = getUrlSearchParams();
-    if (urlParams.name && urlParams.id) {
-      this.type = urlParams.type || '0';
-      this.state.name = urlParams.name;
-      this.state.id = urlParams.id;
-      this.loading = true;
-      getModelInfoByName({
-        repo: location.pathname.split('/').slice(0, 3).join('/'),
-        name: urlParams.name,
-        id: urlParams.id
-      }).then(res => {
-        this.loading = false;
-        const list = res.data;
-        if (list && list.length) {
-          const data = list[0];
-          this.state.type = data.type;
-          this.state.id = data.id;
-          this.state.name = data.name;
-          this.state.version = data.version;
-          this.state.engine = data.engine.toString();
-          this.state.label = data.label;
-          this.state.description = data.description;
-          this.state.size = data.size || 0;
-          this.originData = data;
-        } else {
-          this.cancel();
-        }
-      }).catch(err => {
-        this.loading = false;
-        console.log(err);
-        this.cancel();
-      });
-    } else {
-      this.cancel();
-      return;
-    }
+    this.initModelData();
     this.initDropZone();
   },
   beforeDestroy() {

From 0b9009cabc3c8acaa4f8b16df04cfc42e5560900 Mon Sep 17 00:00:00 2001
From: chenshihai <chenshh@pcl.ac.cn>
Date: Thu, 10 Nov 2022 14:48:49 +0800
Subject: [PATCH 122/187] update

---
 .../pages/modelmanage/common/modelmanage-common-detail.vue  | 6 ++++--
 .../pages/modelmanage/local/modelmanage-local-create-2.vue  | 4 ++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/web_src/vuepages/pages/modelmanage/common/modelmanage-common-detail.vue b/web_src/vuepages/pages/modelmanage/common/modelmanage-common-detail.vue
index 442db17be..0c5372fba 100644
--- a/web_src/vuepages/pages/modelmanage/common/modelmanage-common-detail.vue
+++ b/web_src/vuepages/pages/modelmanage/common/modelmanage-common-detail.vue
@@ -165,7 +165,7 @@
               <template slot-scope="scope">
                 <div class="tbl-file-name">
                   <span class="octicon octicon-file-directory"></span>
-                  <a :href="`${repo}/modelmanage/${state.id}/downloadsingle?parentDir=&fileName=${scope.row.FileName}`">
+                  <a :href="canOperate ? `${repo}/modelmanage/${state.id}/downloadsingle?parentDir=&fileName=${scope.row.FileName}` : 'javascript:;'">
                     <div class="fitted" :title="scope.row.FileName">
                       <i class="file icon" width="16" height="16" aria-hidden="true"></i>
                       {{ scope.row.FileName }}
@@ -180,7 +180,7 @@
             <el-table-column column-key="ModTime" prop="ModTime" :label="$t('modelManage.updateTime')" align="center"
               header-align="center" width="200">
             </el-table-column>
-            <el-table-column v-if="modelType == 1 && canOperate" column-key="operate" prop="operate"
+            <el-table-column v-if="modelType == 1 && canDelete" column-key="operate" prop="operate"
               :label="$t('modelManage.operate')" align="center" header-align="center" width="200">
               <template slot-scope="scope">
                 <span class="btn-del" @click="deleteFile(scope.row)">{{ $t('modelManage.delete') }}</span>
@@ -208,6 +208,7 @@ export default {
     return {
       modelType: '0', // 1-本地, 0-线上
       canOperate: false,
+      canDelete: false,
       isExpanded: false,
       loading: false,
       repo: location.pathname.split('/').slice(0, 3).join('/'),
@@ -236,6 +237,7 @@ export default {
       const data = this.modelList.filter((model) => model.version == version)[0];
       this.modelType = data.modelType;
       this.canOperate = data.isCanOper;
+      this.canDelete = data.isCanDelete;
       this.state.type = data.type;
       this.state.typeStr = data.type == 0 ? 'CPU/GPU' : data.type == 1 ? 'NPU' : '';
       this.state.id = data.id;
diff --git a/web_src/vuepages/pages/modelmanage/local/modelmanage-local-create-2.vue b/web_src/vuepages/pages/modelmanage/local/modelmanage-local-create-2.vue
index b4390c3e0..dce96b73d 100644
--- a/web_src/vuepages/pages/modelmanage/local/modelmanage-local-create-2.vue
+++ b/web_src/vuepages/pages/modelmanage/local/modelmanage-local-create-2.vue
@@ -503,7 +503,7 @@ export default {
                 this.updateFileStatus(file, this.$t('modelManage.uploadFailed'), 0, 1, info);
               } else { // 秒传
                 this.uploadSuccessLength++;
-                this.updateFileStatus(file, this.$t('modelManage.uploadFailed'), 100, 0);
+                this.updateFileStatus(file, this.$t('modelManage.uploadSuccess'), 100, 0);
                 this.uploadSuccess(file);
               }
               console.log(file.name, '文件处理完成');
@@ -748,7 +748,7 @@ export default {
 }
 
 .datast-upload-progress .dataset-status {
-  width: 100px;
+  width: 140px;
   margin-left: 1rem;
 }
 

From e9ac3eed2e7f913675a30bcc1462e3c2dfc2c891 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Thu, 10 Nov 2022 15:22:00 +0800
Subject: [PATCH 123/187] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=9C=AC=E5=9C=B0?=
 =?UTF-8?q?=E6=A8=A1=E5=9E=8B=E5=AF=BC=E5=85=A5=E7=9A=84=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 models/ai_model_manage.go        |  13 ++
 models/user_business_analysis.go | 215 ++++++++++++++++++++++++++-----
 routers/repo/ai_model_manage.go  |  17 ++-
 routers/repo/attachment.go       |  45 +++++--
 4 files changed, 246 insertions(+), 44 deletions(-)

diff --git a/models/ai_model_manage.go b/models/ai_model_manage.go
index 5b14b9ba2..40e5d5378 100644
--- a/models/ai_model_manage.go
+++ b/models/ai_model_manage.go
@@ -287,6 +287,19 @@ func ModifyModelDescription(id string, description string) error {
 	log.Info("success to update description from  db.re=" + fmt.Sprint((re)))
 	return nil
 }
+func ModifyModelLabel(id string, label string) error {
+	var sess *xorm.Session
+	sess = x.ID(id)
+	defer sess.Close()
+	re, err := sess.Cols("label").Update(&AiModelManage{
+		Label: label,
+	})
+	if err != nil {
+		return err
+	}
+	log.Info("success to update description from  db.re=" + fmt.Sprint((re)))
+	return nil
+}
 
 func ModifyLocalModel(id string, name, label, description string, engine int) error {
 	var sess *xorm.Session
diff --git a/models/user_business_analysis.go b/models/user_business_analysis.go
index 3130da905..5bac77114 100644
--- a/models/user_business_analysis.go
+++ b/models/user_business_analysis.go
@@ -499,7 +499,7 @@ func QueryUserStaticDataForUserDefine(opts *UserBusinessAnalysisQueryOptions, wi
 	DataDate := currentTimeNow.Format("2006-01-02 15:04")
 
 	CodeMergeCountMap := queryPullRequest(start_unix, end_unix)
-	CommitCountMap := queryCommitAction(start_unix, end_unix, 5)
+	CommitCountMap, _ := queryCommitAction(start_unix, end_unix, 5)
 	IssueCountMap := queryCreateIssue(start_unix, end_unix)
 
 	CommentCountMap := queryComment(start_unix, end_unix)
@@ -517,7 +517,7 @@ func QueryUserStaticDataForUserDefine(opts *UserBusinessAnalysisQueryOptions, wi
 		CommitCodeSizeMapJson, _ := json.Marshal(CommitCodeSizeMap)
 		log.Info("CommitCodeSizeMapJson=" + string(CommitCodeSizeMapJson))
 	}
-	CommitDatasetSizeMap, CommitDatasetNumMap := queryDatasetSize(start_unix, end_unix)
+	CommitDatasetSizeMap, CommitDatasetNumMap, _ := queryDatasetSize(start_unix, end_unix)
 	SolveIssueCountMap := querySolveIssue(start_unix, end_unix)
 	CreateRepoCountMap, _, _ := queryUserCreateRepo(start_unix, end_unix)
 	LoginCountMap := queryLoginCount(start_unix, end_unix)
@@ -526,7 +526,7 @@ func QueryUserStaticDataForUserDefine(opts *UserBusinessAnalysisQueryOptions, wi
 	AiModelManageMap := queryUserModel(start_unix, end_unix)
 
 	CollectDataset, CollectedDataset := queryDatasetStars(start_unix, end_unix)
-	RecommendDataset := queryRecommedDataSet(start_unix, end_unix)
+	RecommendDataset, _ := queryRecommedDataSet(start_unix, end_unix)
 	CollectImage, CollectedImage := queryImageStars(start_unix, end_unix)
 	RecommendImage := queryRecommedImage(start_unix, end_unix)
 
@@ -752,7 +752,7 @@ func refreshUserStaticTable(wikiCountMap map[string]int, tableName string, pageS
 	startTime := currentTimeNow.AddDate(0, 0, -1)
 
 	CodeMergeCountMap := queryPullRequest(start_unix, end_unix)
-	CommitCountMap := queryCommitAction(start_unix, end_unix, 5)
+	CommitCountMap, mostActiveMap := queryCommitAction(start_unix, end_unix, 5)
 	IssueCountMap := queryCreateIssue(start_unix, end_unix)
 
 	CommentCountMap := queryComment(start_unix, end_unix)
@@ -764,11 +764,11 @@ func refreshUserStaticTable(wikiCountMap map[string]int, tableName string, pageS
 		log.Info("query commit code errr.")
 	} else {
 		log.Info("query commit code size, len=" + fmt.Sprint(len(CommitCodeSizeMap)))
-		CommitCodeSizeMapJson, _ := json.Marshal(CommitCodeSizeMap)
-		log.Info("CommitCodeSizeMapJson=" + string(CommitCodeSizeMapJson))
+		//CommitCodeSizeMapJson, _ := json.Marshal(CommitCodeSizeMap)
+		//log.Info("CommitCodeSizeMapJson=" + string(CommitCodeSizeMapJson))
 	}
 	//CommitCodeSizeMap := queryCommitCodeSize(StartTimeNextDay.Unix(), EndTimeNextDay.Unix())
-	CommitDatasetSizeMap, CommitDatasetNumMap := queryDatasetSize(start_unix, end_unix)
+	CommitDatasetSizeMap, CommitDatasetNumMap, dataSetDownloadMap := queryDatasetSize(start_unix, end_unix)
 	SolveIssueCountMap := querySolveIssue(start_unix, end_unix)
 	CreateRepoCountMap, DetailInfoMap, MostDownloadMap := queryUserCreateRepo(start_unix, end_unix)
 	LoginCountMap := queryLoginCount(start_unix, end_unix)
@@ -778,7 +778,7 @@ func refreshUserStaticTable(wikiCountMap map[string]int, tableName string, pageS
 	AiModelManageMap := queryUserModel(start_unix, end_unix)
 
 	CollectDataset, CollectedDataset := queryDatasetStars(start_unix, end_unix)
-	RecommendDataset := queryRecommedDataSet(start_unix, end_unix)
+	RecommendDataset, CreatedDataset := queryRecommedDataSet(start_unix, end_unix)
 	CollectImage, CollectedImage := queryImageStars(start_unix, end_unix)
 	RecommendImage := queryRecommedImage(start_unix, end_unix)
 
@@ -885,8 +885,32 @@ func refreshUserStaticTable(wikiCountMap map[string]int, tableName string, pageS
 			}
 			if tableName == "user_business_analysis_current_year" {
 				//年度数据
-				log.Info(fmt.Sprint(len(DetailInfoMap)))
-				log.Info(fmt.Sprint(len(MostDownloadMap)))
+				subTime := time.Now().UTC().Sub(dateRecordAll.RegistDate.AsTime().UTC())
+				mostActiveDay := ""
+				if userInfo, ok := mostActiveMap[dateRecordAll.ID]; ok {
+					mostActiveDay = getMostActiveJson(userInfo)
+				}
+				repoInfo := getRepoDetailInfo(DetailInfoMap, dateRecordAll.ID, MostDownloadMap)
+				dataSetInfo := getDataSetInfo(dateRecordAll.ID, CreatedDataset, dataSetDownloadMap, CommitDatasetNumMap, CollectedDataset)
+				codeInfo := getCodeInfo(dateRecordAll)
+				cloudBrainInfo := getCloudBrainInfo(dateRecordAll, CloudBrainTaskItemMap)
+				re := &UserSummaryCurrentYear{
+					ID:             dateRecordAll.ID,
+					Name:           dateRecordAll.Name,
+					Email:          dateRecordAll.Email,
+					Phone:          dateRecordAll.Phone,
+					RegistDate:     dateRecordAll.RegistDate,
+					DateCount:      int(subTime.Hours()) / 24,
+					MostActiveDay:  mostActiveDay,
+					RepoInfo:       repoInfo,
+					DataSetInfo:    dataSetInfo,
+					CodeInfo:       codeInfo,
+					CloudBrainInfo: cloudBrainInfo,
+				}
+				statictisSess.Insert(re)
+				//log.Info(fmt.Sprint(len(CommitCountMap)))
+				//log.Info(fmt.Sprint(len(CommitCodeSizeMap)))
+
 			}
 		}
 		if len(dateRecordBatch) > 0 {
@@ -895,6 +919,7 @@ func refreshUserStaticTable(wikiCountMap map[string]int, tableName string, pageS
 			if err != nil {
 				log.Info("insert all data failed." + err.Error())
 			}
+
 		}
 		indexTotal += PAGE_SIZE
 		if indexTotal >= count {
@@ -915,6 +940,95 @@ func refreshUserStaticTable(wikiCountMap map[string]int, tableName string, pageS
 	}
 	log.Info("refresh data finished.tableName=" + tableName + " total record:" + fmt.Sprint(insertCount))
 }
+func getCloudBrainInfo(dateRecordAll UserBusinessAnalysisAll, CloudBrainTaskItemMap map[string]int) string {
+	cloudBrainInfo := make(map[string]string)
+	cloudBrainInfo["create_task_num"] = fmt.Sprint(dateRecordAll.CloudBrainTaskNum)
+	cloudBrainInfo["debug_task_num"] = fmt.Sprint(dateRecordAll.GpuDebugJob + dateRecordAll.NpuDebugJob)
+	cloudBrainInfo["train_task_num"] = fmt.Sprint(dateRecordAll.GpuTrainJob + dateRecordAll.NpuTrainJob)
+	cloudBrainInfo["inference_task_num"] = fmt.Sprint(dateRecordAll.NpuInferenceJob + CloudBrainTaskItemMap["GpuInferenceJob"])
+	cloudBrainInfo["card_runtime"] = fmt.Sprint(dateRecordAll.CloudBrainRunTime)
+	cloudBrainInfo["card_runtime_money"] = fmt.Sprint(dateRecordAll.CloudBrainRunTime * 5)
+	//todo
+	cloudBrainInfoJson, _ := json.Marshal(cloudBrainInfo)
+	return string(cloudBrainInfoJson)
+}
+
+func getCodeInfo(dateRecordAll UserBusinessAnalysisAll) string {
+	codeInfo := make(map[string]string)
+	codeInfo["commit_count"] = fmt.Sprint(dateRecordAll.CommitCount)
+	codeInfo["commit_line"] = fmt.Sprint(dateRecordAll.CommitCodeSize)
+
+	codeInfoJson, _ := json.Marshal(codeInfo)
+	return string(codeInfoJson)
+}
+
+func getDataSetInfo(userId int64, CreatedDataset map[int64]int, dataSetDownloadMap map[int64]int, CommitDatasetNumMap map[int64]int, CollectedDataset map[int64]int) string {
+	datasetInfo := make(map[string]string)
+	if create_count, ok := CreatedDataset[userId]; ok {
+		datasetInfo["create_count"] = fmt.Sprint(create_count)
+	}
+	if upload_count, ok := CommitDatasetNumMap[userId]; ok {
+		datasetInfo["upload_file_count"] = fmt.Sprint(upload_count)
+	}
+	if download_count, ok := dataSetDownloadMap[userId]; ok {
+		datasetInfo["download_count"] = fmt.Sprint(download_count)
+	}
+	if cllected_count, ok := CollectedDataset[userId]; ok {
+		datasetInfo["cllected_count"] = fmt.Sprint(cllected_count)
+	}
+	datasetInfoJson, _ := json.Marshal(datasetInfo)
+	return string(datasetInfoJson)
+}
+
+func getRepoDetailInfo(repoDetailInfoMap map[string]int, userId int64, mostDownload map[int64]string) string {
+	repoDetailInfo := make(map[string]string)
+	if total, ok := repoDetailInfoMap[fmt.Sprint(userId)+"_total"]; ok {
+		repoDetailInfo["repo_total"] = fmt.Sprint(total)
+	}
+	if private, ok := repoDetailInfoMap[fmt.Sprint(userId)+"_is_private"]; ok {
+		repoDetailInfo["repo_is_private"] = fmt.Sprint(private)
+	}
+	if public, ok := repoDetailInfoMap[fmt.Sprint(userId)+"_is_public"]; ok {
+		repoDetailInfo["repo_is_public"] = fmt.Sprint(public)
+	}
+	if download, ok := repoDetailInfoMap[fmt.Sprint(userId)+"_total_download"]; ok {
+		repoDetailInfo["repo_total_download"] = fmt.Sprint(download)
+	}
+	if mostdownload, ok := repoDetailInfoMap[fmt.Sprint(userId)+"_most_download"]; ok {
+		repoDetailInfo["repo_most_download_count"] = fmt.Sprint(mostdownload)
+	}
+	if mostdownloadName, ok := mostDownload[userId]; ok {
+		repoDetailInfo["repo_most_download_name"] = mostdownloadName
+	}
+	repoDetailInfoJson, _ := json.Marshal(repoDetailInfo)
+	return string(repoDetailInfoJson)
+}
+
+func getMostActiveJson(userInfo map[string]int) string {
+	mostActiveMap := make(map[string]string)
+	if day, ok := userInfo["hour_day"]; ok {
+		hour := userInfo["hour_hour"]
+		month := userInfo["hour_month"]
+		year := userInfo["hour_year"]
+		delete(userInfo, "hour_day")
+		delete(userInfo, "hour_hour")
+		delete(userInfo, "hour_month")
+		delete(userInfo, "hour_year")
+		mostActiveMap["before_dawn"] = fmt.Sprint(year) + "/" + fmt.Sprint(month) + "/" + fmt.Sprint(day) + " " + fmt.Sprint(hour)
+	}
+	max := 0
+	max_day := ""
+	for key, value := range userInfo {
+		if value > max {
+			max = value
+			max_day = key
+		}
+	}
+	mostActiveMap["most_active_day"] = max_day
+	mostActiveMap["most_active_num"] = fmt.Sprint(max)
+	mostActiveMapJson, _ := json.Marshal(mostActiveMap)
+	return string(mostActiveMapJson)
+}
 
 func updateUserIndex(tableName string, statictisSess *xorm.Session, userId int64, userIndex float64) {
 	updateSql := "UPDATE public." + tableName + " set user_index=" + fmt.Sprint(userIndex*100) + " where id=" + fmt.Sprint(userId)
@@ -1002,7 +1116,7 @@ func CounDataByDateAndReCount(wikiCountMap map[string]int, startTime time.Time,
 
 	DataDate := CountDate.Format("2006-01-02")
 	CodeMergeCountMap := queryPullRequest(start_unix, end_unix)
-	CommitCountMap := queryCommitAction(start_unix, end_unix, 5)
+	CommitCountMap, _ := queryCommitAction(start_unix, end_unix, 5)
 	IssueCountMap := queryCreateIssue(start_unix, end_unix)
 
 	CommentCountMap := queryComment(start_unix, end_unix)
@@ -1015,10 +1129,10 @@ func CounDataByDateAndReCount(wikiCountMap map[string]int, startTime time.Time,
 		log.Info("query commit code errr.")
 	} else {
 		//log.Info("query commit code size, len=" + fmt.Sprint(len(CommitCodeSizeMap)))
-		CommitCodeSizeMapJson, _ := json.Marshal(CommitCodeSizeMap)
-		log.Info("CommitCodeSizeMapJson=" + string(CommitCodeSizeMapJson))
+		//CommitCodeSizeMapJson, _ := json.Marshal(CommitCodeSizeMap)
+		//log.Info("CommitCodeSizeMapJson=" + string(CommitCodeSizeMapJson))
 	}
-	CommitDatasetSizeMap, CommitDatasetNumMap := queryDatasetSize(start_unix, end_unix)
+	CommitDatasetSizeMap, CommitDatasetNumMap, _ := queryDatasetSize(start_unix, end_unix)
 	SolveIssueCountMap := querySolveIssue(start_unix, end_unix)
 	CreateRepoCountMap, _, _ := queryUserCreateRepo(start_unix, end_unix)
 	LoginCountMap := queryLoginCount(start_unix, end_unix)
@@ -1027,7 +1141,7 @@ func CounDataByDateAndReCount(wikiCountMap map[string]int, startTime time.Time,
 	AiModelManageMap := queryUserModel(start_unix, end_unix)
 
 	CollectDataset, CollectedDataset := queryDatasetStars(start_unix, end_unix)
-	RecommendDataset := queryRecommedDataSet(start_unix, end_unix)
+	RecommendDataset, _ := queryRecommedDataSet(start_unix, end_unix)
 	CollectImage, CollectedImage := queryImageStars(start_unix, end_unix)
 	RecommendImage := queryRecommedImage(start_unix, end_unix)
 
@@ -1495,7 +1609,7 @@ func queryPullRequest(start_unix int64, end_unix int64) map[int64]int {
 	return resultMap
 }
 
-func queryCommitAction(start_unix int64, end_unix int64, actionType int64) map[int64]int {
+func queryCommitAction(start_unix int64, end_unix int64, actionType int64) (map[int64]int, map[int64]map[string]int) {
 	sess := x.NewSession()
 	defer sess.Close()
 	resultMap := make(map[int64]int)
@@ -1505,7 +1619,7 @@ func queryCommitAction(start_unix int64, end_unix int64, actionType int64) map[i
 	count, err := sess.Where(cond).Count(new(Action))
 	if err != nil {
 		log.Info("query action error. return.")
-		return resultMap
+		return resultMap, mostActiveMap
 	}
 
 	var indexTotal int64
@@ -1532,6 +1646,17 @@ func queryCommitAction(start_unix int64, end_unix int64, actionType int64) map[i
 			} else {
 				mostActiveMap[actionRecord.UserID][key] = getMapKeyStringValue(key, mostActiveMap[actionRecord.UserID]) + 1
 			}
+			utcTime := actionRecord.CreatedUnix.AsTime().UTC()
+			hour := utcTime.Hour()
+			if hour >= 0 && hour <= 5 {
+				key = "hour_hour"
+				if getMapKeyStringValue(key, mostActiveMap[actionRecord.UserID]) < hour {
+					mostActiveMap[actionRecord.UserID][key] = hour
+					mostActiveMap[actionRecord.UserID]["hour_day"] = utcTime.Day()
+					mostActiveMap[actionRecord.UserID]["hour_month"] = int(utcTime.Month())
+					mostActiveMap[actionRecord.UserID]["hour_year"] = utcTime.Year()
+				}
+			}
 		}
 		indexTotal += PAGE_SIZE
 		if indexTotal >= count {
@@ -1539,7 +1664,7 @@ func queryCommitAction(start_unix int64, end_unix int64, actionType int64) map[i
 		}
 	}
 
-	return resultMap
+	return resultMap, mostActiveMap
 }
 func getDate(createTime timeutil.TimeStamp) string {
 	return createTime.Format("2006-01-02")
@@ -1732,15 +1857,16 @@ func queryFollow(start_unix int64, end_unix int64) (map[int64]int, map[int64]int
 	return resultMap, resultFocusedByOtherMap
 }
 
-func queryRecommedDataSet(start_unix int64, end_unix int64) map[int64]int {
+func queryRecommedDataSet(start_unix int64, end_unix int64) (map[int64]int, map[int64]int) {
 	sess := x.NewSession()
 	defer sess.Close()
-	userIdDdatasetMap := make(map[int64]int)
-	cond := " created_unix>=" + fmt.Sprint(start_unix) + " and created_unix<=" + fmt.Sprint(end_unix) + " and recommend=true"
+	userIdRecommentDatasetMap := make(map[int64]int)
+	userIdCreateDatasetMap := make(map[int64]int)
+	cond := " created_unix>=" + fmt.Sprint(start_unix) + " and created_unix<=" + fmt.Sprint(end_unix)
 	count, err := sess.Where(cond).Count(new(Dataset))
 	if err != nil {
 		log.Info("query recommend dataset error. return.")
-		return userIdDdatasetMap
+		return userIdRecommentDatasetMap, userIdCreateDatasetMap
 	}
 	var indexTotal int64
 	indexTotal = 0
@@ -1750,18 +1876,21 @@ func queryRecommedDataSet(start_unix int64, end_unix int64) map[int64]int {
 		sess.Find(&datasetList)
 		log.Info("query datasetList size=" + fmt.Sprint(len(datasetList)))
 		for _, datasetRecord := range datasetList {
-			if _, ok := userIdDdatasetMap[datasetRecord.UserID]; !ok {
-				userIdDdatasetMap[datasetRecord.UserID] = 1
-			} else {
-				userIdDdatasetMap[datasetRecord.UserID] += 1
+			if datasetRecord.Recommend {
+				if _, ok := userIdRecommentDatasetMap[datasetRecord.UserID]; !ok {
+					userIdRecommentDatasetMap[datasetRecord.UserID] = 1
+				} else {
+					userIdRecommentDatasetMap[datasetRecord.UserID] += 1
+				}
 			}
+			userIdCreateDatasetMap[datasetRecord.UserID] = getMapValue(datasetRecord.UserID, userIdCreateDatasetMap) + 1
 		}
 		indexTotal += PAGE_SIZE
 		if indexTotal >= count {
 			break
 		}
 	}
-	return userIdDdatasetMap
+	return userIdRecommentDatasetMap, userIdCreateDatasetMap
 }
 
 func queryAllDataSet() (map[int64]int64, map[int64]int64) {
@@ -1940,22 +2069,23 @@ func queryImageStars(start_unix int64, end_unix int64) (map[int64]int, map[int64
 	return imageCollect, imageCollected
 }
 
-func queryDatasetSize(start_unix int64, end_unix int64) (map[int64]int, map[int64]int) {
+func queryDatasetSize(start_unix int64, end_unix int64) (map[int64]int, map[int64]int, map[int64]int) {
 	sess := x.NewSession()
 	defer sess.Close()
 	resultSizeMap := make(map[int64]int)
 	resultNumMap := make(map[int64]int)
+	resultDownloadMap := make(map[int64]int)
 	cond := " created_unix>=" + fmt.Sprint(start_unix) + " and created_unix<=" + fmt.Sprint(end_unix)
 
 	count, err := sess.Where(cond).Count(new(Attachment))
 	if err != nil {
 		log.Info("query attachment error. return.")
-		return resultSizeMap, resultNumMap
+		return resultSizeMap, resultNumMap, resultDownloadMap
 	}
 	var indexTotal int64
 	indexTotal = 0
 	for {
-		sess.Select("id,uploader_id,size").Table("attachment").Where(cond).OrderBy("id asc").Limit(PAGE_SIZE, int(indexTotal))
+		sess.Select("id,uploader_id,size,download_count").Table("attachment").Where(cond).OrderBy("id asc").Limit(PAGE_SIZE, int(indexTotal))
 		attachmentList := make([]*Attachment, 0)
 		sess.Find(&attachmentList)
 
@@ -1964,9 +2094,11 @@ func queryDatasetSize(start_unix int64, end_unix int64) (map[int64]int, map[int6
 			if _, ok := resultSizeMap[attachRecord.UploaderID]; !ok {
 				resultSizeMap[attachRecord.UploaderID] = int(attachRecord.Size / (1024 * 1024)) //MB
 				resultNumMap[attachRecord.UploaderID] = 1
+				resultDownloadMap[attachRecord.UploaderID] = int(attachRecord.DownloadCount)
 			} else {
 				resultSizeMap[attachRecord.UploaderID] += int(attachRecord.Size / (1024 * 1024)) //MB
 				resultNumMap[attachRecord.UploaderID] += 1
+				resultDownloadMap[attachRecord.UploaderID] += int(attachRecord.DownloadCount)
 			}
 		}
 
@@ -1976,7 +2108,7 @@ func queryDatasetSize(start_unix int64, end_unix int64) (map[int64]int, map[int6
 		}
 	}
 
-	return resultSizeMap, resultNumMap
+	return resultSizeMap, resultNumMap, resultDownloadMap
 }
 
 func queryUserCreateRepo(start_unix int64, end_unix int64) (map[int64]int, map[string]int, map[int64]string) {
@@ -2216,6 +2348,7 @@ func queryCloudBrainTask(start_unix int64, end_unix int64) (map[int64]int, map[s
 				setMapKey("CloudBrainRunTime", cloudTaskRecord.UserID, int(cloudTaskRecord.Duration), resultItemMap)
 			}
 			if cloudTaskRecord.Type == 1 { //npu
+				setMapKey("CloudBrainTwo", cloudTaskRecord.UserID, 1, resultItemMap)
 				if cloudTaskRecord.JobType == "TRAIN" {
 					setMapKey("NpuTrainJob", cloudTaskRecord.UserID, 1, resultItemMap)
 				} else if cloudTaskRecord.JobType == "INFERENCE" {
@@ -2223,14 +2356,32 @@ func queryCloudBrainTask(start_unix int64, end_unix int64) (map[int64]int, map[s
 				} else {
 					setMapKey("NpuDebugJob", cloudTaskRecord.UserID, 1, resultItemMap)
 				}
-			} else { //type=0  gpu
+			} else if cloudTaskRecord.Type == 0 { //type=0  gpu
+				setMapKey("CloudBrainOne", cloudTaskRecord.UserID, 1, resultItemMap)
 				if cloudTaskRecord.JobType == "TRAIN" {
 					setMapKey("GpuTrainJob", cloudTaskRecord.UserID, 1, resultItemMap)
+				} else if cloudTaskRecord.JobType == "INFERENCE" {
+					setMapKey("GpuInferenceJob", cloudTaskRecord.UserID, 1, resultItemMap)
 				} else if cloudTaskRecord.JobType == "BENCHMARK" {
 					setMapKey("GpuBenchMarkJob", cloudTaskRecord.UserID, 1, resultItemMap)
 				} else {
 					setMapKey("GpuDebugJob", cloudTaskRecord.UserID, 1, resultItemMap)
 				}
+			} else if cloudTaskRecord.Type == 2 {
+				setMapKey("C2Net", cloudTaskRecord.UserID, 1, resultItemMap)
+				if cloudTaskRecord.ComputeResource == NPUResource {
+					if cloudTaskRecord.JobType == "TRAIN" {
+						setMapKey("NpuTrainJob", cloudTaskRecord.UserID, 1, resultItemMap)
+					} else {
+						setMapKey("NpuDebugJob", cloudTaskRecord.UserID, 1, resultItemMap)
+					}
+				} else if cloudTaskRecord.ComputeResource == GPUResource {
+					if cloudTaskRecord.JobType == "TRAIN" {
+						setMapKey("GpuTrainJob", cloudTaskRecord.UserID, 1, resultItemMap)
+					} else {
+						setMapKey("GpuDebugJob", cloudTaskRecord.UserID, 1, resultItemMap)
+					}
+				}
 			}
 		}
 		indexTotal += PAGE_SIZE
diff --git a/routers/repo/ai_model_manage.go b/routers/repo/ai_model_manage.go
index a71203b40..750fe4c5b 100644
--- a/routers/repo/ai_model_manage.go
+++ b/routers/repo/ai_model_manage.go
@@ -1083,6 +1083,16 @@ func ModifyModel(id string, description string) error {
 	return err
 }
 
+func ModifyModelLabel(id string, label string) error {
+	err := models.ModifyModelLabel(id, label)
+	if err == nil {
+		log.Info("modify success.")
+	} else {
+		log.Info("Failed to modify.id=" + id + "  desc=" + label + " error:" + err.Error())
+	}
+	return err
+}
+
 func ModifyModelInfo(ctx *context.Context) {
 	log.Info("modify model start.")
 	id := ctx.Query("id")
@@ -1124,7 +1134,12 @@ func ModifyModelInfo(ctx *context.Context) {
 		err = models.ModifyLocalModel(id, name, label, description, engine)
 
 	} else {
-		err = ModifyModel(id, description)
+		_, ok := ctx.Req.Form["label"]
+		if ok {
+			err = ModifyModelLabel(id, ctx.Query("label"))
+		} else {
+			err = ModifyModel(id, description)
+		}
 	}
 
 	if err != nil {
diff --git a/routers/repo/attachment.go b/routers/repo/attachment.go
index de1869f1f..fb56d494e 100755
--- a/routers/repo/attachment.go
+++ b/routers/repo/attachment.go
@@ -675,22 +675,45 @@ func GetSuccessChunks(ctx *context.Context) {
 			//copy
 			srcObjectName := fileChunk.ObjectName
 			destObjectName := getObjectName(fileName, modeluuid)
+			var isExist bool
 			if typeCloudBrain == models.TypeCloudBrainOne {
 				bucketName := setting.Attachment.Minio.Bucket
-				storage.MinioCopyAFile(bucketName, srcObjectName, bucketName, destObjectName)
+				if storage.MinioGetFilesSize(bucketName, []string{destObjectName}) > 0 {
+					isExist = true
+				} else {
+					storage.MinioCopyAFile(bucketName, srcObjectName, bucketName, destObjectName)
+				}
 			} else {
 				bucketName := setting.Bucket
-				storage.ObsCopyFile(bucketName, srcObjectName, bucketName, destObjectName)
+				if storage.ObsGetFilesSize(bucketName, []string{destObjectName}) > 0 {
+					isExist = true
+				} else {
+					storage.ObsCopyFile(bucketName, srcObjectName, bucketName, destObjectName)
+				}
 			}
-			UpdateModelSize(modeluuid)
-			ctx.JSON(200, map[string]string{
-				"uuid":     fileChunk.UUID,
-				"uploaded": strconv.Itoa(fileChunk.IsUploaded),
-				"uploadID": fileChunk.UploadID,
-				"chunks":   string(chunks),
-				"attachID": strconv.Itoa(int(attachID)),
-				"fileName": attach.Name,
-			})
+			if isExist {
+				ctx.JSON(200, map[string]string{
+					"uuid":      fileChunk.UUID,
+					"uploaded":  strconv.Itoa(fileChunk.IsUploaded),
+					"uploadID":  fileChunk.UploadID,
+					"chunks":    string(chunks),
+					"attachID":  strconv.Itoa(int(attachID)),
+					"modeluuid": modeluuid,
+					"fileName":  attach.Name,
+					"modelName": modelname,
+				})
+			} else {
+				UpdateModelSize(modeluuid)
+				ctx.JSON(200, map[string]string{
+					"uuid":     fileChunk.UUID,
+					"uploaded": strconv.Itoa(fileChunk.IsUploaded),
+					"uploadID": fileChunk.UploadID,
+					"chunks":   string(chunks),
+					"attachID": strconv.Itoa(int(attachID)),
+					"fileName": attach.Name,
+				})
+			}
+
 			return
 		} else {
 			model, err := models.QueryModelById(dbmodeluuid)

From 718eb51f2d43234f5f8eb716e4301d208d477921 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Thu, 10 Nov 2022 15:31:14 +0800
Subject: [PATCH 124/187] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E6=94=B9Bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 models/ai_model_manage.go       | 13 -------------
 routers/repo/ai_model_manage.go | 22 +++++-----------------
 routers/repo/attachment.go      |  1 -
 3 files changed, 5 insertions(+), 31 deletions(-)

diff --git a/models/ai_model_manage.go b/models/ai_model_manage.go
index 40e5d5378..5b14b9ba2 100644
--- a/models/ai_model_manage.go
+++ b/models/ai_model_manage.go
@@ -287,19 +287,6 @@ func ModifyModelDescription(id string, description string) error {
 	log.Info("success to update description from  db.re=" + fmt.Sprint((re)))
 	return nil
 }
-func ModifyModelLabel(id string, label string) error {
-	var sess *xorm.Session
-	sess = x.ID(id)
-	defer sess.Close()
-	re, err := sess.Cols("label").Update(&AiModelManage{
-		Label: label,
-	})
-	if err != nil {
-		return err
-	}
-	log.Info("success to update description from  db.re=" + fmt.Sprint((re)))
-	return nil
-}
 
 func ModifyLocalModel(id string, name, label, description string, engine int) error {
 	var sess *xorm.Session
diff --git a/routers/repo/ai_model_manage.go b/routers/repo/ai_model_manage.go
index 750fe4c5b..ad4b4b91f 100644
--- a/routers/repo/ai_model_manage.go
+++ b/routers/repo/ai_model_manage.go
@@ -1083,20 +1083,9 @@ func ModifyModel(id string, description string) error {
 	return err
 }
 
-func ModifyModelLabel(id string, label string) error {
-	err := models.ModifyModelLabel(id, label)
-	if err == nil {
-		log.Info("modify success.")
-	} else {
-		log.Info("Failed to modify.id=" + id + "  desc=" + label + " error:" + err.Error())
-	}
-	return err
-}
-
 func ModifyModelInfo(ctx *context.Context) {
 	log.Info("modify model start.")
 	id := ctx.Query("id")
-	description := ctx.Query("description")
 	re := map[string]string{
 		"code": "-1",
 	}
@@ -1134,12 +1123,11 @@ func ModifyModelInfo(ctx *context.Context) {
 		err = models.ModifyLocalModel(id, name, label, description, engine)
 
 	} else {
-		_, ok := ctx.Req.Form["label"]
-		if ok {
-			err = ModifyModelLabel(id, ctx.Query("label"))
-		} else {
-			err = ModifyModel(id, description)
-		}
+		label := ctx.Query("label")
+		description := ctx.Query("description")
+		engine := task.Engine
+		name := task.Name
+		err = models.ModifyLocalModel(id, name, label, description, int(engine))
 	}
 
 	if err != nil {
diff --git a/routers/repo/attachment.go b/routers/repo/attachment.go
index fb56d494e..555330491 100755
--- a/routers/repo/attachment.go
+++ b/routers/repo/attachment.go
@@ -713,7 +713,6 @@ func GetSuccessChunks(ctx *context.Context) {
 					"fileName": attach.Name,
 				})
 			}
-
 			return
 		} else {
 			model, err := models.QueryModelById(dbmodeluuid)

From 78faab8e2ab5ef41978181051dc504ddddb04166 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Thu, 10 Nov 2022 16:51:50 +0800
Subject: [PATCH 125/187] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=EF=BC=8C=E5=A2=9E=E5=8A=A0=E5=B9=B4=E5=BA=A6=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=87=86=E5=A4=87=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 models/user_business_analysis.go | 96 ++++++++++++++++++++++++++++++--
 1 file changed, 90 insertions(+), 6 deletions(-)

diff --git a/models/user_business_analysis.go b/models/user_business_analysis.go
index 5bac77114..bf4fa2d4b 100644
--- a/models/user_business_analysis.go
+++ b/models/user_business_analysis.go
@@ -3,12 +3,15 @@ package models
 import (
 	"encoding/json"
 	"fmt"
+	"io/ioutil"
+	"net/http"
 	"sort"
 	"strconv"
 	"strings"
 	"time"
 
 	"code.gitea.io/gitea/modules/log"
+	"code.gitea.io/gitea/modules/setting"
 	"code.gitea.io/gitea/modules/timeutil"
 	"xorm.io/builder"
 	"xorm.io/xorm"
@@ -785,7 +788,10 @@ func refreshUserStaticTable(wikiCountMap map[string]int, tableName string, pageS
 	InvitationMap := queryUserInvitationCount(start_unix, end_unix)
 
 	DataDate := currentTimeNow.Format("2006-01-02") + " 00:01"
-
+	bonusMap := make(map[string]map[string]int)
+	if tableName == "user_business_analysis_current_year" {
+		bonusMap = getBonusMap()
+	}
 	cond := "type != 1 and is_active=true"
 	count, err := sess.Where(cond).Count(new(User))
 	if err != nil {
@@ -894,6 +900,7 @@ func refreshUserStaticTable(wikiCountMap map[string]int, tableName string, pageS
 				dataSetInfo := getDataSetInfo(dateRecordAll.ID, CreatedDataset, dataSetDownloadMap, CommitDatasetNumMap, CollectedDataset)
 				codeInfo := getCodeInfo(dateRecordAll)
 				cloudBrainInfo := getCloudBrainInfo(dateRecordAll, CloudBrainTaskItemMap)
+				playARoll := getPlayARoll(bonusMap, dateRecordAll.Name)
 				re := &UserSummaryCurrentYear{
 					ID:             dateRecordAll.ID,
 					Name:           dateRecordAll.Name,
@@ -906,11 +913,9 @@ func refreshUserStaticTable(wikiCountMap map[string]int, tableName string, pageS
 					DataSetInfo:    dataSetInfo,
 					CodeInfo:       codeInfo,
 					CloudBrainInfo: cloudBrainInfo,
+					PlayARoll:      playARoll,
 				}
 				statictisSess.Insert(re)
-				//log.Info(fmt.Sprint(len(CommitCountMap)))
-				//log.Info(fmt.Sprint(len(CommitCodeSizeMap)))
-
 			}
 		}
 		if len(dateRecordBatch) > 0 {
@@ -940,15 +945,71 @@ func refreshUserStaticTable(wikiCountMap map[string]int, tableName string, pageS
 	}
 	log.Info("refresh data finished.tableName=" + tableName + " total record:" + fmt.Sprint(insertCount))
 }
+
+func getBonusMap() map[string]map[string]int {
+	bonusMap := make(map[string]map[string]int)
+	url := setting.RecommentRepoAddr + "bonus/record.txt"
+	content, err := GetContentFromPromote(url)
+	if err == nil {
+		filenames := strings.Split(content, "\n")
+		for i := 0; i < len(filenames); i++ {
+			url = setting.RecommentRepoAddr + "bonus/" + filenames[i]
+			csvContent, err1 := GetContentFromPromote(url)
+			if err1 == nil {
+				//read csv
+				lines := strings.Split(csvContent, "\n")
+				for j := 1; j < len(lines); j++ {
+					userName := lines[1]
+					//email := lines[2]
+					record, ok := bonusMap[userName]
+					if !ok {
+						record = make(map[string]int)
+					}
+					record["times"] = getMapKeyStringValue("times", record) + getIntValue(lines[3])
+					record["total_bonus"] = getMapKeyStringValue("total_bonus", record) + getIntValue(lines[4])
+					record["total_cardtime"] = getMapKeyStringValue("total_cardtime", record) + getIntValue(lines[5])
+					record["total_giveup"] = getMapKeyStringValue("total_giveup", record) + getIntValue(lines[6])
+				}
+			}
+		}
+	}
+	return bonusMap
+}
+
+func getIntValue(val string) int {
+	i, err := strconv.Atoi(val)
+	if err == nil {
+		return i
+	}
+	return 0
+}
+
+func getPlayARoll(bonusMap map[string]map[string]int, userName string) string {
+	bonusInfo := make(map[string]string)
+
+	record, ok := bonusMap[userName]
+	if ok {
+		bonusInfo["times"] = fmt.Sprint(record["times"])
+		bonusInfo["total_bonus"] = fmt.Sprint(record["total_bonus"])
+		bonusInfo["total_cardtime"] = fmt.Sprint(record["total_cardtime"])
+		bonusInfo["total_giveup"] = fmt.Sprint(record["total_giveup"])
+	}
+	bonusInfoJson, _ := json.Marshal(bonusInfo)
+	return string(bonusInfoJson)
+}
+
 func getCloudBrainInfo(dateRecordAll UserBusinessAnalysisAll, CloudBrainTaskItemMap map[string]int) string {
 	cloudBrainInfo := make(map[string]string)
 	cloudBrainInfo["create_task_num"] = fmt.Sprint(dateRecordAll.CloudBrainTaskNum)
 	cloudBrainInfo["debug_task_num"] = fmt.Sprint(dateRecordAll.GpuDebugJob + dateRecordAll.NpuDebugJob)
 	cloudBrainInfo["train_task_num"] = fmt.Sprint(dateRecordAll.GpuTrainJob + dateRecordAll.NpuTrainJob)
-	cloudBrainInfo["inference_task_num"] = fmt.Sprint(dateRecordAll.NpuInferenceJob + CloudBrainTaskItemMap["GpuInferenceJob"])
+	cloudBrainInfo["inference_task_num"] = fmt.Sprint(dateRecordAll.NpuInferenceJob + CloudBrainTaskItemMap[fmt.Sprint(dateRecordAll.ID)+"_GpuInferenceJob"])
 	cloudBrainInfo["card_runtime"] = fmt.Sprint(dateRecordAll.CloudBrainRunTime)
 	cloudBrainInfo["card_runtime_money"] = fmt.Sprint(dateRecordAll.CloudBrainRunTime * 5)
-	//todo
+	cloudBrainInfo["CloudBrainOne"] = fmt.Sprint(CloudBrainTaskItemMap[fmt.Sprint(dateRecordAll.ID)+"_CloudBrainOne"])
+	cloudBrainInfo["CloudBrainTwo"] = fmt.Sprint(CloudBrainTaskItemMap[fmt.Sprint(dateRecordAll.ID)+"_CloudBrainTwo"])
+	cloudBrainInfo["C2Net"] = fmt.Sprint(CloudBrainTaskItemMap[fmt.Sprint(dateRecordAll.ID)+"_C2Net"])
+
 	cloudBrainInfoJson, _ := json.Marshal(cloudBrainInfo)
 	return string(cloudBrainInfoJson)
 }
@@ -2461,3 +2522,26 @@ func subMonth(t1, t2 time.Time) (month int) {
 	}
 	return month
 }
+
+func GetContentFromPromote(url string) (string, error) {
+	defer func() {
+		if err := recover(); err != nil {
+			log.Info("not error.", err)
+			return
+		}
+	}()
+	resp, err := http.Get(url)
+	if err != nil || resp.StatusCode != 200 {
+		log.Info("Get organizations url error=" + err.Error())
+		return "", err
+	}
+
+	bytes, err := ioutil.ReadAll(resp.Body)
+	resp.Body.Close()
+	if err != nil {
+		log.Info("Get organizations url error=" + err.Error())
+		return "", err
+	}
+	allLineStr := string(bytes)
+	return allLineStr, nil
+}

From 6c35ac78b152fa8da839c03e41231ecb289081f6 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Thu, 10 Nov 2022 16:53:33 +0800
Subject: [PATCH 126/187] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=EF=BC=8C=E5=A2=9E=E5=8A=A0=E5=B9=B4=E5=BA=A6=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=87=86=E5=A4=87=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 models/models.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/models/models.go b/models/models.go
index a4ec43f43..7002f089b 100755
--- a/models/models.go
+++ b/models/models.go
@@ -185,6 +185,7 @@ func init() {
 		new(UserAnalysisPara),
 		new(Invitation),
 		new(CloudbrainDurationStatistic),
+		new(UserSummaryCurrentYear),
 	)
 
 	gonicNames := []string{"SSL", "UID"}

From d3134a55675fc18d74f1e17c6291807757233441 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Thu, 10 Nov 2022 17:20:59 +0800
Subject: [PATCH 127/187] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=EF=BC=8C=E5=A2=9E=E5=8A=A0=E5=B9=B4=E5=BA=A6=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=87=86=E5=A4=87=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 models/user_business_analysis.go | 71 ++++++++++++++++++++------------
 1 file changed, 45 insertions(+), 26 deletions(-)

diff --git a/models/user_business_analysis.go b/models/user_business_analysis.go
index bf4fa2d4b..367674076 100644
--- a/models/user_business_analysis.go
+++ b/models/user_business_analysis.go
@@ -791,6 +791,8 @@ func refreshUserStaticTable(wikiCountMap map[string]int, tableName string, pageS
 	bonusMap := make(map[string]map[string]int)
 	if tableName == "user_business_analysis_current_year" {
 		bonusMap = getBonusMap()
+		log.Info("truncate all data from table:user_summary_current_year ")
+		statictisSess.Exec("TRUNCATE TABLE user_summary_current_year")
 	}
 	cond := "type != 1 and is_active=true"
 	count, err := sess.Where(cond).Count(new(User))
@@ -986,41 +988,50 @@ func getIntValue(val string) int {
 
 func getPlayARoll(bonusMap map[string]map[string]int, userName string) string {
 	bonusInfo := make(map[string]string)
-
 	record, ok := bonusMap[userName]
 	if ok {
 		bonusInfo["times"] = fmt.Sprint(record["times"])
 		bonusInfo["total_bonus"] = fmt.Sprint(record["total_bonus"])
 		bonusInfo["total_cardtime"] = fmt.Sprint(record["total_cardtime"])
 		bonusInfo["total_giveup"] = fmt.Sprint(record["total_giveup"])
+		bonusInfoJson, _ := json.Marshal(bonusInfo)
+		return string(bonusInfoJson)
+	} else {
+		return ""
 	}
-	bonusInfoJson, _ := json.Marshal(bonusInfo)
-	return string(bonusInfoJson)
 }
 
 func getCloudBrainInfo(dateRecordAll UserBusinessAnalysisAll, CloudBrainTaskItemMap map[string]int) string {
-	cloudBrainInfo := make(map[string]string)
-	cloudBrainInfo["create_task_num"] = fmt.Sprint(dateRecordAll.CloudBrainTaskNum)
-	cloudBrainInfo["debug_task_num"] = fmt.Sprint(dateRecordAll.GpuDebugJob + dateRecordAll.NpuDebugJob)
-	cloudBrainInfo["train_task_num"] = fmt.Sprint(dateRecordAll.GpuTrainJob + dateRecordAll.NpuTrainJob)
-	cloudBrainInfo["inference_task_num"] = fmt.Sprint(dateRecordAll.NpuInferenceJob + CloudBrainTaskItemMap[fmt.Sprint(dateRecordAll.ID)+"_GpuInferenceJob"])
-	cloudBrainInfo["card_runtime"] = fmt.Sprint(dateRecordAll.CloudBrainRunTime)
-	cloudBrainInfo["card_runtime_money"] = fmt.Sprint(dateRecordAll.CloudBrainRunTime * 5)
-	cloudBrainInfo["CloudBrainOne"] = fmt.Sprint(CloudBrainTaskItemMap[fmt.Sprint(dateRecordAll.ID)+"_CloudBrainOne"])
-	cloudBrainInfo["CloudBrainTwo"] = fmt.Sprint(CloudBrainTaskItemMap[fmt.Sprint(dateRecordAll.ID)+"_CloudBrainTwo"])
-	cloudBrainInfo["C2Net"] = fmt.Sprint(CloudBrainTaskItemMap[fmt.Sprint(dateRecordAll.ID)+"_C2Net"])
-
-	cloudBrainInfoJson, _ := json.Marshal(cloudBrainInfo)
-	return string(cloudBrainInfoJson)
+	if dateRecordAll.CloudBrainTaskNum > 0 {
+		cloudBrainInfo := make(map[string]string)
+		cloudBrainInfo["create_task_num"] = fmt.Sprint(dateRecordAll.CloudBrainTaskNum)
+		cloudBrainInfo["debug_task_num"] = fmt.Sprint(dateRecordAll.GpuDebugJob + dateRecordAll.NpuDebugJob)
+		cloudBrainInfo["train_task_num"] = fmt.Sprint(dateRecordAll.GpuTrainJob + dateRecordAll.NpuTrainJob)
+		cloudBrainInfo["inference_task_num"] = fmt.Sprint(dateRecordAll.NpuInferenceJob + CloudBrainTaskItemMap[fmt.Sprint(dateRecordAll.ID)+"_GpuInferenceJob"])
+		cloudBrainInfo["card_runtime"] = fmt.Sprint(dateRecordAll.CloudBrainRunTime)
+		cloudBrainInfo["card_runtime_money"] = fmt.Sprint(dateRecordAll.CloudBrainRunTime * 5)
+		cloudBrainInfo["CloudBrainOne"] = fmt.Sprint(CloudBrainTaskItemMap[fmt.Sprint(dateRecordAll.ID)+"_CloudBrainOne"])
+		cloudBrainInfo["CloudBrainTwo"] = fmt.Sprint(CloudBrainTaskItemMap[fmt.Sprint(dateRecordAll.ID)+"_CloudBrainTwo"])
+		cloudBrainInfo["C2Net"] = fmt.Sprint(CloudBrainTaskItemMap[fmt.Sprint(dateRecordAll.ID)+"_C2Net"])
+
+		cloudBrainInfoJson, _ := json.Marshal(cloudBrainInfo)
+		return string(cloudBrainInfoJson)
+	} else {
+		return ""
+	}
 }
 
 func getCodeInfo(dateRecordAll UserBusinessAnalysisAll) string {
-	codeInfo := make(map[string]string)
-	codeInfo["commit_count"] = fmt.Sprint(dateRecordAll.CommitCount)
-	codeInfo["commit_line"] = fmt.Sprint(dateRecordAll.CommitCodeSize)
+	if dateRecordAll.CommitCount > 0 {
+		codeInfo := make(map[string]string)
+		codeInfo["commit_count"] = fmt.Sprint(dateRecordAll.CommitCount)
+		codeInfo["commit_line"] = fmt.Sprint(dateRecordAll.CommitCodeSize)
 
-	codeInfoJson, _ := json.Marshal(codeInfo)
-	return string(codeInfoJson)
+		codeInfoJson, _ := json.Marshal(codeInfo)
+		return string(codeInfoJson)
+	} else {
+		return ""
+	}
 }
 
 func getDataSetInfo(userId int64, CreatedDataset map[int64]int, dataSetDownloadMap map[int64]int, CommitDatasetNumMap map[int64]int, CollectedDataset map[int64]int) string {
@@ -1037,8 +1048,12 @@ func getDataSetInfo(userId int64, CreatedDataset map[int64]int, dataSetDownloadM
 	if cllected_count, ok := CollectedDataset[userId]; ok {
 		datasetInfo["cllected_count"] = fmt.Sprint(cllected_count)
 	}
-	datasetInfoJson, _ := json.Marshal(datasetInfo)
-	return string(datasetInfoJson)
+	if len(datasetInfo) > 0 {
+		datasetInfoJson, _ := json.Marshal(datasetInfo)
+		return string(datasetInfoJson)
+	} else {
+		return ""
+	}
 }
 
 func getRepoDetailInfo(repoDetailInfoMap map[string]int, userId int64, mostDownload map[int64]string) string {
@@ -1061,8 +1076,12 @@ func getRepoDetailInfo(repoDetailInfoMap map[string]int, userId int64, mostDownl
 	if mostdownloadName, ok := mostDownload[userId]; ok {
 		repoDetailInfo["repo_most_download_name"] = mostdownloadName
 	}
-	repoDetailInfoJson, _ := json.Marshal(repoDetailInfo)
-	return string(repoDetailInfoJson)
+	if len(repoDetailInfo) > 0 {
+		repoDetailInfoJson, _ := json.Marshal(repoDetailInfo)
+		return string(repoDetailInfoJson)
+	} else {
+		return ""
+	}
 }
 
 func getMostActiveJson(userInfo map[string]int) string {
@@ -1686,7 +1705,7 @@ func queryCommitAction(start_unix int64, end_unix int64, actionType int64) (map[
 	var indexTotal int64
 	indexTotal = 0
 	for {
-		sess.Select("id,user_id,op_type,act_user_id").Table("action").Where(cond).OrderBy("id asc").Limit(PAGE_SIZE, int(indexTotal))
+		sess.Select("id,user_id,op_type,act_user_id,created_unix").Table("action").Where(cond).OrderBy("id asc").Limit(PAGE_SIZE, int(indexTotal))
 		actionList := make([]*Action, 0)
 		sess.Find(&actionList)
 

From d264f4735b9ff13b4a24df5e04e5288161dbd0c3 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Thu, 10 Nov 2022 17:31:59 +0800
Subject: [PATCH 128/187] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=EF=BC=8C=E5=A2=9E=E5=8A=A0=E5=B9=B4=E5=BA=A6=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=87=86=E5=A4=87=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 models/user_business_analysis.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/models/user_business_analysis.go b/models/user_business_analysis.go
index 367674076..50bb34406 100644
--- a/models/user_business_analysis.go
+++ b/models/user_business_analysis.go
@@ -1726,7 +1726,7 @@ func queryCommitAction(start_unix int64, end_unix int64, actionType int64) (map[
 			} else {
 				mostActiveMap[actionRecord.UserID][key] = getMapKeyStringValue(key, mostActiveMap[actionRecord.UserID]) + 1
 			}
-			utcTime := actionRecord.CreatedUnix.AsTime().UTC()
+			utcTime := actionRecord.CreatedUnix.AsTime()
 			hour := utcTime.Hour()
 			if hour >= 0 && hour <= 5 {
 				key = "hour_hour"

From 9e75cbfcb663bb9f9a07f43a2d23b073d4b17692 Mon Sep 17 00:00:00 2001
From: chenyifan01 <cyf_uestc@outlook.com>
Date: Thu, 10 Nov 2022 18:01:32 +0800
Subject: [PATCH 129/187] #3105 add grampus metrics

---
 modules/grampus/resty.go | 26 ++++++++++++++++++++++++++
 routers/api/v1/api.go    |  1 +
 routers/repo/grampus.go  | 22 ++++++++++++++++++++++
 3 files changed, 49 insertions(+)

diff --git a/modules/grampus/resty.go b/modules/grampus/resty.go
index f36721c85..a9e1aed5c 100755
--- a/modules/grampus/resty.go
+++ b/modules/grampus/resty.go
@@ -245,6 +245,32 @@ func GetTrainJobLog(jobID string) (string, error) {
 	return logContent, nil
 }
 
+func GetGrampusMetrics(jobID string) (models.GetTrainJobMetricStatisticResult, error) {
+	checkSetting()
+	client := getRestyClient()
+	var result models.GetTrainJobMetricStatisticResult
+	res, err := client.R().
+		SetAuthToken(TOKEN).
+		Get(HOST + urlTrainJob + "/" + jobID + "/task/0/replica/0/metrics")
+
+	if err != nil {
+		return result, fmt.Errorf("resty GetTrainJobLog: %v", err)
+	}
+	if err = json.Unmarshal([]byte(res.String()), &result); err != nil {
+		log.Error("GetGrampusMetrics json.Unmarshal failed(%s): %v", res.String(), err.Error())
+		return result, fmt.Errorf("json.Unmarshal failed(%s): %v", res.String(), err.Error())
+	}
+	if res.StatusCode() != http.StatusOK {
+		log.Error("Call GrampusMetrics failed(%d):%s(%s)", res.StatusCode(), result.ErrorCode, result.ErrorMsg)
+		return result, fmt.Errorf("Call GrampusMetrics failed(%d):%d(%s)", res.StatusCode(), result.ErrorCode, result.ErrorMsg)
+	}
+	if !result.IsSuccess {
+		log.Error("GetGrampusMetrics(%s) failed", jobID)
+		return result, fmt.Errorf("GetGrampusMetrics failed:%s", result.ErrorMsg)
+	}
+	return result, nil
+}
+
 func StopJob(jobID string) (*models.GrampusStopJobResponse, error) {
 	checkSetting()
 	client := getRestyClient()
diff --git a/routers/api/v1/api.go b/routers/api/v1/api.go
index 813b77c8c..5533a4c9e 100755
--- a/routers/api/v1/api.go
+++ b/routers/api/v1/api.go
@@ -1048,6 +1048,7 @@ func RegisterRoutes(m *macaron.Macaron) {
 							m.Get("", repo.GetModelArtsTrainJobVersion)
 							m.Post("/stop_version", cloudbrain.AdminOrOwnerOrJobCreaterRightForTrain, repo_ext.GrampusStopJob)
 							m.Get("/log", repo_ext.GrampusGetLog)
+							m.Get("/metrics", repo_ext.GrampusMetrics)
 							m.Get("/download_log", cloudbrain.AdminOrJobCreaterRightForTrain, repo_ext.GrampusDownloadLog)
 						})
 					})
diff --git a/routers/repo/grampus.go b/routers/repo/grampus.go
index cc17773b0..581a1fbfb 100755
--- a/routers/repo/grampus.go
+++ b/routers/repo/grampus.go
@@ -957,6 +957,28 @@ func GrampusGetLog(ctx *context.Context) {
 	return
 }
 
+func GrampusMetrics(ctx *context.Context) {
+	jobID := ctx.Params(":jobid")
+	job, err := models.GetCloudbrainByJobID(jobID)
+	if err != nil {
+		log.Error("GetCloudbrainByJobID failed: %v", err, ctx.Data["MsgID"])
+		ctx.ServerError(err.Error(), err)
+		return
+	}
+
+	result, err := grampus.GetGrampusMetrics(job.JobID)
+	if err != nil {
+		log.Error("GetTrainJobLog failed: %v", err, ctx.Data["MsgID"])
+	}
+	ctx.JSON(http.StatusOK, map[string]interface{}{
+		"JobID":       jobID,
+		"Interval":    result.Interval,
+		"MetricsInfo": result.MetricsInfo,
+	})
+
+	return
+}
+
 func generateCommand(repoName, processorType, codeRemotePath, dataRemotePath, bootFile, paramSrc, outputRemotePath, datasetName, pretrainModelPath, pretrainModelFileName, modelRemoteObsUrl string) (string, error) {
 	var command string
 

From fad7b8327842af7c368e6b232f6af05d590f2baa Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Fri, 11 Nov 2022 11:04:54 +0800
Subject: [PATCH 130/187] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=EF=BC=8C=E8=A7=A3=E5=86=B3=E8=AF=84=E5=AE=A1=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/repo/ai_model_manage.go | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/routers/repo/ai_model_manage.go b/routers/repo/ai_model_manage.go
index ad4b4b91f..a72e812ab 100644
--- a/routers/repo/ai_model_manage.go
+++ b/routers/repo/ai_model_manage.go
@@ -76,6 +76,11 @@ func saveModelByParameters(jobId string, versionName string, name string, versio
 	//download model zip   //train type
 	if aiTask.ComputeResource == models.NPUResource {
 		cloudType = models.TypeCloudBrainTwo
+		spec, err := resource.GetCloudbrainSpec(aiTask.ID)
+		if err == nil {
+			flaverName := "NPU: " + fmt.Sprint(spec.AccCardsNum) + "*" + spec.AccCardType + ",CPU: " + fmt.Sprint(spec.CpuCores) + "," + ctx.Tr("cloudbrain.memory") + ": " + fmt.Sprint(spec.MemGiB) + "GB," + ctx.Tr("cloudbrain.shared_memory") + ": " + fmt.Sprint(spec.ShareMemGiB) + "GB"
+			aiTask.FlavorName = flaverName
+		}
 	} else if aiTask.ComputeResource == models.GPUResource {
 		cloudType = models.TypeCloudBrainOne
 		spec, err := resource.GetCloudbrainSpec(aiTask.ID)
@@ -1247,7 +1252,7 @@ func CreateLocalModelForUpload(ctx *context.Context) {
 	ctx.Data["uuid"] = ctx.Query("uuid")
 	ctx.Data["isModelManage"] = true
 	ctx.Data["ModelManageAccess"] = ctx.Repo.CanWrite(models.UnitTypeModelManage)
-
+	ctx.Data["max_model_size"] = setting.MaxModelSize * MODEL_MAX_SIZE
 	ctx.HTML(200, tplCreateLocalForUploadModelInfo)
 }
 

From c4d97f9770eab8ac49ee1a25818bc0ee7fd45fa7 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Fri, 11 Nov 2022 11:47:34 +0800
Subject: [PATCH 131/187] =?UTF-8?q?=E5=8D=95=E4=B8=AA=E6=A8=A1=E5=9E=8B?=
 =?UTF-8?q?=E6=80=BB=E5=A4=A7=E5=B0=8F=E4=B8=8D=E8=B6=85=E8=BF=87200G?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 modules/setting/setting.go | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/modules/setting/setting.go b/modules/setting/setting.go
index 88557ee60..ef72debe5 100755
--- a/modules/setting/setting.go
+++ b/modules/setting/setting.go
@@ -609,9 +609,9 @@ var (
 		AiCenterInfo      string
 	}{}
 
-	C2NetInfos  *C2NetSqInfos
-	CenterInfos *AiCenterInfos
-	C2NetMapInfo   map[string]*C2NetSequenceInfo
+	C2NetInfos   *C2NetSqInfos
+	CenterInfos  *AiCenterInfos
+	C2NetMapInfo map[string]*C2NetSequenceInfo
 
 	//elk config
 	ElkUrl              string
@@ -1451,7 +1451,7 @@ func NewContext() {
 	MaxDuration = sec.Key("MAX_DURATION").MustInt64(14400)
 	TrainGpuTypes = sec.Key("TRAIN_GPU_TYPES").MustString("")
 	TrainResourceSpecs = sec.Key("TRAIN_RESOURCE_SPECS").MustString("")
-	MaxModelSize = sec.Key("MAX_MODEL_SIZE").MustFloat64(500)
+	MaxModelSize = sec.Key("MAX_MODEL_SIZE").MustFloat64(200)
 	InferenceGpuTypes = sec.Key("INFERENCE_GPU_TYPES").MustString("")
 	InferenceResourceSpecs = sec.Key("INFERENCE_RESOURCE_SPECS").MustString("")
 	SpecialPools = sec.Key("SPECIAL_POOL").MustString("")
@@ -1655,9 +1655,9 @@ func getGrampusConfig() {
 		if err := json.Unmarshal([]byte(Grampus.C2NetSequence), &C2NetInfos); err != nil {
 			log.Error("Unmarshal(C2NetSequence) failed:%v", err)
 		}
-		C2NetMapInfo=make(map[string]*C2NetSequenceInfo)
-		for _,value :=range C2NetInfos.C2NetSqInfo{
-			C2NetMapInfo[value.Name]=value
+		C2NetMapInfo = make(map[string]*C2NetSequenceInfo)
+		for _, value := range C2NetInfos.C2NetSqInfo {
+			C2NetMapInfo[value.Name] = value
 		}
 	}
 	Grampus.SyncScriptProject = sec.Key("SYNC_SCRIPT_PROJECT").MustString("script_for_grampus")

From 0e8a29823804327c1ea9447bdd9cab0828e16627 Mon Sep 17 00:00:00 2001
From: zhoupzh <zhoupzh@pcl.ac.cn>
Date: Fri, 11 Nov 2022 16:53:12 +0800
Subject: [PATCH 132/187] fix issue

---
 templates/repo/grampus/trainjob/show.tmpl   | 16 +++++++++++-----
 templates/repo/modelarts/trainjob/show.tmpl |  2 +-
 web_src/js/index.js                         |  9 ++-------
 3 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/templates/repo/grampus/trainjob/show.tmpl b/templates/repo/grampus/trainjob/show.tmpl
index e8b0eb6cf..c89ffaa98 100755
--- a/templates/repo/grampus/trainjob/show.tmpl
+++ b/templates/repo/grampus/trainjob/show.tmpl
@@ -238,11 +238,8 @@
                             <span>
                                 <div style="float: right;">
                                     {{$.CsrfTokenHtml}}
-                                    
                                 </div>
-                               
                                 <div class="ac-display-inblock title_text acc-margin-bottom">
-
                                     <span class="cti-mgRight-sm">{{TimeSinceUnix1 .CreatedUnix}}</span>
                                     <span class="cti-mgRight-sm">
                                         {{$.i18n.Tr "repo.modelarts.current_version"}}：{{.VersionName}}</span>
@@ -260,7 +257,6 @@
                                     <span class="refresh-status" data-tooltip="刷新" style="cursor: pointer;" data-inverted="" data-version="{{.VersionName}}">
                                         <i class="redo icon redo-color"></i>
                                     </span>
-
                                 </div>
                                  <div style="float: right;">
                                     {{if and ($.canDownload) (ne .Status "WAITING") ($.Permission.CanWrite $.UnitTypeModelManage) }}
@@ -269,7 +265,6 @@
                                     {{else}}
                                     <a class="ti-action-menu-item disabled" id="{{.VersionName}}-create-model">{{$.i18n.Tr "repo.modelarts.create_model"}}</a>
                                     {{end}}
-
                                 </div>
                             </span>
                         </span>
@@ -282,6 +277,9 @@
 
                         <a class="active item" data-tab="first{{$k}}">{{$.i18n.Tr "repo.modelarts.train_job.config"}}</a>
                         <a class="item log_bottom" data-tab="second{{$k}}" data-version="{{.VersionName}}">{{$.i18n.Tr "repo.modelarts.log"}}</a>
+                        {{ if eq $.Spec.ComputeResource "NPU"}}
+                        <a class="item metric_chart" data-tab="four{{$k}}" data-version="{{.VersionName}}" data-path="{{$.RepoRelPath}}/modelarts/train-job/{{.JobID}}/metric_statistics?version_name={{.VersionName}}&statistic_type=each&metrics=">{{$.i18n.Tr "cloudbrain.resource_use"}}</a>
+                        {{end}}
                         <a class="item load-model-file" data-tab="third{{$k}}" data-download-flag="{{$.canDownload}}" data-path="{{$.RepoLink}}/modelarts/train-job/{{.JobID}}/model_list" data-version="{{.VersionName}}" data-parents="" data-filename="" data-init="init" >{{$.i18n.Tr "repo.model_download"}}</a>
                     </div>
                     <div class="ui tab active" data-tab="first{{$k}}">
@@ -564,6 +562,14 @@
 
                         </div>
 
+                    </div>
+                    <div class="ui tab" data-tab="four{{$k}}" style="position: relative;">
+                        <i class="ri-refresh-line metric_chart"
+                            style="position: absolute;right: 25%;color:#3291f8;z-index:99;cursor: pointer;"
+                            data-version="{{.VersionName}}"></i>
+                        <div id="metric-{{.VersionName}}" style="height: 260px;width: 870px;">
+                        </div>
+                        
                     </div>
                     <div class="ui tab" data-tab="third{{$k}}">
                         <input type="hidden" name="model{{.VersionName}}" value="-1">
diff --git a/templates/repo/modelarts/trainjob/show.tmpl b/templates/repo/modelarts/trainjob/show.tmpl
index 2b9537f3f..d615f90a8 100755
--- a/templates/repo/modelarts/trainjob/show.tmpl
+++ b/templates/repo/modelarts/trainjob/show.tmpl
@@ -321,7 +321,7 @@
                             data-tab="first{{$k}}">{{$.i18n.Tr "repo.modelarts.train_job.config"}}</a>
                         <a class="item log_bottom" data-tab="second{{$k}}"
                             data-version="{{.VersionName}}">{{$.i18n.Tr "repo.modelarts.log"}}</a>
-                        <a class="item metric_chart" data-tab="four{{$k}}" data-version="{{.VersionName}}">{{$.i18n.Tr "cloudbrain.resource_use"}}</a>
+                        <a class="item metric_chart" data-tab="four{{$k}}" data-version="{{.VersionName}}" data-path="{{$.RepoRelPath}}/modelarts/train-job/{{.JobID}}/metric_statistics?version_name={{.VersionName}}&statistic_type=each&metrics=">{{$.i18n.Tr "cloudbrain.resource_use"}}</a>
                         <a class="item load-model-file" data-tab="third{{$k}}" data-download-flag="{{$.canDownload}}" data-path="{{$.RepoLink}}/modelarts/train-job/{{.JobID}}/model_list" data-version="{{.VersionName}}" data-parents="" data-filename="" data-init="init" >{{$.i18n.Tr "repo.model_download"}}</a>
                     </div>
                     <div class="ui tab active" data-tab="first{{$k}}">
diff --git a/web_src/js/index.js b/web_src/js/index.js
index bc3de08b5..191d72bfe 100755
--- a/web_src/js/index.js
+++ b/web_src/js/index.js
@@ -5071,12 +5071,7 @@ function initcreateRepo() {
 initcreateRepo();
 
 function initChartsNpu() {
-  const url = window.location.href;
-  const urlArr = url.split("/");
-  let userName = urlArr.slice(-5)[0];
-  let repoPath = urlArr.slice(-4)[0];
-  let jobID = urlArr.slice(-1)[0];
-
+  const repoPath = $('.metric_chart').data('path')
   let options = {
     legend: {
       data: [],
@@ -5127,7 +5122,7 @@ function initChartsNpu() {
       document.getElementById(`metric-${versionName}`)
     );
     $.get(
-      `${window.config.AppSubUrl}/api/v1/repos/${userName}/${repoPath}/modelarts/train-job/${jobID}/metric_statistics?version_name=${versionName}&statistic_type=each&metrics=`,
+      `${window.config.AppSubUrl}/api/v1/repos/${repoPath}`,
       (res) => {
         let filterDta = res.MetricsInfo.filter((item) => {
           return ![

From 864c9f2941e199d9417249e533406a44001f9cf9 Mon Sep 17 00:00:00 2001
From: zhoupzh <zhoupzh@pcl.ac.cn>
Date: Fri, 11 Nov 2022 16:56:39 +0800
Subject: [PATCH 133/187] fix issue

---
 templates/repo/grampus/trainjob/show.tmpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/repo/grampus/trainjob/show.tmpl b/templates/repo/grampus/trainjob/show.tmpl
index c89ffaa98..d48129ea1 100755
--- a/templates/repo/grampus/trainjob/show.tmpl
+++ b/templates/repo/grampus/trainjob/show.tmpl
@@ -278,7 +278,7 @@
                         <a class="active item" data-tab="first{{$k}}">{{$.i18n.Tr "repo.modelarts.train_job.config"}}</a>
                         <a class="item log_bottom" data-tab="second{{$k}}" data-version="{{.VersionName}}">{{$.i18n.Tr "repo.modelarts.log"}}</a>
                         {{ if eq $.Spec.ComputeResource "NPU"}}
-                        <a class="item metric_chart" data-tab="four{{$k}}" data-version="{{.VersionName}}" data-path="{{$.RepoRelPath}}/modelarts/train-job/{{.JobID}}/metric_statistics?version_name={{.VersionName}}&statistic_type=each&metrics=">{{$.i18n.Tr "cloudbrain.resource_use"}}</a>
+                        <a class="item metric_chart" data-tab="four{{$k}}" data-version="{{.VersionName}}" data-path="{{$.RepoRelPath}}/grampus/train-job/{{.JobID}}/metric_statistics?version_name={{.VersionName}}&statistic_type=each&metrics=">{{$.i18n.Tr "cloudbrain.resource_use"}}</a>
                         {{end}}
                         <a class="item load-model-file" data-tab="third{{$k}}" data-download-flag="{{$.canDownload}}" data-path="{{$.RepoLink}}/modelarts/train-job/{{.JobID}}/model_list" data-version="{{.VersionName}}" data-parents="" data-filename="" data-init="init" >{{$.i18n.Tr "repo.model_download"}}</a>
                     </div>

From ba6a9e71c07eccafc61bc9b983c59bf92f2747be Mon Sep 17 00:00:00 2001
From: zhoupzh <zhoupzh@pcl.ac.cn>
Date: Fri, 11 Nov 2022 16:59:44 +0800
Subject: [PATCH 134/187] fix issue

---
 templates/repo/grampus/trainjob/show.tmpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/repo/grampus/trainjob/show.tmpl b/templates/repo/grampus/trainjob/show.tmpl
index d48129ea1..e8d4082f4 100755
--- a/templates/repo/grampus/trainjob/show.tmpl
+++ b/templates/repo/grampus/trainjob/show.tmpl
@@ -278,7 +278,7 @@
                         <a class="active item" data-tab="first{{$k}}">{{$.i18n.Tr "repo.modelarts.train_job.config"}}</a>
                         <a class="item log_bottom" data-tab="second{{$k}}" data-version="{{.VersionName}}">{{$.i18n.Tr "repo.modelarts.log"}}</a>
                         {{ if eq $.Spec.ComputeResource "NPU"}}
-                        <a class="item metric_chart" data-tab="four{{$k}}" data-version="{{.VersionName}}" data-path="{{$.RepoRelPath}}/grampus/train-job/{{.JobID}}/metric_statistics?version_name={{.VersionName}}&statistic_type=each&metrics=">{{$.i18n.Tr "cloudbrain.resource_use"}}</a>
+                        <a class="item metric_chart" data-tab="four{{$k}}" data-version="{{.VersionName}}" data-path="{{$.RepoRelPath}}/grampus/train-job/{{.JobID}}/metrics">{{$.i18n.Tr "cloudbrain.resource_use"}}</a>
                         {{end}}
                         <a class="item load-model-file" data-tab="third{{$k}}" data-download-flag="{{$.canDownload}}" data-path="{{$.RepoLink}}/modelarts/train-job/{{.JobID}}/model_list" data-version="{{.VersionName}}" data-parents="" data-filename="" data-init="init" >{{$.i18n.Tr "repo.model_download"}}</a>
                     </div>

From 72b1c73a8523a8071aa5f0f312bd59960c879d7d Mon Sep 17 00:00:00 2001
From: zhoupzh <zhoupzh@pcl.ac.cn>
Date: Fri, 11 Nov 2022 17:18:22 +0800
Subject: [PATCH 135/187] fix issue

---
 templates/repo/cloudbrain/trainjob/show.tmpl | 85 +-------------------
 1 file changed, 2 insertions(+), 83 deletions(-)

diff --git a/templates/repo/cloudbrain/trainjob/show.tmpl b/templates/repo/cloudbrain/trainjob/show.tmpl
index 7bc3f2c82..ab6c40ead 100644
--- a/templates/repo/cloudbrain/trainjob/show.tmpl
+++ b/templates/repo/cloudbrain/trainjob/show.tmpl
@@ -284,10 +284,7 @@
                 <div class="content-pad">
                     <div class="ui pointing secondary menu" style="border-bottom: 1px solid rgba(34,36,38,.15);">
                         <a class="active item"
-                            data-tab="first{{$k}}">{{$.i18n.Tr "repo.modelarts.train_job.config"}}</a>
-                            
-                        <a class="item" data-tab="second{{$k}}"
-                            onclick="javascript:parseInfo()">{{$.i18n.Tr "repo.cloudbrain.runinfo"}}</a>
+                            data-tab="first{{$k}}">{{$.i18n.Tr "repo.modelarts.train_job.config"}}</a>       
 
                         <a class="item log_bottom" data-tab="third{{$k}}"
                             data-version="{{.VersionName}}">{{$.i18n.Tr "repo.modelarts.log"}}</a>
@@ -504,25 +501,6 @@
 
                         </div>
                     </div>
-
-                    <div class="ui tab" data-tab="second{{$k}}">
-                        <div>
-                            <div class="ui message message{{.VersionName}}" style="display: none;">
-                                <div id="header"></div>
-                            </div>
-                            <div class="ui attached  log" id="log_state{{.VersionName}}"
-                                style="height: 390px !important; overflow: auto;">
-                                <input type="hidden" id="json_value" value="{{$.result.JobStatus.AppExitDiagnostics}}">
-                                <input type="hidden" id="ExitDiagnostics" value="{{$.ExitDiagnostics}}">
-                                <span id="info_display" class="info_text">
-
-                                </span>
-                            </div>
-
-                        </div>
-
-                    </div>
-
                     <div class="ui tab" data-tab="third{{$k}}">
                        <div class="file-info">
                             <a id="{{.VersionName}}-log-down"
@@ -922,66 +900,7 @@
         $('.secondary.menu .item').tab();
     });
 
-    let userName
-    let repoPath
-    let jobID
-    let downlaodFlag = {{ $.canDownload }}
-    let taskID = {{ $.task.ID }}
-    let realJobName = {{ $.task.JobName }}
-    $(document).ready(function () {
-        let url = window.location.href;
-        let urlArr = url.split('/')
-        userName = urlArr.slice(-5)[0]
-        repoPath = urlArr.slice(-4)[0]
-        jobID = urlArr.slice(-1)[0]
-    })
-    function stopBubbling(e) {
-        e = window.event || e;
-        if (e.stopPropagation) {
-            e.stopPropagation();      //阻止事件 冒泡传播
-        } else {
-            e.cancelBubble = true;   //ie兼容
-        }
-    }
-
-    function loadLog(version_name) {
-        document.getElementById("mask").style.display = "block"
-        let startLine =  $('input[name=end_line]').val();
-        if(startLine==""){
-           startLine=0;
-        }
-        let endLine = $('input[name=end_line]').val();
-        if(endLine==""){
-            endLine = 50;
-        }
-        $.get(`/${userName}/${repoPath}/cloudbrain/train-job/${jobID}/get_log?endLine=${endLine}&startLine=${startLine}`, (data) => {
-            $('input[name=end_line]').val(data.EndLine)
-            $('input[name=start_line]').val(data.StartLine)
-            $(`#log_file${version_name}`).text(data.Content)
-            document.getElementById("mask").style.display = "none"
-        }).fail(function (err) {
-            console.log(err);
-            document.getElementById("mask").style.display = "none"
-        });
-    }
-
-    function refreshStatus(version_name) {
-        $.get(`/api/v1/repos/${userName}/${repoPath}/cloudbrain/${taskID}?version_name=${versionname}`, (data) => {
-            // header status and duration
-            //$(`#${version_name}-duration-span`).text(data.JobDuration)
-            $(`#${version_name}-status-span span`).text(data.JobStatus)
-            $(`#${version_name}-status-span i`).attr("class", data.JobStatus)
-            // detail status and duration
-            //$('#'+version_name+'-duration').text(data.JobDuration)
-            $('#' + version_name + '-status').text(data.JobStatus)
-            loadLog(version_name)
-
-
-        }).fail(function (err) {
-            console.log(err);
-        });
-        stopBubbling(arguments.callee.caller.arguments[0])
-    }
+    
 
     function parseInfo() {
         let jsonValue = document.getElementById("json_value").value;

From 1c6c837e19170dd90f5de9b7a76097787786ac3d Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Fri, 11 Nov 2022 17:45:55 +0800
Subject: [PATCH 136/187] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 web_src/js/components/Model.vue | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/web_src/js/components/Model.vue b/web_src/js/components/Model.vue
index 9f2c3a454..46632e88d 100644
--- a/web_src/js/components/Model.vue
+++ b/web_src/js/components/Model.vue
@@ -230,16 +230,10 @@ export default {
             let tableData;
             tableData = res.data;
             for (let i = 0; i < tableData.length; i++) {
-<<<<<<< HEAD
               trainTaskInfo = JSON.parse(tableData[i].trainTaskInfo || '{}');
               tableData[i].engineName = this.getEngineName(tableData[i]);
               tableData[i].computeResource = trainTaskInfo.ComputeResource;
               tableData[i].computeResource = tableData[i].type == '0' ? 'CPU/GPU' : 'NPU';
-=======
-              trainTaskInfo = JSON.parse(tableData[i].trainTaskInfo);
-              tableData[i].engineName = this.getEngineName(tableData[i]);
-              tableData[i].computeResource = trainTaskInfo.ComputeResource;
->>>>>>> origin/V20221116
               tableData[i].cName = tableData[i].name;
               tableData[i].rowKey = tableData[i].id + Math.random();
               tableData[i].name = "";

From 1b9a1be23352354a90e57857a250557d2b9a53e6 Mon Sep 17 00:00:00 2001
From: chenshihai <chenshh@pcl.ac.cn>
Date: Fri, 11 Nov 2022 17:55:56 +0800
Subject: [PATCH 137/187] update

---
 options/locale/locale_en-US.ini               |   4 +-
 options/locale/locale_zh-CN.ini               |   2 +-
 .../repo/modelmanage/create_local_2.tmpl      |   1 +
 web_src/js/components/Model.vue               |  33 +++--
 web_src/vuepages/langs/config/en-US.js        |   2 +-
 web_src/vuepages/langs/config/zh-CN.js        |   2 +-
 .../common/modelmanage-common-detail.vue      | 121 ++++++++++++++----
 .../local/modelmanage-local-create-2.vue      |  35 ++---
 8 files changed, 143 insertions(+), 57 deletions(-)

diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index 7eac45622..645f6498a 100755
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -1272,8 +1272,8 @@ model.manage.notcreatemodel=No model has been created
 model.manage.init1=Code version: You have not initialized the code repository, please
 model.manage.init2=initialized first ;
 model.manage.createtrainjob_tip=Training task: you haven't created a training task, please create it first
-model.manage.createmodel_tip=You can import local model or online model. Import online model should create
-model.manage.createtrainjob=Training task.
+model.manage.createmodel_tip=You can import local model or online model. Import online model should
+model.manage.createtrainjob=Create training task.
 model.manage.delete=Delete Model
 model.manage.delete_confirm=Are you sure to delete this model? Once this model is deleted, it cannot be restored.
 model.manage.select.trainjob=Select train task
diff --git a/options/locale/locale_zh-CN.ini b/options/locale/locale_zh-CN.ini
index afcc50436..973ff5f6f 100755
--- a/options/locale/locale_zh-CN.ini
+++ b/options/locale/locale_zh-CN.ini
@@ -1288,7 +1288,7 @@ model.manage.init1=代码版本：您还没有初始化代码仓库，请先
 model.manage.init2=创建代码版本；
 model.manage.createtrainjob_tip=训练任务：您还没创建过训练任务，请先创建
 model.manage.createmodel_tip=您可以导入本地模型或者导入线上模型。导入线上模型需先
-model.manage.createtrainjob=训练任务。
+model.manage.createtrainjob=创建训练任务。
 model.manage.delete=删除模型
 model.manage.delete_confirm=你确认删除该模型么？此模型一旦删除不可恢复。
 model.manage.select.trainjob=选择训练任务
diff --git a/templates/repo/modelmanage/create_local_2.tmpl b/templates/repo/modelmanage/create_local_2.tmpl
index 6510f5498..5780c6194 100644
--- a/templates/repo/modelmanage/create_local_2.tmpl
+++ b/templates/repo/modelmanage/create_local_2.tmpl
@@ -2,6 +2,7 @@
 <link rel="stylesheet" href="{{StaticUrlPrefix}}/css/vp-modelmanage-local-create-2.css?v={{MD5 AppVer}}" />
 <div class="repository release dataset-list view">
     {{template "repo/header" .}}
+    <script>var MAX_MODEL_SIZE = {{ .max_model_size }};</script>
     <div class="ui container">
         <div id="__vue-root"></div>
     </div>    
diff --git a/web_src/js/components/Model.vue b/web_src/js/components/Model.vue
index 2a179878b..89d67757b 100644
--- a/web_src/js/components/Model.vue
+++ b/web_src/js/components/Model.vue
@@ -16,7 +16,7 @@
             prop="name"
             :label="i18n.model_name"
             align="left"
-            min-width="17%"
+            min-width="20%"
           >
             <template slot-scope="scope">
               <div class="expand-icon" v-if="scope.row.hasChildren === false">
@@ -132,11 +132,11 @@
 
           <el-table-column
             :label="i18n.model_operation"
-            min-width="17%"
+            min-width="15%"
             align="center"
           >
             <template slot-scope="scope">
-              <div class="space-around">
+              <div class="space-around" >
                 <!--<a
                   :style="{
                     visibility: !scope.row.Children ? 'visible' : 'hidden',
@@ -151,24 +151,22 @@
                   "
                   >{{ i18n.model_create_new_ver }}</a
                 >-->
-                <a
-                  v-if="scope.row.modelType == 1"
+                <a class="op-btn"
+                  v-show="scope.row.modelType == 1"
                   :href="url + 'create_local_model_tmpl1?type=1&name=' + scope.row.name + '&id=' + scope.row.id"
                   :class="{ disabled: !scope.row.isCanOper }"
-                  >{{ i18n.modify }}</a
-                >
-                <a
+                  >{{ i18n.modify }}</a>
+                <a class="op-btn" v-show="scope.row.modelType != 1" style="color:transparent;cursor:default;" >{{ i18n.modify }}</a>
+                <a class="op-btn"
                   :href="loadhref + scope.row.id"
                   :class="{ disabled: !scope.row.isCanOper }"
-                  >{{ i18n.model_download }}</a
-                >
-                <a
+                  >{{ i18n.model_download }}</a>
+                <a class="op-btn"
                   :class="{ disabled: !scope.row.isCanDelete }"
                   @click="
                     deleteModel(scope.row.id, scope.row.cName, scope.row.rowKey)
                   "
-                  >{{ i18n.model_delete }}</a
-                >
+                  >{{ i18n.model_delete }}</a>
               </div>
             </template>
           </el-table-column>
@@ -704,6 +702,15 @@ export default {
   justify-content: space-around;
 }
 
+.op-btn-c {
+  text-align: right;
+  padding-right: 20px;
+}
+
+.op-btn {
+  margin: 0 0 0 5px;
+}
+
 .disabled {
   cursor: default;
   pointer-events: none;
diff --git a/web_src/vuepages/langs/config/en-US.js b/web_src/vuepages/langs/config/en-US.js
index 1c160ee1d..8cc9316b0 100644
--- a/web_src/vuepages/langs/config/en-US.js
+++ b/web_src/vuepages/langs/config/en-US.js
@@ -220,7 +220,7 @@ const en = {
     upload: 'Upload',
     uploadStatus: 'Upload status',
     modelFileUploadDefaultTips: 'Click to add files or drag files here directly',
-    modelFileUploadErrTips: 'Up to 10 files can be uploaded at a time, and the total file size of the model does not exceed 200GB',
+    modelFileUploadErrTips: 'Up to 10 files can be uploaded at a time, and the total file size of the model does not exceed {size}GB',
     fileIstoBig: 'File is to big',
     removeFile: 'Rmove file',
     uploadSuccess: 'upload success',
diff --git a/web_src/vuepages/langs/config/zh-CN.js b/web_src/vuepages/langs/config/zh-CN.js
index 2f87c7e15..9e97d03ea 100644
--- a/web_src/vuepages/langs/config/zh-CN.js
+++ b/web_src/vuepages/langs/config/zh-CN.js
@@ -220,7 +220,7 @@ const zh = {
     upload: '上传',
     uploadStatus: '上传状态',
     modelFileUploadDefaultTips: '点击添加文件或直接拖拽文件到此处',
-    modelFileUploadErrTips: '单次最多上传10个文件，模型总文件大小不超过200G',
+    modelFileUploadErrTips: '单次最多上传10个文件，模型总文件大小不超过{size}G',
     fileIstoBig: '文件太大',
     removeFile: '移除文件',
     uploadSuccess: '上传成功',
diff --git a/web_src/vuepages/pages/modelmanage/common/modelmanage-common-detail.vue b/web_src/vuepages/pages/modelmanage/common/modelmanage-common-detail.vue
index 0c5372fba..0e23e21a5 100644
--- a/web_src/vuepages/pages/modelmanage/common/modelmanage-common-detail.vue
+++ b/web_src/vuepages/pages/modelmanage/common/modelmanage-common-detail.vue
@@ -146,10 +146,15 @@
       </div>
       <div class="files-info">
         <div class="top">
-          <div>
+          <div style="width:100%;margin-right:20px;">
             <div class="title">{{ $t('modelManage.modelFilesList') }}：</div>
-            <div class="title" style="margin-top:8px"><span class="version">{{ state.version }}</span>
-              <span style="color:rgba(0,0,0,.4);" class="divider"> / </span>
+            <div class="title files-path-c" style="margin-top:8px;margin-bottom:4px">
+              <div class="file-path" v-for="(item, index) in filePath">
+                <span v-if="index == filePath.length - 1" class="path-name">{{ item.label }}</span>
+                <a v-if="index != filePath.length - 1" class="path-name canback" @click="goBackDir(item)">{{ item.label
+                }}</a>
+                <span style="color:rgba(0,0,0,.4);" class="divider"> / </span>
+              </div>
             </div>
           </div>
           <div>
@@ -164,10 +169,16 @@
               header-align="left">
               <template slot-scope="scope">
                 <div class="tbl-file-name">
-                  <span class="octicon octicon-file-directory"></span>
-                  <a :href="canOperate ? `${repo}/modelmanage/${state.id}/downloadsingle?parentDir=&fileName=${scope.row.FileName}` : 'javascript:;'">
+                  <a v-if="scope.row.IsDir" @click="goNextDir(scope.row)" href="javascript:;">
                     <div class="fitted" :title="scope.row.FileName">
-                      <i class="file icon" width="16" height="16" aria-hidden="true"></i>
+                      <i class="icon folder" width="16" height="16" aria-hidden="true"></i>
+                      {{ scope.row.FileName }}
+                    </div>
+                  </a>
+                  <a v-else :class="!canOperate ? 'disabled-download' : ''"
+                    :href="canOperate ? `${repo}/modelmanage/${state.id}/downloadsingle?parentDir=&fileName=${scope.row.FileName}` : 'javascript:;'">
+                    <div class="fitted" :title="scope.row.FileName">
+                      <i class="icon file" width="16" height="16" aria-hidden="true"></i>
                       {{ scope.row.FileName }}
                     </div>
                   </a>
@@ -183,7 +194,8 @@
             <el-table-column v-if="modelType == 1 && canDelete" column-key="operate" prop="operate"
               :label="$t('modelManage.operate')" align="center" header-align="center" width="200">
               <template slot-scope="scope">
-                <span class="btn-del" @click="deleteFile(scope.row)">{{ $t('modelManage.delete') }}</span>
+                <span v-if="!scope.row.IsDir" class="btn-del" @click="deleteFile(scope.row)">{{ $t('modelManage.delete')
+                }}</span>
               </template>
             </el-table-column>
           </el-table>
@@ -229,11 +241,39 @@ export default {
       curVersion: '',
       modelList: [],
       filesList: [],
+      filePath: [],
     };
   },
   components: {},
   methods: {
-    changeVersion(version) {
+    getDirFiles(dir) {
+      getModelFiles({
+        repo: this.repo,
+        ID: this.state.id,
+        parentDir: dir || '',
+      }).then(res => {
+        const list = res.data || [];
+        list.forEach(item => {
+          item.SizeShow = item.IsDir ? '' : transFileSize(item.Size);
+        })
+        this.filesList = list;
+      }).catch(err => {
+        console.log(err);
+      })
+    },
+    goNextDir(item) {
+      this.filePath.push({
+        label: item.FileName,
+        path: item.FileName
+      });
+      this.getDirFiles(item.FileName);
+    },
+    goBackDir(item) {
+      const index = this.filePath.findIndex(pth => item === pth);
+      this.filePath = this.filePath.slice(0, index + 1);
+      this.getDirFiles(item.path);
+    },
+    changeVersion(version, noFileRefresh) {
       const data = this.modelList.filter((model) => model.version == version)[0];
       this.modelType = data.modelType;
       this.canOperate = data.isCanOper;
@@ -289,19 +329,10 @@ export default {
         });
       }
       this.curVersion = version;
-      getModelFiles({
-        repo: this.repo,
-        ID: this.state.id,
-        parentDir: '',
-      }).then(res => {
-        const list = res.data || [];
-        list.forEach(item => {
-          item.SizeShow = transFileSize(item.Size);
-        })
-        this.filesList = list;
-      }).catch(err => {
-        console.log(err);
-      })
+      if (!noFileRefresh) {
+        this.filePath = [{ label: version, path: '' }];
+        this.getDirFiles('')
+      }
     },
     goUploadPage() {
       window.location.href = `${this.repo}/modelmanage/create_local_model_tmpl2?type=1&name=${this.state.name}&id=${this.state.id}`;
@@ -361,6 +392,7 @@ export default {
         type: 'warning',
         lockScroll: false,
       }).then(() => {
+        this.loading = true;
         deleteModelFile({
           repo: this.repo,
           id: this.state.id,
@@ -368,8 +400,13 @@ export default {
         }).then(res => {
           res = res.data;
           if (res.code == '0') {
-            this.changeVersion(this.curVersion);
+            setTimeout(() => {
+              this.loading = false;
+              this.updateModelInfo();
+              this.getDirFiles(this.filePath[this.filePath.length - 1].path);
+            }, 30);
           } else {
+            this.loading = false;
             this.$message({
               type: 'error',
               message: this.$t('modelManage.modelFileDeleteFailed'),
@@ -383,7 +420,20 @@ export default {
           });
         });
       }).catch(() => { });
-    }
+    },
+    updateModelInfo() {
+      getModelInfoByName({
+        repo: this.repo,
+        name: this.state.name,
+      }).then(res => {
+        const list = res.data || [];
+        this.modelList = list;
+        const noFileRefresh = true;
+        this.changeVersion(this.curVersion, noFileRefresh);
+      }).catch(err => {
+        console.log(err);
+      });
+    },
   },
   mounted() {
     const urlParams = getUrlSearchParams();
@@ -537,6 +587,22 @@ export default {
       justify-content: space-between;
     }
 
+    .files-path-c {
+      margin-bottom: 4px;
+      height: 20px;
+
+      .file-path {
+        margin-right: 6px;
+        float: left;
+
+        .path-name {
+          &.canback {
+            color: #4183c4;
+          }
+        }
+      }
+    }
+
     .table-container {
       /deep/ .el-table__header {
         th {
@@ -562,10 +628,17 @@ export default {
         overflow: hidden;
         font-size: 16px;
         font-weight: 500;
+
+        .disabled-download {
+          cursor: default;
+          pointer-events: none;
+          color: rgba(0, 0, 0, .6) !important;
+          opacity: .45 !important;
+        }
       }
 
       .btn-del {
-        color: rgb(255, 51, 51);
+        color: #0366d6;
         cursor: pointer;
       }
     }
diff --git a/web_src/vuepages/pages/modelmanage/local/modelmanage-local-create-2.vue b/web_src/vuepages/pages/modelmanage/local/modelmanage-local-create-2.vue
index dce96b73d..0f95bc8c4 100644
--- a/web_src/vuepages/pages/modelmanage/local/modelmanage-local-create-2.vue
+++ b/web_src/vuepages/pages/modelmanage/local/modelmanage-local-create-2.vue
@@ -1,30 +1,32 @@
 <template>
   <div>
     <div class="header">
-      <span class="title">{{ type == '1' ? $t('modelManage.addModelFiles') : $t('modelManage.uploadModelFiles') }}</span>
+      <span class="title">{{ type == '1' ? $t('modelManage.addModelFiles') : $t('modelManage.uploadModelFiles')
+      }}</span>
     </div>
     <div class="content ui form">
       <div class="guide-c" v-if="type != '1'">
         <div class="step">
           <div class="num">1</div>
-          <div class="txt">{{$t('modelManage.createModel')}}</div>
+          <div class="txt">{{ $t('modelManage.createModel') }}</div>
         </div>
         <div class="line"></div>
         <div class="step focused">
           <div class="num">2</div>
-          <div class="txt">{{$t('modelManage.uploadModelFiles')}}</div>
+          <div class="txt">{{ $t('modelManage.uploadModelFiles') }}</div>
         </div>
       </div>
       <div class="row-c">
         <div class="row">
-          <div class="r-title"><label class="required">{{$t('modelManage.modelName')}}</label></div>
+          <div class="r-title"><label class="required">{{ $t('modelManage.modelName') }}</label></div>
           <div class="r-content">
-            <el-input size="medium" class="input-disabled" v-model="state.name" :placeholder="$t('modelManage.pleaseInputModelName')" readonly>
+            <el-input size="medium" class="input-disabled" v-model="state.name"
+              :placeholder="$t('modelManage.pleaseInputModelName')" readonly>
             </el-input>
           </div>
         </div>
         <div class="row" style="align-items:flex-start;">
-          <div class="r-title"><label class="required">{{$t('modelManage.fileUpload')}}</label></div>
+          <div class="r-title"><label class="required">{{ $t('modelManage.fileUpload') }}</label></div>
           <div class="r-content">
             <div style="position:relative">
               <form class="dropzone" ref="dropzoneRef">
@@ -38,12 +40,13 @@
         <div class="row" style="margin-top:10px">
           <div class="r-title"><label></label></div>
           <div class="r-content">
-            <el-button size="medium" class="green" @click="submit" :disabled="uploading">{{$t('modelManage.upload')}}</el-button>
-            <el-button size="medium" @click="cancel">{{$t('modelManage.cancel')}}</el-button>
+            <el-button size="medium" class="green" @click="submit" :disabled="uploading">{{ $t('modelManage.upload') }}
+            </el-button>
+            <el-button size="medium" @click="cancel">{{ $t('modelManage.cancel') }}</el-button>
           </div>
         </div>
         <div class="row" style="align-items:flex-start;">
-          <div class="r-title"><label>{{$t('modelManage.uploadStatus')}}：</label></div>
+          <div class="r-title"><label>{{ $t('modelManage.uploadStatus') }}：</label></div>
           <div class="r-content">
             <div v-for="(item, index) in uploadFiles" :key="item.upload.uuid" class="datast-upload-progress">
               <span class="dataset-name nowrap" :title="item.name">{{ item.name }}</span>
@@ -84,7 +87,7 @@ Dropzone.autoDiscover = false;
 const uploadChunkSize = 1024 * 1024 * 64;
 const md5ChunkSize = 1024 * 1024 * 64;
 const maxFileSize = 10;
-const maxModelFilesSize = 200 * 1024 * 1024 * 1024; // 200 GB
+const maxModelFilesSize = window.MAX_MODEL_SIZE || 200 * 1024 * 1024 * 1024; // 200 GB
 
 export default {
   data() {
@@ -99,12 +102,11 @@ export default {
         engine: '',
         label: '',
         description: '',
-        size: '',
+        size: 0,
       },
       originData: null,
       showUploadErr: false,
       uploadErrTxt: '',
-      defaultErrTxt: this.$t('modelManage.modelFileUploadErrTips'),
 
       uploadFiles: [],
       uploadLength: 0,
@@ -166,7 +168,7 @@ export default {
         dictDefaultMessage: this.$t('modelManage.modelFileUploadDefaultTips'),
         dictFileTooBig: this.$t('modelManage.fileIstoBig'),
         dictRemoveFile: this.$t('modelManage.removeFile'),
-        dictMaxFilesExceeded: this.defaultErrTxt,
+        dictMaxFilesExceeded: this.getDefaultErrTxt(),
       });
       this.dropzoneHandler.on("addedfile", file => {
         this.checkFiles(file);
@@ -175,6 +177,9 @@ export default {
         this.checkFiles();
       });
     },
+    getDefaultErrTxt() {
+      return this.$t('modelManage.modelFileUploadErrTips', { size: (maxModelFilesSize / (1024 * 1024 * 1024)).toFixed(2) });
+    },
     showUploadErrInfo(state, info) {
       if (state) {
         this.uploadErrTxt = info;
@@ -190,7 +195,7 @@ export default {
       const filesCount = fileList.length + (file ? 1 : 0);
       const allfilesSize = filesSize + this.state.size;
       if (filesCount > maxFileSize || allfilesSize > maxModelFilesSize) {
-        this.showUploadErrInfo(true, this.defaultErrTxt);
+        this.showUploadErrInfo(true, this.getDefaultErrTxt());
         return false;
       }
       this.showUploadErrInfo(false);
@@ -464,7 +469,7 @@ export default {
       if (this.uploadLength === this.uploadFiles.length) {
         console.log('All file has finish, success ' + this.uploadSuccessLength);
         this.uploading = false;
-        if (this.uploadSuccessLength == this.uploadLength) {         
+        if (this.uploadSuccessLength == this.uploadLength) {
           window.setTimeout(() => {
             this.goDetail();
           }, 1000);

From 90a5be8997c3bf4a47e6d0509d74e759ffdffad2 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Fri, 11 Nov 2022 17:56:39 +0800
Subject: [PATCH 138/187] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=EF=BC=8C=E5=90=88=E5=B9=B6Bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 web_src/js/components/Model.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web_src/js/components/Model.vue b/web_src/js/components/Model.vue
index 46632e88d..9b431e58f 100644
--- a/web_src/js/components/Model.vue
+++ b/web_src/js/components/Model.vue
@@ -491,7 +491,7 @@ export default {
             let trainTaskInfo;
             this.tableData = res.data.data;
             for (let i = 0; i < this.tableData.length; i++) {
-              trainTaskInfo = JSON.parse(this.tableData[i].trainTaskInfo);
+              trainTaskInfo = JSON.parse(tableData[i].trainTaskInfo || '{}');
               this.tableData[i].cName = this.tableData[i].name;
               this.tableData[i].rowKey = this.tableData[i].id + Math.random();
               this.tableData[i].engineName = this.getEngineName(

From db682e4eae3529da0058e957281657e2f58105cd Mon Sep 17 00:00:00 2001
From: chenshihai <chenshh@pcl.ac.cn>
Date: Fri, 11 Nov 2022 18:19:07 +0800
Subject: [PATCH 139/187] update

---
 web_src/js/components/Model.vue                               | 4 ++--
 .../pages/modelmanage/common/modelmanage-common-detail.vue    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/web_src/js/components/Model.vue b/web_src/js/components/Model.vue
index b13ce825b..34ea7f99c 100644
--- a/web_src/js/components/Model.vue
+++ b/web_src/js/components/Model.vue
@@ -230,7 +230,7 @@ export default {
             for (let i = 0; i < tableData.length; i++) {
               trainTaskInfo = JSON.parse(tableData[i].trainTaskInfo || '{}');
               tableData[i].engineName = this.getEngineName(tableData[i]);
-              tableData[i].computeResource = trainTaskInfo.ComputeResource;
+              // tableData[i].computeResource = trainTaskInfo.ComputeResource;
               tableData[i].computeResource = tableData[i].type == '0' ? 'CPU/GPU' : 'NPU';
               tableData[i].cName = tableData[i].name;
               tableData[i].rowKey = tableData[i].id + Math.random();
@@ -489,7 +489,7 @@ export default {
             let trainTaskInfo;
             this.tableData = res.data.data;
             for (let i = 0; i < this.tableData.length; i++) {
-              trainTaskInfo = JSON.parse(tableData[i].trainTaskInfo || '{}');
+              trainTaskInfo = JSON.parse(this.tableData[i].trainTaskInfo || '{}');
               this.tableData[i].cName = this.tableData[i].name;
               this.tableData[i].rowKey = this.tableData[i].id + Math.random();
               this.tableData[i].engineName = this.getEngineName(
diff --git a/web_src/vuepages/pages/modelmanage/common/modelmanage-common-detail.vue b/web_src/vuepages/pages/modelmanage/common/modelmanage-common-detail.vue
index 0e23e21a5..b897a25e6 100644
--- a/web_src/vuepages/pages/modelmanage/common/modelmanage-common-detail.vue
+++ b/web_src/vuepages/pages/modelmanage/common/modelmanage-common-detail.vue
@@ -317,10 +317,10 @@ export default {
         const versionName = trainTaskInfo.VersionName;
         const versionHtml = versionName ? `<span class="append-txt" title="${versionName}">${versionName}</span>` : '';
         const codeCommitID = data.codeCommitID;
-        const codeCommitIDHtml = codeCommitID ? `<span class="append-txt" title="${codeCommitID}">${codeCommitID}</span>` : '';
+        const codeCommitIDHtml = codeCommitID ? `<span class="append-txt" title="${codeCommitID}">${codeCommitID.slice(0, 10)}</span>` : '';
         Object.assign(this.state, {
           displayJobName: `<a href="${taskUrl}" title="${trainTaskInfo.DisplayJobName}">${trainTaskInfo.DisplayJobName}</a>${versionHtml}`,
-          branchName: `${trainTaskInfo.BranchName}${codeCommitIDHtml}`,
+          branchName: `<span>${trainTaskInfo.BranchName}</span>${codeCommitIDHtml}`,
           bootFile: trainTaskInfo.BootFile,
           datasetName: trainTaskInfo.DatasetName,
           parameters: parametersStr || '--',

From 77a0a51c4b6fe0a466994508af1a7d1696636109 Mon Sep 17 00:00:00 2001
From: chenshihai <chenshh@pcl.ac.cn>
Date: Mon, 14 Nov 2022 10:10:57 +0800
Subject: [PATCH 140/187] update

---
 .../pages/modelmanage/common/modelmanage-common-detail.vue      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web_src/vuepages/pages/modelmanage/common/modelmanage-common-detail.vue b/web_src/vuepages/pages/modelmanage/common/modelmanage-common-detail.vue
index b897a25e6..f6322221b 100644
--- a/web_src/vuepages/pages/modelmanage/common/modelmanage-common-detail.vue
+++ b/web_src/vuepages/pages/modelmanage/common/modelmanage-common-detail.vue
@@ -176,7 +176,7 @@
                     </div>
                   </a>
                   <a v-else :class="!canOperate ? 'disabled-download' : ''"
-                    :href="canOperate ? `${repo}/modelmanage/${state.id}/downloadsingle?parentDir=&fileName=${scope.row.FileName}` : 'javascript:;'">
+                    :href="canOperate ? `${repo}/modelmanage/${state.id}/downloadsingle?parentDir=${filePath[filePath.length - 1].path ? filePath[filePath.length - 1].path + '/' : ''}&fileName=${scope.row.FileName}` : 'javascript:;'">
                     <div class="fitted" :title="scope.row.FileName">
                       <i class="icon file" width="16" height="16" aria-hidden="true"></i>
                       {{ scope.row.FileName }}

From 51cb8313166c2f5df061bd7382027b0abced936f Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Mon, 14 Nov 2022 11:50:29 +0800
Subject: [PATCH 141/187] =?UTF-8?q?=E5=B9=B4=E5=BA=A6=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=87=86=E5=A4=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 models/user_business_analysis.go | 238 ++++++-------------------------
 models/user_business_struct.go   | 179 +++++++++++++++++++++++
 2 files changed, 226 insertions(+), 191 deletions(-)

diff --git a/models/user_business_analysis.go b/models/user_business_analysis.go
index 50bb34406..ddd672fe6 100644
--- a/models/user_business_analysis.go
+++ b/models/user_business_analysis.go
@@ -22,185 +22,6 @@ const (
 	BATCH_INSERT_SIZE = 50
 )
 
-type UserBusinessAnalysisAll struct {
-	ID int64 `xorm:"pk"`
-
-	CountDate int64 `xorm:"pk"`
-
-	//action :ActionMergePullRequest                         // 11
-	CodeMergeCount int `xorm:"NOT NULL DEFAULT 0"`
-
-	//action :ActionCommitRepo                               // 5
-	CommitCount int `xorm:"NOT NULL DEFAULT 0"`
-
-	//action :ActionCreateIssue                             // 10
-	IssueCount int `xorm:"NOT NULL DEFAULT 0"`
-
-	//comment table current date
-	CommentCount int `xorm:"NOT NULL DEFAULT 0"`
-
-	//watch table current date
-	FocusRepoCount int `xorm:"NOT NULL DEFAULT 0"`
-
-	//star table current date
-	StarRepoCount int `xorm:"NOT NULL DEFAULT 0"`
-
-	//follow table
-	WatchedCount int `xorm:"NOT NULL DEFAULT 0"`
-
-	// user table
-	GiteaAgeMonth int `xorm:"NOT NULL DEFAULT 0"`
-
-	//
-	CommitCodeSize int `xorm:"NOT NULL DEFAULT 0"`
-
-	//attachement table
-	CommitDatasetSize int `xorm:"NOT NULL DEFAULT 0"`
-
-	//0
-	CommitModelCount int `xorm:"NOT NULL DEFAULT 0"`
-
-	//issue, issueassignees
-	SolveIssueCount int `xorm:"NOT NULL DEFAULT 0"`
-
-	//baike
-	EncyclopediasCount int `xorm:"NOT NULL DEFAULT 0"`
-
-	//user
-	RegistDate timeutil.TimeStamp `xorm:"NOT NULL"`
-
-	//repo
-	CreateRepoCount int `xorm:"NOT NULL DEFAULT 0"`
-
-	//login count, from elk
-	LoginCount int `xorm:"NOT NULL DEFAULT 0"`
-
-	//openi index
-	OpenIIndex float64 `xorm:"NOT NULL DEFAULT 0"`
-
-	//user
-	Email string `xorm:"NOT NULL"`
-
-	//user
-	Name string `xorm:"NOT NULL"`
-
-	DataDate string `xorm:"NULL"`
-
-	//cloudbraintask
-	CloudBrainTaskNum  int     `xorm:"NOT NULL DEFAULT 0"`
-	GpuDebugJob        int     `xorm:"NOT NULL DEFAULT 0"`
-	NpuDebugJob        int     `xorm:"NOT NULL DEFAULT 0"`
-	GpuTrainJob        int     `xorm:"NOT NULL DEFAULT 0"`
-	NpuTrainJob        int     `xorm:"NOT NULL DEFAULT 0"`
-	NpuInferenceJob    int     `xorm:"NOT NULL DEFAULT 0"`
-	GpuBenchMarkJob    int     `xorm:"NOT NULL DEFAULT 0"`
-	CloudBrainRunTime  int     `xorm:"NOT NULL DEFAULT 0"`
-	CommitDatasetNum   int     `xorm:"NOT NULL DEFAULT 0"`
-	UserIndex          float64 `xorm:"NOT NULL DEFAULT 0"`
-	UserIndexPrimitive float64 `xorm:"NOT NULL DEFAULT 0"`
-
-	UserLocation string `xorm:"NULL"`
-
-	FocusOtherUser   int `xorm:"NOT NULL DEFAULT 0"`
-	CollectDataset   int `xorm:"NOT NULL DEFAULT 0"`
-	CollectedDataset int `xorm:"NOT NULL DEFAULT 0"`
-	RecommendDataset int `xorm:"NOT NULL DEFAULT 0"`
-	CollectImage     int `xorm:"NOT NULL DEFAULT 0"`
-	CollectedImage   int `xorm:"NOT NULL DEFAULT 0"`
-	RecommendImage   int `xorm:"NOT NULL DEFAULT 0"`
-
-	Phone             string `xorm:"NULL"`
-	InvitationUserNum int    `xorm:"NOT NULL DEFAULT 0"`
-}
-
-type UserBusinessAnalysis struct {
-	ID        int64  `xorm:"pk"`
-	DataDate  string `xorm:"pk"`
-	CountDate int64  `xorm:"NULL"`
-
-	//action :ActionMergePullRequest                         // 11
-	CodeMergeCount int `xorm:"NOT NULL DEFAULT 0"`
-
-	//action :ActionCommitRepo                               // 5
-	CommitCount int `xorm:"NOT NULL DEFAULT 0"`
-
-	//action :ActionCreateIssue                             // 6
-	IssueCount int `xorm:"NOT NULL DEFAULT 0"`
-
-	//comment table current date
-	CommentCount int `xorm:"NOT NULL DEFAULT 0"`
-
-	//watch table current date
-	FocusRepoCount int `xorm:"NOT NULL DEFAULT 0"`
-
-	//star table current date
-	StarRepoCount int `xorm:"NOT NULL DEFAULT 0"`
-
-	//follow table
-	WatchedCount int `xorm:"NOT NULL DEFAULT 0"`
-
-	// user table
-	GiteaAgeMonth int `xorm:"NOT NULL DEFAULT 0"`
-
-	//
-	CommitCodeSize int `xorm:"NOT NULL DEFAULT 0"`
-
-	//attachement table
-	CommitDatasetSize int `xorm:"NOT NULL DEFAULT 0"`
-
-	//0
-	CommitModelCount int `xorm:"NOT NULL DEFAULT 0"`
-
-	//issue, issueassignees
-	SolveIssueCount int `xorm:"NOT NULL DEFAULT 0"`
-
-	//baike
-	EncyclopediasCount int `xorm:"NOT NULL DEFAULT 0"`
-
-	//user
-	RegistDate timeutil.TimeStamp `xorm:"NOT NULL"`
-
-	//repo
-	CreateRepoCount int `xorm:"NOT NULL DEFAULT 0"`
-
-	//login count, from elk
-	LoginCount int `xorm:"NOT NULL DEFAULT 0"`
-
-	//openi index
-	OpenIIndex float64 `xorm:"NOT NULL DEFAULT 0"`
-
-	//user
-	Email string `xorm:"NOT NULL"`
-
-	//user
-	Name string `xorm:"NOT NULL"`
-
-	CloudBrainTaskNum  int     `xorm:"NOT NULL DEFAULT 0"`
-	GpuDebugJob        int     `xorm:"NOT NULL DEFAULT 0"`
-	NpuDebugJob        int     `xorm:"NOT NULL DEFAULT 0"`
-	GpuTrainJob        int     `xorm:"NOT NULL DEFAULT 0"`
-	NpuTrainJob        int     `xorm:"NOT NULL DEFAULT 0"`
-	NpuInferenceJob    int     `xorm:"NOT NULL DEFAULT 0"`
-	GpuBenchMarkJob    int     `xorm:"NOT NULL DEFAULT 0"`
-	CloudBrainRunTime  int     `xorm:"NOT NULL DEFAULT 0"`
-	CommitDatasetNum   int     `xorm:"NOT NULL DEFAULT 0"`
-	UserIndex          float64 `xorm:"NOT NULL DEFAULT 0"`
-	UserIndexPrimitive float64 `xorm:"NOT NULL DEFAULT 0"`
-
-	UserLocation string `xorm:"NULL"`
-
-	FocusOtherUser   int `xorm:"NOT NULL DEFAULT 0"`
-	CollectDataset   int `xorm:"NOT NULL DEFAULT 0"`
-	CollectedDataset int `xorm:"NOT NULL DEFAULT 0"`
-	RecommendDataset int `xorm:"NOT NULL DEFAULT 0"`
-	CollectImage     int `xorm:"NOT NULL DEFAULT 0"`
-	CollectedImage   int `xorm:"NOT NULL DEFAULT 0"`
-	RecommendImage   int `xorm:"NOT NULL DEFAULT 0"`
-
-	Phone             string `xorm:"NULL"`
-	InvitationUserNum int    `xorm:"NOT NULL DEFAULT 0"`
-}
-
 type UserBusinessAnalysisQueryOptions struct {
 	ListOptions
 	UserName  string
@@ -898,11 +719,14 @@ func refreshUserStaticTable(wikiCountMap map[string]int, tableName string, pageS
 				if userInfo, ok := mostActiveMap[dateRecordAll.ID]; ok {
 					mostActiveDay = getMostActiveJson(userInfo)
 				}
+				scoreMap := make(map[string]float64)
 				repoInfo := getRepoDetailInfo(DetailInfoMap, dateRecordAll.ID, MostDownloadMap)
-				dataSetInfo := getDataSetInfo(dateRecordAll.ID, CreatedDataset, dataSetDownloadMap, CommitDatasetNumMap, CollectedDataset)
-				codeInfo := getCodeInfo(dateRecordAll)
-				cloudBrainInfo := getCloudBrainInfo(dateRecordAll, CloudBrainTaskItemMap)
-				playARoll := getPlayARoll(bonusMap, dateRecordAll.Name)
+				dataSetInfo, datasetscore := getDataSetInfo(dateRecordAll.ID, CreatedDataset, dataSetDownloadMap, CommitDatasetNumMap, CollectedDataset)
+				scoreMap["datasetscore"] = datasetscore
+				codeInfo, codescore := getCodeInfo(dateRecordAll)
+				scoreMap["codescore"] = codescore
+				cloudBrainInfo := getCloudBrainInfo(dateRecordAll, CloudBrainTaskItemMap, scoreMap)
+				playARoll := getPlayARoll(bonusMap, dateRecordAll.Name, scoreMap)
 				re := &UserSummaryCurrentYear{
 					ID:             dateRecordAll.ID,
 					Name:           dateRecordAll.Name,
@@ -986,11 +810,16 @@ func getIntValue(val string) int {
 	return 0
 }
 
-func getPlayARoll(bonusMap map[string]map[string]int, userName string) string {
+func getPlayARoll(bonusMap map[string]map[string]int, userName string, scoreMap map[string]float64) string {
 	bonusInfo := make(map[string]string)
 	record, ok := bonusMap[userName]
 	if ok {
+		rollscore := 0.0
 		bonusInfo["times"] = fmt.Sprint(record["times"])
+		if record["times"] >= 4 {
+			rollscore = float64(record["times"]) / float64(4)
+		}
+		scoreMap["rollscore"] = rollscore
 		bonusInfo["total_bonus"] = fmt.Sprint(record["total_bonus"])
 		bonusInfo["total_cardtime"] = fmt.Sprint(record["total_cardtime"])
 		bonusInfo["total_giveup"] = fmt.Sprint(record["total_giveup"])
@@ -1001,43 +830,69 @@ func getPlayARoll(bonusMap map[string]map[string]int, userName string) string {
 	}
 }
 
-func getCloudBrainInfo(dateRecordAll UserBusinessAnalysisAll, CloudBrainTaskItemMap map[string]int) string {
+func getCloudBrainInfo(dateRecordAll UserBusinessAnalysisAll, CloudBrainTaskItemMap map[string]int, scoreMap map[string]float64) string {
+	trainscore := 0.0
+	debugscore := 0.0
+	runtime := 0.0
 	if dateRecordAll.CloudBrainTaskNum > 0 {
 		cloudBrainInfo := make(map[string]string)
 		cloudBrainInfo["create_task_num"] = fmt.Sprint(dateRecordAll.CloudBrainTaskNum)
 		cloudBrainInfo["debug_task_num"] = fmt.Sprint(dateRecordAll.GpuDebugJob + dateRecordAll.NpuDebugJob)
+		if dateRecordAll.GpuDebugJob+dateRecordAll.NpuDebugJob >= 50 {
+			debugscore = float64(dateRecordAll.GpuDebugJob+dateRecordAll.NpuDebugJob) / float64(50)
+		}
 		cloudBrainInfo["train_task_num"] = fmt.Sprint(dateRecordAll.GpuTrainJob + dateRecordAll.NpuTrainJob)
+		if dateRecordAll.GpuTrainJob+dateRecordAll.NpuTrainJob >= 50 {
+			trainscore = float64(dateRecordAll.GpuTrainJob+dateRecordAll.NpuTrainJob) / float64(50)
+		}
 		cloudBrainInfo["inference_task_num"] = fmt.Sprint(dateRecordAll.NpuInferenceJob + CloudBrainTaskItemMap[fmt.Sprint(dateRecordAll.ID)+"_GpuInferenceJob"])
 		cloudBrainInfo["card_runtime"] = fmt.Sprint(dateRecordAll.CloudBrainRunTime)
+		if dateRecordAll.CloudBrainRunTime >= 100 {
+			runtime = float64(dateRecordAll.CloudBrainRunTime) / float64(100)
+		}
 		cloudBrainInfo["card_runtime_money"] = fmt.Sprint(dateRecordAll.CloudBrainRunTime * 5)
 		cloudBrainInfo["CloudBrainOne"] = fmt.Sprint(CloudBrainTaskItemMap[fmt.Sprint(dateRecordAll.ID)+"_CloudBrainOne"])
 		cloudBrainInfo["CloudBrainTwo"] = fmt.Sprint(CloudBrainTaskItemMap[fmt.Sprint(dateRecordAll.ID)+"_CloudBrainTwo"])
 		cloudBrainInfo["C2Net"] = fmt.Sprint(CloudBrainTaskItemMap[fmt.Sprint(dateRecordAll.ID)+"_C2Net"])
 
 		cloudBrainInfoJson, _ := json.Marshal(cloudBrainInfo)
+		scoreMap["trainscore"] = trainscore
+		scoreMap["debugscore"] = debugscore
+		scoreMap["runtime"] = runtime
 		return string(cloudBrainInfoJson)
 	} else {
+		scoreMap["trainscore"] = trainscore
+		scoreMap["debugscore"] = debugscore
+		scoreMap["runtime"] = runtime
 		return ""
 	}
 }
 
-func getCodeInfo(dateRecordAll UserBusinessAnalysisAll) string {
+func getCodeInfo(dateRecordAll UserBusinessAnalysisAll) (string, float64) {
 	if dateRecordAll.CommitCount > 0 {
 		codeInfo := make(map[string]string)
 		codeInfo["commit_count"] = fmt.Sprint(dateRecordAll.CommitCount)
 		codeInfo["commit_line"] = fmt.Sprint(dateRecordAll.CommitCodeSize)
+		score := 0.0
+		score = float64(dateRecordAll.CommitCodeSize) / float64(dateRecordAll.CommitCount) / float64(20000)
+		if score < (float64(dateRecordAll.CommitCount) / float64(100)) {
+			score = float64(dateRecordAll.CommitCount) / float64(100)
+		}
+		codeInfo["score"] = fmt.Sprintf("%.2f", score)
 
 		codeInfoJson, _ := json.Marshal(codeInfo)
-		return string(codeInfoJson)
+		return string(codeInfoJson), score
 	} else {
-		return ""
+		return "", 0
 	}
 }
 
-func getDataSetInfo(userId int64, CreatedDataset map[int64]int, dataSetDownloadMap map[int64]int, CommitDatasetNumMap map[int64]int, CollectedDataset map[int64]int) string {
+func getDataSetInfo(userId int64, CreatedDataset map[int64]int, dataSetDownloadMap map[int64]int, CommitDatasetNumMap map[int64]int, CollectedDataset map[int64]int) (string, float64) {
 	datasetInfo := make(map[string]string)
+	score := 0.0
 	if create_count, ok := CreatedDataset[userId]; ok {
 		datasetInfo["create_count"] = fmt.Sprint(create_count)
+		score = float64(create_count) / 10
 	}
 	if upload_count, ok := CommitDatasetNumMap[userId]; ok {
 		datasetInfo["upload_file_count"] = fmt.Sprint(upload_count)
@@ -1048,11 +903,12 @@ func getDataSetInfo(userId int64, CreatedDataset map[int64]int, dataSetDownloadM
 	if cllected_count, ok := CollectedDataset[userId]; ok {
 		datasetInfo["cllected_count"] = fmt.Sprint(cllected_count)
 	}
+
 	if len(datasetInfo) > 0 {
 		datasetInfoJson, _ := json.Marshal(datasetInfo)
-		return string(datasetInfoJson)
+		return string(datasetInfoJson), score
 	} else {
-		return ""
+		return "", score
 	}
 }
 
diff --git a/models/user_business_struct.go b/models/user_business_struct.go
index 4c9037226..9dcc12342 100644
--- a/models/user_business_struct.go
+++ b/models/user_business_struct.go
@@ -526,3 +526,182 @@ type UserMetrics struct {
 	ActivityUserJson           string  `xorm:"text NULL"`          //激活用户列表
 	CurrentDayRegistUser       int     `xorm:"NOT NULL DEFAULT 0"` //当天注册用户
 }
+
+type UserBusinessAnalysisAll struct {
+	ID int64 `xorm:"pk"`
+
+	CountDate int64 `xorm:"pk"`
+
+	//action :ActionMergePullRequest                         // 11
+	CodeMergeCount int `xorm:"NOT NULL DEFAULT 0"`
+
+	//action :ActionCommitRepo                               // 5
+	CommitCount int `xorm:"NOT NULL DEFAULT 0"`
+
+	//action :ActionCreateIssue                             // 10
+	IssueCount int `xorm:"NOT NULL DEFAULT 0"`
+
+	//comment table current date
+	CommentCount int `xorm:"NOT NULL DEFAULT 0"`
+
+	//watch table current date
+	FocusRepoCount int `xorm:"NOT NULL DEFAULT 0"`
+
+	//star table current date
+	StarRepoCount int `xorm:"NOT NULL DEFAULT 0"`
+
+	//follow table
+	WatchedCount int `xorm:"NOT NULL DEFAULT 0"`
+
+	// user table
+	GiteaAgeMonth int `xorm:"NOT NULL DEFAULT 0"`
+
+	//
+	CommitCodeSize int `xorm:"NOT NULL DEFAULT 0"`
+
+	//attachement table
+	CommitDatasetSize int `xorm:"NOT NULL DEFAULT 0"`
+
+	//0
+	CommitModelCount int `xorm:"NOT NULL DEFAULT 0"`
+
+	//issue, issueassignees
+	SolveIssueCount int `xorm:"NOT NULL DEFAULT 0"`
+
+	//baike
+	EncyclopediasCount int `xorm:"NOT NULL DEFAULT 0"`
+
+	//user
+	RegistDate timeutil.TimeStamp `xorm:"NOT NULL"`
+
+	//repo
+	CreateRepoCount int `xorm:"NOT NULL DEFAULT 0"`
+
+	//login count, from elk
+	LoginCount int `xorm:"NOT NULL DEFAULT 0"`
+
+	//openi index
+	OpenIIndex float64 `xorm:"NOT NULL DEFAULT 0"`
+
+	//user
+	Email string `xorm:"NOT NULL"`
+
+	//user
+	Name string `xorm:"NOT NULL"`
+
+	DataDate string `xorm:"NULL"`
+
+	//cloudbraintask
+	CloudBrainTaskNum  int     `xorm:"NOT NULL DEFAULT 0"`
+	GpuDebugJob        int     `xorm:"NOT NULL DEFAULT 0"`
+	NpuDebugJob        int     `xorm:"NOT NULL DEFAULT 0"`
+	GpuTrainJob        int     `xorm:"NOT NULL DEFAULT 0"`
+	NpuTrainJob        int     `xorm:"NOT NULL DEFAULT 0"`
+	NpuInferenceJob    int     `xorm:"NOT NULL DEFAULT 0"`
+	GpuBenchMarkJob    int     `xorm:"NOT NULL DEFAULT 0"`
+	CloudBrainRunTime  int     `xorm:"NOT NULL DEFAULT 0"`
+	CommitDatasetNum   int     `xorm:"NOT NULL DEFAULT 0"`
+	UserIndex          float64 `xorm:"NOT NULL DEFAULT 0"`
+	UserIndexPrimitive float64 `xorm:"NOT NULL DEFAULT 0"`
+
+	UserLocation string `xorm:"NULL"`
+
+	FocusOtherUser   int `xorm:"NOT NULL DEFAULT 0"`
+	CollectDataset   int `xorm:"NOT NULL DEFAULT 0"`
+	CollectedDataset int `xorm:"NOT NULL DEFAULT 0"`
+	RecommendDataset int `xorm:"NOT NULL DEFAULT 0"`
+	CollectImage     int `xorm:"NOT NULL DEFAULT 0"`
+	CollectedImage   int `xorm:"NOT NULL DEFAULT 0"`
+	RecommendImage   int `xorm:"NOT NULL DEFAULT 0"`
+
+	Phone             string `xorm:"NULL"`
+	InvitationUserNum int    `xorm:"NOT NULL DEFAULT 0"`
+}
+
+type UserBusinessAnalysis struct {
+	ID        int64  `xorm:"pk"`
+	DataDate  string `xorm:"pk"`
+	CountDate int64  `xorm:"NULL"`
+
+	//action :ActionMergePullRequest                         // 11
+	CodeMergeCount int `xorm:"NOT NULL DEFAULT 0"`
+
+	//action :ActionCommitRepo                               // 5
+	CommitCount int `xorm:"NOT NULL DEFAULT 0"`
+
+	//action :ActionCreateIssue                             // 6
+	IssueCount int `xorm:"NOT NULL DEFAULT 0"`
+
+	//comment table current date
+	CommentCount int `xorm:"NOT NULL DEFAULT 0"`
+
+	//watch table current date
+	FocusRepoCount int `xorm:"NOT NULL DEFAULT 0"`
+
+	//star table current date
+	StarRepoCount int `xorm:"NOT NULL DEFAULT 0"`
+
+	//follow table
+	WatchedCount int `xorm:"NOT NULL DEFAULT 0"`
+
+	// user table
+	GiteaAgeMonth int `xorm:"NOT NULL DEFAULT 0"`
+
+	//
+	CommitCodeSize int `xorm:"NOT NULL DEFAULT 0"`
+
+	//attachement table
+	CommitDatasetSize int `xorm:"NOT NULL DEFAULT 0"`
+
+	//0
+	CommitModelCount int `xorm:"NOT NULL DEFAULT 0"`
+
+	//issue, issueassignees
+	SolveIssueCount int `xorm:"NOT NULL DEFAULT 0"`
+
+	//baike
+	EncyclopediasCount int `xorm:"NOT NULL DEFAULT 0"`
+
+	//user
+	RegistDate timeutil.TimeStamp `xorm:"NOT NULL"`
+
+	//repo
+	CreateRepoCount int `xorm:"NOT NULL DEFAULT 0"`
+
+	//login count, from elk
+	LoginCount int `xorm:"NOT NULL DEFAULT 0"`
+
+	//openi index
+	OpenIIndex float64 `xorm:"NOT NULL DEFAULT 0"`
+
+	//user
+	Email string `xorm:"NOT NULL"`
+
+	//user
+	Name string `xorm:"NOT NULL"`
+
+	CloudBrainTaskNum  int     `xorm:"NOT NULL DEFAULT 0"`
+	GpuDebugJob        int     `xorm:"NOT NULL DEFAULT 0"`
+	NpuDebugJob        int     `xorm:"NOT NULL DEFAULT 0"`
+	GpuTrainJob        int     `xorm:"NOT NULL DEFAULT 0"`
+	NpuTrainJob        int     `xorm:"NOT NULL DEFAULT 0"`
+	NpuInferenceJob    int     `xorm:"NOT NULL DEFAULT 0"`
+	GpuBenchMarkJob    int     `xorm:"NOT NULL DEFAULT 0"`
+	CloudBrainRunTime  int     `xorm:"NOT NULL DEFAULT 0"`
+	CommitDatasetNum   int     `xorm:"NOT NULL DEFAULT 0"`
+	UserIndex          float64 `xorm:"NOT NULL DEFAULT 0"`
+	UserIndexPrimitive float64 `xorm:"NOT NULL DEFAULT 0"`
+
+	UserLocation string `xorm:"NULL"`
+
+	FocusOtherUser   int `xorm:"NOT NULL DEFAULT 0"`
+	CollectDataset   int `xorm:"NOT NULL DEFAULT 0"`
+	CollectedDataset int `xorm:"NOT NULL DEFAULT 0"`
+	RecommendDataset int `xorm:"NOT NULL DEFAULT 0"`
+	CollectImage     int `xorm:"NOT NULL DEFAULT 0"`
+	CollectedImage   int `xorm:"NOT NULL DEFAULT 0"`
+	RecommendImage   int `xorm:"NOT NULL DEFAULT 0"`
+
+	Phone             string `xorm:"NULL"`
+	InvitationUserNum int    `xorm:"NOT NULL DEFAULT 0"`
+}

From bc8c798dffe267822e7bad55ae6788577eac09ab Mon Sep 17 00:00:00 2001
From: chenshihai <chenshh@pcl.ac.cn>
Date: Mon, 14 Nov 2022 14:52:05 +0800
Subject: [PATCH 142/187] fix bugs

---
 routers/routes/routes.go                      |  6 ++---
 templates/base/footer_content.tmpl            | 23 +++++++++++++++++--
 templates/base/footer_content_fluid.tmpl      | 22 +++++++++++++++++-
 templates/repo/cloudbrain/trainjob/show.tmpl  | 10 +++++++-
 templates/repo/grampus/trainjob/show.tmpl     |  9 ++++++++
 templates/repo/modelarts/trainjob/show.tmpl   |  8 +++++++
 templates/repo/modelmanage/create_online.tmpl |  7 +++---
 templates/repo/modelmanage/index.tmpl         |  7 +++---
 web_src/js/components/Model.vue               |  4 ++--
 web_src/vuepages/langs/config/en-US.js        |  2 +-
 .../common/modelmanage-common-detail.vue      |  2 +-
 .../local/modelmanage-local-create-1.vue      |  2 +-
 12 files changed, 84 insertions(+), 18 deletions(-)

diff --git a/routers/routes/routes.go b/routers/routes/routes.go
index 1c0ab9057..63acdd988 100755
--- a/routers/routes/routes.go
+++ b/routers/routes/routes.go
@@ -1229,9 +1229,9 @@ func RegisterRoutes(m *macaron.Macaron) {
 			})
 		}, context.RepoRef())
 		m.Group("/modelmanage", func() {
-			m.Get("/create_local_model_tmpl1", repo.CreateLocalModel)
-			m.Get("/create_local_model_tmpl2", repo.CreateLocalModelForUpload)
-			m.Get("/create_online_model_tmpl", repo.CreateOnlineModel)
+			m.Get("/create_local_model_1", repo.CreateLocalModel)
+			m.Get("/create_local_model_2", repo.CreateLocalModelForUpload)
+			m.Get("/create_online_model", repo.CreateOnlineModel)
 			m.Post("/create_local_model", repo.SaveLocalModel)
 			m.Delete("/delete_model_file", repo.DeleteModelFile)
 
diff --git a/templates/base/footer_content.tmpl b/templates/base/footer_content.tmpl
index cb732bbbe..b4c8518c4 100755
--- a/templates/base/footer_content.tmpl
+++ b/templates/base/footer_content.tmpl
@@ -24,11 +24,30 @@
 							<div class="text">{{.LangName}}</div>
 							<div class="menu">
 								{{range .AllLangs}}
-									<a lang="{{.Lang}}" class="item {{if eq $.Lang .Lang}}active selected{{end}}" href="{{if eq $.Lang .Lang}}#{{else}}{{$.Link}}?lang={{.Lang}}{{end}}">{{.Name}}</a>
+									<!-- <a lang="{{.Lang}}" class="item {{if eq $.Lang .Lang}}active selected{{end}}" href="{{if eq $.Lang .Lang}}#{{else}}{{$.Link}}?lang={{.Lang}}{{end}}">{{.Name}}</a> -->
+									<a lang="{{.Lang}}" class="item {{if eq $.Lang .Lang}}active selected{{end}}" href="javascript:;" olang="{{$.Lang}}" lang="{{.Lang}}" >{{.Name}}</a>
 								{{end}}
 							</div>
 						</div>
-
+						<script>
+						;(function() {
+							document.addEventListener('DOMContentLoaded', function() {
+								$('.ui.language .menu .item').on('click', function() {
+									var lang = $(this).attr('lang');
+									var oLang = $(this).attr('olang');
+									if (oLang === lang) return;
+									var origin = window.location.origin;
+									var pathname = window.location.pathname;
+									var search = window.location.search;
+									var hash = window.location.hash;
+									var oHref = window.location.href;
+									var urlSearchParams = new URLSearchParams(search);
+									urlSearchParams.set('lang', lang);
+									window.location.href = origin + pathname + '?' + urlSearchParams.toString() + hash;
+								});
+							});
+						})();
+						</script>
 						<a href="https://git.openi.org.cn/zeizei/OpenI_Learning" class="item" target="_blank"><i class="compass icon" ></i> {{.i18n.Tr "custom.Platform_Tutorial"}}</a>
 						{{if .EnableSwagger}}<a href="/api/swagger" class="item"><i class="plug icon"></i> API</a>{{end}}
 						{{if .IsSigned}}
diff --git a/templates/base/footer_content_fluid.tmpl b/templates/base/footer_content_fluid.tmpl
index 723c78045..be17f2781 100755
--- a/templates/base/footer_content_fluid.tmpl
+++ b/templates/base/footer_content_fluid.tmpl
@@ -22,10 +22,30 @@
 							<div class="text">{{.LangName}}</div>
 							<div class="menu">
 								{{range .AllLangs}}
-									<a lang="{{.Lang}}" class="item {{if eq $.Lang .Lang}}active selected{{end}}" href="{{if eq $.Lang .Lang}}#{{else}}{{$.Link}}?lang={{.Lang}}{{end}}">{{.Name}}</a>
+									<!--<a lang="{{.Lang}}" class="item {{if eq $.Lang .Lang}}active selected{{end}}" href="{{if eq $.Lang .Lang}}#{{else}}{{$.Link}}?lang={{.Lang}}{{end}}">{{.Name}}</a>-->									
+									<a lang="{{.Lang}}" class="item {{if eq $.Lang .Lang}}active selected{{end}}" href="javascript:;" olang="{{$.Lang}}" lang="{{.Lang}}" >{{.Name}}</a>
 								{{end}}
 							</div>
 						</div>
+						<script>
+						;(function() {
+							document.addEventListener('DOMContentLoaded', function() {
+								$('.ui.language .menu .item').on('click', function() {
+									var lang = $(this).attr('lang');
+									var oLang = $(this).attr('olang');
+									if (oLang === lang) return;
+									var origin = window.location.origin;
+									var pathname = window.location.pathname;
+									var search = window.location.search;
+									var hash = window.location.hash;
+									var oHref = window.location.href;
+									var urlSearchParams = new URLSearchParams(search);
+									urlSearchParams.set('lang', lang);
+									window.location.href = origin + pathname + '?' + urlSearchParams.toString() + hash;
+								});
+							});
+						})();
+						</script>
 						<a href="https://git.openi.org.cn/zeizei/OpenI_Learning" class="item" target="_blank"><i class="compass icon"></i> {{.i18n.Tr "custom.Platform_Tutorial"}} </a>
 						{{if .EnableSwagger}}<a href="/api/swagger" class="item"><i class="plug icon" ></i> API</a>{{end}}
 						{{if .IsSigned}}
diff --git a/templates/repo/cloudbrain/trainjob/show.tmpl b/templates/repo/cloudbrain/trainjob/show.tmpl
index ab6c40ead..4c00f9600 100644
--- a/templates/repo/cloudbrain/trainjob/show.tmpl
+++ b/templates/repo/cloudbrain/trainjob/show.tmpl
@@ -690,7 +690,15 @@
 <script src="{{StaticUrlPrefix}}/js/specsuse.js?v={{MD5 AppVer}}" type="text/javascript"></script>
 
 <script>
-   var setting = {
+    var userName;
+    var repoPath;
+    $(document).ready(function(){
+        var url = window.location.href;
+        var urlArr = url.split('/')
+        userName = urlArr.slice(-4)[0]
+        repoPath = urlArr.slice(-3)[0]
+    });
+    var setting = {
 			check: {
 				enable: true,
 				chkboxType: {"Y":"ps", "N":"ps"}
diff --git a/templates/repo/grampus/trainjob/show.tmpl b/templates/repo/grampus/trainjob/show.tmpl
index e8d4082f4..c80bfbb7e 100755
--- a/templates/repo/grampus/trainjob/show.tmpl
+++ b/templates/repo/grampus/trainjob/show.tmpl
@@ -721,6 +721,15 @@
         });
         $('td.ti-text-form-content.spec').text(specStr);
     })();
+    var userName;
+    var repoPath;
+    $(document).ready(function(){
+        var url = window.location.href;
+        var urlArr = url.split('/')
+        userName = urlArr.slice(-4)[0]
+        repoPath = urlArr.slice(-3)[0]
+    });
+
    var setting = {
 			check: {
 				enable: true,
diff --git a/templates/repo/modelarts/trainjob/show.tmpl b/templates/repo/modelarts/trainjob/show.tmpl
index 62fd8c718..852acfaef 100755
--- a/templates/repo/modelarts/trainjob/show.tmpl
+++ b/templates/repo/modelarts/trainjob/show.tmpl
@@ -732,6 +732,14 @@
 <script type="text/javascript" src="/self/ztree/js/jquery.ztree.core.js"></script>
 <script type="text/javascript" src="/self/ztree/js/jquery.ztree.excheck.js"></script>
 <script>
+    var userName;
+    var repoPath;
+    $(document).ready(function(){
+        var url = window.location.href;
+        var urlArr = url.split('/')
+        userName = urlArr.slice(-4)[0]
+        repoPath = urlArr.slice(-3)[0]
+    });    
     var setting = {
 			check: {
 				enable: true,
diff --git a/templates/repo/modelmanage/create_online.tmpl b/templates/repo/modelmanage/create_online.tmpl
index f3334a98a..32503d1f0 100644
--- a/templates/repo/modelmanage/create_online.tmpl
+++ b/templates/repo/modelmanage/create_online.tmpl
@@ -351,7 +351,8 @@
                 let train_html = '';
                 modelData = data;
                 for (let i = 0; i < n_length; i++) {
-                    train_html += `<div class="item" data-value="${data[i].VersionName}">${data[i].VersionName}</div>`
+                    var VersionName = data[i].VersionName || 'V0001';
+                    train_html += `<div class="item" data-value="${VersionName}">${VersionName}</div>`
                     train_html += '</div>'
                 }
                 if (data.length) {
@@ -549,7 +550,7 @@
             let version = $("input[name='version']").val();
             let data = $("#formId").serialize();
             const initModel = $("input[name='initModel']").val();
-            let url_href = location.href.split("create_online_model_tmpl")[0] + 'create_new_model';
+            let url_href = location.href.split("create_online_model")[0] + 'create_new_model';
             $("#mask").css({ display: "block", "z-index": "9999" });
             $.ajax({
                 url: url_href,
@@ -571,7 +572,7 @@
         }
 
         function backToModelListPage() {
-            let url_href = location.href.split("create_online_model_tmpl")[0] + 'show_model';
+            let url_href = location.href.split("create_online_model")[0] + 'show_model';
             window.location.href = url_href;
         }
         window.submitSaveModel = submitSaveModel;
diff --git a/templates/repo/modelmanage/index.tmpl b/templates/repo/modelmanage/index.tmpl
index 1befa48ee..b358384e3 100644
--- a/templates/repo/modelmanage/index.tmpl
+++ b/templates/repo/modelmanage/index.tmpl
@@ -75,9 +75,9 @@
             <div class="column right aligned">
                 <!--  -->
                 <a class="ui button {{if .Permission.CanWrite $.UnitTypeModelManage}} blue m-blue-btn {{else}} disabled {{end}}"
-                    href="{{.RepoLink}}/modelmanage/create_local_model_tmpl1">{{$.i18n.Tr "repo.model.manage.import_local_model"}}</a>
+                    href="{{.RepoLink}}/modelmanage/create_local_model_1">{{$.i18n.Tr "repo.model.manage.import_local_model"}}</a>
                 <a class="ui button {{if .Permission.CanWrite $.UnitTypeModelManage}} green {{else}} disabled {{end}}"
-                    href="{{.RepoLink}}/modelmanage/create_online_model_tmpl">{{$.i18n.Tr "repo.model.manage.import_online_model"}}</a>
+                    href="{{.RepoLink}}/modelmanage/create_online_model">{{$.i18n.Tr "repo.model.manage.import_online_model"}}</a>
             </div>
         </div>
         {{if eq $.MODEL_COUNT 0}}
@@ -443,7 +443,8 @@
                 let train_html = '';
                 modelData = data;
                 for (let i = 0; i < n_length; i++) {
-                    train_html += `<div class="item" data-value="${data[i].VersionName}">${data[i].VersionName}</div>`
+                    var VersionName = data[i].VersionName || 'V0001';
+                    train_html += `<div class="item" data-value="${VersionName}">${VersionName}</div>`
                     train_html += '</div>'
                 }
                 if (data.length) {
diff --git a/web_src/js/components/Model.vue b/web_src/js/components/Model.vue
index 34ea7f99c..d97249b2b 100644
--- a/web_src/js/components/Model.vue
+++ b/web_src/js/components/Model.vue
@@ -153,7 +153,7 @@
                 >-->
                 <a class="op-btn"
                   v-show="scope.row.modelType == 1"
-                  :href="url + 'create_local_model_tmpl1?type=1&name=' + scope.row.name + '&id=' + scope.row.id"
+                  :href="url + 'create_local_model_1?type=1&name=' + scope.row.name + '&id=' + scope.row.id"
                   :class="{ disabled: !scope.row.isCanOper }"
                   >{{ i18n.modify }}</a>
                 <a class="op-btn" v-show="scope.row.modelType != 1" style="color:transparent;cursor:default;" >{{ i18n.modify }}</a>
@@ -480,7 +480,7 @@ export default {
       try {
         this.loadNodeMap.clear();
         this.$axios
-          .get(location.href + "_api", {
+          .get(this.url + "show_model_api", {
             params: this.params,
           })
           .then((res) => {
diff --git a/web_src/vuepages/langs/config/en-US.js b/web_src/vuepages/langs/config/en-US.js
index 7d22f5589..7a5c7aec2 100644
--- a/web_src/vuepages/langs/config/en-US.js
+++ b/web_src/vuepages/langs/config/en-US.js
@@ -241,7 +241,7 @@ const en = {
     specInfo: 'Specifications',
     workServerNumber: 'Amount of compute node',
     runParameters: 'Run parameters',
-    seeMore: 'See more',
+    seeMore: 'View more',
     collapseDetails: 'Collapse details',
     modelFilesList: 'Mode files list',
     fileName: 'File name',
diff --git a/web_src/vuepages/pages/modelmanage/common/modelmanage-common-detail.vue b/web_src/vuepages/pages/modelmanage/common/modelmanage-common-detail.vue
index f6322221b..b94029a34 100644
--- a/web_src/vuepages/pages/modelmanage/common/modelmanage-common-detail.vue
+++ b/web_src/vuepages/pages/modelmanage/common/modelmanage-common-detail.vue
@@ -335,7 +335,7 @@ export default {
       }
     },
     goUploadPage() {
-      window.location.href = `${this.repo}/modelmanage/create_local_model_tmpl2?type=1&name=${this.state.name}&id=${this.state.id}`;
+      window.location.href = `${this.repo}/modelmanage/create_local_model_2?type=1&name=${this.state.name}&id=${this.state.id}`;
     },
     backToModelListPage() {
       const list = window.location.href.split('/');
diff --git a/web_src/vuepages/pages/modelmanage/local/modelmanage-local-create-1.vue b/web_src/vuepages/pages/modelmanage/local/modelmanage-local-create-1.vue
index 3c3b35c58..3c9e4cb83 100644
--- a/web_src/vuepages/pages/modelmanage/local/modelmanage-local-create-1.vue
+++ b/web_src/vuepages/pages/modelmanage/local/modelmanage-local-create-1.vue
@@ -159,7 +159,7 @@ export default {
           }
           const list = window.location.href.split('/');
           list.pop();
-          list.push('create_local_model_tmpl2');
+          list.push('create_local_model_2');
           window.location.href = list.join('/') + '?type=0&name=' + this.state.name + '&id=' + res.id;
         } else {
           this.$message({

From 94d78940b7efa3849efa6d0d9580319d2b157a7f Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Mon, 14 Nov 2022 14:59:21 +0800
Subject: [PATCH 143/187] =?UTF-8?q?=E6=A8=A1=E5=9E=8B=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E4=B8=AD=EF=BC=8CNPU=E7=9A=84=E8=A7=84=E6=A0=BC=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E9=97=AE=E9=A2=98=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/repo/ai_model_manage.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/routers/repo/ai_model_manage.go b/routers/repo/ai_model_manage.go
index a72e812ab..4cad38cc8 100644
--- a/routers/repo/ai_model_manage.go
+++ b/routers/repo/ai_model_manage.go
@@ -78,7 +78,7 @@ func saveModelByParameters(jobId string, versionName string, name string, versio
 		cloudType = models.TypeCloudBrainTwo
 		spec, err := resource.GetCloudbrainSpec(aiTask.ID)
 		if err == nil {
-			flaverName := "NPU: " + fmt.Sprint(spec.AccCardsNum) + "*" + spec.AccCardType + ",CPU: " + fmt.Sprint(spec.CpuCores) + "," + ctx.Tr("cloudbrain.memory") + ": " + fmt.Sprint(spec.MemGiB) + "GB," + ctx.Tr("cloudbrain.shared_memory") + ": " + fmt.Sprint(spec.ShareMemGiB) + "GB"
+			flaverName := "NPU: " + fmt.Sprint(spec.AccCardsNum) + "*" + spec.AccCardType + ",CPU: " + fmt.Sprint(spec.CpuCores) + "," + ctx.Tr("cloudbrain.gpu_memory") + ": " + fmt.Sprint(spec.GPUMemGiB) + "GB," + ctx.Tr("cloudbrain.memory") + ": " + fmt.Sprint(spec.MemGiB) + "GB"
 			aiTask.FlavorName = flaverName
 		}
 	} else if aiTask.ComputeResource == models.GPUResource {

From ef28d9ba947a53b013f4266b0af6477cfc6c4ac8 Mon Sep 17 00:00:00 2001
From: chenyifan01 <cyf_uestc@outlook.com>
Date: Mon, 14 Nov 2022 15:12:17 +0800
Subject: [PATCH 144/187] #3196 fix bug

---
 models/resource_specification.go               | 18 +++++++++++++++++-
 routers/admin/resources.go                     |  1 +
 .../resource/resource_specification.go         |  1 +
 3 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/models/resource_specification.go b/models/resource_specification.go
index a6f5f1f82..7a11edd05 100644
--- a/models/resource_specification.go
+++ b/models/resource_specification.go
@@ -12,6 +12,13 @@ const (
 	SpecOffShelf
 )
 
+type SearchSpecOrderBy int
+
+const (
+	SearchSpecOrderById SearchSpecOrderBy = iota
+	SearchSpecOrder4Standard
+)
+
 type ResourceSpecification struct {
 	ID              int64  `xorm:"pk autoincr"`
 	QueueId         int64  `xorm:"INDEX"`
@@ -85,6 +92,7 @@ type SearchResourceSpecificationOptions struct {
 	Status        int
 	Cluster       string
 	AvailableCode int
+	OrderBy       SearchSpecOrderBy
 }
 
 type SearchResourceBriefSpecificationOptions struct {
@@ -233,10 +241,18 @@ func SearchResourceSpecification(opts SearchResourceSpecificationOptions) (int64
 		return 0, nil, err
 	}
 
+	var orderby = ""
+	switch opts.OrderBy {
+	case SearchSpecOrder4Standard:
+		orderby = "resource_queue.compute_resource asc,resource_queue.acc_card_type asc,resource_specification.acc_cards_num asc,resource_specification.cpu_cores asc,resource_specification.mem_gi_b asc,resource_specification.share_mem_gi_b asc"
+	default:
+		orderby = "resource_specification.id desc"
+	}
+
 	r := make([]ResourceSpecAndQueue, 0)
 	err = x.Where(cond).
 		Join("INNER", "resource_queue", "resource_queue.ID = resource_specification.queue_id").
-		Desc("resource_specification.id").
+		OrderBy(orderby).
 		Limit(opts.PageSize, (opts.Page-1)*opts.PageSize).
 		Unscoped().Find(&r)
 	if err != nil {
diff --git a/routers/admin/resources.go b/routers/admin/resources.go
index 026c37e52..feea7b69b 100644
--- a/routers/admin/resources.go
+++ b/routers/admin/resources.go
@@ -127,6 +127,7 @@ func GetResourceSpecificationList(ctx *context.Context) {
 		Status:        status,
 		Cluster:       cluster,
 		AvailableCode: available,
+		OrderBy:       models.SearchSpecOrderById,
 	})
 	if err != nil {
 		log.Error("GetResourceSpecificationList error.%v", err)
diff --git a/services/cloudbrain/resource/resource_specification.go b/services/cloudbrain/resource/resource_specification.go
index d23fd3aad..8f4182d87 100644
--- a/services/cloudbrain/resource/resource_specification.go
+++ b/services/cloudbrain/resource/resource_specification.go
@@ -138,6 +138,7 @@ func GetResourceSpecificationList(opts models.SearchResourceSpecificationOptions
 func GetAllDistinctResourceSpecification(opts models.SearchResourceSpecificationOptions) (*models.ResourceSpecAndQueueListRes, error) {
 	opts.Page = 0
 	opts.PageSize = 1000
+	opts.OrderBy = models.SearchSpecOrder4Standard
 	_, r, err := models.SearchResourceSpecification(opts)
 	if err != nil {
 		return nil, err

From 071f62c5d6fbbbe02c309df164798341139fa8c9 Mon Sep 17 00:00:00 2001
From: chenshihai <chenshh@pcl.ac.cn>
Date: Mon, 14 Nov 2022 15:16:36 +0800
Subject: [PATCH 145/187] fix-bugs

---
 templates/repo/cloudbrain/trainjob/show.tmpl           |  4 ++--
 templates/repo/grampus/trainjob/show.tmpl              |  9 ---------
 templates/repo/modelarts/trainjob/show.tmpl            | 10 +---------
 .../modelmanage/local/modelmanage-local-create-1.vue   |  4 ++--
 4 files changed, 5 insertions(+), 22 deletions(-)

diff --git a/templates/repo/cloudbrain/trainjob/show.tmpl b/templates/repo/cloudbrain/trainjob/show.tmpl
index 4c00f9600..8193e80fc 100644
--- a/templates/repo/cloudbrain/trainjob/show.tmpl
+++ b/templates/repo/cloudbrain/trainjob/show.tmpl
@@ -695,8 +695,8 @@
     $(document).ready(function(){
         var url = window.location.href;
         var urlArr = url.split('/')
-        userName = urlArr.slice(-4)[0]
-        repoPath = urlArr.slice(-3)[0]
+        userName = urlArr.slice(-5)[0]
+        repoPath = urlArr.slice(-4)[0]
     });
     var setting = {
 			check: {
diff --git a/templates/repo/grampus/trainjob/show.tmpl b/templates/repo/grampus/trainjob/show.tmpl
index c80bfbb7e..e8d4082f4 100755
--- a/templates/repo/grampus/trainjob/show.tmpl
+++ b/templates/repo/grampus/trainjob/show.tmpl
@@ -721,15 +721,6 @@
         });
         $('td.ti-text-form-content.spec').text(specStr);
     })();
-    var userName;
-    var repoPath;
-    $(document).ready(function(){
-        var url = window.location.href;
-        var urlArr = url.split('/')
-        userName = urlArr.slice(-4)[0]
-        repoPath = urlArr.slice(-3)[0]
-    });
-
    var setting = {
 			check: {
 				enable: true,
diff --git a/templates/repo/modelarts/trainjob/show.tmpl b/templates/repo/modelarts/trainjob/show.tmpl
index 852acfaef..f088a7641 100755
--- a/templates/repo/modelarts/trainjob/show.tmpl
+++ b/templates/repo/modelarts/trainjob/show.tmpl
@@ -731,15 +731,7 @@
 
 <script type="text/javascript" src="/self/ztree/js/jquery.ztree.core.js"></script>
 <script type="text/javascript" src="/self/ztree/js/jquery.ztree.excheck.js"></script>
-<script>
-    var userName;
-    var repoPath;
-    $(document).ready(function(){
-        var url = window.location.href;
-        var urlArr = url.split('/')
-        userName = urlArr.slice(-4)[0]
-        repoPath = urlArr.slice(-3)[0]
-    });    
+<script>  
     var setting = {
 			check: {
 				enable: true,
diff --git a/web_src/vuepages/pages/modelmanage/local/modelmanage-local-create-1.vue b/web_src/vuepages/pages/modelmanage/local/modelmanage-local-create-1.vue
index 3c9e4cb83..0a106531c 100644
--- a/web_src/vuepages/pages/modelmanage/local/modelmanage-local-create-1.vue
+++ b/web_src/vuepages/pages/modelmanage/local/modelmanage-local-create-1.vue
@@ -23,7 +23,7 @@
             <div class="cluster-type-btn" v-if="type != 1 || type == 1 && state.type === 0"
               :class="state.type === 0 ? 'focused' : ''"
               :style="type != 1 ? 'border-top-right-radius:unset;border-bottom-right-radius:unset;' : ''"
-              @click="state.type = 0">
+              @click="state.type = 0;state.engine='0'">
               <svg xmlns="http://www.w3.org/2000/svg"
                 class="icon styles__StyledSVGIconPathComponent-sc-16fsqc8-0 cSaWDI svg-icon-path-icon fill"
                 viewBox="0 0 32 32" width="16" height="16">
@@ -39,7 +39,7 @@
             <div class="cluster-type-btn" v-if="type != 1 || type == 1 && state.type === 1"
               :class="state.type === 1 ? 'focused' : ''"
               :style="type != 1 ? 'border-top-left-radius:unset;border-bottom-left-radius:unset;' : ''"
-              @click="state.type = 1">
+              @click="state.type = 1;state.engine='2'">
               <svg xmlns="http://www.w3.org/2000/svg"
                 class="icon styles__StyledSVGIconPathComponent-sc-16fsqc8-0 iKfgJk svg-icon-path-icon fill"
                 viewBox="0 0 32 32" width="16" height="16">

From 0b614d10b9985f089c304e4c6dcff134e3d486f2 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Mon, 14 Nov 2022 15:26:48 +0800
Subject: [PATCH 146/187] =?UTF-8?q?=E6=A8=A1=E5=9E=8B=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E4=B8=AD=EF=BC=8CNPU=E7=9A=84=E8=A7=84=E6=A0=BC=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E9=97=AE=E9=A2=98=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/repo/ai_model_manage.go | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/routers/repo/ai_model_manage.go b/routers/repo/ai_model_manage.go
index 4cad38cc8..b66b50d37 100644
--- a/routers/repo/ai_model_manage.go
+++ b/routers/repo/ai_model_manage.go
@@ -78,7 +78,11 @@ func saveModelByParameters(jobId string, versionName string, name string, versio
 		cloudType = models.TypeCloudBrainTwo
 		spec, err := resource.GetCloudbrainSpec(aiTask.ID)
 		if err == nil {
-			flaverName := "NPU: " + fmt.Sprint(spec.AccCardsNum) + "*" + spec.AccCardType + ",CPU: " + fmt.Sprint(spec.CpuCores) + "," + ctx.Tr("cloudbrain.gpu_memory") + ": " + fmt.Sprint(spec.GPUMemGiB) + "GB," + ctx.Tr("cloudbrain.memory") + ": " + fmt.Sprint(spec.MemGiB) + "GB"
+			flaverName := "NPU: " + fmt.Sprint(spec.AccCardsNum) + "*" + spec.AccCardType + ",CPU: " + fmt.Sprint(spec.CpuCores) + ","
+			if spec.GPUMemGiB > 0 {
+				flaverName += ctx.Tr("cloudbrain.gpu_memory") + ": " + fmt.Sprint(spec.GPUMemGiB) + "GB,"
+			}
+			flaverName += ctx.Tr("cloudbrain.memory") + ": " + fmt.Sprint(spec.MemGiB) + "GB"
 			aiTask.FlavorName = flaverName
 		}
 	} else if aiTask.ComputeResource == models.GPUResource {

From 85cd770442ea62fe83494c56e38a812d55534858 Mon Sep 17 00:00:00 2001
From: chenshihai <chenshh@pcl.ac.cn>
Date: Mon, 14 Nov 2022 15:48:23 +0800
Subject: [PATCH 147/187] fix-bugs

---
 web_src/vuepages/langs/config/en-US.js                |  1 +
 web_src/vuepages/langs/config/zh-CN.js                |  1 +
 .../modelmanage/local/modelmanage-local-create-2.vue  | 11 +++++++++--
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/web_src/vuepages/langs/config/en-US.js b/web_src/vuepages/langs/config/en-US.js
index 7a5c7aec2..0d30c6578 100644
--- a/web_src/vuepages/langs/config/en-US.js
+++ b/web_src/vuepages/langs/config/en-US.js
@@ -221,6 +221,7 @@ const en = {
     uploadStatus: 'Upload status',
     modelFileUploadDefaultTips: 'Click to add files or drag files here directly',
     modelFileUploadErrTips: 'Up to 10 files can be uploaded at a time, and the total file size of the model does not exceed {size}GB',
+    modelFileNameTips: 'The file name should not exceed 128 characters',
     fileIstoBig: 'File is to big',
     removeFile: 'Rmove file',
     uploadSuccess: 'upload success',
diff --git a/web_src/vuepages/langs/config/zh-CN.js b/web_src/vuepages/langs/config/zh-CN.js
index 9e97d03ea..4698c67e0 100644
--- a/web_src/vuepages/langs/config/zh-CN.js
+++ b/web_src/vuepages/langs/config/zh-CN.js
@@ -221,6 +221,7 @@ const zh = {
     uploadStatus: '上传状态',
     modelFileUploadDefaultTips: '点击添加文件或直接拖拽文件到此处',
     modelFileUploadErrTips: '单次最多上传10个文件，模型总文件大小不超过{size}G',
+    modelFileNameTips: '文件名长度不超过128字符',
     fileIstoBig: '文件太大',
     removeFile: '移除文件',
     uploadSuccess: '上传成功',
diff --git a/web_src/vuepages/pages/modelmanage/local/modelmanage-local-create-2.vue b/web_src/vuepages/pages/modelmanage/local/modelmanage-local-create-2.vue
index 0f95bc8c4..facd8f3e3 100644
--- a/web_src/vuepages/pages/modelmanage/local/modelmanage-local-create-2.vue
+++ b/web_src/vuepages/pages/modelmanage/local/modelmanage-local-create-2.vue
@@ -198,6 +198,11 @@ export default {
         this.showUploadErrInfo(true, this.getDefaultErrTxt());
         return false;
       }
+      if (file && file.name.length > 128) {
+        this.showUploadErrInfo(true, this.$t('modelManage.modelFileNameTips'));
+        this.uploadError(file, this.$t('modelManage.modelFileNameTips'));
+        return false;
+      }
       this.showUploadErrInfo(false);
       return true;
     },
@@ -466,7 +471,7 @@ export default {
     },
     uploadFinishCheck(file) {
       console.log('uploadFinishCheck', file, this.uploadLength, '/', this.uploadFiles.length);
-      if (this.uploadLength === this.uploadFiles.length) {
+      if (this.uploadLength === this.uploadFiles.length && this.uploadFiles.length != 0) {
         console.log('All file has finish, success ' + this.uploadSuccessLength);
         this.uploading = false;
         if (this.uploadSuccessLength == this.uploadLength) {
@@ -483,7 +488,9 @@ export default {
     submit() {
       const fileList = this.dropzoneHandler.getAcceptedFiles();
       if (!fileList.length) return;
-      if (!this.checkFiles()) return;
+      for (let i = 0, iLen = fileList.length; i < iLen; i++) {
+        if (!this.checkFiles(fileList[i])) return;
+      }
       this.resetFileStatus();
       this.uploadFiles = fileList;
       this.uploading = true;

From 1d01f70541301f006577ca4453b4464c38d09f61 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Mon, 14 Nov 2022 15:51:14 +0800
Subject: [PATCH 148/187] =?UTF-8?q?=E6=A8=A1=E5=9E=8B=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E4=B8=AD=EF=BC=8CNPU=E7=9A=84=E8=A7=84=E6=A0=BC=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E9=97=AE=E9=A2=98=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/repo/attachment.go | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/routers/repo/attachment.go b/routers/repo/attachment.go
index 555330491..8cea9272d 100755
--- a/routers/repo/attachment.go
+++ b/routers/repo/attachment.go
@@ -552,7 +552,7 @@ func GetSuccessChunks(ctx *context.Context) {
 	fileName := ctx.Query("file_name")
 	scene := ctx.Query("scene")
 	modeluuid := ctx.Query("modeluuid")
-	log.Info("scene=" + scene)
+	log.Info("scene=" + scene + " typeCloudBrain=" + fmt.Sprint(typeCloudBrain))
 	var chunks string
 
 	err := checkTypeCloudBrain(typeCloudBrain)
@@ -668,6 +668,7 @@ func GetSuccessChunks(ctx *context.Context) {
 		dbmodeluuid := attach.Description
 		modelname := ""
 		if dbmodeluuid != modeluuid {
+			log.Info("The file has uploaded.fileChunk.ObjectName=" + fileChunk.ObjectName)
 			model, err := models.QueryModelById(dbmodeluuid)
 			if err == nil {
 				modelname = model.Name

From 85399a00d5b4d5e44253272a10d389e53ed84606 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Mon, 14 Nov 2022 15:56:22 +0800
Subject: [PATCH 149/187] =?UTF-8?q?=E6=A8=A1=E5=9E=8B=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E4=B8=AD=EF=BC=8CNPU=E7=9A=84=E8=A7=84=E6=A0=BC=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E9=97=AE=E9=A2=98=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/repo/attachment.go | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/routers/repo/attachment.go b/routers/repo/attachment.go
index 8cea9272d..756c80d21 100755
--- a/routers/repo/attachment.go
+++ b/routers/repo/attachment.go
@@ -668,7 +668,7 @@ func GetSuccessChunks(ctx *context.Context) {
 		dbmodeluuid := attach.Description
 		modelname := ""
 		if dbmodeluuid != modeluuid {
-			log.Info("The file has uploaded.fileChunk.ObjectName=" + fileChunk.ObjectName)
+			log.Info("The file has uploaded.fileChunk.ObjectName=" + fileChunk.ObjectName + " typeCloudBrain=" + fmt.Sprint(typeCloudBrain))
 			model, err := models.QueryModelById(dbmodeluuid)
 			if err == nil {
 				modelname = model.Name
@@ -677,7 +677,8 @@ func GetSuccessChunks(ctx *context.Context) {
 			srcObjectName := fileChunk.ObjectName
 			destObjectName := getObjectName(fileName, modeluuid)
 			var isExist bool
-			if typeCloudBrain == models.TypeCloudBrainOne {
+			if typeCloudBrain == int(models.TypeCloudBrainOne) {
+				log.Info("minio copy..")
 				bucketName := setting.Attachment.Minio.Bucket
 				if storage.MinioGetFilesSize(bucketName, []string{destObjectName}) > 0 {
 					isExist = true
@@ -685,6 +686,7 @@ func GetSuccessChunks(ctx *context.Context) {
 					storage.MinioCopyAFile(bucketName, srcObjectName, bucketName, destObjectName)
 				}
 			} else {
+				log.Info("obs copy..")
 				bucketName := setting.Bucket
 				if storage.ObsGetFilesSize(bucketName, []string{destObjectName}) > 0 {
 					isExist = true

From 422007310d373dddae3124d2de05c77a8d420df9 Mon Sep 17 00:00:00 2001
From: chenshihai <chenshh@pcl.ac.cn>
Date: Mon, 14 Nov 2022 15:57:53 +0800
Subject: [PATCH 150/187] fix-bugs

---
 .../common/modelmanage-common-detail.vue         | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/web_src/vuepages/pages/modelmanage/common/modelmanage-common-detail.vue b/web_src/vuepages/pages/modelmanage/common/modelmanage-common-detail.vue
index b94029a34..81d3d940e 100644
--- a/web_src/vuepages/pages/modelmanage/common/modelmanage-common-detail.vue
+++ b/web_src/vuepages/pages/modelmanage/common/modelmanage-common-detail.vue
@@ -172,14 +172,14 @@
                   <a v-if="scope.row.IsDir" @click="goNextDir(scope.row)" href="javascript:;">
                     <div class="fitted" :title="scope.row.FileName">
                       <i class="icon folder" width="16" height="16" aria-hidden="true"></i>
-                      {{ scope.row.FileName }}
+                      <span>{{ scope.row.FileName }}</span>
                     </div>
                   </a>
                   <a v-else :class="!canOperate ? 'disabled-download' : ''"
                     :href="canOperate ? `${repo}/modelmanage/${state.id}/downloadsingle?parentDir=${filePath[filePath.length - 1].path ? filePath[filePath.length - 1].path + '/' : ''}&fileName=${scope.row.FileName}` : 'javascript:;'">
                     <div class="fitted" :title="scope.row.FileName">
                       <i class="icon file" width="16" height="16" aria-hidden="true"></i>
-                      {{ scope.row.FileName }}
+                      <span>{{ scope.row.FileName }}</span>
                     </div>
                   </a>
                 </div>
@@ -628,6 +628,18 @@ export default {
         overflow: hidden;
         font-size: 16px;
         font-weight: 500;
+        position: relative;
+
+        a {
+          max-width: 100%;
+
+          .fitted {
+            overflow: hidden;
+            text-overflow: ellipsis;
+            white-space: nowrap;
+            max-width: 100%;
+          }
+        }
 
         .disabled-download {
           cursor: default;

From acd01b3db3d9d06f005d75057f8de7bcab497515 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Mon, 14 Nov 2022 16:11:56 +0800
Subject: [PATCH 151/187] =?UTF-8?q?=E6=A8=A1=E5=9E=8B=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E4=B8=AD=EF=BC=8CNPU=E7=9A=84=E8=A7=84=E6=A0=BC=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E9=97=AE=E9=A2=98=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/repo/attachment.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/routers/repo/attachment.go b/routers/repo/attachment.go
index 756c80d21..5d678cd23 100755
--- a/routers/repo/attachment.go
+++ b/routers/repo/attachment.go
@@ -691,6 +691,7 @@ func GetSuccessChunks(ctx *context.Context) {
 				if storage.ObsGetFilesSize(bucketName, []string{destObjectName}) > 0 {
 					isExist = true
 				} else {
+					log.Info("obs copy............")
 					storage.ObsCopyFile(bucketName, srcObjectName, bucketName, destObjectName)
 				}
 			}

From c2453a20af4187fb0978631282266d9d2e2cba01 Mon Sep 17 00:00:00 2001
From: chenshihai <chenshh@pcl.ac.cn>
Date: Mon, 14 Nov 2022 16:18:49 +0800
Subject: [PATCH 152/187] fix-bugs

---
 .../pages/modelmanage/local/modelmanage-local-create-2.vue   | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/web_src/vuepages/pages/modelmanage/local/modelmanage-local-create-2.vue b/web_src/vuepages/pages/modelmanage/local/modelmanage-local-create-2.vue
index facd8f3e3..e154152b3 100644
--- a/web_src/vuepages/pages/modelmanage/local/modelmanage-local-create-2.vue
+++ b/web_src/vuepages/pages/modelmanage/local/modelmanage-local-create-2.vue
@@ -194,6 +194,11 @@ export default {
       const filesSize = fileList.reduce((acc, item, index) => acc + item.size, 0) + (file ? file.size : 0);
       const filesCount = fileList.length + (file ? 1 : 0);
       const allfilesSize = filesSize + this.state.size;
+      if (file && filesCount > maxFileSize) {
+        this.dropzoneHandler.removeFile(file);
+        this.showUploadErrInfo(true, this.getDefaultErrTxt());
+        return false;
+      }
       if (filesCount > maxFileSize || allfilesSize > maxModelFilesSize) {
         this.showUploadErrInfo(true, this.getDefaultErrTxt());
         return false;

From 8d756d72c121f803b4793bfd73a7a00e4a94fe8b Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Mon, 14 Nov 2022 16:24:00 +0800
Subject: [PATCH 153/187] =?UTF-8?q?=E6=A8=A1=E5=9E=8B=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E4=B8=AD=EF=BC=8CNPU=E7=9A=84=E8=A7=84=E6=A0=BC=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E9=97=AE=E9=A2=98=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/repo/attachment.go | 26 +++++++++++++++++---------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/routers/repo/attachment.go b/routers/repo/attachment.go
index 5d678cd23..da950eb31 100755
--- a/routers/repo/attachment.go
+++ b/routers/repo/attachment.go
@@ -669,29 +669,37 @@ func GetSuccessChunks(ctx *context.Context) {
 		modelname := ""
 		if dbmodeluuid != modeluuid {
 			log.Info("The file has uploaded.fileChunk.ObjectName=" + fileChunk.ObjectName + " typeCloudBrain=" + fmt.Sprint(typeCloudBrain))
-			model, err := models.QueryModelById(dbmodeluuid)
-			if err == nil {
-				modelname = model.Name
+			srcObjectName := fileChunk.ObjectName
+			var isExist bool
+			if dbmodeluuid != "" {
+				model, err := models.QueryModelById(dbmodeluuid)
+				if err == nil && model != nil {
+					modelname = model.Name
+				}
 			}
 			//copy
-			srcObjectName := fileChunk.ObjectName
 			destObjectName := getObjectName(fileName, modeluuid)
-			var isExist bool
-			if typeCloudBrain == int(models.TypeCloudBrainOne) {
-				log.Info("minio copy..")
+			if typeCloudBrain == models.TypeCloudBrainOne {
 				bucketName := setting.Attachment.Minio.Bucket
+				log.Info("minio copy..srcObjectName=" + srcObjectName + " bucketName=" + bucketName)
 				if storage.MinioGetFilesSize(bucketName, []string{destObjectName}) > 0 {
 					isExist = true
 				} else {
+					if srcObjectName == "" {
+						srcObjectName = getMinioInitObjectName("", fileChunk.UUID, "", "")
+					}
 					storage.MinioCopyAFile(bucketName, srcObjectName, bucketName, destObjectName)
 				}
 			} else {
-				log.Info("obs copy..")
 				bucketName := setting.Bucket
+				log.Info("obs copy..srcObjectName=" + srcObjectName + " bucketName=" + bucketName)
 				if storage.ObsGetFilesSize(bucketName, []string{destObjectName}) > 0 {
 					isExist = true
 				} else {
-					log.Info("obs copy............")
+					if srcObjectName == "" {
+						srcObjectName = getOBSInitObjectName("", fileChunk.UUID, "", attach.Name)
+					}
+					log.Info("obs copy..srcObjectName=" + srcObjectName + " bucketName=" + bucketName)
 					storage.ObsCopyFile(bucketName, srcObjectName, bucketName, destObjectName)
 				}
 			}

From f7ee9745cd600db909f5485d6aed1b17a8257432 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Mon, 14 Nov 2022 17:17:47 +0800
Subject: [PATCH 154/187] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=EF=BC=8C=E8=A7=A3=E5=86=B3Bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/repo/attachment.go | 111 +++++++++++++++++++++++++++----------
 1 file changed, 83 insertions(+), 28 deletions(-)

diff --git a/routers/repo/attachment.go b/routers/repo/attachment.go
index da950eb31..3972a275d 100755
--- a/routers/repo/attachment.go
+++ b/routers/repo/attachment.go
@@ -546,6 +546,56 @@ func getCloudTwoOBSPrefix(scene string, fileChunk *models.FileChunk, fileName st
 	}
 }
 
+func specialDeal(modeluuid, uuid, fileName string, ctx *context.Context, fileChunk *models.FileChunk, typeCloudBrain int) {
+	copyModelFile(typeCloudBrain, fileChunk, fileName, fileName, modeluuid)
+	UpdateModelSize(modeluuid)
+	_, err := models.InsertAttachment(&models.Attachment{
+		UUID:        uuid,
+		UploaderID:  ctx.User.ID,
+		IsPrivate:   true,
+		Name:        fileName,
+		Size:        ctx.QueryInt64("size"),
+		DatasetID:   0,
+		Description: modeluuid,
+		Type:        typeCloudBrain,
+	})
+	if err != nil {
+		log.Info("add attachment error.")
+	}
+}
+
+func copyModelFile(typeCloudBrain int, fileChunk *models.FileChunk, name, fileName, modeluuid string) bool {
+	srcObjectName := fileChunk.ObjectName
+	var isExist bool
+	//copy
+	destObjectName := getObjectName(fileName, modeluuid)
+	if typeCloudBrain == models.TypeCloudBrainOne {
+		bucketName := setting.Attachment.Minio.Bucket
+		log.Info("minio copy..srcObjectName=" + srcObjectName + " bucketName=" + bucketName)
+		if storage.MinioGetFilesSize(bucketName, []string{destObjectName}) > 0 {
+			isExist = true
+		} else {
+			if srcObjectName == "" {
+				srcObjectName = getMinioInitObjectName("", fileChunk.UUID, "", "")
+			}
+			storage.MinioCopyAFile(bucketName, srcObjectName, bucketName, destObjectName)
+		}
+	} else {
+		bucketName := setting.Bucket
+		log.Info("obs copy..srcObjectName=" + srcObjectName + " bucketName=" + bucketName)
+		if storage.ObsGetFilesSize(bucketName, []string{destObjectName}) > 0 {
+			isExist = true
+		} else {
+			if srcObjectName == "" {
+				srcObjectName = getOBSInitObjectName("", fileChunk.UUID, "", name)
+			}
+			log.Info("obs copy..srcObjectName=" + srcObjectName + " bucketName=" + bucketName)
+			storage.ObsCopyFile(bucketName, srcObjectName, bucketName, destObjectName)
+		}
+	}
+	return isExist
+}
+
 func GetSuccessChunks(ctx *context.Context) {
 	fileMD5 := ctx.Query("md5")
 	typeCloudBrain := ctx.QueryInt("type")
@@ -651,6 +701,10 @@ func GetSuccessChunks(ctx *context.Context) {
 	}
 
 	if attach == nil {
+		if fileChunk.IsUploaded == 1 && scene == Attachment_model {
+			log.Info("model upload special deal.")
+			specialDeal(modeluuid, fileChunk.UUID, fileName, ctx, fileChunk, typeCloudBrain)
+		}
 		ctx.JSON(200, map[string]string{
 			"uuid":        fileChunk.UUID,
 			"uploaded":    strconv.Itoa(fileChunk.IsUploaded),
@@ -669,40 +723,41 @@ func GetSuccessChunks(ctx *context.Context) {
 		modelname := ""
 		if dbmodeluuid != modeluuid {
 			log.Info("The file has uploaded.fileChunk.ObjectName=" + fileChunk.ObjectName + " typeCloudBrain=" + fmt.Sprint(typeCloudBrain))
-			srcObjectName := fileChunk.ObjectName
-			var isExist bool
+			isExist := copyModelFile(typeCloudBrain, fileChunk, attach.Name, fileName, modeluuid)
+			// srcObjectName := fileChunk.ObjectName
+			// var isExist bool
+			// //copy
+			// destObjectName := getObjectName(fileName, modeluuid)
+			// if typeCloudBrain == models.TypeCloudBrainOne {
+			// 	bucketName := setting.Attachment.Minio.Bucket
+			// 	log.Info("minio copy..srcObjectName=" + srcObjectName + " bucketName=" + bucketName)
+			// 	if storage.MinioGetFilesSize(bucketName, []string{destObjectName}) > 0 {
+			// 		isExist = true
+			// 	} else {
+			// 		if srcObjectName == "" {
+			// 			srcObjectName = getMinioInitObjectName("", fileChunk.UUID, "", "")
+			// 		}
+			// 		storage.MinioCopyAFile(bucketName, srcObjectName, bucketName, destObjectName)
+			// 	}
+			// } else {
+			// 	bucketName := setting.Bucket
+			// 	log.Info("obs copy..srcObjectName=" + srcObjectName + " bucketName=" + bucketName)
+			// 	if storage.ObsGetFilesSize(bucketName, []string{destObjectName}) > 0 {
+			// 		isExist = true
+			// 	} else {
+			// 		if srcObjectName == "" {
+			// 			srcObjectName = getOBSInitObjectName("", fileChunk.UUID, "", attach.Name)
+			// 		}
+			// 		log.Info("obs copy..srcObjectName=" + srcObjectName + " bucketName=" + bucketName)
+			// 		storage.ObsCopyFile(bucketName, srcObjectName, bucketName, destObjectName)
+			// 	}
+			// }
 			if dbmodeluuid != "" {
 				model, err := models.QueryModelById(dbmodeluuid)
 				if err == nil && model != nil {
 					modelname = model.Name
 				}
 			}
-			//copy
-			destObjectName := getObjectName(fileName, modeluuid)
-			if typeCloudBrain == models.TypeCloudBrainOne {
-				bucketName := setting.Attachment.Minio.Bucket
-				log.Info("minio copy..srcObjectName=" + srcObjectName + " bucketName=" + bucketName)
-				if storage.MinioGetFilesSize(bucketName, []string{destObjectName}) > 0 {
-					isExist = true
-				} else {
-					if srcObjectName == "" {
-						srcObjectName = getMinioInitObjectName("", fileChunk.UUID, "", "")
-					}
-					storage.MinioCopyAFile(bucketName, srcObjectName, bucketName, destObjectName)
-				}
-			} else {
-				bucketName := setting.Bucket
-				log.Info("obs copy..srcObjectName=" + srcObjectName + " bucketName=" + bucketName)
-				if storage.ObsGetFilesSize(bucketName, []string{destObjectName}) > 0 {
-					isExist = true
-				} else {
-					if srcObjectName == "" {
-						srcObjectName = getOBSInitObjectName("", fileChunk.UUID, "", attach.Name)
-					}
-					log.Info("obs copy..srcObjectName=" + srcObjectName + " bucketName=" + bucketName)
-					storage.ObsCopyFile(bucketName, srcObjectName, bucketName, destObjectName)
-				}
-			}
 			if isExist {
 				ctx.JSON(200, map[string]string{
 					"uuid":      fileChunk.UUID,

From 74daa3095dac559037cd2f1a5c5d61683765b3ec Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Mon, 14 Nov 2022 17:22:49 +0800
Subject: [PATCH 155/187] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=EF=BC=8C=E8=A7=A3=E5=86=B3Bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/repo/attachment.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/routers/repo/attachment.go b/routers/repo/attachment.go
index 3972a275d..03f9f842e 100755
--- a/routers/repo/attachment.go
+++ b/routers/repo/attachment.go
@@ -578,6 +578,7 @@ func copyModelFile(typeCloudBrain int, fileChunk *models.FileChunk, name, fileNa
 			if srcObjectName == "" {
 				srcObjectName = getMinioInitObjectName("", fileChunk.UUID, "", "")
 			}
+			log.Info("minio copy..srcObjectName=" + srcObjectName + " bucketName=" + bucketName)
 			storage.MinioCopyAFile(bucketName, srcObjectName, bucketName, destObjectName)
 		}
 	} else {

From 0bbf7ae106f59788660b2e5ffa46f9b8923b5799 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Mon, 14 Nov 2022 17:26:04 +0800
Subject: [PATCH 156/187] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=EF=BC=8C=E8=A7=A3=E5=86=B3Bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/repo/attachment.go | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/routers/repo/attachment.go b/routers/repo/attachment.go
index 03f9f842e..c580cc7c4 100755
--- a/routers/repo/attachment.go
+++ b/routers/repo/attachment.go
@@ -630,6 +630,11 @@ func GetSuccessChunks(ctx *context.Context) {
 	isExist := false
 	if typeCloudBrain == models.TypeCloudBrainOne {
 		isExist, err = storage.Attachments.HasObject(getCloudOneMinioPrefix(scene, fileChunk))
+		if isExist {
+			log.Info("The file is exist in minio. has uploaded.")
+		} else {
+			log.Info("The file is not exist in minio..")
+		}
 		if err != nil {
 			ctx.ServerError("HasObject failed", err)
 			return
@@ -641,6 +646,11 @@ func GetSuccessChunks(ctx *context.Context) {
 			oldFileName = oldAttachment.Name
 		}
 		isExist, err = storage.ObsHasObject(getCloudTwoOBSPrefix(scene, fileChunk, oldFileName))
+		if isExist {
+			log.Info("The file is exist in obs. has uploaded.")
+		} else {
+			log.Info("The file is not exist in obs.")
+		}
 		if err != nil {
 			ctx.ServerError("ObsHasObject failed", err)
 			return

From 8848039b9d1d9e8576e8c2c7e8dc9aeb58cef799 Mon Sep 17 00:00:00 2001
From: chenshihai <chenshh@pcl.ac.cn>
Date: Mon, 14 Nov 2022 17:30:08 +0800
Subject: [PATCH 157/187] fix-bugs

---
 web_src/vuepages/langs/config/zh-CN.js                      | 2 +-
 .../pages/modelmanage/local/modelmanage-local-create-2.vue  | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/web_src/vuepages/langs/config/zh-CN.js b/web_src/vuepages/langs/config/zh-CN.js
index 4698c67e0..88c953faf 100644
--- a/web_src/vuepages/langs/config/zh-CN.js
+++ b/web_src/vuepages/langs/config/zh-CN.js
@@ -221,7 +221,7 @@ const zh = {
     uploadStatus: '上传状态',
     modelFileUploadDefaultTips: '点击添加文件或直接拖拽文件到此处',
     modelFileUploadErrTips: '单次最多上传10个文件，模型总文件大小不超过{size}G',
-    modelFileNameTips: '文件名长度不超过128字符',
+    modelFileNameTips: '文件名长度不超过128个字符',
     fileIstoBig: '文件太大',
     removeFile: '移除文件',
     uploadSuccess: '上传成功',
diff --git a/web_src/vuepages/pages/modelmanage/local/modelmanage-local-create-2.vue b/web_src/vuepages/pages/modelmanage/local/modelmanage-local-create-2.vue
index e154152b3..1e034fa2b 100644
--- a/web_src/vuepages/pages/modelmanage/local/modelmanage-local-create-2.vue
+++ b/web_src/vuepages/pages/modelmanage/local/modelmanage-local-create-2.vue
@@ -189,10 +189,10 @@ export default {
         this.showUploadErr = false;
       }
     },
-    checkFiles(file) {
+    checkFiles(file, countStay) {
       const fileList = this.dropzoneHandler.getAcceptedFiles();
       const filesSize = fileList.reduce((acc, item, index) => acc + item.size, 0) + (file ? file.size : 0);
-      const filesCount = fileList.length + (file ? 1 : 0);
+      const filesCount = fileList.length + (file && !countStay ? 1 : 0);
       const allfilesSize = filesSize + this.state.size;
       if (file && filesCount > maxFileSize) {
         this.dropzoneHandler.removeFile(file);
@@ -494,7 +494,7 @@ export default {
       const fileList = this.dropzoneHandler.getAcceptedFiles();
       if (!fileList.length) return;
       for (let i = 0, iLen = fileList.length; i < iLen; i++) {
-        if (!this.checkFiles(fileList[i])) return;
+        if (!this.checkFiles(fileList[i], true)) return;
       }
       this.resetFileStatus();
       this.uploadFiles = fileList;

From 15b6e7ee3af6f540774f3f601c647766a03910a6 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Mon, 14 Nov 2022 17:37:23 +0800
Subject: [PATCH 158/187] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=EF=BC=8C=E8=A7=A3=E5=86=B3Bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/repo/attachment.go | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/routers/repo/attachment.go b/routers/repo/attachment.go
index c580cc7c4..d5953c2d3 100755
--- a/routers/repo/attachment.go
+++ b/routers/repo/attachment.go
@@ -629,9 +629,10 @@ func GetSuccessChunks(ctx *context.Context) {
 
 	isExist := false
 	if typeCloudBrain == models.TypeCloudBrainOne {
+
 		isExist, err = storage.Attachments.HasObject(getCloudOneMinioPrefix(scene, fileChunk))
 		if isExist {
-			log.Info("The file is exist in minio. has uploaded.")
+			log.Info("The file is exist in minio. has uploaded.path=" + getCloudOneMinioPrefix(scene, fileChunk))
 		} else {
 			log.Info("The file is not exist in minio..")
 		}

From 0c933bbb5f82ae64f43285d41f7a60cdd36a9aff Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Mon, 14 Nov 2022 17:47:30 +0800
Subject: [PATCH 159/187] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=EF=BC=8C=E8=A7=A3=E5=86=B3Bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/repo/attachment.go | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/routers/repo/attachment.go b/routers/repo/attachment.go
index d5953c2d3..1cdcc7905 100755
--- a/routers/repo/attachment.go
+++ b/routers/repo/attachment.go
@@ -532,18 +532,20 @@ func UpdateAttachmentDecompressState(ctx *context.Context) {
 
 func getCloudOneMinioPrefix(scene string, fileChunk *models.FileChunk) string {
 	if scene == Attachment_model {
-		return fileChunk.ObjectName
-	} else {
-		return setting.Attachment.Minio.BasePath + models.AttachmentRelativePath(fileChunk.UUID)
+		if fileChunk.ObjectName != "" {
+			return fileChunk.ObjectName
+		}
 	}
+	return setting.Attachment.Minio.BasePath + models.AttachmentRelativePath(fileChunk.UUID)
 }
 
 func getCloudTwoOBSPrefix(scene string, fileChunk *models.FileChunk, fileName string) string {
 	if scene == Attachment_model {
-		return fileChunk.ObjectName
-	} else {
-		return setting.BasePath + models.AttachmentRelativePath(fileChunk.UUID) + "/" + fileName
+		if fileChunk.ObjectName != "" {
+			return fileChunk.ObjectName
+		}
 	}
+	return setting.BasePath + models.AttachmentRelativePath(fileChunk.UUID) + "/" + fileName
 }
 
 func specialDeal(modeluuid, uuid, fileName string, ctx *context.Context, fileChunk *models.FileChunk, typeCloudBrain int) {
@@ -629,7 +631,6 @@ func GetSuccessChunks(ctx *context.Context) {
 
 	isExist := false
 	if typeCloudBrain == models.TypeCloudBrainOne {
-
 		isExist, err = storage.Attachments.HasObject(getCloudOneMinioPrefix(scene, fileChunk))
 		if isExist {
 			log.Info("The file is exist in minio. has uploaded.path=" + getCloudOneMinioPrefix(scene, fileChunk))

From c8a826a75eb9b55e63e489ca5f1489e55c29144f Mon Sep 17 00:00:00 2001
From: chenshihai <chenshh@pcl.ac.cn>
Date: Mon, 14 Nov 2022 18:12:22 +0800
Subject: [PATCH 160/187] update

---
 .../common/modelmanage-common-detail.vue            | 13 ++++++++-----
 web_src/vuepages/utils/index.js                     |  2 +-
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/web_src/vuepages/pages/modelmanage/common/modelmanage-common-detail.vue b/web_src/vuepages/pages/modelmanage/common/modelmanage-common-detail.vue
index 81d3d940e..d3cb3d866 100644
--- a/web_src/vuepages/pages/modelmanage/common/modelmanage-common-detail.vue
+++ b/web_src/vuepages/pages/modelmanage/common/modelmanage-common-detail.vue
@@ -165,8 +165,9 @@
         </div>
         <div class="table-container">
           <el-table :data="filesList" row-key="sn" style="width: 100%" v-loading="loading" stripe>
-            <el-table-column column-key="FileName" prop="FileName" :label="$t('modelManage.fileName')" align="left"
-              header-align="left">
+            <el-table-column column-key="FileName" prop="FileName" sortable
+              :sort-method="(a, b) => a.FileName.toLocaleLowerCase().localeCompare(b.FileName.toLocaleLowerCase())"
+              :label="$t('modelManage.fileName')" align="left" header-align="left">
               <template slot-scope="scope">
                 <div class="tbl-file-name">
                   <a v-if="scope.row.IsDir" @click="goNextDir(scope.row)" href="javascript:;">
@@ -185,10 +186,11 @@
                 </div>
               </template>
             </el-table-column>
-            <el-table-column column-key="SizeShow" prop="SizeShow" :label="$t('modelManage.fileSize')" align="center"
-              header-align="center" width="200">
+            <el-table-column column-key="SizeShow" prop="SizeShow" sortable :sort-method="(a, b) => a.Size - b.Size"
+              :label="$t('modelManage.fileSize')" align="center" header-align="center" width="200">
             </el-table-column>
-            <el-table-column column-key="ModTime" prop="ModTime" :label="$t('modelManage.updateTime')" align="center"
+            <el-table-column column-key="ModTime" prop="ModTime" sortable
+              :sort-method="(a, b) => a.ModTimeNum - b.ModTimeNum" :label="$t('modelManage.updateTime')" align="center"
               header-align="center" width="200">
             </el-table-column>
             <el-table-column v-if="modelType == 1 && canDelete" column-key="operate" prop="operate"
@@ -255,6 +257,7 @@ export default {
         const list = res.data || [];
         list.forEach(item => {
           item.SizeShow = item.IsDir ? '' : transFileSize(item.Size);
+          item.ModTimeNum = new Date(item.ModTime).getTime();
         })
         this.filesList = list;
       }).catch(err => {
diff --git a/web_src/vuepages/utils/index.js b/web_src/vuepages/utils/index.js
index 3962bb76f..e3e23f7d3 100644
--- a/web_src/vuepages/utils/index.js
+++ b/web_src/vuepages/utils/index.js
@@ -23,5 +23,5 @@ export const transFileSize = (srcSize) => {
   srcSize = parseFloat(srcSize);
   const index = Math.floor(Math.log(srcSize) / Math.log(1024));
   const size = (srcSize / Math.pow(1024, index)).toFixed(2);
-  return size + unitArr[index];
+  return size + ' ' +  unitArr[index];
 };

From 92454db1086ebc7ff8838e022a1e8a6d3e068ae2 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Mon, 14 Nov 2022 18:57:45 +0800
Subject: [PATCH 161/187] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=EF=BC=8C=E8=A7=A3=E5=86=B3Bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/repo/attachment.go | 40 +++++++++-----------------------------
 1 file changed, 9 insertions(+), 31 deletions(-)

diff --git a/routers/repo/attachment.go b/routers/repo/attachment.go
index 1cdcc7905..7b7840fd8 100755
--- a/routers/repo/attachment.go
+++ b/routers/repo/attachment.go
@@ -649,7 +649,7 @@ func GetSuccessChunks(ctx *context.Context) {
 		}
 		isExist, err = storage.ObsHasObject(getCloudTwoOBSPrefix(scene, fileChunk, oldFileName))
 		if isExist {
-			log.Info("The file is exist in obs. has uploaded.")
+			log.Info("The file is exist in obs. has uploaded. path=" + getCloudTwoOBSPrefix(scene, fileChunk, oldFileName))
 		} else {
 			log.Info("The file is not exist in obs.")
 		}
@@ -668,36 +668,14 @@ func GetSuccessChunks(ctx *context.Context) {
 			}
 		}
 	} else {
-		if fileChunk.IsUploaded == models.FileUploaded {
-			log.Info("the file has been recorded but not uploaded")
-			fileChunk.IsUploaded = models.FileNotUploaded
-			if err = models.UpdateFileChunk(fileChunk); err != nil {
-				log.Error("UpdateFileChunk failed:", err.Error())
-			}
-		}
-
-		if typeCloudBrain == models.TypeCloudBrainOne {
-			chunks, err = storage.GetPartInfos(getChunkMinioExistObjectName(scene, fileChunk, fileName), fileChunk.UploadID)
-			if err != nil {
-				log.Error("GetPartInfos failed:%v", err.Error())
-			}
-		} else {
-			chunks, err = storage.GetObsPartInfos(getChunkOBSExistObjectName(scene, fileChunk, fileName), fileChunk.UploadID)
-			if err != nil {
-				log.Error("GetObsPartInfos failed:%v", err.Error())
-			}
-		}
-
-		if err != nil {
-			models.DeleteFileChunk(fileChunk)
-			ctx.JSON(200, map[string]string{
-				"uuid":     "",
-				"uploaded": "0",
-				"uploadID": "",
-				"chunks":   "",
-			})
-			return
-		}
+		models.DeleteFileChunk(fileChunk)
+		ctx.JSON(200, map[string]string{
+			"uuid":     "",
+			"uploaded": "0",
+			"uploadID": "",
+			"chunks":   "",
+		})
+		return
 	}
 
 	var attachID int64

From 5afa2e22afc011451c99c160922714ce621cac24 Mon Sep 17 00:00:00 2001
From: chenshihai <chenshh@pcl.ac.cn>
Date: Tue, 15 Nov 2022 09:21:20 +0800
Subject: [PATCH 162/187] fix-bugs

---
 .../common/modelmanage-common-detail.vue      |  6 +-
 .../local/modelmanage-local-create-1.vue      | 55 +++++++++++++++----
 2 files changed, 47 insertions(+), 14 deletions(-)

diff --git a/web_src/vuepages/pages/modelmanage/common/modelmanage-common-detail.vue b/web_src/vuepages/pages/modelmanage/common/modelmanage-common-detail.vue
index d3cb3d866..badd5a057 100644
--- a/web_src/vuepages/pages/modelmanage/common/modelmanage-common-detail.vue
+++ b/web_src/vuepages/pages/modelmanage/common/modelmanage-common-detail.vue
@@ -164,7 +164,7 @@
           </div>
         </div>
         <div class="table-container">
-          <el-table :data="filesList" row-key="sn" style="width: 100%" v-loading="loading" stripe>
+          <el-table ref="tableRef" :data="filesList" row-key="sn" style="width: 100%" v-loading="loading" stripe>
             <el-table-column column-key="FileName" prop="FileName" sortable
               :sort-method="(a, b) => a.FileName.toLocaleLowerCase().localeCompare(b.FileName.toLocaleLowerCase())"
               :label="$t('modelManage.fileName')" align="left" header-align="left">
@@ -259,10 +259,12 @@ export default {
           item.SizeShow = item.IsDir ? '' : transFileSize(item.Size);
           item.ModTimeNum = new Date(item.ModTime).getTime();
         })
+        list.sort((a, b) => b.ModTimeNum - a.ModTimeNum);
         this.filesList = list;
+        this.$refs['tableRef']?.clearSort();
       }).catch(err => {
         console.log(err);
-      })
+      });
     },
     goNextDir(item) {
       this.filePath.push({
diff --git a/web_src/vuepages/pages/modelmanage/local/modelmanage-local-create-1.vue b/web_src/vuepages/pages/modelmanage/local/modelmanage-local-create-1.vue
index 0a106531c..815b5368d 100644
--- a/web_src/vuepages/pages/modelmanage/local/modelmanage-local-create-1.vue
+++ b/web_src/vuepages/pages/modelmanage/local/modelmanage-local-create-1.vue
@@ -23,7 +23,7 @@
             <div class="cluster-type-btn" v-if="type != 1 || type == 1 && state.type === 0"
               :class="state.type === 0 ? 'focused' : ''"
               :style="type != 1 ? 'border-top-right-radius:unset;border-bottom-right-radius:unset;' : ''"
-              @click="state.type = 0;state.engine='0'">
+              @click="state.type = 0; state.engine = '0'">
               <svg xmlns="http://www.w3.org/2000/svg"
                 class="icon styles__StyledSVGIconPathComponent-sc-16fsqc8-0 cSaWDI svg-icon-path-icon fill"
                 viewBox="0 0 32 32" width="16" height="16">
@@ -39,7 +39,7 @@
             <div class="cluster-type-btn" v-if="type != 1 || type == 1 && state.type === 1"
               :class="state.type === 1 ? 'focused' : ''"
               :style="type != 1 ? 'border-top-left-radius:unset;border-bottom-left-radius:unset;' : ''"
-              @click="state.type = 1;state.engine='2'">
+              @click="state.type = 1; state.engine = '2'">
               <svg xmlns="http://www.w3.org/2000/svg"
                 class="icon styles__StyledSVGIconPathComponent-sc-16fsqc8-0 iKfgJk svg-icon-path-icon fill"
                 viewBox="0 0 32 32" width="16" height="16">
@@ -54,10 +54,11 @@
             </div>
           </div>
         </div>
-        <div class="row">
+        <div class="row" :class="nameErr ? 'error' : ''">
           <div class="r-title"><label class="required">{{ $t('modelManage.modelName') }}</label></div>
           <div class="r-content">
-            <el-input size="medium" :maxLength="25" v-model="state.name" :placeholder="$t('modelManage.pleaseInputModelName')">
+            <el-input size="medium" :maxLength="25" v-model="state.name" @blur="checkName"
+              :placeholder="$t('modelManage.pleaseInputModelName')">
             </el-input>
           </div>
         </div>
@@ -80,8 +81,8 @@
         <div class="row">
           <div class="r-title"><label>{{ $t('modelManage.modelLabel') }}</label></div>
           <div class="r-content">
-            <el-input size="medium" :maxLength="255" v-model="state.label" :placeholder="$t('modelManage.modelLabelInputTips')"
-              @input="labelInput"></el-input>
+            <el-input size="medium" :maxLength="255" v-model="state.label"
+              :placeholder="$t('modelManage.modelLabelInputTips')" @input="labelInput"></el-input>
           </div>
         </div>
         <div class="row" style="align-items:flex-start;">
@@ -95,7 +96,9 @@
         <div class="row" style="margin-top:20px">
           <div class="r-title"><label></label></div>
           <div class="r-content">
-            <el-button size="medium" class="green" @click="submit">{{ type == '1' ? $t('modelManage.confirm') : $t('modelManage.createModel') }}
+            <el-button size="medium" class="green" @click="submit">{{ type == '1' ? $t('modelManage.confirm') :
+                $t('modelManage.createModel')
+            }}
             </el-button>
             <el-button size="medium" @click="cancel">{{ $t('modelManage.cancel') }}</el-button>
           </div>
@@ -127,23 +130,28 @@ export default {
         label: '',
         description: '',
       },
+      nameErr: false,
       isShowVersion: false,
       engineList: MODEL_ENGINES,
     };
   },
   components: {},
   methods: {
+    checkName() {
+      this.nameErr = !this.state.name;
+      return !this.nameErr;
+    },
     labelInput() {
       const hasEndSpace = this.state.label[this.state.label.length - 1] == ' ';
       const list = this.state.label.trim().split(' ').filter(label => label != '');
       this.state.label = list.slice(0, MAX_LABEL_COUNT).join(' ') + (hasEndSpace && list.length < MAX_LABEL_COUNT ? ' ' : '');
     },
     submit() {
-      if (!this.state.name) {
-        this.$message({
-          type: 'info',
-          message: this.$t('modelManage.pleaseInputModelName'),
-        });
+      if (!this.checkName()) {
+        // this.$message({
+        //   type: 'info',
+        //   message: this.$t('modelManage.pleaseInputModelName'),
+        // });       
         return;
       }
       const submintApi = this.type == '1' ? modifyModel : saveLocalModel;
@@ -161,6 +169,11 @@ export default {
           list.pop();
           list.push('create_local_model_2');
           window.location.href = list.join('/') + '?type=0&name=' + this.state.name + '&id=' + res.id;
+        } if (res && res.code == '-1') {
+          this.$message({
+            type: 'error',
+            message: res.msg,
+          });
         } else {
           this.$message({
             type: 'error',
@@ -325,6 +338,24 @@ export default {
         }
       }
 
+      &.error {
+        .r-title {
+          color: #9f3a38;
+        }
+
+        .r-content {
+          /deep/.el-input__inner {
+            color: #9f3a38;
+            background: #fff6f6;
+            border-color: #e0b4b4;
+
+            &::placeholder {
+              color: #e0b4b4;
+            }
+          }
+        }
+      }
+
       .r-content {
         flex: 1;
 

From f997dba77e837b5d0c73f5462fd8bcabed65996f Mon Sep 17 00:00:00 2001
From: chenshihai <chenshh@pcl.ac.cn>
Date: Tue, 15 Nov 2022 09:31:49 +0800
Subject: [PATCH 163/187] update

---
 web_src/vuepages/apis/modules/modelmanage.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/web_src/vuepages/apis/modules/modelmanage.js b/web_src/vuepages/apis/modules/modelmanage.js
index 62c782405..7124dcfc9 100644
--- a/web_src/vuepages/apis/modules/modelmanage.js
+++ b/web_src/vuepages/apis/modules/modelmanage.js
@@ -62,7 +62,7 @@ export const deleteModelFile = (params) => {
 // return: uploadID, uuid, uploaded, chunks, attachID, modeluuid, modelName, fileName
 export const getChunks = (params) => {
   return service({
-    url: `/attachments/get_chunks`,
+    url: `/attachments/model/get_chunks`,
     method: 'get',
     params,
     data: {},
@@ -74,7 +74,7 @@ export const getChunks = (params) => {
 // return: uploadID, uuid
 export const getNewMultipart = (params) => {
   return service({
-    url: `/attachments/new_multipart`,
+    url: `/attachments/model/new_multipart`,
     method: 'get',
     params,
     data: {},
@@ -86,7 +86,7 @@ export const getNewMultipart = (params) => {
 // return: url
 export const getMultipartUrl = (params) => {
   return service({
-    url: `/attachments/get_multipart_url`,
+    url: `/attachments/model/get_multipart_url`,
     method: 'get',
     params,
     data: {},
@@ -97,7 +97,7 @@ export const getMultipartUrl = (params) => {
 // data: { uuid, uploadID, size, type, file_name, dataset_id, description, scene=model, modeluuid=xxxx }
 export const setCompleteMultipart = (data) => {
   return service({
-    url: `/attachments/complete_multipart`,
+    url: `/attachments/model/complete_multipart`,
     method: 'post',
     headers: { 'Content-type': 'application/x-www-form-urlencoded' },
     params: {},

From ea6fe35df867533170405e8f7a799b0d0a8a9691 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Tue, 15 Nov 2022 09:31:56 +0800
Subject: [PATCH 164/187] =?UTF-8?q?=E6=A8=A1=E5=9E=8B=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E9=99=84=E4=BB=B6=E6=96=B0=E6=8E=A5=E5=8F=A3=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 models/file_chunk.go             |  73 ++++++
 models/models.go                 |   1 +
 routers/repo/attachment.go       | 435 ++++++++-----------------------
 routers/repo/attachment_model.go | 423 ++++++++++++++++++++++++++++++
 routers/routes/routes.go         |   7 +
 5 files changed, 609 insertions(+), 330 deletions(-)
 create mode 100644 routers/repo/attachment_model.go

diff --git a/models/file_chunk.go b/models/file_chunk.go
index 3d83d87e1..339b5d7a4 100755
--- a/models/file_chunk.go
+++ b/models/file_chunk.go
@@ -14,6 +14,21 @@ const (
 )
 
 type FileChunk struct {
+	ID             int64  `xorm:"pk autoincr"`
+	UUID           string `xorm:"uuid UNIQUE"`
+	Md5            string `xorm:"INDEX"`
+	IsUploaded     int    `xorm:"DEFAULT 0"` // not uploaded: 0, uploaded: 1
+	UploadID       string `xorm:"UNIQUE"`    //minio upload id
+	TotalChunks    int
+	Size           int64
+	UserID         int64              `xorm:"INDEX"`
+	Type           int                `xorm:"INDEX DEFAULT 0"`
+	CompletedParts []string           `xorm:"DEFAULT ''"` // chunkNumber+etag eg: ,1-asqwewqe21312312.2-123hjkas
+	CreatedUnix    timeutil.TimeStamp `xorm:"INDEX created"`
+	UpdatedUnix    timeutil.TimeStamp `xorm:"INDEX updated"`
+}
+
+type ModelFileChunk struct {
 	ID             int64  `xorm:"pk autoincr"`
 	UUID           string `xorm:"uuid UNIQUE"`
 	Md5            string `xorm:"INDEX"`
@@ -50,6 +65,21 @@ func GetFileChunkByMD5AndUser(md5 string, userID int64, typeCloudBrain int) (*Fi
 	return getFileChunkByMD5AndUser(x, md5, userID, typeCloudBrain)
 }
 
+func GetModelFileChunkByMD5AndUser(md5 string, userID int64, typeCloudBrain int) (*ModelFileChunk, error) {
+	return getModelFileChunkByMD5AndUser(x, md5, userID, typeCloudBrain)
+}
+
+func getModelFileChunkByMD5AndUser(e Engine, md5 string, userID int64, typeCloudBrain int) (*ModelFileChunk, error) {
+	fileChunk := new(ModelFileChunk)
+
+	if has, err := e.Where("md5 = ? and user_id = ? and type = ?", md5, userID, typeCloudBrain).Get(fileChunk); err != nil {
+		return nil, err
+	} else if !has {
+		return nil, ErrFileChunkNotExist{md5, ""}
+	}
+	return fileChunk, nil
+}
+
 func getFileChunkByMD5AndUser(e Engine, md5 string, userID int64, typeCloudBrain int) (*FileChunk, error) {
 	fileChunk := new(FileChunk)
 
@@ -77,6 +107,21 @@ func getFileChunkByUUID(e Engine, uuid string) (*FileChunk, error) {
 	return fileChunk, nil
 }
 
+func GetModelFileChunkByUUID(uuid string) (*ModelFileChunk, error) {
+	return getModelFileChunkByUUID(x, uuid)
+}
+
+func getModelFileChunkByUUID(e Engine, uuid string) (*ModelFileChunk, error) {
+	fileChunk := new(ModelFileChunk)
+
+	if has, err := e.Where("uuid = ?", uuid).Get(fileChunk); err != nil {
+		return nil, err
+	} else if !has {
+		return nil, ErrFileChunkNotExist{"", uuid}
+	}
+	return fileChunk, nil
+}
+
 // InsertFileChunk insert a record into file_chunk.
 func InsertFileChunk(fileChunk *FileChunk) (_ *FileChunk, err error) {
 	if _, err := x.Insert(fileChunk); err != nil {
@@ -86,6 +131,14 @@ func InsertFileChunk(fileChunk *FileChunk) (_ *FileChunk, err error) {
 	return fileChunk, nil
 }
 
+// InsertFileChunk insert a record into file_chunk.
+func InsertModelFileChunk(fileChunk *ModelFileChunk) (_ *ModelFileChunk, err error) {
+	if _, err := x.Insert(fileChunk); err != nil {
+		return nil, err
+	}
+	return fileChunk, nil
+}
+
 func DeleteFileChunkById(uuid string) (*FileChunk, error) {
 	return deleteFileChunkById(x, uuid)
 }
@@ -107,6 +160,17 @@ func deleteFileChunkById(e Engine, uuid string) (*FileChunk, error) {
 	}
 }
 
+func UpdateModelFileChunk(fileChunk *ModelFileChunk) error {
+	return updateModelFileChunk(x, fileChunk)
+}
+
+func updateModelFileChunk(e Engine, fileChunk *ModelFileChunk) error {
+	var sess *xorm.Session
+	sess = e.Where("uuid = ?", fileChunk.UUID)
+	_, err := sess.Cols("is_uploaded").Update(fileChunk)
+	return err
+}
+
 // UpdateFileChunk updates the given file_chunk in database
 func UpdateFileChunk(fileChunk *FileChunk) error {
 	return updateFileChunk(x, fileChunk)
@@ -128,3 +192,12 @@ func deleteFileChunk(e Engine, fileChunk *FileChunk) error {
 	_, err := e.ID(fileChunk.ID).Delete(fileChunk)
 	return err
 }
+
+func DeleteModelFileChunk(fileChunk *ModelFileChunk) error {
+	return deleteModelFileChunk(x, fileChunk)
+}
+
+func deleteModelFileChunk(e Engine, fileChunk *ModelFileChunk) error {
+	_, err := e.ID(fileChunk.ID).Delete(fileChunk)
+	return err
+}
diff --git a/models/models.go b/models/models.go
index 7002f089b..6427c576c 100755
--- a/models/models.go
+++ b/models/models.go
@@ -136,6 +136,7 @@ func init() {
 		new(ImageTopic),
 		new(ImageTopicRelation),
 		new(FileChunk),
+		new(ModelFileChunk),
 		new(BlockChain),
 		new(RecommendOrg),
 		new(AiModelManage),
diff --git a/routers/repo/attachment.go b/routers/repo/attachment.go
index 7b7840fd8..f7ddf2b1a 100755
--- a/routers/repo/attachment.go
+++ b/routers/repo/attachment.go
@@ -312,8 +312,7 @@ func GetAttachment(ctx *context.Context) {
 				url = setting.PROXYURL + "/obs_proxy_download?uuid=" + attach.UUID + "&file_name=" + attach.Name
 				log.Info("return url=" + url)
 			} else {
-				objectName := strings.TrimPrefix(path.Join(setting.BasePath, path.Join(attach.UUID[0:1], attach.UUID[1:2], attach.UUID, attach.Name)), "/")
-				url, err = storage.ObsGetPreSignedUrl(objectName, attach.Name)
+				url, err = storage.ObsGetPreSignedUrl(attach.UUID, attach.Name)
 				if err != nil {
 					ctx.ServerError("ObsGetPreSignedUrl", err)
 					return
@@ -417,7 +416,7 @@ func AddAttachment(ctx *context.Context) {
 	uuid := ctx.Query("uuid")
 	has := false
 	if typeCloudBrain == models.TypeCloudBrainOne {
-		has, err = storage.Attachments.HasObject(setting.Attachment.Minio.BasePath + models.AttachmentRelativePath(uuid))
+		has, err = storage.Attachments.HasObject(models.AttachmentRelativePath(uuid))
 		if err != nil {
 			ctx.ServerError("HasObject", err)
 			return
@@ -530,82 +529,10 @@ func UpdateAttachmentDecompressState(ctx *context.Context) {
 	})
 }
 
-func getCloudOneMinioPrefix(scene string, fileChunk *models.FileChunk) string {
-	if scene == Attachment_model {
-		if fileChunk.ObjectName != "" {
-			return fileChunk.ObjectName
-		}
-	}
-	return setting.Attachment.Minio.BasePath + models.AttachmentRelativePath(fileChunk.UUID)
-}
-
-func getCloudTwoOBSPrefix(scene string, fileChunk *models.FileChunk, fileName string) string {
-	if scene == Attachment_model {
-		if fileChunk.ObjectName != "" {
-			return fileChunk.ObjectName
-		}
-	}
-	return setting.BasePath + models.AttachmentRelativePath(fileChunk.UUID) + "/" + fileName
-}
-
-func specialDeal(modeluuid, uuid, fileName string, ctx *context.Context, fileChunk *models.FileChunk, typeCloudBrain int) {
-	copyModelFile(typeCloudBrain, fileChunk, fileName, fileName, modeluuid)
-	UpdateModelSize(modeluuid)
-	_, err := models.InsertAttachment(&models.Attachment{
-		UUID:        uuid,
-		UploaderID:  ctx.User.ID,
-		IsPrivate:   true,
-		Name:        fileName,
-		Size:        ctx.QueryInt64("size"),
-		DatasetID:   0,
-		Description: modeluuid,
-		Type:        typeCloudBrain,
-	})
-	if err != nil {
-		log.Info("add attachment error.")
-	}
-}
-
-func copyModelFile(typeCloudBrain int, fileChunk *models.FileChunk, name, fileName, modeluuid string) bool {
-	srcObjectName := fileChunk.ObjectName
-	var isExist bool
-	//copy
-	destObjectName := getObjectName(fileName, modeluuid)
-	if typeCloudBrain == models.TypeCloudBrainOne {
-		bucketName := setting.Attachment.Minio.Bucket
-		log.Info("minio copy..srcObjectName=" + srcObjectName + " bucketName=" + bucketName)
-		if storage.MinioGetFilesSize(bucketName, []string{destObjectName}) > 0 {
-			isExist = true
-		} else {
-			if srcObjectName == "" {
-				srcObjectName = getMinioInitObjectName("", fileChunk.UUID, "", "")
-			}
-			log.Info("minio copy..srcObjectName=" + srcObjectName + " bucketName=" + bucketName)
-			storage.MinioCopyAFile(bucketName, srcObjectName, bucketName, destObjectName)
-		}
-	} else {
-		bucketName := setting.Bucket
-		log.Info("obs copy..srcObjectName=" + srcObjectName + " bucketName=" + bucketName)
-		if storage.ObsGetFilesSize(bucketName, []string{destObjectName}) > 0 {
-			isExist = true
-		} else {
-			if srcObjectName == "" {
-				srcObjectName = getOBSInitObjectName("", fileChunk.UUID, "", name)
-			}
-			log.Info("obs copy..srcObjectName=" + srcObjectName + " bucketName=" + bucketName)
-			storage.ObsCopyFile(bucketName, srcObjectName, bucketName, destObjectName)
-		}
-	}
-	return isExist
-}
-
 func GetSuccessChunks(ctx *context.Context) {
 	fileMD5 := ctx.Query("md5")
 	typeCloudBrain := ctx.QueryInt("type")
 	fileName := ctx.Query("file_name")
-	scene := ctx.Query("scene")
-	modeluuid := ctx.Query("modeluuid")
-	log.Info("scene=" + scene + " typeCloudBrain=" + fmt.Sprint(typeCloudBrain))
 	var chunks string
 
 	err := checkTypeCloudBrain(typeCloudBrain)
@@ -631,12 +558,7 @@ func GetSuccessChunks(ctx *context.Context) {
 
 	isExist := false
 	if typeCloudBrain == models.TypeCloudBrainOne {
-		isExist, err = storage.Attachments.HasObject(getCloudOneMinioPrefix(scene, fileChunk))
-		if isExist {
-			log.Info("The file is exist in minio. has uploaded.path=" + getCloudOneMinioPrefix(scene, fileChunk))
-		} else {
-			log.Info("The file is not exist in minio..")
-		}
+		isExist, err = storage.Attachments.HasObject(setting.Attachment.Minio.BasePath + models.AttachmentRelativePath(fileChunk.UUID))
 		if err != nil {
 			ctx.ServerError("HasObject failed", err)
 			return
@@ -647,12 +569,7 @@ func GetSuccessChunks(ctx *context.Context) {
 		if oldAttachment != nil {
 			oldFileName = oldAttachment.Name
 		}
-		isExist, err = storage.ObsHasObject(getCloudTwoOBSPrefix(scene, fileChunk, oldFileName))
-		if isExist {
-			log.Info("The file is exist in obs. has uploaded. path=" + getCloudTwoOBSPrefix(scene, fileChunk, oldFileName))
-		} else {
-			log.Info("The file is not exist in obs.")
-		}
+		isExist, err = storage.ObsHasObject(setting.BasePath + models.AttachmentRelativePath(fileChunk.UUID) + "/" + oldFileName)
 		if err != nil {
 			ctx.ServerError("ObsHasObject failed", err)
 			return
@@ -668,14 +585,36 @@ func GetSuccessChunks(ctx *context.Context) {
 			}
 		}
 	} else {
-		models.DeleteFileChunk(fileChunk)
-		ctx.JSON(200, map[string]string{
-			"uuid":     "",
-			"uploaded": "0",
-			"uploadID": "",
-			"chunks":   "",
-		})
-		return
+		if fileChunk.IsUploaded == models.FileUploaded {
+			log.Info("the file has been recorded but not uploaded")
+			fileChunk.IsUploaded = models.FileNotUploaded
+			if err = models.UpdateFileChunk(fileChunk); err != nil {
+				log.Error("UpdateFileChunk failed:", err.Error())
+			}
+		}
+
+		if typeCloudBrain == models.TypeCloudBrainOne {
+			chunks, err = storage.GetPartInfos(strings.TrimPrefix(path.Join(setting.Attachment.Minio.BasePath, path.Join(fileChunk.UUID[0:1], fileChunk.UUID[1:2], fileChunk.UUID)), "/"), fileChunk.UploadID)
+			if err != nil {
+				log.Error("GetPartInfos failed:%v", err.Error())
+			}
+		} else {
+			chunks, err = storage.GetObsPartInfos(strings.TrimPrefix(path.Join(setting.BasePath, path.Join(fileChunk.UUID[0:1], fileChunk.UUID[1:2], fileChunk.UUID, fileName)), "/"), fileChunk.UploadID)
+			if err != nil {
+				log.Error("GetObsPartInfos failed:%v", err.Error())
+			}
+		}
+
+		if err != nil {
+			models.DeleteFileChunk(fileChunk)
+			ctx.JSON(200, map[string]string{
+				"uuid":     "",
+				"uploaded": "0",
+				"uploadID": "",
+				"chunks":   "",
+			})
+			return
+		}
 	}
 
 	var attachID int64
@@ -692,10 +631,6 @@ func GetSuccessChunks(ctx *context.Context) {
 	}
 
 	if attach == nil {
-		if fileChunk.IsUploaded == 1 && scene == Attachment_model {
-			log.Info("model upload special deal.")
-			specialDeal(modeluuid, fileChunk.UUID, fileName, ctx, fileChunk, typeCloudBrain)
-		}
 		ctx.JSON(200, map[string]string{
 			"uuid":        fileChunk.UUID,
 			"uploaded":    strconv.Itoa(fileChunk.IsUploaded),
@@ -708,141 +643,24 @@ func GetSuccessChunks(ctx *context.Context) {
 		})
 		return
 	}
-	if scene == Attachment_model {
-		//使用description存储模型信息
-		dbmodeluuid := attach.Description
-		modelname := ""
-		if dbmodeluuid != modeluuid {
-			log.Info("The file has uploaded.fileChunk.ObjectName=" + fileChunk.ObjectName + " typeCloudBrain=" + fmt.Sprint(typeCloudBrain))
-			isExist := copyModelFile(typeCloudBrain, fileChunk, attach.Name, fileName, modeluuid)
-			// srcObjectName := fileChunk.ObjectName
-			// var isExist bool
-			// //copy
-			// destObjectName := getObjectName(fileName, modeluuid)
-			// if typeCloudBrain == models.TypeCloudBrainOne {
-			// 	bucketName := setting.Attachment.Minio.Bucket
-			// 	log.Info("minio copy..srcObjectName=" + srcObjectName + " bucketName=" + bucketName)
-			// 	if storage.MinioGetFilesSize(bucketName, []string{destObjectName}) > 0 {
-			// 		isExist = true
-			// 	} else {
-			// 		if srcObjectName == "" {
-			// 			srcObjectName = getMinioInitObjectName("", fileChunk.UUID, "", "")
-			// 		}
-			// 		storage.MinioCopyAFile(bucketName, srcObjectName, bucketName, destObjectName)
-			// 	}
-			// } else {
-			// 	bucketName := setting.Bucket
-			// 	log.Info("obs copy..srcObjectName=" + srcObjectName + " bucketName=" + bucketName)
-			// 	if storage.ObsGetFilesSize(bucketName, []string{destObjectName}) > 0 {
-			// 		isExist = true
-			// 	} else {
-			// 		if srcObjectName == "" {
-			// 			srcObjectName = getOBSInitObjectName("", fileChunk.UUID, "", attach.Name)
-			// 		}
-			// 		log.Info("obs copy..srcObjectName=" + srcObjectName + " bucketName=" + bucketName)
-			// 		storage.ObsCopyFile(bucketName, srcObjectName, bucketName, destObjectName)
-			// 	}
-			// }
-			if dbmodeluuid != "" {
-				model, err := models.QueryModelById(dbmodeluuid)
-				if err == nil && model != nil {
-					modelname = model.Name
-				}
-			}
-			if isExist {
-				ctx.JSON(200, map[string]string{
-					"uuid":      fileChunk.UUID,
-					"uploaded":  strconv.Itoa(fileChunk.IsUploaded),
-					"uploadID":  fileChunk.UploadID,
-					"chunks":    string(chunks),
-					"attachID":  strconv.Itoa(int(attachID)),
-					"modeluuid": modeluuid,
-					"fileName":  attach.Name,
-					"modelName": modelname,
-				})
-			} else {
-				UpdateModelSize(modeluuid)
-				ctx.JSON(200, map[string]string{
-					"uuid":     fileChunk.UUID,
-					"uploaded": strconv.Itoa(fileChunk.IsUploaded),
-					"uploadID": fileChunk.UploadID,
-					"chunks":   string(chunks),
-					"attachID": strconv.Itoa(int(attachID)),
-					"fileName": attach.Name,
-				})
-			}
-			return
-		} else {
-			model, err := models.QueryModelById(dbmodeluuid)
-			if err == nil {
-				modelname = model.Name
-			}
-			ctx.JSON(200, map[string]string{
-				"uuid":      fileChunk.UUID,
-				"uploaded":  strconv.Itoa(fileChunk.IsUploaded),
-				"uploadID":  fileChunk.UploadID,
-				"chunks":    string(chunks),
-				"attachID":  strconv.Itoa(int(attachID)),
-				"modeluuid": dbmodeluuid,
-				"fileName":  attach.Name,
-				"modelName": modelname,
-			})
-			return
-		}
-	} else {
-		dataset, err := models.GetDatasetByID(attach.DatasetID)
-		if err != nil {
-			ctx.ServerError("GetDatasetByID", err)
-			return
-		}
-
-		ctx.JSON(200, map[string]string{
-			"uuid":        fileChunk.UUID,
-			"uploaded":    strconv.Itoa(fileChunk.IsUploaded),
-			"uploadID":    fileChunk.UploadID,
-			"chunks":      string(chunks),
-			"attachID":    strconv.Itoa(int(attachID)),
-			"datasetID":   strconv.Itoa(int(attach.DatasetID)),
-			"fileName":    attach.Name,
-			"datasetName": dataset.Title,
-		})
-	}
-}
-
-func getObjectName(filename string, modeluuid string) string {
-	return strings.TrimPrefix(path.Join(Model_prefix, path.Join(modeluuid[0:1], modeluuid[1:2], modeluuid, filename)), "/")
-}
 
-func getMinioInitObjectName(scene string, uuid, modeluuid string, filename string) string {
-	if scene == Attachment_model {
-		return strings.TrimPrefix(path.Join(Model_prefix, path.Join(modeluuid[0:1], modeluuid[1:2], modeluuid, filename)), "/")
-	} else {
-		return strings.TrimPrefix(path.Join(setting.Attachment.Minio.BasePath, path.Join(uuid[0:1], uuid[1:2], uuid)), "/")
-	}
-}
-
-func getChunkMinioExistObjectName(scene string, fileChunk *models.FileChunk, filename string) string {
-	if scene == Attachment_model {
-		return fileChunk.ObjectName
-	} else {
-		return strings.TrimPrefix(path.Join(setting.Attachment.Minio.BasePath, path.Join(fileChunk.UUID[0:1], fileChunk.UUID[1:2], fileChunk.UUID)), "/")
+	dataset, err := models.GetDatasetByID(attach.DatasetID)
+	if err != nil {
+		ctx.ServerError("GetDatasetByID", err)
+		return
 	}
-}
 
-func getOBSInitObjectName(scene string, uuid, modeluuid string, filename string) string {
-	if scene == Attachment_model {
-		return strings.TrimPrefix(path.Join(Model_prefix, path.Join(modeluuid[0:1], modeluuid[1:2], modeluuid, filename)), "/")
-	} else {
-		return strings.TrimPrefix(path.Join(setting.BasePath, path.Join(uuid[0:1], uuid[1:2], uuid, filename)), "/")
-	}
-}
+	ctx.JSON(200, map[string]string{
+		"uuid":        fileChunk.UUID,
+		"uploaded":    strconv.Itoa(fileChunk.IsUploaded),
+		"uploadID":    fileChunk.UploadID,
+		"chunks":      string(chunks),
+		"attachID":    strconv.Itoa(int(attachID)),
+		"datasetID":   strconv.Itoa(int(attach.DatasetID)),
+		"fileName":    attach.Name,
+		"datasetName": dataset.Title,
+	})
 
-func getChunkOBSExistObjectName(scene string, fileChunk *models.FileChunk, filename string) string {
-	if scene == Attachment_model {
-		return fileChunk.ObjectName
-	} else {
-		return strings.TrimPrefix(path.Join(setting.BasePath, path.Join(fileChunk.UUID[0:1], fileChunk.UUID[1:2], fileChunk.UUID, filename)), "/")
-	}
 }
 
 func NewMultipart(ctx *context.Context) {
@@ -865,8 +683,6 @@ func NewMultipart(ctx *context.Context) {
 	}
 
 	fileName := ctx.Query("file_name")
-	scene := ctx.Query("scene")
-	modeluuid := ctx.Query("modeluuid")
 
 	if setting.Attachment.StoreType == storage.MinioStorageType {
 		totalChunkCounts := ctx.QueryInt("totalChunkCounts")
@@ -882,19 +698,15 @@ func NewMultipart(ctx *context.Context) {
 		}
 
 		uuid := gouuid.NewV4().String()
-
 		var uploadID string
-		var objectName string
 		if typeCloudBrain == models.TypeCloudBrainOne {
-			objectName = getMinioInitObjectName(scene, uuid, modeluuid, fileName)
-			uploadID, err = storage.NewMultiPartUpload(objectName)
+			uploadID, err = storage.NewMultiPartUpload(strings.TrimPrefix(path.Join(setting.Attachment.Minio.BasePath, path.Join(uuid[0:1], uuid[1:2], uuid)), "/"))
 			if err != nil {
 				ctx.ServerError("NewMultipart", err)
 				return
 			}
 		} else {
-			objectName = getOBSInitObjectName(scene, uuid, modeluuid, fileName)
-			uploadID, err = storage.NewObsMultiPartUpload(objectName)
+			uploadID, err = storage.NewObsMultiPartUpload(strings.TrimPrefix(path.Join(setting.BasePath, path.Join(uuid[0:1], uuid[1:2], uuid, fileName)), "/"))
 			if err != nil {
 				ctx.ServerError("NewObsMultiPartUpload", err)
 				return
@@ -905,7 +717,6 @@ func NewMultipart(ctx *context.Context) {
 			UUID:        uuid,
 			UserID:      ctx.User.ID,
 			UploadID:    uploadID,
-			ObjectName:  objectName,
 			Md5:         ctx.Query("md5"),
 			Size:        fileSize,
 			TotalChunks: totalChunkCounts,
@@ -939,8 +750,8 @@ func PutOBSProxyUpload(ctx *context.Context) {
 		ctx.Error(500, fmt.Sprintf("FormFile: %v", RequestBody))
 		return
 	}
-	objectName := strings.TrimPrefix(path.Join(setting.BasePath, path.Join(uuid[0:1], uuid[1:2], uuid, fileName)), "/")
-	err := storage.ObsMultiPartUpload(objectName, uploadID, partNumber, fileName, RequestBody.ReadCloser())
+
+	err := storage.ObsMultiPartUpload(uuid, uploadID, partNumber, fileName, RequestBody.ReadCloser())
 	if err != nil {
 		log.Info("upload error.")
 	}
@@ -980,22 +791,14 @@ func GetMultipartUploadUrl(ctx *context.Context) {
 	partNumber := ctx.QueryInt("chunkNumber")
 	size := ctx.QueryInt64("size")
 	fileName := ctx.Query("file_name")
-	scene := ctx.Query("scene")
+
 	typeCloudBrain := ctx.QueryInt("type")
 	err := checkTypeCloudBrain(typeCloudBrain)
 	if err != nil {
 		ctx.ServerError("checkTypeCloudBrain failed", err)
 		return
 	}
-	fileChunk, err := models.GetFileChunkByUUID(uuid)
-	if err != nil {
-		if models.IsErrFileChunkNotExist(err) {
-			ctx.Error(404)
-		} else {
-			ctx.ServerError("GetFileChunkByUUID", err)
-		}
-		return
-	}
+
 	url := ""
 	if typeCloudBrain == models.TypeCloudBrainOne {
 		if size > minio_ext.MinPartSize {
@@ -1003,7 +806,7 @@ func GetMultipartUploadUrl(ctx *context.Context) {
 			return
 		}
 
-		url, err = storage.GenMultiPartSignedUrl(getChunkMinioExistObjectName(scene, fileChunk, fileName), uploadID, partNumber, size)
+		url, err = storage.GenMultiPartSignedUrl(strings.TrimPrefix(path.Join(setting.Attachment.Minio.BasePath, path.Join(uuid[0:1], uuid[1:2], uuid)), "/"), uploadID, partNumber, size)
 		if err != nil {
 			ctx.Error(500, fmt.Sprintf("GenMultiPartSignedUrl failed: %v", err))
 			return
@@ -1013,7 +816,7 @@ func GetMultipartUploadUrl(ctx *context.Context) {
 			url = setting.PROXYURL + "/obs_proxy_multipart?uuid=" + uuid + "&uploadId=" + uploadID + "&partNumber=" + fmt.Sprint(partNumber) + "&file_name=" + fileName
 			log.Info("return url=" + url)
 		} else {
-			url, err = storage.ObsGenMultiPartSignedUrl(getChunkOBSExistObjectName(scene, fileChunk, fileName), uploadID, partNumber)
+			url, err = storage.ObsGenMultiPartSignedUrl(strings.TrimPrefix(path.Join(setting.BasePath, path.Join(uuid[0:1], uuid[1:2], uuid, fileName)), "/"), uploadID, partNumber)
 			if err != nil {
 				ctx.Error(500, fmt.Sprintf("ObsGenMultiPartSignedUrl failed: %v", err))
 				return
@@ -1021,7 +824,6 @@ func GetMultipartUploadUrl(ctx *context.Context) {
 			log.Info("url=" + url)
 		}
 	}
-
 	ctx.JSON(200, map[string]string{
 		"url": url,
 	})
@@ -1032,12 +834,8 @@ func CompleteMultipart(ctx *context.Context) {
 	uploadID := ctx.Query("uploadID")
 	typeCloudBrain := ctx.QueryInt("type")
 	fileName := ctx.Query("file_name")
-	scene := ctx.Query("scene")
-	modeluuid := ctx.Query("modeluuid")
 
 	log.Warn("uuid:" + uuid)
-	log.Warn("modeluuid:" + modeluuid)
-	log.Warn("scene:" + scene)
 	log.Warn("typeCloudBrain:" + strconv.Itoa(typeCloudBrain))
 
 	err := checkTypeCloudBrain(typeCloudBrain)
@@ -1057,13 +855,13 @@ func CompleteMultipart(ctx *context.Context) {
 	}
 
 	if typeCloudBrain == models.TypeCloudBrainOne {
-		_, err = storage.CompleteMultiPartUpload(getChunkMinioExistObjectName(scene, fileChunk, fileName), uploadID, fileChunk.TotalChunks)
+		_, err = storage.CompleteMultiPartUpload(strings.TrimPrefix(path.Join(setting.Attachment.Minio.BasePath, path.Join(fileChunk.UUID[0:1], fileChunk.UUID[1:2], fileChunk.UUID)), "/"), uploadID, fileChunk.TotalChunks)
 		if err != nil {
 			ctx.Error(500, fmt.Sprintf("CompleteMultiPartUpload failed: %v", err))
 			return
 		}
 	} else {
-		err = storage.CompleteObsMultiPartUpload(getChunkOBSExistObjectName(scene, fileChunk, fileName), uploadID, fileChunk.TotalChunks)
+		err = storage.CompleteObsMultiPartUpload(strings.TrimPrefix(path.Join(setting.BasePath, path.Join(fileChunk.UUID[0:1], fileChunk.UUID[1:2], fileChunk.UUID, fileName)), "/"), uploadID, fileChunk.TotalChunks)
 		if err != nil {
 			ctx.Error(500, fmt.Sprintf("CompleteObsMultiPartUpload failed: %v", err))
 			return
@@ -1077,81 +875,58 @@ func CompleteMultipart(ctx *context.Context) {
 		ctx.Error(500, fmt.Sprintf("UpdateFileChunk: %v", err))
 		return
 	}
+	dataset, _ := models.GetDatasetByID(ctx.QueryInt64("dataset_id"))
+	log.Warn("insert attachment to datasetId:" + strconv.FormatInt(dataset.ID, 10))
+	attachment, err := models.InsertAttachment(&models.Attachment{
+		UUID:        uuid,
+		UploaderID:  ctx.User.ID,
+		IsPrivate:   dataset.IsPrivate(),
+		Name:        fileName,
+		Size:        ctx.QueryInt64("size"),
+		DatasetID:   ctx.QueryInt64("dataset_id"),
+		Description: ctx.Query("description"),
+		Type:        typeCloudBrain,
+	})
 
-	if scene == Attachment_model {
-		//更新模型大小信息
-		UpdateModelSize(modeluuid)
-		_, err := models.InsertAttachment(&models.Attachment{
-			UUID:        uuid,
-			UploaderID:  ctx.User.ID,
-			IsPrivate:   true,
-			Name:        fileName,
-			Size:        ctx.QueryInt64("size"),
-			DatasetID:   0,
-			Description: modeluuid,
-			Type:        typeCloudBrain,
-		})
-		if err != nil {
-			ctx.Error(500, fmt.Sprintf("InsertAttachment: %v", err))
-			return
-		}
-		ctx.JSON(200, map[string]string{
-			"result_code": "0",
-		})
-
-	} else {
-		dataset, _ := models.GetDatasetByID(ctx.QueryInt64("dataset_id"))
-		log.Warn("insert attachment to datasetId:" + strconv.FormatInt(dataset.ID, 10))
-		attachment, err := models.InsertAttachment(&models.Attachment{
-			UUID:        uuid,
-			UploaderID:  ctx.User.ID,
-			IsPrivate:   dataset.IsPrivate(),
-			Name:        fileName,
-			Size:        ctx.QueryInt64("size"),
-			DatasetID:   ctx.QueryInt64("dataset_id"),
-			Description: ctx.Query("description"),
-			Type:        typeCloudBrain,
-		})
-
-		if err != nil {
-			ctx.Error(500, fmt.Sprintf("InsertAttachment: %v", err))
-			return
-		}
-		attachment.UpdateDatasetUpdateUnix()
-		repository, _ := models.GetRepositoryByID(dataset.RepoID)
-		notification.NotifyOtherTask(ctx.User, repository, fmt.Sprint(repository.IsPrivate, attachment.IsPrivate), attachment.Name, models.ActionUploadAttachment)
-		if attachment.DatasetID != 0 {
-			if isCanDecompress(attachment.Name) {
-				if typeCloudBrain == models.TypeCloudBrainOne {
-					err = worker.SendDecompressTask(contexExt.Background(), uuid, attachment.Name)
-					if err != nil {
-						log.Error("SendDecompressTask(%s) failed:%s", uuid, err.Error())
-					} else {
-						updateAttachmentDecompressStateIng(attachment)
-					}
+	if err != nil {
+		ctx.Error(500, fmt.Sprintf("InsertAttachment: %v", err))
+		return
+	}
+	attachment.UpdateDatasetUpdateUnix()
+	repository, _ := models.GetRepositoryByID(dataset.RepoID)
+	notification.NotifyOtherTask(ctx.User, repository, fmt.Sprint(repository.IsPrivate, attachment.IsPrivate), attachment.Name, models.ActionUploadAttachment)
+	if attachment.DatasetID != 0 {
+		if isCanDecompress(attachment.Name) {
+			if typeCloudBrain == models.TypeCloudBrainOne {
+				err = worker.SendDecompressTask(contexExt.Background(), uuid, attachment.Name)
+				if err != nil {
+					log.Error("SendDecompressTask(%s) failed:%s", uuid, err.Error())
+				} else {
+					updateAttachmentDecompressStateIng(attachment)
 				}
-				if typeCloudBrain == models.TypeCloudBrainTwo {
-					attachjson, _ := json.Marshal(attachment)
-					err = labelmsg.SendDecompressAttachToLabelOBS(string(attachjson))
-					if err != nil {
-						log.Error("SendDecompressTask to labelsystem (%s) failed:%s", attachment.UUID, err.Error())
-					} else {
-						updateAttachmentDecompressStateIng(attachment)
-					}
+			}
+			if typeCloudBrain == models.TypeCloudBrainTwo {
+				attachjson, _ := json.Marshal(attachment)
+				err = labelmsg.SendDecompressAttachToLabelOBS(string(attachjson))
+				if err != nil {
+					log.Error("SendDecompressTask to labelsystem (%s) failed:%s", attachment.UUID, err.Error())
+				} else {
+					updateAttachmentDecompressStateIng(attachment)
 				}
-			} else {
-				var labelMap map[string]string
-				labelMap = make(map[string]string)
-				labelMap["UUID"] = uuid
-				labelMap["Type"] = fmt.Sprint(attachment.Type)
-				labelMap["UploaderID"] = fmt.Sprint(attachment.UploaderID)
-				labelMap["RepoID"] = fmt.Sprint(dataset.RepoID)
-				labelMap["AttachName"] = attachment.Name
-				attachjson, _ := json.Marshal(labelMap)
-				labelmsg.SendAddAttachToLabelSys(string(attachjson))
 			}
+		} else {
+			var labelMap map[string]string
+			labelMap = make(map[string]string)
+			labelMap["UUID"] = uuid
+			labelMap["Type"] = fmt.Sprint(attachment.Type)
+			labelMap["UploaderID"] = fmt.Sprint(attachment.UploaderID)
+			labelMap["RepoID"] = fmt.Sprint(dataset.RepoID)
+			labelMap["AttachName"] = attachment.Name
+			attachjson, _ := json.Marshal(labelMap)
+			labelmsg.SendAddAttachToLabelSys(string(attachjson))
 		}
 	}
+
 	ctx.JSON(200, map[string]string{
 		"result_code": "0",
 	})
@@ -1238,7 +1013,7 @@ func queryDatasets(ctx *context.Context, attachs []*models.AttachmentUsername) {
 	}
 
 	for _, attch := range attachs {
-		has, err := storage.Attachments.HasObject(setting.Attachment.Minio.BasePath + models.AttachmentRelativePath(attch.UUID))
+		has, err := storage.Attachments.HasObject(models.AttachmentRelativePath(attch.UUID))
 		if err != nil || !has {
 			continue
 		}
diff --git a/routers/repo/attachment_model.go b/routers/repo/attachment_model.go
new file mode 100644
index 000000000..e820f01dd
--- /dev/null
+++ b/routers/repo/attachment_model.go
@@ -0,0 +1,423 @@
+package repo
+
+import (
+	"fmt"
+	"path"
+	"strconv"
+	"strings"
+
+	"code.gitea.io/gitea/models"
+	"code.gitea.io/gitea/modules/context"
+	"code.gitea.io/gitea/modules/log"
+	"code.gitea.io/gitea/modules/minio_ext"
+	"code.gitea.io/gitea/modules/setting"
+	"code.gitea.io/gitea/modules/storage"
+	"code.gitea.io/gitea/modules/upload"
+	gouuid "github.com/satori/go.uuid"
+)
+
+func GetModelChunks(ctx *context.Context) {
+	fileMD5 := ctx.Query("md5")
+	typeCloudBrain := ctx.QueryInt("type")
+	fileName := ctx.Query("file_name")
+	scene := ctx.Query("scene")
+	modeluuid := ctx.Query("modeluuid")
+	log.Info("scene=" + scene + " typeCloudBrain=" + fmt.Sprint(typeCloudBrain))
+	var chunks string
+
+	err := checkTypeCloudBrain(typeCloudBrain)
+	if err != nil {
+		ctx.ServerError("checkTypeCloudBrain failed", err)
+		return
+	}
+
+	fileChunk, err := models.GetModelFileChunkByMD5AndUser(fileMD5, ctx.User.ID, typeCloudBrain)
+	if err != nil {
+		if models.IsErrFileChunkNotExist(err) {
+			ctx.JSON(200, map[string]string{
+				"uuid":     "",
+				"uploaded": "0",
+				"uploadID": "",
+				"chunks":   "",
+			})
+		} else {
+			ctx.ServerError("GetFileChunkByMD5", err)
+		}
+		return
+	}
+
+	isExist := false
+	if typeCloudBrain == models.TypeCloudBrainOne {
+		isExist, err = storage.Attachments.HasObject(fileChunk.ObjectName)
+		if isExist {
+			log.Info("The file is exist in minio. has uploaded.path=" + fileChunk.ObjectName)
+		} else {
+			log.Info("The file is not exist in minio..")
+		}
+		if err != nil {
+			ctx.ServerError("HasObject failed", err)
+			return
+		}
+	} else {
+		isExist, err = storage.ObsHasObject(fileChunk.ObjectName)
+		if isExist {
+			log.Info("The file is exist in obs. has uploaded. path=" + fileChunk.ObjectName)
+		} else {
+			log.Info("The file is not exist in obs.")
+		}
+		if err != nil {
+			ctx.ServerError("ObsHasObject failed", err)
+			return
+		}
+	}
+
+	if isExist {
+		if fileChunk.IsUploaded == models.FileNotUploaded {
+			log.Info("the file has been uploaded but not recorded")
+			fileChunk.IsUploaded = models.FileUploaded
+			if err = models.UpdateModelFileChunk(fileChunk); err != nil {
+				log.Error("UpdateFileChunk failed:", err.Error())
+			}
+		}
+	} else {
+		if fileChunk.IsUploaded == models.FileUploaded {
+			log.Info("the file has been recorded but not uploaded")
+			fileChunk.IsUploaded = models.FileNotUploaded
+			if err = models.UpdateModelFileChunk(fileChunk); err != nil {
+				log.Error("UpdateFileChunk failed:", err.Error())
+			}
+		}
+
+		if typeCloudBrain == models.TypeCloudBrainOne {
+			chunks, err = storage.GetPartInfos(fileChunk.ObjectName, fileChunk.UploadID)
+			if err != nil {
+				log.Error("GetPartInfos failed:%v", err.Error())
+			}
+		} else {
+			chunks, err = storage.GetObsPartInfos(fileChunk.ObjectName, fileChunk.UploadID)
+			if err != nil {
+				log.Error("GetObsPartInfos failed:%v", err.Error())
+			}
+		}
+		if err != nil {
+			models.DeleteModelFileChunk(fileChunk)
+			ctx.JSON(200, map[string]string{
+				"uuid":     "",
+				"uploaded": "0",
+				"uploadID": "",
+				"chunks":   "",
+			})
+			return
+		}
+	}
+
+	var attachID int64
+	attach, err := models.GetAttachmentByUUID(fileChunk.UUID)
+	if err != nil {
+		if models.IsErrAttachmentNotExist(err) {
+			attachID = 0
+		} else {
+			ctx.ServerError("GetAttachmentByUUID", err)
+			return
+		}
+	} else {
+		attachID = attach.ID
+	}
+
+	if attach == nil {
+		ctx.JSON(200, map[string]string{
+			"uuid":        fileChunk.UUID,
+			"uploaded":    strconv.Itoa(fileChunk.IsUploaded),
+			"uploadID":    fileChunk.UploadID,
+			"chunks":      string(chunks),
+			"attachID":    "0",
+			"datasetID":   "0",
+			"fileName":    "",
+			"datasetName": "",
+		})
+		return
+	}
+
+	//使用description存储模型信息
+	dbmodeluuid := attach.Description
+	modelname := ""
+	if dbmodeluuid != modeluuid {
+		log.Info("The file has uploaded.fileChunk.ObjectName=" + fileChunk.ObjectName + " typeCloudBrain=" + fmt.Sprint(typeCloudBrain))
+		isExist := copyModelAttachmentFile(typeCloudBrain, fileChunk, fileName, modeluuid)
+		if dbmodeluuid != "" {
+			model, err := models.QueryModelById(dbmodeluuid)
+			if err == nil && model != nil {
+				modelname = model.Name
+			}
+		}
+		if isExist {
+			ctx.JSON(200, map[string]string{
+				"uuid":      fileChunk.UUID,
+				"uploaded":  strconv.Itoa(fileChunk.IsUploaded),
+				"uploadID":  fileChunk.UploadID,
+				"chunks":    string(chunks),
+				"attachID":  strconv.Itoa(int(attachID)),
+				"modeluuid": modeluuid,
+				"fileName":  attach.Name,
+				"modelName": modelname,
+			})
+		} else {
+			UpdateModelSize(modeluuid)
+			ctx.JSON(200, map[string]string{
+				"uuid":     fileChunk.UUID,
+				"uploaded": strconv.Itoa(fileChunk.IsUploaded),
+				"uploadID": fileChunk.UploadID,
+				"chunks":   string(chunks),
+				"attachID": strconv.Itoa(int(attachID)),
+				"fileName": attach.Name,
+			})
+		}
+		return
+	} else {
+		model, err := models.QueryModelById(dbmodeluuid)
+		if err == nil {
+			modelname = model.Name
+		}
+		ctx.JSON(200, map[string]string{
+			"uuid":      fileChunk.UUID,
+			"uploaded":  strconv.Itoa(fileChunk.IsUploaded),
+			"uploadID":  fileChunk.UploadID,
+			"chunks":    string(chunks),
+			"attachID":  strconv.Itoa(int(attachID)),
+			"modeluuid": dbmodeluuid,
+			"fileName":  attach.Name,
+			"modelName": modelname,
+		})
+		return
+	}
+
+}
+
+func copyModelAttachmentFile(typeCloudBrain int, fileChunk *models.ModelFileChunk, fileName, modeluuid string) bool {
+	srcObjectName := fileChunk.ObjectName
+	var isExist bool
+	//copy
+	destObjectName := getObjectName(fileName, modeluuid)
+	if typeCloudBrain == models.TypeCloudBrainOne {
+		bucketName := setting.Attachment.Minio.Bucket
+		log.Info("minio copy..srcObjectName=" + srcObjectName + " bucketName=" + bucketName)
+		if storage.MinioGetFilesSize(bucketName, []string{destObjectName}) > 0 {
+			isExist = true
+		} else {
+
+			log.Info("minio copy..srcObjectName=" + srcObjectName + " bucketName=" + bucketName)
+			storage.MinioCopyAFile(bucketName, srcObjectName, bucketName, destObjectName)
+		}
+	} else {
+		bucketName := setting.Bucket
+		log.Info("obs copy..srcObjectName=" + srcObjectName + " bucketName=" + bucketName)
+		if storage.ObsGetFilesSize(bucketName, []string{destObjectName}) > 0 {
+			isExist = true
+		} else {
+			log.Info("obs copy..srcObjectName=" + srcObjectName + " bucketName=" + bucketName)
+			storage.ObsCopyFile(bucketName, srcObjectName, bucketName, destObjectName)
+		}
+	}
+	return isExist
+}
+
+func getObjectName(filename string, modeluuid string) string {
+	return strings.TrimPrefix(path.Join(Model_prefix, path.Join(modeluuid[0:1], modeluuid[1:2], modeluuid, filename)), "/")
+}
+
+func NewModelMultipart(ctx *context.Context) {
+	if !setting.Attachment.Enabled {
+		ctx.Error(404, "attachment is not enabled")
+		return
+	}
+	fileName := ctx.Query("file_name")
+	modeluuid := ctx.Query("modeluuid")
+
+	err := upload.VerifyFileType(ctx.Query("fileType"), strings.Split(setting.Attachment.AllowedTypes, ","))
+	if err != nil {
+		ctx.Error(400, err.Error())
+		return
+	}
+
+	typeCloudBrain := ctx.QueryInt("type")
+	err = checkTypeCloudBrain(typeCloudBrain)
+	if err != nil {
+		ctx.ServerError("checkTypeCloudBrain failed", err)
+		return
+	}
+
+	if setting.Attachment.StoreType == storage.MinioStorageType {
+		totalChunkCounts := ctx.QueryInt("totalChunkCounts")
+		if totalChunkCounts > minio_ext.MaxPartsCount {
+			ctx.Error(400, fmt.Sprintf("chunk counts(%d) is too much", totalChunkCounts))
+			return
+		}
+
+		fileSize := ctx.QueryInt64("size")
+		if fileSize > minio_ext.MaxMultipartPutObjectSize {
+			ctx.Error(400, fmt.Sprintf("file size(%d) is too big", fileSize))
+			return
+		}
+
+		uuid := gouuid.NewV4().String()
+		var uploadID string
+		if typeCloudBrain == models.TypeCloudBrainOne {
+			uploadID, err = storage.NewMultiPartUpload(strings.TrimPrefix(path.Join(Model_prefix, path.Join(modeluuid[0:1], modeluuid[1:2], modeluuid, fileName)), "/"))
+			if err != nil {
+				ctx.ServerError("NewMultipart", err)
+				return
+			}
+		} else {
+			uploadID, err = storage.NewObsMultiPartUpload(strings.TrimPrefix(path.Join(Model_prefix, path.Join(modeluuid[0:1], modeluuid[1:2], modeluuid, fileName)), "/"))
+			if err != nil {
+				ctx.ServerError("NewObsMultiPartUpload", err)
+				return
+			}
+		}
+
+		_, err = models.InsertModelFileChunk(&models.ModelFileChunk{
+			UUID:        uuid,
+			UserID:      ctx.User.ID,
+			UploadID:    uploadID,
+			Md5:         ctx.Query("md5"),
+			Size:        fileSize,
+			TotalChunks: totalChunkCounts,
+			Type:        typeCloudBrain,
+		})
+
+		if err != nil {
+			ctx.Error(500, fmt.Sprintf("InsertFileChunk: %v", err))
+			return
+		}
+
+		ctx.JSON(200, map[string]string{
+			"uuid":     uuid,
+			"uploadID": uploadID,
+		})
+	} else {
+		ctx.Error(404, "storage type is not enabled")
+		return
+	}
+}
+
+func GetModelMultipartUploadUrl(ctx *context.Context) {
+	uuid := ctx.Query("uuid")
+	uploadID := ctx.Query("uploadID")
+	partNumber := ctx.QueryInt("chunkNumber")
+	size := ctx.QueryInt64("size")
+	fileName := ctx.Query("file_name")
+	typeCloudBrain := ctx.QueryInt("type")
+	err := checkTypeCloudBrain(typeCloudBrain)
+	if err != nil {
+		ctx.ServerError("checkTypeCloudBrain failed", err)
+		return
+	}
+	fileChunk, err := models.GetModelFileChunkByUUID(uuid)
+	if err != nil {
+		if models.IsErrFileChunkNotExist(err) {
+			ctx.Error(404)
+		} else {
+			ctx.ServerError("GetFileChunkByUUID", err)
+		}
+		return
+	}
+	url := ""
+	if typeCloudBrain == models.TypeCloudBrainOne {
+		if size > minio_ext.MinPartSize {
+			ctx.Error(400, fmt.Sprintf("chunk size(%d) is too big", size))
+			return
+		}
+
+		url, err = storage.GenMultiPartSignedUrl(fileChunk.ObjectName, uploadID, partNumber, size)
+		if err != nil {
+			ctx.Error(500, fmt.Sprintf("GenMultiPartSignedUrl failed: %v", err))
+			return
+		}
+	} else {
+		if setting.PROXYURL != "" {
+			url = setting.PROXYURL + "/obs_proxy_multipart?uuid=" + uuid + "&uploadId=" + uploadID + "&partNumber=" + fmt.Sprint(partNumber) + "&file_name=" + fileName
+			log.Info("return url=" + url)
+		} else {
+			url, err = storage.ObsGenMultiPartSignedUrl(fileChunk.ObjectName, uploadID, partNumber)
+			if err != nil {
+				ctx.Error(500, fmt.Sprintf("ObsGenMultiPartSignedUrl failed: %v", err))
+				return
+			}
+			log.Info("url=" + url)
+		}
+	}
+
+	ctx.JSON(200, map[string]string{
+		"url": url,
+	})
+}
+
+func CompleteModelMultipart(ctx *context.Context) {
+	uuid := ctx.Query("uuid")
+	uploadID := ctx.Query("uploadID")
+	typeCloudBrain := ctx.QueryInt("type")
+	fileName := ctx.Query("file_name")
+	modeluuid := ctx.Query("modeluuid")
+	log.Warn("uuid:" + uuid)
+	log.Warn("modeluuid:" + modeluuid)
+	log.Warn("typeCloudBrain:" + strconv.Itoa(typeCloudBrain))
+
+	err := checkTypeCloudBrain(typeCloudBrain)
+	if err != nil {
+		ctx.ServerError("checkTypeCloudBrain failed", err)
+		return
+	}
+	fileChunk, err := models.GetModelFileChunkByUUID(uuid)
+	if err != nil {
+		if models.IsErrFileChunkNotExist(err) {
+			ctx.Error(404)
+		} else {
+			ctx.ServerError("GetFileChunkByUUID", err)
+		}
+		return
+	}
+
+	if typeCloudBrain == models.TypeCloudBrainOne {
+		_, err = storage.CompleteMultiPartUpload(fileChunk.ObjectName, uploadID, fileChunk.TotalChunks)
+		if err != nil {
+			ctx.Error(500, fmt.Sprintf("CompleteMultiPartUpload failed: %v", err))
+			return
+		}
+	} else {
+		err = storage.CompleteObsMultiPartUpload(fileChunk.ObjectName, uploadID, fileChunk.TotalChunks)
+		if err != nil {
+			ctx.Error(500, fmt.Sprintf("CompleteObsMultiPartUpload failed: %v", err))
+			return
+		}
+	}
+
+	fileChunk.IsUploaded = models.FileUploaded
+
+	err = models.UpdateModelFileChunk(fileChunk)
+	if err != nil {
+		ctx.Error(500, fmt.Sprintf("UpdateFileChunk: %v", err))
+		return
+	}
+	//更新模型大小信息
+	UpdateModelSize(modeluuid)
+
+	_, err = models.InsertAttachment(&models.Attachment{
+		UUID:        uuid,
+		UploaderID:  ctx.User.ID,
+		IsPrivate:   true,
+		Name:        fileName,
+		Size:        ctx.QueryInt64("size"),
+		DatasetID:   0,
+		Description: modeluuid,
+		Type:        typeCloudBrain,
+	})
+
+	if err != nil {
+		ctx.Error(500, fmt.Sprintf("InsertAttachment: %v", err))
+		return
+	}
+	ctx.JSON(200, map[string]string{
+		"result_code": "0",
+	})
+
+}
diff --git a/routers/routes/routes.go b/routers/routes/routes.go
index 63acdd988..2b361b507 100755
--- a/routers/routes/routes.go
+++ b/routers/routes/routes.go
@@ -729,6 +729,13 @@ func RegisterRoutes(m *macaron.Macaron) {
 		m.Post("/complete_multipart", repo.CompleteMultipart)
 	})
 
+	m.Group("/attachments/model", func() {
+		m.Get("/get_chunks", repo.GetModelChunks)
+		m.Get("/new_multipart", repo.NewModelMultipart)
+		m.Get("/get_multipart_url", repo.GetModelMultipartUploadUrl)
+		m.Post("/complete_multipart", repo.CompleteModelMultipart)
+	})
+
 	m.Group("/attachments", func() {
 		m.Get("/public/query", repo.QueryAllPublicDataset)
 		m.Get("/private/:username", repo.QueryPrivateDataset)

From e7495ad7f1a28657c818ed6c158c71bb43947bb2 Mon Sep 17 00:00:00 2001
From: chenshihai <chenshh@pcl.ac.cn>
Date: Tue, 15 Nov 2022 09:44:19 +0800
Subject: [PATCH 165/187] update

---
 .../modelmanage/common/modelmanage-common-detail.vue      | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/web_src/vuepages/pages/modelmanage/common/modelmanage-common-detail.vue b/web_src/vuepages/pages/modelmanage/common/modelmanage-common-detail.vue
index badd5a057..0bb4dc70c 100644
--- a/web_src/vuepages/pages/modelmanage/common/modelmanage-common-detail.vue
+++ b/web_src/vuepages/pages/modelmanage/common/modelmanage-common-detail.vue
@@ -26,13 +26,13 @@
                 </div>
               </div>
             </div>
-            <div v-show="isExpanded" class="row">
+            <div class="row">
               <div class="tit">{{ $t('modelManage.modelSize') }}：</div>
               <div class="val">
                 <div class="txt-wrap" :title="state.modelSize">{{ state.modelSize }}</div>
               </div>
             </div>
-            <div v-show="isExpanded" class="row" :class="isEidtDescr ? 'edit-row' : ''">
+            <div class="row" :class="isEidtDescr ? 'edit-row' : ''">
               <div class="tit">{{ $t('modelManage.descr') }}：</div>
               <div class="val" :class="isEidtDescr ? 'edit-val' : ''">
                 <div v-if="!isEidtDescr" class="txt-wrap" :title="state.description"
@@ -59,13 +59,13 @@
                 <div class="txt-wrap" :title="state.engineName">{{ state.engineName }}</div>
               </div>
             </div>
-            <div v-show="isExpanded" class="row">
+            <div class="row">
               <div class="tit">{{ $t('modelManage.createTime') }}：</div>
               <div class="val">
                 <div class="txt-wrap" :title="state.createTime">{{ state.createTime }}</div>
               </div>
             </div>
-            <div v-show="isExpanded" class="row" :class="isEidtLabel ? 'edit-row' : ''">
+            <div class="row" :class="isEidtLabel ? 'edit-row' : ''">
               <div class="tit">{{ $t('modelManage.label') }}：</div>
               <div class="val" :class="isEidtLabel ? 'edit-val' : ''">
                 <div v-if="!isEidtLabel" class="txt-wrap" :title="state.label"

From b5530542b53f370f166b8b54690be43e6ee135f3 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Tue, 15 Nov 2022 09:46:46 +0800
Subject: [PATCH 166/187] =?UTF-8?q?=E6=A8=A1=E5=9E=8B=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E9=99=84=E4=BB=B6=E6=96=B0=E6=8E=A5=E5=8F=A3=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/repo/attachment.go | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/routers/repo/attachment.go b/routers/repo/attachment.go
index f7ddf2b1a..240e78acc 100755
--- a/routers/repo/attachment.go
+++ b/routers/repo/attachment.go
@@ -312,7 +312,8 @@ func GetAttachment(ctx *context.Context) {
 				url = setting.PROXYURL + "/obs_proxy_download?uuid=" + attach.UUID + "&file_name=" + attach.Name
 				log.Info("return url=" + url)
 			} else {
-				url, err = storage.ObsGetPreSignedUrl(attach.UUID, attach.Name)
+				objectName := strings.TrimPrefix(path.Join(setting.BasePath, path.Join(attach.UUID[0:1], attach.UUID[1:2], attach.UUID, attach.Name)), "/")
+				url, err = storage.ObsGetPreSignedUrl(objectName, attach.Name)
 				if err != nil {
 					ctx.ServerError("ObsGetPreSignedUrl", err)
 					return
@@ -416,7 +417,7 @@ func AddAttachment(ctx *context.Context) {
 	uuid := ctx.Query("uuid")
 	has := false
 	if typeCloudBrain == models.TypeCloudBrainOne {
-		has, err = storage.Attachments.HasObject(models.AttachmentRelativePath(uuid))
+		has, err = storage.Attachments.HasObject(setting.Attachment.Minio.BasePath + models.AttachmentRelativePath(uuid))
 		if err != nil {
 			ctx.ServerError("HasObject", err)
 			return
@@ -750,8 +751,8 @@ func PutOBSProxyUpload(ctx *context.Context) {
 		ctx.Error(500, fmt.Sprintf("FormFile: %v", RequestBody))
 		return
 	}
-
-	err := storage.ObsMultiPartUpload(uuid, uploadID, partNumber, fileName, RequestBody.ReadCloser())
+	objectName := strings.TrimPrefix(path.Join(setting.BasePath, path.Join(uuid[0:1], uuid[1:2], uuid, fileName)), "/")
+	err := storage.ObsMultiPartUpload(objectName, uploadID, partNumber, fileName, RequestBody.ReadCloser())
 	if err != nil {
 		log.Info("upload error.")
 	}
@@ -1013,7 +1014,7 @@ func queryDatasets(ctx *context.Context, attachs []*models.AttachmentUsername) {
 	}
 
 	for _, attch := range attachs {
-		has, err := storage.Attachments.HasObject(models.AttachmentRelativePath(attch.UUID))
+		has, err := storage.Attachments.HasObject(setting.Attachment.Minio.BasePath + models.AttachmentRelativePath(attch.UUID))
 		if err != nil || !has {
 			continue
 		}

From 35c161f7eccf0e46393f4905d8d688852a403598 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Tue, 15 Nov 2022 10:07:53 +0800
Subject: [PATCH 167/187] =?UTF-8?q?=E6=A8=A1=E5=9E=8B=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E9=99=84=E4=BB=B6=E6=96=B0=E6=8E=A5=E5=8F=A3=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/repo/attachment_model.go | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/routers/repo/attachment_model.go b/routers/repo/attachment_model.go
index e820f01dd..6ed35a602 100644
--- a/routers/repo/attachment_model.go
+++ b/routers/repo/attachment_model.go
@@ -261,14 +261,17 @@ func NewModelMultipart(ctx *context.Context) {
 
 		uuid := gouuid.NewV4().String()
 		var uploadID string
+		var objectName string
 		if typeCloudBrain == models.TypeCloudBrainOne {
-			uploadID, err = storage.NewMultiPartUpload(strings.TrimPrefix(path.Join(Model_prefix, path.Join(modeluuid[0:1], modeluuid[1:2], modeluuid, fileName)), "/"))
+			objectName = strings.TrimPrefix(path.Join(Model_prefix, path.Join(modeluuid[0:1], modeluuid[1:2], modeluuid, fileName)), "/")
+			uploadID, err = storage.NewMultiPartUpload(objectName)
 			if err != nil {
 				ctx.ServerError("NewMultipart", err)
 				return
 			}
 		} else {
-			uploadID, err = storage.NewObsMultiPartUpload(strings.TrimPrefix(path.Join(Model_prefix, path.Join(modeluuid[0:1], modeluuid[1:2], modeluuid, fileName)), "/"))
+			objectName = strings.TrimPrefix(path.Join(Model_prefix, path.Join(modeluuid[0:1], modeluuid[1:2], modeluuid, fileName)), "/")
+			uploadID, err = storage.NewObsMultiPartUpload(objectName)
 			if err != nil {
 				ctx.ServerError("NewObsMultiPartUpload", err)
 				return
@@ -281,6 +284,7 @@ func NewModelMultipart(ctx *context.Context) {
 			UploadID:    uploadID,
 			Md5:         ctx.Query("md5"),
 			Size:        fileSize,
+			ObjectName:  objectName,
 			TotalChunks: totalChunkCounts,
 			Type:        typeCloudBrain,
 		})

From 2b1d1de798c21b31a14b4ad38dbd951714cde9b0 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Tue, 15 Nov 2022 10:23:32 +0800
Subject: [PATCH 168/187] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/repo/attachment_model.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/routers/repo/attachment_model.go b/routers/repo/attachment_model.go
index 6ed35a602..63d755d8c 100644
--- a/routers/repo/attachment_model.go
+++ b/routers/repo/attachment_model.go
@@ -270,6 +270,7 @@ func NewModelMultipart(ctx *context.Context) {
 				return
 			}
 		} else {
+
 			objectName = strings.TrimPrefix(path.Join(Model_prefix, path.Join(modeluuid[0:1], modeluuid[1:2], modeluuid, fileName)), "/")
 			uploadID, err = storage.NewObsMultiPartUpload(objectName)
 			if err != nil {

From 63d56c635f7f35ce00858e1f6bf4ccb914d149e0 Mon Sep 17 00:00:00 2001
From: chenshihai <chenshh@pcl.ac.cn>
Date: Tue, 15 Nov 2022 10:32:56 +0800
Subject: [PATCH 169/187] update

---
 .../modelmanage/common/modelmanage-common-detail.vue     | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/web_src/vuepages/pages/modelmanage/common/modelmanage-common-detail.vue b/web_src/vuepages/pages/modelmanage/common/modelmanage-common-detail.vue
index 0bb4dc70c..e08b09ed1 100644
--- a/web_src/vuepages/pages/modelmanage/common/modelmanage-common-detail.vue
+++ b/web_src/vuepages/pages/modelmanage/common/modelmanage-common-detail.vue
@@ -271,12 +271,14 @@ export default {
         label: item.FileName,
         path: item.FileName
       });
-      this.getDirFiles(item.FileName);
+      const dir = this.filePath.map((item) => item.path).join('/');
+      this.getDirFiles(dir);
     },
     goBackDir(item) {
       const index = this.filePath.findIndex(pth => item === pth);
       this.filePath = this.filePath.slice(0, index + 1);
-      this.getDirFiles(item.path);
+      const dir = this.filePath.map((item) => item.path).join('/');
+      this.getDirFiles(dir);
     },
     changeVersion(version, noFileRefresh) {
       const data = this.modelList.filter((model) => model.version == version)[0];
@@ -408,7 +410,8 @@ export default {
             setTimeout(() => {
               this.loading = false;
               this.updateModelInfo();
-              this.getDirFiles(this.filePath[this.filePath.length - 1].path);
+              const dir = this.filePath.map((item) => item.path).join('/');
+              this.getDirFiles(dir);
             }, 30);
           } else {
             this.loading = false;

From 3f4a725b8303b703506b9a69af79407ddc0ab313 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Tue, 15 Nov 2022 10:34:43 +0800
Subject: [PATCH 170/187] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=A4=9A=E7=BA=A7?=
 =?UTF-8?q?=E7=9B=AE=E5=BD=95=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 .../modelmanage/common/modelmanage-common-detail.vue     | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/web_src/vuepages/pages/modelmanage/common/modelmanage-common-detail.vue b/web_src/vuepages/pages/modelmanage/common/modelmanage-common-detail.vue
index 0bb4dc70c..e08b09ed1 100644
--- a/web_src/vuepages/pages/modelmanage/common/modelmanage-common-detail.vue
+++ b/web_src/vuepages/pages/modelmanage/common/modelmanage-common-detail.vue
@@ -271,12 +271,14 @@ export default {
         label: item.FileName,
         path: item.FileName
       });
-      this.getDirFiles(item.FileName);
+      const dir = this.filePath.map((item) => item.path).join('/');
+      this.getDirFiles(dir);
     },
     goBackDir(item) {
       const index = this.filePath.findIndex(pth => item === pth);
       this.filePath = this.filePath.slice(0, index + 1);
-      this.getDirFiles(item.path);
+      const dir = this.filePath.map((item) => item.path).join('/');
+      this.getDirFiles(dir);
     },
     changeVersion(version, noFileRefresh) {
       const data = this.modelList.filter((model) => model.version == version)[0];
@@ -408,7 +410,8 @@ export default {
             setTimeout(() => {
               this.loading = false;
               this.updateModelInfo();
-              this.getDirFiles(this.filePath[this.filePath.length - 1].path);
+              const dir = this.filePath.map((item) => item.path).join('/');
+              this.getDirFiles(dir);
             }, 30);
           } else {
             this.loading = false;

From 611c52a0870f81941cc45b071a01f22254f77d95 Mon Sep 17 00:00:00 2001
From: chenshihai <chenshh@pcl.ac.cn>
Date: Tue, 15 Nov 2022 11:48:52 +0800
Subject: [PATCH 171/187] fix-bugs

---
 web_src/js/components/Model.vue                               | 4 ++--
 .../pages/modelmanage/common/modelmanage-common-detail.vue    | 2 +-
 .../pages/modelmanage/local/modelmanage-local-create-1.vue    | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/web_src/js/components/Model.vue b/web_src/js/components/Model.vue
index d97249b2b..02b8643ae 100644
--- a/web_src/js/components/Model.vue
+++ b/web_src/js/components/Model.vue
@@ -26,7 +26,7 @@
               <span v-if="!scope.row.Children" :class="scope.row.modelType == '1' ? 'm-local' : 'm-online'">{{ scope.row.modelType == '1' ? i18n.local : i18n.online }}</span>
               <a
                 class="text-over"
-                :href="showinfoHref + scope.row.name"
+                :href="showinfoHref + encodeURIComponent(scope.row.name)"
                 :title="scope.row.name"
                 >{{ scope.row.name }}</a
               >
@@ -153,7 +153,7 @@
                 >-->
                 <a class="op-btn"
                   v-show="scope.row.modelType == 1"
-                  :href="url + 'create_local_model_1?type=1&name=' + scope.row.name + '&id=' + scope.row.id"
+                  :href="url + 'create_local_model_1?type=1&name=' + encodeURIComponent(scope.row.name) + '&id=' + scope.row.id"
                   :class="{ disabled: !scope.row.isCanOper }"
                   >{{ i18n.modify }}</a>
                 <a class="op-btn" v-show="scope.row.modelType != 1" style="color:transparent;cursor:default;" >{{ i18n.modify }}</a>
diff --git a/web_src/vuepages/pages/modelmanage/common/modelmanage-common-detail.vue b/web_src/vuepages/pages/modelmanage/common/modelmanage-common-detail.vue
index e08b09ed1..70e496101 100644
--- a/web_src/vuepages/pages/modelmanage/common/modelmanage-common-detail.vue
+++ b/web_src/vuepages/pages/modelmanage/common/modelmanage-common-detail.vue
@@ -342,7 +342,7 @@ export default {
       }
     },
     goUploadPage() {
-      window.location.href = `${this.repo}/modelmanage/create_local_model_2?type=1&name=${this.state.name}&id=${this.state.id}`;
+      window.location.href = `${this.repo}/modelmanage/create_local_model_2?type=1&name=${encodeURIComponent(this.state.name)}&id=${this.state.id}`;
     },
     backToModelListPage() {
       const list = window.location.href.split('/');
diff --git a/web_src/vuepages/pages/modelmanage/local/modelmanage-local-create-1.vue b/web_src/vuepages/pages/modelmanage/local/modelmanage-local-create-1.vue
index 815b5368d..a3d7e5785 100644
--- a/web_src/vuepages/pages/modelmanage/local/modelmanage-local-create-1.vue
+++ b/web_src/vuepages/pages/modelmanage/local/modelmanage-local-create-1.vue
@@ -168,7 +168,7 @@ export default {
           const list = window.location.href.split('/');
           list.pop();
           list.push('create_local_model_2');
-          window.location.href = list.join('/') + '?type=0&name=' + this.state.name + '&id=' + res.id;
+          window.location.href = list.join('/') + '?type=0&name=' + encodeURIComponent(this.state.name) + '&id=' + res.id;
         } if (res && res.code == '-1') {
           this.$message({
             type: 'error',
@@ -194,7 +194,7 @@ export default {
       const list = window.location.href.split('/');
       list.pop();
       list.push('show_model_info');
-      window.location.href = list.join('/') + '?name=' + this.state.name;
+      window.location.href = list.join('/') + '?name=' + encodeURIComponent(this.state.name);
     }
   },
   mounted() {

From f5fa4bda66794450cc455cffe3ba98f8d5ce8856 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Tue, 15 Nov 2022 11:50:13 +0800
Subject: [PATCH 172/187] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=EF=BC=8C=E8=A7=A3=E5=86=B3Bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/repo/attachment_model.go | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/routers/repo/attachment_model.go b/routers/repo/attachment_model.go
index 63d755d8c..e89666174 100644
--- a/routers/repo/attachment_model.go
+++ b/routers/repo/attachment_model.go
@@ -210,8 +210,10 @@ func copyModelAttachmentFile(typeCloudBrain int, fileChunk *models.ModelFileChun
 		}
 	} else {
 		bucketName := setting.Bucket
-		log.Info("obs copy..srcObjectName=" + srcObjectName + " bucketName=" + bucketName)
-		if storage.ObsGetFilesSize(bucketName, []string{destObjectName}) > 0 {
+		log.Info("obs copy..srcObjectName=" + srcObjectName + " bucketName=" + bucketName + " destObjectName=" + destObjectName)
+		size := storage.ObsGetFilesSize(bucketName, []string{destObjectName})
+		log.Info("size=" + fmt.Sprint(size))
+		if size > 0 {
 			isExist = true
 		} else {
 			log.Info("obs copy..srcObjectName=" + srcObjectName + " bucketName=" + bucketName)

From 4887c89c898cbf6b6ddd84bdce1e866947da2ebb Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Tue, 15 Nov 2022 11:55:45 +0800
Subject: [PATCH 173/187] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=EF=BC=8C=E8=A7=A3=E5=86=B3=E9=97=AE=E9=A2=98=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/repo/attachment_model.go | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/routers/repo/attachment_model.go b/routers/repo/attachment_model.go
index e89666174..15da4f54f 100644
--- a/routers/repo/attachment_model.go
+++ b/routers/repo/attachment_model.go
@@ -144,13 +144,11 @@ func GetModelChunks(ctx *context.Context) {
 	if dbmodeluuid != modeluuid {
 		log.Info("The file has uploaded.fileChunk.ObjectName=" + fileChunk.ObjectName + " typeCloudBrain=" + fmt.Sprint(typeCloudBrain))
 		isExist := copyModelAttachmentFile(typeCloudBrain, fileChunk, fileName, modeluuid)
-		if dbmodeluuid != "" {
-			model, err := models.QueryModelById(dbmodeluuid)
+		if isExist {
+			model, err := models.QueryModelById(modeluuid)
 			if err == nil && model != nil {
 				modelname = model.Name
 			}
-		}
-		if isExist {
 			ctx.JSON(200, map[string]string{
 				"uuid":      fileChunk.UUID,
 				"uploaded":  strconv.Itoa(fileChunk.IsUploaded),

From a423bdaf8028bc3699fd5becafee0f806b8d85af Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Tue, 15 Nov 2022 14:07:38 +0800
Subject: [PATCH 174/187] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=EF=BC=8C=E8=A7=A3=E5=86=B3Bug=E9=97=AE=E9=A2=98=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 models/file_chunk.go             |  11 +-
 routers/repo/attachment_model.go | 227 ++++++++++++++-----------------
 2 files changed, 111 insertions(+), 127 deletions(-)

diff --git a/models/file_chunk.go b/models/file_chunk.go
index 339b5d7a4..cad7746b7 100755
--- a/models/file_chunk.go
+++ b/models/file_chunk.go
@@ -30,8 +30,9 @@ type FileChunk struct {
 
 type ModelFileChunk struct {
 	ID             int64  `xorm:"pk autoincr"`
-	UUID           string `xorm:"uuid UNIQUE"`
+	UUID           string `xorm:"INDEX"`
 	Md5            string `xorm:"INDEX"`
+	ModelUUID      string `xorm:"INDEX"`
 	ObjectName     string `xorm:"DEFAULT ''"`
 	IsUploaded     int    `xorm:"DEFAULT 0"` // not uploaded: 0, uploaded: 1
 	UploadID       string `xorm:"UNIQUE"`    //minio upload id
@@ -65,14 +66,14 @@ func GetFileChunkByMD5AndUser(md5 string, userID int64, typeCloudBrain int) (*Fi
 	return getFileChunkByMD5AndUser(x, md5, userID, typeCloudBrain)
 }
 
-func GetModelFileChunkByMD5AndUser(md5 string, userID int64, typeCloudBrain int) (*ModelFileChunk, error) {
-	return getModelFileChunkByMD5AndUser(x, md5, userID, typeCloudBrain)
+func GetModelFileChunkByMD5AndUser(md5 string, userID int64, typeCloudBrain int, uuid string) (*ModelFileChunk, error) {
+	return getModelFileChunkByMD5AndUser(x, md5, userID, typeCloudBrain, uuid)
 }
 
-func getModelFileChunkByMD5AndUser(e Engine, md5 string, userID int64, typeCloudBrain int) (*ModelFileChunk, error) {
+func getModelFileChunkByMD5AndUser(e Engine, md5 string, userID int64, typeCloudBrain int, uuid string) (*ModelFileChunk, error) {
 	fileChunk := new(ModelFileChunk)
 
-	if has, err := e.Where("md5 = ? and user_id = ? and type = ?", md5, userID, typeCloudBrain).Get(fileChunk); err != nil {
+	if has, err := e.Where("md5 = ? and user_id = ? and type = ? and model_uuid= ?", md5, userID, typeCloudBrain, uuid).Get(fileChunk); err != nil {
 		return nil, err
 	} else if !has {
 		return nil, ErrFileChunkNotExist{md5, ""}
diff --git a/routers/repo/attachment_model.go b/routers/repo/attachment_model.go
index 15da4f54f..b5b21b06b 100644
--- a/routers/repo/attachment_model.go
+++ b/routers/repo/attachment_model.go
@@ -31,7 +31,7 @@ func GetModelChunks(ctx *context.Context) {
 		return
 	}
 
-	fileChunk, err := models.GetModelFileChunkByMD5AndUser(fileMD5, ctx.User.ID, typeCloudBrain)
+	fileChunk, err := models.GetModelFileChunkByMD5AndUser(fileMD5, ctx.User.ID, typeCloudBrain, modeluuid)
 	if err != nil {
 		if models.IsErrFileChunkNotExist(err) {
 			ctx.JSON(200, map[string]string{
@@ -79,6 +79,21 @@ func GetModelChunks(ctx *context.Context) {
 				log.Error("UpdateFileChunk failed:", err.Error())
 			}
 		}
+		modelname := ""
+		model, err := models.QueryModelById(modeluuid)
+		if err == nil && model != nil {
+			modelname = model.Name
+		}
+		ctx.JSON(200, map[string]string{
+			"uuid":      fileChunk.UUID,
+			"uploaded":  strconv.Itoa(fileChunk.IsUploaded),
+			"uploadID":  fileChunk.UploadID,
+			"chunks":    string(chunks),
+			"attachID":  "0",
+			"modeluuid": modeluuid,
+			"fileName":  fileName,
+			"modelName": modelname,
+		})
 	} else {
 		if fileChunk.IsUploaded == models.FileUploaded {
 			log.Info("the file has been recorded but not uploaded")
@@ -107,120 +122,103 @@ func GetModelChunks(ctx *context.Context) {
 				"uploadID": "",
 				"chunks":   "",
 			})
-			return
-		}
-	}
-
-	var attachID int64
-	attach, err := models.GetAttachmentByUUID(fileChunk.UUID)
-	if err != nil {
-		if models.IsErrAttachmentNotExist(err) {
-			attachID = 0
-		} else {
-			ctx.ServerError("GetAttachmentByUUID", err)
-			return
-		}
-	} else {
-		attachID = attach.ID
-	}
-
-	if attach == nil {
-		ctx.JSON(200, map[string]string{
-			"uuid":        fileChunk.UUID,
-			"uploaded":    strconv.Itoa(fileChunk.IsUploaded),
-			"uploadID":    fileChunk.UploadID,
-			"chunks":      string(chunks),
-			"attachID":    "0",
-			"datasetID":   "0",
-			"fileName":    "",
-			"datasetName": "",
-		})
-		return
-	}
-
-	//使用description存储模型信息
-	dbmodeluuid := attach.Description
-	modelname := ""
-	if dbmodeluuid != modeluuid {
-		log.Info("The file has uploaded.fileChunk.ObjectName=" + fileChunk.ObjectName + " typeCloudBrain=" + fmt.Sprint(typeCloudBrain))
-		isExist := copyModelAttachmentFile(typeCloudBrain, fileChunk, fileName, modeluuid)
-		if isExist {
-			model, err := models.QueryModelById(modeluuid)
-			if err == nil && model != nil {
-				modelname = model.Name
-			}
-			ctx.JSON(200, map[string]string{
-				"uuid":      fileChunk.UUID,
-				"uploaded":  strconv.Itoa(fileChunk.IsUploaded),
-				"uploadID":  fileChunk.UploadID,
-				"chunks":    string(chunks),
-				"attachID":  strconv.Itoa(int(attachID)),
-				"modeluuid": modeluuid,
-				"fileName":  attach.Name,
-				"modelName": modelname,
-			})
 		} else {
-			UpdateModelSize(modeluuid)
 			ctx.JSON(200, map[string]string{
-				"uuid":     fileChunk.UUID,
-				"uploaded": strconv.Itoa(fileChunk.IsUploaded),
-				"uploadID": fileChunk.UploadID,
-				"chunks":   string(chunks),
-				"attachID": strconv.Itoa(int(attachID)),
-				"fileName": attach.Name,
+				"uuid":        fileChunk.UUID,
+				"uploaded":    strconv.Itoa(fileChunk.IsUploaded),
+				"uploadID":    fileChunk.UploadID,
+				"chunks":      string(chunks),
+				"attachID":    "0",
+				"datasetID":   "0",
+				"fileName":    "",
+				"datasetName": "",
 			})
 		}
-		return
-	} else {
-		model, err := models.QueryModelById(dbmodeluuid)
-		if err == nil {
-			modelname = model.Name
-		}
-		ctx.JSON(200, map[string]string{
-			"uuid":      fileChunk.UUID,
-			"uploaded":  strconv.Itoa(fileChunk.IsUploaded),
-			"uploadID":  fileChunk.UploadID,
-			"chunks":    string(chunks),
-			"attachID":  strconv.Itoa(int(attachID)),
-			"modeluuid": dbmodeluuid,
-			"fileName":  attach.Name,
-			"modelName": modelname,
-		})
-		return
 	}
 
-}
-
-func copyModelAttachmentFile(typeCloudBrain int, fileChunk *models.ModelFileChunk, fileName, modeluuid string) bool {
-	srcObjectName := fileChunk.ObjectName
-	var isExist bool
-	//copy
-	destObjectName := getObjectName(fileName, modeluuid)
-	if typeCloudBrain == models.TypeCloudBrainOne {
-		bucketName := setting.Attachment.Minio.Bucket
-		log.Info("minio copy..srcObjectName=" + srcObjectName + " bucketName=" + bucketName)
-		if storage.MinioGetFilesSize(bucketName, []string{destObjectName}) > 0 {
-			isExist = true
-		} else {
+	// //使用description存储模型信息
+	// dbmodeluuid := attach.Description
+	// modelname := ""
+	// if dbmodeluuid != modeluuid {
+	// 	log.Info("The file has uploaded.fileChunk.ObjectName=" + fileChunk.ObjectName + " typeCloudBrain=" + fmt.Sprint(typeCloudBrain))
+	// 	isExist := copyModelAttachmentFile(typeCloudBrain, fileChunk, fileName, modeluuid)
+	// 	if isExist {
+	// 		model, err := models.QueryModelById(modeluuid)
+	// 		if err == nil && model != nil {
+	// 			modelname = model.Name
+	// 		}
+	// 		ctx.JSON(200, map[string]string{
+	// 			"uuid":      fileChunk.UUID,
+	// 			"uploaded":  strconv.Itoa(fileChunk.IsUploaded),
+	// 			"uploadID":  fileChunk.UploadID,
+	// 			"chunks":    string(chunks),
+	// 			"attachID":  strconv.Itoa(int(attachID)),
+	// 			"modeluuid": modeluuid,
+	// 			"fileName":  attach.Name,
+	// 			"modelName": modelname,
+	// 		})
+	// 	} else {
+	// 		UpdateModelSize(modeluuid)
+	// 		ctx.JSON(200, map[string]string{
+	// 			"uuid":     fileChunk.UUID,
+	// 			"uploaded": strconv.Itoa(fileChunk.IsUploaded),
+	// 			"uploadID": fileChunk.UploadID,
+	// 			"chunks":   string(chunks),
+	// 			"attachID": strconv.Itoa(int(attachID)),
+	// 			"fileName": attach.Name,
+	// 		})
+	// 	}
+	// 	return
+	// } else {
+	// 	model, err := models.QueryModelById(dbmodeluuid)
+	// 	if err == nil {
+	// 		modelname = model.Name
+	// 	}
+	// 	ctx.JSON(200, map[string]string{
+	// 		"uuid":      fileChunk.UUID,
+	// 		"uploaded":  strconv.Itoa(fileChunk.IsUploaded),
+	// 		"uploadID":  fileChunk.UploadID,
+	// 		"chunks":    string(chunks),
+	// 		"attachID":  strconv.Itoa(int(attachID)),
+	// 		"modeluuid": dbmodeluuid,
+	// 		"fileName":  attach.Name,
+	// 		"modelName": modelname,
+	// 	})
+	// 	return
+	// }
 
-			log.Info("minio copy..srcObjectName=" + srcObjectName + " bucketName=" + bucketName)
-			storage.MinioCopyAFile(bucketName, srcObjectName, bucketName, destObjectName)
-		}
-	} else {
-		bucketName := setting.Bucket
-		log.Info("obs copy..srcObjectName=" + srcObjectName + " bucketName=" + bucketName + " destObjectName=" + destObjectName)
-		size := storage.ObsGetFilesSize(bucketName, []string{destObjectName})
-		log.Info("size=" + fmt.Sprint(size))
-		if size > 0 {
-			isExist = true
-		} else {
-			log.Info("obs copy..srcObjectName=" + srcObjectName + " bucketName=" + bucketName)
-			storage.ObsCopyFile(bucketName, srcObjectName, bucketName, destObjectName)
-		}
-	}
-	return isExist
 }
 
+// func copyModelAttachmentFile(typeCloudBrain int, fileChunk *models.ModelFileChunk, fileName, modeluuid string) bool {
+// 	srcObjectName := fileChunk.ObjectName
+// 	var isExist bool
+// 	//copy
+// 	destObjectName := getObjectName(fileName, modeluuid)
+// 	if typeCloudBrain == models.TypeCloudBrainOne {
+// 		bucketName := setting.Attachment.Minio.Bucket
+// 		log.Info("minio copy..srcObjectName=" + srcObjectName + " bucketName=" + bucketName)
+// 		if storage.MinioGetFilesSize(bucketName, []string{destObjectName}) > 0 {
+// 			isExist = true
+// 		} else {
+
+// 			log.Info("minio copy..srcObjectName=" + srcObjectName + " bucketName=" + bucketName)
+// 			storage.MinioCopyAFile(bucketName, srcObjectName, bucketName, destObjectName)
+// 		}
+// 	} else {
+// 		bucketName := setting.Bucket
+// 		log.Info("obs copy..srcObjectName=" + srcObjectName + " bucketName=" + bucketName + " destObjectName=" + destObjectName)
+// 		size := storage.ObsGetFilesSize(bucketName, []string{destObjectName})
+// 		log.Info("size=" + fmt.Sprint(size))
+// 		if size > 0 {
+// 			isExist = true
+// 		} else {
+// 			log.Info("obs copy..srcObjectName=" + srcObjectName + " bucketName=" + bucketName)
+// 			storage.ObsCopyFile(bucketName, srcObjectName, bucketName, destObjectName)
+// 		}
+// 	}
+// 	return isExist
+// }
+
 func getObjectName(filename string, modeluuid string) string {
 	return strings.TrimPrefix(path.Join(Model_prefix, path.Join(modeluuid[0:1], modeluuid[1:2], modeluuid, filename)), "/")
 }
@@ -286,6 +284,7 @@ func NewModelMultipart(ctx *context.Context) {
 			Md5:         ctx.Query("md5"),
 			Size:        fileSize,
 			ObjectName:  objectName,
+			ModelUUID:   modeluuid,
 			TotalChunks: totalChunkCounts,
 			Type:        typeCloudBrain,
 		})
@@ -361,7 +360,6 @@ func CompleteModelMultipart(ctx *context.Context) {
 	uuid := ctx.Query("uuid")
 	uploadID := ctx.Query("uploadID")
 	typeCloudBrain := ctx.QueryInt("type")
-	fileName := ctx.Query("file_name")
 	modeluuid := ctx.Query("modeluuid")
 	log.Warn("uuid:" + uuid)
 	log.Warn("modeluuid:" + modeluuid)
@@ -406,21 +404,6 @@ func CompleteModelMultipart(ctx *context.Context) {
 	//更新模型大小信息
 	UpdateModelSize(modeluuid)
 
-	_, err = models.InsertAttachment(&models.Attachment{
-		UUID:        uuid,
-		UploaderID:  ctx.User.ID,
-		IsPrivate:   true,
-		Name:        fileName,
-		Size:        ctx.QueryInt64("size"),
-		DatasetID:   0,
-		Description: modeluuid,
-		Type:        typeCloudBrain,
-	})
-
-	if err != nil {
-		ctx.Error(500, fmt.Sprintf("InsertAttachment: %v", err))
-		return
-	}
 	ctx.JSON(200, map[string]string{
 		"result_code": "0",
 	})

From 4e110b776b9ae14f405605cb03b06be38065011c Mon Sep 17 00:00:00 2001
From: chenshihai <chenshh@pcl.ac.cn>
Date: Tue, 15 Nov 2022 14:18:41 +0800
Subject: [PATCH 175/187] update

---
 .../pages/modelmanage/common/modelmanage-common-detail.vue   | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/web_src/vuepages/pages/modelmanage/common/modelmanage-common-detail.vue b/web_src/vuepages/pages/modelmanage/common/modelmanage-common-detail.vue
index 70e496101..8ac6c6ff8 100644
--- a/web_src/vuepages/pages/modelmanage/common/modelmanage-common-detail.vue
+++ b/web_src/vuepages/pages/modelmanage/common/modelmanage-common-detail.vue
@@ -249,12 +249,13 @@ export default {
   components: {},
   methods: {
     getDirFiles(dir) {
+      dir = dir.length ? dir.slice(1) : '';
       getModelFiles({
         repo: this.repo,
         ID: this.state.id,
-        parentDir: dir || '',
+        parentDir: dir,
       }).then(res => {
-        const list = res.data || [];
+        const list = res.data || [];       
         list.forEach(item => {
           item.SizeShow = item.IsDir ? '' : transFileSize(item.Size);
           item.ModTimeNum = new Date(item.ModTime).getTime();

From f2d195113dfe4eafe1f75046eb5aebb3c2fcdbd7 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Tue, 15 Nov 2022 14:22:25 +0800
Subject: [PATCH 176/187] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/repo/attachment_model.go | 82 --------------------------------
 1 file changed, 82 deletions(-)

diff --git a/routers/repo/attachment_model.go b/routers/repo/attachment_model.go
index b5b21b06b..bfd298744 100644
--- a/routers/repo/attachment_model.go
+++ b/routers/repo/attachment_model.go
@@ -135,90 +135,8 @@ func GetModelChunks(ctx *context.Context) {
 			})
 		}
 	}
-
-	// //使用description存储模型信息
-	// dbmodeluuid := attach.Description
-	// modelname := ""
-	// if dbmodeluuid != modeluuid {
-	// 	log.Info("The file has uploaded.fileChunk.ObjectName=" + fileChunk.ObjectName + " typeCloudBrain=" + fmt.Sprint(typeCloudBrain))
-	// 	isExist := copyModelAttachmentFile(typeCloudBrain, fileChunk, fileName, modeluuid)
-	// 	if isExist {
-	// 		model, err := models.QueryModelById(modeluuid)
-	// 		if err == nil && model != nil {
-	// 			modelname = model.Name
-	// 		}
-	// 		ctx.JSON(200, map[string]string{
-	// 			"uuid":      fileChunk.UUID,
-	// 			"uploaded":  strconv.Itoa(fileChunk.IsUploaded),
-	// 			"uploadID":  fileChunk.UploadID,
-	// 			"chunks":    string(chunks),
-	// 			"attachID":  strconv.Itoa(int(attachID)),
-	// 			"modeluuid": modeluuid,
-	// 			"fileName":  attach.Name,
-	// 			"modelName": modelname,
-	// 		})
-	// 	} else {
-	// 		UpdateModelSize(modeluuid)
-	// 		ctx.JSON(200, map[string]string{
-	// 			"uuid":     fileChunk.UUID,
-	// 			"uploaded": strconv.Itoa(fileChunk.IsUploaded),
-	// 			"uploadID": fileChunk.UploadID,
-	// 			"chunks":   string(chunks),
-	// 			"attachID": strconv.Itoa(int(attachID)),
-	// 			"fileName": attach.Name,
-	// 		})
-	// 	}
-	// 	return
-	// } else {
-	// 	model, err := models.QueryModelById(dbmodeluuid)
-	// 	if err == nil {
-	// 		modelname = model.Name
-	// 	}
-	// 	ctx.JSON(200, map[string]string{
-	// 		"uuid":      fileChunk.UUID,
-	// 		"uploaded":  strconv.Itoa(fileChunk.IsUploaded),
-	// 		"uploadID":  fileChunk.UploadID,
-	// 		"chunks":    string(chunks),
-	// 		"attachID":  strconv.Itoa(int(attachID)),
-	// 		"modeluuid": dbmodeluuid,
-	// 		"fileName":  attach.Name,
-	// 		"modelName": modelname,
-	// 	})
-	// 	return
-	// }
-
 }
 
-// func copyModelAttachmentFile(typeCloudBrain int, fileChunk *models.ModelFileChunk, fileName, modeluuid string) bool {
-// 	srcObjectName := fileChunk.ObjectName
-// 	var isExist bool
-// 	//copy
-// 	destObjectName := getObjectName(fileName, modeluuid)
-// 	if typeCloudBrain == models.TypeCloudBrainOne {
-// 		bucketName := setting.Attachment.Minio.Bucket
-// 		log.Info("minio copy..srcObjectName=" + srcObjectName + " bucketName=" + bucketName)
-// 		if storage.MinioGetFilesSize(bucketName, []string{destObjectName}) > 0 {
-// 			isExist = true
-// 		} else {
-
-// 			log.Info("minio copy..srcObjectName=" + srcObjectName + " bucketName=" + bucketName)
-// 			storage.MinioCopyAFile(bucketName, srcObjectName, bucketName, destObjectName)
-// 		}
-// 	} else {
-// 		bucketName := setting.Bucket
-// 		log.Info("obs copy..srcObjectName=" + srcObjectName + " bucketName=" + bucketName + " destObjectName=" + destObjectName)
-// 		size := storage.ObsGetFilesSize(bucketName, []string{destObjectName})
-// 		log.Info("size=" + fmt.Sprint(size))
-// 		if size > 0 {
-// 			isExist = true
-// 		} else {
-// 			log.Info("obs copy..srcObjectName=" + srcObjectName + " bucketName=" + bucketName)
-// 			storage.ObsCopyFile(bucketName, srcObjectName, bucketName, destObjectName)
-// 		}
-// 	}
-// 	return isExist
-// }
-
 func getObjectName(filename string, modeluuid string) string {
 	return strings.TrimPrefix(path.Join(Model_prefix, path.Join(modeluuid[0:1], modeluuid[1:2], modeluuid, filename)), "/")
 }

From 218c06fcf530af56e17c48b87a7148ef44f563e9 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Tue, 15 Nov 2022 14:33:23 +0800
Subject: [PATCH 177/187] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/repo/attachment_model.go | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/routers/repo/attachment_model.go b/routers/repo/attachment_model.go
index bfd298744..efc7cbe08 100644
--- a/routers/repo/attachment_model.go
+++ b/routers/repo/attachment_model.go
@@ -227,7 +227,6 @@ func GetModelMultipartUploadUrl(ctx *context.Context) {
 	uploadID := ctx.Query("uploadID")
 	partNumber := ctx.QueryInt("chunkNumber")
 	size := ctx.QueryInt64("size")
-	fileName := ctx.Query("file_name")
 	typeCloudBrain := ctx.QueryInt("type")
 	err := checkTypeCloudBrain(typeCloudBrain)
 	if err != nil {
@@ -249,24 +248,19 @@ func GetModelMultipartUploadUrl(ctx *context.Context) {
 			ctx.Error(400, fmt.Sprintf("chunk size(%d) is too big", size))
 			return
 		}
-
 		url, err = storage.GenMultiPartSignedUrl(fileChunk.ObjectName, uploadID, partNumber, size)
 		if err != nil {
 			ctx.Error(500, fmt.Sprintf("GenMultiPartSignedUrl failed: %v", err))
 			return
 		}
 	} else {
-		if setting.PROXYURL != "" {
-			url = setting.PROXYURL + "/obs_proxy_multipart?uuid=" + uuid + "&uploadId=" + uploadID + "&partNumber=" + fmt.Sprint(partNumber) + "&file_name=" + fileName
-			log.Info("return url=" + url)
-		} else {
-			url, err = storage.ObsGenMultiPartSignedUrl(fileChunk.ObjectName, uploadID, partNumber)
-			if err != nil {
-				ctx.Error(500, fmt.Sprintf("ObsGenMultiPartSignedUrl failed: %v", err))
-				return
-			}
-			log.Info("url=" + url)
+		url, err = storage.ObsGenMultiPartSignedUrl(fileChunk.ObjectName, uploadID, partNumber)
+		if err != nil {
+			ctx.Error(500, fmt.Sprintf("ObsGenMultiPartSignedUrl failed: %v", err))
+			return
 		}
+		log.Info("url=" + url)
+
 	}
 
 	ctx.JSON(200, map[string]string{

From 827961f03be91e8549e161cb027543cecfa25182 Mon Sep 17 00:00:00 2001
From: chenshihai <chenshh@pcl.ac.cn>
Date: Tue, 15 Nov 2022 14:44:46 +0800
Subject: [PATCH 178/187] update

---
 .../pages/modelmanage/common/modelmanage-common-detail.vue    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/web_src/vuepages/pages/modelmanage/common/modelmanage-common-detail.vue b/web_src/vuepages/pages/modelmanage/common/modelmanage-common-detail.vue
index 8ac6c6ff8..fb7c51063 100644
--- a/web_src/vuepages/pages/modelmanage/common/modelmanage-common-detail.vue
+++ b/web_src/vuepages/pages/modelmanage/common/modelmanage-common-detail.vue
@@ -177,7 +177,7 @@
                     </div>
                   </a>
                   <a v-else :class="!canOperate ? 'disabled-download' : ''"
-                    :href="canOperate ? `${repo}/modelmanage/${state.id}/downloadsingle?parentDir=${filePath[filePath.length - 1].path ? filePath[filePath.length - 1].path + '/' : ''}&fileName=${scope.row.FileName}` : 'javascript:;'">
+                    :href="canOperate ? `${repo}/modelmanage/${state.id}/downloadsingle?parentDir=${filePath.length > 1 ? encodeURIComponent(filePath.map(item => item.path).join('/').slice(1) + '/') : ''}&fileName=${scope.row.FileName}` : 'javascript:;'">
                     <div class="fitted" :title="scope.row.FileName">
                       <i class="icon file" width="16" height="16" aria-hidden="true"></i>
                       <span>{{ scope.row.FileName }}</span>
@@ -255,7 +255,7 @@ export default {
         ID: this.state.id,
         parentDir: dir,
       }).then(res => {
-        const list = res.data || [];       
+        const list = res.data || [];
         list.forEach(item => {
           item.SizeShow = item.IsDir ? '' : transFileSize(item.Size);
           item.ModTimeNum = new Date(item.ModTime).getTime();

From 73ffb17ff037c441310198409230fd30ed39d443 Mon Sep 17 00:00:00 2001
From: chenshihai <chenshh@pcl.ac.cn>
Date: Tue, 15 Nov 2022 14:50:32 +0800
Subject: [PATCH 179/187] update

---
 .../pages/modelmanage/local/modelmanage-local-create-1.vue      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web_src/vuepages/pages/modelmanage/local/modelmanage-local-create-1.vue b/web_src/vuepages/pages/modelmanage/local/modelmanage-local-create-1.vue
index a3d7e5785..fefcf4114 100644
--- a/web_src/vuepages/pages/modelmanage/local/modelmanage-local-create-1.vue
+++ b/web_src/vuepages/pages/modelmanage/local/modelmanage-local-create-1.vue
@@ -169,7 +169,7 @@ export default {
           list.pop();
           list.push('create_local_model_2');
           window.location.href = list.join('/') + '?type=0&name=' + encodeURIComponent(this.state.name) + '&id=' + res.id;
-        } if (res && res.code == '-1') {
+        } else if (res && res.code == '-1') {
           this.$message({
             type: 'error',
             message: res.msg,

From ac62fccfa2137f165985036d2292fa30f3de48f3 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Tue, 15 Nov 2022 15:47:55 +0800
Subject: [PATCH 180/187] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=A4=A7=E5=B0=8F=E6=98=BE=E7=A4=BA=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/repo/ai_model_manage.go | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/routers/repo/ai_model_manage.go b/routers/repo/ai_model_manage.go
index b66b50d37..2221a2d4c 100644
--- a/routers/repo/ai_model_manage.go
+++ b/routers/repo/ai_model_manage.go
@@ -451,9 +451,11 @@ func DeleteModelFile(ctx *context.Context) {
 		if model.ModelType == MODEL_LOCAL_TYPE {
 			if model.Type == models.TypeCloudBrainOne {
 				bucketName := setting.Attachment.Minio.Bucket
-				log.Info("bucket=" + bucketName + " path=" + model.Path[len(bucketName)+1:] + fileName)
+				objectName := model.Path[len(bucketName)+1:] + fileName
+				log.Info("delete bucket=" + bucketName + " path=" + objectName)
 				if strings.HasPrefix(model.Path, bucketName+"/"+Model_prefix) {
-					err := storage.Attachments.DeleteDir(model.Path[len(bucketName)+1:] + fileName)
+					totalSize := storage.MinioGetFilesSize(bucketName, []string{objectName})
+					err := storage.Attachments.DeleteDir(objectName)
 					if err != nil {
 						log.Info("Failed to delete model. id=" + id)
 						re := map[string]string{
@@ -463,13 +465,17 @@ func DeleteModelFile(ctx *context.Context) {
 						ctx.JSON(200, re)
 						return
 					} else {
-						UpdateModelSize(id)
+						log.Info("delete minio file size is:" + fmt.Sprint(totalSize))
+						models.ModifyModelSize(id, model.Size-totalSize)
 					}
 				}
 			} else if model.Type == models.TypeCloudBrainTwo {
-				log.Info("bucket=" + setting.Bucket + " path=" + model.Path[len(setting.Bucket)+1:] + fileName)
-				if strings.HasPrefix(model.Path, setting.Bucket+"/"+Model_prefix) {
-					err := storage.ObsRemoveObject(setting.Bucket, model.Path[len(setting.Bucket)+1:]+fileName)
+				bucketName := setting.Bucket
+				objectName := model.Path[len(setting.Bucket)+1:] + fileName
+				log.Info("delete bucket=" + setting.Bucket + " path=" + objectName)
+				if strings.HasPrefix(model.Path, bucketName+"/"+Model_prefix) {
+					totalSize := storage.ObsGetFilesSize(bucketName, []string{objectName})
+					err := storage.ObsRemoveObject(bucketName, objectName)
 					if err != nil {
 						log.Info("Failed to delete model. id=" + id)
 						re := map[string]string{
@@ -479,7 +485,8 @@ func DeleteModelFile(ctx *context.Context) {
 						ctx.JSON(200, re)
 						return
 					} else {
-						UpdateModelSize(id)
+						log.Info("delete obs file size is:" + fmt.Sprint(totalSize))
+						models.ModifyModelSize(id, model.Size-totalSize)
 					}
 				}
 			}

From 47829808c08333bde1abcfeb020f8496eff61579 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Tue, 15 Nov 2022 16:01:24 +0800
Subject: [PATCH 181/187] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/repo/ai_model_manage.go | 20 +++++---------------
 1 file changed, 5 insertions(+), 15 deletions(-)

diff --git a/routers/repo/ai_model_manage.go b/routers/repo/ai_model_manage.go
index 2221a2d4c..7eedb9bc4 100644
--- a/routers/repo/ai_model_manage.go
+++ b/routers/repo/ai_model_manage.go
@@ -76,24 +76,14 @@ func saveModelByParameters(jobId string, versionName string, name string, versio
 	//download model zip   //train type
 	if aiTask.ComputeResource == models.NPUResource {
 		cloudType = models.TypeCloudBrainTwo
-		spec, err := resource.GetCloudbrainSpec(aiTask.ID)
-		if err == nil {
-			flaverName := "NPU: " + fmt.Sprint(spec.AccCardsNum) + "*" + spec.AccCardType + ",CPU: " + fmt.Sprint(spec.CpuCores) + ","
-			if spec.GPUMemGiB > 0 {
-				flaverName += ctx.Tr("cloudbrain.gpu_memory") + ": " + fmt.Sprint(spec.GPUMemGiB) + "GB,"
-			}
-			flaverName += ctx.Tr("cloudbrain.memory") + ": " + fmt.Sprint(spec.MemGiB) + "GB"
-			aiTask.FlavorName = flaverName
-		}
 	} else if aiTask.ComputeResource == models.GPUResource {
 		cloudType = models.TypeCloudBrainOne
-		spec, err := resource.GetCloudbrainSpec(aiTask.ID)
-		if err == nil {
-			flaverName := "GPU: " + fmt.Sprint(spec.AccCardsNum) + "*" + spec.AccCardType + ",CPU: " + fmt.Sprint(spec.CpuCores) + "," + ctx.Tr("cloudbrain.memory") + ": " + fmt.Sprint(spec.MemGiB) + "GB," + ctx.Tr("cloudbrain.shared_memory") + ": " + fmt.Sprint(spec.ShareMemGiB) + "GB"
-			aiTask.FlavorName = flaverName
-		}
 	}
-
+	spec, err := resource.GetCloudbrainSpec(aiTask.ID)
+	if err == nil {
+		specJson, _ := json.Marshal(spec)
+		aiTask.FlavorName = string(specJson)
+	}
 	accuracy := make(map[string]string)
 	accuracy["F1"] = ""
 	accuracy["Recall"] = ""

From a348ad2a328f5ca661b0541478b456ca93409caf Mon Sep 17 00:00:00 2001
From: chenshihai <chenshh@pcl.ac.cn>
Date: Tue, 15 Nov 2022 16:21:04 +0800
Subject: [PATCH 182/187] fix-bugs

---
 .../common/modelmanage-common-detail.vue           | 11 +++++++++--
 web_src/vuepages/utils/index.js                    | 14 ++++++++++++++
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/web_src/vuepages/pages/modelmanage/common/modelmanage-common-detail.vue b/web_src/vuepages/pages/modelmanage/common/modelmanage-common-detail.vue
index fb7c51063..f5bba0323 100644
--- a/web_src/vuepages/pages/modelmanage/common/modelmanage-common-detail.vue
+++ b/web_src/vuepages/pages/modelmanage/common/modelmanage-common-detail.vue
@@ -210,7 +210,7 @@
 <script>
 
 import { getModelInfoByName, modifyModel, getModelFiles, deleteModelFile } from '~/apis/modules/modelmanage';
-import { getUrlSearchParams, getListValueWithKey, transFileSize } from '~/utils';
+import { getUrlSearchParams, getListValueWithKey, transFileSize, renderSpecStr } from '~/utils';
 import { MODEL_ENGINES } from '~/const';
 import { formatDate } from 'element-ui/lib/utils/date-util';
 
@@ -326,6 +326,13 @@ export default {
         const versionHtml = versionName ? `<span class="append-txt" title="${versionName}">${versionName}</span>` : '';
         const codeCommitID = data.codeCommitID;
         const codeCommitIDHtml = codeCommitID ? `<span class="append-txt" title="${codeCommitID}">${codeCommitID.slice(0, 10)}</span>` : '';
+        let specObj;
+        try {
+          specObj = trainTaskInfo.FlavorName ? JSON.parse(trainTaskInfo.FlavorName) : '';
+        } catch (e) {
+          specObj = trainTaskInfo.FlavorName;
+        }
+        const sepcStr = typeof specObj == 'object' ? renderSpecStr(specObj) : specObj;
         Object.assign(this.state, {
           displayJobName: `<a href="${taskUrl}" title="${trainTaskInfo.DisplayJobName}">${trainTaskInfo.DisplayJobName}</a>${versionHtml}`,
           branchName: `<span>${trainTaskInfo.BranchName}</span>${codeCommitIDHtml}`,
@@ -333,7 +340,7 @@ export default {
           datasetName: trainTaskInfo.DatasetName,
           parameters: parametersStr || '--',
           workServerNumber: trainTaskInfo.WorkServerNumber || '--',
-          specStr: trainTaskInfo.FlavorName || '--',
+          specStr: sepcStr || '--',
         });
       }
       this.curVersion = version;
diff --git a/web_src/vuepages/utils/index.js b/web_src/vuepages/utils/index.js
index e3e23f7d3..5b9ecc23f 100644
--- a/web_src/vuepages/utils/index.js
+++ b/web_src/vuepages/utils/index.js
@@ -1,3 +1,7 @@
+
+import { i18n } from '~/langs';
+import { ACC_CARD_TYPE } from '~/const';
+
 export const getListValueWithKey = (list, key, k = 'k', v = 'v') => {
   for (let i = 0, iLen = list.length; i < iLen; i++) {
     const listI = list[i];
@@ -25,3 +29,13 @@ export const transFileSize = (srcSize) => {
   const size = (srcSize / Math.pow(1024, index)).toFixed(2);
   return size + ' ' +  unitArr[index];
 };
+
+export const renderSpecStr = (spec, showPoint) => {
+  if (!spec) return '';
+  var ngpu = `${spec.ComputeResource}: ${spec.AccCardsNum + '*' + getListValueWithKey(ACC_CARD_TYPE, spec.AccCardType)}`;
+  var gpuMemStr = spec.GPUMemGiB != 0 ? `${i18n.t('resourcesManagement.gpuMem')}: ${spec.GPUMemGiB}GB, ` : '';
+  var sharedMemStr = spec.ShareMemGiB != 0 ? `, ${i18n.t('resourcesManagement.shareMem')}: ${spec.ShareMemGiB}GB` : '';
+  var pointStr = showPoint ? `, ${spec.UnitPrice == 0 ? i18n.t('resourcesManagement.free') : spec.UnitPrice + i18n.t('resourcesManagement.point_hr')}` : '';
+  var specStr = `${ngpu}, CPU: ${spec.CpuCores}, ${gpuMemStr}${i18n.t('resourcesManagement.mem')}: ${spec.MemGiB}GB${sharedMemStr}${pointStr}`;
+  return specStr;
+};

From 10e3b11a8e1aefabf4647e58f0e82931db93052b Mon Sep 17 00:00:00 2001
From: chenshihai <chenshh@pcl.ac.cn>
Date: Tue, 15 Nov 2022 16:21:51 +0800
Subject: [PATCH 183/187] fix-bugs

---
 .../pages/modelmanage/common/modelmanage-common-detail.vue      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web_src/vuepages/pages/modelmanage/common/modelmanage-common-detail.vue b/web_src/vuepages/pages/modelmanage/common/modelmanage-common-detail.vue
index f5bba0323..995e2d83f 100644
--- a/web_src/vuepages/pages/modelmanage/common/modelmanage-common-detail.vue
+++ b/web_src/vuepages/pages/modelmanage/common/modelmanage-common-detail.vue
@@ -332,7 +332,7 @@ export default {
         } catch (e) {
           specObj = trainTaskInfo.FlavorName;
         }
-        const sepcStr = typeof specObj == 'object' ? renderSpecStr(specObj) : specObj;
+        const sepcStr = typeof specObj == 'object' ? renderSpecStr(specObj, false) : specObj;
         Object.assign(this.state, {
           displayJobName: `<a href="${taskUrl}" title="${trainTaskInfo.DisplayJobName}">${trainTaskInfo.DisplayJobName}</a>${versionHtml}`,
           branchName: `<span>${trainTaskInfo.BranchName}</span>${codeCommitIDHtml}`,

From cd364700374c0b4b8663941e37ddab20c836469c Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Tue, 15 Nov 2022 18:56:56 +0800
Subject: [PATCH 184/187] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8E=A8=E7=90=86?=
 =?UTF-8?q?=E7=9B=B8=E5=85=B3Bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 web_src/js/features/cloudrbanin.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web_src/js/features/cloudrbanin.js b/web_src/js/features/cloudrbanin.js
index 5a95dfe6c..d0c58bf3f 100644
--- a/web_src/js/features/cloudrbanin.js
+++ b/web_src/js/features/cloudrbanin.js
@@ -398,7 +398,7 @@ export default async function initCloudrain() {
           $(`#${jobName}`).popup("toggle");
         } else {
           let versionData = data.filter((item) => {
-            return item.Version === versionName;
+            return item.version === versionName;
           });
           if (versionData.length == 0) {
             $(`#${jobName}`).popup("toggle");

From 9b2173e5267eac436e9fde24fd6da048b0a37b31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BD=99=E8=B7=83?= <yyuu51888@163.com>
Date: Wed, 16 Nov 2022 09:51:21 +0800
Subject: [PATCH 185/187] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20'README.md'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

update URL
---
 README.md | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/README.md b/README.md
index 1d9ab8d06..7c954c2e4 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 <h1><img src="public/img/favicon.png" alt="logo" width="30" height="30">AiForge - 启智AI开发协作平台</h1>
 
-[![release](https://img.shields.io/badge/release-1.21.11.1-blue)](https://git.openi.org.cn/OpenI/aiforge/releases/latest)
+[![release](https://img.shields.io/badge/release-1.21.11.1-blue)](https://openi.pcl.ac.cn/OpenI/aiforge/releases/latest)
 [![License: MIT](https://img.shields.io/badge/License-MIT-blue.svg)](https://opensource.org/licenses/MIT)
 
 
@@ -10,7 +10,7 @@
 
 启智AI开发协作平台是一个在线Web应用，旨在为人工智能算法、模型开发提供在线协同工作环境，它提供了<b>代码托管、数据集管理与共享、免费云端算力资源支持(GPU/NPU)、共享镜像</b>等功能。
 
-[启智AI开发协作平台](https://git.openi.org.cn) 是使用本项目构建的在线服务，您可以直接点击链接访问试用。
+[启智AI开发协作平台](https://openi.pcl.ac.cn) 是使用本项目构建的在线服务，您可以直接点击链接访问试用。
 
 本项目是基于[Gitea](https://github.com/go-gitea/gitea)发展而来的，我们对其进行了Fork并基于此扩展了人工智能开发中需要的功能，如数据集管理和模型训练等。对于和代码托管相关的功能，您可以参考[Gitea的文档](https://docs.gitea.io/zh-cn/)。
 
@@ -20,7 +20,7 @@
 后端服务涵盖了AI模型开发流水线，包括代码协同开发、数据管理、模型调试、训练、推理和部署等（*目前尚未支持模型部署*）。在不同的开发阶段，我们还将提供丰富的开发工具供用户使用，如数据标注、数据筛选、模型转换、模型压缩、代码检测等。我们也欢迎社区提供更多丰富的工具接入，提高利用平台进行开发的效率。
 ![系统架构图](assets/架构图.png)
 ## 在线服务使用
-本项目的在线服务平台的详细使用帮助文档，可参阅本项目[百科](https://git.openi.org.cn/OpenI/aiforge/wiki)内容。
+本项目的在线服务平台的详细使用帮助文档，可参阅本项目[百科](https://openi.pcl.ac.cn/OpenI/aiforge/wiki)内容。
 - 如何创建账号
 - 如何创建组织及管理成员权限
 - 如何创建项目仓库
@@ -39,22 +39,22 @@
 [从源代码安装说明](https://docs.gitea.io/zh-cn/install-from-source/)
 
 ## 授权许可
-本项目采用 MIT 开源授权许可证，完整的授权说明已放置在 [LICENSE](https://git.openi.org.cn/OpenI/aiforge/src/branch/develop/LICENSE) 文件中。
+本项目采用 MIT 开源授权许可证，完整的授权说明已放置在 [LICENSE](https://openi.pcl.ac.cn/OpenI/aiforge/src/branch/develop/LICENSE) 文件中。
 
 
 ## 需要帮助? 
 如果您在使用或者开发过程中遇到问题，可以在以下渠道咨询：
- - 点击[这里](https://git.openi.org.cn/OpenI/aiforge/issues)在线提交问题（点击页面右上角绿色按钮**创建任务**）
+ - 点击[这里](https://openi.pcl.ac.cn/OpenI/aiforge/issues)在线提交问题（点击页面右上角绿色按钮**创建任务**）
  - 加入微信群实时交流，获得进一步的支持
-   <img src="https://git.openi.org.cn/OpenI/aiforge/wiki/raw/img/wechatgroup.jpg" width=200px />
+   <img src="https://openi.pcl.ac.cn/OpenI/aiforge/wiki/raw/img/wechatgroup.jpg" width=200px />
 
 ## 启智社区小白训练营：
-- 结合案例给大家详细讲解如何使用社区平台，帮助无技术背景的小白成长为启智社区达人 (https://git.openi.org.cn/zeizei/OpenI_Learning)
+- 结合案例给大家详细讲解如何使用社区平台，帮助无技术背景的小白成长为启智社区达人 (https://openi.pcl.ac.cn/zeizei/OpenI_Learning)
 
 ## 平台引用
 如果本平台对您的科研工作提供了帮助，可在论文致谢中加入：
-英文版：```Thanks for the support provided by OpenI Community (https://git.openi.org.cn).```
-中文版：```感谢启智社区提供的技术支持(https://git.openi.org.cn)。```
+英文版：```Thanks for the support provided by OpenI Community (https://openi.pcl.ac.cn).```
+中文版：```感谢启智社区提供的技术支持(https://openi.pcl.ac.cn)。```
 
 如果您的成果中引用了本平台，也欢迎在下述开源项目中提交您的成果信息：
-https://git.openi.org.cn/OpenIOSSG/references
+https://openi.pcl.ac.cn/OpenIOSSG/references

From c5403eaf2d92c249c17b8f1c57047afbd71f8227 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Wed, 16 Nov 2022 11:50:55 +0800
Subject: [PATCH 186/187] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=EF=BC=8C=E8=8E=B7=E5=8F=96=E6=AC=A1=E6=95=B0=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 models/user_business_analysis.go | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/models/user_business_analysis.go b/models/user_business_analysis.go
index ddd672fe6..394c24825 100644
--- a/models/user_business_analysis.go
+++ b/models/user_business_analysis.go
@@ -785,16 +785,20 @@ func getBonusMap() map[string]map[string]int {
 				//read csv
 				lines := strings.Split(csvContent, "\n")
 				for j := 1; j < len(lines); j++ {
-					userName := lines[1]
+					aLine := strings.Split(lines[j], ",")
+					if len(aLine) < 7 {
+						continue
+					}
+					userName := aLine[1]
 					//email := lines[2]
 					record, ok := bonusMap[userName]
 					if !ok {
 						record = make(map[string]int)
 					}
-					record["times"] = getMapKeyStringValue("times", record) + getIntValue(lines[3])
-					record["total_bonus"] = getMapKeyStringValue("total_bonus", record) + getIntValue(lines[4])
-					record["total_cardtime"] = getMapKeyStringValue("total_cardtime", record) + getIntValue(lines[5])
-					record["total_giveup"] = getMapKeyStringValue("total_giveup", record) + getIntValue(lines[6])
+					record["times"] = getMapKeyStringValue("times", record) + getIntValue(aLine[3])
+					record["total_bonus"] = getMapKeyStringValue("total_bonus", record) + getIntValue(aLine[4])
+					record["total_cardtime"] = getMapKeyStringValue("total_cardtime", record) + getIntValue(aLine[5])
+					record["total_giveup"] = getMapKeyStringValue("total_giveup", record) + getIntValue(aLine[6])
 				}
 			}
 		}

From 2aa39eea2c29207183eee4cd2e778bb14027fa22 Mon Sep 17 00:00:00 2001
From: chenshihai <chenshh@pcl.ac.cn>
Date: Wed, 16 Nov 2022 14:21:30 +0800
Subject: [PATCH 187/187] fix-bugs

---
 .../pages/modelmanage/local/modelmanage-local-create-2.vue      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web_src/vuepages/pages/modelmanage/local/modelmanage-local-create-2.vue b/web_src/vuepages/pages/modelmanage/local/modelmanage-local-create-2.vue
index 1e034fa2b..209707147 100644
--- a/web_src/vuepages/pages/modelmanage/local/modelmanage-local-create-2.vue
+++ b/web_src/vuepages/pages/modelmanage/local/modelmanage-local-create-2.vue
@@ -191,7 +191,7 @@ export default {
     },
     checkFiles(file, countStay) {
       const fileList = this.dropzoneHandler.getAcceptedFiles();
-      const filesSize = fileList.reduce((acc, item, index) => acc + item.size, 0) + (file ? file.size : 0);
+      const filesSize = fileList.reduce((acc, item, index) => acc + item.size, 0) + (file && !countStay ? file.size : 0);
       const filesCount = fileList.length + (file && !countStay ? 1 : 0);
       const allfilesSize = filesSize + this.state.size;
       if (file && filesCount > maxFileSize) {