diff --git a/packages/ui-vue/components/code-editor/src/code-textbox.component.tsx b/packages/ui-vue/components/code-editor/src/code-textbox.component.tsx
index a4c4011e73ace8e9503290e6d72f043702eb374a..ebb26d72de66238a4c1e0a02b632a70b34ac8c3d 100644
--- a/packages/ui-vue/components/code-editor/src/code-textbox.component.tsx
+++ b/packages/ui-vue/components/code-editor/src/code-textbox.component.tsx
@@ -74,8 +74,8 @@ export default defineComponent({
             fitContent: false,
             showHeader: true,
             showCloseButton: true,
-            showMaxButton: false,
-            resizeable: false,
+            showMaxButton: true,
+            resizeable: true,
             draggable: true,
             buttons: [
                 {
diff --git a/packages/ui-vue/components/date-picker/src/components/date-picker-container/date-picker-container.component.tsx b/packages/ui-vue/components/date-picker/src/components/date-picker-container/date-picker-container.component.tsx
index be9d3644951c29b73db44dc65fbce05bcbe3487c..2c304ce53b823d00a55e5f43ba35627902a206c5 100644
--- a/packages/ui-vue/components/date-picker/src/components/date-picker-container/date-picker-container.component.tsx
+++ b/packages/ui-vue/components/date-picker/src/components/date-picker-container/date-picker-container.component.tsx
@@ -1262,7 +1262,7 @@ export default defineComponent({
                             {enablePeriod.value && selectMode.value === 'day' && <div class="d-flex f-utils-fill" style="justify-content:center">
                                 <button class="btn btn-link" onClick={navigateToTimeView}>{toggleDateAndTimeLabel.value}</button></div>
                             }
-                            <FButton onClick={onConfirm} style={canConfirm.value}>确定</FButton>
+                            <FButton onClick={onConfirm} style={canConfirm.value}>{props.locales.buttons.commit}</FButton>
                         </div>
                         
                     }
diff --git a/packages/ui-vue/components/time-picker/src/property-config/time-picker.property-config.ts b/packages/ui-vue/components/time-picker/src/property-config/time-picker.property-config.ts
index d9f3a937b4786e206f44be31cea4a09f528d7f97..9712f9aa72394fa5a038ea1c0c5146f0592f7adf 100644
--- a/packages/ui-vue/components/time-picker/src/property-config/time-picker.property-config.ts
+++ b/packages/ui-vue/components/time-picker/src/property-config/time-picker.property-config.ts
@@ -13,6 +13,12 @@ export class TimePickerProperty extends InputBaseProperty {
                 title: "允许编辑",
                 type: "boolean"
             },
+            use12Hours: {
+                description: "",
+                title: "是否使用12小时制",
+                type: "boolean",
+                refreshPanelAfterChanged: true
+            },
             format: {
                 description: "",
                 title: "格式",
@@ -21,7 +27,10 @@ export class TimePickerProperty extends InputBaseProperty {
                     type: "combo-list",
                     textField: "name",
                     valueField: "value",
-                    data: [
+                    data: propertyData.editor.use12Hours? [
+                        { value: "hh:mm:ss", name: "hh:mm:ss" },
+                        { value: "hh:mm", name: "hh:mm" }
+                    ]: [
                         { value: "HH:mm:ss", name: "HH:mm:ss" },
                         { value: "HH:mm", name: "HH:mm" }
                     ]
@@ -32,11 +41,6 @@ export class TimePickerProperty extends InputBaseProperty {
                 title: "是否显示时分秒标题",
                 type: "boolean"
             },
-            use12Hours: {
-                description: "",
-                title: "是否使用12小时制",
-                type: "boolean"
-            },
             hourStep: {
                 description: "",
                 title: "时步长",
@@ -67,6 +71,11 @@ export class TimePickerProperty extends InputBaseProperty {
                     useThousands: false
                 }
             }
+        }, (changeObject, propertyData) => {
+            if (changeObject.propertyID === "use12Hours") {
+                propertyData.editor.format = propertyData.editor.format || "hh:mm:ss";
+                propertyData.editor.format = changeObject.propertyValue? propertyData.editor.format.replace("HH", "hh"): propertyData.editor.format.replace("hh", "HH");
+            }
         });
     }
 };