Merge remote-tracking branch 'origin/dev' into dev

src/views/TaskKanban/index.vue

@@ -21,11 +21,17 @@
                @resetColumn="resetColumnTwo('crud', 'option', 'optionBack', 288)"
                @saveColumn="saveColumnTwo('crud', 'option', 'optionBack', 288)"
                @on-load="onLoad">
+      <template slot-scope="scope" slot="createUserName">
+        <el-link type="primary" :underline="false" @click="chakanfun(scope.row,scope.index)">{{scope.row.createUserName}}</el-link>
+      </template>
         <template slot-scope="scope" slot="tsInfo">
-            <el-tooltip class="item" effect="dark" :content="scope.row.tsInfo" placement="top">
-                <div style="color: #1e9fff;width: 100px;overflow: hidden;white-space: nowrap;text-overflow: ellipsis;"
-                     @click="chakanfun(scope.row,scope.index)">{{scope.row.tsInfo}}</div>
-            </el-tooltip>
+<!--            <el-tooltip class="item" effect="dark" :content="scope.row.tsInfo" placement="top">-->
+<!--                <div style="color: #1e9fff;width: 100px;overflow: hidden;white-space: nowrap;text-overflow: ellipsis;"-->
+<!--                     @click="chakanfun(scope.row,scope.index)">{{scope.row.tsInfo}}</div>-->
+<!--            </el-tooltip>-->
+          <avue-text-ellipsis :text="scope.row.tsInfo" :height="30" use-tooltip placement="top">
+            <small slot="more">...</small>
+          </avue-text-ellipsis>
         </template>
         <template slot-scope="scope" slot="isDateExceeded">
             <span :style="scope.row.isDateExceeded=='已超时'?'color: #de4a3b':'color: #65da78'">{{scope.row.isDateExceeded}}</span>