diff --git a/CHANGELOG.md b/CHANGELOG.md
index c86a960452f8d33344df7baeec0ba80e6e3705ef..00c5d7798e6ce4800ee7dabe95e8fd2c89f354a4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,8 @@
 
 ### Change
 
+- 更新日历自定义选择按钮名称
+- 更新树导航引擎加载实体数据时先判断是否有主键
 - 优化按钮组和关系分页上方下拉列表 popover 关闭模式
 
 ## [0.0.28] - 2024-10-18
diff --git a/src/locale/en/index.ts b/src/locale/en/index.ts
index b056ef568da2914b9cded8336e730da6eb8a0c8f..eba606b9e8f05b11a837631de69acb24f38709b3 100644
--- a/src/locale/en/index.ts
+++ b/src/locale/en/index.ts
@@ -89,7 +89,7 @@ export default {
     calendar: {
       today: 'Today',
       pickerDate: 'Picker Date',
-      customPicker: 'Custom Picker',
+      customPicker: 'Please select a date',
     },
   },
   // 编辑器
diff --git a/src/locale/zh-CN/index.ts b/src/locale/zh-CN/index.ts
index 4e007877a5c315202f4f3b83e842010b1bc76ddb..4516cb7cd9849360fabac47f06646d7f9ee0144c 100644
--- a/src/locale/zh-CN/index.ts
+++ b/src/locale/zh-CN/index.ts
@@ -87,7 +87,7 @@ export default {
     calendar: {
       today: '今天',
       pickerDate: '选择日期',
-      customPicker: '自定义选择日期',
+      customPicker: '请选择日期',
     },
   },
   // 编辑器
diff --git a/src/view-engine/mob-tree-exp-view.engine.ts b/src/view-engine/mob-tree-exp-view.engine.ts
index daa7a6830c89aae90ad5d5430dc077cffddee633..321cfc0de0ea3aa0053d385d4184d9f68384ab04 100644
--- a/src/view-engine/mob-tree-exp-view.engine.ts
+++ b/src/view-engine/mob-tree-exp-view.engine.ts
@@ -5,6 +5,7 @@ import {
   ITreeController,
   ViewEngineBase,
   IExpBarControlController,
+  calcDeCodeNameById,
 } from '@ibiz-template/runtime';
 import { IAppDETreeExplorerView } from '@ibiz/model-core';
 
@@ -55,6 +56,10 @@ export class MobTreeExpViewEngine extends ViewEngineBase {
 
   async onMounted(): Promise<void> {
     await super.onMounted();
+    const deName = calcDeCodeNameById(this.view.model.appDataEntityId!);
+    if (!this.view.context[deName]) {
+      return;
+    }
     await this.loadEntityData();
   }
 }