From 427b71035102e596907d2f401a095d9e7535d2af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8A=A0=E4=BA=86=E8=91=B1=E8=8A=B1=E7=9A=84=E8=9B=8B?=
 =?UTF-8?q?=E7=82=92=E9=A5=AD?= <2878709960@qq.com>
Date: Fri, 18 Oct 2024 20:14:11 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=9B=B4=E6=96=B0=E6=97=A5=E5=8E=86?=
 =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E9=80=89=E6=8B=A9=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0=EF=BC=8C=E6=9B=B4=E6=96=B0=E6=A0=91=E5=AF=BC?=
 =?UTF-8?q?=E8=88=AA=E5=BC=95=E6=93=8E=E5=8A=A0=E8=BD=BD=E5=AE=9E=E4=BD=93?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=97=B6=E5=85=88=E5=88=A4=E6=96=AD=E6=98=AF?=
 =?UTF-8?q?=E5=90=A6=E6=9C=89=E4=B8=BB=E9=94=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                                | 2 ++
 src/locale/en/index.ts                      | 2 +-
 src/locale/zh-CN/index.ts                   | 2 +-
 src/view-engine/mob-tree-exp-view.engine.ts | 5 +++++
 4 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c86a9604..00c5d779 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 b056ef56..eba606b9 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 4e007877..4516cb7c 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 daa7a683..321cfc0d 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();
   }
 }
-- 
Gitee