Merge branch 'lwx_v8'

src/components/DesignForm/formControlPropertiNew.vue

@@ -956,7 +956,7 @@ const attrList = computed(() => {
                     isNum: true
                 },
                 {
-                    label: '显示类型',
+                    label: 'type',
                     value: control.type,
                     path: 'control.type',
                     vShow: ['datePicker'],
@@ -974,7 +974,7 @@ const attrList = computed(() => {
                     }
                 },
                 {
-                    label: '时间格式',
+                    label: 'format',
                     value: control.format,
                     path: 'control.format',
                     vShow: ['datePicker', 'timePicker'],