Merge branch 'feature-sprint2' of https://10.30.90.89:39999/luban/dataspherestudio into feature-sprint2

Author: mingfengwang

web/src/apps/workflows/assets/styles/workflow.scss

@@ -131,6 +131,7 @@
           }
           &-icon {
             cursor: pointer;
+            font-size: 16px;
           }
         }
         &-b {

web/src/apps/workflows/components/vue-process/shapeView.vue

@@ -9,8 +9,8 @@
     <input v-model="searchValue" :placeholder="$t('message.workflow.vueProcess.search')" class="shape-search">
     <div v-for="(shape, index) in search" :key="index" :class="{ 'top': index==0 }" class="shape-container">
       <div :class="{open: shape.show}" class="shape-title" @click="toggleTitle(shape)">
-        <SvgIcon v-show="!shape.show" class="icon" icon-class="close" verticalAlign="0px" />
-        <SvgIcon v-show="shape.show" class="icon" icon-class="open" verticalAlign="0px" />
+        <SvgIcon v-show="!shape.show" class="icon" icon-class="close" verticalAlign="0px" style="opacity: 0.65;"/>
+        <SvgIcon v-show="shape.show" class="icon" icon-class="open" verticalAlign="0px" style="opacity: 0.65;"/>
         {{ shape.title }}
       </div>
       <div v-show="shape.show" v-if="shape.children && shape.children.length>0" class="shape-content">

web/src/apps/workflows/components/vue-process/style/index.scss

@@ -95,7 +95,7 @@ $mask-color: rgba(55, 55, 55, .6);
     height: 36px;
     padding-left: 10px;
     @include bg-color($background-color-base, $dark-workflow-bg-color);
-    border: 1px solid $border-color-base;
+    border-bottom: 1px solid $border-color-base;
     @include border-color($border-color-base, $dark-base-color);
 
     .icon {
@@ -180,7 +180,7 @@ $mask-color: rgba(55, 55, 55, .6);
       height: 36px;
       align-items: center;
       justify-content: space-between;
-      border-top: 1px solid #DEE4EC;
+      // border-top: 1px solid #DEE4EC;
       border-bottom: 1px solid #DEE4EC;
       @include border-color(#DEE4EC, $dark-base-color);
       .head-title {
@@ -208,7 +208,7 @@ $mask-color: rgba(55, 55, 55, .6);
 
     .shape-container {
       margin-top: 1px;
-      border-bottom: 1px solid $border-color-split;
+      // border-bottom: 1px solid $border-color-split;
       @include border-color($border-color-split, $dark-workflow-bg-color);
 
       &.top {
@@ -249,7 +249,8 @@ $mask-color: rgba(55, 55, 55, .6);
     .shape-box {
       display: flex;
       align-items: center;
-      margin: 10px 0;
+      height: 34px;
+      line-height: 34px;
       padding: 0 10px 0 20px;
       cursor: pointer;
       &:hover {

web/src/apps/workflows/i18n/common/zh.json

@@ -178,7 +178,7 @@
                 "publishPermissions": "发布权限",
                 "userAllowedPublish": "请选择可发布用户",
                 "devProcess": "开发流程",
-                "orchestratorMode": "编排模式",
+                "orchestratorMode": "工作流模式",
                 "GZL": "工作流",
                 "HZXM": "合作项目",
                 "projectName": "项目名称",
@@ -516,9 +516,9 @@
             "orchestratorPublish": "编排发布",
             "publishLoading": "已有编排在发布，稍后再试",
             "modeifyOrchestrator": "修改编排",
-            "orchestratorName": "编排名称",
+            "orchestratorName": "工作流名称",
             "allowedProject": "所属项目",
-            "orchestratorMode": "编排模式",
+            "orchestratorMode": "工作流模式",
             "orchestratorMethod": "编排方式",
             "FailedOpenOrchestrator": "打开编排失败",
             "noEditPermission": "没有编辑权限",

web/src/apps/workflows/module/common/tabList/index.scss

@@ -153,20 +153,20 @@
   padding: 0 10px;
   overflow: hidden;
   margin-right: 8px;
-  background: #e1e5ea;
+  @include bg-color( #E1E5EA, $dark-workspace-body-bg-color);
   border-radius: 12px;
   &.active {
     height: 24px;
     @include font-color($primary-color, $dark-primary-color);
     line-height: 24px;
-    background: #e1e5ea;
+    @include bg-color(#E8EEF4, $dark-workspace-body-bg-color);
     border-radius: 12px;
   }
   &:hover {
     height: 24px;
     @include font-color($primary-color, $dark-primary-color);
     line-height: 24px;
-    background: #d1d7dd;
     border-radius: 12px;
+    @include bg-color(#D1D7DD, $dark-workspace-body-bg-color);
   }
 }

web/src/apps/workflows/module/common/tabList/tabs.vue

@@ -10,7 +10,7 @@
       <Icon
         v-show="isHover"
         class="close-icon"
-        size="18"
+        size="12"
         type="md-close"
         @click.stop="remove"
       />

web/src/apps/workflows/module/process/component/nodeparameter.vue

@@ -28,7 +28,7 @@
       </FormItem>
     </Form>
     <div v-if="currentNodeParamsBaseinfoList.length > 0" class="node-module-param-modal-header">
-      <h3>{{$t('message.workflow.process.nodeParameter.SXXX')}}</h3>
+      <h5>{{$t('message.workflow.process.nodeParameter.SXXX')}}</h5>
     </div>
     <Form v-if="currentNodeParamsBaseinfoList.length > 0 && currentNode.jobParams" label-position="top"
       ref="parameterForm"  class="node-parameter-bar" :model="currentNode">

web/src/apps/workflows/module/process/index.scss

@@ -135,7 +135,7 @@
       @include font-color($light-text-color, $dark-text-color);
       &:hover {
         // background-color: #ccc;
-        @include bg-color(#ccc, $dark-active-menu-item);
+        // @include bg-color(#ccc, $dark-active-menu-item);
       }
     }
   }

web/src/apps/workflows/module/process/module.vue

@@ -136,7 +136,7 @@
       v-clickoutside="handleOutsideClick"
       v-show="isParamModalShow">
       <div class="process-module-param-modal-header">
-        <h3>{{ isResourceShow ? $t('message.workflow.process.resource') : isDispatch ? $t('message.workflow.process.schedule') : $t('message.workflow.process.params') }}{{$t('message.workflow.process.seting')}}</h3>
+        <h5>{{ isResourceShow ? $t('message.workflow.process.resource') : isDispatch ? $t('message.workflow.process.schedule') : $t('message.workflow.process.params') }}{{$t('message.workflow.process.seting')}}</h5>
       </div>
       <div class="process-module-param-modal-content">
         <argument
@@ -158,7 +158,7 @@
       v-show="nodebaseinfoShow"
       @click="clickBaseInfo">
       <div class="process-module-param-modal-header">
-        <h3>{{$t('message.workflow.process.baseInfo')}}</h3>
+        <h5>{{$t('message.workflow.process.baseInfo')}}</h5>
         <div v-if="!myReadonly" class="save-button">
           <Button size="small" @click.stop="saveNodeParameter"
             :disabled="false">{{$t('message.workflow.process.nodeParameter.BC')}}

web/src/apps/workflows/module/workflow/index.vue

@@ -126,19 +126,17 @@
       ></publishComponent>
     </Modal>
     <!--新增和导入 二合一弹窗-->
-    <Modal v-model="mergeModalShow" :footer-hide="true">
-      <Tabs value="form">
-        <Tab-pane label="新建编排" name="form">
-          <WorkflowFormNew
-            v-if="mergeModalShow"
-            :workflow-data="currentOrchetratorData"
-            :orchestratorModeList="orchestratorModeList"
-            :selectOrchestratorList="selectOrchestratorList"
-            :projectNameList="formatProjectNameList"
-            @cancel="ProjectMergeCancel"
-            @confirm="ProjectMergeConfirm"
-          ></WorkflowFormNew>
-        </Tab-pane>
+    <Modal v-model="mergeModalShow" :footer-hide="true" title="添加工作流">
+      <WorkflowFormNew
+        v-if="mergeModalShow"
+        :workflow-data="currentOrchetratorData"
+        :orchestratorModeList="orchestratorModeList"
+        :selectOrchestratorList="selectOrchestratorList"
+        :projectNameList="formatProjectNameList"
+        @cancel="ProjectMergeCancel"
+        @confirm="ProjectMergeConfirm"
+        >
+      </WorkflowFormNew>
         <!-- <Tab-pane label="导入编排" name="upload">
           <Upload
             ref="uploadJson"
@@ -159,7 +157,6 @@
             </div>
           </Upload>
         </Tab-pane> -->
-      </Tabs>
     </Modal>
     <Spin v-if="loading" size="large" fix />
   </div>