isorg

custom/public/css/git.openi.css

@@ -71,6 +71,19 @@
 .ui.secondary.hometop.segment #navbar{
   z-index: 10;
 }
+.ui.secondary.c2net.segment{
+    /* background: #f8faff; 
+    border: none;*/
+    margin-bottom: 5em;
+    padding-top: 2em;
+    color: rgba(0,0,0,.87);
+    background-image: linear-gradient(to bottom left,var(--tw-gradient-stops));
+    --tw-gradient-from: #f5f3ff;
+    --tw-gradient-stops: var(--tw-gradient-from),#fff,var(--tw-gradient-to,hsla(0,0%,100%,0));
+    --tw-gradient-to: rgba(219,234,254,0.4);
+    border-top: 1px solid rgba(243,244,246,1)!important;
+    border-bottom: 1px solid rgba(243,244,246,1)!important;
+}
 
 .hometop .ui.secondary.menu .active.item{
   color: #000;
@@ -134,8 +147,13 @@
 .i-code-pic > img{
   margin-bottom: -3.0rem;
 }
+.i-env .ui.cards>.card{
+  box-shadow:none;
+}
 .i-env .ui.cards>.card>.image{
   background: none;
+  width: 60%;
+  margin: auto;
 }
 .i-env .ui.cards>.card>.content{
   border-top: none;
@@ -168,7 +186,7 @@
   bottom: 0;
   background-color: rgba(105, 192, 255, .4);
   width: 2px;
-}
+} 
 .homenews .time-since{
   padding-left: 1em;
   color: #888888;
@@ -185,7 +203,7 @@
   padding: 0;
 }
 .newslist{
-  height: 325px;
+  height: 300px;
   overflow: hidden;
 }
 
@@ -208,14 +226,25 @@
   height: auto;
   border-top: 2px solid #3291F8;
   border-right: 2px solid #3291F8;
-  border-bottom: 2px solid #3291F8;
-  border-radius: 0 4.0em 4.0em 0;
+  border-radius: 0 4.0em 0 0;
   width: 10em;
   z-index: 6;
 }
+.leftline02::after, .leftline02-2::after{
+  content: '';
+  position: absolute;
+  transform: translate(55%,50%);
+  right: 0;
+  bottom: 0;
+  width: 1.0em;
+  height: 1.0em;
+  background-color: #FFF;
+  border: 2px solid #3291F8;
+  border-radius: 1em;
+}
 .leftline03{
   border-radius: 4.0em 0 0 0;
-    border-top: 2px solid #3291F8;
+  border-top: 2px solid #3291F8;
   border-bottom:none;
   top: -2.0em;
 }
@@ -224,6 +253,9 @@
   width: 7em;
   z-index: 5;
 }
+.leftline02-2::after{
+  border-color: rgba(105, 192, 255, .4);
+}
 .leftline04{
   border-radius: 0;
     border-top: none;
@@ -280,6 +312,9 @@
 .i-env > div{
   position: relative;
 }
+.event-list .ui.card>.image>img{
+  height: 146px !important;
+}
 
 @media only screen and (max-width: 767px) {
   .am-mt-30{ margin-top: 1.5rem !important;}
@@ -376,4 +411,40 @@
 
 @media only screen and (min-width: 1920px) {
 
+}
+
+/* rotation3D */
+#app{
+  width: 800px;
+  margin: 0 auto;
+}
+.rotation3D-baseMap{
+  position: absolute; left: 0; right: 0; top: 270px; margin: auto;
+  width: 800px; height: 516px;
+  background: url("../rotation3D/img/baseMap.png") no-repeat;
+  background-size: cover;
+}
+.rotation3D-baseMap::before{
+  position: absolute; 
+  margin: auto; z-index: 99;            
+  left:50%; top: -150px; 
+  transform:translate(-50%,0);
+  width: 342px; height: 470px; display: block; content: '';
+  background: url("../rotation3D/img/baseLogo.svg");
+  /*animation: 10s bounceUpDown infinite;*/
+}
+.rotation3D-baseMap::after{
+  position: absolute; 
+  margin: auto; z-index: 100;
+  left:50%; top:0; 
+  transform:translate(-50%,0);
+  width: 110px; height: 86px; display: block; content: '';
+  background: url("../rotation3D/img/brain.svg");
+  animation: 6s bounceUpDown infinite;
+  mix-blend-mode: color-dodge;
+}
+@keyframes bounceUpDown{
+  0% {transform: translate(-50%, 0px);}
+  50% {transform: translate(-50%, -15px);}
+  100% {transform: translate(-50%, 0px);}
 }

custom/public/rotation3D/rotation3D.css

@@ -0,0 +1,152 @@
+
+/*
+  椭圆会使内部失真    transform: rotateX(50deg);
+*/
+.rotation3D{
+    position: relative; width: 800px; height: 600px;  user-select: none;
+    margin: 0 auto;
+    /* border: 1px solid white; border-radius: 100%; */
+    /* cursor: move; */
+}
+.rotation3D .center{
+    display: none;
+    position: absolute; left: 50%; top: 50%;
+    transform: translate(-50%, -50%);
+}
+
+.rotation3D .itemList{ position: absolute; width: 100%; height: 100%; z-index: 20; }
+.rotation3D .lineList{
+    position: absolute; width: 100%; height: 100%; z-index: 10;
+    transform-style: preserve-3d;
+}
+
+/*---------------------------点样式---------------------------*/
+.rotation3D__item{
+    position: absolute; display: block; width: 161px; height: 188px;
+    text-align: center; line-height: 30px; font-size: 16px; color: white;
+    /*background: #2292ef; border-radius: 4px;*/
+    /*cursor: pointer; */
+}
+.rotation3D__item .scale{ position: absolute; top: 0; width: 100%; height: 100%; }
+.rotation3D__item .cont{ position: relative; z-index: 2; }
+.rotation3D__item .cont .iconfont { font-size: 28px; margin-top: 30px; margin-bottom: 96px; display: block; }
+.rotation3D__item .cont p{ color: #101010; }
+.itemList .rotation3D__item .cont p::after{
+    font-size: 12px;
+    content: '';
+    position: absolute;
+    left: 0;
+    right: 0;
+    margin-top: 60px;
+    color: #101010;
+}
+.itemList .rotation3D__item:nth-child(1) .cont p::after{
+    content: "鹏城云脑一号";
+}
+.itemList .rotation3D__item:nth-child(2) .cont p::after{
+    content: "鹏城云脑二号";
+}
+.itemList .rotation3D__item:nth-child(3) .cont p::after{
+    content: "北大人工智能集群系统";
+}
+.itemList .rotation3D__item:nth-child(4) .cont p::after{
+    content: "合肥类脑智能开放平台";
+}
+.itemList .rotation3D__item:nth-child(5) .cont p::after{
+    content: "武汉人工智能计算中心";
+}
+.itemList .rotation3D__item:nth-child(6) .cont p::after{
+    content: "西安未来人工智能计算中心";
+}
+.itemList .rotation3D__item:nth-child(7) .cont p::after{
+    content: "更多接入中…";
+}
+.itemList .rotation3D__item:nth-child(8) .cont p::after{
+    content: "中原人工智能计算中心";
+}
+.itemList .rotation3D__item:nth-child(9) .cont p::after{
+    content: "成都人工智能计算中心";
+}
+.itemList .rotation3D__item:nth-child(10) .cont p::after{
+    content: "横琴先进智能计算中心";
+}
+.itemList .rotation3D__item:nth-child(11) .cont p::after{
+    content: "国家超级计算济南中心";
+}
+
+.rotation3D__item.blue{ color: #01e9fc; }
+.rotation3D__item.green{ color: #b4b3ca; }
+.rotation3D__item.yellow{ color: #ffd200; }
+
+/*底座*/
+.rotation3D__item .baseImg{ position: absolute; width: 100%; height: 100%; z-index: 1; }
+.rotation3D__item.blue .baseImg{ background: url("img/idc-red.png"); }
+.rotation3D__item.green .baseImg{ background: url("img/idc-green.png"); }
+.rotation3D__item.yellow .baseImg{ background: url("img/idc-yellow.png"); }
+
+/*---------------------------
+    线样式
+    线高为总高的一般
+---------------------------*/
+.rotation3D__line{
+    position: absolute; left: 50%; top: 50%;
+    display: block; width: 1px; height: 50%;
+    padding-top: 60px; color: #fff; font-size: 50px;
+    /*background: #fff;*/
+    /*原点设置在中间*/
+    transform-origin: 50% 0;
+    transform-style: preserve-3d;
+}
+.rotation3D__line .pos{ position: absolute; top: 0; }
+.rotation3D__line svg { position: absolute; top: 0; }
+.rotation3D__line svg path {
+    stroke: #fff; fill: none;
+    stroke-width: 2;
+    animation: path-animation 100s linear 0s infinite normal;
+}
+@keyframes path-animation {
+    0% { stroke-dashoffset:500; }
+    100% { stroke-dashoffset:0; }
+}
+.rotation3D__line .dot {
+    position: absolute; top: 0; left: 0; text-align: center;
+    /*width: 35px; height: 35px; font-size: 35px; */
+    width: 19px; height: 19px; font-size: 19px;
+}
+.rotation3D__line .dot1,.rotation3D__line .dot3,.rotation3D__line .dot4{
+    animation: svg-path-animation 6s ease-in-out 0s infinite normal;
+}
+.rotation3D__line .dot1{
+    offset-path: path("M0 400, 0 0"); offset-distance: 0%;
+}
+.rotation3D__line .dot2{
+    offset-path: path("M0 200, 0 0"); offset-distance: 0%;
+    background: #ffd200; border-radius: 100%;
+    font-size: 22px; color: #000;
+}
+.rotation3D__line .dot3{
+    offset-path: path("M20 400 S 0 200, 20 0"); offset-distance: 0%;
+}
+.rotation3D__line .dot4{
+    position: relative;
+    offset-path: path("M20 0 S 40 200, 20 400"); offset-distance: 0%;
+}
+@keyframes svg-path-animation {
+    from {offset-distance: 100%;}
+    to {offset-distance: 0%;}
+}
+.dot1 > span{
+    position: absolute;
+    font-size: 12px;
+    color: #888;
+    transform: rotate(180deg)scale(0.80);
+}
+
+/*颜色*/
+.rotation3D__line.blue { color: #07b2f9; }
+.rotation3D__line.green { color: #ac94ee; }
+.rotation3D__line.yellow { color: #ffd500; }
+
+.rotation3D__line.blue svg path { stroke: #07b2f9; }
+.rotation3D__line.green svg path { stroke: #ac94ee; }
+.rotation3D__line.yellow svg path { stroke: #ffd500; }

custom/public/rotation3D/rotation3D.js

@@ -0,0 +1,380 @@
+var cancelFrame = window.cancelAnimationFrame || window.cancelRequestAnimationFrame;
+var requestFrame = window.requestAnimationFrame;
+var time = !window.performance || !window.performance.now ?
+    function () {return +new Date()}:
+    function () {return performance.now()};
+
+/**
+ * 计算两点距离
+ * @param points
+ * @returns {number}
+ * distance([{x:0,y:0},{x:1,y:1}]);
+ */
+var distance = function(points) {
+    var p1=points[0];
+    var p2=points[1];
+    var a = p2.x-p1.x;
+    var b = p2.y-p1.y;
+    return Math.sqrt(a*a+b*b);
+};
+
+/**
+ * 圆公式
+ * @param rotation 弧度
+ * 计算公式：
+ * Math.PI;     //圆周率
+ * Math.sin();  //正弦 x      -左 +右
+ * Math.cos;    //余弦 y      -下 +上
+ */
+var circleMath = {
+    /**
+     * 根据弧度计算角度
+     * @param rotation 弧度
+     * rotation, farScale, xs, xr, ys, yr, itemWidth
+     */
+    // parseRotate: function (rotation) {
+    //     return (180 / Math.PI * rotation) - 180;
+    // },
+    parseRotate: function (rotation, self) {
+        var sin = Math.sin(rotation), cos = Math.cos(rotation);
+        var sin_cos = sin*cos;  //得出偏移正负值，从0°向左依次 +-+-
+        var angle = (180 / Math.PI * rotation) - 180;
+        var lastAngle = angle;
+
+        // console.log('rotation',rotation)
+        // console.log('sin',sin)
+        // console.log('cos',cos)
+        // console.log('sin*cos',sin*cos);
+        // console.log('统一偏移角度',self.yr * (sin_cos/Math.PI))
+
+        lastAngle = angle + (self.yr * (sin_cos/(Math.PI+1)));
+
+        return lastAngle;
+    },
+    /**
+     * 计算scale,x,y
+     * scale    最小尺寸 + ((1 - 最小尺寸) * (sin正弦 + 1) * 0.5)
+     * x        x起点 + (尺寸 * cos余弦 * x半径) - 元素宽度一半
+     * y        y起点 + (尺寸 * sin正弦 * x半径) - 元素宽度一半
+     * farScale, xs, xr, ys, yr, itemWidth
+     */
+    parseSXY: function (rotation, self) {
+        var farScale=self.farScale;
+        var itemWidth=self.itemWidth;
+        var xs=self.xs; var xr=self.xr; var ys=self.ys; var yr=self.yr;
+        var sin = Math.sin(rotation), cos = Math.cos(rotation);
+        var scale = farScale + ((1 - farScale) * (sin + 1) * 0.5);  //单个尺寸
+
+        // 按设置尺寸
+        // var x = xs + (scale * cos * xr) - (itemWidth * 0.5);
+        // var y = ys + (scale * sin * yr) - (itemWidth * 0.5);
+        // 不使用压缩
+        // var x = xs + (cos * xs) - (itemWidth * 0.5);
+        // var y = ys + (sin * ys) - (itemWidth * 0.5);
+        // 使用压缩
+        var x = xs + (cos * xr) - (itemWidth * 0.5);
+        var y = ys + (sin * yr) - (itemWidth * 0.5);
+        var distanceNumber = distance([
+            {x:self.$rotation.width()/2 - self.$item.width()/2, y:self.$rotation.height()/2 - self.$item.height()/2},
+            {x:x,y:y}]
+        );
+
+        // console.log({x:self.$rotation.width()/2, y:self.$rotation.height()/2})
+        // console.log('x,y',x,y)
+        // console.log('两点距离',distanceNumber)
+
+        return {
+            x: x,
+            y: y,
+            scale: scale,
+            distanceNumber: distanceNumber,
+        }
+    },
+}
+/**
+ * 3D旋转
+ * @param id
+ */
+var Rotation3D = window.Rotation3D = function (_opts) {
+    var self=this;
+    this.$rotation = $(_opts.id)
+    this.$lineList = this.$rotation.find('.lineList')
+    this.$item = this.$rotation.find('.rotation3D__item')
+    this.$line = this.$rotation.find('.rotation3D__line')
+    this.itemWidth = this.$item.width();
+    this.itemHeight = this.$item.height();
+    this.length = this.$item.length;
+    // 圆计算
+    this.rotation = Math.PI / 2;    //圆周率/2
+    this.destRotation = this.rotation;
+
+    var xr = this.$rotation.width() * 0.5;
+    var yr = this.$rotation.height() * 0.5;
+    var xRadius = _opts.xRadius || 0;
+    var yRadius = _opts.yRadius || 0;
+
+    var opts = Object.assign({
+        farScale: 1,        // 最小尺寸
+        xs: xr,             // x起点
+        ys: yr,             // y起点
+        xr: xr - xRadius,   // x半径-压缩
+        yr: yr - yRadius,	// y半径-压缩
+        // 播放
+        autoPlay:false,
+        autoPlayDelay:3000,
+        currenIndex:-1,
+        fps:30,
+        speed:4,
+    },_opts)
+    Object.assign(this, opts)
+
+    // 遍历子元素
+    this.$item.each(function (index) {
+        $(this).click(function () {
+            $(this).addClass('active').siblings().removeClass('active')
+            self.goTo(index)
+        })
+    })
+    // 当前控件进入离开
+    this.$rotation.mouseenter(function () {
+        clearInterval(self.autoPlayTimer)
+    })
+    this.$rotation.mouseleave(function () {
+        self.onAutoPlay()
+    })
+
+    this.onAutoPlay()
+    this.onDrag()
+    this.render()
+
+}
+/**
+ * item样式
+ * x    x起点 + (尺寸 * 余弦 * x压缩) - 元素宽度一半
+ * y    y起点 + (尺寸 * 正弦 * y压缩) - 元素宽度一半
+ */
+Rotation3D.prototype.itemStyle = function($item, index, rotation) {
+    //console.log("itemStyle=" + rotation + " index=" + index);
+    var parseSXY = circleMath.parseSXY(rotation, this);
+    var scale = parseSXY.scale;
+    var x = parseSXY.x;
+    var y = parseSXY.y;
+    var $line = this.$lineList.find('.rotation3D__line').eq(index);
+
+    //设置当前子菜单的位置（left,top） = (x,y)
+    $item.find('.scale').css({
+        'transform': `scale(${scale})`,
+        // 'top': `${this.itemWidth * (1-scale) }`,
+    })
+    $item.css({
+        position: 'absolute',
+        display: 'inline-block',
+        // opacity: scale,
+        'z-index': parseInt(scale * 100),
+        'transform-origin': '0px 0px',
+        // 'transform': `translate(${x}px, ${y}px) scale(${scale})`,
+        'transform': `translate(${x}px, ${y}px)`,
+    });
+
+    /**
+     * 线样式
+     */
+    $line.css({
+        height:parseSXY.distanceNumber,
+    })
+    $line.find('svg').css({
+        height:parseSXY.distanceNumber,
+    })
+    $line.find('.dot1').css({
+        'offset-path':`path("M0 ${parseSXY.distanceNumber}, 0 0")`,
+    })
+    $line.find('#path1').attr({
+        'd':`M0 ${parseSXY.distanceNumber}, 0 0`,
+    })
+
+    $line.find('.dot2').css({
+        'offset-path':`path("M0 ${parseSXY.distanceNumber/2}, 0 0")`,
+    })
+    $line.find('#path2').attr({
+        'd':`M0 ${parseSXY.distanceNumber}, 0 0`,
+    })
+
+    $line.find('.dot3').css({
+        'offset-path':`path("M20 ${parseSXY.distanceNumber} S 0 ${parseSXY.distanceNumber/2}, 20 0")`,
+    })
+    $line.find('#path3').attr({
+        'd':`M20 ${parseSXY.distanceNumber} S 0 ${parseSXY.distanceNumber/2}, 20 0`,
+    })
+
+    $line.find('.dot4').css({
+        'offset-path':`path("M20 0 S 40 ${parseSXY.distanceNumber/2}, 20 ${parseSXY.distanceNumber}")`,
+    })
+    $line.find('#path4').attr({
+        'd':`M20 0 S 40 ${parseSXY.distanceNumber/2}, 20 ${parseSXY.distanceNumber}`,
+    })
+
+}
+/**
+ * line样式
+ */
+Rotation3D.prototype.lineStyle = function($line, index, rotation) {
+    var rotate = circleMath.parseRotate(rotation, this)
+    //console.log("lineStyle=" + rotation + " index=" + index);
+
+    $line.css({
+        transform: 'rotate(' + rotate + 'deg)',
+    })
+    this.$lineList.css({
+        // transform: `rotateX(${this.yRadius / 3}deg)`,
+    })
+}
+
+/**
+ * 旋转至index
+ */
+Rotation3D.prototype.goTo = function (index) {
+    var self = this;
+    this.currenIndex = index;
+    //console.log('goTo currenIndex', index);
+    /**
+     * 1.计算floatIndex,用于控死amdiff
+     */
+    var itemsRotated = this.length * ((Math.PI / 2) - this.rotation) / (2 * Math.PI);
+    var floatIndex = itemsRotated % this.length;
+    if (floatIndex < 0) { floatIndex = floatIndex + this.length; }
+
+    /**
+     * 2.计算diff,判断方向正反
+     */
+    var diff = index - (floatIndex % this.length);
+    if (2 * Math.abs(diff) > this.length) {
+        diff -= (diff > 0) ? this.length : -this.length;
+    }
+    // 停止任何正在进行的旋转
+    this.destRotation += (2 * Math.PI / this.length) * -diff;
+    this.scheduleNextFrame();
+
+}
+/**
+ * 定时器渐近旋转
+ */
+Rotation3D.prototype.scheduleNextFrame = function () {
+    var self = this
+    this.lastTime = time();
+    // 暂停
+    var pause = function () {
+        cancelFrame ? cancelFrame(this.timer) : clearTimeout(self.timer);
+        self.timer = 0;
+    }
+    // 渐进播放
+    var playFrame = function () {
+        var rem = self.destRotation - self.rotation;
+        var now = time(), dt = (now - self.lastTime) * 0.002;
+        self.lastTime = now;
+        // console.log('rem',rem)
+
+        if (Math.abs(rem) < 0.003) {
+            self.rotation = self.destRotation;
+            pause();
+        } else {
+            // 渐近地接近目的地
+            self.rotation = self.destRotation - rem / (1 + (self.speed * dt));
+            self.scheduleNextFrame();
+        }
+        self.render();
+    }
+
+    this.timer = cancelFrame ?
+        requestFrame(playFrame) :
+        setTimeout(playFrame, 1000 / this.fps);
+}
+/**
+ * 更新
+ */
+Rotation3D.prototype.render = function () {
+    var self=this;
+    
+    // 图形间隔：弧度
+    var spacing = 2 * Math.PI / this.$item.length;
+    var itemRotation = this.rotation;
+    var lineRotation = this.rotation + (Math.PI/2);
+
+    this.$item.each(function (index) {
+        self.itemStyle($(this), index, itemRotation)
+        itemRotation += spacing;
+    })
+    this.$line.each(function (index) {
+        self.lineStyle($(this), index, lineRotation)
+        lineRotation += spacing;
+    })
+}
+/**
+ * 自动播放
+ */
+Rotation3D.prototype.onAutoPlay = function () {
+    var self = this;
+
+    if (this.autoPlay) {
+        this.autoPlayTimer = setInterval(function () {
+            if (self.currenIndex < 0) {
+                self.currenIndex = self.length - 1
+            }
+            //console.log("autoPlayTimer....");
+            self.goTo(self.currenIndex);
+            self.currenIndex--; //倒叙
+        }, this.autoPlayDelay)
+    }
+}
+/**
+ * 拖拽
+ */
+Rotation3D.prototype.onDrag = function () {
+    var self = this;
+    var startX, startY, moveX, moveY, endX, endY;
+    //console.log("onDrag....");
+    // 拖拽：三个事件-按下 移动 抬起
+    //按下
+    this.$rotation.mousedown(function (e) {
+        startX = e.pageX; startY = e.pageY;
+        //console.log("mousedown....");
+        // 移动
+        $(document).mousemove(function (e) {
+            // console.log('移动');
+            endX = e.pageX; endY = e.pageY;
+            moveX = endX - startX; moveY = endY - startY;
+            // console.log('x,y',moveX,moveY);
+        })
+        // 抬起
+        $(document).mouseup(function (e) {
+            endX = e.pageX; endY = e.pageY;
+            moveX = endX - startX; moveY = endY - startY;
+            //console.log("mouseup....");
+            // 每40旋转一步
+            var moveIndex = parseInt(Math.abs(moveX) / 50)
+            //console.log('moveIndex',moveIndex)
+            if (moveIndex > 0) {
+                // console.log(moveX<0 ? '向左' : '向右')
+                if (moveX < 0) { //向左
+                    self.currenIndex = self.currenIndex - moveIndex
+                    play(moveIndex)
+                } else { //向右
+                    self.currenIndex = self.currenIndex + moveIndex
+                    play(moveIndex)
+                }
+            }
+
+            // 解绑
+            $(document).unbind("mousemove");
+            $(document).unbind("mouseup");
+        })
+
+    })
+
+    function play() {
+        if (self.currenIndex == 0) {
+            self.currenIndex = self.length - 1
+        }
+        self.goTo(self.currenIndex % self.length);
+    }
+
+}

models/attachment.go

@@ -43,6 +43,7 @@ type Attachment struct {
 	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"`
@@ -107,6 +108,15 @@ func (a *Attachment) IncreaseDownloadCount() error {
 	return nil
 }
 
+func IncreaseAttachmentUseNumber(uuid string) error {
+	// Update use number.
+	if _, err := x.Exec("UPDATE `attachment` SET use_number=use_number+1 WHERE uuid=?", uuid); err != nil {
+		return fmt.Errorf("increase attachment use count: %v", err)
+	}
+
+	return nil
+}
+
 func (a *Attachment) UpdateDatasetUpdateUnix() error {
 	// Update download count.
 	if _, err := x.Exec("UPDATE `dataset` SET updated_unix="+fmt.Sprint(time.Now().Unix())+" WHERE id=?", a.DatasetID); err != nil {

models/cloudbrain.go

@@ -1156,6 +1156,17 @@ type LogFile struct {
 	Name string
 }
 
+type GetTrainJobMetricStatisticResult struct {
+	TrainJobResult
+	Interval    int       `json:"interval"` //查询的时间间隔，单位为分钟
+	MetricsInfo []Metrics `json:"metrics"`  //监控详情
+}
+
+type Metrics struct {
+	Metric string   `json:"metric"` //监控指标项
+	Value  []string `json:"value"`  //获取的监控值的序列，元素为String类型
+}
+
 func Cloudbrains(opts *CloudbrainsOptions) ([]*CloudbrainInfo, int64, error) {
 	sess := x.NewSession()
 	defer sess.Close()
@@ -1291,7 +1302,8 @@ func QueryModelTrainJobVersionList(jobId string) ([]*CloudbrainInfo, int, error)
 		builder.Eq{"cloudbrain.job_id": jobId},
 	)
 	cond = cond.And(
-		builder.Eq{"cloudbrain.Status": "COMPLETED"},
+		builder.In("cloudbrain.Status", "COMPLETED", "SUCCEEDED"),
+		//builder.Eq{"cloudbrain.Status": "COMPLETED"},
 	)
 
 	sess.OrderBy("cloudbrain.created_unix DESC")
@@ -1312,7 +1324,7 @@ func QueryModelTrainJobList(repoId int64) ([]*CloudbrainInfo, int, error) {
 		builder.Eq{"repo_id": repoId},
 	)
 	cond = cond.And(
-		builder.Eq{"Status": "COMPLETED"},
+		builder.In("Status", "COMPLETED", "SUCCEEDED"),
 	)
 	cond = cond.And(
 		builder.Eq{"job_type": "TRAIN"},
@@ -1406,6 +1418,8 @@ func CreateCloudbrain(cloudbrain *Cloudbrain) (err error) {
 	if _, err = x.NoAutoTime().Insert(cloudbrain); err != nil {
 		return err
 	}
+
+	go IncreaseDatasetUseCount(cloudbrain.Uuid)
 	return nil
 }
 
@@ -1586,6 +1600,14 @@ func GetCloudbrainCountByUserID(userID int64, jobType string) (int, error) {
 	return int(count), err
 }
 
+func GetCloudbrainRunCountByRepoID(repoID int64) (int, error) {
+	count, err := x.In("status", JobWaiting, JobRunning, ModelArtsCreateQueue, ModelArtsCreating, ModelArtsStarting,
+		ModelArtsReadyToStart, ModelArtsResizing, ModelArtsStartQueuing, ModelArtsRunning, ModelArtsRestarting, ModelArtsTrainJobInit,
+		ModelArtsTrainJobImageCreating, ModelArtsTrainJobSubmitTrying, ModelArtsTrainJobWaiting, ModelArtsTrainJobRunning,
+		ModelArtsTrainJobScaling, ModelArtsTrainJobCheckInit, ModelArtsTrainJobCheckRunning, ModelArtsTrainJobCheckRunningCompleted).And("repo_id = ?", repoID).Count(new(Cloudbrain))
+	return int(count), err
+}
+
 func GetBenchmarkCountByUserID(userID int64) (int, error) {
 	count, err := x.In("status", JobWaiting, JobRunning).And("(job_type = ? or job_type = ? or job_type = ?) and user_id = ? and type = ?", string(JobTypeBenchmark), string(JobTypeBrainScore), string(JobTypeSnn4imagenet), userID, TypeCloudBrainOne).Count(new(Cloudbrain))
 	return int(count), err
@@ -1641,6 +1663,8 @@ func RestartCloudbrain(old *Cloudbrain, new *Cloudbrain) (err error) {
 		return err
 	}
 
+	go IncreaseDatasetUseCount(new.Uuid)
+
 	return nil
 }
 func CloudbrainAll(opts *CloudbrainsOptions) ([]*CloudbrainInfo, int64, error) {

models/cloudbrain_static.go

@@ -181,6 +181,25 @@ func GetRecordBeginTime() ([]*CloudbrainInfo, error) {
 	return cloudbrains, nil
 }
 
+func GetAllStatusCloudBrain() map[string]int {
+	sess := x.NewSession()
+	defer sess.Close()
+	cloudbrains := make([]*CloudbrainInfo, 0)
+	if err := sess.Table(&Cloudbrain{}).Unscoped().
+		Find(&cloudbrains); err != nil {
+		log.Info("find error.")
+	}
+	cloudBrainStatusResult := make(map[string]int)
+	for _, cloudbrain := range cloudbrains {
+		if _, ok := cloudBrainStatusResult[cloudbrain.Status]; !ok {
+			cloudBrainStatusResult[cloudbrain.Status] = 1
+		} else {
+			cloudBrainStatusResult[cloudbrain.Status] += 1
+		}
+	}
+	return cloudBrainStatusResult
+}
+
 func GetWaittingTop() ([]*CloudbrainInfo, error) {
 	sess := x.NewSession()
 	defer sess.Close()
@@ -263,4 +282,13 @@ func GetRunHourPeriodCount(dateBeginTime string, dateEndTime string) (map[string
 		dateHourMap[strconv.Itoa(key)] = cout
 	}
 	return dateHourMap, nil
+	cloudBrainStatusResult := make(map[string]int)
+	for _, cloudbrain := range cloudbrains {
+		if _, ok := cloudBrainStatusResult[cloudbrain.Status]; !ok {
+			cloudBrainStatusResult[cloudbrain.Status] = 1
+		} else {
+			cloudBrainStatusResult[cloudbrain.Status] += 1
+		}
+	}
+	return cloudBrainStatusResult
 }

models/dataset.go

@@ -1,10 +1,12 @@
 package models
 
 import (
-	"code.gitea.io/gitea/modules/log"
 	"errors"
 	"fmt"
 	"sort"
+	"strings"
+
+	"code.gitea.io/gitea/modules/log"
 
 	"code.gitea.io/gitea/modules/timeutil"
 	"xorm.io/builder"
@@ -23,8 +25,9 @@ type Dataset struct {
 	Category      string
 	Description   string `xorm:"TEXT"`
 	DownloadTimes int64
-	NumStars      int  `xorm:"INDEX NOT NULL DEFAULT 0"`
-	Recommend     bool `xorm:"INDEX NOT NULL DEFAULT false"`
+	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"`
@@ -179,7 +182,7 @@ func SearchDatasetCondition(opts *SearchDatasetOptions) builder.Cond {
 
 func generateFilterCond(opts *SearchDatasetOptions, cond builder.Cond) builder.Cond {
 	if len(opts.Keyword) > 0 {
-		cond = cond.And(builder.Or(builder.Like{"dataset.title", opts.Keyword}, builder.Like{"dataset.description", opts.Keyword}))
+		cond = cond.And(builder.Or(builder.Like{"LOWER(dataset.title)", strings.ToLower(opts.Keyword)}, builder.Like{"LOWER(dataset.description)", strings.ToLower(opts.Keyword)}))
 	}
 
 	if len(opts.Category) > 0 {
@@ -210,7 +213,7 @@ func SearchDatasetByCondition(opts *SearchDatasetOptions, cond builder.Cond) (Da
 	defer sess.Close()
 
 	datasets := make(DatasetList, 0, opts.PageSize)
-	selectColumnsSql := "distinct dataset.id,dataset.title, dataset.status, dataset.category, dataset.description, dataset.download_times, dataset.license, dataset.task, dataset.release_id, dataset.user_id, dataset.repo_id, dataset.created_unix,dataset.updated_unix,dataset.num_stars,dataset.recommend"
+	selectColumnsSql := "distinct dataset.id,dataset.title, dataset.status, dataset.category, dataset.description, dataset.download_times, dataset.license, dataset.task, dataset.release_id, dataset.user_id, dataset.repo_id, dataset.created_unix,dataset.updated_unix,dataset.num_stars,dataset.recommend,dataset.use_count"
 
 	count, err := sess.Distinct("dataset.id").Join("INNER", "repository", "repository.id = dataset.repo_id").
 		Join("INNER", "attachment", "attachment.dataset_id=dataset.id").
@@ -348,6 +351,17 @@ func UpdateDataset(ctx DBContext, rel *Dataset) error {
 	return err
 }
 
+func IncreaseDatasetUseCount(uuid string) {
+
+	IncreaseAttachmentUseNumber(uuid)
+
+	attachment, _ := GetAttachmentByUUID(uuid)
+	if attachment != nil {
+		x.Exec("UPDATE `dataset` SET use_count=use_count+1 WHERE id=?", attachment.DatasetID)
+	}
+
+}
+
 // GetDatasetByID returns Dataset with given ID.
 func GetDatasetByID(id int64) (*Dataset, error) {
 	rel := new(Dataset)

models/org.go

@@ -160,7 +160,11 @@ func UpdateOrgStatistics() {
 			has, _ := x.Get(orgStat)
 
 			orgStat.NumScore = numScore
-			if has {
+
+			count, err := GetPublicRepositoryCount(&org)
+			if err != nil || count == 0 {
+				x.ID(orgStat.ID).Delete(new(OrgStatistic))
+			} else if has {
 				x.ID(orgStat.ID).Cols("num_score").Update(&orgStat)
 			} else {
 				x.Insert(orgStat)

models/repo_list.go

@@ -218,6 +218,8 @@ const (
 	SearchOrderByForks                 SearchOrderBy = "num_forks ASC"
 	SearchOrderByForksReverse          SearchOrderBy = "num_forks DESC"
 	SearchOrderByDownloadTimes         SearchOrderBy = "download_times DESC"
+	SearchOrderByUseCount              SearchOrderBy = "use_count ASC"
+	SearchOrderByUseCountReverse       SearchOrderBy = "use_count DESC"
 	SearchOrderByHot                   SearchOrderBy = "(num_watches + num_stars + num_forks + clone_cnt) DESC"
 	SearchOrderByActive                SearchOrderBy = "(num_issues + num_pulls + num_commit) DESC"
 	SearchOrderByWatches               SearchOrderBy = "num_watches DESC"

models/user_business_analysis.go

@@ -477,6 +477,7 @@ func QueryUserStaticDataForUserDefine(opts *UserBusinessAnalysisQueryOptions, wi
 			dateRecord.Email = userRecord.Email
 			dateRecord.RegistDate = userRecord.CreatedUnix
 			dateRecord.Name = userRecord.Name
+			dateRecord.UserLocation = userRecord.Location
 			dateRecord.GiteaAgeMonth = subMonth(currentTimeNow, userRecord.CreatedUnix.AsTime())
 
 			dateRecord.CodeMergeCount = getMapValue(dateRecord.ID, CodeMergeCountMap)
@@ -534,7 +535,7 @@ func QueryUserStaticDataForUserDefine(opts *UserBusinessAnalysisQueryOptions, wi
 			break
 		}
 	}
-	log.Info("query user define,count=" + fmt.Sprint((ResultList)))
+	log.Info("query user define,count=" + fmt.Sprint(len(ResultList)))
 	return ResultList, int64(len(ResultList))
 }
 
@@ -718,12 +719,11 @@ func refreshUserStaticTable(wikiCountMap map[string]int, tableName string, pageS
 	userIndexMap := make(map[int64]float64, 0)
 	maxUserIndex := 0.0
 	minUserIndex := 100000000.0
-	dateRecordBatch := make([]UserBusinessAnalysisAll, 0)
 	for {
 		sess.Select("`user`.*").Table("user").Where(cond).OrderBy("id asc").Limit(PAGE_SIZE, int(indexTotal))
 		userList := make([]*User, 0)
 		sess.Find(&userList)
-
+		dateRecordBatch := make([]UserBusinessAnalysisAll, 0)
 		for _, userRecord := range userList {
 			var dateRecordAll UserBusinessAnalysisAll
 			dateRecordAll.ID = userRecord.ID
@@ -788,7 +788,7 @@ func refreshUserStaticTable(wikiCountMap map[string]int, tableName string, pageS
 
 			dateRecordBatch = append(dateRecordBatch, dateRecordAll)
 			if len(dateRecordBatch) >= BATCH_INSERT_SIZE {
-				insertTable(dateRecordBatch, tableName, statictisSess)
+				err := insertTable(dateRecordBatch, tableName, statictisSess)
 				insertCount += BATCH_INSERT_SIZE
 				if err != nil {
 					log.Info("insert all data failed." + err.Error())
@@ -803,18 +803,19 @@ func refreshUserStaticTable(wikiCountMap map[string]int, tableName string, pageS
 				}
 			}
 		}
+		if len(dateRecordBatch) > 0 {
+			err := insertTable(dateRecordBatch, tableName, statictisSess)
+			insertCount += len(dateRecordBatch)
+			if err != nil {
+				log.Info("insert all data failed." + err.Error())
+			}
+		}
 		indexTotal += PAGE_SIZE
 		if indexTotal >= count {
 			break
 		}
 	}
-	if len(dateRecordBatch) > 0 {
-		insertTable(dateRecordBatch, tableName, statictisSess)
-		insertCount += len(dateRecordBatch)
-		if err != nil {
-			log.Info("insert all data failed." + err.Error())
-		}
-	}
+
 	if tableName == "user_business_analysis_all" {
 		log.Info("TotalHasActivityUser=" + fmt.Sprint(userMetrics["TotalHasActivityUser"]))
 	}
@@ -834,7 +835,7 @@ func updateUserIndex(tableName string, statictisSess *xorm.Session, userId int64
 	statictisSess.Exec(updateSql)
 }
 
-func insertTable(dateRecords []UserBusinessAnalysisAll, tableName string, statictisSess *xorm.Session) {
+func insertTable(dateRecords []UserBusinessAnalysisAll, tableName string, statictisSess *xorm.Session) error {
 
 	insertBatchSql := "INSERT INTO public." + tableName +
 		"(id, count_date, code_merge_count, commit_count, issue_count, comment_count, focus_repo_count, star_repo_count, watched_count, gitea_age_month, commit_code_size, commit_dataset_size, " +
@@ -853,7 +854,8 @@ func insertTable(dateRecords []UserBusinessAnalysisAll, tableName string, static
 		}
 	}
 
-	statictisSess.Exec(insertBatchSql)
+	_, err := statictisSess.Exec(insertBatchSql)
+	return err
 }
 
 func RefreshUserStaticAllTabel(wikiCountMap map[string]int, userMetrics map[string]int) {
@@ -926,7 +928,7 @@ func CounDataByDateAndReCount(wikiCountMap map[string]int, startTime time.Time,
 	if err != nil {
 		log.Info("query commit code errr.")
 	} else {
-		log.Info("query commit code size, len=" + fmt.Sprint(len(CommitCodeSizeMap)))
+		//log.Info("query commit code size, len=" + fmt.Sprint(len(CommitCodeSizeMap)))
 		CommitCodeSizeMapJson, _ := json.Marshal(CommitCodeSizeMap)
 		log.Info("CommitCodeSizeMapJson=" + string(CommitCodeSizeMapJson))
 	}
@@ -973,7 +975,7 @@ func CounDataByDateAndReCount(wikiCountMap map[string]int, startTime time.Time,
 			dateRecord.Name = userRecord.Name
 			dateRecord.GiteaAgeMonth = subMonth(currentTimeNow, userRecord.CreatedUnix.AsTime())
 			dateRecord.DataDate = DataDate
-
+			dateRecord.UserLocation = userRecord.Location
 			dateRecord.CodeMergeCount = getMapValue(dateRecord.ID, CodeMergeCountMap)
 			dateRecord.CommitCount = getMapValue(dateRecord.ID, CommitCountMap)
 			dateRecord.IssueCount = getMapValue(dateRecord.ID, IssueCountMap)
@@ -1026,20 +1028,7 @@ func CounDataByDateAndReCount(wikiCountMap map[string]int, startTime time.Time,
 				log.Info("has activity." + userRecord.Name)
 				addUserToMap(userNewAddActivity, userRecord.CreatedUnix, dateRecord.ID)
 			}
-			if !userRecord.IsActive {
-				continue
-			}
 
-			var deleteDateRecord UserBusinessAnalysis
-			deleteDateRecord.ID = userRecord.ID
-			deleteDateRecord.CountDate = CountDate.Unix()
-			statictisSess.Delete(&deleteDateRecord)
-
-			_, err = statictisSess.Insert(&dateRecord)
-			if err != nil {
-				log.Info("insert daterecord failed." + err.Error())
-				return err
-			}
 		}
 
 		indexTotal += PAGE_SIZE
@@ -1124,7 +1113,7 @@ func setUserMetrics(userMetrics map[string]int, user *User, start_time int64, en
 	//HasActivityUser         int   `xorm:"NOT NULL DEFAULT 0"`
 	//TotalActivateRegistUser int   `xorm:"NOT NULL DEFAULT 0"`
 	//TotalHasActivityUser
-	regist_time := user.CreatedUnix.AsTime().Unix()
+	regist_time := int64(user.CreatedUnix)
 	if regist_time >= start_time && regist_time <= end_time {
 		if user.IsActive {
 			userMetrics["ActivateRegistUser"] = getMapKeyStringValue("ActivateRegistUser", userMetrics) + 1
@@ -1166,7 +1155,6 @@ func getUserIndexFromAnalysisAll(dateRecord UserBusinessAnalysisAll, ParaWeight
 	// 登录次数	0.10
 	result = float64(dateRecord.CodeMergeCount) * getParaWeightValue("CodeMergeCount", ParaWeight, 0.2)
 	result += float64(dateRecord.CommitCount) * getParaWeightValue("CommitCount", ParaWeight, 0.2)
-	log.Info("1 result=" + fmt.Sprint(result))
 	result += float64(dateRecord.IssueCount) * getParaWeightValue("IssueCount", ParaWeight, 0.2)
 	result += float64(dateRecord.CommentCount) * getParaWeightValue("CommentCount", ParaWeight, 0.2)
 	result += float64(dateRecord.FocusRepoCount) * getParaWeightValue("FocusRepoCount", ParaWeight, 0.1)
@@ -1249,7 +1237,6 @@ func getUserIndex(dateRecord UserBusinessAnalysis, ParaWeight map[string]float64
 	// 登录次数	0.10
 	result = float64(dateRecord.CodeMergeCount) * getParaWeightValue("CodeMergeCount", ParaWeight, 0.2)
 	result += float64(dateRecord.CommitCount) * getParaWeightValue("CommitCount", ParaWeight, 0.2)
-	log.Info("2 result=" + fmt.Sprint(result))
 	result += float64(dateRecord.IssueCount) * getParaWeightValue("IssueCount", ParaWeight, 0.2)
 	result += float64(dateRecord.CommentCount) * getParaWeightValue("CommentCount", ParaWeight, 0.2)
 	result += float64(dateRecord.FocusRepoCount) * getParaWeightValue("FocusRepoCount", ParaWeight, 0.1)
@@ -2061,7 +2048,7 @@ func queryCloudBrainTask(start_unix int64, end_unix int64) (map[int64]int, map[s
 	var indexTotal int64
 	indexTotal = 0
 	for {
-		sess.Select("id,job_type,user_id,duration,train_job_duration,type").Table("cloudbrain").Where(cond).OrderBy("id asc").Limit(PAGE_SIZE, int(indexTotal))
+		sess.Select("id,job_type,user_id,duration,train_job_duration,type").Table("cloudbrain").Unscoped().Where(cond).OrderBy("id asc").Limit(PAGE_SIZE, int(indexTotal))
 		cloudTaskList := make([]*Cloudbrain, 0)
 		sess.Find(&cloudTaskList)
 		log.Info("query cloudbrain size=" + fmt.Sprint(len(cloudTaskList)))
@@ -2071,7 +2058,9 @@ func queryCloudBrainTask(start_unix int64, end_unix int64) (map[int64]int, map[s
 			} else {
 				resultMap[cloudTaskRecord.UserID] += 1
 			}
-			setMapKey("CloudBrainRunTime", cloudTaskRecord.UserID, int(cloudTaskRecord.Duration), resultItemMap)
+			if cloudTaskRecord.Duration < 100000000 && cloudTaskRecord.Duration > 0 {
+				setMapKey("CloudBrainRunTime", cloudTaskRecord.UserID, int(cloudTaskRecord.Duration), resultItemMap)
+			}
 			if cloudTaskRecord.Type == 1 { //npu
 				if cloudTaskRecord.JobType == "TRAIN" {
 					setMapKey("NpuTrainJob", cloudTaskRecord.UserID, 1, resultItemMap)

modules/auth/repo_form.go

@@ -46,6 +46,7 @@ type CreateRepoForm struct {
 	Webhooks     bool
 	Avatar       bool
 	Labels       bool
+	AutoAgree    bool
 }
 
 // Validate validates the fields

modules/auth/wechat/access_token.go

@@ -9,7 +9,7 @@ import (
 
 const EMPTY_REDIS_VAL = "Nil"
 
-var accessTokenLock = redis_lock.NewDistributeLock()
+var accessTokenLock = redis_lock.NewDistributeLock(redis_key.AccessTokenLockKey())
 
 func GetWechatAccessToken() string {
 	token, _ := redis_client.Get(redis_key.WechatAccessTokenKey())
@@ -28,15 +28,15 @@ func GetWechatAccessToken() string {
 }
 
 func refreshAccessToken() {
-	if ok := accessTokenLock.Lock(redis_key.AccessTokenLockKey(), 3*time.Second); ok {
-		defer accessTokenLock.UnLock(redis_key.AccessTokenLockKey())
+	if ok := accessTokenLock.Lock(3 * time.Second); ok {
+		defer accessTokenLock.UnLock()
 		callAccessTokenAndUpdateCache()
 	}
 }
 
 func refreshAndGetAccessToken() string {
-	if ok := accessTokenLock.LockWithWait(redis_key.AccessTokenLockKey(), 3*time.Second, 3*time.Second); ok {
-		defer accessTokenLock.UnLock(redis_key.AccessTokenLockKey())
+	if ok := accessTokenLock.LockWithWait(3*time.Second, 3*time.Second); ok {
+		defer accessTokenLock.UnLock()
 		token, _ := redis_client.Get(redis_key.WechatAccessTokenKey())
 		if token != "" {
 			if token == EMPTY_REDIS_VAL {

modules/modelarts/resty.go

@@ -1119,3 +1119,44 @@ sendjob:
 
 	return &result, nil
 }
+
+func GetTrainJobMetricStatistic(jobID, versionID, podName string) (*models.GetTrainJobMetricStatisticResult, error) {
+	checkSetting()
+	client := getRestyClient()
+	var result models.GetTrainJobMetricStatisticResult
+
+	retry := 0
+
+sendjob:
+	res, err := client.R().
+		SetAuthToken(TOKEN).
+		SetResult(&result).
+		Get(HOST + "/v1/" + setting.ProjectID + urlTrainJob + "/" + jobID + "/versions/" + versionID + "/pod/" + podName + "/metric-statistic")
+
+	if err != nil {
+		return nil, fmt.Errorf("resty GetTrainJobMetricStatistic: %v", err)
+	}
+
+	if res.StatusCode() == http.StatusUnauthorized && retry < 1 {
+		retry++
+		_ = getToken()
+		goto sendjob
+	}
+
+	if res.StatusCode() != http.StatusOK {
+		var temp models.ErrorResult
+		if err = json.Unmarshal([]byte(res.String()), &temp); err != nil {
+			log.Error("json.Unmarshal failed(%s): %v", res.String(), err.Error())
+			return &result, fmt.Errorf("json.Unmarshal failed(%s): %v", res.String(), err.Error())
+		}
+		log.Error("GetTrainJobMetricStatistic failed(%d):%s(%s)", res.StatusCode(), temp.ErrorCode, temp.ErrorMsg)
+		return &result, fmt.Errorf("GetTrainJobMetricStatistic failed(%d):%s(%s)", res.StatusCode(), temp.ErrorCode, temp.ErrorMsg)
+	}
+
+	if !result.IsSuccess {
+		log.Error("GetTrainJobMetricStatistic(%s) failed", jobID)
+		return &result, fmt.Errorf("获取任务资源占用情况失败:%s", result.ErrorMsg)
+	}
+
+	return &result, nil
+}

modules/redis/redis_lock/lock.go

@@ -6,22 +6,23 @@ import (
 )
 
 type DistributeLock struct {
+	lockKey string
 }
 
-func NewDistributeLock() *DistributeLock {
-	return &DistributeLock{}
+func NewDistributeLock(lockKey string) *DistributeLock {
+	return &DistributeLock{lockKey: lockKey}
 }
 
-func (lock *DistributeLock) Lock(lockKey string, expireTime time.Duration) bool {
-	isOk, _ := redis_client.Setnx(lockKey, "", expireTime)
+func (lock *DistributeLock) Lock(expireTime time.Duration) bool {
+	isOk, _ := redis_client.Setnx(lock.lockKey, "", expireTime)
 	return isOk
 }
 
-func (lock *DistributeLock) LockWithWait(lockKey string, expireTime time.Duration, waitTime time.Duration) bool {
+func (lock *DistributeLock) LockWithWait(expireTime time.Duration, waitTime time.Duration) bool {
 	start := time.Now().Unix() * 1000
 	duration := waitTime.Milliseconds()
 	for {
-		isOk, _ := redis_client.Setnx(lockKey, "", expireTime)
+		isOk, _ := redis_client.Setnx(lock.lockKey, "", expireTime)
 		if isOk {
 			return true
 		}
@@ -34,7 +35,7 @@ func (lock *DistributeLock) LockWithWait(lockKey string, expireTime time.Duratio
 	return false
 }
 
-func (lock *DistributeLock) UnLock(lockKey string) error {
-	_, err := redis_client.Del(lockKey)
+func (lock *DistributeLock) UnLock() error {
+	_, err := redis_client.Del(lock.lockKey)
 	return err
 }

modules/repofiles/update.go

@@ -783,6 +783,7 @@ func RenameRepoFile(repo *models.Repository, doer *models.User, opts *RenameRepo
 
 	// Check that the path given in opts.treePath is valid (not a git path)
 	treePath := CleanUploadFileName(opts.TreePath)
+	treePath = strings.ReplaceAll(treePath, " ", "")
 	if treePath == "" {
 		return models.ErrFilenameInvalid{
 			Path: opts.TreePath,
@@ -942,16 +943,16 @@ func moveAndAddFiles(oldTreePath, newTreePath string, t *TemporaryUploadReposito
 		}
 		//example for v(mode SHA-1 stage file)
 		//100755 d294c88235ac05d3dece028d8a65590f28ec46ac 0       custom/conf/app.ini
-		v = strings.ReplaceAll(v, "0\t", "")
-		tmpArray := strings.Split(v, " ")
-		oldPath := tmpArray[2]
+		tempArray := strings.Split(v, "0\t")
+		leftArray := strings.Split(tempArray[0], " ")
+		oldPath := tempArray[1]
 		newPath := newTreePath + strings.TrimPrefix(oldPath, oldTreePath)
 		// mode 0 means remove file
 		stdIn.WriteString("0 0000000000000000000000000000000000000000\t")
 		stdIn.WriteString(oldPath)
 		stdIn.WriteByte('\000')
-		stdIn.WriteString(tmpArray[0] + " ")
-		stdIn.WriteString(tmpArray[1] + "\t")
+		stdIn.WriteString(leftArray[0] + " ")
+		stdIn.WriteString(leftArray[1] + "\t")
 		stdIn.WriteString(newPath)
 		stdIn.WriteByte('\000')
 	}

modules/storage/local.go

@@ -39,6 +39,14 @@ func (l *LocalStorage) Open(path string) (io.ReadCloser, error) {
 	return f, nil
 }
 
+func (l *LocalStorage) DownloadAFile(bucket string, objectName string) (io.ReadCloser, error) {
+	f, err := os.Open(filepath.Join(l.dir, objectName))
+	if err != nil {
+		return nil, err
+	}
+	return f, nil
+}
+
 // Save save a file
 func (l *LocalStorage) Save(path string, r io.Reader) (int64, error) {
 	p := filepath.Join(l.dir, path)

modules/storage/minio.go

@@ -59,6 +59,16 @@ func (m *MinioStorage) buildMinioPath(p string) string {
 	return strings.TrimPrefix(path.Join(m.basePath, p), "/")
 }
 
+func (m *MinioStorage) DownloadAFile(bucket string, objectName string) (io.ReadCloser, error) {
+
+	var opts = minio.GetObjectOptions{}
+	object, err := m.client.GetObject(m.bucket, objectName, opts)
+	if err != nil {
+		return nil, err
+	}
+	return object, nil
+}
+
 // Open open a file
 func (m *MinioStorage) Open(path string) (io.ReadCloser, error) {
 	var opts = minio.GetObjectOptions{}

modules/storage/minio_ext.go

@@ -113,7 +113,141 @@ func GenMultiPartSignedUrl(uuid string, uploadId string, partNumber int, partSiz
 	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)
+}
+
+func GetAllObjectByBucketAndPrefixMinio(bucket string, prefix string) ([]FileInfo, error) {
+	_, core, err := getClients()
+	if err != nil {
+		log.Error("getClients failed:", err.Error())
+		return nil, err
+	}
+	prefixLen := len(prefix)
+	delimiter := ""
+	marker := ""
+	index := 1
+	fileInfoList := FileInfoList{}
+	for {
+		output, err := core.ListObjects(bucket, prefix, marker, delimiter, 1000)
+		if err == nil {
+			log.Info("Page:%d\n", index)
+			index++
+			for _, val := range output.Contents {
+				var isDir bool
+				if prefixLen == len(val.Key) {
+					continue
+				}
+				if strings.HasSuffix(val.Key, "/") {
+					isDir = true
+				} else {
+					isDir = false
+				}
+				fileInfo := FileInfo{
+					ModTime:  val.LastModified.Format("2006-01-02 15:04:05"),
+					FileName: val.Key[prefixLen:],
+					Size:     val.Size,
+					IsDir:    isDir,
+					ParenDir: "",
+				}
+				fileInfoList = append(fileInfoList, fileInfo)
+			}
+			if output.IsTruncated {
+				marker = output.NextMarker
+			} else {
+				break
+			}
+		} else {
+			log.Info("list error." + err.Error())
+			return nil, err
+		}
+	}
+	sort.Sort(fileInfoList)
+	return fileInfoList, nil
+}
+
+func GetOneLevelAllObjectUnderDirMinio(bucket string, prefixRootPath string, relativePath string) ([]FileInfo, error) {
+	_, core, err := getClients()
+	if err != nil {
+		log.Error("getClients failed:", err.Error())
+		return nil, err
+	}
 
+	Prefix := prefixRootPath + relativePath
+	if !strings.HasSuffix(Prefix, "/") {
+		Prefix += "/"
+	}
+	log.Info("bucket=" + bucket + " Prefix=" + Prefix)
+	output, err := core.ListObjects(bucket, Prefix, "", "", 1000)
+	fileInfos := make([]FileInfo, 0)
+	prefixLen := len(Prefix)
+	if err == nil {
+		for _, val := range output.Contents {
+			log.Info("val key=" + val.Key)
+			var isDir bool
+			var fileName string
+			if val.Key == Prefix {
+				continue
+			}
+			if strings.Contains(val.Key[prefixLen:len(val.Key)-1], "/") {
+				continue
+			}
+			if strings.HasSuffix(val.Key, "/") {
+				isDir = true
+				fileName = val.Key[prefixLen : len(val.Key)-1]
+				relativePath += val.Key[prefixLen:]
+			} else {
+				isDir = false
+				fileName = val.Key[prefixLen:]
+			}
+			fileInfo := FileInfo{
+				ModTime:  val.LastModified.Local().Format("2006-01-02 15:04:05"),
+				FileName: fileName,
+				Size:     val.Size,
+				IsDir:    isDir,
+				ParenDir: relativePath,
+			}
+			fileInfos = append(fileInfos, fileInfo)
+		}
+		return fileInfos, err
+	} else {
+
+		log.Error("Message:%s", err.Error())
+
+		return nil, err
+	}
+
+}
+
+func MinioPathCopy(bucketName string, srcPath string, destPath string) (int64, error) {
+	_, core, err := getClients()
+	var fileTotalSize int64
+	fileTotalSize = 0
+	if err != nil {
+		log.Error("getClients failed:", err.Error())
+		return fileTotalSize, err
+	}
+	delimiter := ""
+	marker := ""
+	for {
+		output, err := core.ListObjects(bucketName, srcPath, marker, delimiter, 1000)
+		if err == nil {
+			for _, val := range output.Contents {
+				srcObjectName := val.Key
+				destObjectName := destPath + srcObjectName[len(srcPath):]
+				log.Info("srcObjectName=" + srcObjectName + " destObjectName=" + destObjectName)
+				core.CopyObject(bucketName, srcObjectName, bucketName, destObjectName, val.UserMetadata)
+				fileTotalSize += val.Size
+			}
+			if output.IsTruncated {
+				marker = output.NextMarker
+			} else {
+				break
+			}
+		} else {
+			log.Info("list error." + err.Error())
+			return 0, err
+		}
+	}
+	return fileTotalSize, nil
 }
 
 func NewMultiPartUpload(uuid string) (string, error) {

modules/storage/obs.go

@@ -564,3 +564,17 @@ func ObsCreateObject(path string) error {
 
 	return nil
 }
+
+func GetObsLogFileName(prefix string) (string, error) {
+	input := &obs.ListObjectsInput{}
+	input.Bucket = setting.Bucket
+	input.Prefix = prefix
+
+	output, err := ObsCli.ListObjects(input)
+	if err != nil {
+		log.Error("PutObject failed:", err.Error())
+		return "", err
+	}
+
+	return output.Contents[0].Key, nil
+}

modules/storage/storage.go

@@ -22,6 +22,7 @@ const (
 type ObjectStorage interface {
 	Save(path string, r io.Reader) (int64, error)
 	Open(path string) (io.ReadCloser, error)
+	DownloadAFile(bucket string, objectName string) (io.ReadCloser, error)
 	Delete(path string) error
 	DeleteDir(dir string) error
 	PresignedGetURL(path string, fileName string) (string, error)

options/locale/locale_en-US.ini

@@ -519,6 +519,8 @@ static.RecommendDataset=Recommended Dataset Count
 static.CollectImage=Collect Image Count
 static.CollectedImage=Collected Image Count
 static.RecommendImage=Recommended Image Count
+static.email=Email
+static.location=Location
 static.all=All
 static.public.user_business_analysis_current_month=Current_Month
 static.public.user_business_analysis_current_week=Current_Week
@@ -528,7 +530,7 @@ static.public.user_business_analysis_last30_day=Last_30_day
 static.public.user_business_analysis_last_month=Last_Month
 static.public.user_business_analysis_yesterday=Yesterday
 static.public.user_business_analysis_all=All
-
+static.downloadinfo=Due to the large amount of data generated in the customized time period and long calculation time, please download and export the data from the following address and export the data download address:
 metrics.sheetname=User Trend Analysis
 metrics.date=Count Date
 metrics.newregistuser=New registered user
@@ -537,6 +539,7 @@ metrics.hasactivateuser=New contributing activities
 metrics.newregistnotactiveuser=New inactive
 metrics.averageuser=Average new users
 metrics.newuseractiveindex=Activation rate of new users
+metrics.currentdayactivity=Current day contributing activities
 metrics.totalregistuser=Cumulative registered users
 metrics.totalactiveduser=Cumulative activated users
 metrics.totalhasactivityuser=Cumulative active users
@@ -814,6 +817,7 @@ settings.delete_notices_1= - This operation <strong>CANNOT</strong> be undone.
 settings.delete_notices_2= - This operation will permanently delete the <strong>%s</strong> dataset.
 settings.delete_notices_fork_1= - Forks of this dataset will become independent after deletion.
 settings.deletion_success= The dataset has been deleted.
+settings.deletion_notice_cloudbrain = you need to stop the cloudbrain task under the project before remove the project!
 task.machine_translation= machine translation
 task.question_answering_system= question answering system
 task.information_retrieval= information retrieval
@@ -894,6 +898,10 @@ search_dataset = Search Dataset Files
 unzip_tooltips = If it has not been decompressed for a long time, please check whether the compressed package has encrypted files or file errors
 zip_failed = Decompression failed, please check whether the compressed package is encrypted or contact technical support
 dataset_desc = The description should not exceed 1024 characters
+unzip_successed=Unzip Successed
+unzip_failed=Unzip Failed
+unzip_stared=Unzipping
+unzip_status=Unzip Status
 [repo]
 owner = Owner
 repo_name = Repository Name
@@ -1137,6 +1145,7 @@ modelarts.infer_job.model_version = Model/Version
 modelarts.infer_job.select_model = Select Model
 modelarts.infer_job.boot_file_helper=The startup file is the entry file for your program execution and must end in.py.Such as  inference.py, main.py, example/inference. Py, case/main.py.
 modelarts.infer_job.tooltip = The model has been deleted and cannot be viewed.
+modelarts.download_log=Download log file
 
 
 debug_task_not_created = Debug task has not been created
@@ -1175,6 +1184,7 @@ template.topics = Topics
 template.avatar = Avatar
 template.issue_labels = Issue Labels
 template.one_item = Must select at least one template item
+template.one_promise = Must agree to use the agreement!
 template.invalid = Must select a template repository
 template.repo_adress=Adress
 template.repo_path=path
@@ -1442,7 +1452,9 @@ issues.filter_sort.feweststars = Fewest stars
 issues.filter_sort.mostforks = Most forks
 issues.filter_sort.fewestforks = Fewest forks
 issues.filter_sort.downloadtimes = Most downloaded
-issues.filter_sort.moststars = Most star
+issues.filter_sort.citations=Citations
+issues.filter_sort.mostusecount = Most Quote
+issues.filter_sort.fewestusecount=Fewest Quote
 issues.action_open = Open
 issues.action_close = Close
 issues.action_label = Label
@@ -2248,7 +2260,8 @@ topic.done = Done
 topic.count_prompt = You can not select more than 25 topics
 topic.format_prompt = Topics must start with a chinese character,a letter or number, can include dashes ('-') and can be up to 35 characters long.
 imagetopic.format_prompt = Topics can be up to 35 characters long.
-
+use_repo_agreement=I promise that the content of this warehouse does not violate any national laws and regulations. During the use of the warehouse, I will abide by the OpenI community management regulations and platform usage rules, and will not conduct malicious attacks, mining, or any other illegal or disruptive platform order. Information release and related behaviors. For more information please refer to
+openi_use_agreement=OpenI Qizhi Community Platform Use Agreement.
 [org]
 org_name_holder = Organization Name
 org_full_name_holder = Organization Full Name
@@ -2946,6 +2959,7 @@ raw_minutes = minutes
 
 [dropzone]
 default_message = Drop files or click here to upload.
+default_dataset_message = Click to add files or directly drag and drop files here
 invalid_input_type = You can not upload files of this type.
 file_too_big = File size ({{filesize}} MB) exceeds the maximum size of ({{maxFilesize}} MB).
 remove_file = Remove file

options/locale/locale_zh-CN.ini

@@ -226,7 +226,7 @@ contributors=贡献者
 contributor=贡献者
 
 page_title=探索更好的AI
-page_small_title=启智AI开发协作平台
+page_small_title=启智AI协作平台
 page_description=面向AI领域的一站式协同开发环境，提供集代码开发、数据管理、模型调试、推理和评测为一体的AI开发流水线
 page_use=立即使用
 page_only_dynamic=仅展示开源项目动态
@@ -524,6 +524,8 @@ static.RecommendDataset=被推荐数据集数
 static.CollectImage=收藏镜像数
 static.CollectedImage=被收藏镜像数
 static.RecommendImage=被推荐镜像数
+static.email=Email
+static.location=所在地区
 static.all=所有
 static.public.user_business_analysis_current_month=本月
 static.public.user_business_analysis_current_week=本周
@@ -533,7 +535,7 @@ static.public.user_business_analysis_last30_day=近30天
 static.public.user_business_analysis_last_month=上月
 static.public.user_business_analysis_yesterday=昨天
 static.public.user_business_analysis_all=所有
-
+static.downloadinfo=因自定义时间段产生的数据量比较大，计算时间比较长，请您从如下地址下载导出数据,导出数据下载地址:
 metrics.sheetname=用户趋势分析
 metrics.date=日期
 metrics.newregistuser=新增注册用户
@@ -542,6 +544,7 @@ metrics.hasactivateuser=新增有贡献活动
 metrics.newregistnotactiveuser=新增未激活
 metrics.averageuser=平均新增用户
 metrics.newuseractiveindex=新增用户激活率
+metrics.currentdayactivity=当日有贡献活动
 metrics.totalregistuser=累计注册用户
 metrics.totalactiveduser=累计已激活
 metrics.totalhasactivityuser=累计有贡献活动
@@ -900,6 +903,10 @@ search_dataset = 搜索数据集文件
 unzip_tooltips = 如果长时间未解压,请检查压缩包是否有加密文件或者文件错误
 zip_failed = 解压失败，请检查压缩包是否有加密或者联系技术支持人员。
 dataset_desc = 描述字数不超过1024个字符
+unzip_successed=解压成功
+unzip_failed=解压失败
+unzip_stared=解压中
+unzip_status=解压状态
 
 [repo]
 owner=拥有者
@@ -1152,6 +1159,7 @@ modelarts.infer_job.model_version = 模型/版本
 modelarts.infer_job.select_model = 选择模型
 modelarts.infer_job.boot_file_helper=启动文件是您程序执行的入口文件，必须是以.py结尾的文件。比如inference.py、main.py、example/inference.py、case/main.py。
 modelarts.infer_job.tooltip = 该模型已删除，无法查看。
+modelarts.download_log=下载日志文件
 
 
 debug_task_not_created = 未创建过调试任务
@@ -1190,6 +1198,7 @@ template.topics=主题
 template.avatar=头像
 template.issue_labels=任务标签
 template.one_item=必须至少选择一个模板项
+template.one_promise=创建项目时需承诺遵守使用协议
 template.invalid=必须选择一个模板项目
 template.repo_adress=项目地址
 template.repo_path=项目地址
@@ -1453,12 +1462,15 @@ issues.filter_sort.mostcomment=最多评论
 issues.filter_sort.leastcomment=最少评论
 issues.filter_sort.nearduedate=到期日从近到远
 issues.filter_sort.farduedate=到期日从远到近
-issues.filter_sort.moststars=点赞由多到少
 issues.filter_sort.feweststars=点赞由少到多
 issues.filter_sort.mostforks=派生由多到少
 issues.filter_sort.fewestforks=派生由少到多
 issues.filter_sort.downloadtimes=下载次数
+issues.filter_sort.citations=引用次数
 issues.filter_sort.moststars=收藏数量
+issues.filter_sort.mostusecount=最多引用
+issues.filter_sort.fewestusecount=最少引用
+
 issues.action_open=开启
 issues.action_close=关闭
 issues.action_label=标签
@@ -1932,6 +1944,7 @@ settings.delete_notices_1=- 此操作 <strong>不可以</strong> 被回滚。
 settings.delete_notices_2=- 此操作将永久删除项目 <strong>%s</strong>，包括 Git 数据、 任务、评论、百科和协作者的操作权限。
 settings.delete_notices_fork_1=- 在此项目删除后，它的派生项目将变成独立项目。
 settings.deletion_success=项目已被删除。
+settings.deletion_notice_cloudbrain=请先停止项目内正在运行的云脑任务，然后再删除项目。
 settings.update_settings_success=项目设置已更新。
 settings.transfer_owner=新拥有者
 settings.make_transfer=开始转移
@@ -2262,7 +2275,8 @@ topic.done=保存
 topic.count_prompt=您最多选择25个标签
 topic.format_prompt=标签必须以中文、字母或数字开头，可以包含连字符 (-)，并且长度不得超过35个字符
 imagetopic.format_prompt=标签长度不得超过35个字符
-
+use_repo_agreement=我承诺此仓内容不违反任何国家法律法规，仓库使用过程中遵守OpenI启智社区管理规定和平台使用规则，不进行恶意攻击、挖矿等任何违法或扰乱平台秩序的信息发布和相关行为。更多信息请参考
+openi_use_agreement=OpenI启智社区平台使用协议
 [org]
 org_name_holder=组织名称
 org_full_name_holder=组织全名
@@ -2960,6 +2974,7 @@ raw_minutes=分钟
 
 [dropzone]
 default_message=拖动文件或者点击此处上传。
+default_dataset_message=点击添加文件或直接拖拽文件到此处。
 invalid_input_type=您不能上传该类型的文件
 file_too_big=文件体积（{{filesize}} MB）超过了最大允许体积（{{maxFilesize}} MB）
 remove_file=移除文件

public/home/home.js

@@ -9,7 +9,7 @@ if(isEmpty(token)){
 
 var swiperNewMessage = new Swiper(".newslist", {
     direction: "vertical",
-    slidesPerView: 10,
+    slidesPerView: 9,
     loop: true,
     autoplay: {
         delay: 2500,
@@ -17,7 +17,7 @@ var swiperNewMessage = new Swiper(".newslist", {
     },
 });
 var swiperEvent = new Swiper(".event-list", {
-    slidesPerView: 2,
+    slidesPerView: 3,
     spaceBetween: 30,
     pagination: {
         el: ".swiper-pagination",
@@ -117,6 +117,7 @@ socket.onmessage = function (e) {
                         continue;
                     }
                 }
+                refresh3DInfo(record);
                 var recordPrefix = getMsg(record);
                 if(record.OpType == "6" || record.OpType == "10" || record.OpType == "12" || record.OpType == "13"){
                     html += recordPrefix + actionName;
@@ -200,6 +201,29 @@ function getTaskLink(record){
     return re;
 }
 
+function refresh3DInfo(record){
+    if(record.OpType == "25" || record.OpType == "29" || record.OpType == "31"){
+        //cloudbrain one
+        var lines = $('.rotation3D__line');
+        var span =  $('.rotation3D__line').find("span")[0];
+        //console.log(span);
+        span.innerText =record.RefName;
+        //$('.rotation3D__line').find("span").eq(0).text(record.RefName)
+        //console.log("cloudbrain one line length=" + lines.length);
+        //lines[0].find("span").text(record.RefName);
+    }else if(record.OpType == "26" || record.OpType == "27" || record.OpType == "28"){
+        //cloudbrain two
+        var lines = $('.rotation3D__line');
+        //console.log("cloudbrain two line length=" + lines.length);
+        var span =  $('.rotation3D__line').find("span")[1];
+        //console.log(span);
+        span.innerText =record.RefName;
+        //$('.rotation3D__line').find("span").eq(1).text(record.RefName)
+        //lines[1].find("span").text(record.RefName);
+    }
+
+}
+
 function getMsg(record){
     var html ="";
     html += "<div class=\"swiper-slide item\">";
@@ -418,48 +442,57 @@ queryRecommendData();
 function queryRecommendData(){
     $.ajax({
         type:"GET",
-        url:"/recommend/org",
+        url:"/recommend/home",
         headers: {
            authorization:token,
          },
         dataType:"json",
         async:false,
         success:function(json){
-           displayOrg(json);
+           displayOrg(json.org);
+           displayRepo(json.repo);
+           displayActivity(json.image);
+           displayCloudBrain(json.cloudbrain)
         },
         error:function(response) {
         }
     });
 
-    $.ajax({
-        type:"GET",
-        url:"/recommend/repo",
-        headers: {
-           authorization:token,
-         },
-        dataType:"json",
-        async:false,
-        success:function(json){
-           displayRepo(json);
-        },
-        error:function(response) {
-        }
-    });
+    // $.ajax({
+    //     type:"GET",
+    //     url:"/recommend/repo",
+    //     headers: {
+    //        authorization:token,
+    //      },
+    //     dataType:"json",
+    //     async:false,
+    //     success:function(json){
+    //        displayRepo(json);
+    //     },
+    //     error:function(response) {
+    //     }
+    // });
+
+    // $.ajax({
+    //     type:"GET",
+    //     url:"/recommend/imageinfo",
+    //     headers: {
+    //        authorization:token,
+    //      },
+    //     dataType:"json",
+    //     async:false,
+    //     success:function(json){
+    //        displayActivity(json);
+    //     },
+    //     error:function(response) {
+    //     }
+    // });
+}
 
-    $.ajax({
-        type:"GET",
-        url:"/recommend/imageinfo",
-        headers: {
-           authorization:token,
-         },
-        dataType:"json",
-        async:false,
-        success:function(json){
-           displayActivity(json);
-        },
-        error:function(response) {
-        }
-    });
+function displayCloudBrain(json){
+    $('#completed_task').text(json.completed_task);
+    $('#running_task').text(json.running_task);
+    $('#wait_task').text(json.wait_task);
 }
 
 function displayActivity(json){

public/self/css/notebook/notebook.css

@@ -0,0 +1,86 @@
+.nb-notebook {
+    line-height: 1.5;
+    margin-left: 7em;
+}
+
+.nb-stdout, .nb-stderr {
+    white-space: pre-wrap;
+    margin: 1em 0;
+    padding: 0.1em 0.5em;
+}
+
+.nb-stderr {
+    background-color: #FAA;
+}
+
+.nb-cell + .nb-cell {
+    margin-top: 0.5em;
+}
+
+.nb-output table {
+    border: 1px solid #000;
+    border-collapse: collapse;
+}
+
+.nb-output th {
+    font-weight: bold;
+}
+
+.nb-output th, .nb-output td {
+    border: 1px solid #000;
+    padding: 0.25em;
+    text-align: left;
+    vertical-align: middle;
+    border-collapse: collapse;
+}
+
+.nb-notebook blockquote {
+    border-left: 5px solid #CCC;
+    margin-left: 0;
+    padding-left: 1em;
+}
+
+.nb-cell {
+    position: relative;
+}
+
+.nb-raw-cell {
+    white-space: pre-wrap;
+    background-color: #f5f2f0;
+    font-family: Consolas, Monaco, 'Andale Mono', monospace;
+    padding: 1em;
+    margin: .5em 0;
+}
+
+.nb-output {
+    min-height: 1em;
+    width: 100%;
+    overflow-x: scroll;
+    border-right: 1px dotted #CCC;
+}
+
+.nb-output img {
+    max-width: 100%;
+}
+
+.nb-output:before, .nb-input:before {
+    position: absolute;
+    font-family: monospace;
+    color: #999;
+    left: -7em;
+    width: 7em;
+    text-align: right;
+}
+
+.nb-input:before {
+    content: "In [" attr(data-prompt-number) "]:";
+}
+.nb-output:before {
+    content: "Out [" attr(data-prompt-number) "]:";
+}
+
+// Fix pandas dataframe formatting
+   div[style="max-height:1000px;max-width:1500px;overflow:auto;"] {
+       max-height: none !important;
+   }
+

public/self/css/notebook/prism.css

@@ -0,0 +1,142 @@
+/* PrismJS 1.21.0
+https://prismjs.com/download.html#themes=prism&languages=markup+clike+javascript+julia+python+r */
+/**
+ * prism.js default theme for JavaScript, CSS and HTML
+ * Based on dabblet (http://dabblet.com)
+ * @author Lea Verou
+ */
+
+code[class*="language-"],
+pre[class*="language-"] {
+	color: black;
+	background: none;
+	text-shadow: 0 1px white;
+	font-family: Consolas, Monaco, 'Andale Mono', 'Ubuntu Mono', monospace;
+	font-size: 1em;
+	text-align: left;
+	white-space: pre;
+	word-spacing: normal;
+	word-break: normal;
+	word-wrap: normal;
+	line-height: 1.5;
+
+	-moz-tab-size: 4;
+	-o-tab-size: 4;
+	tab-size: 4;
+
+	-webkit-hyphens: none;
+	-moz-hyphens: none;
+	-ms-hyphens: none;
+	hyphens: none;
+}
+
+pre[class*="language-"]::-moz-selection, pre[class*="language-"] ::-moz-selection,
+code[class*="language-"]::-moz-selection, code[class*="language-"] ::-moz-selection {
+	text-shadow: none;
+	background: #b3d4fc;
+}
+
+pre[class*="language-"]::selection, pre[class*="language-"] ::selection,
+code[class*="language-"]::selection, code[class*="language-"] ::selection {
+	text-shadow: none;
+	background: #b3d4fc;
+}
+
+@media print {
+	code[class*="language-"],
+	pre[class*="language-"] {
+		text-shadow: none;
+	}
+}
+
+/* Code blocks */
+pre[class*="language-"] {
+	padding: 1em;
+	margin: .5em 0;
+	overflow: auto;
+}
+
+:not(pre) > code[class*="language-"],
+pre[class*="language-"] {
+	background: #f5f2f0;
+}
+
+/* Inline code */
+:not(pre) > code[class*="language-"] {
+	padding: .1em;
+	border-radius: .3em;
+	white-space: normal;
+}
+
+.token.comment,
+.token.prolog,
+.token.doctype,
+.token.cdata {
+	color: slategray;
+}
+
+.token.punctuation {
+	color: #999;
+}
+
+.token.namespace {
+	opacity: .7;
+}
+
+.token.property,
+.token.tag,
+.token.boolean,
+.token.number,
+.token.constant,
+.token.symbol,
+.token.deleted {
+	color: #905;
+}
+
+.token.selector,
+.token.attr-name,
+.token.string,
+.token.char,
+.token.builtin,
+.token.inserted {
+	color: #690;
+}
+
+.token.operator,
+.token.entity,
+.token.url,
+.language-css .token.string,
+.style .token.string {
+	color: #9a6e3a;
+	/* This background color was intended by the author of this theme. */
+	background: hsla(0, 0%, 100%, .5);
+}
+
+.token.atrule,
+.token.attr-value,
+.token.keyword {
+	color: #07a;
+}
+
+.token.function,
+.token.class-name {
+	color: #DD4A68;
+}
+
+.token.regex,
+.token.important,
+.token.variable {
+	color: #e90;
+}
+
+.token.important,
+.token.bold {
+	font-weight: bold;
+}
+.token.italic {
+	font-style: italic;
+}
+
+.token.entity {
+	cursor: help;
+}

public/self/js/notebook/ansi_up.min.js

@@ -0,0 +1,6 @@
+// ansi_up.js
+// version : 1.1.0
+// author : Dru Nelson
+// license : MIT
+// http://github.com/drudru/ansi_up
+(function(a,b){function g(){this.fg=this.bg=null,this.bright=0}var c,d="1.1.0",e=typeof module!="undefined",f=[[{color:"0, 0, 0","class":"ansi-black"},{color:"187, 0, 0","class":"ansi-red"},{color:"0, 187, 0","class":"ansi-green"},{color:"187, 187, 0","class":"ansi-yellow"},{color:"0, 0, 187","class":"ansi-blue"},{color:"187, 0, 187","class":"ansi-magenta"},{color:"0, 187, 187","class":"ansi-cyan"},{color:"255,255,255","class":"ansi-white"}],[{color:"85, 85, 85","class":"ansi-bright-black"},{color:"255, 85, 85","class":"ansi-bright-red"},{color:"0, 255, 0","class":"ansi-bright-green"},{color:"255, 255, 85","class":"ansi-bright-yellow"},{color:"85, 85, 255","class":"ansi-bright-blue"},{color:"255, 85, 255","class":"ansi-bright-magenta"},{color:"85, 255, 255","class":"ansi-bright-cyan"},{color:"255, 255, 255","class":"ansi-bright-white"}]];g.prototype.escape_for_html=function(a){return a.replace(/[&<>]/gm,function(a){if(a=="&")return"&amp;";if(a=="<")return"&lt;";if(a==">")return"&gt;"})},g.prototype.linkify=function(a){return a.replace(/(https?:\/\/[^\s]+)/gm,function(a){return'<a href="'+a+'">'+a+"</a>"})},g.prototype.ansi_to_html=function(a,b){var c=a.split(/\033\[/),d=c.shift(),e=this,f=c.map(function(a){return e.process_chunk(a,b)});f.unshift(d);var g=f.reduce(function(a,b){return Array.isArray(b)?a.concat(b):(a.push(b),a)},[]),h=g.join("");return h},g.prototype.process_chunk=function(a,b){b=typeof b=="undefined"?{}:b;var c=typeof b.use_classes!="undefined"&&b.use_classes,d=c?"class":"color",e=a.match(/([\d;]*)m([^]*)/m);if(!e)return a;var g=e[2],h=e[1].split(";"),i=this;h.map(function(a){var b=parseInt(a);isNaN(b)||b===0?(i.fg=i.bg=null,i.bright=0):b===1?i.bright=1:b>=30&&b<38?i.fg=f[i.bright][b%10][d]:b>=40&&b<48&&(i.bg=f[0][b%10][d])});if(i.fg===null&&i.bg===null)return g;var j=classes=[];return i.fg&&(c?classes.push(i.fg+"-fg"):j.push("color:rgb("+i.fg+")")),i.bg&&(c?classes.push(i.bg+"-bg"):j.push("background-color:rgb("+i.bg+")")),c?['<span class="'+classes.join(" ")+'">',g,"</span>"]:['<span style="'+j.join(";")+'">',g,"</span>"]},c={escape_for_html:function(a){var b=new g;return b.escape_for_html(a)},linkify:function(a){var b=new g;return b.linkify(a)},ansi_to_html:function(a,b){var c=new g;return c.ansi_to_html(a,b)},ansi_to_html_obj:function(){return new g}},e&&(module.exports=c),typeof window!="undefined"&&typeof ender=="undefined"&&(window.ansi_up=c),typeof define=="function"&&define.amd&&define("ansi_up",[],function(){return c})})(Date);

public/self/js/notebook/katex-auto-render.min.js

@@ -0,0 +1 @@
+!function(e,t){"object"==typeof exports&&"object"==typeof module?module.exports=t(require("katex")):"function"==typeof define&&define.amd?define(["katex"],t):"object"==typeof exports?exports.renderMathInElement=t(require("katex")):e.renderMathInElement=t(e.katex)}("undefined"!=typeof self?self:this,function(e){return function(e){var t={};function r(n){if(t[n])return t[n].exports;var o=t[n]={i:n,l:!1,exports:{}};return e[n].call(o.exports,o,o.exports,r),o.l=!0,o.exports}return r.m=e,r.c=t,r.d=function(e,t,n){r.o(e,t)||Object.defineProperty(e,t,{enumerable:!0,get:n})},r.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},r.t=function(e,t){if(1&t&&(e=r(e)),8&t)return e;if(4&t&&"object"==typeof e&&e&&e.__esModule)return e;var n=Object.create(null);if(r.r(n),Object.defineProperty(n,"default",{enumerable:!0,value:e}),2&t&&"string"!=typeof e)for(var o in e)r.d(n,o,function(t){return e[t]}.bind(null,o));return n},r.n=function(e){var t=e&&e.__esModule?function(){return e.default}:function(){return e};return r.d(t,"a",t),t},r.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},r.p="",r(r.s=1)}([function(t,r){t.exports=e},function(e,t,r){"use strict";r.r(t);var n=r(0),o=r.n(n),a=function(e,t,r){for(var n=r,o=0,a=e.length;n<t.length;){var i=t[n];if(o<=0&&t.slice(n,n+a)===e)return n;"\\"===i?n++:"{"===i?o++:"}"===i&&o--,n++}return-1},i=function(e,t,r,n){for(var o=[],i=0;i<e.length;i++)if("text"===e[i].type){var l=e[i].data,d=!0,s=0,f=void 0;for(-1!==(f=l.indexOf(t))&&(s=f,o.push({type:"text",data:l.slice(0,s)}),d=!1);;){if(d){if(-1===(f=l.indexOf(t,s)))break;o.push({type:"text",data:l.slice(s,f)}),s=f}else{if(-1===(f=a(r,l,s+t.length)))break;o.push({type:"math",data:l.slice(s+t.length,f),rawData:l.slice(s,f+r.length),display:n}),s=f+r.length}d=!d}o.push({type:"text",data:l.slice(s)})}else o.push(e[i]);return o},l=function(e,t){var r=function(e,t){for(var r=[{type:"text",data:e}],n=0;n<t.length;n++){var o=t[n];r=i(r,o.left,o.right,o.display||!1)}return r}(e,t.delimiters);if(1===r.length&&"text"===r[0].type)return null;for(var n=document.createDocumentFragment(),a=0;a<r.length;a++)if("text"===r[a].type)n.appendChild(document.createTextNode(r[a].data));else{var l=document.createElement("span"),d=r[a].data;t.displayMode=r[a].display;try{t.preProcess&&(d=t.preProcess(d)),o.a.render(d,l,t)}catch(e){if(!(e instanceof o.a.ParseError))throw e;t.errorCallback("KaTeX auto-render: Failed to parse `"+r[a].data+"` with ",e),n.appendChild(document.createTextNode(r[a].rawData));continue}n.appendChild(l)}return n};t.default=function(e,t){if(!e)throw new Error("No element provided to render");var r={};for(var n in t)t.hasOwnProperty(n)&&(r[n]=t[n]);r.delimiters=r.delimiters||[{left:"$$",right:"$$",display:!0},{left:"\\(",right:"\\)",display:!1},{left:"\\[",right:"\\]",display:!0}],r.ignoredTags=r.ignoredTags||["script","noscript","style","textarea","pre","code","option"],r.ignoredClasses=r.ignoredClasses||[],r.errorCallback=r.errorCallback||console.error,r.macros=r.macros||{},function e(t,r){for(var n=0;n<t.childNodes.length;n++){var o=t.childNodes[n];if(3===o.nodeType){var a=l(o.textContent,r);a&&(n+=a.childNodes.length-1,t.replaceChild(a,o))}else 1===o.nodeType&&function(){var t=" "+o.className+" ";-1===r.ignoredTags.indexOf(o.nodeName.toLowerCase())&&r.ignoredClasses.every(function(e){return-1===t.indexOf(" "+e+" ")})&&e(o,r)}()}}(e,r)}}]).default});

routers/admin/dataset.go

@@ -61,6 +61,10 @@ func Datasets(ctx *context.Context) {
 		orderBy = models.SearchOrderByForksReverse
 	case "fewestforks":
 		orderBy = models.SearchOrderByForks
+	case "mostusecount":
+		orderBy = models.SearchOrderByUseCountReverse
+	case "fewestusecount":
+		orderBy = models.SearchOrderByUseCount
 	default:
 		ctx.Data["SortType"] = "recentupdate"
 		orderBy = models.SearchOrderByRecentUpdated

routers/api/v1/api.go

@@ -934,6 +934,7 @@ func RegisterRoutes(m *macaron.Macaron) {
 							m.Post("/del_version", repo.DelTrainJobVersion)
 							m.Post("/stop_version", repo.StopTrainJobVersion)
 							m.Get("/model_list", repo.ModelList)
+							m.Get("/metric_statistics", repo.TrainJobGetMetricStatistic)
 						})
 					})
 					m.Group("/inference-job", func() {

routers/api/v1/repo/cloudbrain_dashboard.go

@@ -1138,6 +1138,14 @@ func getMonthCloudbrainInfo(beginTime time.Time, endTime time.Time) ([]DateCloud
 		count += 1
 	}
 	return dayCloudbrainInfo, count, nil
+type CloudbrainsStatusAnalysis struct {
+	JobWaitingCount   int64 `json:"jobWaitingCount"`
+	JobRunningCount   int64 `json:"jobRunningCount"`
+	JobStoppedCount   int64 `json:"jobStoppedCount"`
+	JobCompletedCount int64 `json:"jobCompletedCount"`
+	JobFailedCount    int64 `json:"jobFailedCount"`
+	JobKilledCount    int64 `json:"jobKilledCount"`
+	JobInitCount      int64 `json:"jobInitCount"`
 }
 
 func DownloadCloudBrainBoard(ctx *context.Context) {
@@ -1364,5 +1372,5 @@ func getCloudbrainTimePeroid(ctx *context.Context, recordBeginTime time.Time) (t
 	}
 
 	return beginTime, endTime, nil
-
 }
+

routers/api/v1/repo/modelarts.go

@@ -462,3 +462,46 @@ func ResultList(ctx *context.APIContext) {
 		"PageIsCloudBrain": true,
 	})
 }
+
+func TrainJobGetMetricStatistic(ctx *context.APIContext) {
+	var (
+		err error
+	)
+
+	var jobID = ctx.Params(":jobid")
+	var versionName = ctx.Query("version_name")
+
+	result, err := trainJobGetMetricStatistic(jobID, versionName)
+	if err != nil {
+		log.Error("trainJobGetMetricStatistic(%s) failed:%v", jobID, err.Error())
+		return
+	}
+
+	ctx.JSON(http.StatusOK, map[string]interface{}{
+		"JobID":       jobID,
+		"Interval":    result.Interval,
+		"MetricsInfo": result.MetricsInfo,
+	})
+}
+
+func trainJobGetMetricStatistic(jobID string, versionName string) (*models.GetTrainJobMetricStatisticResult, error) {
+	task, err := models.GetCloudbrainByJobIDAndVersionName(jobID, versionName)
+	if err != nil {
+		log.Error("GetCloudbrainByJobIDAndVersionName(%s) failed:%v", jobID, err.Error())
+		return nil, err
+	}
+
+	resultLogFile, err := modelarts.GetTrainJobLogFileNames(jobID, strconv.FormatInt(task.VersionID, 10))
+	if err != nil {
+		log.Error("GetTrainJobLogFileNames(%s) failed:%v", jobID, err.Error())
+		return nil, err
+	}
+
+	result, err := modelarts.GetTrainJobMetricStatistic(jobID, strconv.FormatInt(task.VersionID, 10), resultLogFile.LogFileList[0])
+	if err != nil {
+		log.Error("GetTrainJobMetricStatistic(%s) failed:%v", jobID, err.Error())
+		return nil, err
+	}
+
+	return result, err
+}

routers/home.go

@@ -7,6 +7,7 @@ package routers
 
 import (
 	"bytes"
+	"fmt"
 	"net/http"
 	"strconv"
 	"strings"
@@ -99,6 +100,12 @@ func setRecommendURL(ctx *context.Context) {
 
 func Dashboard(ctx *context.Context) {
 	if ctx.IsSigned {
+		pictureInfo, err := getImageInfo("dashboard-picture")
+		if err == nil && len(pictureInfo) > 0 {
+			log.Info("set image info=" + pictureInfo[0]["url"])
+			ctx.Data["image_url"] = pictureInfo[0]["url"]
+			ctx.Data["image_link"] = pictureInfo[0]["image_link"]
+		}
 		if !ctx.User.IsActive && setting.Service.RegisterEmailConfirm {
 			ctx.Data["Title"] = ctx.Tr("auth.active_your_account")
 			ctx.HTML(200, user.TplActivate)
@@ -259,7 +266,11 @@ func ExploreRepos(ctx *context.Context) {
 	ctx.Data["PageIsExplore"] = true
 	ctx.Data["PageIsExploreRepositories"] = true
 	ctx.Data["IsRepoIndexerEnabled"] = setting.Indexer.RepoIndexerEnabled
-
+	pictureInfo, err := getImageInfo("explore-user-picture")
+	if err == nil && len(pictureInfo) > 0 {
+		ctx.Data["image_url"] = pictureInfo[0]["url"]
+		ctx.Data["image_link"] = pictureInfo[0]["image_link"]
+	}
 	var ownerID int64
 	if ctx.User != nil && !ctx.User.IsAdmin {
 		ownerID = ctx.User.ID
@@ -312,6 +323,10 @@ func ExploreDatasets(ctx *context.Context) {
 		orderBy = models.SearchOrderByStarsReverse
 	case "feweststars":
 		orderBy = models.SearchOrderByStars
+	case "mostusecount":
+		orderBy = models.SearchOrderByUseCountReverse
+	case "fewestusecount":
+		orderBy = models.SearchOrderByUseCount
 	case "default":
 		orderBy = models.SearchOrderByDefault
 	default:
@@ -434,7 +449,11 @@ func ExploreUsers(ctx *context.Context) {
 	ctx.Data["PageIsExplore"] = true
 	ctx.Data["PageIsExploreUsers"] = true
 	ctx.Data["IsRepoIndexerEnabled"] = setting.Indexer.RepoIndexerEnabled
-
+	pictureInfo, err := getImageInfo("explore-user-picture")
+	if err == nil && len(pictureInfo) > 0 {
+		ctx.Data["image_url"] = pictureInfo[0]["url"]
+		ctx.Data["image_link"] = pictureInfo[0]["image_link"]
+	}
 	RenderUserSearch(ctx, &models.SearchUserOptions{
 		Actor:       ctx.User,
 		Type:        models.UserTypeIndividual,
@@ -471,7 +490,7 @@ func ExploreOrganizations(ctx *context.Context) {
 		return
 	}
 
-	recommendOrgs, err := GetRecommendOrg()
+	recommendOrgs, err := getRecommendOrg()
 	if err != nil {
 		log.Error("GetRecommendOrgInfos failed:%v", err.Error(), ctx.Data["MsgID"])
 		ctx.ServerError("GetRecommendOrgInfos", err)
@@ -606,31 +625,31 @@ func ExploreImages(ctx *context.Context) {
 }
 
 func ExploreDataAnalysisUserTrend(ctx *context.Context) {
-	ctx.Data["url_params"]="UserTrend"
+	ctx.Data["url_params"] = "UserTrend"
 	ctx.HTML(200, tplExploreExploreDataAnalysis)
 }
 func ExploreDataAnalysisUserAnalysis(ctx *context.Context) {
-	ctx.Data["url_params"]="UserAnalysis"
+	ctx.Data["url_params"] = "UserAnalysis"
 	ctx.HTML(200, tplExploreExploreDataAnalysis)
 }
 func ExploreDataAnalysisProTrend(ctx *context.Context) {
-	ctx.Data["url_params"]="ProTrend"
+	ctx.Data["url_params"] = "ProTrend"
 	ctx.HTML(200, tplExploreExploreDataAnalysis)
 }
 func ExploreDataAnalysisProAnalysis(ctx *context.Context) {
-	ctx.Data["url_params"]="ProAnalysis"
+	ctx.Data["url_params"] = "ProAnalysis"
 	ctx.HTML(200, tplExploreExploreDataAnalysis)
 }
 func ExploreDataAnalysisOverview(ctx *context.Context) {
-	ctx.Data["url_params"]="Overview"
+	ctx.Data["url_params"] = "Overview"
 	ctx.HTML(200, tplExploreExploreDataAnalysis)
 }
 func ExploreDataAnalysisBrainAnalysis(ctx *context.Context) {
-	ctx.Data["url_params"]="BrainAnalysis"
+	ctx.Data["url_params"] = "BrainAnalysis"
 	ctx.HTML(200, tplExploreExploreDataAnalysis)
 }
 func ExploreDataAnalysis(ctx *context.Context) {
-	ctx.Data["url_params"]=""
+	ctx.Data["url_params"] = ""
 	ctx.HTML(200, tplExploreExploreDataAnalysis)
 }
 
@@ -640,7 +659,7 @@ func NotFound(ctx *context.Context) {
 	ctx.NotFound("home.NotFound", nil)
 }
 
-func GetRecommendOrg() ([]map[string]interface{}, error) {
+func getRecommendOrg() ([]map[string]interface{}, error) {
 	url := setting.RecommentRepoAddr + "organizations"
 	result, err := repository.RecommendFromPromote(url)
 
@@ -668,17 +687,18 @@ func GetRecommendOrg() ([]map[string]interface{}, error) {
 	}
 	return resultOrg, nil
 }
-func GetImageInfo() ([]map[string]interface{}, error) {
-	url := setting.RecommentRepoAddr + "picture_info"
+
+func getImageInfo(filename string) ([]map[string]string, error) {
+	url := setting.RecommentRepoAddr + filename
 	result, err := repository.RecommendFromPromote(url)
 
 	if err != nil {
 		return nil, err
 	}
-	imageInfo := make([]map[string]interface{}, 0)
+	imageInfo := make([]map[string]string, 0)
 	for i := 0; i < (len(result) - 1); i++ {
 		line := result[i]
-		imageMap := make(map[string]interface{})
+		imageMap := make(map[string]string)
 		if line[0:4] == "url=" {
 			url := line[4:]
 			imageMap["url"] = url
@@ -731,14 +751,14 @@ func GetRankUser(index string) ([]map[string]interface{}, error) {
 	return resultOrg, nil
 }
 
-func GetImageInfoFromPromote(ctx *context.Context) {
-	imageInfo, err := GetImageInfo()
-	if err != nil {
-		ctx.ServerError("500", err)
-		return
-	}
-	ctx.JSON(200, imageInfo)
-}
+// func GetImageInfoFromPromote(ctx *context.Context) {
+// 	imageInfo, err := GetImageInfo()
+// 	if err != nil {
+// 		ctx.ServerError("500", err)
+// 		return
+// 	}
+// 	ctx.JSON(200, imageInfo)
+// }
 
 func GetUserRankFromPromote(ctx *context.Context) {
 	index := ctx.Params("index")
@@ -750,15 +770,49 @@ func GetUserRankFromPromote(ctx *context.Context) {
 	ctx.JSON(200, resultUserRank)
 }
 
-func RecommendOrgFromPromote(ctx *context.Context) {
-	resultOrg, err := GetRecommendOrg()
+func RecommendHomeInfo(ctx *context.Context) {
+	resultOrg, err := getRecommendOrg()
 	if err != nil {
-		ctx.ServerError("500", err)
-		return
+		log.Info("error." + err.Error())
+	}
+	resultRepo, err := repository.GetRecommendRepoFromPromote("projects")
+	if err != nil {
+		log.Info("error." + err.Error())
+	}
+	resultImage, err := getImageInfo("picture_info")
+	if err != nil {
+		log.Info("error." + err.Error())
 	}
-	ctx.JSON(200, resultOrg)
+	resultCloudBrain, err := getCloudbrainNums()
+	if err != nil {
+		log.Info("error." + err.Error())
+	}
+	mapInterface := make(map[string]interface{})
+	mapInterface["org"] = resultOrg
+	mapInterface["repo"] = resultRepo
+	mapInterface["image"] = resultImage
+	mapInterface["cloudbrain"] = resultCloudBrain
+	ctx.JSON(http.StatusOK, mapInterface)
 }
 
+func getCloudbrainNums() (map[string]string, error) {
+	result := make(map[string]string)
+	cloudStatusMap := models.GetAllStatusCloudBrain()
+	result["completed_task"] = fmt.Sprint(cloudStatusMap["COMPLETED"])
+	result["running_task"] = fmt.Sprint(cloudStatusMap["RUNNING"])
+	result["wait_task"] = fmt.Sprint(cloudStatusMap["WAITING"])
+	return result, nil
+}
+
+// func RecommendOrgFromPromote(ctx *context.Context) {
+// 	resultOrg, err := GetRecommendOrg()
+// 	if err != nil {
+// 		ctx.ServerError("500", err)
+// 		return
+// 	}
+// 	ctx.JSON(200, resultOrg)
+// }
+
 func RecommendRepoFromPromote(ctx *context.Context) {
 	result, err := repository.GetRecommendRepoFromPromote("projects")
 	if err != nil {

routers/repo/ai_model_manage.go

@@ -6,6 +6,7 @@ import (
 	"errors"
 	"fmt"
 	"net/http"
+	"net/url"
 	"path"
 	"strings"
 
@@ -27,19 +28,22 @@ const (
 	MODEL_NOT_LATEST       = 0
 )
 
-func saveModelByParameters(jobId string, versionName string, name string, version string, label string, description string, ctx *context.Context) error {
+func saveModelByParameters(jobId string, versionName string, name string, version string, label string, description string, engine int, ctx *context.Context) error {
 	aiTask, err := models.GetCloudbrainByJobIDAndVersionName(jobId, versionName)
 	if err != nil {
-		log.Info("query task error." + err.Error())
-		return err
+		aiTask, err = models.GetRepoCloudBrainByJobID(ctx.Repo.Repository.ID, jobId)
+		if err != nil {
+			log.Info("query task error." + err.Error())
+			return err
+		} else {
+			log.Info("query gpu train task.")
+		}
 	}
-
 	uuid := uuid.NewV4()
 	id := uuid.String()
 	modelPath := id
 	var lastNewModelId string
 	var modelSize int64
-	cloudType := models.TypeCloudBrainTwo
 
 	log.Info("find task name:" + aiTask.JobName)
 	aimodels := models.QueryModelByName(name, aiTask.RepoID)
@@ -53,7 +57,7 @@ func saveModelByParameters(jobId string, versionName string, name string, versio
 			}
 		}
 	}
-	cloudType = aiTask.Type
+	cloudType := aiTask.Type
 	//download model zip   //train type
 	if cloudType == models.TypeCloudBrainTwo {
 		modelPath, modelSize, err = downloadModelFromCloudBrainTwo(id, aiTask.JobName, "", aiTask.TrainUrl)
@@ -61,6 +65,12 @@ func saveModelByParameters(jobId string, versionName string, name string, versio
 			log.Info("download model from CloudBrainTwo faild." + err.Error())
 			return err
 		}
+	} else if cloudType == models.TypeCloudBrainOne {
+		modelPath, modelSize, err = downloadModelFromCloudBrainOne(id, aiTask.JobName, "", aiTask.TrainUrl)
+		if err != nil {
+			log.Info("download model from CloudBrainOne faild." + err.Error())
+			return err
+		}
 	}
 	accuracy := make(map[string]string)
 	accuracy["F1"] = ""
@@ -131,7 +141,7 @@ func SaveNewNameModel(ctx *context.Context) {
 		return
 	}
 	SaveModel(ctx)
-
+	ctx.Status(200)
 	log.Info("save model end.")
 }
 
@@ -143,8 +153,9 @@ func SaveModel(ctx *context.Context) {
 	version := ctx.Query("Version")
 	label := ctx.Query("Label")
 	description := ctx.Query("Description")
+	engine := ctx.QueryInt("Engine")
 	trainTaskCreate := ctx.QueryBool("trainTaskCreate")
-
+	log.Info("engine=" + fmt.Sprint(engine))
 	if !trainTaskCreate {
 		if !ctx.Repo.CanWrite(models.UnitTypeModelManage) {
 			//ctx.NotFound(ctx.Req.URL.RequestURI(), nil)
@@ -163,14 +174,14 @@ func SaveModel(ctx *context.Context) {
 		return
 	}
 
-	err := saveModelByParameters(JobId, VersionName, name, version, label, description, ctx)
+	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
 	}
-
+	ctx.Status(200)
 	log.Info("save model end.")
 }
 
@@ -199,6 +210,22 @@ func downloadModelFromCloudBrainTwo(modelUUID string, jobName string, parentDir
 	return dataActualPath, size, nil
 }
 
+func downloadModelFromCloudBrainOne(modelUUID string, jobName string, parentDir string, trainUrl string) (string, int64, error) {
+	modelActualPath := storage.GetMinioPath(jobName, "/model/")
+	log.Info("modelActualPath=" + modelActualPath)
+	modelSrcPrefix := setting.CBCodePathPrefix + jobName + "/model/"
+	destKeyNamePrefix := Model_prefix + models.AttachmentRelativePath(modelUUID) + "/"
+	bucketName := setting.Attachment.Minio.Bucket
+	log.Info("destKeyNamePrefix=" + destKeyNamePrefix + "   modelSrcPrefix=" + modelSrcPrefix + "  bucket=" + bucketName)
+	size, err := storage.MinioPathCopy(bucketName, modelSrcPrefix, destKeyNamePrefix)
+	if err == nil {
+		dataActualPath := bucketName + "/" + destKeyNamePrefix
+		return dataActualPath, size, nil
+	} else {
+		return "", 0, nil
+	}
+}
+
 func DeleteModel(ctx *context.Context) {
 	log.Info("delete model start.")
 	id := ctx.Query("ID")
@@ -277,51 +304,117 @@ func DownloadMultiModelFile(ctx *context.Context) {
 	}
 
 	path := Model_prefix + models.AttachmentRelativePath(id) + "/"
+	if task.Type == models.TypeCloudBrainTwo {
+		downloadFromCloudBrainTwo(path, task, ctx, id)
+	} else if task.Type == models.TypeCloudBrainOne {
+		downloadFromCloudBrainOne(path, task, ctx, id)
+	}
+}
 
-	allFile, err := storage.GetAllObjectByBucketAndPrefix(setting.Bucket, path)
+func MinioDownloadManyFile(path string, ctx *context.Context, returnFileName string, allFile []storage.FileInfo) {
+	ctx.Resp.Header().Set("Content-Disposition", "attachment; filename="+url.QueryEscape(returnFileName))
+	ctx.Resp.Header().Set("Content-Type", "application/octet-stream")
+	w := zip.NewWriter(ctx.Resp)
+	defer w.Close()
+	for _, oneFile := range allFile {
+		if oneFile.IsDir {
+			log.Info("zip dir name:" + oneFile.FileName)
+		} else {
+			log.Info("zip file name:" + oneFile.FileName)
+			fDest, err := w.Create(oneFile.FileName)
+			if err != nil {
+				log.Info("create zip entry error, download file failed: %s\n", err.Error())
+				ctx.ServerError("download file failed:", err)
+				return
+			}
+			log.Info("minio file path=" + (path + oneFile.FileName))
+			body, err := storage.Attachments.DownloadAFile(setting.Attachment.Minio.Bucket, path+oneFile.FileName)
+			if err != nil {
+				log.Info("download file failed: %s\n", err.Error())
+				ctx.ServerError("download file failed:", err)
+				return
+			} else {
+				defer body.Close()
+				p := make([]byte, 1024)
+				var readErr error
+				var readCount int
+				// 读取对象内容
+				for {
+					readCount, readErr = body.Read(p)
+					if readCount > 0 {
+						fDest.Write(p[:readCount])
+					}
+					if readErr != nil {
+						break
+					}
+				}
+			}
+		}
+	}
+
+}
+
+func downloadFromCloudBrainOne(path string, task *models.AiModelManage, ctx *context.Context, id string) {
+	allFile, err := storage.GetAllObjectByBucketAndPrefixMinio(setting.Attachment.Minio.Bucket, path)
 	if err == nil {
 		//count++
 		models.ModifyModelDownloadCount(id)
-
 		returnFileName := task.Name + "_" + task.Version + ".zip"
-		ctx.Resp.Header().Set("Content-Disposition", "attachment; filename="+returnFileName)
-		ctx.Resp.Header().Set("Content-Type", "application/octet-stream")
-		w := zip.NewWriter(ctx.Resp)
-		defer w.Close()
-		for _, oneFile := range allFile {
-			if oneFile.IsDir {
-				log.Info("zip dir name:" + oneFile.FileName)
+		MinioDownloadManyFile(path, ctx, returnFileName, allFile)
+	} else {
+		log.Info("error,msg=" + err.Error())
+		ctx.ServerError("no file to download.", err)
+	}
+}
+
+func ObsDownloadManyFile(path string, ctx *context.Context, returnFileName string, allFile []storage.FileInfo) {
+	ctx.Resp.Header().Set("Content-Disposition", "attachment; filename="+url.QueryEscape(returnFileName))
+	ctx.Resp.Header().Set("Content-Type", "application/octet-stream")
+	w := zip.NewWriter(ctx.Resp)
+	defer w.Close()
+	for _, oneFile := range allFile {
+		if oneFile.IsDir {
+			log.Info("zip dir name:" + oneFile.FileName)
+		} else {
+			log.Info("zip file name:" + oneFile.FileName)
+			fDest, err := w.Create(oneFile.FileName)
+			if err != nil {
+				log.Info("create zip entry error, download file failed: %s\n", err.Error())
+				ctx.ServerError("download file failed:", err)
+				return
+			}
+			body, err := storage.ObsDownloadAFile(setting.Bucket, path+oneFile.FileName)
+			if err != nil {
+				log.Info("download file failed: %s\n", err.Error())
+				ctx.ServerError("download file failed:", err)
+				return
 			} else {
-				log.Info("zip file name:" + oneFile.FileName)
-				fDest, err := w.Create(oneFile.FileName)
-				if err != nil {
-					log.Info("create zip entry error, download file failed: %s\n", err.Error())
-					ctx.ServerError("download file failed:", err)
-					return
-				}
-				body, err := storage.ObsDownloadAFile(setting.Bucket, path+oneFile.FileName)
-				if err != nil {
-					log.Info("download file failed: %s\n", err.Error())
-					ctx.ServerError("download file failed:", err)
-					return
-				} else {
-					defer body.Close()
-					p := make([]byte, 1024)
-					var readErr error
-					var readCount int
-					// 读取对象内容
-					for {
-						readCount, readErr = body.Read(p)
-						if readCount > 0 {
-							fDest.Write(p[:readCount])
-						}
-						if readErr != nil {
-							break
-						}
+				defer body.Close()
+				p := make([]byte, 1024)
+				var readErr error
+				var readCount int
+				// 读取对象内容
+				for {
+					readCount, readErr = body.Read(p)
+					if readCount > 0 {
+						fDest.Write(p[:readCount])
+					}
+					if readErr != nil {
+						break
 					}
 				}
 			}
 		}
+	}
+}
+
+func downloadFromCloudBrainTwo(path string, task *models.AiModelManage, ctx *context.Context, id string) {
+	allFile, err := storage.GetAllObjectByBucketAndPrefix(setting.Bucket, path)
+	if err == nil {
+		//count++
+		models.ModifyModelDownloadCount(id)
+		returnFileName := task.Name + "_" + task.Version + ".zip"
+		ObsDownloadManyFile(path, ctx, returnFileName, allFile)
 	} else {
 		log.Info("error,msg=" + err.Error())
 		ctx.ServerError("no file to download.", err)
@@ -374,42 +467,55 @@ func DownloadSingleModelFile(ctx *context.Context) {
 		ctx.NotFound(ctx.Req.URL.RequestURI(), nil)
 		return
 	}
-	if setting.PROXYURL != "" {
-		body, err := storage.ObsDownloadAFile(setting.Bucket, path)
-		if err != nil {
-			log.Info("download error.")
+	if task.Type == models.TypeCloudBrainTwo {
+		if setting.PROXYURL != "" {
+			body, err := storage.ObsDownloadAFile(setting.Bucket, path)
+			if err != nil {
+				log.Info("download error.")
+			} else {
+				//count++
+				models.ModifyModelDownloadCount(id)
+				defer body.Close()
+				ctx.Resp.Header().Set("Content-Disposition", "attachment; filename="+fileName)
+				ctx.Resp.Header().Set("Content-Type", "application/octet-stream")
+				p := make([]byte, 1024)
+				var readErr error
+				var readCount int
+				// 读取对象内容
+				for {
+					readCount, readErr = body.Read(p)
+					if readCount > 0 {
+						ctx.Resp.Write(p[:readCount])
+						//fmt.Printf("%s", p[:readCount])
+					}
+					if readErr != nil {
+						break
+					}
+				}
+			}
 		} else {
+			url, err := storage.GetObsCreateSignedUrlByBucketAndKey(setting.Bucket, path)
+			if err != nil {
+				log.Error("GetObsCreateSignedUrl failed: %v", err.Error(), ctx.Data["msgID"])
+				ctx.ServerError("GetObsCreateSignedUrl", err)
+				return
+			}
 			//count++
 			models.ModifyModelDownloadCount(id)
-			defer body.Close()
-			ctx.Resp.Header().Set("Content-Disposition", "attachment; filename="+fileName)
-			ctx.Resp.Header().Set("Content-Type", "application/octet-stream")
-			p := make([]byte, 1024)
-			var readErr error
-			var readCount int
-			// 读取对象内容
-			for {
-				readCount, readErr = body.Read(p)
-				if readCount > 0 {
-					ctx.Resp.Write(p[:readCount])
-					//fmt.Printf("%s", p[:readCount])
-				}
-				if readErr != nil {
-					break
-				}
-			}
+			http.Redirect(ctx.Resp, ctx.Req.Request, url, http.StatusMovedPermanently)
 		}
-	} else {
-		url, err := storage.GetObsCreateSignedUrlByBucketAndKey(setting.Bucket, path)
+	} else if task.Type == models.TypeCloudBrainOne {
+		log.Info("start to down load minio file.")
+		url, err := storage.Attachments.PresignedGetURL(path, fileName)
 		if err != nil {
-			log.Error("GetObsCreateSignedUrl failed: %v", err.Error(), ctx.Data["msgID"])
-			ctx.ServerError("GetObsCreateSignedUrl", err)
+			log.Error("Get minio get SignedUrl failed: %v", err.Error(), ctx.Data["msgID"])
+			ctx.ServerError("Get minio get SignedUrl failed", err)
 			return
 		}
-		//count++
 		models.ModifyModelDownloadCount(id)
 		http.Redirect(ctx.Resp, ctx.Req.Request, url, http.StatusMovedPermanently)
 	}
+
 }
 
 func ShowModelInfo(ctx *context.Context) {
@@ -684,14 +790,22 @@ func QueryModelListForPredict(ctx *context.Context) {
 func QueryModelFileForPredict(ctx *context.Context) {
 	id := ctx.Query("ID")
 	model, err := models.QueryModelById(id)
-	if err != nil {
+	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)
+		} 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)
+		}
+	} else {
 		log.Error("no such model!", err.Error())
 		ctx.ServerError("no such model:", err)
 		return
 	}
-	prefix := model.Path[len(setting.Bucket)+1:]
-	fileinfos, err := storage.GetAllObjectByBucketAndPrefix(setting.Bucket, prefix)
-	ctx.JSON(http.StatusOK, fileinfos)
+
 }
 
 func QueryOneLevelModelFile(ctx *context.Context) {
@@ -703,7 +817,16 @@ func QueryOneLevelModelFile(ctx *context.Context) {
 		ctx.ServerError("no such model:", err)
 		return
 	}
-	prefix := model.Path[len(setting.Bucket)+1:]
-	fileinfos, err := storage.GetOneLevelAllObjectUnderDir(setting.Bucket, prefix, parentDir)
-	ctx.JSON(http.StatusOK, fileinfos)
+	if model.Type == models.TypeCloudBrainTwo {
+		log.Info("TypeCloudBrainTwo list model file.")
+		prefix := model.Path[len(setting.Bucket)+1:]
+		fileinfos, _ := storage.GetOneLevelAllObjectUnderDir(setting.Bucket, prefix, parentDir)
+		ctx.JSON(http.StatusOK, fileinfos)
+	} else if model.Type == models.TypeCloudBrainOne {
+		log.Info("TypeCloudBrainOne list model file.")
+		prefix := model.Path[len(setting.Attachment.Minio.Bucket)+1:]
+		fileinfos, _ := storage.GetOneLevelAllObjectUnderDirMinio(setting.Attachment.Minio.Bucket, prefix, parentDir)
+		ctx.JSON(http.StatusOK, fileinfos)
+	}
+
 }

routers/repo/attachment.go

@@ -902,16 +902,17 @@ func CompleteMultipart(ctx *context.Context) {
 				if err != nil {
 					log.Error("SendDecompressTask(%s) failed:%s", uuid, err.Error())
 				} else {
-					attachment.DecompressState = models.DecompressStateIng
-					err = models.UpdateAttachment(attachment)
-					if err != nil {
-						log.Error("UpdateAttachment state(%s) failed:%s", uuid, err.Error())
-					}
+					updateAttachmentDecompressStateIng(attachment)
 				}
 			}
 			if typeCloudBrain == models.TypeCloudBrainTwo {
 				attachjson, _ := json.Marshal(attachment)
-				labelmsg.SendDecompressAttachToLabelOBS(string(attachjson))
+				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

routers/repo/cloudbrain.go

@@ -206,7 +206,7 @@ func CloudBrainCreate(ctx *context.Context, form auth.CreateCloudBrainForm) {
 	ctx.Data["PageIsCloudBrain"] = true
 	displayJobName := form.DisplayJobName
 	jobName := util.ConvertDisplayJobNameToJobName(displayJobName)
-	image := form.Image
+	image := strings.TrimSpace(form.Image)
 	uuid := form.Attachment
 	jobType := form.JobType
 	gpuQueue := form.GpuType
@@ -283,30 +283,6 @@ func CloudBrainCreate(ctx *context.Context, form auth.CreateCloudBrainForm) {
 	mkModelPath(modelPath)
 	uploadCodeToMinio(modelPath, jobName, cloudbrain.ModelMountPath+"/")
 
-	benchmarkPath := setting.JobPath + jobName + cloudbrain.BenchMarkMountPath
-	if setting.IsBenchmarkEnabled && jobType == string(models.JobTypeBenchmark) {
-		var gpuType string
-		for _, gpuInfo := range gpuInfos.GpuInfo {
-			if gpuInfo.Queue == gpuQueue {
-				gpuType = gpuInfo.Value
-			}
-		}
-		downloadRateCode(repo, jobName, setting.BenchmarkOwner, setting.BenchmarkName, benchmarkPath, form.BenchmarkCategory, gpuType)
-		uploadCodeToMinio(benchmarkPath+"/", jobName, cloudbrain.BenchMarkMountPath+"/")
-	}
-
-	snn4imagenetPath := setting.JobPath + jobName + cloudbrain.Snn4imagenetMountPath
-	if setting.IsSnn4imagenetEnabled && jobType == string(models.JobTypeSnn4imagenet) {
-		downloadRateCode(repo, jobName, setting.Snn4imagenetOwner, setting.Snn4imagenetName, snn4imagenetPath, "", "")
-		uploadCodeToMinio(snn4imagenetPath+"/", jobName, cloudbrain.Snn4imagenetMountPath+"/")
-	}
-
-	brainScorePath := setting.JobPath + jobName + cloudbrain.BrainScoreMountPath
-	if setting.IsBrainScoreEnabled && jobType == string(models.JobTypeBrainScore) {
-		downloadRateCode(repo, jobName, setting.BrainScoreOwner, setting.BrainScoreName, brainScorePath, "", "")
-		uploadCodeToMinio(brainScorePath+"/", jobName, cloudbrain.BrainScoreMountPath+"/")
-	}
-
 	err = cloudbrain.GenerateTask(ctx, displayJobName, jobName, image, command, uuid, storage.GetMinioPath(jobName, cloudbrain.CodeMountPath+"/"),
 		storage.GetMinioPath(jobName, cloudbrain.ModelMountPath+"/"),
 		storage.GetMinioPath(jobName, cloudbrain.BenchMarkMountPath+"/"), storage.GetMinioPath(jobName, cloudbrain.Snn4imagenetMountPath+"/"),
@@ -482,6 +458,17 @@ func cloudBrainShow(ctx *context.Context, tpName base.TplName, jobType models.Jo
 					ctx.Data["resource_type"] = resourceType.Value
 				}
 			}
+		} else if cloudbrain.IsBenchmarkJob(task.JobType) {
+			if benchmarkGpuInfos == nil {
+				json.Unmarshal([]byte(setting.BenchmarkGpuTypes), &benchmarkGpuInfos)
+			}
+
+			for _, resourceType := range benchmarkGpuInfos.GpuInfo {
+				if resourceType.Queue == jobRes.Config.GpuType {
+					ctx.Data["resource_type"] = resourceType.Value
+				}
+			}
+
 		} else {
 			if gpuInfos == nil {
 				json.Unmarshal([]byte(setting.GpuTypes), &gpuInfos)
@@ -1163,6 +1150,7 @@ func CloudBrainDownloadModel(ctx *context.Context) {
 		ctx.ServerError("PresignedGetURL", err)
 		return
 	}
+	ctx.Resp.Header().Set("Cache-Control", "max-age=0")
 	http.Redirect(ctx.Resp, ctx.Req.Request, url, http.StatusMovedPermanently)
 }
 
@@ -1241,7 +1229,7 @@ func downloadCode(repo *models.Repository, codePath, branchName string) error {
 	return nil
 }
 
-func downloadRateCode(repo *models.Repository, taskName, rateOwnerName, rateRepoName, codePath, benchmarkCategory, gpuType string) error {
+func downloadRateCode(repo *models.Repository, taskName, rateOwnerName, rateRepoName, codePath, benchmarkCategory, gpuType, userName string) error {
 	err := os.MkdirAll(codePath, os.ModePerm)
 	if err != nil {
 		log.Error("mkdir codePath failed", err.Error())
@@ -1269,7 +1257,7 @@ func downloadRateCode(repo *models.Repository, taskName, rateOwnerName, rateRepo
 	defer f.Close()
 
 	data, err := json.Marshal(models.TaskInfo{
-		Username:          repo.Owner.Name,
+		Username:          userName,
 		TaskName:          taskName,
 		CodeName:          repo.Name,
 		BenchmarkCategory: strings.Split(benchmarkCategory, ","),
@@ -1853,7 +1841,7 @@ func BenchMarkAlgorithmCreate(ctx *context.Context, form auth.CreateCloudBrainFo
 	ctx.Data["PageIsCloudBrain"] = true
 	displayJobName := form.DisplayJobName
 	jobName := util.ConvertDisplayJobNameToJobName(displayJobName)
-	image := form.Image
+	image := strings.TrimSpace(form.Image)
 	gpuQueue := form.GpuType
 	command := cloudbrain.CommandBenchmark
 	codePath := setting.JobPath + jobName + cloudbrain.CodeMountPath
@@ -1978,7 +1966,7 @@ func BenchMarkAlgorithmCreate(ctx *context.Context, form auth.CreateCloudBrainFo
 		}
 	}
 
-	if err := downloadRateCode(repo, jobName, childInfo.Owner, childInfo.RepoName, benchmarkPath, form.BenchmarkCategory, gpuType); err != nil {
+	if err := downloadRateCode(repo, jobName, childInfo.Owner, childInfo.RepoName, benchmarkPath, form.BenchmarkCategory, gpuType, ctx.User.Name); err != nil {
 		log.Error("downloadRateCode failed, %v", err, ctx.Data["MsgID"])
 		//cloudBrainNewDataPrepare(ctx)
 		//ctx.RenderWithErr("system error", tplCloudBrainBenchmarkNew, &form)
@@ -2076,7 +2064,7 @@ func ModelBenchmarkCreate(ctx *context.Context, form auth.CreateCloudBrainForm)
 
 	snn4imagenetPath := setting.JobPath + jobName + cloudbrain.Snn4imagenetMountPath
 	if setting.IsSnn4imagenetEnabled && jobType == string(models.JobTypeSnn4imagenet) {
-		downloadRateCode(repo, jobName, setting.Snn4imagenetOwner, setting.Snn4imagenetName, snn4imagenetPath, "", "")
+		downloadRateCode(repo, jobName, setting.Snn4imagenetOwner, setting.Snn4imagenetName, snn4imagenetPath, "", "", ctx.User.Name)
 		uploadCodeToMinio(snn4imagenetPath+"/", jobName, cloudbrain.Snn4imagenetMountPath+"/")
 		command = fmt.Sprintf(cloudbrain.Snn4imagenetCommand, displayJobName, trimSpaceNewlineInString(form.Description))
 
@@ -2084,7 +2072,7 @@ func ModelBenchmarkCreate(ctx *context.Context, form auth.CreateCloudBrainForm)
 	benchmarkChildTypeID := 0
 	brainScorePath := setting.JobPath + jobName + cloudbrain.BrainScoreMountPath
 	if setting.IsBrainScoreEnabled && jobType == string(models.JobTypeBrainScore) {
-		downloadRateCode(repo, jobName, setting.BrainScoreOwner, setting.BrainScoreName, brainScorePath, "", "")
+		downloadRateCode(repo, jobName, setting.BrainScoreOwner, setting.BrainScoreName, brainScorePath, "", "", ctx.User.Name)
 		uploadCodeToMinio(brainScorePath+"/", jobName, cloudbrain.BrainScoreMountPath+"/")
 		benchmarkChildTypeID = form.BenchmarkChildTypeID
 		command = fmt.Sprintf(cloudbrain.BrainScoreCommand, getBrainRegion(benchmarkChildTypeID), displayJobName, trimSpaceNewlineInString(form.Description))
@@ -2144,7 +2132,7 @@ func CloudBrainTrainJobNew(ctx *context.Context) {
 
 func getTrainJobCommand(form auth.CreateCloudBrainForm) (string, error) {
 	var command string
-	bootFile := form.BootFile
+	bootFile := strings.TrimSpace(form.BootFile)
 	params := form.Params
 
 	if !strings.HasSuffix(bootFile, ".py") {

routers/repo/dataset.go

@@ -106,6 +106,8 @@ func DatasetIndex(ctx *context.Context) {
 	MustEnableDataset(ctx)
 	ctx.Data["PageIsDataset"] = true
 
+	ctx.Data["SortType"] = ctx.Query("sort")
+
 	repo := ctx.Repo.Repository
 
 	dataset, err := models.GetDatasetByRepo(repo)
@@ -128,9 +130,31 @@ func DatasetIndex(ctx *context.Context) {
 
 	attachments := newFilterPrivateAttachments(ctx, dataset.Attachments, repo)
 
-	sort.Slice(attachments, func(i, j int) bool {
-		return attachments[i].CreatedUnix > attachments[j].CreatedUnix
-	})
+	if ctx.Data["SortType"] == "nameAsc" {
+		sort.Slice(attachments, func(i, j int) bool {
+			return strings.ToLower(attachments[i].Name) < strings.ToLower(attachments[j].Name)
+		})
+	} else if ctx.Data["SortType"] == "nameDesc" {
+		sort.Slice(attachments, func(i, j int) bool {
+			return strings.ToLower(attachments[i].Name) > strings.ToLower(attachments[j].Name)
+		})
+	} else if ctx.Data["SortType"] == "sizeAsc" {
+		sort.Slice(attachments, func(i, j int) bool {
+			return attachments[i].Size < attachments[j].Size
+		})
+	} else if ctx.Data["SortType"] == "sizeDesc" {
+		sort.Slice(attachments, func(i, j int) bool {
+			return attachments[i].Size > attachments[j].Size
+		})
+	} else if ctx.Data["SortType"] == "timeAsc" {
+		sort.Slice(attachments, func(i, j int) bool {
+			return attachments[i].CreatedUnix < attachments[j].CreatedUnix
+		})
+	} else {
+		sort.Slice(attachments, func(i, j int) bool {
+			return attachments[i].CreatedUnix > attachments[j].CreatedUnix
+		})
+	}
 
 	page := ctx.QueryInt("page")
 	if page <= 0 {
@@ -148,6 +172,10 @@ func DatasetIndex(ctx *context.Context) {
 	for _, attachment := range pageAttachments {
 		uploader, _ := models.GetUserByID(attachment.UploaderID)
 		attachment.Uploader = uploader
+		if !strings.HasSuffix(attachment.Name, ".zip") {
+			attachment.DecompressState = -1 //非zip文件
+		}
+
 	}
 
 	ctx.Data["Page"] = pager

routers/repo/modelarts.go

@@ -764,6 +764,7 @@ func trainJobErrorNewDataPrepare(ctx *context.Context, form auth.CreateModelArts
 	ctx.Data["bootFile"] = form.BootFile
 	ctx.Data["uuid"] = form.Attachment
 	ctx.Data["branch_name"] = form.BranchName
+	ctx.Data["cloudbraintype"] = models.TypeCloudBrainTwo
 
 	return nil
 }
@@ -954,6 +955,7 @@ func versionErrorDataPrepare(ctx *context.Context, form auth.CreateModelArtsTrai
 		return err
 	}
 	ctx.Data["config_list"] = configList.ParaConfigs
+	ctx.Data["cloudbraintype"] = models.TypeCloudBrainTwo
 
 	return nil
 }
@@ -967,7 +969,7 @@ func TrainJobCreate(ctx *context.Context, form auth.CreateModelArtsTrainJobForm)
 	description := form.Description
 	workServerNumber := form.WorkServerNumber
 	engineID := form.EngineID
-	bootFile := form.BootFile
+	bootFile := strings.TrimSpace(form.BootFile)
 	flavorCode := form.Flavor
 	params := form.Params
 	poolID := form.PoolID
@@ -1210,7 +1212,7 @@ func TrainJobCreateVersion(ctx *context.Context, form auth.CreateModelArtsTrainJ
 	description := form.Description
 	workServerNumber := form.WorkServerNumber
 	engineID := form.EngineID
-	bootFile := form.BootFile
+	bootFile := strings.TrimSpace(form.BootFile)
 	flavorCode := form.Flavor
 	params := form.Params
 	poolID := form.PoolID
@@ -1284,7 +1286,7 @@ func TrainJobCreateVersion(ctx *context.Context, form auth.CreateModelArtsTrainJ
 
 	var parameters models.Parameters
 	param := make([]models.Parameter, 0)
-	existDeviceTarget := true
+	existDeviceTarget := false
 	if len(params) != 0 {
 		err := json.Unmarshal([]byte(params), &parameters)
 		if err != nil {
@@ -1471,8 +1473,8 @@ func obsMkdir(dir string) error {
 }
 
 func paramCheckCreateTrainJob(form auth.CreateModelArtsTrainJobForm) error {
-	if !strings.HasSuffix(form.BootFile, ".py") {
-		log.Error("the boot file(%s) must be a python file", form.BootFile)
+	if !strings.HasSuffix(strings.TrimSpace(form.BootFile), ".py") {
+		log.Error("the boot file(%s) must be a python file", strings.TrimSpace(form.BootFile))
 		return errors.New("启动文件必须是python文件")
 	}
 
@@ -1489,8 +1491,8 @@ func paramCheckCreateTrainJob(form auth.CreateModelArtsTrainJobForm) error {
 }
 
 func paramCheckCreateInferenceJob(form auth.CreateModelArtsInferenceJobForm) error {
-	if !strings.HasSuffix(form.BootFile, ".py") {
-		log.Error("the boot file(%s) must be a python file", form.BootFile)
+	if !strings.HasSuffix(strings.TrimSpace(form.BootFile), ".py") {
+		log.Error("the boot file(%s) must be a python file", strings.TrimSpace(form.BootFile))
 		return errors.New("启动文件必须是python文件")
 	}
 
@@ -1803,7 +1805,7 @@ func InferenceJobCreate(ctx *context.Context, form auth.CreateModelArtsInference
 	description := form.Description
 	workServerNumber := form.WorkServerNumber
 	engineID := form.EngineID
-	bootFile := form.BootFile
+	bootFile := strings.TrimSpace(form.BootFile)
 	flavorCode := form.Flavor
 	params := form.Params
 	poolID := form.PoolID
@@ -2175,6 +2177,7 @@ func inferenceJobErrorNewDataPrepare(ctx *context.Context, form auth.CreateModel
 	ctx.Data["model_version"] = form.ModelVersion
 	ctx.Data["ckpt_name"] = form.CkptName
 	ctx.Data["train_url"] = form.TrainUrl
+	ctx.Data["cloudbraintype"] = models.TypeCloudBrainTwo
 
 	return nil
 }
@@ -2248,7 +2251,6 @@ func ModelDownload(ctx *context.Context) {
 	versionName := ctx.Query("version_name")
 	parentDir := ctx.Query("parent_dir")
 	fileName := ctx.Query("file_name")
-	log.Info("DownloadSingleModelFile start.")
 	task, err := models.GetCloudbrainByJobIDAndVersionName(jobID, versionName)
 	if err != nil {
 		log.Error("GetCloudbrainByJobID(%s) failed:%v", task.JobName, err.Error())
@@ -2256,7 +2258,6 @@ func ModelDownload(ctx *context.Context) {
 	}
 
 	path := strings.TrimPrefix(path.Join(setting.TrainJobModelPath, task.JobName, setting.OutPutPath, versionName, parentDir, fileName), "/")
-	log.Info("Download path is:%s", path)
 
 	url, err := storage.GetObsCreateSignedUrlByBucketAndKey(setting.Bucket, path)
 	if err != nil {
@@ -2264,6 +2265,7 @@ func ModelDownload(ctx *context.Context) {
 		ctx.ServerError("GetObsCreateSignedUrl", err)
 		return
 	}
+	ctx.Resp.Header().Set("Cache-Control", "max-age=0")
 	http.Redirect(ctx.Resp, ctx.Req.Request, url, http.StatusMovedPermanently)
 }
 
@@ -2275,13 +2277,11 @@ func ResultDownload(ctx *context.Context) {
 	versionName := ctx.Query("version_name")
 	parentDir := ctx.Query("parent_dir")
 	fileName := ctx.Query("file_name")
-	log.Info("DownloadResult start.")
 	task := ctx.Cloudbrain
 	if err != nil {
 		ctx.Data["error"] = err.Error()
 	}
 	path := strings.TrimPrefix(path.Join(setting.TrainJobModelPath, task.JobName, "result/", versionName, parentDir, fileName), "/")
-	log.Info("Download path is:%s", path)
 
 	url, err := storage.GetObsCreateSignedUrlByBucketAndKey(setting.Bucket, path)
 	if err != nil {
@@ -2289,6 +2289,7 @@ func ResultDownload(ctx *context.Context) {
 		ctx.ServerError("GetObsCreateSignedUrl", err)
 		return
 	}
+	ctx.Resp.Header().Set("Cache-Control", "max-age=0")
 	http.Redirect(ctx.Resp, ctx.Req.Request, url, http.StatusMovedPermanently)
 }
 func DeleteJobStorage(jobName string) error {
@@ -2387,3 +2388,35 @@ func SetJobCount(ctx *context.Context) {
 	}
 	ctx.Data["jobCount"] = jobCount
 }
+
+func TrainJobDownloadLogFile(ctx *context.Context) {
+	var (
+		err error
+	)
+
+	var jobID = ctx.Params(":jobid")
+	versionName := ctx.Query("version_name")
+	task, err := models.GetCloudbrainByJobIDAndVersionName(jobID, versionName)
+	if err != nil {
+		log.Error("GetCloudbrainByJobIDAndVersionName(%s) failed:%v", task.JobName, err.Error(), ctx.Data["msgID"])
+		ctx.ServerError("GetCloudbrainByJobIDAndVersionName", err)
+		return
+	}
+
+	prefix := strings.TrimPrefix(path.Join(setting.TrainJobModelPath, task.JobName, modelarts.LogPath, versionName), "/") + "/job"
+	key, err := storage.GetObsLogFileName(prefix)
+	if err != nil {
+		log.Error("GetObsLogFileName(%s) failed:%v", jobID, err.Error(), ctx.Data["msgID"])
+		ctx.ServerError("GetObsLogFileName", err)
+		return
+	}
+
+	url, err := storage.GetObsCreateSignedUrlByBucketAndKey(setting.Bucket, key)
+	if err != nil {
+		log.Error("GetObsCreateSignedUrlByBucketAndKey failed: %v", err.Error(), ctx.Data["msgID"])
+		ctx.ServerError("GetObsCreateSignedUrlByBucketAndKey", err)
+		return
+	}
+	ctx.Resp.Header().Set("Cache-Control", "max-age=0")
+	http.Redirect(ctx.Resp, ctx.Req.Request, url, http.StatusMovedPermanently)
+}

routers/repo/repo.go

@@ -6,7 +6,6 @@
 package repo
 
 import (
-	"code.gitea.io/gitea/modules/validation"
 	"fmt"
 	"net/url"
 	"os"
@@ -15,6 +14,8 @@ import (
 	"strings"
 	"unicode/utf8"
 
+	"code.gitea.io/gitea/modules/validation"
+
 	"code.gitea.io/gitea/models"
 	"code.gitea.io/gitea/modules/auth"
 	"code.gitea.io/gitea/modules/base"
@@ -193,7 +194,10 @@ func CreatePost(ctx *context.Context, form auth.CreateRepoForm) {
 		return
 	}
 	ctx.Data["ContextUser"] = ctxUser
-
+	if !form.AutoAgree {
+		ctx.RenderWithErr(ctx.Tr("repo.template.one_promise"), tplCreate, form)
+		return
+	}
 	if ctx.HasError() {
 		ctx.HTML(200, tplCreate)
 		return

routers/repo/setting.go

@@ -6,7 +6,6 @@
 package repo
 
 import (
-	"code.gitea.io/gitea/modules/notification"
 	"errors"
 	"fmt"
 	"io/ioutil"
@@ -15,6 +14,8 @@ import (
 	"strings"
 	"time"
 
+	"code.gitea.io/gitea/modules/notification"
+
 	"code.gitea.io/gitea/models"
 	"code.gitea.io/gitea/modules/auth"
 	"code.gitea.io/gitea/modules/base"
@@ -477,16 +478,27 @@ func SettingsPost(ctx *context.Context, form auth.RepoSettingForm) {
 			ctx.RenderWithErr(ctx.Tr("form.enterred_invalid_repo_name"), tplSettingsOptions, nil)
 			return
 		}
-
-		if err := repo_service.DeleteRepository(ctx.User, ctx.Repo.Repository); err != nil {
-			ctx.ServerError("DeleteRepository", err)
+		count, err := models.GetCloudbrainRunCountByRepoID(repo.ID)
+		if err != nil {
+			ctx.ServerError("GetCloudbrainCountByRepoID failed", err)
 			return
-		}
-		log.Trace("Repository deleted: %s/%s", ctx.Repo.Owner.Name, repo.Name)
-		go StopJobsByRepoID(repo.ID)
+		} else {
+			if count >= 1 {
+				ctx.Data["Err_RepoName"] = nil
+				ctx.Flash.Error(ctx.Tr("repo.settings.deletion_notice_cloudbrain"))
+				ctx.Redirect(ctx.Repo.RepoLink + "/settings")
+				return
+			}
+			if err := repo_service.DeleteRepository(ctx.User, ctx.Repo.Repository); err != nil {
+				ctx.ServerError("DeleteRepository", err)
+				return
+			}
+			log.Trace("Repository deleted: %s/%s", ctx.Repo.Owner.Name, repo.Name)
+			go StopJobsByRepoID(repo.ID)
 
-		ctx.Flash.Success(ctx.Tr("repo.settings.deletion_success"))
-		ctx.Redirect(ctx.Repo.Owner.DashboardLink())
+			ctx.Flash.Success(ctx.Tr("repo.settings.deletion_success"))
+			ctx.Redirect(ctx.Repo.Owner.DashboardLink())
+		}
 
 	case "delete-wiki":
 		if !ctx.Repo.IsOwner() {

routers/repo/user_data_analysis.go

@@ -29,6 +29,7 @@ func getUserMetricsExcelHeader(ctx *context.Context) map[string]string {
 	excelHeader = append(excelHeader, ctx.Tr("user.metrics.hasactivateuser"))
 	excelHeader = append(excelHeader, ctx.Tr("user.metrics.newregistnotactiveuser"))
 	excelHeader = append(excelHeader, ctx.Tr("user.metrics.newuseractiveindex"))
+	excelHeader = append(excelHeader, ctx.Tr("user.metrics.currentdayactivity"))
 	excelHeader = append(excelHeader, ctx.Tr("user.metrics.totalregistuser"))
 	excelHeader = append(excelHeader, ctx.Tr("user.metrics.totalactiveduser"))
 	excelHeader = append(excelHeader, ctx.Tr("user.metrics.totalhasactivityuser"))
@@ -67,6 +68,10 @@ func writeUserMetricsExcel(row int, xlsx *excelize.File, sheetName string, userM
 	}
 	xlsx.SetCellValue(sheetName, getColumn(tmp)+rows, value)
 	tmp = tmp + 1
+
+	xlsx.SetCellValue(sheetName, getColumn(tmp)+rows, userMetrics.HasActivityUser)
+	tmp = tmp + 1
+
 	xlsx.SetCellValue(sheetName, getColumn(tmp)+rows, userMetrics.TotalUser)
 	tmp = tmp + 1
 	xlsx.SetCellValue(sheetName, getColumn(tmp)+rows, userMetrics.TotalActivateRegistUser)
@@ -106,6 +111,9 @@ func getExcelHeader(ctx *context.Context) map[string]string {
 	excelHeader = append(excelHeader, ctx.Tr("user.static.CollectedImage"))
 	excelHeader = append(excelHeader, ctx.Tr("user.static.RecommendImage"))
 
+	excelHeader = append(excelHeader, ctx.Tr("user.static.email"))
+	excelHeader = append(excelHeader, ctx.Tr("user.static.location"))
+
 	excelHeader = append(excelHeader, ctx.Tr("user.static.registdate"))
 	excelHeader = append(excelHeader, ctx.Tr("user.static.countdate"))
 
@@ -181,6 +189,13 @@ func writeExcel(row int, xlsx *excelize.File, sheetName string, userRecord *mode
 	tmp = tmp + 1
 	xlsx.SetCellValue(sheetName, getColumn(tmp)+rows, userRecord.RecommendImage)
 	tmp = tmp + 1
+
+	xlsx.SetCellValue(sheetName, getColumn(tmp)+rows, userRecord.Email)
+	tmp = tmp + 1
+
+	xlsx.SetCellValue(sheetName, getColumn(tmp)+rows, userRecord.UserLocation)
+	tmp = tmp + 1
+
 	formatTime := userRecord.RegistDate.Format("2006-01-02 15:04:05")
 	xlsx.SetCellValue(sheetName, getColumn(tmp)+rows, formatTime[0:len(formatTime)-3])
 	tmp = tmp + 1
@@ -249,6 +264,13 @@ func writeExcelPage(row int, xlsx *excelize.File, sheetName string, userRecord *
 	tmp = tmp + 1
 	xlsx.SetCellValue(sheetName, getColumn(tmp)+rows, userRecord.RecommendImage)
 	tmp = tmp + 1
+
+	xlsx.SetCellValue(sheetName, getColumn(tmp)+rows, userRecord.Email)
+	tmp = tmp + 1
+
+	xlsx.SetCellValue(sheetName, getColumn(tmp)+rows, userRecord.UserLocation)
+	tmp = tmp + 1
+
 	formatTime := userRecord.RegistDate.Format("2006-01-02 15:04:05")
 	xlsx.SetCellValue(sheetName, getColumn(tmp)+rows, formatTime[0:len(formatTime)-3])
 	tmp = tmp + 1
@@ -414,9 +436,7 @@ func DownloadUserDefineFile(ctx *context.Context) {
 		log.Info("file not exist.")
 		ctx.JSON(http.StatusOK, "File Not Exist.")
 	} else {
-		ctx.Resp.Header().Set("Content-Disposition", "attachment; filename="+filename)
-		ctx.Resp.Header().Set("Content-Type", "application/octet-stream")
-		ctx.ServeFile(allFilename, filename)
+		ctx.ServeFile(allFilename, url.QueryEscape(filename))
 	}
 }
 
@@ -544,14 +564,13 @@ func QueryUserStaticDataPage(ctx *context.Context) {
 		endTime = time.Now()
 	} else {
 		startTime, _ = time.ParseInLocation("2006-01-02", startDate, time.Local)
-		startTime = time.Date(startTime.Year(), startTime.Month(), startTime.Day(), 12, 0, 0, 0, startTime.Location())
+		startTime = time.Date(startTime.Year(), startTime.Month(), startTime.Day(), 0, 0, 0, 0, startTime.Location())
 		settingStartTime, _ := time.Parse("2006-01-02", setting.RadarMap.RecordBeginTime)
 		if startTime.Unix() < settingStartTime.Unix() {
 			startTime = settingStartTime
 			startDate = settingStartTime.Format("2006-01-02")
 		}
 		endTime, _ = time.ParseInLocation("2006-01-02", endDate, time.Local)
-		//endTime = endTime.AddDate(0, 0, 1)
 		endTime = time.Date(endTime.Year(), endTime.Month(), endTime.Day(), 23, 59, 59, 0, startTime.Location())
 
 		isAll = false
@@ -582,7 +601,7 @@ func QueryUserStaticDataPage(ctx *context.Context) {
 		filename := sheetName + "_" + startDate + "_" + endDate + ".xlsx"
 		os.Remove(setting.AppDataPath + Excel_File_Path + filename)
 		go writeFileToDisk(ctx, count, re, filename)
-		ctx.JSON(http.StatusOK, setting.AppURL+"api/v1/download_user_define_file?filename="+filename)
+		ctx.JSON(http.StatusOK, ctx.Tr("user.static.downloadinfo")+setting.AppURL+"api/v1/download_user_define_file?filename="+filename)
 	} else {
 		mapInterface := make(map[string]interface{})
 		re, count := models.QueryUserStaticDataPage(pageOpts)
@@ -672,8 +691,11 @@ func TimingCountDataByDateAndReCount(date string, isReCount bool) {
 
 	t, _ := time.Parse("2006-01-02", date)
 	startTime := time.Date(t.Year(), t.Month(), t.Day(), 0, 0, 0, 0, t.Location())
-
+	startTime = startTime.UTC()
 	endTime := time.Date(t.Year(), t.Month(), t.Day(), 23, 59, 59, 0, t.Location())
+	endTime = endTime.UTC()
+	log.Info("startTime time:" + startTime.Format("2006-01-02 15:04:05"))
+	log.Info("endTime time:" + endTime.Format("2006-01-02 15:04:05"))
 	warnEmailMessage := "用户统计信息入库失败，请尽快定位。"
 	//query wiki data
 	log.Info("start to time count data")

routers/repo/view.go

@@ -471,6 +471,8 @@ func renderFile(ctx *context.Context, entry *git.TreeEntry, treeLink, rawLink st
 
 		readmeExist := markup.IsReadmeFile(blob.Name())
 		ctx.Data["ReadmeExist"] = readmeExist
+		isNoteBook := strings.HasSuffix(blob.Name(), ".ipynb")
+		ctx.Data["IsNoteBook"] = isNoteBook
 		if markupType := markup.Type(blob.Name()); markupType != "" {
 			ctx.Data["IsMarkup"] = true
 			ctx.Data["MarkupType"] = markupType
@@ -480,6 +482,8 @@ func renderFile(ctx *context.Context, entry *git.TreeEntry, treeLink, rawLink st
 			ctx.Data["FileContent"] = strings.Replace(
 				gotemplate.HTMLEscapeString(string(buf)), "\n", `<br>`, -1,
 			)
+		} else if isNoteBook {
+			ctx.Data["FileContent"] = string(buf)
 		} else {
 			// Building code view blocks with line number on server side.
 			var fileContent string

routers/routes/routes.go

@@ -323,10 +323,11 @@ func RegisterRoutes(m *macaron.Macaron) {
 	m.Get("/dashboard", routers.Dashboard)
 	go routers.SocketManager.Run()
 	m.Get("/action/notification", routers.ActionNotification)
-	m.Get("/recommend/org", routers.RecommendOrgFromPromote)
-	m.Get("/recommend/repo", routers.RecommendRepoFromPromote)
+	m.Get("/recommend/home", routers.RecommendHomeInfo)
+	//m.Get("/recommend/org", routers.RecommendOrgFromPromote)
+	//m.Get("/recommend/repo", routers.RecommendRepoFromPromote)
 	m.Get("/recommend/userrank/:index", routers.GetUserRankFromPromote)
-	m.Get("/recommend/imageinfo", routers.GetImageInfoFromPromote)
+	//m.Get("/recommend/imageinfo", routers.GetImageInfoFromPromote)
 	m.Post("/all/search/", routers.Search)
 	m.Get("/all/search/", routers.EmptySearch)
 	m.Get("/all/dosearch/", routers.SearchApi)
@@ -1097,9 +1098,9 @@ func RegisterRoutes(m *macaron.Macaron) {
 			m.Get("/show_model_child_api", repo.ShowOneVersionOtherModel)
 			m.Get("/query_train_job", reqRepoCloudBrainReader, repo.QueryTrainJobList)
 			m.Get("/query_train_job_version", reqRepoCloudBrainReader, repo.QueryTrainJobVersionList)
-			m.Get("/query_model_for_predict", reqRepoCloudBrainReader, repo.QueryModelListForPredict)
-			m.Get("/query_modelfile_for_predict", reqRepoCloudBrainReader, repo.QueryModelFileForPredict)
-			m.Get("/query_onelevel_modelfile", reqRepoCloudBrainReader, repo.QueryOneLevelModelFile)
+			m.Get("/query_model_for_predict", reqRepoModelManageReader, repo.QueryModelListForPredict)
+			m.Get("/query_modelfile_for_predict", reqRepoModelManageReader, repo.QueryModelFileForPredict)
+			m.Get("/query_onelevel_modelfile", reqRepoModelManageReader, repo.QueryOneLevelModelFile)
 			m.Group("/:ID", func() {
 				m.Get("", repo.ShowSingleModel)
 				m.Get("/downloadsingle", repo.DownloadSingleModelFile)
@@ -1140,6 +1141,7 @@ func RegisterRoutes(m *macaron.Macaron) {
 					m.Post("/stop", cloudbrain.AdminOrOwnerOrJobCreaterRightForTrain, repo.TrainJobStop)
 					m.Post("/del", cloudbrain.AdminOrOwnerOrJobCreaterRightForTrain, repo.TrainJobDel)
 					m.Get("/model_download", cloudbrain.AdminOrJobCreaterRightForTrain, repo.ModelDownload)
+					m.Get("/download_log_file", cloudbrain.AdminOrJobCreaterRightForTrain, repo.TrainJobDownloadLogFile)
 					m.Get("/create_version", reqWechatBind, cloudbrain.AdminOrJobCreaterRightForTrain, repo.TrainJobNewVersion)
 					m.Post("/create_version", reqWechatBind, cloudbrain.AdminOrJobCreaterRightForTrain, bindIgnErr(auth.CreateModelArtsTrainJobForm{}), repo.TrainJobCreateVersion)
 				})

services/repository/repository.go

@@ -154,6 +154,12 @@ func GetRecommendRepoFromPromote(filename string) ([]map[string]interface{}, err
 }
 
 func RecommendFromPromote(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())

templates/base/footer.tmpl

@@ -13,6 +13,9 @@
 	{{template "base/footer_content" .}}
 
 	<script src="{{StaticUrlPrefix}}/js/jquery.js?v={{MD5 AppVer}}"></script>
+
+
+	
 {{if .RequireSimpleMDE}}
 	<script src="{{StaticUrlPrefix}}/vendor/plugins/simplemde/simplemde.min.js"></script>
 	<script src="{{StaticUrlPrefix}}/vendor/plugins/codemirror/addon/mode/loadmode.js"></script>
@@ -43,5 +46,46 @@
 	<script src="{{StaticUrlPrefix}}/fomantic/semantic.min.js?v={{MD5 AppVer}}"></script>
 	<script src="{{StaticUrlPrefix}}/js/index.js?v={{MD5 AppVer}}"></script>
 {{template "custom/footer" .}}
+{{if .PageIsHome}}
+	<!--script src="https://www.jq22.com/jquery/jquery-1.10.2.js"></script-->
+	<script src="/rotation3D/vue-2.6.10.min.js"></script>
+	<script src="/rotation3D/rotation3D.js?v={{MD5 AppVer}}"></script>
+	<script>
+		var app = new Vue({
+			el: "#app",
+			//数据 blue, green, yellow
+			data: {
+				itemList: [
+					{ name:'鹏城云脑一号', type:'blue', icon:'', },
+					{ name:'鹏城云脑二号', type:'blue', icon:'', },
+					{ name:'北大人工智能集群系统', type:'green', icon:'', },
+					{ name:'合肥类脑智能开放平台', type:'green', icon:'', },
+					{ name:'武汉人工智能计算中心', type:'green', icon:'', },
+					{ name:'西安未来人工智能计算中心', type:'green', icon:'', },					
+					{ name:'……', type:'yellow', icon:'', },
+					{ name:'中原人工智能计算中心', type:'green', icon:'', },
+					{ name:'成都人工智能计算中心', type:'green', icon:'', },
+					{ name:'横琴先进智能计算中心', type:'green', icon:'', },
+					{ name:'国家超级计算济南中心', type:'green', icon:'', },
+				],
+			},
+			mounted: function () {
+				new Rotation3D({
+					id: '#rotation3D',
+					farScale: 0.6,
+					// farScale: 1,
+					xRadius: 0,  //x半径压缩
+					yRadius: 130,  //y半径压缩
+					// yRadius: 0,  //y半径压缩
+					// autoPlay:true,
+					// autoPlayDelay:6000,
+				})
+	
+			},
+			methods: {},
+		});
+	</script>
+{{end}}
+
 </body>
 </html>

templates/base/head_home.tmpl

@@ -192,6 +192,8 @@ var _hmt = _hmt || [];
 <!-- Swiper -->
 <link rel="stylesheet" href="/swiper/swiper-bundle.min.css">
 <script src="/swiper/swiper-bundle.min.js"></script>
+<!-- rotation3D -->
+<link rel="stylesheet" href="/rotation3D/rotation3D.css">
 </head>
 <body>
 	{{template "custom/body_outer_pre" .}}

templates/base/head_navbar.tmpl

@@ -34,7 +34,7 @@
 
 		<a class="item" href="{{AppSubUrl}}/explore/repos">{{.i18n.Tr "custom.head.project"}}</a>
 		<a class="item" href="{{AppSubUrl}}/explore/datasets">{{.i18n.Tr "custom.head.dataset"}}</a>
-		<div class="ui dropdown item" id='dropdown_explore'>
+		<div class="ui simple dropdown item" id='dropdown_explore'>
 			{{.i18n.Tr "explore"}}
 			<i class="dropdown icon"></i>
 			<div class="menu">
@@ -65,7 +65,7 @@
 
 		<a class="item" href="{{AppSubUrl}}/explore/repos">{{.i18n.Tr "custom.head.project"}}</a>
 		<a class="item" href="{{AppSubUrl}}/explore/datasets">{{.i18n.Tr "custom.head.dataset"}}</a>
-		<div class="ui dropdown item" id='dropdown_PageHome'>
+		<div class="ui simple dropdown item" id='dropdown_PageHome'>
 			{{.i18n.Tr "explore"}}
 			<i class="dropdown icon"></i>
 			<div class="menu" >
@@ -120,7 +120,7 @@
 				</span>
 			</a>
 
-			<div class="ui dropdown jump item poping up" data-content="{{.i18n.Tr "create_new"}}" data-variation="tiny inverted">
+			<div class="ui simple dropdown jump item poping up" data-content="{{.i18n.Tr "create_new"}}" data-variation="tiny inverted">
 				<span class="text">
 					<span class="fitted">{{svg "octicon-plus" 16}}</span>
 					<span class="sr-mobile-only">{{.i18n.Tr "create_new"}}</span>
@@ -141,7 +141,7 @@
 				</div><!-- end content create new menu -->
 			</div><!-- end dropdown menu create new -->
 
-			<div class="ui dropdown jump item poping up" tabindex="-1" data-content="{{.i18n.Tr "user_profile_and_more"}}" data-variation="tiny inverted">
+			<div class="ui simple dropdown jump item poping up" tabindex="-1" data-content="{{.i18n.Tr "user_profile_and_more"}}" data-variation="tiny inverted">
 				<span class="text">
 					<img class="ui tiny avatar image" width="24" height="24" src="{{.SignedUser.RelAvatarLink}}">
 					<span class="sr-only">{{.i18n.Tr "user_profile_and_more"}}</span>

templates/custom/select_dataset.tmpl

@@ -1,138 +1,171 @@
-
-<div class="dataset-repolink" id="dataset-repolink-init" style="display: none;" data-repolink="{{.RepoLink}}" data-cloudranin-type="{{.cloudbraintype}}"></div>
+<div class="dataset-repolink" id="dataset-repolink-init" style="display: none;" data-repolink="{{.RepoLink}}"
+    data-cloudranin-type="{{.cloudbraintype}}"></div>
 <div class="inline {{if eq .cloudbraintype 0}} required {{end}} field" id="dataset-base">
     <label>{{.i18n.Tr "dataset.dataset"}}</label>
     <input type="hidden" name="attachment" :value="dataset_uuid">
     {{if eq .cloudbraintype 0}}
-    <input class="disabled" type="text" :value="dataset_name" placeholder="{{.i18n.Tr "cloudbrain.select_dataset"}}" required onfocus="this.blur();">
+    <input class="disabled" type="text" :value="dataset_name" placeholder="{{.i18n.Tr "cloudbrain.select_dataset"}}"
+        required onfocus="this.blur();">
     {{else}}
     <input class="disabled" type="text" :value="dataset_name" placeholder="{{.i18n.Tr "cloudbrain.select_dataset"}}">
     {{end}}
-    <el-button type="text" @click="dialogVisible = true" icon="el-icon-plus" style="color: #0366d6;"> {{.i18n.Tr "dataset.select_dataset"}}</el-button>
-    <el-dialog
-    title="{{.i18n.Tr "dataset.select_dataset"}}"
-    :visible.sync="dialogVisible"
-    width="50%"
-    >
-    <div class="ui icon input" style="z-index: 9999;position: absolute;right: 50px;height:30px;">
-        <i class="search icon"></i>
-        <input type="text" placeholder="{{.i18n.Tr "dataset.search_dataset"}}" v-model="searchDataItem">
-    </div>
-    
-    <el-tabs v-model="activeName" @tab-click="handleClick('{{.RepoLink}}',activeName,{{.cloudbraintype}})">
-        <el-tab-pane label="{{.i18n.Tr "dataset.current_project"}}" name="first">
-            <div style="display: flex;align-items: center;justify-content: space-between;padding: 1rem 0;border-bottom:1px solid #F5F5F5" v-for="(dataset,index) in currentRepoDataset" :key="index">
-                <div style="width: 90%;">
-                    <div style="display: flex;align-items: center;"><span class="panel_creator_reponam">${dataset.Repo.OwnerName}/${dataset.Repo.Alias}</span><img v-if="dataset.Recommend" src="/img/jian.svg" style="margin-left: 0.5rem;"><span class="panel_dataset_name">${dataset.Name} </span></div>
-                    <div style="margin-top: 8px;display: flex;">
-                        <a :title="dataset.UserName" style="cursor: default;"> 
-                            <img class="ui avatar mini image" style="width: 20px;height: 20px;" :src="dataset.RelAvatarLink">
-                        </a>
-                        <span class="panel_datset_desc">${dataset.Description}</span>
-                    </div>
-                </div>
-                <div>
-                    <button v-if="dataset.DecompressState===1" class="ui primary basic button mini" @click.stop.prevent="selectDataset(dataset.UUID,dataset.Name)">{{.i18n.Tr "dataset.use"}}</button>
-                    <span v-if="dataset.DecompressState===2" style="display: flex;align-items: center;">
-                        <i class="CREATING"></i>
-                        <span style="margin-left: 0.4em;font-size: 12px;color: #5A5A5A;" data-tooltip="{{$.i18n.Tr "dataset.unzip_tooltips"}}" data-inverted="" data-variation="mini" data-position="left center">解压中</span>
-                    </span>
-                    <span v-if="dataset.DecompressState===3" style="display: flex;align-items: center;">
-                        <i class="FAILED"></i>
-                        <span style="margin-left: 0.4em;font-size: 12px;color:red;" data-tooltip="{{$.i18n.Tr "dataset.zip_failed"}}" data-inverted="" data-variation="mini" data-position="left center">解压失败</span>
-                    </span>
-                </div>
+    <el-button type="text" @click="dialogVisible = true" icon="el-icon-plus" style="color: #0366d6;">
+        {{.i18n.Tr "dataset.select_dataset"}}</el-button>
+    <el-dialog title="{{.i18n.Tr "dataset.select_dataset"}}" :visible.sync="dialogVisible" width="50%">
+        <div v-loading="loadingDataIndex" style="position: relative;">
+            <div class="ui icon input" style="z-index: 9999;position: absolute;right: 50px;height:30px;">
+                <i class="search icon"></i>
+                <input type="text" placeholder="{{.i18n.Tr "dataset.search_dataset"}}" v-model="searchDataItem">
             </div>
-            
-            
-        </el-tab-pane>
-        <el-tab-pane label="{{.i18n.Tr "dataset.owner_dataset"}}" name="second">
-            <div style="display: flex;align-items: center;justify-content: space-between;padding: 1rem 0;border-bottom:1px solid #F5F5F5" v-for="(dataset,index) in myDataset" :key="index">
-                <div style="width: 90%;">
-                    <div style="display: flex;align-items: center;"><span class="panel_creator_reponam">${dataset.Repo.OwnerName}/${dataset.Repo.Alias}</span><img v-if="dataset.Recommend" src="/img/jian.svg" style="margin-left: 0.5rem;"><span class="panel_dataset_name">${dataset.Name}</span></div>
-                    <div style="margin-top: 8px;display: flex;">
-                        <a :title="dataset.UserName" style="cursor: default;"> 
-                            <img class="ui avatar mini image" style="width: 20px;height: 20px;" :src="dataset.RelAvatarLink">
-                        </a>
-                        <span class="panel_datset_desc">${dataset.Description}</span>
+
+            <el-tabs v-model="activeName" @tab-click="handleClick('{{.RepoLink}}',activeName,{{.cloudbraintype}})">
+                <el-tab-pane label="{{.i18n.Tr "dataset.current_project"}}" name="first">
+                    <div style="display: flex;align-items: center;justify-content: space-between;padding: 1rem 0;border-bottom:1px solid #F5F5F5"
+                        v-for="(dataset,index) in currentRepoDataset" :key="index">
+                        <div style="width: 90%;">
+                            <div style="display: flex;align-items: center;"><span
+                                    class="panel_creator_reponam">${dataset.Repo.OwnerName}/${dataset.Repo.Alias}</span><img
+                                    v-if="dataset.Recommend" src="/img/jian.svg" style="margin-left: 0.5rem;"><span
+                                    class="panel_dataset_name">${dataset.Name} </span></div>
+                            <div style="margin-top: 8px;display: flex;">
+                                <a :title="dataset.UserName" style="cursor: default;">
+                                    <img class="ui avatar mini image" style="width: 20px;height: 20px;"
+                                        :src="dataset.RelAvatarLink">
+                                </a>
+                                <span class="panel_datset_desc">${dataset.Description}</span>
+                            </div>
+                        </div>
+                        <div>
+                            <button v-if="dataset.DecompressState===1" class="ui primary basic button mini"
+                                @click.stop.prevent="selectDataset(dataset.UUID,dataset.Name)">{{.i18n.Tr "dataset.use"}}</button>
+                            <span v-if="dataset.DecompressState===2" style="display: flex;align-items: center;">
+                                <i class="CREATING"></i>
+                                <span style="margin-left: 0.4em;font-size: 12px;color: #5A5A5A;"
+                                    data-tooltip="{{$.i18n.Tr "dataset.unzip_tooltips"}}" data-inverted=""
+                                    data-variation="mini" data-position="left center">解压中</span>
+                            </span>
+                            <span v-if="dataset.DecompressState===3" style="display: flex;align-items: center;">
+                                <i class="FAILED"></i>
+                                <span style="margin-left: 0.4em;font-size: 12px;color:red;"
+                                    data-tooltip="{{$.i18n.Tr "dataset.zip_failed"}}" data-inverted=""
+                                    data-variation="mini" data-position="left center">解压失败</span>
+                            </span>
+                        </div>
+                    </div>
+                </el-tab-pane>
+                <el-tab-pane label="{{.i18n.Tr "dataset.owner_dataset"}}" name="second">
+                    <div style="display: flex;align-items: center;justify-content: space-between;padding: 1rem 0;border-bottom:1px solid #F5F5F5"
+                        v-for="(dataset,index) in myDataset" :key="index">
+                        <div style="width: 90%;">
+                            <div style="display: flex;align-items: center;"><span
+                                    class="panel_creator_reponam">${dataset.Repo.OwnerName}/${dataset.Repo.Alias}</span><img
+                                    v-if="dataset.Recommend" src="/img/jian.svg" style="margin-left: 0.5rem;"><span
+                                    class="panel_dataset_name">${dataset.Name}</span></div>
+                            <div style="margin-top: 8px;display: flex;">
+                                <a :title="dataset.UserName" style="cursor: default;">
+                                    <img class="ui avatar mini image" style="width: 20px;height: 20px;"
+                                        :src="dataset.RelAvatarLink">
+                                </a>
+                                <span class="panel_datset_desc">${dataset.Description}</span>
+                            </div>
+                        </div>
+                        <div>
+                            <button v-if="dataset.DecompressState===1" class="ui primary basic button mini"
+                                @click.stop.prevent="selectDataset(dataset.UUID,dataset.Name)">{{.i18n.Tr "dataset.use"}}</button>
+                            <span v-if="dataset.DecompressState===2" style="display: flex;align-items: center;">
+                                <i class="CREATING"></i>
+                                <span style="margin-left: 0.4em;font-size: 12px;color: #5A5A5A;"
+                                    data-tooltip="{{$.i18n.Tr "dataset.unzip_tooltips"}}" data-inverted=""
+                                    data-variation="mini" data-position="left center">解压中</span>
+                            </span>
+                            <span v-if="dataset.DecompressState===3" style="display: flex;align-items: center;">
+                                <i class="FAILED"></i>
+                                <span style="margin-left: 0.4em;font-size: 12px;color:red;"
+                                    data-tooltip="{{$.i18n.Tr "dataset.zip_failed"}}" data-inverted=""
+                                    data-variation="mini" data-position="left center">解压失败</span>
+                            </span>
+                        </div>
                     </div>
-                </div>
-                <div>
-                    <button v-if="dataset.DecompressState===1" class="ui primary basic button mini" @click.stop.prevent="selectDataset(dataset.UUID,dataset.Name)">{{.i18n.Tr "dataset.use"}}</button>
-                    <span v-if="dataset.DecompressState===2" style="display: flex;align-items: center;">
-                        <i class="CREATING"></i>
-                        <span style="margin-left: 0.4em;font-size: 12px;color: #5A5A5A;" data-tooltip="{{$.i18n.Tr "dataset.unzip_tooltips"}}" data-inverted="" data-variation="mini" data-position="left center">解压中</span>
-                    </span>
-                    <span v-if="dataset.DecompressState===3" style="display: flex;align-items: center;">
-                        <i class="FAILED"></i>
-                        <span style="margin-left: 0.4em;font-size: 12px;color:red;" data-tooltip="{{$.i18n.Tr "dataset.zip_failed"}}" data-inverted="" data-variation="mini" data-position="left center">解压失败</span>
-                    </span>
-                </div>
-            </div>
 
-        </el-tab-pane>
-        <el-tab-pane label="{{.i18n.Tr "dataset.public_dataset"}}" name="third">
-            <div style="display: flex;align-items: center;justify-content: space-between;padding: 1rem 0;border-bottom:1px solid #F5F5F5" v-for="(dataset,index) in publicDataset" :key="index">
-                <div style="width: 90%;">
-                    <div style="display: flex;align-items: center;"><span class="panel_creator_reponam">${dataset.Repo.OwnerName}/${dataset.Repo.Alias}</span><img v-if="dataset.Recommend" src="/img/jian.svg" style="margin-left: 0.5rem;"><span class="panel_dataset_name">${dataset.Name}</span></div>
-                    <div style="margin-top: 8px;display: flex;">
-                        <a :title="dataset.UserName" style="cursor: default;"> 
-                            <img class="ui avatar mini image" style="width: 20px;height: 20px;" :src="dataset.RelAvatarLink">
-                        </a>
-                        <span class="panel_datset_desc">${dataset.Description}</span>
+                </el-tab-pane>
+                <el-tab-pane label="{{.i18n.Tr "dataset.public_dataset"}}" name="third">
+                    <div style="display: flex;align-items: center;justify-content: space-between;padding: 1rem 0;border-bottom:1px solid #F5F5F5"
+                        v-for="(dataset,index) in publicDataset" :key="index">
+                        <div style="width: 90%;">
+                            <div style="display: flex;align-items: center;"><span
+                                    class="panel_creator_reponam">${dataset.Repo.OwnerName}/${dataset.Repo.Alias}</span><img
+                                    v-if="dataset.Recommend" src="/img/jian.svg" style="margin-left: 0.5rem;"><span
+                                    class="panel_dataset_name">${dataset.Name}</span></div>
+                            <div style="margin-top: 8px;display: flex;">
+                                <a :title="dataset.UserName" style="cursor: default;">
+                                    <img class="ui avatar mini image" style="width: 20px;height: 20px;"
+                                        :src="dataset.RelAvatarLink">
+                                </a>
+                                <span class="panel_datset_desc">${dataset.Description}</span>
+                            </div>
+                        </div>
+                        <div>
+                            <button v-if="dataset.DecompressState===1" class="ui primary basic button mini"
+                                @click.stop.prevent="selectDataset(dataset.UUID,dataset.Name)">{{.i18n.Tr "dataset.use"}}</button>
+                            <span v-if="dataset.DecompressState===2" style="display: flex;align-items: center;">
+                                <i class="CREATING"></i>
+                                <span style="margin-left: 0.4em;font-size: 12px;color: #5A5A5A;"
+                                    data-tooltip="{{$.i18n.Tr "dataset.unzip_tooltips"}}" data-inverted=""
+                                    data-variation="mini" data-position="left center">解压中</span>
+                            </span>
+                            <span v-if="dataset.DecompressState===3" style="display: flex;align-items: center;">
+                                <i class="FAILED"></i>
+                                <span style="margin-left: 0.4em;font-size: 12px;color:red;"
+                                    data-tooltip="{{$.i18n.Tr "dataset.zip_failed"}}" data-inverted=""
+                                    data-variation="mini" data-position="left center">解压失败</span>
+                            </span>
+                        </div>
                     </div>
-                </div>
-                <div>
-                    <button v-if="dataset.DecompressState===1" class="ui primary basic button mini" @click.stop.prevent="selectDataset(dataset.UUID,dataset.Name)">{{.i18n.Tr "dataset.use"}}</button>
-                    <span v-if="dataset.DecompressState===2" style="display: flex;align-items: center;">
-                        <i class="CREATING"></i>
-                        <span style="margin-left: 0.4em;font-size: 12px;color: #5A5A5A;" data-tooltip="{{$.i18n.Tr "dataset.unzip_tooltips"}}" data-inverted="" data-variation="mini" data-position="left center">解压中</span>
-                    </span>
-                    <span v-if="dataset.DecompressState===3" style="display: flex;align-items: center;">
-                        <i class="FAILED"></i>
-                        <span style="margin-left: 0.4em;font-size: 12px;color:red;" data-tooltip="{{$.i18n.Tr "dataset.zip_failed"}}" data-inverted="" data-variation="mini" data-position="left center">解压失败</span>
-                    </span>
-                </div>
-            </div>
 
-        </el-tab-pane>
-        <el-tab-pane label="{{.i18n.Tr "dataset.I_liked"}}" name="fourth">
-            <div style="display: flex;align-items: center;justify-content: space-between;padding: 1rem 0;border-bottom:1px solid #F5F5F5" v-for="(dataset,index) in myFavoriteDataset" :key="index">
-                <div style="width: 90%;">
-                    <div style="display: flex;align-items: center;"><span class="panel_creator_reponam">${dataset.Repo.OwnerName}/${dataset.Repo.Alias}</span><img v-if="dataset.Recommend" src="/img/jian.svg" style="margin-left: 0.5rem;"><span class="panel_dataset_name">${dataset.Name}</span></div>
-                    <div style="margin-top: 8px;display: flex;">
-                        <a :title="dataset.UserName" style="cursor: default;"> 
-                            <img class="ui avatar mini image" style="width: 20px;height: 20px;" :src="dataset.RelAvatarLink">
-                        </a>
-                        <span class="panel_datset_desc">${dataset.Description}</span>
+                </el-tab-pane>
+                <el-tab-pane label="{{.i18n.Tr "dataset.I_liked"}}" name="fourth">
+                    <div style="display: flex;align-items: center;justify-content: space-between;padding: 1rem 0;border-bottom:1px solid #F5F5F5"
+                        v-for="(dataset,index) in myFavoriteDataset" :key="index">
+                        <div style="width: 90%;">
+                            <div style="display: flex;align-items: center;"><span
+                                    class="panel_creator_reponam">${dataset.Repo.OwnerName}/${dataset.Repo.Alias}</span><img
+                                    v-if="dataset.Recommend" src="/img/jian.svg" style="margin-left: 0.5rem;"><span
+                                    class="panel_dataset_name">${dataset.Name}</span></div>
+                            <div style="margin-top: 8px;display: flex;">
+                                <a :title="dataset.UserName" style="cursor: default;">
+                                    <img class="ui avatar mini image" style="width: 20px;height: 20px;"
+                                        :src="dataset.RelAvatarLink">
+                                </a>
+                                <span class="panel_datset_desc">${dataset.Description}</span>
+                            </div>
+                        </div>
+                        <div>
+                            <button v-if="dataset.DecompressState===1" class="ui primary basic button mini"
+                                @click.stop.prevent="selectDataset(dataset.UUID,dataset.Name)">{{.i18n.Tr "dataset.use"}}</button>
+                            <span v-if="dataset.DecompressState===2" style="display: flex;align-items: center;">
+                                <i class="CREATING"></i>
+                                <span style="margin-left: 0.4em;font-size: 12px;color: #5A5A5A;"
+                                    data-tooltip="{{$.i18n.Tr "dataset.unzip_tooltips"}}" data-inverted=""
+                                    data-variation="mini" data-position="left center">解压中</span>
+                            </span>
+                            <span v-if="dataset.DecompressState===3" style="display: flex;align-items: center;">
+                                <i class="FAILED"></i>
+                                <span style="margin-left: 0.4em;font-size: 12px;color:red;"
+                                    data-tooltip="{{$.i18n.Tr "dataset.zip_failed"}}" data-inverted=""
+                                    data-variation="mini" data-position="left center">解压失败</span>
+                            </span>
+                        </div>
                     </div>
-                </div>
-                <div>
-                    <button v-if="dataset.DecompressState===1" class="ui primary basic button mini" @click.stop.prevent="selectDataset(dataset.UUID,dataset.Name)">{{.i18n.Tr "dataset.use"}}</button>
-                    <span v-if="dataset.DecompressState===2" style="display: flex;align-items: center;">
-                        <i class="CREATING"></i>
-                        <span style="margin-left: 0.4em;font-size: 12px;color: #5A5A5A;" data-tooltip="{{$.i18n.Tr "dataset.unzip_tooltips"}}" data-inverted="" data-variation="mini" data-position="left center">解压中</span>
-                    </span>
-                    <span v-if="dataset.DecompressState===3" style="display: flex;align-items: center;">
-                        <i class="FAILED"></i>
-                        <span style="margin-left: 0.4em;font-size: 12px;color:red;" data-tooltip="{{$.i18n.Tr "dataset.zip_failed"}}" data-inverted="" data-variation="mini" data-position="left center">解压失败</span>
-                    </span>
-                </div>
-            </div>
 
-        </el-tab-pane>
-    </el-tabs>
-    <div class="center">
-        <el-pagination
-        background
-        @current-change="handleCurrentChange"
-        :current-page="page"
-        :page-size="5"
-        layout="total,prev, pager, next"
-        :total="totalnums">
-        </el-pagination>
-    </div>
+                </el-tab-pane>
+            </el-tabs>
+            <div class="center">
+                <el-pagination background @current-change="handleCurrentChange" :current-page="page" :page-size="5"
+                    layout="total,prev, pager, next" :total="totalnums">
+                </el-pagination>
+            </div>
+        </div>
     </el-dialog>
 
 
-</div>
+</div>

templates/custom/select_dataset_train.tmpl

@@ -1,142 +1,179 @@
-
-<div class="dataset-repolink" id="dataset-repolink-init" style="display: none;" data-repolink="{{.RepoLink}}" data-cloudranin-type="{{.cloudbraintype}}"></div>
+<div class="dataset-repolink" id="dataset-repolink-init" style="display: none;" data-repolink="{{.RepoLink}}"
+    data-cloudranin-type="{{.cloudbraintype}}"></div>
 <div class="inline required unite min_title field" id="dataset-base" style="margin-bottom: 0 !important;">
     {{if or (.benchmarkMode) (.newInference)}}
-    <label style="font-weight: normal;">{{if .benchmarkMode}}{{.i18n.Tr "repo.model_manager"}}</label><span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>{{else}}{{.i18n.Tr "dataset.dataset"}}</label>&nbsp;&nbsp;&nbsp;&nbsp;{{end}}
+    <label
+        style="font-weight: normal;">{{if .benchmarkMode}}{{.i18n.Tr "repo.model_manager"}}</label><span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>{{else}}{{.i18n.Tr "dataset.dataset"}}</label>&nbsp;&nbsp;&nbsp;&nbsp;{{end}}
     {{else}}
     <label style="font-weight: normal;">{{.i18n.Tr "dataset.dataset"}}</label>&nbsp;&nbsp;&nbsp;
     {{end}}
     <input type="hidden" name="attachment" :value="dataset_uuid">
     <input class="disabled" type="text" :value="dataset_name" required onfocus="this.blur();" style="width: 48.5%;">
-    <el-button type="text" @click="dialogVisible = true" icon="el-icon-plus" style="color: #0366d6;"> {{if .benchmarkMode}}{{.i18n.Tr "repo.modelarts.infer_job.select_model"}}{{else}}{{.i18n.Tr "dataset.select_dataset"}}{{end}}</el-button>
+    <el-button type="text" @click="dialogVisible = true" icon="el-icon-plus" style="color: #0366d6;">
+        {{if .benchmarkMode}}{{.i18n.Tr "repo.modelarts.infer_job.select_model"}}{{else}}{{.i18n.Tr "dataset.select_dataset"}}{{end}}
+    </el-button>
     {{if .benchmarkMode}}
     <span class="tooltips" style="display: block;padding-left: 0.5rem;">说明：先使用数据集功能上传模型，然后从数据集列表选模型。</span>
     {{end}}
-    <el-dialog
-    title="{{.i18n.Tr "dataset.select_dataset"}}"
-    :visible.sync="dialogVisible"
-    width="50%"
-    >
-    <div class="ui icon input" style="z-index: 9999;position: absolute;right: 50px;height:30px;">
-        <i class="search icon"></i>
-        <input type="text" placeholder="{{.i18n.Tr "dataset.search_dataset"}}" v-model="searchDataItem">
-    </div>
-    
-    <el-tabs v-model="activeName" @tab-click="handleClick('{{.RepoLink}}',activeName,{{.cloudbraintype}})">
-        <el-tab-pane label="{{.i18n.Tr "dataset.current_project"}}" name="first">
-            <div style="display: flex;align-items: center;justify-content: space-between;padding: 1rem 0;border-bottom:1px solid #F5F5F5" v-for="(dataset,index) in currentRepoDataset" :key="index">
-                <div style="width: 90%;">
-                    <div style="display: flex;align-items: center;"><span class="panel_creator_reponam">${dataset.Repo.OwnerName}/${dataset.Repo.Alias} </span><img v-if="dataset.Recommend" src="/img/jian.svg" style="margin-left: 0.5rem;"><span class="panel_dataset_name">${dataset.Name} </span></div>
-                    <div style="margin-top: 8px;display: flex;">
-                        <a :title="dataset.UserName" style="cursor: default;"> 
-                            <img class="ui avatar mini image" style="width: 20px;height: 20px;" :src="dataset.RelAvatarLink">
-                        </a>
-                        <span class="panel_datset_desc">${dataset.Description}</span>
-                    </div>
-                </div>
-                <div>
-                    <button v-if="dataset.DecompressState===1" class="ui primary basic button mini" @click.stop.prevent="selectDataset(dataset.UUID,dataset.Name)">{{.i18n.Tr "dataset.use"}}</button>
-                    <span v-if="dataset.DecompressState===2" style="display: flex;align-items: center;">
-                        <i class="CREATING"></i>
-                        <span style="margin-left: 0.4em;font-size: 12px;color: #5A5A5A;" data-tooltip="{{$.i18n.Tr "dataset.unzip_tooltips"}}" data-inverted="" data-variation="mini" data-position="left center">解压中</span>
-                    </span>
-                    <span v-if="dataset.DecompressState===3" style="display: flex;align-items: center;">
-                        <i class="FAILED"></i>
-                        <span style="margin-left: 0.4em;font-size: 12px;color:red;" data-tooltip="{{$.i18n.Tr "dataset.zip_failed"}}" data-inverted="" data-variation="mini" data-position="left center">解压失败</span>
-                    </span>
-                </div>
+    <el-dialog title="{{.i18n.Tr "dataset.select_dataset"}}" :visible.sync="dialogVisible" width="50%">
+        <div v-loading="loadingDataIndex" style="position: relative;">
+            <div class="ui icon input" style="z-index: 9999;position: absolute;right: 50px;height:30px;">
+                <i class="search icon"></i>
+                <input type="text" placeholder="{{.i18n.Tr "dataset.search_dataset"}}" v-model="searchDataItem">
             </div>
-            
-        {{if not .benchmarkMode}}   
-        </el-tab-pane>
-        <el-tab-pane label="{{.i18n.Tr "dataset.owner_dataset"}}" name="second">
-            <div style="display: flex;align-items: center;justify-content: space-between;padding: 1rem 0;border-bottom:1px solid #F5F5F5" v-for="(dataset,index) in myDataset" :key="index">
-                <div style="width: 90%;">
-                    <div style="display: flex;align-items: center;"><span class="panel_creator_reponam">${dataset.Repo.OwnerName}/${dataset.Repo.Alias}</span><img v-if="dataset.Recommend" src="/img/jian.svg" style="margin-left: 0.5rem;"><span class="panel_dataset_name">${dataset.Name}</span></div>
-                    <div style="margin-top: 8px;display: flex;">
-                        <a :title="dataset.UserName" style="cursor: default;"> 
-                            <img class="ui avatar mini image" style="width: 20px;height: 20px;" :src="dataset.RelAvatarLink">
-                        </a>
-                        <span class="panel_datset_desc">${dataset.Description}</span>
+
+            <el-tabs v-model="activeName" @tab-click="handleClick('{{.RepoLink}}',activeName,{{.cloudbraintype}})">
+                <el-tab-pane label="{{.i18n.Tr "dataset.current_project"}}" name="first" v-loading="loadingDataIndex">
+                    <div style="display: flex;align-items: center;justify-content: space-between;padding: 1rem 0;border-bottom:1px solid #F5F5F5"
+                        v-for="(dataset,index) in currentRepoDataset" :key="index">
+                        <div style="width: 90%;">
+                            <div style="display: flex;align-items: center;"><span
+                                    class="panel_creator_reponam">${dataset.Repo.OwnerName}/${dataset.Repo.Alias}
+                                </span><img v-if="dataset.Recommend" src="/img/jian.svg"
+                                    style="margin-left: 0.5rem;"><span class="panel_dataset_name">${dataset.Name}
+                                </span></div>
+                            <div style="margin-top: 8px;display: flex;">
+                                <a :title="dataset.UserName" style="cursor: default;">
+                                    <img class="ui avatar mini image" style="width: 20px;height: 20px;"
+                                        :src="dataset.RelAvatarLink">
+                                </a>
+                                <span class="panel_datset_desc">${dataset.Description}</span>
+                            </div>
+                        </div>
+                        <div>
+                            <button v-if="dataset.DecompressState===1" class="ui primary basic button mini"
+                                @click.stop.prevent="selectDataset(dataset.UUID,dataset.Name)">{{.i18n.Tr "dataset.use"}}</button>
+                            <span v-if="dataset.DecompressState===2" style="display: flex;align-items: center;">
+                                <i class="CREATING"></i>
+                                <span style="margin-left: 0.4em;font-size: 12px;color: #5A5A5A;"
+                                    data-tooltip="{{$.i18n.Tr "dataset.unzip_tooltips"}}" data-inverted=""
+                                    data-variation="mini" data-position="left center">解压中</span>
+                            </span>
+                            <span v-if="dataset.DecompressState===3" style="display: flex;align-items: center;">
+                                <i class="FAILED"></i>
+                                <span style="margin-left: 0.4em;font-size: 12px;color:red;"
+                                    data-tooltip="{{$.i18n.Tr "dataset.zip_failed"}}" data-inverted=""
+                                    data-variation="mini" data-position="left center">解压失败</span>
+                            </span>
+                        </div>
                     </div>
-                </div>
-                <div>
-                    <button v-if="dataset.DecompressState===1" class="ui primary basic button mini" @click.stop.prevent="selectDataset(dataset.UUID,dataset.Name)">{{.i18n.Tr "dataset.use"}}</button>
-                    <span v-if="dataset.DecompressState===2" style="display: flex;align-items: center;">
-                        <i class="CREATING"></i>
-                        <span style="margin-left: 0.4em;font-size: 12px;color: #5A5A5A;" data-tooltip="{{$.i18n.Tr "dataset.unzip_tooltips"}}" data-inverted="" data-variation="mini" data-position="left center">解压中</span>
-                    </span>
-                    <span v-if="dataset.DecompressState===3" style="display: flex;align-items: center;">
-                        <i class="FAILED"></i>
-                        <span style="margin-left: 0.4em;font-size: 12px;color:red;" data-tooltip="{{$.i18n.Tr "dataset.zip_failed"}}" data-inverted="" data-variation="mini" data-position="left center">解压失败</span>
-                    </span>
-                </div>
-            </div>
 
-        </el-tab-pane>
-        <el-tab-pane label="{{.i18n.Tr "dataset.public_dataset"}}" name="third">
-            <div style="display: flex;align-items: center;justify-content: space-between;padding: 1rem 0;border-bottom:1px solid #F5F5F5" v-for="(dataset,index) in publicDataset" :key="index">
-                <div style="width: 90%;">
-                    <div style="display: flex;align-items: center;"><span class="panel_creator_reponam">${dataset.Repo.OwnerName}/${dataset.Repo.Alias}</span><img v-if="dataset.Recommend" src="/img/jian.svg" style="margin-left: 0.5rem;"><span class="panel_dataset_name">${dataset.Name}</span></div>
-                    <div style="margin-top: 8px;display: flex;">
-                        <a :title="dataset.UserName" style="cursor: default;"> 
-                            <img class="ui avatar mini image" style="width: 20px;height: 20px;" :src="dataset.RelAvatarLink">
-                        </a>
-                        <span class="panel_datset_desc">${dataset.Description}</span>
+                    {{if not .benchmarkMode}}
+                </el-tab-pane>
+                <el-tab-pane label="{{.i18n.Tr "dataset.owner_dataset"}}" name="second" v-loading="loadingDataIndex">
+                    <div style="display: flex;align-items: center;justify-content: space-between;padding: 1rem 0;border-bottom:1px solid #F5F5F5"
+                        v-for="(dataset,index) in myDataset" :key="index">
+                        <div style="width: 90%;">
+                            <div style="display: flex;align-items: center;"><span
+                                    class="panel_creator_reponam">${dataset.Repo.OwnerName}/${dataset.Repo.Alias}</span><img
+                                    v-if="dataset.Recommend" src="/img/jian.svg" style="margin-left: 0.5rem;"><span
+                                    class="panel_dataset_name">${dataset.Name}</span></div>
+                            <div style="margin-top: 8px;display: flex;">
+                                <a :title="dataset.UserName" style="cursor: default;">
+                                    <img class="ui avatar mini image" style="width: 20px;height: 20px;"
+                                        :src="dataset.RelAvatarLink">
+                                </a>
+                                <span class="panel_datset_desc">${dataset.Description}</span>
+                            </div>
+                        </div>
+                        <div>
+                            <button v-if="dataset.DecompressState===1" class="ui primary basic button mini"
+                                @click.stop.prevent="selectDataset(dataset.UUID,dataset.Name)">{{.i18n.Tr "dataset.use"}}</button>
+                            <span v-if="dataset.DecompressState===2" style="display: flex;align-items: center;">
+                                <i class="CREATING"></i>
+                                <span style="margin-left: 0.4em;font-size: 12px;color: #5A5A5A;"
+                                    data-tooltip="{{$.i18n.Tr "dataset.unzip_tooltips"}}" data-inverted=""
+                                    data-variation="mini" data-position="left center">解压中</span>
+                            </span>
+                            <span v-if="dataset.DecompressState===3" style="display: flex;align-items: center;">
+                                <i class="FAILED"></i>
+                                <span style="margin-left: 0.4em;font-size: 12px;color:red;"
+                                    data-tooltip="{{$.i18n.Tr "dataset.zip_failed"}}" data-inverted=""
+                                    data-variation="mini" data-position="left center">解压失败</span>
+                            </span>
+                        </div>
                     </div>
-                </div>
-                <div>
-                    <button v-if="dataset.DecompressState===1" class="ui primary basic button mini" @click.stop.prevent="selectDataset(dataset.UUID,dataset.Name)">{{.i18n.Tr "dataset.use"}}</button>
-                    <span v-if="dataset.DecompressState===2" style="display: flex;align-items: center;">
-                        <i class="CREATING"></i>
-                        <span style="margin-left: 0.4em;font-size: 12px;color: #5A5A5A;" data-tooltip="{{$.i18n.Tr "dataset.unzip_tooltips"}}" data-inverted="" data-variation="mini" data-position="left center">解压中</span>
-                    </span>
-                    <span v-if="dataset.DecompressState===3" style="display: flex;align-items: center;">
-                        <i class="FAILED"></i>
-                        <span style="margin-left: 0.4em;font-size: 12px;color:red;" data-tooltip="{{$.i18n.Tr "dataset.zip_failed"}}" data-inverted="" data-variation="mini" data-position="left center">解压失败</span>
-                    </span>
-                </div>
-            </div>
 
-        </el-tab-pane>
-        <el-tab-pane label="{{.i18n.Tr "dataset.I_liked"}}" name="fourth">
-            <div style="display: flex;align-items: center;justify-content: space-between;padding: 1rem 0;border-bottom:1px solid #F5F5F5" v-for="(dataset,index) in myFavoriteDataset" :key="index">
-                <div style="width: 90%;">
-                    <div style="display: flex;align-items: center;"><span class="panel_creator_reponam">${dataset.Repo.OwnerName}/${dataset.Repo.Alias}</span><img v-if="dataset.Recommend" src="/img/jian.svg" style="margin-left: 0.5rem;"><span class="panel_dataset_name">${dataset.Name}</span></div>
-                    <div style="margin-top: 8px;display: flex;">
-                        <a :title="dataset.UserName" style="cursor: default;"> 
-                            <img class="ui avatar mini image" style="width: 20px;height: 20px;" :src="dataset.RelAvatarLink">
-                        </a>
-                        <span class="panel_datset_desc">${dataset.Description}</span>
+                </el-tab-pane>
+                <el-tab-pane label="{{.i18n.Tr "dataset.public_dataset"}}" name="third" v-loading="loadingDataIndex">
+                    <div style="display: flex;align-items: center;justify-content: space-between;padding: 1rem 0;border-bottom:1px solid #F5F5F5"
+                        v-for="(dataset,index) in publicDataset" :key="index">
+                        <div style="width: 90%;">
+                            <div style="display: flex;align-items: center;"><span
+                                    class="panel_creator_reponam">${dataset.Repo.OwnerName}/${dataset.Repo.Alias}</span><img
+                                    v-if="dataset.Recommend" src="/img/jian.svg" style="margin-left: 0.5rem;"><span
+                                    class="panel_dataset_name">${dataset.Name}</span></div>
+                            <div style="margin-top: 8px;display: flex;">
+                                <a :title="dataset.UserName" style="cursor: default;">
+                                    <img class="ui avatar mini image" style="width: 20px;height: 20px;"
+                                        :src="dataset.RelAvatarLink">
+                                </a>
+                                <span class="panel_datset_desc">${dataset.Description}</span>
+                            </div>
+                        </div>
+                        <div>
+                            <button v-if="dataset.DecompressState===1" class="ui primary basic button mini"
+                                @click.stop.prevent="selectDataset(dataset.UUID,dataset.Name)">{{.i18n.Tr "dataset.use"}}</button>
+                            <span v-if="dataset.DecompressState===2" style="display: flex;align-items: center;">
+                                <i class="CREATING"></i>
+                                <span style="margin-left: 0.4em;font-size: 12px;color: #5A5A5A;"
+                                    data-tooltip="{{$.i18n.Tr "dataset.unzip_tooltips"}}" data-inverted=""
+                                    data-variation="mini" data-position="left center">解压中</span>
+                            </span>
+                            <span v-if="dataset.DecompressState===3" style="display: flex;align-items: center;">
+                                <i class="FAILED"></i>
+                                <span style="margin-left: 0.4em;font-size: 12px;color:red;"
+                                    data-tooltip="{{$.i18n.Tr "dataset.zip_failed"}}" data-inverted=""
+                                    data-variation="mini" data-position="left center">解压失败</span>
+                            </span>
+                        </div>
+                    </div>
+
+                </el-tab-pane>
+                <el-tab-pane label="{{.i18n.Tr "dataset.I_liked"}}" name="fourth" v-loading="loadingDataIndex">
+                    <div style="display: flex;align-items: center;justify-content: space-between;padding: 1rem 0;border-bottom:1px solid #F5F5F5"
+                        v-for="(dataset,index) in myFavoriteDataset" :key="index">
+                        <div style="width: 90%;">
+                            <div style="display: flex;align-items: center;"><span
+                                    class="panel_creator_reponam">${dataset.Repo.OwnerName}/${dataset.Repo.Alias}</span><img
+                                    v-if="dataset.Recommend" src="/img/jian.svg" style="margin-left: 0.5rem;"><span
+                                    class="panel_dataset_name">${dataset.Name}</span></div>
+                            <div style="margin-top: 8px;display: flex;">
+                                <a :title="dataset.UserName" style="cursor: default;">
+                                    <img class="ui avatar mini image" style="width: 20px;height: 20px;"
+                                        :src="dataset.RelAvatarLink">
+                                </a>
+                                <span class="panel_datset_desc">${dataset.Description}</span>
+                            </div>
+                        </div>
+                        <div>
+                            <button v-if="dataset.DecompressState===1" class="ui primary basic button mini"
+                                @click.stop.prevent="selectDataset(dataset.UUID,dataset.Name)">{{.i18n.Tr "dataset.use"}}</button>
+                            <span v-if="dataset.DecompressState===2" style="display: flex;align-items: center;">
+                                <i class="CREATING"></i>
+                                <span style="margin-left: 0.4em;font-size: 12px;color: #5A5A5A;"
+                                    data-tooltip="{{$.i18n.Tr "dataset.unzip_tooltips"}}" data-inverted=""
+                                    data-variation="mini" data-position="left center">解压中</span>
+                            </span>
+                            <span v-if="dataset.DecompressState===3" style="display: flex;align-items: center;">
+                                <i class="FAILED"></i>
+                                <span style="margin-left: 0.4em;font-size: 12px;color:red;"
+                                    data-tooltip="{{$.i18n.Tr "dataset.zip_failed"}}" data-inverted=""
+                                    data-variation="mini" data-position="left center">解压失败</span>
+                            </span>
+                        </div>
                     </div>
-                </div>
-                <div>
-                    <button v-if="dataset.DecompressState===1" class="ui primary basic button mini" @click.stop.prevent="selectDataset(dataset.UUID,dataset.Name)">{{.i18n.Tr "dataset.use"}}</button>
-                    <span v-if="dataset.DecompressState===2" style="display: flex;align-items: center;">
-                        <i class="CREATING"></i>
-                        <span style="margin-left: 0.4em;font-size: 12px;color: #5A5A5A;" data-tooltip="{{$.i18n.Tr "dataset.unzip_tooltips"}}" data-inverted="" data-variation="mini" data-position="left center">解压中</span>
-                    </span>
-                    <span v-if="dataset.DecompressState===3" style="display: flex;align-items: center;">
-                        <i class="FAILED"></i>
-                        <span style="margin-left: 0.4em;font-size: 12px;color:red;" data-tooltip="{{$.i18n.Tr "dataset.zip_failed"}}" data-inverted="" data-variation="mini" data-position="left center">解压失败</span>
-                    </span>
-                </div>
-            </div>
 
-        </el-tab-pane>
-        {{end}}
-    </el-tabs>
-    <div class="center">
-        <el-pagination
-        background
-        @current-change="handleCurrentChange"
-        :current-page="page"
-        :page-size="5"
-        layout="total,prev, pager, next"
-        :total="totalnums">
-        </el-pagination>
-    </div>
+                </el-tab-pane>
+                {{end}}
+            </el-tabs>
+            <div class="center">
+                <el-pagination background @current-change="handleCurrentChange" :current-page="page" :page-size="5"
+                    layout="total,prev, pager, next" :total="totalnums">
+                </el-pagination>
+            </div>
+        </div>
     </el-dialog>
 
 
-</div>
+</div>

templates/explore/datasets.tmpl

@@ -1,133 +1,162 @@
 {{template "base/head" .}}
 <style>
-.mg-b-1{
-	margin-bottom: 1rem;
-}
-.mg-b-2{
-	margin-bottom: 2rem;
-}
-.mg-l-1{
-	margin-left: 1rem;
-}
-.text-gray-400 {
-    --tw-text-opacity: 1;
-    color: rgba(156,163,175,var(--tw-text-opacity));
-}
-.text-sm {
-    font-size: .875rem;
-    line-height: 1.25rem;
-}
-.underline {
-    text-decoration: underline;
-}
-.flex{
-	display: flex;
-}
-.font-medium{
-	font-weight: 500;
-}
-.flex-wrap{
-	flex-wrap: wrap;
-}
-.tag {
-    background-image: linear-gradient(to bottom,var(--tw-gradient-stops));
-    border-color: transparent;
-    border-radius: 0.5rem;
-    border-width: 1px;
-    font-size: .875rem;
-    line-height: 1.25rem;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-}
-.tag-red {
-    --tw-gradient-from: #fef2f2;
-    --tw-gradient-stops: var(--tw-gradient-from),var(--tw-gradient-to,hsla(0,86%,97%,0));
-    --tw-gradient-to: #fef2f2;
-    --tw-text-opacity: 1;
-    color: rgba(153,27,27,var(--tw-text-opacity));
-}
-.tag-purple {
-    --tw-gradient-from: #f5f3ff;
-    --tw-gradient-stops: var(--tw-gradient-from),var(--tw-gradient-to,rgba(245,243,255,0));
-    --tw-gradient-to: #f5f3ff;
-    --tw-text-opacity: 1;
-    color: rgba(91,33,182,var(--tw-text-opacity));
-}
-.tag-blue {
-    --tw-gradient-from: #eff6ff;
-    --tw-gradient-stops: var(--tw-gradient-from),var(--tw-gradient-to,rgba(239,246,255,0));
-    --tw-gradient-to: #eff6ff;
-    --tw-text-opacity: 1;
-    color: rgba(30,64,175,var(--tw-text-opacity));
-}
-.tag.inactive {
-    filter: grayscale(100%);
-    opacity: .5;
-}
-.tag.tag-active{
-	background-color: #0366d6;
-	color: #ffffff;
-}
-.tag-gray{
-	background-color: #f8f9fa;
-	color: #415058;
-}
-.tag {
-    align-items: center;
-    display: inline-flex;
-    flex: none;
-    height: 2rem;
-    margin-bottom: 0.35rem;
-    margin-right: 0.35rem;
-    max-width: 100%;
-}
-.tag>span {
-    padding: 0.75rem;
-	font-size: 14px;
-}
-.repo_dataset_header{
-	font-size: 12px;
-	color: #3291F8;
-}
-.heart-stroke{
-      stroke: #666;
-      stroke-width: 2;
-      fill: #fff
-    }
-.stars_active{
-      fill: #FA8C16 !important;
-      stroke:#FA8C16 !important
-    }
+	.mg-b-1 {
+		margin-bottom: 1rem;
+	}
+
+	.mg-b-2 {
+		margin-bottom: 2rem;
+	}
+
+	.mg-l-1 {
+		margin-left: 1rem;
+	}
+
+	.text-gray-400 {
+		--tw-text-opacity: 1;
+		color: rgba(156, 163, 175, var(--tw-text-opacity));
+	}
+
+	.text-sm {
+		font-size: .875rem;
+		line-height: 1.25rem;
+	}
+
+	.underline {
+		text-decoration: underline;
+	}
+
+	.flex {
+		display: flex;
+	}
+
+	.font-medium {
+		font-weight: 500;
+	}
+
+	.flex-wrap {
+		flex-wrap: wrap;
+	}
+
+	.tag {
+		background-image: linear-gradient(to bottom, var(--tw-gradient-stops));
+		border-color: transparent;
+		border-radius: 0.5rem;
+		border-width: 1px;
+		font-size: .875rem;
+		line-height: 1.25rem;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		white-space: nowrap;
+	}
+
+	.tag-red {
+		--tw-gradient-from: #fef2f2;
+		--tw-gradient-stops: var(--tw-gradient-from), var(--tw-gradient-to, hsla(0, 86%, 97%, 0));
+		--tw-gradient-to: #fef2f2;
+		--tw-text-opacity: 1;
+		color: rgba(153, 27, 27, var(--tw-text-opacity));
+	}
+
+	.tag-purple {
+		--tw-gradient-from: #f5f3ff;
+		--tw-gradient-stops: var(--tw-gradient-from), var(--tw-gradient-to, rgba(245, 243, 255, 0));
+		--tw-gradient-to: #f5f3ff;
+		--tw-text-opacity: 1;
+		color: rgba(91, 33, 182, var(--tw-text-opacity));
+	}
+
+	.tag-blue {
+		--tw-gradient-from: #eff6ff;
+		--tw-gradient-stops: var(--tw-gradient-from), var(--tw-gradient-to, rgba(239, 246, 255, 0));
+		--tw-gradient-to: #eff6ff;
+		--tw-text-opacity: 1;
+		color: rgba(30, 64, 175, var(--tw-text-opacity));
+	}
+
+	.tag.inactive {
+		filter: grayscale(100%);
+		opacity: .5;
+	}
+
+	.tag.tag-active {
+		background-color: #0366d6;
+		color: #ffffff;
+	}
+
+	.tag-gray {
+		background-color: #f8f9fa;
+		color: #415058;
+	}
+
+	.tag {
+		align-items: center;
+		display: inline-flex;
+		flex: none;
+		height: 2rem;
+		margin-bottom: 0.35rem;
+		margin-right: 0.35rem;
+		max-width: 100%;
+	}
+
+	.tag>span {
+		padding: 0.75rem;
+		font-size: 14px;
+	}
+
+	.repo_dataset_header {
+		font-size: 12px;
+		color: #3291F8;
+	}
+
+	.heart-stroke {
+		stroke: #FA8C16;
+		stroke-width: 2;
+		fill: #fff
+	}
+
+	.stars_active {
+		fill: #FA8C16 !important;
+		stroke: #FA8C16 !important
+	}
 </style>
 <div class="explore repositories">
 	{{template "explore/dataset_search" .}}
 	<div>
 		<div class="ui container">
 			<div class="ui grid">
-				
+
 				{{template "explore/dataset_left" .}}
-				
+
 				<div class="ui sixteen wide mobile sixteen wide tablet twelve wide computer column">
 					<div class="ui row">
 						<h2 class="ui left floated medium header">
-						{{.i18n.Tr "datasets"}}
+							{{.i18n.Tr "datasets"}}
 						</h2>
 						<div class="ui right floated secondary filter menu">
 							<!-- Sort -->
 							<div class="ui right dropdown type jump item">
 								<span class="text">
-								{{.i18n.Tr "repo.issues.filter_sort"}}
-								<i class="dropdown icon"></i>
+									{{.i18n.Tr "repo.issues.filter_sort"}}
+									<i class="dropdown icon"></i>
 								</span>
 								<div class="menu">
-										<a class="{{if eq .SortType "default"}}active{{end}} item" href="{{$.Link}}?sort=default&q={{$.Keyword}}&tab={{$.TabName}}&category={{$.Category}}&task={{$.Task}}&license={{$.License}}&recommend={{$.Recommend}}">{{.i18n.Tr "repo.issues.filter_sort.default"}}</a>
-									<a class="{{if eq .SortType "newest"}}active{{end}} item" href="{{$.Link}}?sort=newest&q={{$.Keyword}}&tab={{$.TabName}}&category={{$.Category}}&task={{$.Task}}&license={{$.License}}&recommend={{$.Recommend}}">{{.i18n.Tr "repo.issues.filter_sort.latest"}}</a>
-									<a class="{{if eq .SortType "oldest"}}active{{end}} item" href="{{$.Link}}?sort=oldest&q={{$.Keyword}}&tab={{$.TabName}}&category={{$.Category}}&task={{$.Task}}&license={{$.License}}&recommend={{$.Recommend}}">{{.i18n.Tr "repo.issues.filter_sort.oldest"}}</a>
-									<a class="{{if eq .SortType "recentupdate"}}active{{end}} item" href="{{$.Link}}?sort=recentupdate&q={{$.Keyword}}&tab={{$.TabName}}&category={{$.Category}}&task={{$.Task}}&license={{$.License}}&recommend={{$.Recommend}}">{{.i18n.Tr "repo.issues.filter_sort.recentupdate"}}</a>
-									<a class="{{if eq .SortType "leastupdate"}}active{{end}} item" href="{{$.Link}}?sort=leastupdate&q={{$.Keyword}}&tab={{$.TabName}}&category={{$.Category}}&task={{$.Task}}&license={{$.License}}&recommend={{$.Recommend}}">{{.i18n.Tr "repo.issues.filter_sort.leastupdate"}}</a>
-									<a class="{{if eq .SortType "downloadtimes"}}active{{end}} item" href="{{$.Link}}?sort=downloadtimes&q={{$.Keyword}}&tab={{$.TabName}}&category={{$.Category}}&task={{$.Task}}&license={{$.License}}&recommend={{$.Recommend}}">{{.i18n.Tr "repo.issues.filter_sort.downloadtimes"}}</a>
-									<a class="{{if eq .SortType "moststars"}}active{{end}} item" href="{{$.Link}}?sort=moststars&q={{$.Keyword}}&tab={{$.TabName}}&category={{$.Category}}&task={{$.Task}}&license={{$.License}}&recommend={{$.Recommend}}">{{.i18n.Tr "repo.issues.filter_sort.moststars"}}</a>
+									<a class="{{if eq .SortType "default"}}active{{end}} item"
+										href="{{$.Link}}?sort=default&q={{$.Keyword}}&tab={{$.TabName}}&category={{$.Category}}&task={{$.Task}}&license={{$.License}}&recommend={{$.Recommend}}">{{.i18n.Tr "repo.issues.filter_sort.default"}}</a>
+									<a class="{{if eq .SortType "newest"}}active{{end}} item"
+										href="{{$.Link}}?sort=newest&q={{$.Keyword}}&tab={{$.TabName}}&category={{$.Category}}&task={{$.Task}}&license={{$.License}}&recommend={{$.Recommend}}">{{.i18n.Tr "repo.issues.filter_sort.latest"}}</a>
+									<a class="{{if eq .SortType "oldest"}}active{{end}} item"
+										href="{{$.Link}}?sort=oldest&q={{$.Keyword}}&tab={{$.TabName}}&category={{$.Category}}&task={{$.Task}}&license={{$.License}}&recommend={{$.Recommend}}">{{.i18n.Tr "repo.issues.filter_sort.oldest"}}</a>
+									<a class="{{if eq .SortType "recentupdate"}}active{{end}} item"
+										href="{{$.Link}}?sort=recentupdate&q={{$.Keyword}}&tab={{$.TabName}}&category={{$.Category}}&task={{$.Task}}&license={{$.License}}&recommend={{$.Recommend}}">{{.i18n.Tr "repo.issues.filter_sort.recentupdate"}}</a>
+									<a class="{{if eq .SortType "leastupdate"}}active{{end}} item"
+										href="{{$.Link}}?sort=leastupdate&q={{$.Keyword}}&tab={{$.TabName}}&category={{$.Category}}&task={{$.Task}}&license={{$.License}}&recommend={{$.Recommend}}">{{.i18n.Tr "repo.issues.filter_sort.leastupdate"}}</a>
+									<a class="{{if eq .SortType "downloadtimes"}}active{{end}} item"
+										href="{{$.Link}}?sort=downloadtimes&q={{$.Keyword}}&tab={{$.TabName}}&category={{$.Category}}&task={{$.Task}}&license={{$.License}}&recommend={{$.Recommend}}">{{.i18n.Tr "repo.issues.filter_sort.downloadtimes"}}</a>
+									<a class="{{if eq .SortType "moststars"}}active{{end}} item"
+										href="{{$.Link}}?sort=moststars&q={{$.Keyword}}&tab={{$.TabName}}&category={{$.Category}}&task={{$.Task}}&license={{$.License}}&recommend={{$.Recommend}}">{{.i18n.Tr "repo.issues.filter_sort.moststars"}}</a>
+									<a class="{{if eq .SortType "mostusecount"}}active{{end}} item"
+										href="{{$.Link}}?sort=mostusecount&q={{$.Keyword}}&tab={{$.TabName}}&category={{$.Category}}&task={{$.Task}}&license={{$.License}}&recommend={{$.Recommend}}">{{.i18n.Tr "repo.issues.filter_sort.mostusecount"}}</a>
 								</div>
 							</div>
 						</div>
@@ -141,85 +170,116 @@
 					{{end}}
 
 					<div class="ui row" style="clear: both;" id="dataset-base">
-						<el-checkbox v-model="checked" style="padding: 0.5rem 1rem;"  @change="handleCheckedChange" >仅显示平台推荐</el-checkbox>
+						<el-checkbox v-model="checked" style="padding: 0.5rem 1rem;" @change="handleCheckedChange">
+							仅显示平台推荐</el-checkbox>
 						<div class="ui two cards">
 							{{range $k, $v :=.Datasets}}
-							<div class="ui card" @click="gotoDataset('{{.Repo.Link}}/datasets')" style="cursor: pointer;box-shadow: 0px 4px 4px 0px rgba(232,232,232,0.6);border: 1px solid rgba(232, 232, 232, 1);">
+							<div class="ui card" @click="gotoDataset('{{.Repo.Link}}/datasets')"
+								style="cursor: pointer;box-shadow: 0px 4px 4px 0px rgba(232,232,232,0.6);border: 1px solid rgba(232, 232, 232, 1);">
 								<div class="content" style="border-bottom: none;">
-									<div class="repo_dataset_header" style="display: flex;align-items: center;justify-content: space-between;">
-										<a href="{{.Repo.Link}}/datasets" style="font-size: 12px;color: #3291F8;height: 24px;">{{.Repo.OwnerName}} / {{.Repo.Alias}}</a>
+									<div
+										style="font-size: 16px;color:#0366D6;font-family: SourceHanSansSC-medium;height: 34px;font-weight: bold;display: flex;align-items: center">
+										<span title="{{.Title}}" class="nowrap"
+											style="display: inline-block;">{{.Title}}</span>{{if .Recommend}}<img
+											src="/img/jian.svg" style="margin-left: 0.5rem;">{{end}}
 										{{if $.IsSigned}}
-										<span style="display: flex;align-items: center;justify-content: flex-end;cursor: pointer;" @click.stop="postSquareStar({{.ID}},'{{.Repo.Link}}/datasets',{{$k}})">
-											<span style="line-height: 1;color: #101010;margin-bottom: -2px;"><i class="ri-download-line" style="font-size: 1.3em;"></i></span>
-											<span style="line-height: 1;color: #101010;margin-right: 0.6rem;">{{.DownloadTimes}}</span>
+										<span
+											style="display: flex;align-items: center;justify-content: flex-end;cursor: pointer;font-size: 12px;font-weight: normal;flex: 1;margin-left: 1.5rem;"
+											@click.stop="postSquareStar({{.ID}},'{{.Repo.Link}}/datasets',{{$k}})">
+
 											<div style="line-height: 1;margin-right: 4px;margin-bottom: -2px;">
-												<svg width="1.4em" height="1.4em" viewBox="0 0 32 32" class="heart-stroke" :class='{stars_active:starActives[{{$k}}]}'><path d="M4.4 6.54c-1.761 1.643-2.6 3.793-2.36 6.056.24 2.263 1.507 4.521 3.663 6.534a29110.9 29110.9 0 0010.296 9.633l10.297-9.633c2.157-2.013 3.424-4.273 3.664-6.536.24-2.264-.599-4.412-2.36-6.056-1.73-1.613-3.84-2.29-6.097-1.955-1.689.25-3.454 1.078-5.105 2.394l-.4.319-.398-.319c-1.649-1.316-3.414-2.143-5.105-2.394a7.612 7.612 0 00-1.113-.081c-1.838 0-3.541.694-4.983 2.038z"></path></svg>
+												<svg width="1.4em" height="1.4em" viewBox="0 0 32 32"
+													class="heart-stroke" :class='{stars_active:starActives[{{$k}}]}'>
+													<path
+														d="M4.4 6.54c-1.761 1.643-2.6 3.793-2.36 6.056.24 2.263 1.507 4.521 3.663 6.534a29110.9 29110.9 0 0010.296 9.633l10.297-9.633c2.157-2.013 3.424-4.273 3.664-6.536.24-2.264-.599-4.412-2.36-6.056-1.73-1.613-3.84-2.29-6.097-1.955-1.689.25-3.454 1.078-5.105 2.394l-.4.319-.398-.319c-1.649-1.316-3.414-2.143-5.105-2.394a7.612 7.612 0 00-1.113-.081c-1.838 0-3.541.694-4.983 2.038z">
+													</path>
+												</svg>
 											</div>
 											<span style="line-height: 1;color: #101010;">${starItems[{{$k}}]}</span>
 										</span>
 										{{else}}
-										<span style="display: flex;align-items: center;justify-content: flex-end;cursor: pointer;">
-											<span style="line-height: 1;color: #101010;margin-bottom: -2px;"><i class="ri-download-line" style="font-size: 1.3em;"></i></span>
-											<span style="line-height: 1;color: #101010;margin-right: 0.6rem;">{{.DownloadTimes}}</span>
+										<span
+											style="display: flex;align-items: center;justify-content: flex-end;cursor: pointer;font-size: 12px;font-weight: normal;flex: 1;">
+
 											<div style="line-height: 1;margin-right: 4px;margin-bottom: -2px;">
-												<svg width="1.4em" height="1.4em" viewBox="0 0 32 32" class="heart-stroke" :class='{stars_active:starActives[{{$k}}]}'><path d="M4.4 6.54c-1.761 1.643-2.6 3.793-2.36 6.056.24 2.263 1.507 4.521 3.663 6.534a29110.9 29110.9 0 0010.296 9.633l10.297-9.633c2.157-2.013 3.424-4.273 3.664-6.536.24-2.264-.599-4.412-2.36-6.056-1.73-1.613-3.84-2.29-6.097-1.955-1.689.25-3.454 1.078-5.105 2.394l-.4.319-.398-.319c-1.649-1.316-3.414-2.143-5.105-2.394a7.612 7.612 0 00-1.113-.081c-1.838 0-3.541.694-4.983 2.038z"></path></svg>
+												<svg width="1.4em" height="1.4em" viewBox="0 0 32 32"
+													class="heart-stroke" :class='{stars_active:starActives[{{$k}}]}'>
+													<path
+														d="M4.4 6.54c-1.761 1.643-2.6 3.793-2.36 6.056.24 2.263 1.507 4.521 3.663 6.534a29110.9 29110.9 0 0010.296 9.633l10.297-9.633c2.157-2.013 3.424-4.273 3.664-6.536.24-2.264-.599-4.412-2.36-6.056-1.73-1.613-3.84-2.29-6.097-1.955-1.689.25-3.454 1.078-5.105 2.394l-.4.319-.398-.319c-1.649-1.316-3.414-2.143-5.105-2.394a7.612 7.612 0 00-1.113-.081c-1.838 0-3.541.694-4.983 2.038z">
+													</path>
+												</svg>
 											</div>
 											<span style="line-height: 1;color: #101010;">${starItems[{{$k}}]}</span>
 										</span>
 										{{end}}
+
 									</div>
-									<div  style="font-size: 16px;color:#0366D6;font-family: SourceHanSansSC-medium;height: 27px;font-weight: bold;display: flex;align-items: center"><span title="{{.Title}}" class="nowrap" style="display: inline-block;">{{.Title}}</span>{{if .Recommend}}<img src="/img/jian.svg" style="margin-left: 0.5rem;">{{end}}</div>
 									{{if or (.Category) (.Task) (.License)}}
 									<div style="font-size: 12px;margin-top: 5px;">
 										{{if .Category}}
 										{{$category := .Category}}
-										<a class="ui repo-topic label topic" href="{{$.Link}}?sort={{$.SortType}}&q={{$.Keyword}}&tab={{$.TabName}}&category={{.Category}}&task={{$.Task}}&license={{$.License}}">{{$.i18n.Tr (printf "dataset.category.%s" $category)}}</a>
+										<a class="ui repo-topic label topic"
+											href="{{$.Link}}?sort={{$.SortType}}&q={{$.Keyword}}&tab={{$.TabName}}&category={{.Category}}&task={{$.Task}}&license={{$.License}}">{{$.i18n.Tr (printf "dataset.category.%s" $category)}}</a>
 										{{end}}
 										{{if .Task}}
 										{{$task := .Task}}
-										<a class="ui repo-topic label topic" href="{{$.Link}}?sort={{$.SortType}}&q={{$.Keyword}}&tab={{$.TabName}}&category={{$.Category}}&task={{.Task}}&license={{$.License}}">{{$.i18n.Tr (printf "dataset.task.%s" $task)}}</a>
+										<a class="ui repo-topic label topic"
+											href="{{$.Link}}?sort={{$.SortType}}&q={{$.Keyword}}&tab={{$.TabName}}&category={{$.Category}}&task={{.Task}}&license={{$.License}}">{{$.i18n.Tr (printf "dataset.task.%s" $task)}}</a>
 										{{end}}
 										{{if .License}}
-										<a class="ui repo-topic label topic" href="{{$.Link}}?sort={{$.SortType}}&q={{$.Keyword}}&tab={{$.TabName}}&category={{$.Category}}&task={{$.Task}}&license={{.License}}">{{.License}}</a>
+										<a class="ui repo-topic label topic"
+											href="{{$.Link}}?sort={{$.SortType}}&q={{$.Keyword}}&tab={{$.TabName}}&category={{$.Category}}&task={{$.Task}}&license={{.License}}">{{.License}}</a>
 										{{end}}
 									</div>
 									{{end}}
-									<div class="description" style="-webkit-box-orient: vertical;-webkit-line-clamp: 2;display: -webkit-box;overflow: hidden;color:#999999;font-size: 14px;margin-top: 10px;">
+									<div class="description"
+										style="-webkit-box-orient: vertical;-webkit-line-clamp: 2;display: -webkit-box;overflow: hidden;color:#999999;font-size: 14px;margin-top: 10px;">
 										<p>{{.Description}}</p>
 									</div>
-									
+
 								</div>
 								<div class="extra content" style="border-top: none !important;">
 									<div style="display: flex;align-items: center;">
 										{{if eq .UserID 0}}
 										<a href="{{AppSubUrl}}/{{.Repo.OwnerName}}" title="{{.Repo.OwnerName}}">
-											<img class="ui avatar image" style="width: 22px;height:22px;"  src="/user/avatar/{{.Repo.OwnerName}}/-1">
+											<img class="ui avatar image" style="width: 22px;height:22px;"
+												src="/user/avatar/{{.Repo.OwnerName}}/-1">
 										</a>
 										{{else}}
 										<a href="{{AppSubUrl}}/{{.User.Name}}" title="{{.User.Name}}">
-											<img class="ui avatar image" style="width: 22px;height:22px;"  src="/user/avatar/{{.User.Name}}/-1">
+											<img class="ui avatar image" style="width: 22px;height:22px;"
+												src="/user/avatar/{{.User.Name}}/-1">
 										</a>
 										{{end}}
-										<span style="color: #999999;font-size: 14px;;">创建于：{{TimeSinceUnix1 .CreatedUnix}}</span>
+										<span
+											style="color: #999999;font-size: 12px;margin-left: 0.5rem;">{{TimeSinceUnixShort .CreatedUnix}}</span>
+										<span
+											style="display: flex;align-items: center;justify-content: center;margin: 0 1rem;"
+											title="{{$.i18n.Tr "repo.issues.filter_sort.citations"}}">
+											<i class="ri-link"></i>
+											<span
+												style="color: #101010; font-size: 12px;margin-left: 0.2rem;">{{.UseCount}}</span>
+										</span>
+										<span style=" display: flex;align-items: center;justify-content: center;"
+											title='{{$.i18n.Tr "repo.issues.filter_sort.downloadtimes"}}'>
+											<i class="ri-download-line"></i>
+											<span
+												style="color: #101010;font-size: 12px;margin-left: 0.2rem;">{{.DownloadTimes}}</span>
+										</span>
 									</div>
 								</div>
 							</div>
 							{{end}}
-							
+
 
 						</div>
 					</div>
 
 					<div id="app" style="margin-top: 2rem;">
 						<div class="center">
-							<el-pagination
-							background
-							@current-change="handleCurrentChange"
-							:current-page="page"
-							:page-sizes="[30]"
-							:page-size="30"
-							layout="total, sizes, prev, pager, next, jumper"
-							:total="{{.Page.Paginater.Total}}">
+							<el-pagination background @current-change="handleCurrentChange" :current-page="page"
+								:page-sizes="[30]" :page-size="30" layout="total, sizes, prev, pager, next, jumper"
+								:total="{{.Page.Paginater.Total}}">
 							</el-pagination>
 						</div>
 					</div>

templates/explore/repo_right.tmpl

@@ -1,4 +1,4 @@
-<a href="https://openi.org.cn/index.php?m=content&c=index&a=lists&catid=208" target="_blank"><img class="ui mini image" src="https://openi.org.cn/uploadfile/2022/0507/e8bdd42ed598f12.jpg" style="width:100%;"></a>
+<a href="{{.image_link}}" target="_blank"><img class="ui mini image" src="{{.image_url}}" style="width:100%;"></a>
 
 <div class="ui secondary pointing menu">
     <div class="active item">

templates/home.tmpl

@@ -1,6 +1,6 @@
 {{template "base/head_home" .}}
     <div class="ui vertical masthead secondary hometop segment">
-        <div class="ui container" style="position: relative;">
+        <div class="ui container" style="position: relative;">            
             <div class="ui center homebanner">
                 <h1 class="ui huge header">
                     {{.page_title}}
@@ -17,7 +17,7 @@
                 {{end}}
             </div>
             <div class="bannerpic"><img class="ui fluid image" src="/img/gitopeni-index-01.svg"></div>
-            <div id="homenews" class="ui container">
+            <div id="homenews">
                 <p>* {{.page_only_dynamic}}</p>
                 <div class="ui grid">
                     <div class="sixteen wide mobile twelve wide tablet ten wide computer column homenews">
@@ -35,33 +35,32 @@
 
     <!--组织-->
     <div class="ui container homeorg">
-        <div class="ui stackable grid">
+        <div class="ui stackable grid"> 
             <div class="sixteen wide tablet four wide computer column homeorg-tit">
-                <h2>{{.page_recommend_activity}}</h2>
-                <p><span class="ui text grey">{{.page_recommend_activity_desc}}</p>
+                <h2>{{.page_recommend_org}}</h2>
+                <p><span class="ui text grey">{{.page_recommend_org_desc}}&nbsp;</span><a href="{{.RecommendURL}}">{{.page_recommend_org_commit}}</a></p>
+                <a href="{{AppSubUrl}}/explore/organizations" class="circular ui primary basic button">{{.page_recommend_org_more}} <i class="arrow circle right icon"></i></a>
             </div>
             <div class="sixteen wide tablet twelve wide computer column">
-                <div class="event-list">
-                    <div class="swiper-wrapper" id="recommendactivity">
-                    
+                <div class="homeorg-list">
+                    <div class="swiper-wrapper" id="recommendorg">
                         
                     </div>
                     <div class="swiper-pagination"></div>
+                    
                 </div>
             </div>
 
             <div class="sixteen wide tablet four wide computer column homeorg-tit">
-                <h2>{{.page_recommend_org}}</h2>
-                <p><span class="ui text grey">{{.page_recommend_org_desc}}&nbsp;</span><a href="{{.RecommendURL}}">{{.page_recommend_org_commit}}</a></p>
-                <a href="{{AppSubUrl}}/explore/organizations" class="circular ui primary basic button">{{.page_recommend_org_more}} <i class="arrow circle right icon"></i></a>
+                <h2>{{.page_recommend_activity}}</h2>
+                <p><span class="ui text grey">{{.page_recommend_activity_desc}}</p>
             </div>
             <div class="sixteen wide tablet twelve wide computer column">
-                <div class="homeorg-list">
-                    <div class="swiper-wrapper" id="recommendorg">
+                <div class="event-list">
+                    <div class="swiper-wrapper" id="recommendactivity">                    
                         
                     </div>
                     <div class="swiper-pagination"></div>
-                    
                 </div>
             </div>
         </div>
@@ -87,56 +86,112 @@
         
     </div>
 
+    <div class="ui vertical masthead secondary c2net segment">
+        <div class="ui container">
+            <div class="ui center am-pt-30 am-pb-30">
+                <h2>智算网络</h2>
+                <p><span class="ui text grey">人工智能算力网络推进联盟已接入10家智算中心，算力总规模1542P</p>
+            </div>
+
+            <div id="app" v-cloak>
+				<!--数据
+				<div class="aiData">
+					<p>完成AI任务<br><strong id="completed_task">1716</strong></p>
+					<p>运行AI任务<br><strong id="running_task">120</strong></p>
+					<p>等待AI任务<br><strong id="wait_task">80</strong></p>
+				</div>-->
+                <!--底座-->
+                <div class="rotation3D-baseMap"></div>
+                <!--旋转3D-->
+                <div id="rotation3D" class="rotation3D">
+                    <button class="center">中心</button>
+					
+                    <div class="itemList">
+                        <div class="rotation3D__item" :class="item.type" v-for="item in itemList">
+                            <div class="scale">
+                                <div class="baseImg"></div>
+                                <div class="cont">
+                                    <i class="iconfont" :class="item.icon"></i>
+                                    <p></p>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="lineList">
+                        <div class="rotation3D__line" v-for="item in itemList" :class="item.type">
+                            <div v-if="item.type=='blue'" class="pos">
+                                <svg width="50" height="400">
+                                    <path id="path1" d="M0 400, 0 0" stroke-dasharray="5,10"/>
+                                </svg>
+								<div class="dot dot1 ri-arrow-left-s-line"><span></span></div>
+                            </div>
+                            <div v-if="item.type=='yellow'" class="pos">
+                                <svg width="10" height="400">
+                                    <path id="path2" d="M0 400, 0 0" stroke-dasharray="5,10"/>
+                                </svg>
+                                <div class="dot dot2"><i class="el-icon-close"></i></div>
+                            </div>
+                            <div v-if="item.type=='green'" class="pos">
+                                <svg width="50" height="400">
+                                    <path id="path1" d="M0 400, 0 0" stroke-dasharray="5,10"/>
+                                </svg>
+                                <div class="dot dot1 ri-arrow-left-s-line"></div>
+                            </div>
+                        </div>
+                    </div>					
+                </div>
+            </div><!--rotation3D end--> 
+        </div>
+    </div>
 
     <a name="fourth"></a>
     <div class="ui container i-env">
         
         <div class="ui center am-pb-30">
-            <div class="leftline03"></div>
             <h2>{{.page_dev_env}}</h2>
             <p><span class="ui text grey">{{.page_dev_env_desc}}</p>
         </div>
         <div class="ui four doubling cards">
             <div class="card">
                 <div class="image">
-                    <img src="/img/i-pic-01.svg">
+                    <img src="/img/i-pic-01.jpg">
                 </div>
                 <div class="content">
                     <h3 class="ui centered small header">{{.page_dev_env_desc_title}}</h3>
-                    <div class="description">
+                    <div class="description ui text grey">
                     {{.page_dev_env_desc_desc}}
                     </div>
                 </div>
             </div>
             <div class="card">
                 <div class="image">
-                    <img src="/img/i-pic-02.svg">
+                    <img src="/img/i-pic-02.jpg">
                 </div>
                 <div class="content">
                     <h3 class="ui centered small header">{{.page_dev_env_desc1_title}}</h3>
-                    <div class="description">
+                    <div class="description ui text grey">
                     {{.page_dev_env_desc1_desc}}
                     </div>
                 </div>
             </div>
                 <div class="card">
                 <div class="image">
-                    <img src="/img/i-pic-03.svg">
+                    <img src="/img/i-pic-03.jpg">
                 </div>
                 <div class="content">
                     <h3 class="ui centered small header">{{.page_dev_env_desc2_title}}</h3>
-                    <div class="description">
+                    <div class="description ui text grey">
                     {{.page_dev_env_desc2_desc}}
                     </div>
                 </div>
             </div>
                 <div class="card">
                 <div class="image">
-                    <img src="/img/i-pic-04.svg">
+                    <img src="/img/i-pic-04.jpg">
                 </div>
                 <div class="content">
                     <h3 class="ui centered small header">{{.page_dev_env_desc3_title}}</h3>
-                    <div class="description">
+                    <div class="description ui text grey">
                     {{.page_dev_env_desc3_desc}}
                     </div>
                 </div>
@@ -172,8 +227,8 @@
         </div>
     </div>
     <div class="am-mt-30"></div>
-<script src="/self/js/jquery.min.js" type="text/javascript"></script>
-<script src="/home/home.js?v={{MD5 AppVer}}" type="text/javascript"></script>
+    <script src="/self/js/jquery.min.js" type="text/javascript"></script>	
+    <script src="/home/home.js?v={{MD5 AppVer}}" type="text/javascript"></script>
 
 
 {{template "base/footer" .}}

templates/org/member/members.tmpl

@@ -9,14 +9,14 @@
 			<div class="ui sixteen wide computer column list">
 				{{ range .Members}}
 					<div class="item ui grid">
-						<div class="three wide mobile two wide tablet two wide computer column">
+						<div class="three wide mobile two wide tablet one wide computer column">
 							<img class="ui avatar" src="{{.SizedRelAvatarLink 48}}">
 						</div>
 						<div class="seven wide mobile three wide tablet three wide computer column">
 							<div class="meta"><a href="{{.HomeLink}}">{{.Name}}</a></div>
 							<div class="meta">{{.FullName}}</div>
 						</div>
-						<div class="ui four wide column center tablet only computer only">
+						<div class="ui three wide tablet four wide computer column center tablet only computer only">
 							<div class="meta">
 								{{$.i18n.Tr "org.members.membership_visibility"}}
 							</div>

templates/org/navber.tmpl

@@ -48,7 +48,7 @@
 </style>
 
 <div class="row">
-	<div class="ui secondary tiny pointing borderless menu center aligned grid mbom">
+	<div class="ui secondary pointing borderless menu center aligned grid mbom">
 		{{with .Org}}
 		<a class="{{if $.PageIsOrgHome}}active{{end}} item" href="{{.HomeLink}}">
 			{{svg "octicon-home" 16}}&nbsp;{{$.i18n.Tr "org.home"}}

templates/repo/attachment/upload.tmpl

@@ -1,60 +1,58 @@
-
 {{template "base/head" .}}
 <div class="repository">
-{{template "repo/header" .}}
+    {{template "repo/header" .}}
     <div class="ui container">
         <input type="hidden" id="postPath" value="{{.Link}}">
         <div style="width: 80%;margin: auto;">
-          <h4 class="ui top attached header">
-            {{$.i18n.Tr "dataset.upload_dataset_file"}}
-          </h4>
-          <div class="ui attached segment" style="padding: 2em 3em;">
-              <div class="ui form" id="dataset-base">
-                  <el-form  label-width="140px">
-                      {{.CsrfTokenHtml}}
-                      <el-form-item label='{{$.i18n.Tr "dataset.dataset_available_clusters"}}:' prop="title">
-                          <el-button :class="{active:type==0}" :disabled="clusterFlag" size="small" style="margin: 0;border-radius: 0.28571429rem 0 0 0.28571429rem;" @click="uploadGpu">CPU/GPU</el-button>
-                          <el-button :class="{active:type==1}" :disabled="clusterFlag" size="small" style="margin: 0 0 0 -4px;border-radius: 0 0.28571429rem 0.28571429rem 0;" @click="uploadNpu">NPU</el-button>
-                      </el-form-item>
-                      <el-form-item label='{{$.i18n.Tr "dataset.file_description"}}:' prop="description">
-                          <el-input type="textarea" :rows="3" maxlength="255" placeholder="{{$.i18n.Tr "repo.modelarts.train_job.new_place"}}" v-model="desc"></el-input>
-                      </el-form-item>
-                      <el-form-item label='{{$.i18n.Tr "dataset.data_upload"}}:' prop="category">
+            <h4 class="ui top attached header">
+                {{$.i18n.Tr "dataset.upload_dataset_file"}}
+            </h4>
+            <div class="ui attached segment" style="padding: 2em 3em;">
+                <div class="ui form" id="dataset-base">
+                    <el-form label-width="140px">
+                        {{.CsrfTokenHtml}}
+                        <el-form-item label='{{$.i18n.Tr "dataset.dataset_available_clusters"}}:' prop="title">
+                            <el-button :class="{active:type==0}" :disabled="clusterFlag" size="small"
+                                style="margin: 0;border-radius: 0.28571429rem 0 0 0.28571429rem;" @click="uploadGpu">
+                                CPU/GPU</el-button>
+                            <el-button :class="{active:type==1}" :disabled="clusterFlag" size="small"
+                                style="margin: 0 0 0 -4px;border-radius: 0 0.28571429rem 0.28571429rem 0;"
+                                @click="uploadNpu">NPU</el-button>
+                        </el-form-item>
+                        <el-form-item label='{{$.i18n.Tr "dataset.file_description"}}:' prop="description">
+                            <el-input type="textarea" :rows="3" maxlength="255"
+                                placeholder="{{$.i18n.Tr "repo.modelarts.train_job.new_place"}}" v-model="desc">
+                            </el-input>
+                        </el-form-item>
+                        <el-form-item label='{{$.i18n.Tr "dataset.data_upload"}}:' prop="category">
                             <minio-uploader :uploadtype="type" :desc="desc" @setcluster="setcluster"></minio-uploader>
-                      </el-form-item>        
-                        <div style='display:none;'
-                        id="minioUploader-params"
-                        data-uuid="{{.uuid}}"
-                        data-add-url="{{.Repository.OwnerName}}/attachments/add"
-                        data-accepts="{{.AttachmentAllowedTypes}}"
-                        data-remove-url="{{AppSubUrl}}/attachments/delete"
-                        data-csrf="{{.CsrfToken}}"
-                        dataset-id={{.dataset.ID}}
-                        data-max-file="100"
-                        data-dataset-id="{{.dataset.ID}}"
-                        data-max-size="{{.AttachmentMaxSize}}"
-                        data-default-message="{{.i18n.Tr "dropzone.default_message"}}"
-                        data-invalid-input-type="{{.i18n.Tr "dropzone.invalid_input_type"}}"
-                        data-file-too-big="{{.i18n.Tr "dropzone.file_too_big"}}"
-                        data-remove-file="{{.i18n.Tr "dropzone.remove_file"}}"
-                        data-file-status='{{.i18n.Tr "dropzone.file_status"}}'
-                        data-file-init-status='{{.i18n.Tr "dropzone.file_init_status"}}'
-                        data-waitting-uploading='{{.i18n.Tr "dropzone.waitting_uploading"}}'
-                        data-md5-computing='{{.i18n.Tr "dropzone.md5_computing"}}'
-                        data-obs-connecting='{{.i18n.Tr "dropzone.obs-connecting"}}'
-                        data-loading-file='{{.i18n.Tr "dropzone.loading_file"}}'
-                        data-upload-complete='{{.i18n.Tr "dropzone.upload_complete"}}'
-                        data-uploading='{{.i18n.Tr "dropzone.uploading"}}'
-                        data-failed='{{.i18n.Tr "dropzone.failed"}}'
-                        data-repopath='{{AppSubUrl}}{{$.RepoLink}}/datasets'
-                        data-cancel='{{.i18n.Tr "cancel"}}'
-                        data-upload='{{.i18n.Tr "dataset.dataset_upload"}}'
-                        >
+                        </el-form-item>
+                        <div style='display:none;' id="minioUploader-params" data-uuid="{{.uuid}}"
+                            data-add-url="{{.Repository.OwnerName}}/attachments/add"
+                            data-accepts="{{.AttachmentAllowedTypes}}"
+                            data-remove-url="{{AppSubUrl}}/attachments/delete" data-csrf="{{.CsrfToken}}"
+                            dataset-id={{.dataset.ID}} data-max-file="100" data-dataset-id="{{.dataset.ID}}"
+                            data-max-size="{{.AttachmentMaxSize}}"
+                            data-default-message="{{.i18n.Tr "dropzone.default_dataset_message"}}"
+                            data-invalid-input-type="{{.i18n.Tr "dropzone.invalid_input_type"}}"
+                            data-file-too-big="{{.i18n.Tr "dropzone.file_too_big"}}"
+                            data-remove-file="{{.i18n.Tr "dropzone.remove_file"}}"
+                            data-file-status='{{.i18n.Tr "dropzone.file_status"}}'
+                            data-file-init-status='{{.i18n.Tr "dropzone.file_init_status"}}'
+                            data-waitting-uploading='{{.i18n.Tr "dropzone.waitting_uploading"}}'
+                            data-md5-computing='{{.i18n.Tr "dropzone.md5_computing"}}'
+                            data-obs-connecting='{{.i18n.Tr "dropzone.obs-connecting"}}'
+                            data-loading-file='{{.i18n.Tr "dropzone.loading_file"}}'
+                            data-upload-complete='{{.i18n.Tr "dropzone.upload_complete"}}'
+                            data-uploading='{{.i18n.Tr "dropzone.uploading"}}'
+                            data-failed='{{.i18n.Tr "dropzone.failed"}}'
+                            data-repopath='{{AppSubUrl}}{{$.RepoLink}}/datasets' data-cancel='{{.i18n.Tr "cancel"}}'
+                            data-upload='{{.i18n.Tr "dataset.dataset_upload"}}'>
                         </div>
                         <div id="datasetId" datasetId="{{.datasetId}}"></div>
-                  </el-form>
-              </div>
-          </div>
+                    </el-form>
+                </div>
+            </div>
         </div>
         <div style="width: 80%;margin: auto;padding-top: 2em;">
             <!-- <p>说明：<br>
@@ -62,10 +60,11 @@
             - 云脑1提供 <span class="text blue">CPU / GPU</span> 资源，云脑2提供 <span class="text blue">Ascend NPU</span> 资源；调试使用的数据集也需要上传到对应的环境。
             </p> -->
             <p style="color: 505559;">{{$.i18n.Tr "dataset.illustrate"}}：</p>
-            <p style="line-height: 1.5;color: #101010;">{{$.i18n.Tr "dataset.illustrate.only"}}<span class="text red">&nbsp;{{$.i18n.Tr "dataset.illustrate.zip"}}&nbsp;</span>{{$.i18n.Tr "dataset.illustrate.fisrt_end"}};</br>
+            <p style="line-height: 1.5;color: #101010;">{{$.i18n.Tr "dataset.illustrate.only"}}<span
+                    class="text red">&nbsp;{{$.i18n.Tr "dataset.illustrate.zip"}}&nbsp;</span>{{$.i18n.Tr "dataset.illustrate.fisrt_end"}};</br>
                 {{$.i18n.Tr "dataset.dataset_explain"}}</p>
 
         </div>
     </div>
 </div>
-{{template "base/footer" .}}
+{{template "base/footer" .}}

templates/repo/cloudbrain/new.tmpl

@@ -127,6 +127,7 @@
             </div>
             <form id="form_id" class="ui form" action="{{.Link}}" method="post">
                 {{.CsrfTokenHtml}}
+                <input type="hidden" name='isBranches' value="{{.Branches}}">
                 <h3 class="ui top attached header">
                     {{.i18n.Tr "repo.cloudbrain.new"}}
                 </h3>
@@ -185,7 +186,8 @@
                     <input id="store_category" type="hidden" name="get_benchmark_category">
                     <div class="inline required field">
                         <label>{{.i18n.Tr "repo.modelarts.code_version"}}</label>
-                        <select class="ui dropdown width80 left2" id="code_version" name="branch_name">
+                        <select class="ui dropdown width80 left2 {{if not .Branches}}error{{end}}" id="code_version"
+                            name="branch_name">
                             {{if .branch_name}}
                             <option name="branch_name" value="{{.branch_name}}">{{.branch_name}}</option>
                             {{range $k, $v :=.Branches}}
@@ -213,19 +215,6 @@
                         </select>
                     </div>
 
-                    <!-- <div class="inline required field" style="position: relative;">
-                        <label>{{.i18n.Tr "cloudbrain.mirror"}}</label>
-                        <input type="text" list="cloudbrain_image" placeholder="{{.i18n.Tr "cloudbrain.choose_mirror"}}" name="image" required autofocus maxlength="255">
-                        <i class="times circle outline icon icons" style="visibility: hidden;" onclick="clearValue()"></i>
-                        <datalist class="ui search" id="cloudbrain_image" style='width:385px;' name="image">
-                            {{range .images}}
-                                <option name="image" value="{{.Place}}">{{.PlaceView}}</option>
-                            {{end}}
-                            {{range .public_images}}
-                                <option name="image" value="{{.Place}}">{{.PlaceView}}</option>
-                            {{end}}
-                        </datalist>
-                    </div> -->
                     <div id="images-new-cb">
 
                     </div>
@@ -298,10 +287,6 @@
 <script>
     let form = document.getElementById('form_id');
 
-    // let inputs = document.querySelectorAll('input[list]');
-    // inputs[0].addEventListener('change', function() {
-    //     $(".icon.icons").css("visibility","visible")
-    // });
 
     $('#messageInfo').css('display', 'none')
     function clearValue() {
@@ -381,6 +366,9 @@
     })
 
     $('.ui.green.button').click(function () {
+        if (!$('input[name="isBranches"]').val()) {
+            return false
+        }
         selected_value = $("#cloudbrain_benchmark_category").val()
         $('#store_category').attr("value", selected_value)
     })

templates/repo/cloudbrain/trainjob/new.tmpl

@@ -1,71 +1,77 @@
 {{template "base/head" .}}
 <style>
+    .unite {
+        font-family: SourceHanSansSC-medium !important;
+        color: rgba(16, 16, 16, 100) !important;
+    }
+
+    .title {
+        font-size: 16px !important;
+        padding-left: 3rem !important;
+    }
+
+    .min_title {
+        font-size: 14px !important;
+        padding-left: 6rem !important;
+        margin-bottom: 2rem !important;
+
+    }
+
+    .width {
+        width: 100% !important;
+    }
+
+    .width80 {
+        width: 80.7% !important;
+        margin-left: 10px;
+    }
+
+    .width806 {
+        width: 80.6% !important;
+        margin-left: -2px;
+    }
+
+    .width85 {
+        width: 85% !important;
+        margin-left: 4.5rem !important;
+    }
 
-.unite{
-    font-family: SourceHanSansSC-medium !important;
-    color: rgba(16, 16, 16, 100) !important;
-}
-
-.title{
-    font-size: 16px !important;
-    padding-left: 3rem !important;
-}
-.min_title{
-    font-size: 14px !important;
-    padding-left: 6rem !important;
-    margin-bottom: 2rem !important;
-
-}
-.width{
-    width:100% !important;
-}
-.width80{
-    width: 80.7% !important;
-    margin-left: 10px;
-}
-.width806{
-    width: 80.6% !important;
-    margin-left: -2px;
-}
-.width85{
-    width: 85% !important;
-    margin-left: 4.5rem !important;
-}
-.width81{
-    margin-left: 1.5rem !important;
-    width: 81% !important;
-}
-
-.add{font-size: 18px;
-    padding: 0.5rem;
-    border: 1px solid rgba(187, 187, 187, 100);
-    border-radius: 0px 5px 5px 0px;
-    line-height: 21px;
-    text-align: center;
-    color: #C2C7CC;
-}
-.min{
-    font-size: 18px;
-    padding: 0.5rem;
-    border: 1px solid rgba(187, 187, 187, 100);
-    border-radius: 5px 0px 0px 5px;
-    line-height: 21px;
-    text-align: center;
-    color: #C2C7CC;
-}
+    .width81 {
+        margin-left: 1.5rem !important;
+        width: 81% !important;
+    }
+
+    .add {
+        font-size: 18px;
+        padding: 0.5rem;
+        border: 1px solid rgba(187, 187, 187, 100);
+        border-radius: 0px 5px 5px 0px;
+        line-height: 21px;
+        text-align: center;
+        color: #C2C7CC;
+    }
 
+    .min {
+        font-size: 18px;
+        padding: 0.5rem;
+        border: 1px solid rgba(187, 187, 187, 100);
+        border-radius: 5px 0px 0px 5px;
+        line-height: 21px;
+        text-align: center;
+        color: #C2C7CC;
+    }
 </style>
 <!-- <div class="ui page dimmer">
     <div class="ui text loader">{{.i18n.Tr "loading"}}</div>
 </div> -->
 <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 id="loadingPage">
+        <div class="rect1"></div>
+        <div class="rect2"></div>
+        <div class="rect3"></div>
+        <div class="rect4"></div>
+        <div class="rect5"></div>
+    </div>
 </div>
 <div class="repository">
     {{template "repo/header" .}}
@@ -86,68 +92,82 @@
                     <label style="font-weight: normal;">{{.i18n.Tr "cloudbrain.compute_resource"}}</label>
                     <div class="ui blue mini menu compact selectcloudbrain">
                         <a class="active item" href="{{.RepoLink}}/cloudbrain/train-job/create">
-                            <svg class="svg" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="16" height="16">
-                                <path fill="none" d="M0 0h24v24H0z"/>
-                                <path d="M3 2.992C3 2.444 3.445 2 3.993 2h16.014a1 1 0 0 1 .993.992v18.016a.993.993 0 0 1-.993.992H3.993A1 1 0 0 1 3 21.008V2.992zM19 11V4H5v7h14zm0 2H5v7h14v-7zM9 6h6v2H9V6zm0 9h6v2H9v-2z"/>
+                            <svg class="svg" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="16"
+                                height="16">
+                                <path fill="none" d="M0 0h24v24H0z" />
+                                <path
+                                    d="M3 2.992C3 2.444 3.445 2 3.993 2h16.014a1 1 0 0 1 .993.992v18.016a.993.993 0 0 1-.993.992H3.993A1 1 0 0 1 3 21.008V2.992zM19 11V4H5v7h14zm0 2H5v7h14v-7zM9 6h6v2H9V6zm0 9h6v2H9v-2z" />
                             </svg>
                             CPU/GPU
                         </a>
                         <a class="item" href="{{.RepoLink}}/modelarts/train-job/create">
-                            <svg class="svg" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="16" height="16">
-                                <path fill="none" d="M0 0h24v24H0z"/>
-                                <path d="M3 2.992C3 2.444 3.445 2 3.993 2h16.014a1 1 0 0 1 .993.992v18.016a.993.993 0 0 1-.993.992H3.993A1 1 0 0 1 3 21.008V2.992zM19 11V4H5v7h14zm0 2H5v7h14v-7zM9 6h6v2H9V6zm0 9h6v2H9v-2z"/>
+                            <svg class="svg" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="16"
+                                height="16">
+                                <path fill="none" d="M0 0h24v24H0z" />
+                                <path
+                                    d="M3 2.992C3 2.444 3.445 2 3.993 2h16.014a1 1 0 0 1 .993.992v18.016a.993.993 0 0 1-.993.992H3.993A1 1 0 0 1 3 21.008V2.992zM19 11V4H5v7h14zm0 2H5v7h14v-7zM9 6h6v2H9V6zm0 9h6v2H9v-2z" />
                             </svg>
                             Ascend NPU</a>
                     </div>
                 </div>
                 <div class="required unite min_title inline field">
                     <label style="font-weight: normal;">{{.i18n.Tr "repo.modelarts.train_job.job_name"}}</label>
-                    <input style="width: 60%;" name="display_job_name" id="display_job_name" placeholder={{.i18n.Tr "repo.modelarts.train_job.job_name"}} value="{{.display_job_name}}" tabindex="3" onkeyup="this.value=this.value.replace(/[, ]/g,'')" autofocus required maxlength="64">
+                    <input style="width: 60%;" name="display_job_name" id="display_job_name"
+                        placeholder={{.i18n.Tr "repo.modelarts.train_job.job_name"}} value="{{.display_job_name}}"
+                        tabindex="3" onkeyup="this.value=this.value.replace(/[, ]/g,'')" autofocus required
+                        maxlength="64">
                     <span class="tooltips" style="display: block;">{{.i18n.Tr "cloudbrain.job_name_rule"}}</span>
                 </div>
-                
+
                 <div class="unite min_title inline field">
-                    <label style="font-weight: normal;" for="description">{{.i18n.Tr "repo.modelarts.train_job.description"}}&nbsp;&nbsp;</label>
-                    <textarea style="width: 80%;" 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)" onkeyup="this.value=this.value.substring(0, 255)"></textarea>
+                    <label style="font-weight: normal;"
+                        for="description">{{.i18n.Tr "repo.modelarts.train_job.description"}}&nbsp;&nbsp;</label>
+                    <textarea style="width: 80%;" 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)"
+                        onkeyup="this.value=this.value.substring(0, 255)"></textarea>
                 </div>
                 <div class="ui divider"></div>
 
                 <h4 class="unite title ui header ">{{.i18n.Tr "repo.modelarts.train_job.parameter_setting"}}:</h4>
-                
+
 
                 <div class="required unite min_title inline field">
-                        <label style="font-weight: normal;">{{.i18n.Tr "repo.modelarts.code_version"}}</label>
-                        <select class="ui dropdown width80 left2" id="code_version" name="branch_name">
-                            {{if .branch_name}}
-                                <option name="branch_name" value="{{.branch_name}}">{{.branch_name}}</option>
-                                {{range $k, $v :=.Branches}}
-                                    {{ if ne $v $.branch_name }}
-                                    <option name="branch_name" value="{{$v}}">{{$v}}</option>
-                                    {{end}}
-                                {{end}}
-                            {{else}}
-                                <option name="branch_name" value="{{.branchName}}">{{.branchName}}</option>
-                                {{range $k, $v :=.Branches}}
-                                    {{ if ne $v $.branchName }}
-                                    <option name="branch_name" value="{{$v}}">{{$v}}</option>
-                                    {{end}}
-                                {{end}}
-                            {{end}}
-                        </select>
+                    <label style="font-weight: normal;">{{.i18n.Tr "repo.modelarts.code_version"}}</label>
+                    <select class="ui dropdown width80 left2" id="code_version" name="branch_name">
+                        {{if .branch_name}}
+                        <option name="branch_name" value="{{.branch_name}}">{{.branch_name}}</option>
+                        {{range $k, $v :=.Branches}}
+                        {{ if ne $v $.branch_name }}
+                        <option name="branch_name" value="{{$v}}">{{$v}}</option>
+                        {{end}}
+                        {{end}}
+                        {{else}}
+                        <option name="branch_name" value="{{.branchName}}">{{.branchName}}</option>
+                        {{range $k, $v :=.Branches}}
+                        {{ if ne $v $.branchName }}
+                        <option name="branch_name" value="{{$v}}">{{$v}}</option>
+                        {{end}}
+                        {{end}}
+                        {{end}}
+                    </select>
                 </div>
 
                 <div class="inline required field" style="display: none;">
                     <label>{{.i18n.Tr "cloudbrain.task_type"}}</label>
-                    <select id="cloudbrain_job_type" class="ui search dropdown" placeholder="选择任务类型" style='width:385px' name="job_type">
+                    <select id="cloudbrain_job_type" class="ui search dropdown" placeholder="选择任务类型" style='width:385px'
+                        name="job_type">
                         <option name="job_type" value="TRAIN">TRAIN</option>
                     </select>
                 </div>
 
                 <div class="required unite min_title inline field">
                     <label style="font-weight: normal;">{{.i18n.Tr "cloudbrain.gpu_type"}}</label>
-                    <select id="cloudbrain_gpu_type" class="ui search width806 dropdown" placeholder="选择GPU类型" style='width:385px' name="gpu_type">
+                    <select id="cloudbrain_gpu_type" class="ui search width806 dropdown" placeholder="选择GPU类型"
+                        style='width:385px' name="gpu_type">
                         {{range .train_gpu_types}}
-                            <option value="{{.Queue}}">{{.Value}}</option>
+                        <option value="{{.Queue}}">{{.Value}}</option>
                         {{end}}
                     </select>
                 </div>
@@ -171,65 +191,75 @@
                 </div>
 
                 <div class="inline unite min_title field required">
-                        <label style="font-weight: normal;">{{.i18n.Tr "repo.modelarts.train_job.start_file"}}</label>
-                        {{if .bootFile}}
-                            <input style="width: 48.5%;" name="boot_file" id="trainjob_boot_file" value="{{.bootFile}}" tabindex="3" autofocus required maxlength="255" >
-                        {{else}}
-                            <input style="width: 48.5%;" name="boot_file" id="trainjob_boot_file" value="" tabindex="3" autofocus required maxlength="255" >
-                        {{end}}
-                        <span>
-                            <i class="question circle icon  link" data-content={{.i18n.Tr "repo.modelarts.train_job.boot_file_helper"}} data-position="right center" data-variation="mini"></i>
-                        </span>
-                        <a  href="https://git.openi.org.cn/OpenIOSSG/MNIST_PytorchExample_GPU" target="_blank">查看样例</a>
+                    <label style="font-weight: normal;">{{.i18n.Tr "repo.modelarts.train_job.start_file"}}</label>
+                    {{if .bootFile}}
+                    <input style="width: 48.5%;" name="boot_file" id="trainjob_boot_file" value="{{.bootFile}}"
+                        tabindex="3" autofocus required maxlength="255">
+                    {{else}}
+                    <input style="width: 48.5%;" name="boot_file" id="trainjob_boot_file" value="" tabindex="3"
+                        autofocus required maxlength="255">
+                    {{end}}
+                    <span>
+                        <i class="question circle icon  link"
+                            data-content={{.i18n.Tr "repo.modelarts.train_job.boot_file_helper"}}
+                            data-position="right center" data-variation="mini"></i>
+                    </span>
+                    <a href="https://git.openi.org.cn/OpenIOSSG/MNIST_PytorchExample_GPU" target="_blank">查看样例</a>
                 </div>
 
-                
+
                 {{template "custom/select_dataset_train" .}}
-                <span class="tooltips" style="margin-left: 11.5rem;margin-bottom: 2rem;">训练脚本存储在/code中，数据集存储在/dataset中，训练输出请存储在/model中以供后续下载。</span>
+                <span class="tooltips"
+                    style="margin-left: 11.5rem;margin-bottom: 2rem;">训练脚本存储在/code中，数据集存储在/dataset中，训练输出请存储在/model中以供后续下载。</span>
                 <div class="inline unite min_title field">
                     <label style="font-weight: normal;">{{.i18n.Tr "repo.modelarts.train_job.run_parameter"}}</label>
-                    <span id="add_run_para" style="margin-left: 0.5rem;cursor:pointer;color: rgba(3, 102, 214, 100);font-size: 14px;line-height: 26px;font-family: SourceHanSansSC-medium;"><i class="plus square outline icon"></i>{{.i18n.Tr "repo.modelarts.train_job.add_run_parameter"}}</span>
-                    <input  id="store_run_para" type="hidden" name="run_para_list">
+                    <span id="add_run_para"
+                        style="margin-left: 0.5rem;cursor:pointer;color: rgba(3, 102, 214, 100);font-size: 14px;line-height: 26px;font-family: SourceHanSansSC-medium;"><i
+                            class="plus square outline icon"></i>{{.i18n.Tr "repo.modelarts.train_job.add_run_parameter"}}</span>
+                    <input id="store_run_para" type="hidden" name="run_para_list">
                     <div class="dynamic field" style="margin-top: 1rem;">
-                    {{if .params}}
+                        {{if .params}}
                         {{if ne 0 (len .params)}}
-                            {{range $k ,$v := .params}}
-                                <div class="two fields width85" id="para{{$k}}">
-                                    <div class="field">
-                                        <input type="text" name="shipping_first-name" value={{$v.Label}} required>
-                                    </div>
-                                    <div class="field">
-                                        <input type="text" name="shipping_last-name" value={{$v.Value}} required>
-                                    </div>
-                                    <span>
-                                        <i class="trash icon"></i>
-                                    </span>
-
-                                </div>
-                            {{end}}
+                        {{range $k ,$v := .params}}
+                        <div class="two fields width85" id="para{{$k}}">
+                            <div class="field">
+                                <input type="text" name="shipping_first-name" value={{$v.Label}} required>
+                            </div>
+                            <div class="field">
+                                <input type="text" name="shipping_last-name" value={{$v.Value}} required>
+                            </div>
+                            <span>
+                                <i class="trash icon"></i>
+                            </span>
+
+                        </div>
+                        {{end}}
+                        {{end}}
                         {{end}}
-                    {{end}}
                     </div>
                 </div>
 
-               <div class="required inline unite min_title field">
+                <div class="required inline unite min_title field">
                     <label style="font-weight: normal;">{{.i18n.Tr "cloudbrain.resource_specification"}}</label>
-                    <select id="cloudbrain_resource_spec" class="ui search dropdown" placeholder="选择资源规格" style='width:385px' name="resource_spec_id">
+                    <select id="cloudbrain_resource_spec" class="ui search dropdown" placeholder="选择资源规格"
+                        style='width:385px' name="resource_spec_id">
                         {{range .train_resource_specs}}
-                            <option name="resource_spec_id" value="{{.Id}}">GPU数：{{.GpuNum}}，CPU数：{{.CpuNum}}，内存(MB)：{{.MemMiB}}，共享内存(MB)：{{.ShareMemMiB}}</option>
+                        <option name="resource_spec_id" value="{{.Id}}">
+                            GPU数：{{.GpuNum}}，CPU数：{{.CpuNum}}，内存(MB)：{{.MemMiB}}，共享内存(MB)：{{.ShareMemMiB}}</option>
                         {{end}}
                     </select>
                 </div>
-                
+
                 <div class="inline unite min_title field">
                     <button class="ui create_train_job green button">
-                    {{.i18n.Tr "repo.cloudbrain.new"}}
+                        {{.i18n.Tr "repo.cloudbrain.new"}}
                     </button>
-                    <a class="ui button" href="{{.RepoLink}}/modelarts/train-job">{{.i18n.Tr "repo.cloudbrain.cancel"}}</a>
+                    <a class="ui button"
+                        href="{{.RepoLink}}/modelarts/train-job">{{.i18n.Tr "repo.cloudbrain.cancel"}}</a>
                 </div>
-                
+
                 <!-- 模态框 -->
-                
+
             </form>
         </div>
     </div>
@@ -246,202 +276,210 @@
         .tab();
 
     let sever_num = $('#trainjob_work_server_num')
-    $('.add').click(function(){
-        sever_num.val(parseInt(sever_num.val())+1)
-        if(sever_num.val()>=26){
-            sever_num.val(parseInt(sever_num.val())-1)
+    $('.add').click(function () {
+        sever_num.val(parseInt(sever_num.val()) + 1)
+        if (sever_num.val() >= 26) {
+            sever_num.val(parseInt(sever_num.val()) - 1)
         }
     })
-    $('.min').click(function(){
-        sever_num.val(parseInt(sever_num.val())-1)
-        if(sever_num.val()<=0){
-            sever_num.val(parseInt(sever_num.val())+1)
+    $('.min').click(function () {
+        sever_num.val(parseInt(sever_num.val()) - 1)
+        if (sever_num.val() <= 0) {
+            sever_num.val(parseInt(sever_num.val()) + 1)
         }
     })
     // 参数增加、删除、修改、保存
-    function Add_parameter(i){
-        value = '<div class="two fields width85" id= "para'+ i +'">' +
-                    '<div class="field">' + 
-                        '<input type="text" name="shipping_first-name" required  placeholder={{.i18n.Tr "repo.modelarts.train_job.parameter_name"}}> ' + 
-                    '</div> ' + 
-                    '<div class="field"> ' +
-                        '<input type="text" name="shipping_last-name" required placeholder={{.i18n.Tr "repo.modelarts.train_job.parameter_value"}}>' +
-                    '</div>'+
-                    '<span>' +
-                        '<i class="trash icon">' +
-                        '</i>' +
-                    '</span>' +
-                '</div>'
+    function Add_parameter(i) {
+        value = '<div class="two fields width85" id= "para' + i + '">' +
+            '<div class="field">' +
+            '<input type="text" name="shipping_first-name" required  placeholder={{.i18n.Tr "repo.modelarts.train_job.parameter_name"}}> ' +
+            '</div> ' +
+            '<div class="field"> ' +
+            '<input type="text" name="shipping_last-name" required placeholder={{.i18n.Tr "repo.modelarts.train_job.parameter_value"}}>' +
+            '</div>' +
+            '<span>' +
+            '<i class="trash icon">' +
+            '</i>' +
+            '</span>' +
+            '</div>'
         $(".dynamic.field").append(value)
-    }   
+    }
 
-    $('#add_run_para').click(function(){
+    $('#add_run_para').click(function () {
         var len = $(".dynamic.field .two.fields").length
         Add_parameter(len)
     });
 
-    $(".dynamic.field").on("click",".trash.icon", function() {
+    $(".dynamic.field").on("click", ".trash.icon", function () {
         var index = $(this).parent().parent().index()
         $(this).parent().parent().remove()
         var len = $(".dynamic.field .two.fields").length
-        $(".dynamic.field .two.fields").each(function(){
+        $(".dynamic.field .two.fields").each(function () {
             var cur_index = $(this).index()
             $(this).attr('id', 'para' + cur_index)
         })
     });
 
-    $('.ui.parameter.green.button').click(function(){
+    $('.ui.parameter.green.button').click(function () {
         var parameters = [];
-        $('table tr').each(function() {
-            $(this).find('td:eq(1)').each(function(){
+        $('table tr').each(function () {
+            $(this).find('td:eq(1)').each(function () {
                 parameters.push($(this).text());
             })
-            $(this).find('input').each(function(){
+            $(this).find('input').each(function () {
                 parameters.push($(this).text())
             })
-            
+
         });
         $('.ui.parameter.modal')
             .modal('hide');
-        for(var i = 2; i < parameters.length; i++){
-            switch(i) {
-                    // 数据集uuid待完成
-                    // case (2):
-                        // console.log(1)
-                        // break;
-                    //     $("#trainjob_datasets").val(parameters[i]);
-                    //     console.log($("#trainjob_datasets").val())
-                    case (3):
-                        $("input[name='boot_file']").val(parameters[i]);
-                        break;
-                    case (4):
-                        var para = parameters[i].split(" ")
-                        for(var j = 0; j < para.length; j++){
-                            var para_name = para[j].split('=')[0]
-                            var para_value = para[j].split('=')[1]
-                            var len = $(".dynamic.field .two.fields").length
-                            Add_parameter(len)
-                            var pid = 'para' + len
-                            $(".dynamic.field"+ " #" + pid + "").find("input[name=shipping_first-name]").val(para_name)
-                            $(".dynamic.field"+ " #" + pid + "").find("input[name=shipping_last-name]").val(para_value)
-                        }
-                        break;
-                    // 数据集pool_id待完成
-                    // case (5):
-                    //     $("select[name='pool_id']").val(parameters[i]);
-                    //     break;
-                    case (6):
-                        $("input[name='work_server_number']").val(parameters[i]);
-                        break;
-                }
+        for (var i = 2; i < parameters.length; i++) {
+            switch (i) {
+                // 数据集uuid待完成
+                // case (2):
+                // console.log(1)
+                // break;
+                //     $("#trainjob_datasets").val(parameters[i]);
+                //     console.log($("#trainjob_datasets").val())
+                case (3):
+                    $("input[name='boot_file']").val(parameters[i]);
+                    break;
+                case (4):
+                    var para = parameters[i].split(" ")
+                    for (var j = 0; j < para.length; j++) {
+                        var para_name = para[j].split('=')[0]
+                        var para_value = para[j].split('=')[1]
+                        var len = $(".dynamic.field .two.fields").length
+                        Add_parameter(len)
+                        var pid = 'para' + len
+                        $(".dynamic.field" + " #" + pid + "").find("input[name=shipping_first-name]").val(para_name)
+                        $(".dynamic.field" + " #" + pid + "").find("input[name=shipping_last-name]").val(para_value)
+                    }
+                    break;
+                // 数据集pool_id待完成
+                // case (5):
+                //     $("select[name='pool_id']").val(parameters[i]);
+                //     break;
+                case (6):
+                    $("input[name='work_server_number']").val(parameters[i]);
+                    break;
+            }
         }
     })
 
-    $('.ui.save.checkbox').click(function(){
+    $('.ui.save.checkbox').click(function () {
         $(this).checkbox({
-            onChange: function(){
-                if ($('.ui.save.checkbox').checkbox('is checked')){
+            onChange: function () {
+                if ($('.ui.save.checkbox').checkbox('is checked')) {
                     $('#save_para').removeClass("disabled")
-                    
-                }else{
-                    $('#save_para').addClass("disabled")   
+
+                } else {
+                    $('#save_para').addClass("disabled")
                 }
             }
         });
     })
 
-    $('.question.circle.icon').hover(function(){
+    $('.question.circle.icon').hover(function () {
         $(this).popup('show')
     });
 
-    $(".item.active.parameter_config").click(function(){
+    $(".item.active.parameter_config").click(function () {
         $('.ui.parameter.modal')
             .modal('setting', 'closable', false)
             .modal('show');
     })
 
-    $('.ui.deny.button').click(function(){
+    $('.ui.deny.button').click(function () {
         $('.ui.parameter.modal')
             .modal('hide');
     })
     $('select.dropdown')
         .dropdown();
 
-    function validate(){
+    function validate() {
         $('.ui.form')
-        .form({
-            on: 'blur',
-            fields: {
-                boot_file: {
-                    identifier  : 'boot_file',
-                    rules: [
-                    {
-                        type: 'regExp[/.+\.py$/g]',
+            .form({
+                on: 'blur',
+                fields: {
+                    boot_file: {
+                        identifier: 'boot_file',
+                        rules: [
+                            {
+                                type: 'regExp[/.+\.py$/g]',
+                            }
+                        ]
+                    },
+                    display_job_name: {
+                        identifier: 'display_job_name',
+                        rules: [
+                            {
+                                type: 'regExp[/^[a-zA-Z0-9-_]{1,64}[a-zA-Z0-9_]$/]',
+                            }
+                        ]
+                    },
+                    attachment: {
+                        identifier: 'attachment',
+                        rules: [
+                            {
+                                type: 'empty',
+                            }
+                        ]
+
+                    },
+                    work_server_number: {
+                        identifier: 'work_server_number',
+                        rules: [
+                            {
+                                type: 'integer[1..25]',
+                            }
+                        ]
+                    },
+                    branch_name: {
+                        identifier: 'branch_name',
+                        rules: [
+                            {
+                                type: 'empty',
+                            }
+                        ]
                     }
-                    ]
                 },
-                display_job_name:{
-                    identifier  : 'display_job_name',
-                    rules: [
-                    {
-                        type: 'regExp[/^[a-zA-Z0-9-_]{1,64}[a-zA-Z0-9_]$/]',
-                    }
-                    ]
+                onSuccess: function () {
+                    // $('.ui.page.dimmer').dimmer('show')
+                    document.getElementById("mask").style.display = "block"
                 },
-                attachment:{
-                    identifier  : 'attachment',
-                    rules: [
-                    {
-                        type: 'empty',
-                    }
-                    ]
-
-                },
-                work_server_number: {
-                    identifier  : 'work_server_number',
-                    rules: [
-                    {
-                        type   : 'integer[1..25]',
-                    }
-                    ]
+                onFailure: function (e) {
+                    return false;
                 }
-            },
-            onSuccess: function(){
-                // $('.ui.page.dimmer').dimmer('show')
-                document.getElementById("mask").style.display = "block"
-            },
-            onFailure: function(e){	
-                return false;
-            }
-        })
+            })
     }
-    document.onreadystatechange = function() {
+    document.onreadystatechange = function () {
         if (document.readyState === "complete") {
             document.getElementById("mask").style.display = "none"
         }
     }
-    function send_run_para(){
+    function send_run_para() {
         var run_parameters = []
         var msg = {}
-        $(".dynamic.field .two.fields").each(function(){
+        $(".dynamic.field .two.fields").each(function () {
             var para_name = $(this).find('input[name=shipping_first-name]').val()
             var para_value = $(this).find('input[name=shipping_last-name]').val()
-            run_parameters.push({"label": para_name, "value": para_value})
+            run_parameters.push({ "label": para_name, "value": para_value })
         })
         msg["parameter"] = run_parameters
         msg = JSON.stringify(msg)
         $('#store_run_para').val(msg)
     }
-    function get_name(){
-        let name1=$("#engine_name .text").text()
-        let name2=$("#flaver_name .text").text()
+    function get_name() {
+        let name1 = $("#engine_name .text").text()
+        let name2 = $("#flaver_name .text").text()
         $("input#ai_engine_name").val(name1)
         $("input#ai_flaver_name").val(name2)
 
     }
-    $('.ui.create_train_job.green.button').click(function(e) {
+    $('.ui.create_train_job.green.button').click(function (e) {
         get_name()
         send_run_para()
-        validate() 
+        validate()
     })
 </script>

templates/repo/create.tmpl

@@ -15,11 +15,11 @@
 						<label>{{.i18n.Tr "repo.visibility"}}</label>
 						<div class="ui checkbox">
 							{{if .IsForcedPrivate}}
-								<input name="private" type="checkbox" checked readonly>
-								<label>{{.i18n.Tr "repo.visibility_helper_forced" | Safe}}</label>
+							<input name="private" type="checkbox" checked readonly>
+							<label>{{.i18n.Tr "repo.visibility_helper_forced" | Safe}}</label>
 							{{else}}
-								<input name="private" type="checkbox" {{if .private}}checked{{end}}>
-								<label>{{.i18n.Tr "repo.visibility_helper" | Safe}}</label>
+							<input name="private" type="checkbox" {{if .private}}checked{{end}}>
+							<label>{{.i18n.Tr "repo.visibility_helper" | Safe}}</label>
 							{{end}}
 						</div>
 						<span class="help">{{.i18n.Tr "repo.visibility_description"}}</span>
@@ -42,33 +42,41 @@
 						<div class="inline field">
 							<label>{{.i18n.Tr "repo.template.items"}}</label>
 							<div class="ui checkbox">
-								<input class="hidden" name="git_content" type="checkbox" tabindex="0" {{if .git_content}}checked{{end}}>
+								<input class="hidden" name="git_content" type="checkbox" tabindex="0"
+									{{if .git_content}}checked{{end}}>
 								<label>{{.i18n.Tr "repo.template.git_content"}}</label>
 							</div>
-							<div class="ui checkbox" {{if not .SignedUser.CanEditGitHook}}data-tooltip="{{.i18n.Tr "repo.template.git_hooks_tooltip"}}"{{end}}>
-								<input class="hidden" name="git_hooks" type="checkbox" tabindex="0" {{if .git_hooks}}checked{{end}}>
+							<div class="ui checkbox"
+								{{if not .SignedUser.CanEditGitHook}}data-tooltip="{{.i18n.Tr "repo.template.git_hooks_tooltip"}}"
+								{{end}}>
+								<input class="hidden" name="git_hooks" type="checkbox" tabindex="0"
+									{{if .git_hooks}}checked{{end}}>
 								<label>{{.i18n.Tr "repo.template.git_hooks"}}</label>
 							</div>
 						</div>
 						<div class="inline field">
 							<label></label>
 							<div class="ui checkbox">
-								<input class="hidden" name="webhooks" type="checkbox" tabindex="0" {{if .webhooks}}checked{{end}}>
+								<input class="hidden" name="webhooks" type="checkbox" tabindex="0"
+									{{if .webhooks}}checked{{end}}>
 								<label>{{.i18n.Tr "repo.template.webhooks"}}</label>
 							</div>
 							<div class="ui checkbox">
-								<input class="hidden" name="topics" type="checkbox" tabindex="0" {{if .topics}}checked{{end}}>
+								<input class="hidden" name="topics" type="checkbox" tabindex="0"
+									{{if .topics}}checked{{end}}>
 								<label>{{.i18n.Tr "repo.template.topics"}}</label>
 							</div>
 						</div>
 						<div class="inline field">
 							<label></label>
 							<div class="ui checkbox">
-								<input class="hidden" name="avatar" type="checkbox" tabindex="0" {{if .avatar}}checked{{end}}>
+								<input class="hidden" name="avatar" type="checkbox" tabindex="0"
+									{{if .avatar}}checked{{end}}>
 								<label>{{.i18n.Tr "repo.template.avatar"}}</label>
 							</div>
 							<div class="ui checkbox">
-								<input class="hidden" name="labels" type="checkbox" tabindex="0" {{if .labels}}checked{{end}}>
+								<input class="hidden" name="labels" type="checkbox" tabindex="0"
+									{{if .labels}}checked{{end}}>
 								<label>{{.i18n.Tr "repo.template.issue_labels"}}</label>
 							</div>
 						</div>
@@ -83,7 +91,8 @@
 								<div class="menu">
 									<div class="item" data-value="">{{.i18n.Tr "repo.issue_labels_helper"}}</div>
 									{{range $template, $labels := .LabelTemplates}}
-										<div class="item" data-value="{{$template}}">{{$template}}<br/><i>({{$labels}})</i></div>
+									<div class="item" data-value="{{$template}}">{{$template}}<br /><i>({{$labels}})</i>
+									</div>
 									{{end}}
 								</div>
 							</div>
@@ -98,7 +107,7 @@
 								<div class="default text">{{.i18n.Tr "repo.repo_gitignore_helper"}}</div>
 								<div class="menu">
 									{{range .Gitignores}}
-										<div class="item" data-value="{{.}}">{{.}}</div>
+									<div class="item" data-value="{{.}}">{{.}}</div>
 									{{end}}
 								</div>
 							</div>
@@ -111,7 +120,7 @@
 								<div class="menu">
 									<div class="item" data-value="">{{.i18n.Tr "repo.license_helper"}}</div>
 									{{range .Licenses}}
-										<div class="item" data-value="{{.}}">{{.}}</div>
+									<div class="item" data-value="{{.}}">{{.}}</div>
 									{{end}}
 								</div>
 							</div>
@@ -124,24 +133,35 @@
 								<div class="default text">{{.i18n.Tr "repo.readme_helper"}}</div>
 								<div class="menu">
 									{{range .Readmes}}
-										<div class="item" data-value="{{.}}">{{.}}</div>
+									<div class="item" data-value="{{.}}">{{.}}</div>
 									{{end}}
 								</div>
 							</div>
 						</div>
 						<div class="inline field">
 							<div class="ui checkbox" id="auto-init">
-								<input class="hidden" name="auto_init" type="checkbox" tabindex="0" {{if .auto_init}}checked{{end}}>
+								<input class="hidden" name="auto_init" type="checkbox" tabindex="0"
+									{{if .auto_init}}checked{{end}}>
 								<label>{{.i18n.Tr "repo.auto_init"}}</label>
 							</div>
 						</div>
 						<div class="inline field">
 							<label for="default_branch">{{.i18n.Tr "repo.default_branch"}}</label>
-							<input id="default_branch" name="default_branch" value="{{.default_branch}}" placeholder="master">
+							<input id="default_branch" name="default_branch" value="{{.default_branch}}"
+								placeholder="master">
+						</div>
+						<div class="inline field">
+							<div class="ui checkbox" id="auto-init">
+								<input class="hidden" name="auto_agree" type="checkbox">
+								<label
+									style="width: 76%;text-align: justify;line-height: 1.5;">{{.i18n.Tr "repo.use_repo_agreement"}}
+									<a target="_blank"
+										href="/home/term/">{{.i18n.Tr "repo.openi_use_agreement"}}</a></label>
+							</div>
 						</div>
 					</div>
 
-					<br/>
+					<br />
 					<div class="inline field">
 						<label></label>
 						<button class="ui green button" id="submit_reponame">
@@ -154,4 +174,4 @@
 		</div>
 	</div>
 </div>
-{{template "base/footer" .}}
+{{template "base/footer" .}}

templates/repo/datasets/index.tmpl

@@ -7,9 +7,11 @@
     background: #FFF !important;
   }
 
+
+
   .dataset_title {
     font-size: 14px;
-    max-width: 80%;
+    /* max-width: 80%; */
     display: inline-block !important;
     margin-left: 6px !important;
     padding-right: 0 !important;
@@ -103,7 +105,7 @@
   }
 
   .heart-stroke {
-    stroke: #666;
+    stroke: #FA8C16;
     stroke-width: 2;
     fill: #fff
   }
@@ -116,6 +118,20 @@
   .diy-popper {
     max-width: 400px;
   }
+
+  .ascending {
+    width: 0;
+    height: 0;
+    border: 5px solid transparent;
+    border-bottom-color: #c0c4cc;
+  }
+
+  .descending {
+    width: 0;
+    height: 0;
+    border: 5px solid transparent;
+    border-top-color: #c0c4cc;
+  }
 </style>
 <div class="repository">
   {{template "repo/header" .}}
@@ -132,7 +148,7 @@
       <div class="ui mobile reversed stackable grid">
         <div class="row">
           <div class="column thirteen wide">
-            <h2>{{.dataset.Title}}</h2>
+            <h2 class="nowrap">{{.dataset.Title}}</h2>
           </div>
           <div class="column three wide right aligned">
             <span style="display: flex;align-items: center;justify-content: flex-end;height: 36px;">
@@ -211,11 +227,25 @@
             <div class="ui grid stackable" style="background: #f0f0f0;;">
               <div class="row">
                 <!-- 数据集名称 -->
-                <div class="four wide column" style="width: 24% !important;">
-                  <span style="margin:0 6px">{{$.i18n.Tr "dataset.dataset_file_name"}}</span>
+                <div class="four wide column name_sort" @click="sortAble('name')"
+                  style="width: 24% !important;cursor: pointer;">
+                  {{$.i18n.Tr "dataset.dataset_file_name"}}
+                  <span class="caret-wrapper">
+                    <i class='ascending sort-caret-up {{if eq .SortType "nameAsc"}} active-up-sort {{end}}'
+                      @click.stop="sortIcon('name','up')"></i>
+                    <i class='descending sort-caret-down {{if eq .SortType "nameDesc"}} active-down-sort {{end}}'
+                      @click.stop="sortIcon('name','down')"></i>
+                  </span>
                 </div>
-                <div class="one wide column text center" style="width: 7.25% !important;">
+                <div class="one wide column text center size_sort" @click="sortAble('size')"
+                  style="width: 7.25% !important;cursor: pointer;">
                   {{$.i18n.Tr "repo.model.manage.size"}}
+                  <span class="caret-wrapper">
+                    <i class='ascending sort-caret-up {{if eq .SortType "sizeAsc"}} active-up-sort {{end}}'
+                      @click.stop="sortIcon('size','up')"></i>
+                    <i class='descending sort-caret-down {{if eq .SortType "sizeDesc"}} active-down-sort {{end}}'
+                      @click.stop="sortIcon('size','down')"></i>
+                  </span>
                 </div>
                 <div class="two wide column text center">
                   {{$.i18n.Tr "dataset.dataset_available_clusters"}}
@@ -226,8 +256,14 @@
                 <div class="one wide column text center">
                   {{$.i18n.Tr "repo.cloudbrain_creator"}}
                 </div>
-                <div class="three wide column text center">
+                <div class="three wide column text center" @click="sortAble('time')" style="cursor: pointer;">
                   {{$.i18n.Tr "dataset.dataset_upload_time"}}
+                  <span class="caret-wrapper">
+                    <i class='ascending sort-caret-up {{if eq .SortType "timeAsc"}} active-up-sort {{end}}'
+                      @click.stop="sortIcon('time','up')"></i>
+                    <i class='descending sort-caret-down {{if eq .SortType "timeDesc"}} active-down-sort {{end}}'
+                      @click.stop="sortIcon('time','down')"></i>
+                  </span>
                 </div>
                 <div class="four wide column text center">
                   {{$.i18n.Tr "repo.cloudbrain_operate"}}
@@ -240,27 +276,34 @@
                 <!-- 数据集名称 -->
 
                 <div class="four wide column" style="width: 24% !important;display: flex;align-items: center;">
-                  {{if .Description}}
                   <el-tooltip class="item" effect="dark" placement="top" popper-class="diy-popper">
-                    <div slot="content">{{.Description}}</br><span><i
-                          class="ri-download-line"></i>{{$.i18n.Tr "dataset.download"}}：{{.DownloadCount}}</span></div>
-                    <a class="dataset_title title" href="{{.DownloadURL}}" title="{{.Name}}" style="border: none;">
-                      {{.Name}}
-                    </a>
-                  </el-tooltip>
-                  {{else}}
-                  <el-tooltip class="item" effect="dark" placement="top" popper-class="diy-popper">
-                    <div slot="content"><span><i
-                          class="ri-download-line"></i>{{$.i18n.Tr "dataset.download"}}：{{.DownloadCount}}</span></div>
-                    <a class="dataset_title title" href="{{.DownloadURL}}" title="{{.Name}}" style="border: none;">
-                      {{.Name}}
-                    </a>
+                    <div slot="content"><span class="wrap">
+
+                        {{if ne .DecompressState -1}}{{$.i18n.Tr "dataset.unzip_status"}}：{{if eq .DecompressState 1}}{{$.i18n.Tr "dataset.unzip_successed"}}{{else if eq .DecompressState 0 2}}{{$.i18n.Tr "dataset.unzip_stared"}}{{else}}{{$.i18n.Tr "dataset.unzip_failed"}}{{end}}
+                        &nbsp;&nbsp;{{end}}<i
+                          class="ri-download-line"></i>{{$.i18n.Tr "dataset.download"}}：{{.DownloadCount}}
+                        {{if .Description}}&nbsp;&nbsp;{{$.i18n.Tr "dataset.description"}}：{{.Description}}{{end}}</span>
+                    </div>
+                    <div style="border: none;display: flex;align-items: center;max-width: 100%;">
+                      {{if eq .DecompressState 1}}
+                      <i class="ri-folder-open-line" style="color: #5bb973;"
+                        title='{{$.i18n.Tr "dataset.unzip_successed"}}'></i>
+                      {{else if eq .DecompressState 0 2}}
+                      <i class="ri-folder-chart-2-line" style="color: #888888;"
+                        title='{{$.i18n.Tr "dataset.unzip_stared"}}'></i>
+                      {{else if eq .DecompressState 3}}
+                      <i class="ri-folder-forbid-line" style="color: #101010;"
+                        title='{{$.i18n.Tr "dataset.unzip_failed"}}'></i>
+                      {{else}}
+                      <i class="ri-folder-forbid-line" style="visibility: hidden;"
+                        title='{{$.i18n.Tr "dataset.unzip_failed"}}'></i>
+                      {{end}}
+                      <a class="dataset_title title" href="{{.DownloadURL}}" title="{{.Name}}">
+                        {{.Name}}
+                      </a>
+                      <i class="ri-lock-2-line" style="color: #fa8c16;" v-if="privates[{{$k}}]"></i>
+                    </div>
                   </el-tooltip>
-                  {{end}}
-                  <i class="ri-lock-2-line" style="color: #fa8c16;" v-if="privates[{{$k}}]"></i>
-                  <!-- <i class="COMPLETED" v-if="zipStatus[{{$k}}]==1"></i>
-                        <i class="WAITING" v-if="zipStatus[{{$k}}]==2"></i>
-                        <i class="FAILED" v-if="zipStatus[{{$k}}]==3"></i> -->
                 </div>
                 <div class="one wide column text center" style="width: 7.25% !important;">
                   {{.Size | FileSize}}
@@ -286,18 +329,6 @@
                   {{.CreatedUnix | TimeSinceUnix1}}
                 </div>
                 <div class="four wide column text right">
-                  <!-- <el-button type="text">下载</el-button>
-                          <el-button type="text">预览</el-button>
-                          <el-button type="text">标注</el-button>
-                          <el-button type="text">
-                            <el-popover
-                            placement="right"
-                            width="400"
-                            trigger="click">
-                            <span>asdasd</span>
-                            <el-button slot="reference" type="text"><i class="ri-more-line"></i></el-button>
-                            </el-popover>
-                          </el-button> -->
                   <div class="ui compact buttons">
 
                     <a class="ui basic blue button" href="{{.DownloadURL}}">{{$.i18n.Tr "dataset.download"}}</a>
@@ -314,11 +345,6 @@
                       @click="setPrivate('{{.UUID}}',true,{{$k}})"
                       v-else="privates[{{$k}}]">{{$.i18n.Tr "dataset.set_private"}}</span>
                     {{end}}
-                    <!-- {{if $.CanRead}}
-                              <a class="ui basic blue button" href="datasets/label/{{.UUID}}?type={{$.Type}}" data-tooltip='{{$.i18n.Tr "dataset.create_label_task"}}'>标注</a>
-                              {{else}}
-                              <a class="ui basic disabled  button">标注</a>
-                              {{end}} -->
                     <a class="ui basic blue button">
                       <el-dropdown size="medium">
                         <span class="el-dropdown-link">
@@ -327,7 +353,6 @@
                         <el-dropdown-menu slot="dropdown">
                           <el-dropdown-item @click.native="copyUrl('{{.DownloadURL}}')">{{$.i18n.Tr "dataset.copy_url"}}
                           </el-dropdown-item>
-                          <!-- <el-dropdown-item class="clipboard" data-clipboard-text="{{.Md5}}" data-clipboard-action="copy">{{$.i18n.Tr "dataset.copy_md5"}}</el-dropdown-item>-->
                           {{if and ($.CanWrite) (eq .DecompressState 1) }}
                           <el-dropdown-item @click.native="gotoAnnotate('{{$.RepoLink}}','{{.UUID}}',{{.Type}})">
                             {{$.i18n.Tr "dataset.annotation"}}</el-dropdown-item>

templates/repo/header.tmpl

@@ -182,3 +182,15 @@
 
 
 <script src="{{StaticUrlPrefix}}/js/jquery.js?v={{MD5 AppVer}}"></script>
+<script src="{{StaticUrlPrefix}}/self/js/notebook/es5-shim.min.js"></script>
+<script src="{{StaticUrlPrefix}}/self/js/notebook/marked.min.js"></script>
+<script src="{{StaticUrlPrefix}}/self/js/notebook/purify.min.js"></script>
+<script src="{{StaticUrlPrefix}}/self/js/notebook/ansi_up.min.js"></script>
+<script src="{{StaticUrlPrefix}}/self/js/notebook/prism.min.js"></script>
+<script src="{{StaticUrlPrefix}}/self/js/notebook/katex.min.js"></script>
+<script src="{{StaticUrlPrefix}}/self/js/notebook/katex-auto-render.min.js"></script>
+<script src="{{StaticUrlPrefix}}/self/js/notebook/notebook.min.js"></script>
+<script src="{{StaticUrlPrefix}}/self/js/notebook/notebook.min.js"></script>
+<link rel="stylesheet" href="{{StaticUrlPrefix}}/self/css/notebook/katex.min.css" />
+<link rel="stylesheet" href="{{StaticUrlPrefix}}/self/css/notebook/prism.css" />
+<link rel="stylesheet" href="{{StaticUrlPrefix}}/self/css/notebook/notebook.css" />

templates/repo/modelarts/trainjob/show.tmpl

@@ -177,6 +177,12 @@
         border: 1px solid #dfe1e6;
     }
 
+    .ti-download-file {
+        display: flex;
+        align-items: center;
+        margin: 0.5rem 0;
+    }
+
     .disabled {
         cursor: default;
         pointer-events: none;
@@ -220,6 +226,7 @@
                 <div class="active section">{{.displayJobName}}</div>
             </div>
         </h4>
+
         {{range $k ,$v := .version_list_task}}
         <div class="ui accordion border-according" id="accordion{{.VersionName}}"
             data-repopath="{{$.RepoRelPath}}/modelarts/train-job" data-jobid="{{.JobID}}"
@@ -305,6 +312,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}}">资源占用情况</a>
                         <a class="item" data-tab="third{{$k}}"
                             onclick="loadModelFile({{.VersionName}},'','','init')">{{$.i18n.Tr "repo.model_download"}}</a>
                     </div>
@@ -478,7 +486,17 @@
                         </div>
                     </div>
                     <div class="ui tab" data-tab="second{{$k}}">
-                        <div style="position: relative;">
+                        <div>
+                            <a id="{{.VersionName}}-log-down"
+                                class='{{if and (.CanModify) (eq .Status "KILLED" "FAILED" "START_FAILED" "STOPPED" "COMPLETED") }}ti-download-file{{else}}disabled{{end}}'
+                                href="{{$.RepoLink}}/modelarts/train-job/{{.JobID}}/download_log_file?version_name={{.VersionName}}">
+                                <i class="ri-download-cloud-2-line"></i>
+                                <span style="margin-left: 0.3rem;">{{$.i18n.Tr "repo.modelarts.download_log"}}</span>
+                            </a>
+
+                        </div>
+                        <div
+                            style="position: relative;border: 1px solid rgba(0,0,0,.2);padding: 0 10px;margin-top: 10px;">
                             <span>
                                 <a title="滚动到顶部" style="position: absolute; right: -32px;cursor: pointer;"
                                     class="log_top" data-version="{{.VersionName}}"><i class="icon-to-top"></i></a>
@@ -501,6 +519,13 @@
                         </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">
                         <input type="hidden" name="modelback{{.VersionName}}" value="-1">
@@ -709,6 +734,12 @@
             // detail status and duration
             $('#' + version_name + '-duration').text(data.JobDuration)
             $('#' + version_name + '-status').text(data.JobStatus)
+            console.log(data)
+            if (["KILLED", "FAILED", "START_FAILED", "STOPPED", "COMPLETED"].includes(data.JobStatus)) {
+                $(`#${version_name}-log-down`).removeClass('disabled').addClass('ti-download-file')
+                $('#' + version_name + '-stop').addClass('disabled')
+            }
+
             loadLog(version_name)
 
 

templates/repo/modelmanage/index.tmpl

@@ -130,6 +130,19 @@
                     <label>模型版本</label>
                     <input style="width: 45%;" id="version" name="Version" value="" readonly required maxlength="255">
                 </div>
+                
+                <div class="unite min_title inline field required">
+                    <label>模型框架</label>
+                    <div class="ui dropdown selection search width70" id="choice_Engine">
+                            <input type="hidden" id="Engine" name="Engine" required>
+                            <div class="default text">选择模型框架</div>
+                            <i class="dropdown icon"></i>
+                            <div class="menu" id="job-Engine">
+                                
+                            </div>
+                    </div>
+                    
+                </div>
                 <div class="inline field">
                     <label>模型标签</label>
                     <input style="width: 83%;margin-left: 7px;" id="label" name="Label" maxlength="255" placeholder='{{.i18n.Tr "repo.modelarts.train_job.label_place"}}'>
@@ -161,7 +174,7 @@
     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)
@@ -185,6 +198,7 @@
                 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')
@@ -197,10 +211,24 @@
     $(function(){
         $('#choice_model').dropdown({
         onChange:function(value){
-            $(".ui.dropdown.selection.search.width70").addClass("loading")
-            $('#choice_version').dropdown('clear')
-            $("#job-version").empty()
-            loadTrainVersion(value)
+                $(".ui.dropdown.selection.search.width70").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])
+                            break;
+                        }
+                    }
+                }
             }
         })
     })
@@ -240,7 +268,8 @@
         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=''
+            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>'
@@ -248,11 +277,59 @@
             if(data.length){
                 $("#job-version").append(train_html)
                 $(".ui.dropdown.selection.search.width70").removeClass("loading")
-                $('#choice_version .default.text').text(data[0].VersionName)
-                $('#choice_version input[name="VersionName"]').val(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)
+                console.log("1111111111");
+                setEngine(data[0])
             }
 
         })
     }
+
+    function setEngine(modelVersion){
+        console.log("modelVersion=" + modelVersion);
+        $('#choice_Engine').dropdown('clear')
+        $("#job-Engine").empty()
+        if(modelVersion.EngineName != null && modelVersion.EngineName != ""){
+            srcEngine = modelVersion.EngineName.split('-')[0]
+            srcEngine = srcEngine.trim();
+            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=\"3\">Other</option>"
+            
+            $('#choice_Engine .default.text').text(selectedText)
+            $('#choice_Engine input[name="Engine"]').val(selectedValue)
+            $("#job-Engine").append(itemHtml);
+            $("#choice_Engine").addClass('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=\"3\">Other</option>"
+            $('#choice_Engine .default.text').text("Pytorch");
+            $('#choice_Engine input[name="Engine"]').val(0)
+            $("#job-Engine").append(itemHtml);
+            $("#choice_Engine").removeClass('disabled');
+        }
+    }
 </script>
 

templates/repo/view_file.tmpl

@@ -108,6 +108,8 @@
 						<tr>
 						{{if .IsFileTooLarge}}
 							<td><strong>{{.i18n.Tr "repo.file_too_large"}}</strong></td>
+						{{else if .IsNoteBook}}
+                            <td id="notebook"></td>
 						{{else}}
 							<td class="lines-num">{{.LineNums}}</td>
 							<td class="lines-code"><pre><code class="{{.HighlightClass}}"><ol class="linenums">{{.FileContent}}</ol></code></pre></td>
@@ -128,4 +130,16 @@ function submitDeleteForm() {
         $("#delete-file-form").submit()
     }
 }
+function showNoteBook(){
+   var isNoteBook = {{.IsNoteBook}}
+   if (isNoteBook) {
+     var jsonStr = "{{.FileContent}}"
+     var notebook = nb.parse(JSON.parse(jsonStr));
+     var rendered = notebook.render();
+     $("#notebook").append(rendered);
+     Prism.highlightAll();
+   }
+}
+showNoteBook()
+
 </script>

templates/user/dashboard/dashboard.tmpl

@@ -10,9 +10,9 @@
 						{{.i18n.Tr "home.wecome_AI_plt"}}
 					</div>
 					<div class="content">
-						<p >{{.i18n.Tr "home.explore_AI"}} <a href="{{AppSubUrl}}/explore/repos"> {{.i18n.Tr "home.repositories"}}</a> {{.i18n.Tr "home.or_t"}} <a href="{{AppSubUrl}}/explore/datasets">{{.i18n.Tr "home.datasets"}}</a></p>
-						<p >{{.i18n.Tr "home.use_plt__fuction"}}&nbsp;<a class="mini ui blue button" href="{{AppSubUrl}}/repo/create{{if .ContextUser.IsOrganization}}?org={{.ContextUser.ID}}{{end}}" >{{.i18n.Tr "repo.create_repo"}}</a></p>
-						<p > {{.i18n.Tr "home.provide_resoure"}}</p>
+						<p class="ui text grey">{{.i18n.Tr "home.explore_AI"}} <a href="{{AppSubUrl}}/explore/repos"> {{.i18n.Tr "home.repositories"}}</a> {{.i18n.Tr "home.or_t"}} <a href="{{AppSubUrl}}/explore/datasets">{{.i18n.Tr "home.datasets"}}</a></p>
+						<p><span class="ui text grey">{{.i18n.Tr "home.use_plt__fuction"}}</span>&nbsp;<a class="mini ui blue button" href="{{AppSubUrl}}/repo/create{{if .ContextUser.IsOrganization}}?org={{.ContextUser.ID}}{{end}}" >{{.i18n.Tr "repo.create_repo"}}</a></p>
+						<p class="ui text grey">{{.i18n.Tr "home.provide_resoure"}}</p>
 					</div>
 					<div class="guide ">
 						<a class="mini ui blue basic button" style="font-weight:700" href="https://git.openi.org.cn/zeizei/OpenI_Learning" target="_blank">{{.i18n.Tr "custom.Platform_Tutorial"}} <i class="ri-arrow-right-line" ></i></a>
@@ -66,19 +66,12 @@
 	}
 	.w_title{
 		padding-top: 25px;
+		margin-bottom: 20px;
 		color: rgba(16, 16, 16, 100);
 		font-size: 20px;
 		text-align: left;
 		font-weight: 700;
 	}
-	.content{
-		color: rgba(80, 85, 89, 100);
-		font-size: 14px;
-		text-align: left;
-		font-family: SourceHanSansSC-regular;
-		margin-top: 20px;
-	}
-
 	.guide{
 		margin-top:30px;
 		padding-bottom: 30px;

templates/user/dashboard/feeds.tmpl

@@ -6,7 +6,7 @@
 		<div class="ui grid">
 			<div class="ui fourteen wide column">
 				<div class="{{if or (eq .GetOpType 5) (eq .GetOpType 18)}}push news{{end}}">
-					<p>
+					<p class="text truncate">
 						{{if gt .ActUser.ID 0}}
 							<a href="{{AppSubUrl}}/{{.GetActUserName}}" title="{{.GetDisplayNameTitle}}">{{.GetDisplayName}}</a>
 						{{else}}

templates/user/dashboard/repolist.tmpl

@@ -163,4 +163,10 @@
 		</div>
 	</div>
 </repo-search>
+<div class="ui hidden divider"></div>
+	<div>
+    	<a href="{{.image_link}}" target="_blank">
+			<img src="{{.image_url}}" class="ui fluid image" alt="">
+		</a>
+	</div>
 </div>

web_src/js/components/BrainAnalysis.vue

@@ -1,86 +1,93 @@
 <template>
     <div style="width: 100%;">
-        <div id = "pro_main">
+        <div id="pro_main">
             <div style="margin-top: 10px;">
-                <b  class="pro_item">云脑分析</b>  <span class="update_time">数据更新时间：</span>  <span style="font-size: 12px;">{{lastUpdatedTime}}&nbsp/&nbsp从有记录起开始统计</span>   
+                <b class="pro_item">云脑分析</b> <span class="update_time">数据更新时间：</span> <span
+                    style="font-size: 12px;">{{lastUpdatedTime}}&nbsp/&nbsp从有记录起开始统计</span>
             </div>
-    
+
             <bar-label :width="'95%'" :height="'500px'"></bar-label>
             <div style="margin-top: 20px;">
-                <span  class="sta_iterm">统计周期：</span> 
-                <button type="button" class='btnLast' id = "all"  v-bind:class="{colorChange:7==dynamic}" @click="resetPage(),getAllProList('all',7)">所有</button>
+                <span class="sta_iterm">统计周期：</span>
+                <button type="button" class='btnLast' id="all" v-bind:class="{colorChange:7==dynamic}"
+                    @click="resetPage(),getAllProList('all',7)">所有</button>
                 <span style="float:right; margin-right: 20px;">
                     <div style="display:inline-block;margin-left: 40px; ">
-                        <a class="el-icon-download" v-if="tableData!=''" :href= "'../api/v1/cloudbrainboard/downloadAll'"></a>
-                        <i class="el-icon-download" v-else="tableData=''" href="#" style="color:rgba(187, 187, 187, 100);" @click='popMark()'></i>
+                        <a class="el-icon-download" v-if="tableData!=''"
+                            :href="'/api/v1/cloudbrainboard/downloadAll'"></a>
+                        <i class="el-icon-download" v-else="tableData=''" href="#"
+                            style="color:rgba(187, 187, 187, 100);" @click='popMark()'></i>
                         <!-- <span ><a id = "download_file" :href= "'../api/v1/projectboard/downloadAll'"   >下载报告</a> </span> -->
-                        <span >
-                            <a id = "download_file"  v-if="tableData!=''" :href= "'../api/v1/cloudbrainboard/downloadAll'">下载报告</a>
-                            <a id = "download_file"  v-else="tableData=''"  href= "#" style="color:rgba(187, 187, 187, 100);" @click='popMark()'>下载报告</a> 
+                        <span>
+                            <a id="download_file" v-if="tableData!=''"
+                                :href="'/api/v1/cloudbrainboard/downloadAll'">下载报告</a>
+                            <a id="download_file" v-else="tableData=''" href="#" style="color:rgba(187, 187, 187, 100);"
+                                @click='popMark()'>下载报告</a>
                         </span>
-                    </div>  
+                    </div>
                 </span>
             </div>
-                    
+
         </div>
-        
+
     </div>
-    </template>
-    
-    <script>
-        // import barLabel from './basic/barLabel.vue';
-        const {AppSubUrl, StaticUrlPrefix, csrf} = window.config;
+</template>
+
+<script>
+    // import barLabel from './basic/barLabel.vue';
+    const { AppSubUrl, StaticUrlPrefix, csrf } = window.config;
 
-        import { export2Excel } from '../excel/util.js'
-        export default{
-            name:'ProAnalysis',
-            components: {
-                // barLabel,
+    import { export2Excel } from '../excel/util.js'
+    export default {
+        name: 'ProAnalysis',
+        components: {
+            // barLabel,
+        },
+        methods: {
+            popMark() {
+                alert("数据为空时，不能下载！")
             },
-            methods: {
-                popMark(){
+            exportData() {
+
+                // this.getOneProList(this.pro_id,'all',true,7)
+                // this.getOneProList(this.pro_id,'all',false,7)
+                // this.fileName()
+                if (this.tableDataID != '') {
+                    this.currentPage = 1
+                    var saveFileName = this.getFileName()
+                    export2Excel(this.columns, this.tableDataID, saveFileName)
+                } else {
                     alert("数据为空时，不能下载！")
-                },
-                exportData(){
-                    
-                    // this.getOneProList(this.pro_id,'all',true,7)
-                    // this.getOneProList(this.pro_id,'all',false,7)
-                    // this.fileName()
-                    if (this.tableDataID!=''){
-                        this.currentPage=1
-                        var saveFileName = this.getFileName()
-                        export2Excel(this.columns,this.tableDataID,saveFileName)
-                    }else{
-                        alert("数据为空时，不能下载！")
-                    }
-               
-                },
+                }
+
             },
-        }
-    </script>
-    
-    <style scoped>
-        .pro_item{
-            font-size: 16px;
-            color:  rgba(16, 16, 16, 100);
-            font-family: SourceHanSansSC-bold;
-        }
-        .update_time{
-            line-height: 17px;
-            font-size: 12px;
-            color:rgba(187, 187, 187, 100);
-            margin-left: 10px;
-        }
-        .btnLast{ 
-            line-height: 1.5;
-            margin: -3.5px;
-            border: 1px solid rgba(22, 132, 252, 100);
-            /* border-right: none; */
-            background: #FFFF;
-            color: #1684FC;
-            width: 60px;
-            height: 30px;
-            border-radius:0px 4px 4px 0px;
-        }
+        },
+    }
+</script>
+
+<style scoped>
+    .pro_item {
+        font-size: 16px;
+        color: rgba(16, 16, 16, 100);
+        font-family: SourceHanSansSC-bold;
+    }
+
+    .update_time {
+        line-height: 17px;
+        font-size: 12px;
+        color: rgba(187, 187, 187, 100);
+        margin-left: 10px;
+    }
 
-    </style>
+    .btnLast {
+        line-height: 1.5;
+        margin: -3.5px;
+        border: 1px solid rgba(22, 132, 252, 100);
+        /* border-right: none; */
+        background: #FFFF;
+        color: #1684FC;
+        width: 60px;
+        height: 30px;
+        border-radius: 0px 4px 4px 0px;
+    }
+</style>

web_src/js/components/Model.vue

@@ -168,7 +168,7 @@ export default {
                 tableData= res.data
                 for(let i=0;i<tableData.length;i++){
                     TrainTaskInfo = JSON.parse(tableData[i].TrainTaskInfo)
-                    tableData[i].EngineName = TrainTaskInfo.EngineName.split('-')[0]
+                    tableData[i].EngineName = this.getEngineName(tableData[i])
                     tableData[i].ComputeResource = TrainTaskInfo.ComputeResource
                     tableData[i].cName=tableData[i].Name
                     tableData[i].Name=''
@@ -218,6 +218,7 @@ export default {
                 $('input[name="Name"]').removeAttr('readonly')
                 $('#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')
@@ -347,6 +348,18 @@ export default {
         })
         .modal('show')
     },
+    getEngineName(model){
+        if(model.Engine == 0){
+            return "Pytorch";
+        }else  if(model.Engine == 1 || model.Engine == 121){
+            return "TensorFlow";
+        }else  if(model.Engine == 2 || model.Engine == 122){
+            return "MindSpore";
+        }else{
+            return "Other"
+        }
+
+    },
     getModelList(){
         try {
             this.$refs.table.store.states.lazyTreeNodeMap = {}
@@ -360,7 +373,7 @@ export default {
                 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].EngineName = TrainTaskInfo.EngineName.split('-')[0]
+                    this.tableData[i].EngineName = this.getEngineName(this.tableData[i])
                     this.tableData[i].ComputeResource = TrainTaskInfo.ComputeResource
                     this.tableData[i].hasChildren = res.data.data[i].VersionCount===1 ? false : true
                 }

web_src/js/components/UserAnalysis.vue

@@ -213,6 +213,18 @@
                     label="被推荐镜像数"
                     width="120px"
                     align="center">
+                </el-table-column> 
+                <el-table-column
+                    prop="Email"
+                    label="Email"
+                    width="120px"
+                    align="center">
+                </el-table-column> 
+                <el-table-column
+                    prop="UserLocation"
+                    label="用户所在地址"
+                    width="120px"
+                    align="center">
                 </el-table-column> 
                  <el-table-column
                     prop="RegistDate"
@@ -267,7 +279,7 @@
                 value_time: '',
                 search:'',
                 data:'',
-                columns: [{title: 'ID',key: 'ID'},{title: '用户名',key: 'Name'},{title: 'PR数',key: 'CodeMergeCount'},{title: 'commit数',key:'CommitCount'},{title: '提出任务数',key: 'IssueCount'},{title: '评论数',key: 'CommentCount'},{title: '关注项目数',key: 'FocusRepoCount'},{title: '点赞项目数',key: 'StarRepoCount'},{title: '登录次数',key: 'LoginCount'},{title:'关注者数',key:'WatchedCount'},{title:'commit代码行数',key:'CommitCodeSize'},{title:'已解决任务数',key:'SolveIssueCount'},{title:'百科页面贡献次数',key:'EncyclopediasCount'},{title:'创建项目',key:'CreateRepoCount'},{title:'用户注册时间',key:'RegistDate'},{title:'云脑任务数',key:'CloudBrainTaskNum'},{title:'云脑运行时间（小时）',key:'CloudBrainRunTime'},{title:'上传（提交）数据集文件数',key:'CommitDatasetNum'},{title:'提交模型数',key:'CommitModelCount'},{title:'归一化用户指数',key:'UserIndex'},{title:'用户指数',key:'UserIndexPrimitive'},{title:'关注他人数',key:'FocusOtherUser'},{title:'收藏数据集',key:'CollectDataset'},{title:'被收藏数据集',key:'CollectedDataset'},{title:'被推荐数据集数',key:'RecommendDataset'},{title:'收藏镜像数',key:'CollectImage'},{title:'被收藏镜像数',key:'CollectedImage'},{title:'被推荐镜像数',key:'RecommendImage'},{title:'系统统计时间',key:'CountDate'}],
+                columns: [{title: 'ID',key: 'ID'},{title: '用户名',key: 'Name'},{title: 'PR数',key: 'CodeMergeCount'},{title: 'commit数',key:'CommitCount'},{title: '提出任务数',key: 'IssueCount'},{title: '评论数',key: 'CommentCount'},{title: '关注项目数',key: 'FocusRepoCount'},{title: '点赞项目数',key: 'StarRepoCount'},{title: '登录次数',key: 'LoginCount'},{title:'关注者数',key:'WatchedCount'},{title:'commit代码行数',key:'CommitCodeSize'},{title:'已解决任务数',key:'SolveIssueCount'},{title:'百科页面贡献次数',key:'EncyclopediasCount'},{title:'创建项目',key:'CreateRepoCount'},{title:'用户注册时间',key:'RegistDate'},{title:'云脑任务数',key:'CloudBrainTaskNum'},{title:'云脑运行时间（小时）',key:'CloudBrainRunTime'},{title:'上传（提交）数据集文件数',key:'CommitDatasetNum'},{title:'提交模型数',key:'CommitModelCount'},{title:'归一化用户指数',key:'UserIndex'},{title:'用户指数',key:'UserIndexPrimitive'},{title:'关注他人数',key:'FocusOtherUser'},{title:'收藏数据集',key:'CollectDataset'},{title:'被收藏数据集',key:'CollectedDataset'},{title:'被推荐数据集数',key:'RecommendDataset'},{title:'收藏镜像数',key:'CollectImage'},{title:'被收藏镜像数',key:'CollectedImage'},{title:'被推荐镜像数',key:'RecommendImage'},{title:'Email',key:'Email'},{title:'用户所在地址',key:'UserLocation'},{title:'系统统计时间',key:'CountDate'}],
                 blob:'',
                 fileName:'',
                 dynamic:7,

web_src/js/components/UserTrend.vue

@@ -13,7 +13,7 @@
                         <span class="yesterday_blk yesterday_title" >昨日新增注册用户数 </span>
                         <span class="yesterday_blk yesterday_color1 yesterday_pdrt yesterday_text">未激活:<span class="bold_num">{{ tableDataYesterday.NotActivateRegistUser }}</span> 人  </span>
                         <span class="yesterday_blk yesterday_color2 yesterday_pdrt yesterday_text">已激活: <span class="bold_num">{{ tableDataYesterday.ActivateRegistUser }} </span>人</span>
-                        <span class="yesterday_blk yesterday_pdrt yesterday_text">有贡献活动: <span class="bold_num">{{ tableDataYesterday.HasActivityUser }} </span>人</span>
+                        <span class="yesterday_blk yesterday_pdrt yesterday_text">有贡献活动: <span class="bold_num">{{ tableDataYesterday.RegistActivityUser }} </span>人</span>
                        
                     </el-col>
                    
@@ -114,7 +114,7 @@
                         align="center">
                     </el-table-column> 
                     <el-table-column
-                        prop="HasActivityUser"
+                        prop="RegistActivityUser"
                         label="新增有贡献活动"
                         align="center">
                     </el-table-column>
@@ -131,6 +131,11 @@
                             {{scope.row.ActivateIndex | rounding}}
                     </template>
                 </el-table-column>
+                 <el-table-column
+                        prop="HasActivityUser"
+                        label="当日有贡献活动"
+                        align="center">
+                    </el-table-column>
                 <el-table-column
                         prop="TotalUser"
                         label="累计注册用户"
@@ -517,7 +522,7 @@
                     xdata.push(this.tableData[this.tableData.length-1-i].DisplayDate);
                     ydata_TotalRegistUser.push(this.tableData[this.tableData.length-1-i].TotalRegistUser)
                     ydata_ActivateRegistUser.push(this.tableData[this.tableData.length-1-i].ActivateRegistUser)
-                    ydata_RegistActivityUser.push(this.tableData[this.tableData.length-1-i].HasActivityUser)
+                    ydata_RegistActivityUser.push(this.tableData[this.tableData.length-1-i].RegistActivityUser)
                     ydata_NotActivateRegistUser.push(this.tableData[this.tableData.length-1-i].NotActivateRegistUser)
                     ydata_TotalUser.push(this.tableData[this.tableData.length-1-i].TotalUser)
                     ydata_TotalActivateRegistUser.push(this.tableData[this.tableData.length-1-i].TotalActivateRegistUser)

web_src/js/index.js

@@ -1214,7 +1214,7 @@ async function initRepository() {
               files: $attachments
             },
             (data) => {
-              if (data.length === 0) {
+              if (data.length === 0 || data.content === '') {
                 $renderContent.html($('#no-content').html());
               } else {
                 $renderContent.html(data.content);
@@ -1222,13 +1222,18 @@ async function initRepository() {
                   highlight(this);
                 });
               }
+              let imageShow = ''
               const $content = $segment.parent();
               if (!$content.find('.ui.small.images').length) {
-                if (data.attachments !== '') {
-                  $content.append(
-                    '<div class="ui bottom attached segment"><div class="ui small images"></div></div>'
-                  );
-                  $content.find('.ui.small.images').html(data.attachments);
+                if (data.attachments !== '' && data.attachments) {
+                  if ($content.find('.ui.middle.aligned').length === 0) {
+                    imageShow += '<div class="ui clearing divider"></div>'
+                    imageShow += '<div class="ui middle aligned padded grid">'
+                    imageShow += data.attachments
+                    imageShow += '</div>'
+                    $content.find('.ui.attached.segment').append(imageShow)
+                  }
+                  else { $content.find('.ui.middle.aligned').html(data.attachments) }
                 }
               } else if (data.attachments === '') {
                 $content
@@ -3870,7 +3875,7 @@ function initVueDataset() {
       cloudbrainType: 0,
       dataset_uuid: '',
       dataset_name: '',
-      loadingDataIndex: true,
+      loadingDataIndex: false,
       timer: null,
       ruleForm: {
         title: '',
@@ -3923,19 +3928,10 @@ function initVueDataset() {
       MinioUploader
     },
     mounted() {
-      // if(document.getElementById('postPath')){
-      //   this.url = document.getElementById('postPath').value
-      // }
-      // this.privates = items
-      // this.num_stars = num_stars
-      // this.star_active = star_active
-      // this.ruleForm1 = ruleForm
-
-      // // this.getEditInit()
-      // this.getTypeList()
       this.getTypeList()
 
       if (!!document.getElementById('dataset-repolink-init')) {
+        this.cloudbrainType = location.href.indexOf('cloudbrain') !== -1 ? 0 : 1
         this.getCurrentRepoDataset(this.repolink, this.cloudbrainType)
       }
 
@@ -4083,6 +4079,62 @@ function initVueDataset() {
       uploadNpu() {
         this.type = 1
       },
+      sortAble(dom) {
+        const params = new URLSearchParams(location.search)
+        if (params.toString() === '') {
+          location.href = `${location.href}?sort=${dom}Asc`
+        }
+        else if (!params.get('sort')) {
+          location.href = `${location.href}&sort=${dom}Asc`
+        }
+        else if (params.get('sort') === `${dom}Desc` || params.get('sort').indexOf(`${dom}`) === -1) {
+          params.set("sort", `${dom}Asc`)
+          let asc = params.toString()
+          location.search = asc
+        }
+        else {
+          params.set("sort", `${dom}Desc`)
+          let desc = params.toString()
+          location.search = desc
+        }
+      },
+      sortIcon(dom, sort) {
+        const params = new URLSearchParams(location.search)
+        if (sort === "up") {
+          if (params.toString() === '') {
+            location.href = `${location.href}?sort=${dom}Asc`
+          }
+          else if (!params.get('sort')) {
+            location.href = `${location.href}&sort=${dom}Asc`
+          } else if (params.get('sort') && params.get('sort').indexOf(`${dom}Asc`) !== -1) {
+            params.delete('sort')
+            location.search = params.toString()
+          } else {
+            params.set("sort", `${dom}Asc`)
+            let asc = params.toString()
+            location.search = asc
+          }
+        }
+        else if (sort === "down") {
+          if (params.toString() === '') {
+            location.href = `${location.href}?sort=${dom}Desc`
+          }
+          else if (!params.get('sort')) {
+            location.href = `${location.href}&sort=${dom}Desc`
+          }
+          else if (params.get('sort') && params.get('sort').indexOf(`${dom}Desc`) !== -1) {
+            params.delete('sort')
+            location.search = params.toString()
+          } else {
+            params.set("sort", `${dom}Desc`)
+            let asc = params.toString()
+            location.search = asc
+          }
+
+
+        }
+
+      },
       setPrivate(uuid, privateFlag, index) {
         const params = { _csrf: csrf, file: uuid, is_private: privateFlag }
         this.$axios.post('/attachments/private', this.qs.stringify(params)).then((res) => {
@@ -4294,6 +4346,7 @@ function initVueDataset() {
         }
       },
       getCurrentRepoDataset(repoLink, type) {
+
         clearInterval(this.timer)
         this.loadingDataIndex = true
         let url = repoLink + '/datasets/current_repo'
@@ -4304,12 +4357,17 @@ function initVueDataset() {
             q: this.searchDataItem
           }
         }).then((res) => {
-          this.currentRepoDataset = JSON.parse(res.data.data)
-          const checkStatuDataset = this.currentRepoDataset.filter(item => item.DecompressState === 2)
-          if (checkStatuDataset.length > 0) {
-            this.polling(checkStatuDataset, repoLink)
+          if (res.data.result_code == '0') {
+            this.currentRepoDataset = JSON.parse(res.data.data)
+            const checkStatuDataset = this.currentRepoDataset.filter(item => item.DecompressState === 2)
+            if (checkStatuDataset.length > 0) {
+              this.polling(checkStatuDataset, repoLink)
+            }
+            this.totalnums = parseInt(res.data.count)
+          } else {
+            this.totalnums = 0
           }
-          this.totalnums = parseInt(res.data.count)
+
           this.loadingDataIndex = false
         })
       },
@@ -5020,3 +5078,98 @@ 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]
+
+
+  let options = {
+    legend: {
+      data: []
+    },
+    grid: {
+      top: '30%',
+      bottom: '2%',
+      containLabel: true
+    },
+    tooltip: {
+      trigger: 'axis',
+      backgroundColor: 'rgb(51, 56, 84)',
+      borderColor: 'rgb(51, 51, 51)',
+      borderWidth: 0,
+      textStyle: {
+        color: '#fff'
+      },
+      axisPointer: {
+        type: 'line'
+      }
+    },
+    xAxis: {
+      type: 'category',
+      data: [],
+      boundaryGap: false,
+      axisLabel: {
+        interval: 'auto'
+      },
+      name: '时间(min)'
+    },
+    yAxis: {
+
+      show: true,
+      name: '占有率(%)',
+      axisLine: {
+        show: true
+      },
+      axisTick: { show: true }
+    },
+
+    series: []
+  };
+  $('.metric_chart').click(function (e) {
+    let versionName = $(this).data('version')
+    let myCharts = echarts.init(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`, (res) => {
+      let filterDta = res.MetricsInfo.filter((item) => {
+
+        return !(['recvBytesRate', 'diskWriteRate', 'sendBytesRate', 'diskReadRate'].includes(item.metric))
+      })
+      let legenData = filterDta.map((item) => {
+        return item.metric
+      })
+      let seriesData = filterDta.map((item) => {
+        let value = item.value.map((item) => { return item > 0 ? item : '0' })
+        let seriesOption = {
+          name: item.metric,
+          type: 'line',
+          symbol: 'circle',
+          symbolSize: 10,
+          smooth: true,
+          showSymbol: false,
+          lineStyle: {
+            width: 2,
+            shadowColor: 'rgba(0,0,0,0.3)',
+            shadowBlur: 10,
+            shadowOffsetY: 8
+          },
+          data: value
+        }
+        return seriesOption
+      })
+      let xLength = res.MetricsInfo[0].value.length
+      options.xAxis.data = Array.from({ length: xLength }, (_, index) => index)
+      options.legend.data = legenData
+      options.series = seriesData
+      options && myCharts.setOption(options);
+
+    })
+    options && myCharts.setOption(options);
+
+  })
+}
+
+initChartsNpu()

web_src/less/_dashboard.less

@@ -82,6 +82,10 @@
 
         line-height: 1.2;
 
+        p {
+            max-width: 100%;
+        }
+        
         > .ui.grid {
             margin-left: auto;
             margin-right: auto;

web_src/less/openi.less

@@ -82,9 +82,14 @@ footer {
 }
 /*PC*/
 @media only screen and (min-width: 1200px){
-.following.bar #navbar, footer .container {
-	padding: 0;
+	.following.bar #navbar, footer .container {
+		padding: 0;
+	}
 }
+@media only screen and (min-width: 1600px){
+	.ui.ui.ui.container:not(.fluid) {
+		width: 1200px;
+	}
 }
 
 /*start page*/
@@ -655,7 +660,10 @@ display: block;
 }
 
 /*pages*/
-.ui.borderless.pagination {border:none}
+.ui.borderless.pagination {
+	border:none;
+	margin-top: .5rem;
+}
 .ui.pagination.menu .item {
     min-width: 32px;
     text-align: center;
@@ -1055,3 +1063,35 @@ display: block;
 	float: left !important;
 	margin: 0px 5px 0px 0px !important;
 }
+
+
+.row .caret-wrapper {
+    display: inline-flex;
+    flex-direction: column;
+    align-items: center;
+    height: 34px;
+    width: 24px;
+    vertical-align: middle;
+    cursor: pointer;
+    position: relative;
+  }
+
+.row .sort-caret-up {
+    position: absolute;
+    top: 5px;
+
+  }
+
+.row  .sort-caret-down {
+    position: absolute;
+    bottom: 5px;
+
+  }
+
+.row  .active-up-sort {
+    border-bottom-color: #409eff;
+  }
+
+  .row  .active-down-sort {
+    border-top-color: #409eff;
+  }