cabloy 5.1.136 → 5.1.138

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

@@ -4,15 +4,15 @@ export * from '../component/formFieldInput/controller.jsx';
 
 import 'zova';
 declare module 'zova' {
-  
-  
+
+
 }
 declare module 'zova-module-basic-input' {
-  
+
         export interface ControllerFormFieldInput {
           /** @internal */
           get scope(): ScopeModuleBasicInput;
-        } 
+        }
 }
 /** controller: end */
 /** controller: begin */
@@ -57,12 +57,12 @@ declare module 'zova' {
   export interface IBeanScopeRecord {
     'basic-input': ScopeModuleBasicInput;
   }
-  
-  
 
-  
 
-  
+
+
+
+
 }
-  
+
 /** scope: end */

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

@@ -4,15 +4,15 @@ export * from '../model/metrics.js';
 import { IModelOptionsMetrics } from '../model/metrics.js';
 import 'zova-module-a-model';
 declare module 'zova-module-a-model' {
-  
+
     export interface IModelRecord {
       'basic-metrics:metrics': IModelOptionsMetrics;
     }
 
-  
+
 }
 declare module 'zova-module-basic-metrics' {
-  
+
         export interface ModelMetrics {
           /** @internal */
           get scope(): ScopeModuleBasicMetrics;
@@ -22,7 +22,7 @@ declare module 'zova-module-basic-metrics' {
           get $beanFullName(): 'basic-metrics.model.metrics';
           get $onionName(): 'basic-metrics:metrics';
           get $onionOptions(): IModelOptionsMetrics;
-        } 
+        }
 }
 /** model: end */
 /** model: begin */
@@ -39,11 +39,11 @@ export * from '../api/basicMetricsMetrics.js';
 
 import 'zova';
 declare module 'zova' {
-  
-  
+
+
 }
 declare module 'zova-module-basic-metrics' {
-  
+
         export interface ApiBasicMetricsMetrics {
           /** @internal */
           get scope(): ScopeModuleBasicMetrics;
@@ -52,8 +52,8 @@ declare module 'zova-module-basic-metrics' {
         export interface ApiBasicMetricsMetrics {
           get $beanFullName(): 'basic-metrics.api.basicMetricsMetrics';
           get $onionName(): 'basic-metrics:basicMetricsMetrics';
-          
-        } 
+
+        }
 }
 /** api: end */
 /** api: begin */
@@ -79,15 +79,15 @@ export * from '../page/dashboard/controller.jsx';
 
 import 'zova';
 declare module 'zova' {
-  
-  
+
+
 }
 declare module 'zova-module-basic-metrics' {
-  
+
         export interface ControllerPageDashboard {
           /** @internal */
           get scope(): ScopeModuleBasicMetrics;
-        } 
+        }
 }
 /** controller: end */
 /** controller: begin */
@@ -109,7 +109,7 @@ export interface IPagePathRecord {
   '/basic/metrics/dashboard': TypePagePathSchema<undefined,undefined>;
 }
 export interface IPageNameRecord {
-  
+
 }
 }
 export const pagePathSchemas = {
@@ -119,7 +119,7 @@ export const pageNameSchemas = {
 
 };
 declare module 'zova-module-basic-metrics' {
-  
+
 }
 /** pages: end */
 
@@ -140,12 +140,12 @@ declare module 'zova' {
   export interface IBeanScopeRecord {
     'basic-metrics': ScopeModuleBasicMetrics;
   }
-  
-  
 
-  
 
-  
+
+
+
+
 }
 
 /** scope: end */

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

@@ -9,11 +9,11 @@ export * from '../component/blockToolbarBulk/controller.jsx';
 
 import 'zova';
 declare module 'zova' {
-  
-  
+
+
 }
 declare module 'zova-module-basic-page' {
-  
+
         export interface ControllerBlockFilter {
           /** @internal */
           get scope(): ScopeModuleBasicPage;
@@ -42,7 +42,7 @@ declare module 'zova-module-basic-page' {
         export interface ControllerBlockToolbarBulk {
           /** @internal */
           get scope(): ScopeModuleBasicPage;
-        } 
+        }
 }
 /** controller: end */
 /** controller: begin */
@@ -126,17 +126,17 @@ declare module 'zova' {
   export interface IBeanScopeRecord {
     'basic-page': ScopeModuleBasicPage;
   }
-  
-  
+
+
 
   export interface IBeanScopeLocale {
     'basic-page': (typeof locales)[TypeLocaleBase];
   }
 
-  
+
 }
 
 export function locale<K extends keyof (typeof locales)[TypeLocaleBase]>(key: K): `basic-page::${K}` {
   return `basic-page::${key}`;
-}  
+}
 /** scope: end */

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

@@ -6,11 +6,11 @@ export * from '../component/blockToolbarRow/controller.jsx';
 
 import 'zova';
 declare module 'zova' {
-  
-  
+
+
 }
 declare module 'zova-module-basic-pageentry' {
-  
+
         export interface ControllerBlockForm {
           /** @internal */
           get scope(): ScopeModuleBasicPageentry;
@@ -24,7 +24,7 @@ declare module 'zova-module-basic-pageentry' {
         export interface ControllerBlockToolbarRow {
           /** @internal */
           get scope(): ScopeModuleBasicPageentry;
-        } 
+        }
 }
 /** controller: end */
 /** controller: begin */
@@ -87,17 +87,17 @@ declare module 'zova' {
   export interface IBeanScopeRecord {
     'basic-pageentry': ScopeModuleBasicPageentry;
   }
-  
-  
+
+
 
   export interface IBeanScopeLocale {
     'basic-pageentry': (typeof locales)[TypeLocaleBase];
   }
 
-  
+
 }
 
 export function locale<K extends keyof (typeof locales)[TypeLocaleBase]>(key: K): `basic-pageentry::${K}` {
   return `basic-pageentry::${key}`;
-}  
+}
 /** scope: end */

package/zova/src/suite/cabloy-basic/modules/basic-pageentry/src/component/blockToolbarRow/controller.tsx

@@ -45,8 +45,12 @@ export class ControllerBlockToolbarRow extends BeanControllerBase {
   }
 
   private _renderActions() {
-    const { $jsx, $celScope } = this.$$renderContext;
+    const { $jsx, $celScope, $$pageEntry } = this.$$renderContext;
     const actions = this.$props.actions;
+    const currentData =
+      $$pageEntry.formMeta.editMode === 'create'
+        ? undefined
+        : ($$pageEntry.formData as Record<string, unknown> | undefined);
     if (!actions || actions.length === 0) return;
     const domActions: VNode[] = [];
     actions.forEach((action, index) => {
@@ -55,7 +59,10 @@ export class ControllerBlockToolbarRow extends BeanControllerBase {
       // check formScene
       if (!this._checkFormScene(permissionHint)) return;
       // check permission
-      if (!this.$passport.checkPermission(this.permissions, actionName, permissionHint)) return;
+      if (
+        !this.$passport.checkPermission(this.permissions, actionName, permissionHint, currentData)
+      )
+        return;
       const options = Object.assign({ key: index }, action.options);
       const domAction = $jsx.render(action.render!, options, $celScope, this.$$renderContext);
       if (!domAction) return;

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

@@ -4,15 +4,15 @@ export * from '../component/formFieldResourcePicker/controller.jsx';
 
 import 'zova';
 declare module 'zova' {
-  
-  
+
+
 }
 declare module 'zova-module-basic-resource' {
-  
+
         export interface ControllerFormFieldResourcePicker {
           /** @internal */
           get scope(): ScopeModuleBasicResource;
-        } 
+        }
 }
 /** controller: end */
 /** controller: begin */
@@ -46,15 +46,15 @@ export * from '../bean/tableCell.resourcePicker.jsx';
 import { ITableCellOptionsResourcePicker } from '../bean/tableCell.resourcePicker.jsx';
 import 'zova-module-a-table';
 declare module 'zova-module-a-table' {
-  
+
     export interface ITableCellRecord {
       'basic-resource:resourcePicker': ITableCellOptionsResourcePicker;
     }
 
-  
+
 }
 declare module 'zova-module-basic-resource' {
-  
+
         export interface TableCellResourcePicker {
           /** @internal */
           get scope(): ScopeModuleBasicResource;
@@ -64,7 +64,7 @@ declare module 'zova-module-basic-resource' {
           get $beanFullName(): 'basic-resource.tableCell.resourcePicker';
           get $onionName(): 'basic-resource:resourcePicker';
           get $onionOptions(): ITableCellOptionsResourcePicker;
-        } 
+        }
 }
 /** tableCell: end */
 /** tableCell: begin */
@@ -92,12 +92,12 @@ declare module 'zova' {
   export interface IBeanScopeRecord {
     'basic-resource': ScopeModuleBasicResource;
   }
-  
-  
 
-  
 
-  
+
+
+
+
 }
-  
+
 /** scope: end */

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

@@ -5,11 +5,11 @@ export * from '../component/select/controller.jsx';
 
 import 'zova';
 declare module 'zova' {
-  
-  
+
+
 }
 declare module 'zova-module-basic-select' {
-  
+
         export interface ControllerFormFieldSelect {
           /** @internal */
           get scope(): ScopeModuleBasicSelect;
@@ -18,7 +18,7 @@ declare module 'zova-module-basic-select' {
         export interface ControllerSelect {
           /** @internal */
           get scope(): ScopeModuleBasicSelect;
-        } 
+        }
 }
 /** controller: end */
 /** controller: begin */
@@ -59,15 +59,15 @@ export * from '../bean/tableCell.select.jsx';
 import { ITableCellOptionsSelect } from '../bean/tableCell.select.jsx';
 import 'zova-module-a-table';
 declare module 'zova-module-a-table' {
-  
+
     export interface ITableCellRecord {
       'basic-select:select': ITableCellOptionsSelect;
     }
 
-  
+
 }
 declare module 'zova-module-basic-select' {
-  
+
         export interface TableCellSelect {
           /** @internal */
           get scope(): ScopeModuleBasicSelect;
@@ -77,7 +77,7 @@ declare module 'zova-module-basic-select' {
           get $beanFullName(): 'basic-select.tableCell.select';
           get $onionName(): 'basic-select:select';
           get $onionOptions(): ITableCellOptionsSelect;
-        } 
+        }
 }
 /** tableCell: end */
 /** tableCell: begin */
@@ -105,12 +105,12 @@ declare module 'zova' {
   export interface IBeanScopeRecord {
     'basic-select': ScopeModuleBasicSelect;
   }
-  
-  
 
-  
 
-  
+
+
+
+
 }
-  
+
 /** scope: end */

package/zova/src/suite/cabloy-basic/modules/basic-select/src/bean/tableCell.select.tsx

@@ -9,6 +9,7 @@ import { BeanBase } from 'zova';
 import { TableCell } from 'zova-module-a-table';
 
 import { ZSelectProps } from '../.metadata/index.js';
+import { isSelectValueEqual } from '../lib/utils.js';
 
 declare module 'zova-module-a-openapi' {
   export interface IResourceTableCellRecord {
@@ -34,9 +35,7 @@ export class TableCellSelect extends BeanBase implements ITableCellRender {
     const itemTitle = options.itemTitle;
     const item = items?.find(item => {
       const itemValue2 = item[String(itemValue)];
-      if (String(itemValue2) === String(value)) return true;
-      if (typeof itemValue2 !== 'boolean') return false;
-      return itemValue2 ? value === 1 || value === '1' : value === 0 || value === '0';
+      return isSelectValueEqual(itemValue2, value);
     });
     const value2 = item?.[String(itemTitle)];
     if (!options.class) return value2;

package/zova/src/suite/cabloy-basic/modules/basic-select/src/component/formFieldSelect/controller.tsx

@@ -8,6 +8,7 @@ import { Controller } from 'zova-module-a-bean';
 import { ZFormField, ZFormFieldPreset } from 'zova-module-a-form';
 
 import { ZSelect, ZSelectProps } from '../../.metadata/component/select.js';
+import { isSelectValueEqual } from '../../lib/utils.js';
 
 declare module 'zova-module-a-openapi' {
   export interface IResourceFormFieldRecord {
@@ -106,9 +107,7 @@ export class ControllerFormFieldSelect extends BeanControllerBase {
     const value = this.$props.value;
     const item = this.$props.options.items?.find(item => {
       const itemValue = item[String(this.$props.options.itemValue)];
-      if (String(itemValue) === String(value)) return true;
-      if (typeof itemValue !== 'boolean') return false;
-      return itemValue ? value === 1 || value === '1' : value === 0 || value === '0';
+      return isSelectValueEqual(itemValue, value);
     });
     return item?.[String(this.$props.options.itemTitle)];
   }

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

@@ -3,6 +3,8 @@ import { VNode } from 'vue';
 import { BeanControllerBase } from 'zova';
 import { Controller } from 'zova-module-a-bean';
 
+import { isSelectValueEqual } from '../../lib/utils.js';
+
 export interface ControllerSelectProps {
   placeholder?: string;
   items?: any[] | undefined;
@@ -60,19 +62,16 @@ export class ControllerSelect extends BeanControllerBase {
       color: selectColor,
     };
     const domOptions: VNode[] = [];
-    const modelValueDom = isNil(this.modelValue) ? '' : String(this.modelValue);
+    let modelValueDom = '';
     if (items) {
       for (const item of items) {
         const title = item[itemTitle];
         const value = item[itemValue];
         const valueDom = isNil(value) ? '' : String(value);
+        const selected = isSelectValueEqual(value, this.modelValue);
+        if (selected) modelValueDom = valueDom;
         domOptions.push(
-          <option
-            key={valueDom}
-            value={valueDom}
-            selected={modelValueDom === valueDom}
-            style={optionStyle}
-          >
+          <option key={valueDom} value={valueDom} selected={selected} style={optionStyle}>
             {title}
           </option>,
         );
@@ -81,6 +80,7 @@ export class ControllerSelect extends BeanControllerBase {
     return (
       <select
         {...props}
+        value={modelValueDom}
         style={selectStyle}
         onChange={(e: Event) => {
           const selectedValue = (e.target as HTMLSelectElement).value;

package/zova/src/suite/cabloy-basic/modules/basic-select/src/lib/utils.ts

@@ -0,0 +1,5 @@
+export function isSelectValueEqual(itemValue: unknown, value: unknown): boolean {
+  if (String(itemValue) === String(value)) return true;
+  if (typeof itemValue !== 'boolean') return false;
+  return itemValue ? value === 1 || value === '1' : value === 0 || value === '0';
+}

package/zova/src/suite/cabloy-basic/modules/basic-select/test/lib/utils.test.ts

@@ -0,0 +1,28 @@
+import assert from 'node:assert/strict';
+import test from 'node:test';
+
+import { isSelectValueEqual } from '../../src/lib/utils.js';
+
+test('Select values preserve standard string matching', () => {
+  assert.equal(isSelectValueEqual(7, '7'), true);
+  assert.equal(isSelectValueEqual('active', 'active'), true);
+  assert.equal(isSelectValueEqual('active', 'inactive'), false);
+});
+
+test('Select boolean items match SQLite boolean values', () => {
+  assert.equal(isSelectValueEqual(true, true), true);
+  assert.equal(isSelectValueEqual(true, 1), true);
+  assert.equal(isSelectValueEqual(true, '1'), true);
+  assert.equal(isSelectValueEqual(false, false), true);
+  assert.equal(isSelectValueEqual(false, 0), true);
+  assert.equal(isSelectValueEqual(false, '0'), true);
+});
+
+test('Select boolean items reject incompatible values', () => {
+  assert.equal(isSelectValueEqual(true, 0), false);
+  assert.equal(isSelectValueEqual(true, '0'), false);
+  assert.equal(isSelectValueEqual(false, 1), false);
+  assert.equal(isSelectValueEqual(false, '1'), false);
+  assert.equal(isSelectValueEqual(true, 'true'), true);
+  assert.equal(isSelectValueEqual(false, 'false'), true);
+});

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

@@ -5,11 +5,11 @@ export * from '../component/table/controller.jsx';
 
 import 'zova';
 declare module 'zova' {
-  
-  
+
+
 }
 declare module 'zova-module-basic-table' {
-  
+
         export interface ControllerActionCreate {
           /** @internal */
           get scope(): ScopeModuleBasicTable;
@@ -18,7 +18,7 @@ declare module 'zova-module-basic-table' {
         export interface ControllerTable {
           /** @internal */
           get scope(): ScopeModuleBasicTable;
-        } 
+        }
 }
 /** controller: end */
 /** controller: begin */
@@ -59,15 +59,15 @@ export * from '../component/table/render.jsx';
 
 import 'zova';
 declare module 'zova' {
-  
-  
+
+
 }
 declare module 'zova-module-basic-table' {
-  
+
         export interface RenderTable {
           /** @internal */
           get scope(): ScopeModuleBasicTable;
-        } 
+        }
 }
 /** render: end */
 /** render: begin */
@@ -90,7 +90,7 @@ import { ITableCellOptionsActionUpdate } from '../bean/tableCell.actionUpdate.js
 import { ITableCellOptionsActionView } from '../bean/tableCell.actionView.jsx';
 import 'zova-module-a-table';
 declare module 'zova-module-a-table' {
-  
+
     export interface ITableCellRecord {
       'basic-table:actionDelete': ITableCellOptionsActionDelete;
 'basic-table:actionOperationsRow': ITableCellOptionsActionOperationsRow;
@@ -98,10 +98,10 @@ declare module 'zova-module-a-table' {
 'basic-table:actionView': ITableCellOptionsActionView;
     }
 
-  
+
 }
 declare module 'zova-module-basic-table' {
-  
+
         export interface TableCellActionDelete {
           /** @internal */
           get scope(): ScopeModuleBasicTable;
@@ -144,7 +144,7 @@ declare module 'zova-module-basic-table' {
           get $beanFullName(): 'basic-table.tableCell.actionView';
           get $onionName(): 'basic-table:actionView';
           get $onionOptions(): ITableCellOptionsActionView;
-        } 
+        }
 }
 /** tableCell: end */
 /** tableCell: begin */
@@ -182,17 +182,17 @@ declare module 'zova' {
   export interface IBeanScopeRecord {
     'basic-table': ScopeModuleBasicTable;
   }
-  
-  
+
+
 
   export interface IBeanScopeLocale {
     'basic-table': (typeof locales)[TypeLocaleBase];
   }
 
-  
+
 }
 
 export function locale<K extends keyof (typeof locales)[TypeLocaleBase]>(key: K): `basic-table::${K}` {
   return `basic-table::${key}`;
-}  
+}
 /** scope: end */

package/zova/src/suite/cabloy-basic/modules/basic-table/src/bean/tableCell.actionOperationsRow.tsx

@@ -59,14 +59,16 @@ export class TableCellActionOperationsRow extends BeanBase implements ITableCell
     const permissions = $celScope.permissions;
     const actions = options.actions;
     if (!actions || actions.length === 0) return;
+    const data = renderContext.cellContext.row.original as Record<string, unknown>;
     const domActions: VNode[] = [];
     actions.forEach((action, index) => {
       const actionName = action.name;
       const permissionHint = action.options?.permission;
-      if (!$host.$passport.checkPermission(permissions, actionName, permissionHint)) return;
+      if (!$host.$passport.checkPermission(permissions, actionName, permissionHint, data)) return;
       const options2 = Object.assign({ key: index }, action.options);
       domActions.push($$table.cellRender(action.render!, options2, renderContext));
     });
+    if (domActions.length === 0) return;
     return <div class={options.class}>{domActions}</div>;
   }
 }