mirror of
https://github.com/MHSanaei/3x-ui.git
synced 2025-04-20 05:52:24 +00:00
persian datepicker bug fixed (#1668)
* add single client bug fixed * persian datepicker bug fixed
This commit is contained in:
parent
538fc9b365
commit
c1422be269
11 changed files with 15 additions and 7 deletions
|
@ -106,7 +106,7 @@
|
||||||
</template>
|
</template>
|
||||||
<a-date-picker v-if="datepicker == 'gregorian'" :show-time="{ format: 'HH:mm:ss' }" format="YYYY-MM-DD HH:mm:ss"
|
<a-date-picker v-if="datepicker == 'gregorian'" :show-time="{ format: 'HH:mm:ss' }" format="YYYY-MM-DD HH:mm:ss"
|
||||||
:dropdown-class-name="themeSwitcher.currentTheme" v-model="clientsBulkModal.expiryTime"></a-date-picker>
|
:dropdown-class-name="themeSwitcher.currentTheme" v-model="clientsBulkModal.expiryTime"></a-date-picker>
|
||||||
<persian-datepicker v-else :dropdown-class-name="themeSwitcher.currentTheme"
|
<persian-datepicker v-else placeholder='{{ i18n "pages.settings.datepickerPlaceholder" }}'
|
||||||
value="clientsBulkModal.expiryTime" v-model="clientsBulkModal.expiryTime"></persian-datepicker>
|
value="clientsBulkModal.expiryTime" v-model="clientsBulkModal.expiryTime"></persian-datepicker>
|
||||||
</a-form-item>
|
</a-form-item>
|
||||||
<a-form-item v-if="clientsBulkModal.expiryTime != 0">
|
<a-form-item v-if="clientsBulkModal.expiryTime != 0">
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
<div>
|
<div>
|
||||||
<a-input :value="value" type="text" v-model="date" data-jdp class="persian-datepicker"
|
<a-input :value="value" type="text" v-model="date" data-jdp class="persian-datepicker"
|
||||||
@input="$emit('input', convertToGregorian($event.target.value)); jalaliDatepicker.hide();"
|
@input="$emit('input', convertToGregorian($event.target.value)); jalaliDatepicker.hide();"
|
||||||
placeholder="انتخاب تاریخ">
|
:placeholder="placeholder">
|
||||||
<template #addonAfter>
|
<template #addonAfter>
|
||||||
<a-icon type="calendar" style="font-size: 16px;"/>
|
<a-icon type="calendar" style="font-size: 16px;"/>
|
||||||
</template>
|
</template>
|
||||||
|
@ -21,7 +21,7 @@
|
||||||
const persianDatepicker = {};
|
const persianDatepicker = {};
|
||||||
|
|
||||||
Vue.component('persian-datepicker', {
|
Vue.component('persian-datepicker', {
|
||||||
props: ['dropdown-class-name', 'format', 'value'],
|
props: ['placeholder', 'format', 'value'],
|
||||||
template: `{{template "component/persianDatepickerTemplate"}}`,
|
template: `{{template "component/persianDatepickerTemplate"}}`,
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
|
@ -48,7 +48,7 @@
|
||||||
listenToDatepicker() {
|
listenToDatepicker() {
|
||||||
jalaliDatepicker.startWatch({
|
jalaliDatepicker.startWatch({
|
||||||
time: true,
|
time: true,
|
||||||
container: '.ant-modal-wrap',
|
zIndex: '9999',
|
||||||
hideAfterChange: true,
|
hideAfterChange: true,
|
||||||
useDropDownYears: false,
|
useDropDownYears: false,
|
||||||
changeMonthRotateYear: true,
|
changeMonthRotateYear: true,
|
||||||
|
|
|
@ -11,6 +11,7 @@
|
||||||
function createThemeSwitcher() {
|
function createThemeSwitcher() {
|
||||||
const isDarkTheme = localStorage.getItem('dark-mode') === 'true';
|
const isDarkTheme = localStorage.getItem('dark-mode') === 'true';
|
||||||
const theme = isDarkTheme ? 'dark' : 'light';
|
const theme = isDarkTheme ? 'dark' : 'light';
|
||||||
|
document.querySelector('body').setAttribute('class', theme)
|
||||||
return {
|
return {
|
||||||
isDarkTheme,
|
isDarkTheme,
|
||||||
get currentTheme() {
|
get currentTheme() {
|
||||||
|
@ -19,6 +20,7 @@
|
||||||
toggleTheme() {
|
toggleTheme() {
|
||||||
this.isDarkTheme = !this.isDarkTheme;
|
this.isDarkTheme = !this.isDarkTheme;
|
||||||
localStorage.setItem('dark-mode', this.isDarkTheme);
|
localStorage.setItem('dark-mode', this.isDarkTheme);
|
||||||
|
document.querySelector('body').setAttribute('class', this.isDarkTheme ? 'dark' : 'light')
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -164,7 +164,7 @@
|
||||||
</template>
|
</template>
|
||||||
<a-date-picker v-if="datepicker == 'gregorian'" :show-time="{ format: 'HH:mm:ss' }" format="YYYY-MM-DD HH:mm:ss"
|
<a-date-picker v-if="datepicker == 'gregorian'" :show-time="{ format: 'HH:mm:ss' }" format="YYYY-MM-DD HH:mm:ss"
|
||||||
:dropdown-class-name="themeSwitcher.currentTheme" v-model="client._expiryTime"></a-date-picker>
|
:dropdown-class-name="themeSwitcher.currentTheme" v-model="client._expiryTime"></a-date-picker>
|
||||||
<persian-datepicker v-else :dropdown-class-name="themeSwitcher.currentTheme"
|
<persian-datepicker v-else placeholder='{{ i18n "pages.settings.datepickerPlaceholder" }}'
|
||||||
value="client._expiryTime" v-model="client._expiryTime"></persian-datepicker>
|
value="client._expiryTime" v-model="client._expiryTime"></persian-datepicker>
|
||||||
<a-tag color="red" v-if="isEdit && isExpiry">Expired</a-tag>
|
<a-tag color="red" v-if="isEdit && isExpiry">Expired</a-tag>
|
||||||
</a-form-item>
|
</a-form-item>
|
||||||
|
|
|
@ -57,8 +57,8 @@
|
||||||
<a-date-picker v-if="datepicker == 'gregorian'" :show-time="{ format: 'HH:mm:ss' }" format="YYYY-MM-DD HH:mm:ss"
|
<a-date-picker v-if="datepicker == 'gregorian'" :show-time="{ format: 'HH:mm:ss' }" format="YYYY-MM-DD HH:mm:ss"
|
||||||
:dropdown-class-name="themeSwitcher.currentTheme"
|
:dropdown-class-name="themeSwitcher.currentTheme"
|
||||||
v-model="dbInbound._expiryTime"></a-date-picker>
|
v-model="dbInbound._expiryTime"></a-date-picker>
|
||||||
<persian-datepicker v-else :dropdown-class-name="themeSwitcher.currentTheme"
|
<persian-datepicker v-else placeholder='{{ i18n "pages.settings.datepickerPlaceholder" }}'
|
||||||
value="dbInbound._expiryTime" v-model="dbInbound._expiryTime"></persian-datepicker>
|
value="dbInbound._expiryTime" v-model="dbInbound._expiryTime"></persian-datepicker>
|
||||||
</a-form-item>
|
</a-form-item>
|
||||||
</a-form>
|
</a-form>
|
||||||
|
|
||||||
|
|
|
@ -251,6 +251,7 @@
|
||||||
"pageSizeDesc" = "Define page size for inbounds table. (0 = disable)"
|
"pageSizeDesc" = "Define page size for inbounds table. (0 = disable)"
|
||||||
"remarkModel" = "Remark Model & Separation Character"
|
"remarkModel" = "Remark Model & Separation Character"
|
||||||
"datepicker" = "Calendar Type"
|
"datepicker" = "Calendar Type"
|
||||||
|
"datepickerPlaceholder" = "Select date"
|
||||||
"datepickerDescription" = "Scheduled tasks will run based on this calendar."
|
"datepickerDescription" = "Scheduled tasks will run based on this calendar."
|
||||||
"sampleRemark" = "Sample Remark"
|
"sampleRemark" = "Sample Remark"
|
||||||
"oldUsername" = "Current Username"
|
"oldUsername" = "Current Username"
|
||||||
|
|
|
@ -251,6 +251,7 @@
|
||||||
"pageSizeDesc" = "Defina el tamaño de página para la tabla de entradas. Establezca 0 para desactivar"
|
"pageSizeDesc" = "Defina el tamaño de página para la tabla de entradas. Establezca 0 para desactivar"
|
||||||
"remarkModel" = "Modelo de observación y carácter de separación"
|
"remarkModel" = "Modelo de observación y carácter de separación"
|
||||||
"datepicker" = "selector de fechas"
|
"datepicker" = "selector de fechas"
|
||||||
|
"datepickerPlaceholder" = "Seleccionar fecha"
|
||||||
"datepickerDescription" = "El tipo de calendario selector especifica la fecha de vencimiento"
|
"datepickerDescription" = "El tipo de calendario selector especifica la fecha de vencimiento"
|
||||||
"sampleRemark" = "Observación de muestra"
|
"sampleRemark" = "Observación de muestra"
|
||||||
"oldUsername" = "Nombre de Usuario Actual"
|
"oldUsername" = "Nombre de Usuario Actual"
|
||||||
|
|
|
@ -251,6 +251,7 @@
|
||||||
"pageSizeDesc" = "(اندازه صفحه برای جدول ورودیها.(0 = غیرفعال"
|
"pageSizeDesc" = "(اندازه صفحه برای جدول ورودیها.(0 = غیرفعال"
|
||||||
"remarkModel" = "نامکانفیگ و جداکننده"
|
"remarkModel" = "نامکانفیگ و جداکننده"
|
||||||
"datepicker" = "نوع تقویم"
|
"datepicker" = "نوع تقویم"
|
||||||
|
"datepickerPlaceholder" = "انتخاب تاریخ"
|
||||||
"datepickerDescription" = "وظایف برنامه ریزی شده بر اساس این تقویم اجرا میشود"
|
"datepickerDescription" = "وظایف برنامه ریزی شده بر اساس این تقویم اجرا میشود"
|
||||||
"sampleRemark" = "نمونهنام"
|
"sampleRemark" = "نمونهنام"
|
||||||
"oldUsername" = "نامکاربری فعلی"
|
"oldUsername" = "نامکاربری فعلی"
|
||||||
|
|
|
@ -251,6 +251,7 @@
|
||||||
"pageSizeDesc" = "Определить размер страницы для входящей таблицы. Установите 0, чтобы отключить"
|
"pageSizeDesc" = "Определить размер страницы для входящей таблицы. Установите 0, чтобы отключить"
|
||||||
"remarkModel" = "Модель примечания и символ разделения"
|
"remarkModel" = "Модель примечания и символ разделения"
|
||||||
"datepicker" = "выбор даты"
|
"datepicker" = "выбор даты"
|
||||||
|
"datepickerPlaceholder" = "Выберите дату"
|
||||||
"datepickerDescription" = "Тип календаря выбора указывает дату истечения срока действия."
|
"datepickerDescription" = "Тип календаря выбора указывает дату истечения срока действия."
|
||||||
"sampleRemark" = "Пример замечания"
|
"sampleRemark" = "Пример замечания"
|
||||||
"oldUsername" = "Текущее имя пользователя"
|
"oldUsername" = "Текущее имя пользователя"
|
||||||
|
|
|
@ -251,6 +251,7 @@
|
||||||
"pageSizeDesc" = "Xác định kích thước trang cho bảng gửi đến. Đặt 0 để tắt"
|
"pageSizeDesc" = "Xác định kích thước trang cho bảng gửi đến. Đặt 0 để tắt"
|
||||||
"remarkModel" = "Ghi chú mô hình và ký tự phân tách"
|
"remarkModel" = "Ghi chú mô hình và ký tự phân tách"
|
||||||
"datepicker" = "Kiểu lịch"
|
"datepicker" = "Kiểu lịch"
|
||||||
|
"datepickerPlaceholder" = "Chọn ngày"
|
||||||
"datepickerDescription" = "Tác vụ chạy theo lịch trình sẽ chạy theo kiểu lịch này."
|
"datepickerDescription" = "Tác vụ chạy theo lịch trình sẽ chạy theo kiểu lịch này."
|
||||||
"sampleRemark" = "Nhận xét mẫu"
|
"sampleRemark" = "Nhận xét mẫu"
|
||||||
"oldUsername" = "Tên người dùng hiện tại"
|
"oldUsername" = "Tên người dùng hiện tại"
|
||||||
|
|
|
@ -251,6 +251,7 @@
|
||||||
"pageSizeDesc" = "定义入站表的页面大小。设置 0 表示禁用"
|
"pageSizeDesc" = "定义入站表的页面大小。设置 0 表示禁用"
|
||||||
"remarkModel" = "备注模型和分隔符"
|
"remarkModel" = "备注模型和分隔符"
|
||||||
"datepicker" = "日期选择器"
|
"datepicker" = "日期选择器"
|
||||||
|
"datepickerPlaceholder" = "选择日期"
|
||||||
"datepickerDescription" = "选择器日历类型指定到期日期"
|
"datepickerDescription" = "选择器日历类型指定到期日期"
|
||||||
"sampleRemark" = "备注示例"
|
"sampleRemark" = "备注示例"
|
||||||
"oldUsername" = "原用户名"
|
"oldUsername" = "原用户名"
|
||||||
|
|
Loading…
Reference in a new issue