adata-ui 2.1.41-beta.17 → 2.1.41-beta.19

package/components/elements/a-select-row/ASelectRowV2.vue

@@ -73,7 +73,7 @@ defineExpose({ onClear })
 </script>
 
 <template>
-  <div class="select-row-v2 relative w-full text-body-md">
+  <div class="select-row-v2 relative w-full min-w-0 text-body-md">
     <button
       type="button"
       :disabled="disabled"
@@ -97,12 +97,12 @@ defineExpose({ onClear })
         {{ label }}<span v-if="required" class="text-danger">&nbsp;*</span>
       </span>
 
-      <span ref="chipsRow" class="relative flex w-full min-w-0 items-center gap-1.5 overflow-hidden text-start leading-none">
+      <span ref="chipsRow" class="relative flex w-0 min-w-0 flex-1 items-center gap-1.5 overflow-hidden text-start leading-none">
         <template v-if="hasValue">
           <span
             v-for="item in visibleItems"
             :key="item.id"
-            class="select-row-v2__chip inline-flex min-w-0 items-center gap-1 rounded-sm bg-brand-subtle px-2 py-0.5 text-body-sm text-brand"
+            class="select-row-v2__chip inline-flex min-w-0 max-w-full items-center gap-1 rounded-sm bg-brand-subtle px-2 py-0.5 text-body-sm text-brand"
             @click.stop="deletable ? deleteItem(item) : (isOpen = true)"
           >
             <span class="truncate">{{ item.name }}</span>

package/components/elements/banner/ABanner.vue

@@ -39,10 +39,10 @@ onBeforeMount(() => {
       v-show="isDark"
       :href="bannerData?.redirect_url"
       target="_blank"
-      :class="location === 'horizontal' ? '' : 'mt-4 mx-auto lg:justify-center hidden lg:flex'"
+      :class="location === 'horizontal' ? '' : 'mt-4 hidden w-0 min-w-full lg:flex'"
     >
       <img
-        :class="location === 'horizontal' ? 'w-full' : 'max-w-[175px]'"
+        class="w-full"
         :src="bannerData.dark_src"
         alt="banner"
       />
@@ -51,10 +51,10 @@ onBeforeMount(() => {
       v-show="!isDark"
       :href="bannerData?.redirect_url"
       target="_blank"
-      :class="location === 'horizontal' ? '' : 'mt-4 mx-auto lg:justify-center hidden lg:flex'"
+      :class="location === 'horizontal' ? '' : 'mt-4 hidden w-0 min-w-full lg:flex'"
     >
       <img
-        :class="location === 'horizontal' ? 'w-full' : 'max-w-[175px]'"
+        class="w-full"
         :src="bannerData.src"
         alt="banner"
       />

package/components/elements/button/AButtonV2.vue

@@ -41,7 +41,7 @@ const VIEW_CLASS: Record<Color, Record<View, string>> = {
     solid: 'bg-action-primary text-action-primary-fg hover:bg-action-primary-hover active:bg-action-primary-active',
     gradient: 'bg-linear-to-r from-brand-500 to-brand-400 text-inverted hover:brightness-105',
     outline: 'border border-brand bg-action-secondary text-brand hover:bg-brand-subtle active:bg-blue-subtle',
-    ghost: 'text-action-secondary-fg hover:bg-action-secondary-hover active:bg-badge',
+    ghost: 'text-brand hover:bg-brand-subtle active:bg-blue-subtle',
     soft: 'bg-brand-subtle text-brand hover:bg-blue-subtle active:bg-brand-200/70 dark:active:bg-brand-500/25',
   },
   green: {

package/components/elements/tree-select-modal/ATreeSelectModal.vue

@@ -107,7 +107,7 @@ defineExpose({ open: openModal, close: () => (isOpen.value = false) })
 </script>
 
 <template>
-  <div class="tree-select-modal w-full">
+  <div class="tree-select-modal w-full min-w-0">
     <slot
       name="trigger"
       :open="openModal"

package/components/features/payment/process/PaymentProcess.vue

@@ -13,6 +13,7 @@ const accessToken = useCookie('accessToken')
 const {
   rateId,
   topUpSidePanel,
+  topUpPresetAmount,
   methodSidePanel,
   kaspiQRSidePanel,
   kaspiRedirectSidePanel,
@@ -42,6 +43,9 @@ function toggleKaspiSidePanel(state: boolean) {
 
 function onBack(type: 'method' | 'kaspi') {
   if (type === 'method') {
+    // Панель пополнения обнуляет поле при закрытии, поэтому введённую сумму
+    // возвращаем ей тем же способом, что и быстрые суммы снаружи.
+    topUpPresetAmount.value = paymentSum.value
     topUpSidePanel.value = true
     methodSidePanel.value = false
   }

package/components/features/payment/process/PaymentTopUpSidePanel.vue

@@ -6,6 +6,7 @@ const emit = defineEmits<{
 const isOpen = defineModel({ default: false })
 
 const { t } = useI18n()
+const { topUpPresetAmount } = usePayment()
 
 const money = ref<number | string>(0)
 const errorAlert = ref(false)
@@ -17,6 +18,19 @@ const sumArr = [
   { id: 4, value: 20000, label: '20 000 ₸', dataTestId: 'topup-balance-amount-20000-button' },
 ]
 
+// Панель монтируется один раз и не размонтируется, поэтому поле суммы задаём
+// сами — но только при открытии, а не при закрытии: иначе сброс виден сквозь
+// анимацию ухода панели. Предвыбранная сумма приходит снаружи (быстрые суммы)
+// и с шага выбора способа оплаты, так что «Назад» не теряет введённое значение,
+// а обычное открытие всегда стартует с нуля.
+watch(isOpen, (open) => {
+  if (!open) return
+
+  money.value = topUpPresetAmount.value ?? 0
+  errorAlert.value = false
+  topUpPresetAmount.value = undefined
+})
+
 const amount = computed(() => Number(money.value) || 0)
 const filterMoney = computed(() => amount.value >= 1)
 
@@ -26,8 +40,9 @@ function onSelectAmount(value: number) {
 }
 
 function onClose() {
+  // Ошибку не гасим здесь — она, как и сумма, сбрасывается при открытии,
+  // иначе смена состояния видна сквозь анимацию закрытия.
   isOpen.value = false
-  errorAlert.value = false
 }
 
 function handlePayment() {

package/components/modals/id/IdResetPasswordOtpModal.vue

@@ -15,7 +15,6 @@ const otp = ref(['', '', '', '', '', ''])
 const otpFormatted = computed(() => {
   return otp.value.join('')
 })
-const showError = ref(false)
 const isLoading = ref(false)
 
 async function onConfirm() {
@@ -41,7 +40,7 @@ async function onConfirm() {
     newPasswordModal.value = true
   }
   catch (error) {
-    showError.value = true
+    $toast.error(apiErrorMessage(error, t('error.validation')))
   }
   finally {
     isLoading.value = false
@@ -50,7 +49,6 @@ async function onConfirm() {
 
 function resetOtp() {
   otp.value = ['', '', '', '', '', '']
-  showError.value = false
 }
 
 function onClose() {
@@ -131,7 +129,6 @@ onMounted(() => {
 
     <id-otp-input
       v-model="otp"
-      v-model:error="showError"
       @on-completed="onConfirm"
     />
 

package/composables/useHeaderNavigationLinks.ts

@@ -480,7 +480,7 @@ export function usePkServicesLinks() {
     {
       title: t('header.products.counterparties.items.counterparty.title'),
       icon: IconSearch,
-      to: buildLocalizedUrl(locale.value, urls.pk, PAGES.pk.main),
+      to: buildLocalizedUrl(locale.value, urls.pk, ''),
       short: PAGES.pk.main,
     },
     {

package/composables/usePayment.ts

@@ -6,6 +6,8 @@ export function usePayment() {
   const kaspiQRSidePanel = useState('kaspi-qr-side-panel', () => false)
   const kaspiRedirectSidePanel = useState('kaspi-redirect-side-panel', () => false)
   const rateId = useState<string>('use-rate-id')
+  /** Сумма, предвыбранная вызывающей стороной: панель пополнения подставит её при открытии. */
+  const topUpPresetAmount = useState<number | undefined>('top-up-preset-amount', () => undefined)
 
   async function payByCard(sum: number, rate?: any) {
     const { $toast, $i18n } = useNuxtApp()
@@ -70,6 +72,7 @@ export function usePayment() {
   return {
     rateId,
     topUpSidePanel,
+    topUpPresetAmount,
     methodSidePanel,
     kaspiQRSidePanel,
     kaspiRedirectSidePanel,

package/icons/building-org.vue

@@ -0,0 +1,15 @@
+<template>
+  <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-building">
+    <path d="M12 10h.01"/>
+    <path d="M12 14h.01"/>
+    <path d="M12 6h.01"/>
+    <path d="M16 10h.01"/>
+    <path d="M16 14h.01"/>
+    <path d="M16 6h.01"/>
+    <path d="M8 10h.01"/>
+    <path d="M8 14h.01"/>
+    <path d="M8 6h.01"/>
+    <path d="M9 22v-3a1 1 0 0 1 1-1h4a1 1 0 0 1 1 1v3"/>
+    <rect x="4" y="2" width="16" height="20" rx="2"/>
+  </svg>
+</template>

package/icons/chart-pie-piece.vue

@@ -0,0 +1,6 @@
+<template>
+  <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-chart-pie">
+    <path d="M21 12c.552 0 1.005-.449.95-.998a10 10 0 0 0-8.953-8.951c-.55-.055-.998.398-.998.95v8a1 1 0 0 0 1 1z"/>
+    <path d="M21.21 15.89A10 10 0 1 1 8 2.83"/>
+  </svg>
+</template>

package/icons/factory.vue

@@ -0,0 +1,7 @@
+<template>
+  <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-factory"><path d="M12 16h.01"/>
+    <path d="M16 16h.01"/>
+    <path d="M3 19a2 2 0 0 0 2 2h14a2 2 0 0 0 2-2V8.5a.5.5 0 0 0-.769-.422l-4.462 2.844A.5.5 0 0 1 15 10.5v-2a.5.5 0 0 0-.769-.422L9.77 10.922A.5.5 0 0 1 9 10.5V5a2 2 0 0 0-2-2H5a2 2 0 0 0-2 2z"/>
+    <path d="M8 16h.01"/>
+  </svg>
+</template>

package/icons/heart-pulse.vue

@@ -0,0 +1,6 @@
+<template>
+  <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-heart-pulse">
+    <path d="M2 9.5a5.5 5.5 0 0 1 9.591-3.676.56.56 0 0 0 .818 0A5.49 5.49 0 0 1 22 9.5c0 2.29-1.5 4-3 5.5l-5.492 5.313a2 2 0 0 1-3 .019L5 15c-1.5-1.5-3-3.2-3-5.5"/>
+    <path d="M3.22 13H9.5l.5-1 2 4.5 2-7 1.5 3.5h5.27"/>
+  </svg>
+</template>

package/icons/store.vue

@@ -0,0 +1,7 @@
+<template>
+  <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-store">
+    <path d="M15 21v-5a1 1 0 0 0-1-1h-4a1 1 0 0 0-1 1v5"/>
+    <path d="M17.774 10.31a1.12 1.12 0 0 0-1.549 0 2.5 2.5 0 0 1-3.451 0 1.12 1.12 0 0 0-1.548 0 2.5 2.5 0 0 1-3.452 0 1.12 1.12 0 0 0-1.549 0 2.5 2.5 0 0 1-3.77-3.248l2.889-4.184A2 2 0 0 1 7 2h10a2 2 0 0 1 1.653.873l2.895 4.192a2.5 2.5 0 0 1-3.774 3.244"/>
+    <path d="M4 10.95V19a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2v-8.05"/>
+  </svg>
+</template>

package/icons/trees.vue

@@ -0,0 +1,8 @@
+<template>
+  <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-trees">
+    <path d="M10 10v.2A3 3 0 0 1 8.9 16H5a3 3 0 0 1-1-5.8V10a3 3 0 0 1 6 0Z"/>
+    <path d="M7 16v6"/>
+    <path d="M13 19v3"/>
+    <path d="M12 19h8.3a1 1 0 0 0 .7-1.7L18 14h.3a1 1 0 0 0 .7-1.7L16 9h.2a1 1 0 0 0 .8-1.7L13 3l-1.4 1.5"/>
+  </svg>
+</template>

package/icons/trophy.vue

@@ -0,0 +1,10 @@
+<template>
+  <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-trophy">
+    <path d="M10 14.66V17a1 1 0 0 1-1 1 2 2 0 0 0-2 2v2"/>
+    <path d="M14 14.66V17a1 1 0 0 0 1 1 2 2 0 0 1 2 2v2"/>
+    <path d="M17.916 10H19.5A2.5 2.5 0 0 0 22 7.5V5a1 1 0 0 0-1-1h-3"/>
+    <path d="M4 22h16"/>
+    <path d="M6 9a6 6 0 0 0 12 0V3a1 1 0 0 0-1-1H7a1 1 0 0 0-1 1z"/>
+    <path d="M6.084 10H4.5A2.5 2.5 0 0 1 2 7.5V5a1 1 0 0 1 1-1h3"/>
+  </svg>
+</template>

package/lang/en.ts

@@ -480,6 +480,7 @@ const EnLocale: RuLocale = {
     password_requirements: {
       minLength: 'At least {length} characters',
       uppercase: 'Uppercase letter',
+      lowercase: 'Lowercase letter',
       digit: 'Digit',
       special: 'Special character',
     },
@@ -639,6 +640,7 @@ const EnLocale: RuLocale = {
           passwordRequirements: 'must contain (an uppercase letter, a number, and a special character)',
           sameAs: 'Passwords do not match',
           uppercase: 'The password must contain an uppercase letter',
+          lowercase: 'The password must contain a lowercase letter',
           digit: 'The password must contain a digit',
           special: 'The password must contain a special character',
         },

package/lang/kk.ts

@@ -481,6 +481,7 @@ const KkLocale: RuLocale = {
     password_requirements: {
       minLength: 'Кемінде {length} таңба',
       uppercase: 'Бас әріп',
+      lowercase: 'Кіші әріп',
       digit: 'Сан',
       special: 'Арнайы таңба',
     },
@@ -640,6 +641,7 @@ const KkLocale: RuLocale = {
           passwordRequirements: '(бас әріп, сан және арнайы таңба) қамтуы тиіс',
           sameAs: 'Құпия сөздер сәйкес емес',
           uppercase: 'Құпия сөзде бас әріп болуы керек',
+          lowercase: 'Құпия сөзде кіші әріп болуы керек',
           digit: 'Құпия сөзде сан болуы керек',
           special: 'Құпия сөзде арнайы таңба болуы керек',
         },

package/lang/ru.ts

@@ -480,6 +480,7 @@ const RuLocale = {
     password_requirements: {
       minLength: 'Не менее {length} символов',
       uppercase: 'Заглавная буква',
+      lowercase: 'Строчная буква',
       digit: 'Цифра',
       special: 'Специальный символ',
     },
@@ -640,6 +641,7 @@ const RuLocale = {
           passwordRequirements: 'содержать (заглавную букву, цифру и специальный символ)',
           sameAs: 'Пароли не совпадают',
           uppercase: 'Пароль должен содержать заглавную букву',
+          lowercase: 'Пароль должен содержать строчную букву',
           digit: 'Пароль должен содержать цифру',
           special: 'Пароль должен содержать специальный символ',
         },

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "adata-ui",
   "type": "module",
-  "version": "2.1.41-beta.17",
+  "version": "2.1.41-beta.19",
   "main": "./nuxt.config.ts",
   "scripts": {
     "dev": "nuxi dev .playground",

package/utils/passwordRules.ts

@@ -5,7 +5,7 @@
  * `forms.password_requirements.<key>` и `error.password.<key>`.
  */
 export interface PasswordRule {
-  key: 'minLength' | 'uppercase' | 'digit' | 'special'
+  key: 'minLength' | 'uppercase' | 'lowercase' | 'digit' | 'special'
   test: (password: string) => boolean
 }
 
@@ -14,6 +14,7 @@ export const PASSWORD_MIN_LENGTH = 8
 export const PASSWORD_RULES: readonly PasswordRule[] = [
   { key: 'minLength', test: password => password.length >= PASSWORD_MIN_LENGTH },
   { key: 'uppercase', test: password => /[A-Z]/.test(password) },
+  { key: 'lowercase', test: password => /[a-z]/.test(password) },
   { key: 'digit', test: password => /\d/.test(password) },
   { key: 'special', test: password => /[^\dA-Z]/i.test(password) },
 ]