Merge pull request 'dd' (#659) from dd into master

Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/659

.drone.yml

@@ -25,9 +25,9 @@ steps:
       - npm -v
       - mkdir -p ./node_modules
       - export NODE_MODULES_PATH=`pwd`/node_modules
-      #- npm config set registry https://registry.npmmirror.com
-      #- set NODE_OPTIONS=--openssl-legacy-provider
-      #- npm install
+      - npm config set registry https://registry.npmmirror.com
+      - set NODE_OPTIONS=--openssl-legacy-provider
+      - npm install
       - npm run build
       - ls /app/build/$DRONE_REPO_NAME/
       - echo $NODE_MODULES_PATH

src/components/NameCircle.vue

@@ -113,7 +113,5 @@ init()
       right: 1px;
     }
   }
-
-
 }
 </style>

src/views/workflow/common/OperationRender.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-button v-print="print"> 打印</el-button>
+    <el-button v-print="print" color="#ded0b2" icon="Printer"> 打印</el-button>
   </div>
   <div style="margin: 10px" id="printBox">
     <el-timeline>
@@ -10,6 +10,14 @@
                         :color="operation.color"
                         size="large"
                         placement="top">
+        <template #dot>
+<!--          :style="{backgroundColor:operation.color}"-->
+          <div style="background-color:#fff;width: 16px; height: 16px">
+            <el-icon :color="operation.color" size="16px">
+              <component :is="operation.icon"></component>
+            </el-icon>
+          </div>
+        </template>
         <el-card>
           <div>
             当前节点: {{ operation.operationName }}
@@ -50,6 +58,13 @@
         </el-card>
       </el-timeline-item>
       <el-timeline-item :color="timeline.color" :icon="timeline.icon" size="large">
+        <template #dot>
+          <div style="background-color:#fff;width: 16px; height: 16px">
+            <el-icon :color="timeline.color" size="16px">
+              <component :is="timeline.icon"></component>
+            </el-icon>
+          </div>
+        </template>
         <el-card style="font-size: 16px;font-weight: bold;">
           {{ timeline.context }}
         </el-card>
@@ -319,6 +334,9 @@ init()
 </script>
 
 <style lang="scss" scoped>
+:deep(.el-timeline-item__dot) {
+  margin-left: -3px;
+}
 :deep .el-card__body, .el-main {
   padding: 10px;
 }
@@ -399,8 +417,8 @@ init()
 }
 
 @media print {
-  :deep .el-timeline-item__node--large > .el-icon {
-    color: rgba(0, 0, 0, 1) !important;
-  }
+  //:deep .el-timeline-item__node--large > .el-icon {
+  //  color: $iconColor !important;
+  //}
 }
 </style>

src/views/workflow/common/TimeLineItem.vue

@@ -1,59 +0,0 @@
-<template>
-  <li :class="[ns.b(), { [ns.e('center')]: center }]">
-    <div :class="ns.e('tail')" />
-    <div
-        v-if="!$slots.dot"
-        :class="defaultNodeKls"
-        :style="{
-        backgroundColor: color,
-      }"
-    >
-      <el-icon v-if="icon" :class="ns.e('icon')" backgroundColor: color>
-        <component :is="icon" />
-      </el-icon>
-    </div>
-    <div v-if="$slots.dot" :class="ns.e('dot')">
-      <slot name="dot" />
-    </div>
-
-    <div :class="ns.e('wrapper')">
-      <div
-          v-if="!hideTimestamp && placement === 'top'"
-          :class="[ns.e('timestamp'), ns.is('top')]"
-      >
-        {{ timestamp }}
-      </div>
-
-      <div :class="ns.e('content')">
-        <slot />
-      </div>
-
-      <div
-          v-if="!hideTimestamp && placement === 'bottom'"
-          :class="[ns.e('timestamp'), ns.is('bottom')]"
-      >
-        {{ timestamp }}
-      </div>
-    </div>
-  </li>
-</template>
-
-<script lang="ts" setup>
-import { computed } from 'vue'
-import { useNamespace } from '@element-plus/hooks'
-import { timelineItemProps } from './timeline-item'
-
-defineOptions({
-  name: 'ElTimelineItem',
-})
-
-const props = defineProps(timelineItemProps)
-
-const ns = useNamespace('timeline-item')
-const defaultNodeKls = computed(() => [
-  ns.e('node'),
-  ns.em('node', props.size || ''),
-  ns.em('node', props.type || ''),
-  ns.is('hollow', props.hollow),
-])
-</script>