- เอกสาร
+
+
+
+ เอกสาร
+ จำนวน {{ currentFile.length }} รายการ
+
+
+
@@ -309,7 +340,8 @@ async function submitFileForm(
@@ -374,13 +406,14 @@ async function submitFileForm(
class="text-overflow-handle block q-px-md text-center"
style="max-width: 100%"
>
- สร้างไฟล์ใหม่
+ สร้างเอกสาร
diff --git a/Services/client/src/components/FileItemAction.vue b/Services/client/src/components/FileItemAction.vue
index 93c80ca..603ae6c 100644
--- a/Services/client/src/components/FileItemAction.vue
+++ b/Services/client/src/components/FileItemAction.vue
@@ -1,35 +1,56 @@
-
-
+
+
-
+
-
+
แก้ไข
-
+
ลบ
diff --git a/Services/client/src/components/FileSearched.vue b/Services/client/src/components/FileSearched.vue
index 4fb2121..6416862 100644
--- a/Services/client/src/components/FileSearched.vue
+++ b/Services/client/src/components/FileSearched.vue
@@ -156,7 +156,7 @@ function confirmDelete() {
setTimeout(() => {
isActFoundFile.value = true
- }, 300)
+ }, 1000)
}
}
@@ -252,7 +252,8 @@ onMounted(() => {
{
:rows="filterFoundFile"
:columns="columns"
row-key="name"
- hide-bottom
- :rows-per-page-options="[0]"
+ :pagination="{
+ rowsPerPage: 0,
+ }"
class="cursor"
>
-
+
{{ nameData.row.fileName }}
@@ -312,7 +318,7 @@ onMounted(() => {
- {{ getType(typeData.row.fileType) }}
+ {{ getType(typeData.row.fileType, typeData.row.fileName) }}
@@ -320,7 +326,7 @@ onMounted(() => {
-
+
{
flat
color="positive"
dense
- icon="edit"
+ icon="o_edit"
@click="
() => triggerFileEdit(actionData.row, actionData.row.pathname)
"
@@ -344,7 +350,7 @@ onMounted(() => {
flat
color="negative"
dense
- icon="delete"
+ icon="mdi-trash-can-outline"
@click="() => triggerFileDelete(actionData.row.pathname)"
id="listViewFileDelete"
/>
diff --git a/Services/client/src/components/FolderForm.vue b/Services/client/src/components/FolderForm.vue
index a41a60f..1383dd2 100644
--- a/Services/client/src/components/FolderForm.vue
+++ b/Services/client/src/components/FolderForm.vue
@@ -14,13 +14,16 @@ const props = withDefaults(
)
const emit = defineEmits(['update:open', 'update:name', 'submit'])
-const offensiveWord = ref(false)
+const offensiveWord = ref()
+const errorMessage = ref('')
+const inputNull = ref(false)
function checkOffensiveWord(input: string) {
return /[\\?%:|"<>#]/.test(input)
}
function reset() {
+ offensiveWord.value = undefined
emit('update:name', undefined)
}
@@ -34,8 +37,9 @@ function keydown(e: KeyboardEvent) {
function submit() {
emit('submit', {
mode: props.mode,
- name: props.name,
+ name: props.name?.trim(),
})
+
emit('update:open', !open), reset()
}
@@ -50,18 +54,19 @@ onUnmounted(() => window.addEventListener('keydown', keydown))
class="q-pa-md"
side="right"
tabindex="0"
+ v-click-outside="() => $emit('update:open', false)"
:width="300"
:breakpoint="500"
:model-value="open"
@update:model-value="(v) => $emit('update:open', v)"
>
-
+
-
+
สร้าง{{ tree }}
-
+
แก้ไข{{ tree }}
@@ -74,7 +79,6 @@ onUnmounted(() => window.addEventListener('keydown', keydown))
color="red"
@click="
() => {
- offensiveWord = false
$emit('update:open', !open)
}
"
@@ -90,9 +94,14 @@ onUnmounted(() => window.addEventListener('keydown', keydown))
dense
class="q-my-sm"
placeholder="กรอกชื่อ"
- :model-value="name"
- error-message="คำต้องห้านจะเปลี่ยนเป็น - เมื่อกดสร้าง"
+ :model-value="props.name"
+ :error-message="
+ !!props.name
+ ? 'คำต้องห้านจะเปลี่ยนเป็น - เมื่อกดสร้าง'
+ : 'โปรดกรอกข้อมูล'
+ "
:error="offensiveWord"
+ :rules="[(v) => !!props.name]"
@update:model-value="
(v) => {
$emit('update:name', v)
@@ -112,7 +121,6 @@ onUnmounted(() => window.addEventListener('keydown', keydown))
flat
@click="
() => {
- offensiveWord = false
$emit('update:open', false), reset()
}
"
diff --git a/Services/client/src/components/GlobalErrorDialog.vue b/Services/client/src/components/GlobalErrorDialog.vue
index 4197bdc..d2d682a 100644
--- a/Services/client/src/components/GlobalErrorDialog.vue
+++ b/Services/client/src/components/GlobalErrorDialog.vue
@@ -16,15 +16,19 @@ watch(visible, () => {
-
- {{
- title
- }}
+
+
+
+
{{ title }}
+
{{ msg }}
+
+
+
+
+
+ {{ createdByRow.row.createdBy }}
+
+
+
@@ -311,7 +320,13 @@ const onRowClick = (evt: Event, row: TreeDataFolder, index: number) => {
-
+
{
flat
color="positive"
dense
- icon="edit"
+ icon="o_edit"
@click.stop="
triggerFolderEdit(
actionsRow.row.name,
@@ -334,11 +349,13 @@ const onRowClick = (evt: Event, row: TreeDataFolder, index: number) => {
"
id="listViewFolderEdit"
/>
+
@@ -360,13 +377,13 @@ const onRowClick = (evt: Event, row: TreeDataFolder, index: number) => {
v-if="props.mode == 'admin'"
outline
push
- class="q-px-md q-ml-md q-py-sm"
+ class="q-px-md q-ml-md"
label="สร้างเอกสาร"
type="submit"
color="primary"
dense
icon="add"
- @click="() => triggerFileCreate()"
+ @click.stop="() => triggerFileCreate()"
id="listViewFileCreate"
/>
@@ -377,8 +394,9 @@ const onRowClick = (evt: Event, row: TreeDataFolder, index: number) => {
:rows="listDataFile"
:columns="columnsFile"
row-key="name"
- hide-bottom
- :rows-per-page-options="[0]"
+ :pagination="{
+ rowsPerPage: 20,
+ }"
class="cursor"
>
@@ -393,7 +411,7 @@ const onRowClick = (evt: Event, row: TreeDataFolder, index: number) => {
"
id="listViewGetFileInfo"
>
-
+
{{ nameRow.row.fileName }}
@@ -401,7 +419,7 @@ const onRowClick = (evt: Event, row: TreeDataFolder, index: number) => {
- {{ getType(fileTypeRow.row.fileType) }}
+ {{ getType(fileTypeRow.row.fileType, fileTypeRow.row.fileName) }}
@@ -409,7 +427,12 @@ const onRowClick = (evt: Event, row: TreeDataFolder, index: number) => {
-
+
{
flat
color="positive"
dense
- icon="edit"
- @click="
+ icon="o_edit"
+ @click.stop="
() => triggerFileEdit(actionsRow.row, actionsRow.row.pathname)
"
id="listViewFileEdit"
@@ -433,8 +456,8 @@ const onRowClick = (evt: Event, row: TreeDataFolder, index: number) => {
flat
color="negative"
dense
- icon="delete"
- @click="() => triggerFileDelete(actionsRow.row.pathname)"
+ icon="mdi-trash-can-outline"
+ @click.stop="() => triggerFileDelete(actionsRow.row.pathname)"
id="listViewFileDelete"
/>
@@ -445,6 +468,7 @@ const onRowClick = (evt: Event, row: TreeDataFolder, index: number) => {