修复按钮不存在导致循环报错问题

io.sc.platform.core.frontend/src/platform/components/grid/GridTop.vue

@@ -32,6 +32,7 @@ import { useQuasar, exportFile } from 'quasar';
 import { axios, Tools, t, NotifyManager } from '@/platform';
 import { selectedMode, formStatus, editStatus } from './ts/grid';
 import GridConfig from './GridConfig.vue';
+import { throws } from 'assert';
 
 const $q = useQuasar();
 
@@ -607,7 +608,9 @@ const handleChildrenBtn = (arr, moreQueryShow) => {
   const tempArr = <any>[];
   for (let i = 0; i < arr.length; i++) {
     const btn = arr[i];
-    if (Array.isArray(btn) && btn.length > 0) {
+    if (typeof btn === 'string' && !buttonObj[btn]) {
+      throw new Error(`'` + btn + `'` + ' toolbar action NOT exits');
+    } else if (Array.isArray(btn) && btn.length > 0) {
       const handleResult = handleChildrenBtn(btn, moreQueryShow);
       if (handleResult && handleResult.length > 0) {
         tempArr.push(handleResult);
@@ -652,7 +655,9 @@ const handleToolbarActions = () => {
     moreQueryShow = true;
   }
   props.grid.props.toolbarActions.forEach((btn: any, index) => {
-    if (typeof btn === 'string' && buttonObj[btn]) {
+    if (typeof btn === 'string' && !buttonObj[btn]) {
+      throw new Error(`'` + btn + `'` + ' toolbar action NOT exits');
+    } else if (typeof btn === 'string' && buttonObj[btn]) {
       if (btn === buttonObj.query.name && moreQueryShow) {
         buttons_.value.push([buttonObj[btn], buttonObj[buttonObj.moreQuery.name]]);
       } else {

io.sc.platform.core.frontend/src/platform/components/grid/WGrid.vue

@@ -182,6 +182,13 @@ const props = defineProps({
   foreignKey: { type: String, default: 'parent' }, // 数据外键（常规表格模式时，该字段暂时无用，将来可用作多个表格的数据关系字段。树形表格模式时，该字段为构建树数据的关系字段）
   refreshData: { type: Boolean, default: false }, // 新增、删除、修改成功后是否刷新数据列表，默认不刷新但是新增修改后台必须返回对应的行数据对象，删除则必须返回删除的记录集primaryKey集合。
   dbClickOperation: { type: String, default: 'view' }, // 默认的双击操作：可填写内置或自定义按钮name，执行的操作为按钮对应的click，固定值提供：expand(展开双击的行)、none(双击不执行任何动作)
+  groupMode: { type: String, default: '' },
+  group: {
+    type: Array,
+    default: () => {
+      return [];
+    },
+  },
   appendRows: {
     // 表格追加行，添加到当前表格数据行尾，可添加多行，支持跨行跨列配置，用于添加合计或者额外信息。
     type: Array,
@@ -901,7 +908,6 @@ const setRowDataExtraProperty = (rows: []) => {
     // 如果存在需要合并的字段，并且不是树表格，重新对数据进行排序
     table.mergeRecords = {};
     sortByProperties(rows, mergeColumns);
-    console.info('rows=========', rows);
   }
   if (rows && rows.length > 0) {
     rows.forEach((item: any, index) => {

io.sc.platform.core.frontend/src/platform/components/grid/css/grid.css

@@ -6,7 +6,6 @@
 }
 .w-grid .q-table__top {
   padding: var(--tableTopPadding) var(--tableTopPadding);
-  border-bottom: 0px !important;
 }
 .w-grid .q-table__middle .q-table th {
   padding: var(--tableHeaderPadding) 8px;

io.sc.platform.core.frontend/src/platform/components/toolbar/WToolbar.vue

@@ -475,8 +475,8 @@ const buttonClick = async (button) => {
       context: context,
       selectedColName: props.grid.getSelectedCell()['colName'],
     });
-    if (button.afterClick) {
     nextTick(async () => {
+      if (button.afterClick) {
         await button.afterClick({
           selected: firstSelectedComputed.value,
           selecteds: selectedComputed.value,
@@ -486,6 +486,7 @@ const buttonClick = async (button) => {
           context: context,
           selectedColName: props.grid.getSelectedCell()['colName'],
         });
+      }
       let data = undefined;
       if (button?.name !== 'add' && button?.name !== 'addTop' && button?.name !== 'addChild') {
         data = firstSelectedComputed.value;
@@ -493,7 +494,6 @@ const buttonClick = async (button) => {
       props.grid.emit('afterEditorOpen', { grid: props.grid, data: data });
     });
   }
-  }
 };
 
 defineExpose({