Merge branch 'master' of http://prodog.leanwo.com:3000/client-2022/pc-component-v3

# Conflicts:
#	packages/modal/src/Modal.vue

packages/i18n/en-US.js

@@ -59,6 +59,12 @@ const lang = {
   imagePreview: {
     imagePreview: 'Image preview',
   },
+
+  modal: {
+    confirm: 'Confirm',
+    cancel: 'Cancel',
+    close: 'Close',
+  },
 };
 
 export default {

packages/i18n/zh-CN.js

@@ -60,6 +60,12 @@ const lang = {
   imagePreview: {
     imagePreview: '图片预览',
   },
+
+  modal: {
+    confirm: '确定',
+    cancel: '取消',
+    close: '关闭',
+  },
 };
 
 

packages/info/src/InfoHeader.vue

@@ -114,6 +114,7 @@
 <script>
 
 import draggable from 'vuedraggable';
+import Language from '../../common/Language.js';
 
 export default {
 
@@ -147,6 +148,7 @@ export default {
   emits: ['gridFieldPropertyChanged', 'filterFieldPropertyChanged'],
     
   data: function () {
+    this.Language = Language;
     return {
       sortMap: {},
       infoFilterFieldsClone: [],
@@ -180,7 +182,7 @@ export default {
           var fieldClone = {
             'key': ('InfoFormField' + '_' + _self.infoWindowNo + '_' + _self.infoFilterFields[i].fieldName),
             'fieldName': _self.infoFilterFields[i].fieldName,
-            'name': _self.infoFilterFields[i].name,
+            'name': Language.getNameTrl(_self.$i18n.locale, _self.infoFilterFields[i]),
             'mandatory': _self.infoFilterFields[i].mandatory,
             'isShow': _self.infoFilterFields[i].isShow,
             'sortNo': _self.infoFilterFields[i].sortNo,
@@ -210,7 +212,7 @@ export default {
           var fieldClone = {
             'key': ('InfoGridField' + '_' + _self.infoWindowNo + '_' + _self.infoGridFields[i].fieldName),
             'fieldName': _self.infoGridFields[i].fieldName,
-            'name': _self.infoGridFields[i].name,
+            'name': Language.getNameTrl(_self.$i18n.locale, _self.infoGridFields[i]),
             'mandatory': _self.infoGridFields[i].mandatory,
             'isShow': _self.infoGridFields[i].isShow,
             'sortNo': _self.infoGridFields[i].sortNo,

packages/info/src/QueryPage.vue

@@ -15,7 +15,7 @@
           <InfoHeader
             :html-help-url="infoWindowDto.htmlHelpUrl"
             :info-grid-fields="infoGridFields"
-            :header-name="infoWindowDto.name"
+            :header-name="Language.getNameTrl($i18n.locale, infoWindowDto)"
             :info-filter-fields="infoFilterFields"
             :info-window-no="infoWindowDto.no"
             @filter-field-property-changed="filterFieldPropertyChanged($event)"

packages/modal/src/Modal.vue

@@ -122,9 +122,9 @@ export default {
 
   data: function () {
     return {
-      okText: '确定(OK)',
-      cancelText: '取消(Cancel)',
-      closeText: '关闭(Close)',
+      okText: this.$t('lang.modal.confirm'),
+      cancelText: this.$t('lang.modal.cancel'),
+      closeText: this.$t('lang.modal.close'),
       okClass: '',
       cancelClass: '',
       closeClass: '',

packages/process/src/ProcessReportDynamic.vue

@@ -61,7 +61,6 @@
               type-bold="true"
               @change="valueChanged(item)"
             />
-
             <DateTime
               v-if="item.displayType =='DateTimeBoxEditor'"
               :id="'editor_' + item.id"
@@ -71,6 +70,15 @@
               @update:model-value="changeValue(item, $event)"
             />
 
+            <!-- 日期选择器  -->
+            <Date
+              v-if="item.displayType =='DateBoxEditor'"
+              :id="'DateBoxEditor_' + item.id"
+              v-model="item.fieldValue.displayValue[0]"
+              class="m-input-group"
+              @update:model-value="changeValue(item, $event)"
+            />
+
             <EnumSelectWidget
               v-if="item.displayType =='ListBoxEnumEditor'"
               :field="item"
@@ -148,6 +156,7 @@ import Common from '../../common/Common.js';
 
 import Navbar from '../../navbar/src/Navbar.vue';
 import DateTime from '../../datetime/src/DateTime.vue';
+import Date from '../../date/src/Date.vue';
 import Loading from '../../loading/src/Loading.vue';
 import ProcessReportResultPreview from './ProcessReportResultPreview.vue';
 import SearchWidget from '../../info/src/SearchWidget.vue';
@@ -159,6 +168,7 @@ export default {
 
   components: {
     DateTime,
+    Date,
     MultiSearchWidget : defineAsyncComponent(() =>
       import('../../info/src/MultiSearchWidget.vue'),
     ),

packages/process/src/ProcessReportStatic.vue

@@ -58,7 +58,7 @@
               placeholder="请输入数字"
               @change="valueChanged(item)"
             />
-
+            {{ item.displayType }}
             <Switches
               v-if="item.displayType =='CheckBoxEditor'"
               v-model="item.fieldValue.displayValue[0]"
@@ -103,6 +103,13 @@
               @value-changed="tabValueChanged($event, item)"
             />
 
+            <!-- 日期选择器  -->
+            <Date
+              v-if="item.displayType =='DateBoxEditor'"
+              v-model="item.fieldValue.displayValue[0]"
+              @selected="changeValue(item, $event)"
+            />
+
             <VueMonthlyPicker
               v-if="item.displayType =='YearMonthEditor'"
               :value="item.fieldValue.displayValue[0]"
@@ -153,6 +160,7 @@ import { defineAsyncComponent } from 'vue';
 
 import moment from 'moment';
 import Common from '../../common/Common.js';
+import Date from '../../date/src/Date.vue';
 import DateTime from '../../datetime/src/DateTime.vue';
 import YearPicker from '../../year-picker/src/YearPicker.vue';
 import Loading from '../../loading/src/Loading.vue';