From c9e200c1745087b2e4d19efef8b976370aebf20f Mon Sep 17 00:00:00 2001 From: kur0nek-o Date: Thu, 2 Nov 2023 17:00:17 +0700 Subject: [PATCH] completed create all filters type --- package-lock.json | 4 +- src/assets/css/style.css | 155 +++++++++++++----- src/components/DatePicker.vue | 1 - src/components/Form/FiltersType/Type1.vue | 8 +- src/components/Form/FiltersType/Type10.vue | 44 +++++ src/components/Form/FiltersType/Type11.vue | 48 ++++++ src/components/Form/FiltersType/Type12.vue | 49 ++++++ src/components/Form/FiltersType/Type13.vue | 41 +++++ src/components/Form/FiltersType/Type14.vue | 34 ++++ src/components/Form/FiltersType/Type15.vue | 25 +++ src/components/Form/FiltersType/Type16.vue | 38 +++++ src/components/Form/FiltersType/Type17.vue | 46 ++++++ src/components/Form/FiltersType/Type2.vue | 10 +- src/components/Form/FiltersType/Type3.vue | 8 +- src/components/Form/FiltersType/Type4.vue | 10 +- src/components/Form/FiltersType/Type5.vue | 8 +- src/components/Form/FiltersType/Type6.vue | 10 +- src/components/Form/FiltersType/Type7.vue | 19 ++- src/components/Form/FiltersType/Type8.vue | 26 +++ src/components/Form/FiltersType/Type9.vue | 39 +++++ src/components/Form/InlineRadioGroup.vue | 43 +++++ src/components/Form/InputWithFilter.vue | 54 ++++++ src/components/Form/InputWithSuffix.vue | 34 ++++ .../Navigation/Aside/AsideMenuSingle.vue | 2 +- src/components/Pages/Gangguan/Table_1.vue | 9 +- src/components/Pages/MenuProvider.vue | 51 +++--- src/router/index.ts | 3 +- src/stores/filters.ts | 24 +++ src/stores/menu.ts | 9 +- src/views/TestView.vue | 37 ++++- 30 files changed, 770 insertions(+), 119 deletions(-) create mode 100644 src/components/Form/FiltersType/Type10.vue create mode 100644 src/components/Form/FiltersType/Type11.vue create mode 100644 src/components/Form/FiltersType/Type12.vue create mode 100644 src/components/Form/FiltersType/Type13.vue create mode 100644 src/components/Form/FiltersType/Type14.vue create mode 100644 src/components/Form/FiltersType/Type15.vue create mode 100644 src/components/Form/FiltersType/Type16.vue create mode 100644 src/components/Form/FiltersType/Type17.vue create mode 100644 src/components/Form/FiltersType/Type8.vue create mode 100644 src/components/Form/FiltersType/Type9.vue create mode 100644 src/components/Form/InlineRadioGroup.vue create mode 100644 src/components/Form/InputWithFilter.vue create mode 100644 src/components/Form/InputWithSuffix.vue create mode 100644 src/stores/filters.ts diff --git a/package-lock.json b/package-lock.json index a6bd914..0dddb7a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "eis", - "version": "0.0.2", + "version": "0.0.1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "eis", - "version": "0.0.2", + "version": "0.0.1", "dependencies": { "@headlessui/tailwindcss": "^0.2.0", "@headlessui/vue": "^1.7.16", diff --git a/src/assets/css/style.css b/src/assets/css/style.css index 8239630..cada6f4 100644 --- a/src/assets/css/style.css +++ b/src/assets/css/style.css @@ -705,40 +705,6 @@ select { --tw-backdrop-sepia: ; } -.container { - width: 100%; -} - -@media (min-width: 640px) { - .container { - max-width: 640px; - } -} - -@media (min-width: 768px) { - .container { - max-width: 768px; - } -} - -@media (min-width: 1024px) { - .container { - max-width: 1024px; - } -} - -@media (min-width: 1280px) { - .container { - max-width: 1280px; - } -} - -@media (min-width: 1536px) { - .container { - max-width: 1536px; - } -} - /* NavBar */ .menu-item { @@ -1085,6 +1051,10 @@ select { margin-right: 0.5rem; } +.mr-2\.5 { + margin-right: 0.625rem; +} + .mt-0 { margin-top: 0px; } @@ -1200,6 +1170,10 @@ select { height: 2.25rem; } +.h-\[16px\] { + height: 16px; +} + .h-\[2\.7rem\] { height: 2.7rem; } @@ -1208,6 +1182,10 @@ select { height: 66px; } +.h-\[7px\] { + height: 7px; +} + .h-\[calc\(100\%-64px\)\] { height: calc(100% - 64px); } @@ -1305,6 +1283,10 @@ select { width: 2.25rem; } +.w-\[16px\] { + width: 16px; +} + .w-\[2\.7rem\] { width: 2.7rem; } @@ -1313,6 +1295,10 @@ select { width: 266px; } +.w-\[7px\] { + width: 7px; +} + .w-auto { width: auto; } @@ -1519,11 +1505,21 @@ select { column-gap: 0.25rem; } +.gap-x-1\.5 { + -moz-column-gap: 0.375rem; + column-gap: 0.375rem; +} + .gap-x-2 { -moz-column-gap: 0.5rem; column-gap: 0.5rem; } +.gap-x-4 { + -moz-column-gap: 1rem; + column-gap: 1rem; +} + .gap-x-6 { -moz-column-gap: 1.5rem; column-gap: 1.5rem; @@ -1537,9 +1533,8 @@ select { row-gap: 0.125rem; } -.gap-x-1\.5 { - -moz-column-gap: 0.375rem; - column-gap: 0.375rem; +.gap-y-1 { + row-gap: 0.25rem; } .space-x-1 > :not([hidden]) ~ :not([hidden]) { @@ -1566,6 +1561,12 @@ select { margin-bottom: calc(0.75rem * var(--tw-space-y-reverse)); } +.space-y-4 > :not([hidden]) ~ :not([hidden]) { + --tw-space-y-reverse: 0; + margin-top: calc(1rem * calc(1 - var(--tw-space-y-reverse))); + margin-bottom: calc(1rem * var(--tw-space-y-reverse)); +} + .divide-y > :not([hidden]) ~ :not([hidden]) { --tw-divide-y-reverse: 0; border-top-width: calc(1px * calc(1 - var(--tw-divide-y-reverse))); @@ -1692,6 +1693,11 @@ select { border-color: rgb(209 213 219 / var(--tw-border-opacity)); } +.border-gray-600 { + --tw-border-opacity: 1; + border-color: rgb(75 85 99 / var(--tw-border-opacity)); +} + .border-primary-500 { --tw-border-opacity: 1; border-color: rgb(3 91 113 / var(--tw-border-opacity)); @@ -1897,10 +1903,6 @@ select { padding: 1rem; } -.p-5 { - padding: 1.25rem; -} - .px-0 { padding-left: 0px; padding-right: 0px; @@ -1946,6 +1948,11 @@ select { padding-right: 1.5rem; } +.py-0 { + padding-top: 0px; + padding-bottom: 0px; +} + .py-1 { padding-top: 0.25rem; padding-bottom: 0.25rem; @@ -2007,6 +2014,10 @@ select { padding-left: 2.75rem; } +.pl-2 { + padding-left: 0.5rem; +} + .pl-3 { padding-left: 0.75rem; } @@ -2031,6 +2042,10 @@ select { padding-right: 1.25rem; } +.pr-7 { + padding-right: 1.75rem; +} + .pt-0 { padding-top: 0px; } @@ -2059,10 +2074,6 @@ select { text-align: start; } -.align-middle { - vertical-align: middle; -} - .text-2xl { font-size: 1.5rem; line-height: 2rem; @@ -2303,6 +2314,11 @@ select { color: rgb(153 153 0 / var(--tw-text-opacity)); } +.text-primary-600 { + --tw-text-opacity: 1; + color: rgb(2 73 90 / var(--tw-text-opacity)); +} + .text-opacity-40 { --tw-text-opacity: 0.4; } @@ -2751,10 +2767,20 @@ select { color: rgb(53 124 141 / var(--tw-text-opacity)); } +.group:checked .group-checked\:text-primary-500 { + --tw-text-opacity: 1; + color: rgb(3 91 113 / var(--tw-text-opacity)); +} + .group:hover .group-hover\:block { display: block; } +.group:hover .group-hover\:bg-gray-300 { + --tw-bg-opacity: 1; + background-color: rgb(209 213 219 / var(--tw-bg-opacity)); +} + .group:hover .group-hover\:bg-primary-500 { --tw-bg-opacity: 1; background-color: rgb(3 91 113 / var(--tw-bg-opacity)); @@ -2787,6 +2813,21 @@ select { color: rgb(255 255 255 / var(--tw-text-opacity)); } +.peer:checked ~ .peer-checked\:border-primary-500 { + --tw-border-opacity: 1; + border-color: rgb(3 91 113 / var(--tw-border-opacity)); +} + +.peer:checked ~ .peer-checked\:bg-primary-500 { + --tw-bg-opacity: 1; + background-color: rgb(3 91 113 / var(--tw-bg-opacity)); +} + +.peer:checked ~ .peer-checked\:text-primary-500 { + --tw-text-opacity: 1; + color: rgb(3 91 113 / var(--tw-text-opacity)); +} + @media (prefers-color-scheme: dark) { .dark\:bg-opacity-50 { --tw-bg-opacity: 0.5; @@ -3022,12 +3063,36 @@ select { gap: 0.75rem; } + .sm\:space-x-10 > :not([hidden]) ~ :not([hidden]) { + --tw-space-x-reverse: 0; + margin-right: calc(2.5rem * var(--tw-space-x-reverse)); + margin-left: calc(2.5rem * calc(1 - var(--tw-space-x-reverse))); + } + .sm\:space-x-4 > :not([hidden]) ~ :not([hidden]) { --tw-space-x-reverse: 0; margin-right: calc(1rem * var(--tw-space-x-reverse)); margin-left: calc(1rem * calc(1 - var(--tw-space-x-reverse))); } + .sm\:space-y-0 > :not([hidden]) ~ :not([hidden]) { + --tw-space-y-reverse: 0; + margin-top: calc(0px * calc(1 - var(--tw-space-y-reverse))); + margin-bottom: calc(0px * var(--tw-space-y-reverse)); + } + + .sm\:space-x-5 > :not([hidden]) ~ :not([hidden]) { + --tw-space-x-reverse: 0; + margin-right: calc(1.25rem * var(--tw-space-x-reverse)); + margin-left: calc(1.25rem * calc(1 - var(--tw-space-x-reverse))); + } + + .sm\:space-x-8 > :not([hidden]) ~ :not([hidden]) { + --tw-space-x-reverse: 0; + margin-right: calc(2rem * var(--tw-space-x-reverse)); + margin-left: calc(2rem * calc(1 - var(--tw-space-x-reverse))); + } + .sm\:space-x-reverse > :not([hidden]) ~ :not([hidden]) { --tw-space-x-reverse: 1; } diff --git a/src/components/DatePicker.vue b/src/components/DatePicker.vue index 14bd28b..4792bd4 100644 --- a/src/components/DatePicker.vue +++ b/src/components/DatePicker.vue @@ -18,7 +18,6 @@ :shortcuts="false" :auto-apply="false" v-slot="{ value, placeholder }" - overlay >
diff --git a/src/components/Form/FiltersType/Type1.vue b/src/components/Form/FiltersType/Type1.vue index 9a6f876..c4a5ed1 100644 --- a/src/components/Form/FiltersType/Type1.vue +++ b/src/components/Form/FiltersType/Type1.vue @@ -5,13 +5,13 @@