doway-coms 2.10.78 → 2.10.80

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "doway-coms",
-  "version": "2.10.78",
+  "version": "2.10.80",
   "description": "doway组件库",
   "author": "dowaysoft",
   "main": "packages/index.js",

package/packages/BaseGrid/src/index.vue

@@ -374,7 +374,7 @@
         <slot name="expandDefault" :item="{ row, column }"></slot>
       </template>
       <template #linkCell="{ row, column }">
-        <div class="link-cell-tags">
+        <div class="link-cell-tags" v-if="!gridEdit">
           <template v-if="row[column.property]">
             <a-tag
                 v-for="(item, index) in row[column.property].split(',')"
@@ -387,6 +387,7 @@
             </a-tag>
           </template>
         </div>
+        <span v-else>{{row[column.property]}}</span>
       </template>
       <template #operation_edit="scope">
         <div>
@@ -3095,32 +3096,32 @@ export default {
     async cellClick({ row, column }) {
       this.$emit('cellClick', { row, column })
       //判断是否可以跳转
-      if (
-        this.gridEdit != true ||
-        !(column.editRender && column.editRender.enabled === true)
-      ) {
-        if (column.params && column.params.route) {
-          let tempRouteName = column.params.route.name
-          let tempRouteQuery = row[column.params.route.field]
-          if (XEUtils.isArray(tempRouteName)) {
-            //需要不同条件跳转不同页面
-            for (let i = 0; i < tempRouteName.length; i++) {
-              if (tempRouteName[i].value === row[tempRouteName[i].field]) {
-                tempRouteQuery =
-                  row[tempRouteName[i].query] || row[column.params.route.field]
-                tempRouteName = tempRouteName[i].name
-                break
-              }
-            }
-          }
-          if (!tempRouteQuery) return;
-          this.$router.pushRoute({
-            name: tempRouteName,
-            query: { id: tempRouteQuery },
-          })
-          return
-        }
-      }
+      // if (
+      //   this.gridEdit != true ||
+      //   !(column.editRender && column.editRender.enabled === true)
+      // ) {
+      //   if (column.params && column.params.route) {
+      //     let tempRouteName = column.params.route.name
+      //     let tempRouteQuery = row[column.params.route.field]
+      //     if (XEUtils.isArray(tempRouteName)) {
+      //       //需要不同条件跳转不同页面
+      //       for (let i = 0; i < tempRouteName.length; i++) {
+      //         if (tempRouteName[i].value === row[tempRouteName[i].field]) {
+      //           tempRouteQuery =
+      //             row[tempRouteName[i].query] || row[column.params.route.field]
+      //           tempRouteName = tempRouteName[i].name
+      //           break
+      //         }
+      //       }
+      //     }
+      //     if (!tempRouteQuery) return;
+      //     this.$router.pushRoute({
+      //       name: tempRouteName,
+      //       query: { id: tempRouteQuery },
+      //     })
+      //     return
+      //   }
+      // }
       // 判断当前网格是否可以编辑状态
       if (this.gridEdit !== true) {
         return