cabloy 5.1.170 → 5.1.172

package/vona/src/suite/a-training/modules/training-student/src/dto/studentSelectResItem.tsx

@@ -46,10 +46,14 @@ export interface IDtoOptionsStudentSelectResItem extends IDecoratorDtoOptions {}
               requiresSelection: true,
               selectedMaxIds: 100,
             }),
+            ZovaRender.tableActionBulk('basic-table:actionRefresh', {
+              permission: { public: true },
+              placement: 'end',
+            }),
             ZovaRender.tableActionBulk('basic-table:actionColumnConfig', {
               permission: { public: true },
               placement: 'end',
-            } as any),
+            }),
           ],
         }),
         ZovaRender.block('basic-page:blockTable'),

package/vona/src/suite/a-training/modules/training-student/test/student.test.ts

@@ -103,6 +103,11 @@ describe('student.test.ts', { concurrency: false }, () => {
       );
       assert.equal(deleteBulkAction?.options?.requiresSelection, true);
       assert.equal(deleteBulkAction?.options?.selectedMaxIds, 100);
+      const refreshAction = toolbarBlock?.options?.actions?.find(
+        (action: any) => action.render === 'basic-table:actionRefresh',
+      );
+      assert.equal(refreshAction?.options?.requiresSelection, undefined);
+      assert.equal(refreshAction?.options?.selectedMaxIds, undefined);
       const columnConfigAction = toolbarBlock?.options?.actions?.find(
         (action: any) => action.render === 'basic-table:actionColumnConfig',
       );

package/zova/packages-cli/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zova-cli",
-  "version": "1.2.108",
+  "version": "1.2.109",
   "gitHead": "6f675a8cc46d596142c591c28a40cc4d82fcc6cc",
   "description": "zova cli",
   "keywords": [
@@ -44,7 +44,7 @@
     "@cabloy/process-helper": "^3.1.8",
     "fs-extra": "^11.3.5",
     "semver": "^7.6.2",
-    "zova-cli-set-front": "^1.2.106"
+    "zova-cli-set-front": "^1.2.107"
   },
   "devDependencies": {
     "clean-package": "^2.2.0",

package/zova/packages-cli/cli-set-front/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zova-cli-set-front",
-  "version": "1.2.106",
+  "version": "1.2.107",
   "gitHead": "6f675a8cc46d596142c591c28a40cc4d82fcc6cc",
   "description": "zova cli-set-front",
   "keywords": [

package/zova/packages-cli/cli-set-front/src/lib/bean/cli.bin.buildRest.ts

@@ -45,6 +45,13 @@ declare module '@cabloy/cli' {
   }
 }
 
+interface IBinBuildRestPackageJson {
+  name: string;
+  version: string;
+  dependencies?: Record<string, string>;
+  [key: string]: unknown;
+}
+
 interface IBinBuildRestContext {
   projectPath: string;
   flavor: ZovaMetaFlavor;
@@ -54,6 +61,7 @@ interface IBinBuildRestContext {
   outDir: string;
   bundleModules?: string[];
   sideEffectImportModuleNames?: string[];
+  packageJson?: IBinBuildRestPackageJson;
 }
 
 export class CliBinBuildRest extends BeanCliBase {
@@ -129,6 +137,7 @@ export class CliBinBuildRest extends BeanCliBase {
     const templateDir = this.template.resolveTemplatePath(__ThisSetName__, 'rest');
     // render
     await this.template.renderDir(srcDir, templateDir);
+    context.packageJson = await loadJSONFile(path.join(srcDir, 'package.json'));
   }
 
   async _buildTs({ srcDir, outDir }: IBinBuildRestContext) {
@@ -204,7 +213,7 @@ export class CliBinBuildRest extends BeanCliBase {
   }
 
   async _build(buildContext: IBinBuildRestContext) {
-    const { projectPath, flavor, bundleNameCopy, srcDir, outDir } = buildContext;
+    const { projectPath, flavor, bundleNameCopy, outDir, packageJson } = buildContext;
     // build
     await this._buildTs(buildContext);
     await this._buildDts(buildContext);
@@ -212,8 +221,10 @@ export class CliBinBuildRest extends BeanCliBase {
     const deps = await _extractDeps(path.join(outDir, 'index.d.mts'));
     const depsVersion = await _extractDepsVersion(projectPath, deps);
     // package.json
-    const pkgContent = await loadJSONFile(path.join(srcDir, 'package.json'));
-    pkgContent.dependencies = depsVersion;
+    const pkgContent = {
+      ...packageJson!,
+      dependencies: depsVersion,
+    };
     await saveJSONFile(path.join(outDir, 'package.json'), pkgContent);
     // await fse.copyFile(path.join(srcDir, 'package.json'), path.join(outDir, 'package.json'));
     // release

package/zova/pnpm-lock.yaml

@@ -77,7 +77,7 @@ importers:
         version: 10.6.0(postcss@8.5.28)
       axios:
         specifier: ^1.18.1
-        version: 1.20.0(supports-color@10.2.2)
+        version: 1.20.0
       compression:
         specifier: ^1.8.1
         version: 1.8.2
@@ -366,7 +366,7 @@ importers:
     devDependencies:
       '@cabloy/cli':
         specifier: ^3.1.29
-        version: 3.1.29(supports-color@10.2.2)(vue@3.5.42(typescript@5.9.3))
+        version: 3.1.29(vue@3.5.42(typescript@5.9.3))
       '@cabloy/lint':
         specifier: ^5.1.32
         version: 5.1.32(@typescript-eslint/eslint-plugin@8.70.0(@typescript-eslint/parser@8.70.0(eslint@10.10.0(jiti@2.7.0))(supports-color@10.2.2)(typescript@5.9.3))(eslint@10.10.0(jiti@2.7.0))(typescript@5.9.3))(@typescript-eslint/typescript-estree@8.70.0(typescript@5.9.3))(@typescript-eslint/utils@8.70.0(eslint@10.10.0(jiti@2.7.0))(typescript@5.9.3))(eslint@10.10.0(jiti@2.7.0))(oxfmt@0.62.0)(oxlint@1.82.0)(supports-color@10.2.2)(typescript@5.9.3)(vue-eslint-parser@10.4.1(eslint@10.10.0(jiti@2.7.0)))
@@ -441,7 +441,7 @@ importers:
     dependencies:
       '@cabloy/cli':
         specifier: ^3.1.29
-        version: 3.1.29(supports-color@10.2.2)(vue@3.5.42(typescript@5.9.3))
+        version: 3.1.29(vue@3.5.42(typescript@5.9.3))
       '@cabloy/process-helper':
         specifier: ^3.1.8
         version: 3.1.8
@@ -475,7 +475,7 @@ importers:
         version: 7.29.7(@babel/core@7.29.7)
       '@cabloy/cli':
         specifier: ^3.1.29
-        version: 3.1.29(supports-color@10.2.2)(vue@3.5.42(typescript@5.9.3))
+        version: 3.1.29(vue@3.5.42(typescript@5.9.3))
       '@cabloy/extend':
         specifier: ^3.2.8
         version: 3.2.8
@@ -873,7 +873,7 @@ importers:
         specifier: ^5.1.89
         version: link:../zova-core
       zova-suite-a-zova:
-        specifier: ^5.1.160
+        specifier: ^5.1.161
         version: link:../../src/suite-vendor/a-zova
     devDependencies:
       clean-package:
@@ -977,7 +977,7 @@ importers:
   src/suite-vendor/a-cabloy:
     dependencies:
       zova-module-a-layoutprofile:
-        specifier: ^5.0.0
+        specifier: ^5.0.2
         version: link:modules/a-layoutprofile
       zova-module-a-rbac:
         specifier: ^5.0.1
@@ -1109,7 +1109,7 @@ importers:
         specifier: ^5.1.36
         version: link:modules/a-model
       zova-module-a-openapi:
-        specifier: ^5.1.53
+        specifier: ^5.1.54
         version: link:modules/a-openapi
       zova-module-a-router:
         specifier: ^5.1.37
@@ -1121,7 +1121,7 @@ importers:
         specifier: ^5.1.34
         version: link:modules/a-routertabs
       zova-module-a-ssr:
-        specifier: ^5.1.38
+        specifier: ^5.1.39
         version: link:modules/a-ssr
       zova-module-a-ssrhmr:
         specifier: ^5.1.23
@@ -1133,7 +1133,7 @@ importers:
         specifier: ^5.1.35
         version: link:modules/a-style
       zova-module-a-table:
-        specifier: ^5.1.42
+        specifier: ^5.1.43
         version: link:modules/a-table
       zova-module-a-zod:
         specifier: ^5.1.37
@@ -1213,7 +1213,7 @@ importers:
     dependencies:
       axios:
         specifier: ^1.18.1
-        version: 1.20.0(supports-color@10.2.2)
+        version: 1.20.0
     devDependencies:
       clean-package:
         specifier: ^2.2.0
@@ -1486,7 +1486,7 @@ importers:
     devDependencies:
       '@cabloy/cli':
         specifier: ^3.1.29
-        version: 3.1.29(supports-color@10.2.2)(vue@3.5.42(typescript@5.9.3))
+        version: 3.1.29(vue@3.5.42(typescript@5.9.3))
       '@types/luxon':
         specifier: ^3.7.1
         version: 3.7.5
@@ -8829,7 +8829,7 @@ snapshots:
 
   '@bufbuild/protobuf@2.15.0': {}
 
-  '@cabloy/cli@3.1.29(supports-color@10.2.2)(vue@3.5.42(typescript@5.9.3))':
+  '@cabloy/cli@3.1.29(vue@3.5.42(typescript@5.9.3))':
     dependencies:
       '@babel/parser': 7.29.8
       '@cabloy/module-glob': 5.3.18
@@ -8838,7 +8838,7 @@ snapshots:
       '@cabloy/utils': 2.1.27
       '@cabloy/word-utils': link:packages-utils/word-utils
       '@npmcli/config': 10.12.0
-      '@zhennann/common-bin': 4.0.1(supports-color@10.2.2)
+      '@zhennann/common-bin': 4.0.1
       '@zhennann/ejs': 3.0.1
       boxen: 4.2.0
       chalk: 3.0.0
@@ -11026,7 +11026,7 @@ snapshots:
 
   '@vue/shared@3.5.13': {}
 
-  '@zhennann/common-bin@4.0.1(supports-color@10.2.2)':
+  '@zhennann/common-bin@4.0.1':
     dependencies:
       chalk: 4.1.2
       change-case: 4.1.2
@@ -11060,7 +11060,7 @@ snapshots:
 
   acorn@8.18.0: {}
 
-  agent-base@6.0.2(supports-color@10.2.2):
+  agent-base@6.0.2:
     dependencies:
       debug: 4.4.3(supports-color@10.2.2)
     transitivePeerDependencies:
@@ -11168,11 +11168,11 @@ snapshots:
     dependencies:
       possible-typed-array-names: 1.1.0
 
-  axios@1.20.0(supports-color@10.2.2):
+  axios@1.20.0:
     dependencies:
       follow-redirects: 1.16.0
       form-data: 4.0.6
-      https-proxy-agent: 5.0.1(supports-color@10.2.2)
+      https-proxy-agent: 5.0.1
       proxy-from-env: 2.1.0
     transitivePeerDependencies:
       - debug
@@ -12567,9 +12567,9 @@ snapshots:
       statuses: 2.0.2
       toidentifier: 1.0.1
 
-  https-proxy-agent@5.0.1(supports-color@10.2.2):
+  https-proxy-agent@5.0.1:
     dependencies:
-      agent-base: 6.0.2(supports-color@10.2.2)
+      agent-base: 6.0.2
       debug: 4.4.3(supports-color@10.2.2)
     transitivePeerDependencies:
       - supports-color

package/zova/src/suite/cabloy-basic/modules/basic-table/src/.metadata/component/actionRefresh.ts

@@ -0,0 +1,31 @@
+import type { TypeControllerInnerProps } from 'zova';
+
+import { defineComponent } from 'vue';
+import { prepareComponentOptions, useController } from 'zova';
+
+import type { ControllerActionRefreshProps } from '../../component/actionRefresh/controller.jsx';
+
+import { ControllerActionRefresh } from '../../component/actionRefresh/controller.jsx';
+export type ZActionRefreshProps = {
+  controllerRef?: (ref: ControllerActionRefresh) => void;
+} & ControllerActionRefreshProps;
+
+type ControllerInnerProps = TypeControllerInnerProps<
+  ControllerActionRefreshProps,
+  keyof typeof ControllerActionRefresh.$propsDefault
+>;
+declare module 'zova-module-basic-table' {
+  export interface ControllerActionRefresh {
+    $props: ControllerInnerProps;
+  }
+}
+
+export const ZActionRefresh = defineComponent((_props: ZActionRefreshProps) => {
+  useController(ControllerActionRefresh, undefined, undefined);
+  return () => {};
+}, prepareComponentOptions(ControllerActionRefresh.$componentOptions));
+declare module 'zova-module-a-bean' {
+  export interface IVonaComponentRecord {
+    'basic-table:actionRefresh': ControllerActionRefreshProps;
+  }
+}

package/zova/src/suite/cabloy-basic/modules/basic-table/src/.metadata/index.ts

@@ -3,6 +3,7 @@
 export * from '../component/actionColumnConfig/controller.jsx';
 export * from '../component/actionCreate/controller.jsx';
 export * from '../component/actionDeleteBulk/controller.jsx';
+export * from '../component/actionRefresh/controller.jsx';
 export * from '../component/table/controller.jsx';
 
 import 'zova';
@@ -27,6 +28,11 @@ declare module 'zova-module-basic-table' {
           get scope(): ScopeModuleBasicTable;
         }
 
+        export interface ControllerActionRefresh {
+          /** @internal */
+          get scope(): ScopeModuleBasicTable;
+        }
+
         export interface ControllerTable {
           /** @internal */
           get scope(): ScopeModuleBasicTable;
@@ -37,6 +43,7 @@ declare module 'zova-module-basic-table' {
 import type { ControllerActionColumnConfig } from '../component/actionColumnConfig/controller.jsx';
 import type { ControllerActionCreate } from '../component/actionCreate/controller.jsx';
 import type { ControllerActionDeleteBulk } from '../component/actionDeleteBulk/controller.jsx';
+import type { ControllerActionRefresh } from '../component/actionRefresh/controller.jsx';
 import type { ControllerTable } from '../component/table/controller.jsx';
 import 'zova';
 declare module 'zova' {
@@ -44,6 +51,7 @@ declare module 'zova' {
     'basic-table.controller.actionColumnConfig': ControllerActionColumnConfig;
 'basic-table.controller.actionCreate': ControllerActionCreate;
 'basic-table.controller.actionDeleteBulk': ControllerActionDeleteBulk;
+'basic-table.controller.actionRefresh': ControllerActionRefresh;
 'basic-table.controller.table': ControllerTable;
   }
 }
@@ -56,12 +64,15 @@ export * from './component/actionCreate.js';
 import { ZActionCreate } from './component/actionCreate.js';
 export * from './component/actionDeleteBulk.js';
 import { ZActionDeleteBulk } from './component/actionDeleteBulk.js';
+export * from './component/actionRefresh.js';
+import { ZActionRefresh } from './component/actionRefresh.js';
 export * from './component/table.js';
 import { ZTable } from './component/table.js';
 export const components = {
   'actionColumnConfig': ZActionColumnConfig,
 'actionCreate': ZActionCreate,
 'actionDeleteBulk': ZActionDeleteBulk,
+'actionRefresh': ZActionRefresh,
 'table': ZTable,
 };
 import 'zova';
@@ -70,12 +81,14 @@ export interface IComponentRecord {
   'basic-table:actionColumnConfig': ControllerActionColumnConfig;
 'basic-table:actionCreate': ControllerActionCreate;
 'basic-table:actionDeleteBulk': ControllerActionDeleteBulk;
+'basic-table:actionRefresh': ControllerActionRefresh;
 'basic-table:table': ControllerTable;
 }
 export interface IZovaComponentRecord {
   'basic-table:actionColumnConfig': typeof ZActionColumnConfig;
 'basic-table:actionCreate': typeof ZActionCreate;
 'basic-table:actionDeleteBulk': typeof ZActionDeleteBulk;
+'basic-table:actionRefresh': typeof ZActionRefresh;
 'basic-table:table': typeof ZTable;
 }
 }

package/zova/src/suite/cabloy-basic/modules/basic-table/src/component/actionRefresh/controller.tsx

@@ -0,0 +1,42 @@
+import type { IComponentOptions } from 'zova';
+import type {
+  IJsxRenderContextPage,
+  IResourceTableActionBulkPropsBase,
+} from 'zova-module-a-openapi';
+
+import { BeanControllerBase, Use } from 'zova';
+import { Controller } from 'zova-module-a-bean';
+
+declare module 'zova-module-a-openapi' {
+  export interface IResourceTableActionBulkRecord {
+    'basic-table:actionRefresh'?: ControllerActionRefreshProps;
+  }
+}
+
+export interface ControllerActionRefreshProps extends IResourceTableActionBulkPropsBase {}
+
+@Controller()
+export class ControllerActionRefresh extends BeanControllerBase {
+  static $propsDefault = { class: 'btn join-item' };
+  static $componentOptions: IComponentOptions = { inheritAttrs: false, deepExtendDefault: true };
+
+  @Use({ injectionScope: 'host' })
+  $$renderContext: IJsxRenderContextPage;
+
+  protected render() {
+    const disabled = this.$props.disabled === true || this.$props.dynamicDisabled === true;
+    return (
+      <button
+        class={this.$props.class}
+        type="button"
+        disabled={disabled}
+        onClick={async () => {
+          if (disabled) return;
+          await this.$$renderContext.$$page.queryData.refetch();
+        }}
+      >
+        {this.scope.locale.Refresh() as string}
+      </button>
+    );
+  }
+}

package/zova/src/suite/cabloy-basic/modules/basic-table/src/config/locale/en-us.ts

@@ -5,6 +5,7 @@ export default {
   SelectRow: 'Select row %s',
   DeleteBulk: 'Bulk Delete',
   DeleteBulkConfirm: 'Are you sure you want to bulk delete %d selected items?',
+  Refresh: 'Refresh',
   ColumnConfiguration: 'Column configuration',
   Columns: 'Columns',
   Visible: 'Visible',

package/zova/src/suite/cabloy-basic/modules/basic-table/src/config/locale/zh-cn.ts

@@ -5,6 +5,7 @@ export default {
   SelectRow: '选择行 %s',
   DeleteBulk: '批量删除',
   DeleteBulkConfirm: '您确认要批量删除已选择的 %d 项吗？',
+  Refresh: '刷新',
   ColumnConfiguration: '列配置',
   Columns: '字段',
   Visible: '显示',