sync

2025-03-13 20:45:12 +07:00
22 changed files with 248 additions and 215 deletions
--- a/README.md
+++ b/README.md
@@ -50,13 +50,14 @@ wails3 generate bindings -ts
 Для финальной сборки запустите эту команду в директории проекта:

 ```
-PRODUCTION=true wails3 build
+go env -w CGO_ENABLED=1
+wails3 build -clean -upx -v 2 -webview2 embed
 ```

 **Перед релизом не забыть**:
- убедиться, что дефолтные данные правильные
- убедиться, что приложение запускается
- (опционально) поместить все нужные asset'ы в папку assets
+
+- поместить все нужные asset'ы в папку assets
+- изменить версию схемы БД (пока не нужно)
 - приложить сопроводительную записку.

 ## Работа без GitHub
--- a/build/Taskfile.darwin.yml
+++ b/build/Taskfile.darwin.yml
@@ -13,7 +13,7 @@ tasks:
    cmds:
      - go build {{.BUILD_FLAGS}} -o {{.BIN_DIR}}/{{.APP_NAME}}
    vars:
-      BUILD_FLAGS: '{{if eq .PRODUCTION "true"}}-tags "production sqlite_icu" -trimpath -ldflags="-w -s"{{else}}-gcflags=all="-l" -tags "sqlite_icu"{{end}}'
+      BUILD_FLAGS: '{{if eq .PRODUCTION "true"}}-tags production -trimpath -ldflags="-w -s"{{else}}-gcflags=all="-l"{{end}}'
    env:
      GOOS: darwin
      CGO_ENABLED: 1
--- a/build/Taskfile.linux.yml
+++ b/build/Taskfile.linux.yml
@@ -13,7 +13,7 @@ tasks:
    cmds:
      - go build {{.BUILD_FLAGS}} -o {{.BIN_DIR}}/{{.APP_NAME}}
    vars:
-      BUILD_FLAGS: '{{if eq .PRODUCTION "true"}}-tags "production sqlite_icu" -trimpath -ldflags="-w -s"{{else}}-gcflags=all="-l" -tags "sqlite_icu" {{end}}'
+      BUILD_FLAGS: '{{if eq .PRODUCTION "true"}}-tags production -trimpath -ldflags="-w -s"{{else}}-gcflags=all="-l"{{end}}'
    env:
      GOOS: linux
      CGO_ENABLED: 1
--- a/build/Taskfile.windows.yml
+++ b/build/Taskfile.windows.yml
@@ -18,7 +18,7 @@ tasks:
      - cmd: rm -f *.syso
        platforms: [linux, darwin]
    vars:
-      BUILD_FLAGS: '{{if eq .PRODUCTION "true"}}-tags "production sqlite_icu" -trimpath -ldflags="-w -s -H windowsgui"{{else}}-gcflags=all="-l" -tags "sqlite_icu"{{end}}'
+      BUILD_FLAGS: '{{if eq .PRODUCTION "true"}}-tags production -trimpath -ldflags="-w -s -H windowsgui"{{else}}-gcflags=all="-l"{{end}}'
    env:
      GOOS: windows
      CGO_ENABLED: 1
--- a/frontend/src/author/AuthorScheme.vue
+++ b/frontend/src/author/AuthorScheme.vue
@@ -31,6 +31,7 @@ const load = async () => {

 onMounted(async () => {
  await load();
+  console.log(await SortedByOrder({"Comments": "DESC"}))
 });

 const scheme: Scheme<Author> = reactive({
--- a/frontend/src/components/selects/MultiSelect.vue
+++ b/frontend/src/components/selects/MultiSelect.vue
@@ -17,6 +17,7 @@ const pushOrRemove = (option: T) => {
    } else {
        selected.value.push(option)
    }
+    //setNullIds()
 }

 const setNullIds = () => {
@@ -26,11 +27,12 @@ const setNullIds = () => {
    })
 }

+//onMounted(setNullIds)
 </script>

 <template>
    <div class="">
-        <ul class="max-h-48 h-auto overflow-y-auto background rounded-md p-3 w-full native-border">
+        <ul class="max-h-48 h-auto overflow-y-auto background rounded-md p-3 w-full border-gray-500 border">
            <li v-for="option in options" :key="option.Id" class="flex items-center gap-2">
                <Checkbox :checked="selected.some(item => item.Id == option.Id)" @click="pushOrRemove(option)" />
                <label :for="option.Id.toString()">{{ structView(option, path) }}</label>
--- a/frontend/src/post/PostScheme.vue
+++ b/frontend/src/post/PostScheme.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import Table from "../table/Table.vue";
-import {onMounted, reactive, watch} from "vue";
+import { onMounted, reactive } from "vue";
 import { getDefaultValues } from "../utils/structs/defaults.util";
 import Service from "./post.service.ts";
 import type { Scheme } from "../types/scheme.type";
@@ -16,7 +16,7 @@ const posttypeService = new PosttypeService();

 import CommentService from "../comment/comment.service.ts";
 import { SortedByOrder } from "../../bindings/app/internal/services/postservice.ts";
-import {getDefaultSortOptions} from "../utils/structs/default-sort-options.util.ts";
+import type { Search } from "../types/search.type.ts";

 const commentService = new CommentService();

@@ -33,12 +33,13 @@ const load = async () => {
    (scheme as any).Comments.type!.nested!.values =
        await commentService.readAll();

-    items.value = await service.sort(sortOptions.value) ;
+    items.value = await service.readAll();
    return items.value;
 };

 onMounted(async () => {
    await load();
+    console.log(await SortedByOrder({ "Author": "DESC", "Text": "ASC" }));
 });

 const scheme: Scheme<Post> = reactive({
@@ -116,6 +117,9 @@ const scheme: Scheme<Post> = reactive({
                values: [],
                field: ["Text"],
            },
+        },
+        customWindow: {
+            create: true,
        }
    },
 });
@@ -130,15 +134,15 @@ const validate: Validate<Post> = (entity) => {
    };
 };

-const search = async (input: string) => {
+const search: Search<Post> = (input) => {
    
 }
-
-const sortOptions = ref(getDefaultSortOptions(scheme))
-
-
 </script>

 <template>
-    <Table :scheme :service :get-defaults :load :items :validate @on-search="search" v-model:sort-options="sortOptions"></Table>
+    <Table :scheme :service :get-defaults :load :items :validate @on-search="search">
+        <template #CommentsCreate="{ data }">
+            <p>{{ data }}</p>
+        </template>
+    </Table>
 </template>
--- a/frontend/src/post/post.service.ts
+++ b/frontend/src/post/post.service.ts
@@ -4,11 +4,10 @@ import {
  Delete,
  GetById,
  Update,
-  Count, SortedByOrder,
+  Count,
 } from "../../bindings/app/internal/services/postservice.ts";
 import type { Post } from "../../bindings/app/internal/services";
 import type { IService } from "../types/service.type.ts";
-import type {SortOptions} from "../types/sort-options.type.ts";

 export default class PostService implements IService<Post> {
  async read(id: number) {
@@ -34,8 +33,4 @@ export default class PostService implements IService<Post> {
  async count() {
    return await Count();
  }
-
-  async sort(options: SortOptions<Post>) {
-    return await SortedByOrder(options) as Post[]
-  }
 }
--- a/frontend/src/style.css
+++ b/frontend/src/style.css
@@ -5,25 +5,10 @@

 html, body, .background {
    background: white;
-    color: rgb(51, 65, 85);
-}
-
-.secondary-background {
-    background: var(--p-content-background)
-}
-
-.native-border {
-    border: 1px solid var(--p-select-border-color);
 }

@media (prefers-color-scheme: dark) {
    html, body, .background {
        background: #121212;
-        color: white;
    }
-
-    .native-border {
-        border: 1px solid rgb(100, 100, 109);
-    }
-
 }
--- a/frontend/src/table/DialogWindow.vue
+++ b/frontend/src/table/DialogWindow.vue
@@ -62,7 +62,7 @@ async function handleSave() {
 </script>

 <template>
-    <Dialog v-model:visible="showCreate" class="w-[500px]">
+    <Dialog v-model:visible="showCreate">
        <template #header>
            <h1>{{ props.updateMode ? 'Изменить' : 'Создать' }} {{ props.name?.toLowerCase() }}</h1>
        </template>
--- a/frontend/src/table/SortingOptions.vue
+++ b/frontend/src/table/SortingOptions.vue
@@ -1,25 +0,0 @@
-<script setup lang="ts" generic="T extends IEntity">
-import type {IEntity} from "../types/entity.type.ts";
-import type {SortOptions} from "../types/sort-options.type.ts";
-import type {Scheme} from "../types/scheme.type.ts";
-import {Select} from 'primevue'
-import {watch} from "vue";
-
-
-const options = defineModel<SortOptions<T>>()
-const optionsKeys = Object.keys(options.value as T) as (keyof T)[]
-
-defineProps<{
-  scheme: Scheme<T>
-  load: () => Promise<T[]>
-}>()
-</script>
-
-<template>
-  <ul class="flex flex-col gap-2 native-border secondary-background  p-3 rounded-md">
-    <li v-for="optionKey in optionsKeys" class="flex items-center justify-between w-full">
-      <h1>{{ scheme[optionKey].russian }}</h1>
-      <Select size="small" class="w-24" :options="['ASC', 'DESC']" v-model="options![optionKey]" @value-change="load"></Select>
-    </li>
-  </ul>
-</template>
--- a/frontend/src/table/Table.vue
+++ b/frontend/src/table/Table.vue
@@ -1,18 +1,20 @@
 <script setup lang="ts" generic="T extends IEntity">
-import {onMounted, ref, watch, type UnwrapRef} from "vue";
-import type {TableProps} from "../types/table-props.type";
-import {DataTable, Column, Button, InputText} from "primevue";
-import {manyStructsView} from "../utils/structs/structs-view.util";
-import type {TableEmits} from "../types/table-emits.type";
+import { onMounted, ref, watch, type UnwrapRef } from "vue";
+import type { TableProps } from "../types/table-props.type";
+import { DataTable, Column, Button, InputText } from "primevue";
+import { manyStructsView } from "../utils/structs/structs-view.util";
+import type { TableEmits } from "../types/table-emits.type";
 import FloatingButton from "../components/buttons/FloatingButton.vue";
-import type {IEntity} from "../types/entity.type";
+import type { IEntity } from "../types/entity.type";
 import DialogWindow from "./DialogWindow.vue";
-import {viewDate} from "../utils/date/view.util";
-import SortingOptions from "./SortingOptions.vue";
-import type {SortOptions} from "../types/sort-options.type.ts";
+import { viewDate } from "../utils/date/view.util";

 const props = defineProps<TableProps<T>>();

+onMounted(async () => {
+    props.load();
+});
+
 type Key = keyof T;
 const keys = Object.keys(props.scheme) as Key[];
 const emits = defineEmits<TableEmits>();
@@ -24,148 +26,176 @@ const showUpdate = ref(false);
 const updateItem = ref<null | T>(null);

 watch(showUpdate, (value) => {
-  if (!value) {
-    updateItem.value = null;
-  }
+    if (!value) {
+        updateItem.value = null;
+    }
 });

 watch(updateItem, (value) => {
-  if (value) {
-    showUpdate.value = true;
-  } else {
-    showUpdate.value = false;
-  }
+    if (value) {
+        showUpdate.value = true;
+    } else {
+        showUpdate.value = false;
+    }
 });

 watch(showCreate, (value) => {
-  if (value) {
-    createItem.value = props.getDefaults();
-  } else {
-    createItem.value = null;
-  }
+    if (value) {
+        createItem.value = props.getDefaults();
+    } else {
+        createItem.value = null;
+    }
 });

 watch(createItem, (value) => {
-  if (value) {
-    showCreate.value = true;
-  } else {
-    showCreate.value = false;
-  }
+    if (value) {
+        showCreate.value = true;
+    } else {
+        showCreate.value = false;
+    }
 });

 const handleFloatingButtonClick = () => {
-  emits('onCreateOpen')
-  emits('onOpen')
-  showCreate.value = true;
+    emits("onCreateOpen");
+    emits("onOpen");
+    showCreate.value = true;
 };
 const slots = defineSlots();

 const createSlotName = (key: any) => key + "Create";
 const updateSlotName = (key: any) => key + "Update";

-watch(() => props.items, () => {
-  if (props.colorize) {
-    const trs = document.querySelectorAll("tr");
-    props.items.forEach(item => {
-      const tr = trs[item.Id];
-      if (tr) {
-        tr.style.backgroundColor = props.colorize!(item);
-      }
-    })
-  }
-})
-
-const input = ref('')
-const sortOptions = defineModel<SortOptions<T>>('sort-options');
-const showSortOptions = ref(false)
+watch(
+    () => props.items,
+    () => {
+        if (props.colorize) {
+            const trs = document.querySelectorAll("tr");
+            props.items.forEach((item) => {
+                const tr = trs[item.Id];
+                if (tr) {
+                    tr.style.backgroundColor = props.colorize!(item);
+                }
+            });
+        }
+    },
+);

+const input = defineModel<string>("search", { default: "" });
 </script>

 <template>
-  <div class="m-2 flex flex-col items-center gap-2">
-    <div class="flex flex-col gap-2 relative">
-      <div class="flex items-center justify-center gap-2 h-10">
-        <Button severity="secondary" class="h-full aspect-square" @click="showSortOptions = !showSortOptions">
-          <span class="pi pi-sort"></span>
+    <div class="flex h-10 justify-center m-4 gap-2">
+        <InputText v-model="input" placeholder="Поиск" class="h-full w-64" />
+        <Button class="h-full aspect-square" severity="secondary">
+            <span class="pi pi-search"></span>
        </Button>
-
-        <InputText class="h-full w-64" v-model="input"/>
-        <Button severity="secondary" class="h-full aspect-square" @click="emits('onSearch', input)">
-          <span class="pi pi-search"></span>
-        </Button>
-      </div>
-      <SortingOptions v-model="sortOptions as SortOptions<T>" :scheme v-if="showSortOptions"
-                      class="absolute z-10 w-full top-full translate-y-2" :load="props.load"></SortingOptions>
    </div>
-
-  </div>
-  <DialogWindow :name :load :items :validate :scheme :service :get-defaults v-model:item="<T>createItem"
-                v-model:show="showCreate" @on-save="data => emits('onSave', data)"
-                @on-save-create="data => emits('onSaveCreate', data)">
-    <template v-for="key in keys" #[key]="{ data }">
-      <slot :name="<string>key" :data="data"></slot>
-    </template>
-    <template v-for="key in keys" #[createSlotName(key)]="{ data }">
-      <slot :name="createSlotName(key)" :data="data"></slot>
-    </template>
-  </DialogWindow>
-  <DialogWindow :name :load :items :validate :scheme update-mode :service :get-defaults v-model:item="<T>updateItem"
-                v-model:show="showUpdate" @on-save="data => emits('onSave', data)"
-                @on-save-update="data => emits('onSaveUpdate', data)">
-    <template v-for="key in keys" #[key]="{ data }">
-      <slot :name="<string>key" :data="data"></slot>
-    </template>
-    <template v-for="key in keys" #[updateSlotName(key)]="{ data }">
-      <slot :name="updateSlotName(key)" :data="data"></slot>
-    </template>
-  </DialogWindow>
-  <div>
-    <DataTable :value="<[]>items" paginator :rows="10">
-      <template #header v-if="props.name">
-        <p>{{ props.name }}</p>
-      </template>
-      <template v-for="key in keys">
-        <Column :header="props.scheme[key]?.russian" v-if="!props.scheme[key].hidden">
-          <template #body="{ data }">
-            <p class="truncate max-w-56" v-tooltip="viewDate(manyStructsView(
-                            data[key],
-                            props.scheme[key]?.type?.nested?.field,
-                        ), scheme[key]?.type?.primitive)">
-              {{
-                viewDate(manyStructsView(
-                    data[key],
-                    props.scheme[key]?.type?.nested?.field,
-                ), scheme[key]?.type?.primitive)
-              }}
-            </p>
-          </template>
-        </Column>
-      </template>
-      <Column header="Действия">
-        <template #body="{ data }">
-          <div class="flex gap-2">
-            <Button severity="secondary" icon="pi pi-pencil" @click="async () => {
-                            await emits('onUpdateOpen')
-                            await emits('onOpen')
-                            updateItem = data
-                        }"></Button>
-            <Button severity="danger" icon="pi pi-trash" @click="async () => {
-                            await emits('onDelete', data)
-                            await props.service.delete(data.Id)
-                            await load()
-                        }"></Button>
-          </div>
+    <DialogWindow
+        :name
+        :load
+        :items
+        :validate
+        :scheme
+        :service
+        :get-defaults
+        v-model:item="<T>createItem"
+        v-model:show="showCreate"
+        @on-save="(data) => emits('onSave', data)"
+        @on-save-create="(data) => emits('onSaveCreate', data)"
+    >
+        <template v-for="key in keys" #[key]="{ data }">
+            <slot :name="<string>key" :data></slot>
        </template>
-      </Column>
-      <template #paginatorstart>
-        <Button severity="secondary" @click="props.load">
-          <span class="pi pi-refresh"></span>
-        </Button>
-      </template>
-      <template #paginatorend>
-        <span></span>
-      </template>
-    </DataTable>
-    <FloatingButton @click="handleFloatingButtonClick"/>
-  </div>
+        <template v-for="key in keys" #[createSlotName(key)]="{ data }">
+            <slot :name="createSlotName(key)" :data></slot>
+        </template>
+    </DialogWindow>
+    <DialogWindow
+        :name
+        :load
+        :items
+        :validate
+        :scheme
+        update-mode
+        :service
+        :get-defaults
+        v-model:item="<T>updateItem"
+        v-model:show="showUpdate"
+        @on-save="(data) => emits('onSave', data)"
+        @on-save-update="(data) => emits('onSaveUpdate', data)"
+    >
+        <template v-for="key in keys" #[key]="{ data }">
+            <slot :name="<string>key" :data></slot>
+        </template>
+        <template v-for="key in keys" #[updateSlotName(key)]="{ data }">
+            <slot :name="updateSlotName(key)" :data></slot>
+        </template>
+    </DialogWindow>
+    <div>
+        <DataTable :value="<[]>items" paginator :rows="10">
+            <template #header v-if="props.name">
+                <p>{{ props.name }}</p>
+            </template>
+            <template v-for="key in keys">
+                <Column
+                    :header="props.scheme[key]?.russian"
+                    v-if="!props.scheme[key].hidden"
+                >
+                    <template #body="{ data }">
+                        <p
+                            class="truncate max-w-56"
+                            v-tooltip="
+                                viewDate(
+                                    manyStructsView(
+                                        data[key],
+                                        props.scheme[key]?.type?.nested?.field,
+                                    ),
+                                    scheme[key]?.type?.primitive,
+                                )
+                            "
+                        >
+                            {{
+                                viewDate(
+                                    manyStructsView(
+                                        data[key],
+                                        props.scheme[key]?.type?.nested?.field,
+                                    ),
+                                    scheme[key]?.type?.primitive,
+                                )
+                            }}
+                        </p>
+                    </template>
+                </Column>
+            </template>
+            <Column header="Действия">
+                <template #body="{ data }">
+                    <div class="flex gap-2">
+                        <Button
+                            severity="secondary"
+                            icon="pi pi-pencil"
+                            @click="
+                                async () => {
+                                    await emits('onUpdateOpen');
+                                    await emits('onOpen');
+                                    updateItem = data;
+                                }
+                            "
+                        ></Button>
+                        <Button
+                            severity="danger"
+                            icon="pi pi-trash"
+                            @click="
+                                async () => {
+                                    await emits('onDelete', data);
+                                    await props.service.delete(data.Id);
+                                    await load();
+                                }
+                            "
+                        ></Button>
+                    </div>
+                </template>
+            </Column>
+        </DataTable>
+        <FloatingButton @click="handleFloatingButtonClick" />
+    </div>
 </template>
--- a/frontend/src/types/search.type.ts
+++ b/frontend/src/types/search.type.ts
@@ -0,0 +1,3 @@
+import type { IEntity } from "./entity.type";
+
+export type Search<T extends IEntity> = (input: string) => T[]
--- a/frontend/src/types/sort-options.type.ts
+++ b/frontend/src/types/sort-options.type.ts
@@ -1,6 +0,0 @@
-import type { IEntity } from "./entity.type";
-import type { Sorting } from "./sorting.type";
-
-export type SortOptions<T extends IEntity> = {
-    [key in keyof Partial<T>]: Sorting
-}
--- a/frontend/src/types/sort.type.ts
+++ b/frontend/src/types/sort.type.ts
@@ -0,0 +1,7 @@
+import type { IEntity } from "./entity.type";
+
+export type SortOptions<T extends IEntity> = {
+    [key in keyof T]: "ASC" | "DESC"
+}
+
+export type Sort<T extends IEntity> = (options: SortOptions<T>) => T[]
--- a/frontend/src/types/sorting.type.ts
+++ b/frontend/src/types/sorting.type.ts
@@ -1 +0,0 @@
-export type Sorting = "DESC" | "ASC"
--- a/frontend/src/types/table-props.type.ts
+++ b/frontend/src/types/table-props.type.ts
@@ -1,6 +1,8 @@
 import type { IEntity } from "./entity.type";
 import type { Scheme } from "./scheme.type";
+import type { Search } from "./search.type";
 import type { IService } from "./service.type";
+import type { Sort } from "./sort.type";
 import type { Validate } from "./validate.type";

 export interface TableProps<T extends IEntity> {
--- a/frontend/src/utils/structs/default-sort-options.util.ts
+++ b/frontend/src/utils/structs/default-sort-options.util.ts
@@ -1,16 +0,0 @@
-import type { IEntity } from "../../types/entity.type";
-import type { Scheme } from "../../types/scheme.type";
-import type { SortOptions } from "../../types/sort-options.type";
-
-export const getDefaultSortOptions = <T extends IEntity>(scheme: Scheme<T>): SortOptions<T> => {
-    const keys = Object.keys(scheme) as (keyof T)[]
-    const result: Partial<SortOptions<T>> = {}
-
-    keys.forEach(key => {
-        if (!scheme[key].hidden && key !== 'entityId' && !scheme[key].many) {
-            result[key] = 'ASC'
-        }
-    })
-
-    return result as SortOptions<T>
-}
--- a/frontend/src/utils/structs/default-sort.util.ts
+++ b/frontend/src/utils/structs/default-sort.util.ts
@@ -0,0 +1,6 @@
+import type { IEntity } from "../../types/entity.type";
+import type { Scheme } from "../../types/scheme.type";
+
+export const defaultSort = <T extends IEntity>(scheme: Scheme<T>) => {
+    
+}
--- a/package-lock.json
+++ b/package-lock.json
@@ -0,0 +1,18 @@
+{
+	"name": "boilerplate",
+	"lockfileVersion": 3,
+	"requires": true,
+	"packages": {
+		"": {
+			"dependencies": {
+				"@wailsio/runtime": "3.0.0-alpha.66"
+			}
+		},
+		"node_modules/@wailsio/runtime": {
+			"version": "3.0.0-alpha.66",
+			"resolved": "https://registry.npmjs.org/@wailsio/runtime/-/runtime-3.0.0-alpha.66.tgz",
+			"integrity": "sha512-ENLu8rn1griL1gFHJqkq1i+BVxrrA0JPJHYneUJYuf/s54kjuQViW0RKDEe/WTDo56ABpfykrd/T8OYpPUyXUw==",
+			"license": "MIT"
+		}
+	}
+}
--- a/package.json
+++ b/package.json
@@ -0,0 +1,5 @@
+{
+	"dependencies": {
+		"@wailsio/runtime": "3.0.0-alpha.66"
+	}
+}
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -0,0 +1,22 @@
+lockfileVersion: '9.0'
+
+settings:
+  autoInstallPeers: true
+  excludeLinksFromLockfile: false
+
+importers:
+
+  .:
+    dependencies:
+      '@wailsio/runtime':
+        specifier: 3.0.0-alpha.66
+        version: 3.0.0-alpha.66
+
+packages:
+
+  '@wailsio/runtime@3.0.0-alpha.66':
+    resolution: {integrity: sha512-ENLu8rn1griL1gFHJqkq1i+BVxrrA0JPJHYneUJYuf/s54kjuQViW0RKDEe/WTDo56ABpfykrd/T8OYpPUyXUw==}
+
+snapshots:
+
+  '@wailsio/runtime@3.0.0-alpha.66': {}