From 21c86e6fcb6c2b0eccda967d07db01575aa37c7d Mon Sep 17 00:00:00 2001
From: likunming <likunming@163.com>
Date: Fri, 12 Jan 2024 16:09:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../platform/components/grid/TreeGridRow.vue  | 23 ++++---
 .../src/platform/components/grid/WGrid.vue    | 63 +++++++------------
 .../components/toolbar/ChildrenBtn.vue        |  4 +-
 .../platform/components/toolbar/WToolbar.vue  |  4 +-
 4 files changed, 38 insertions(+), 56 deletions(-)

diff --git a/io.sc.platform.core.frontend/src/platform/components/grid/TreeGridRow.vue b/io.sc.platform.core.frontend/src/platform/components/grid/TreeGridRow.vue
index eaf6cec7..932954ea 100644
--- a/io.sc.platform.core.frontend/src/platform/components/grid/TreeGridRow.vue
+++ b/io.sc.platform.core.frontend/src/platform/components/grid/TreeGridRow.vue
@@ -1,30 +1,30 @@
 <template>
-  <q-tr>
+  <q-tr :props="scope">
     <q-td :style="{ 'padding-left': '2px' }">
       <div class="flex flex-nowrap items-center">
         <!--层级占位符-->
         <span :style="`width:${27 * props.level}px;`"></span>
         <!--展开按钮-->
         <q-btn
-          v-if="props_.row.children && props_.row.children.length > 0"
+          v-if="scope.row.children && scope.row.children.length > 0"
           flat
           size="16px"
           dense
           padding="0px 0px"
-          :icon="props_.row.expand ? 'bi-dash' : 'bi-plus'"
-          @click="props_.row.expand = !props_.row.expand"
+          :icon="scope.row.expand ? 'bi-dash' : 'bi-plus'"
+          @click="scope.row.expand = !scope.row.expand"
         />
         <!--展开按钮占位符-->
         <span v-else style="width: 27px"></span>
         <!--选择框-->
-        <q-checkbox v-model="props_.row.selected" flat size="40px" dense />
+        <q-checkbox v-model="scope.row.selected" flat size="40px" dense />
         <!--文件夹图标-->
-        <q-icon v-if="props_.row.children && props_.row.children.length > 0" :name="'folder'" color="amber" size="20px" class="px-1"></q-icon>
+        <q-icon v-if="scope.row.children && scope.row.children.length > 0" :name="'folder'" color="amber" size="20px" class="px-1"></q-icon>
         <!--文件图标-->
         <q-icon v-else name="note" size="20px" class="px-1"></q-icon>
       </div>
     </q-td>
-    <q-td v-for="(col, index) in props_.cols" :key="col.name" :style="{ 'padding-left': '7px' }">
+    <q-td v-for="(col, index) in scope.cols" :key="col.name" :style="{ 'padding-left': '7px' }">
       <div class="flex flex-nowrap items-center">
         <template v-if="col.name === '_sortNo_'">
           {{ index + 1 }}
@@ -38,8 +38,8 @@
       </div>
     </q-td>
   </q-tr>
-  <template v-for="child in props_.row.children" :key="child.id">
-    <TreeGridRow v-if="props_.row.expand" :props="propsHandler(child)" :columns-map="columnsMap" :level="props.level + 1"></TreeGridRow>
+  <template v-for="child in scope.row.children" :key="child.id">
+    <TreeGridRow v-if="scope.row.expand" :props="propsHandler(child)" :columns-map="columnsMap" :level="props.level + 1"></TreeGridRow>
   </template>
 </template>
 <script setup lang="ts">
@@ -58,11 +58,10 @@ const props = defineProps({
     },
   },
 });
-
-const props_ = { ...props.props };
+const scope = { ...props.props };
 const propsHandler = (child) => {
   const cols = <any>[];
-  props_.cols.forEach((col) => {
+  scope.cols.forEach((col) => {
     if (props.columnsMap.get(col.name) && props.columnsMap.get(col.name).format) {
       cols.push({ ...col, value: props.columnsMap.get(col.name).format(child[col.name]) });
     } else {
diff --git a/io.sc.platform.core.frontend/src/platform/components/grid/WGrid.vue b/io.sc.platform.core.frontend/src/platform/components/grid/WGrid.vue
index 5786cc78..1615f60a 100644
--- a/io.sc.platform.core.frontend/src/platform/components/grid/WGrid.vue
+++ b/io.sc.platform.core.frontend/src/platform/components/grid/WGrid.vue
@@ -88,7 +88,7 @@
       </template>
       <template #body="scope">
         <template v-if="tree">
-          <TreeGridRow :props="scope" :columns-map="tableColumnsMap"></TreeGridRow>
+          <TreeGridRow :props="scope" :columns-map="tableColumnsMap" @row-click="rowClick($el, scope.row, scope.rowIndex)"></TreeGridRow>
         </template>
         <q-tr v-else :props="scope" @click="rowClick($el, scope.row, scope.rowIndex)" @dblclick="rowDbClick($el, scope.row, scope.rowIndex)">
           <q-td v-if="!attrs.selection || attrs.selection !== 'none'" class="text-center" style="padding: 0; width: 50px">
@@ -139,7 +139,7 @@
         </q-inner-loading>
       </template>
       <template #pagination="scope">
-        <template v-if="props.pagination.rowsPerPage">
+        <template v-if="props.pagination.rowsPerPage || props.pagination.rowsPerPage > 0">
           <template v-if="table.refHeightWidth.middleWidth > 600">
             <q-pagination
               v-model="table.pagination.page"
@@ -205,10 +205,6 @@ const tableHeadBgColor = gc.theme.dark ? darkBgColor : gc.theme?.grid?.headBgCol
 const tableBorderColor = gc.theme?.grid?.borderColor || 'rgba(0, 0, 0, 0.12)';
 const stickyBgColor = gc.theme.dark ? darkBgColor : gc.theme?.grid?.stickyBgColor || '#ffffff';
 
-const aaa = (a) => {
-  console.info('a============', a);
-  return '111';
-};
 const props = defineProps({
   height: { type: Number, default: 0 }, // 表格高度
   title: { type: String, default: '' }, // 表格标题
@@ -544,35 +540,7 @@ const buttonObj = {
       return false;
     },
     click: (selected, context) => {
-      if (!table.selected || table.selected.length <= 0) {
-        NotifyManager.warn('请选择要查看的记录');
-      } else {
-        viewInfo.infoArray = <any>[];
-        if (props.viewer.panel.fields && props.viewer.panel.fields.length > 0) {
-          for (let item of props.viewer.panel.fields) {
-            if (item.format) {
-              viewInfo.infoArray.push({ label: item.label, value: item.format(table.selected[0][item.name]) });
-            } else {
-              let value = null;
-              if (tableColumnsMap.get(item.name) && tableColumnsMap.get(item.name).format) {
-                value = tableColumnsMap.get(item.name).format(table.selected[0][item.name]);
-              } else {
-                value = table.selected[0][item.name];
-              }
-              viewInfo.infoArray.push({ label: item.label, value: value });
-            }
-          }
-        } else {
-          for (let item of tableColumnsMap) {
-            if (item[1].format) {
-              viewInfo.infoArray.push({ label: item[1].label, value: item[1].format(table.selected[0][item[0]]) });
-            } else {
-              viewInfo.infoArray.push({ label: item[1].label, value: table.selected[0][item[0]] });
-            }
-          }
-        }
-        drawerRef.value.show();
-      }
+      onView();
     },
   },
   export: {
@@ -671,7 +639,7 @@ const table = reactive({
     descending: props.pagination.descending ? props.pagination.descending : false,
     reqPageStart: Object.hasOwnProperty.call(props.pagination, 'reqPageStart') ? props.pagination.reqPageStart : 1,
     page: 1,
-    rowsPerPage: props.pagination.rowsPerPage ? props.pagination.rowsPerPage : 0,
+    rowsPerPage: props.pagination.rowsPerPage,
     rowsNumber: 10,
     rowsPerPageOptions: [5, 10, 20, 50, 100],
   },
@@ -939,6 +907,7 @@ const rowClickFun = (row: any) => {
     table.selected = [];
     table.selected.push(row);
   } else if (attrs.selection && attrs.selection === 'multiple') {
+    table.selected = [];
     table.selected.push(row);
   }
 };
@@ -1158,10 +1127,24 @@ const save = async () => {
 };
 const onView = () => {
   if (!table.selected || table.selected.length <= 0) {
-    NotifyManager.warn('请选择要查看的数据');
+    NotifyManager.warn('请选择要查看的记录');
   } else {
-    if (drawerRef.value) {
-      viewInfo.infoArray = <any>[];
+    viewInfo.infoArray = <any>[];
+    if (props.viewer.panel.fields && props.viewer.panel.fields.length > 0) {
+      for (let item of props.viewer.panel.fields) {
+        if (item.format) {
+          viewInfo.infoArray.push({ label: item.label, value: item.format(table.selected[0][item.name]) });
+        } else {
+          let value = null;
+          if (tableColumnsMap.get(item.name) && tableColumnsMap.get(item.name).format) {
+            value = tableColumnsMap.get(item.name).format(table.selected[0][item.name]);
+          } else {
+            value = table.selected[0][item.name];
+          }
+          viewInfo.infoArray.push({ label: item.label, value: value });
+        }
+      }
+    } else {
       for (let item of tableColumnsMap) {
         if (item[1].format) {
           viewInfo.infoArray.push({ label: item[1].label, value: item[1].format(table.selected[0][item[0]]) });
@@ -1169,8 +1152,8 @@ const onView = () => {
           viewInfo.infoArray.push({ label: item[1].label, value: table.selected[0][item[0]] });
         }
       }
-      drawerRef.value.show();
     }
+    drawerRef.value.show();
   }
 };
 
diff --git a/io.sc.platform.core.frontend/src/platform/components/toolbar/ChildrenBtn.vue b/io.sc.platform.core.frontend/src/platform/components/toolbar/ChildrenBtn.vue
index b46447f4..85d3ac95 100644
--- a/io.sc.platform.core.frontend/src/platform/components/toolbar/ChildrenBtn.vue
+++ b/io.sc.platform.core.frontend/src/platform/components/toolbar/ChildrenBtn.vue
@@ -1,7 +1,7 @@
 <template>
   <q-item clickable :disable="button[0].enableIf ? !button[0].enableIf(gridProp.gridSelected) : false">
     <q-item-section>
-      <q-item-label><q-icon v-if="button[0].icon" :name="button[0].icon" size="20px"></q-icon> {{ button[0].label }}</q-item-label>
+      <q-item-label><q-icon v-if="button[0].icon" :name="button[0].icon" left size="20px"></q-icon> {{ button[0].label }}</q-item-label>
     </q-item-section>
     <q-item-section side>
       <q-icon name="keyboard_arrow_right" />
@@ -21,7 +21,7 @@
               @click="buttonClick(childrenBtn)"
             >
               <q-item-section>
-                <q-item-label><q-icon v-if="childrenBtn.icon" :name="childrenBtn.icon" size="20px"></q-icon> {{ childrenBtn.label }}</q-item-label>
+                <q-item-label><q-icon v-if="childrenBtn.icon" :name="childrenBtn.icon" left size="20px"></q-icon> {{ childrenBtn.label }}</q-item-label>
               </q-item-section>
             </q-item>
           </template>
diff --git a/io.sc.platform.core.frontend/src/platform/components/toolbar/WToolbar.vue b/io.sc.platform.core.frontend/src/platform/components/toolbar/WToolbar.vue
index e0149e10..e656e84e 100644
--- a/io.sc.platform.core.frontend/src/platform/components/toolbar/WToolbar.vue
+++ b/io.sc.platform.core.frontend/src/platform/components/toolbar/WToolbar.vue
@@ -36,7 +36,7 @@
                   @click="buttonClick(childrenBtn)"
                 >
                   <q-item-section>
-                    <q-item-label><q-icon v-if="childrenBtn.icon" :name="childrenBtn.icon" size="20px"></q-icon> {{ childrenBtn.label }}</q-item-label>
+                    <q-item-label><q-icon v-if="childrenBtn.icon" :name="childrenBtn.icon" left size="20px"></q-icon> {{ childrenBtn.label }}</q-item-label>
                   </q-item-section>
                 </q-item>
               </template>
@@ -74,7 +74,7 @@
             >
               <q-item-section>
                 <q-item-label
-                  ><q-icon v-if="childrenBtn.data.icon" :name="childrenBtn.data.icon" size="20px"></q-icon> {{ childrenBtn.data.label }}</q-item-label
+                  ><q-icon v-if="childrenBtn.data.icon" :name="childrenBtn.data.icon" left size="20px"></q-icon> {{ childrenBtn.data.label }}</q-item-label
                 >
               </q-item-section>
             </q-item>