Merge branch 'dev'

@CONTROL/数据视图/CONTROL-BASE.vue.ftl

@@ -37,13 +37,12 @@
                         ${ctrl.itemRender.code}
   <#else>
                         <div class="data-view-item">
-                            <img v-if="item.srficon" :src="item.srficon" class="single-card-img" />
+                            <img v-if="item.srficonpath" :src="item.srficonpath" class="single-card-img" />
                             <img v-else src="/assets/img/noimage.png" class="single-card-img" />
                             <div class="single-card-default">
                                 <Tooltip :content="item.srfmajortext">
                                 {{item.srfmajortext}}
                                 </Tooltip>
-                                <span v-if="item.srfdescription" class="description">{{ item.srfdescription }}</span>
                             </div>
                         </div>
                         <div class="data-view-item-action">
@@ -77,13 +76,12 @@
                                     ${ctrl.itemRender.code}
                                 <#else>
                                     <div class="data-view-item">
-                                        <img v-if="item.srficon" :src="item.srficon" class="single-card-img" />
+                                        <img v-if="item.srficonpath" :src="item.srficonpath" class="single-card-img" />
                                         <img v-else src="/assets/img/noimage.png" class="single-card-img" />
                                         <div class="single-card-default">
                                             <Tooltip :content="item.srfmajortext">
                                             {{item.srfmajortext}}
                                             </Tooltip>
-                                            <span class="description">{{ item.srfdescription }}</span>
                                         </div>
                                     </div>
                                     <div class="data-view-item-action">

@CONTROL/数据视图/CONTROL.less.ftl

@@ -90,9 +90,9 @@
           }
         }
         .el-card{
-          background-color: #fff;
+          background-color: #f6f6f6;
           color: #666666;
-          box-shadow: 0 2px 12px 0 #b1b3b8;
+          box-shadow: 0 2px 12px 0 #909399;
         }
         .single-card-data{
             height: 100%;
@@ -100,11 +100,7 @@
             cursor: pointer;
             border: 2px solid transparent;
             .data-view-item{
-              display: flex;
-              margin-bottom: 36px;
               .single-card-default {
-                display: flex;
-                flex-direction: column;
                   .ivu-tooltip{
                       .ivu-tooltip-rel{
                           width: 150px;
@@ -119,15 +115,11 @@
                   }
               }
               .single-card-img {
-                width: 50px;
-                height: 50px;
-                border-radius: 50%;
-                margin-right: 20px;
+                  width: 150px;
+                  height: calc(100% - 32px);
               }
             }
             .data-view-item-action{
-              display: flex;
-              justify-content: space-around;
               button{
                 margin: 0 3px;
                 cursor: pointer;

@EDITOR/IP地址输入框/EDITOR.vue.ftl

+<#if editor?? && editor.render??> 
+    ${editor.render.code}
+<#else>
+<app-input-ip
+    v-model="data.${editor.name}" 
+    :context="context"
+    :formState="formState"
+    :viewparams="viewparams"
+    :disabled="detailsModel.${editor.name}.disabled"
+    @enter="onEnter($event)">
+</app-input-ip>
+</#if>
\ No newline at end of file