diff --git a/app/components/Modal.vue b/app/components/Modal.vue index 86cf7ab..8095847 100644 --- a/app/components/Modal.vue +++ b/app/components/Modal.vue @@ -22,22 +22,15 @@ v-if="title" class="modal-card-head px-4 py-3" > -
-
-
-

-
-
- -
-
-
+

+
{ if (!lock) emit("close"); }; @@ -129,7 +122,8 @@ const doClick = function (e) { }; onMounted(() => { - if (Object.values(props).some((x) => isNotNil(x))) { + const modalHasProps = Object.values(props).some((x) => isNotNil(x)); + if (modalHasProps) { document.documentElement.classList.add("is-clipped"); window.addEventListener("keydown", (e) => { if (e.key === "Escape") closeModal(); diff --git a/app/components/SearchBox.vue b/app/components/SearchBox.vue index fe03b68..324a88a 100644 --- a/app/components/SearchBox.vue +++ b/app/components/SearchBox.vue @@ -34,13 +34,13 @@ @@ -54,14 +54,8 @@ class="dropdown-content px-3" style="min-width: 100%" > -

- {{ isVietnamese ? "Không có giá trị thỏa mãn" : "No matching values" }} -

+

+ + Không có giá trị thoả mãn +

@@ -124,8 +139,7 @@ @dataevent="dataevent" @close="showmodal = undefined" v-bind="showmodal" - v-if="showmodal" - > + />
@@ -157,6 +171,7 @@ export default { return { search: undefined, data: [], + isLoading: false, timer: undefined, value: undefined, selected: undefined, @@ -266,8 +281,10 @@ export default { } }, async getData() { + this.isLoading = false; this.params.filter = this.filter; let data = await this.$getdata(this.api, undefined, this.params); + this.isLoading = true; return data; }, async getApi(val) { @@ -373,4 +390,11 @@ export default { .field:not(:last-child) { margin-bottom: 0; } +.button.is-light { + --bulma-button-background-l: 89%; +} +.button:hover, +.button.is-hovered { + --bulma-button-background-l-delta: -10%; +} diff --git a/app/components/common/InputNumber.vue b/app/components/common/InputNumber.vue index 06d31a4..d95ea60 100644 --- a/app/components/common/InputNumber.vue +++ b/app/components/common/InputNumber.vue @@ -1,24 +1,34 @@ diff --git a/app/components/datatable/EditLabel.vue b/app/components/datatable/EditLabel.vue index b55e95d..4c6a4d2 100644 --- a/app/components/datatable/EditLabel.vue +++ b/app/components/datatable/EditLabel.vue @@ -1,12 +1,11 @@ -
+ + + + Thêm thuộc tính + +
-
-
- Cập nhật + Cập nhật +
+
-

+

Đang mở: {{ $stripHtml(currentsetting.name, 40) }}

- +
- - - - Ghi đè + + - - - - - Tạo mới + Ghi đè + +
@@ -106,28 +113,30 @@ import { ref } from "vue"; import { useStore } from "@/stores/index"; const emit = defineEmits([]); const store = useStore(); -var props = defineProps({ +const props = defineProps({ pagename: String, classify: String, option: String, data: Object, focus: Boolean, }); -const { $empty, $copy, $filter, $stripHtml, $updateapi, $insertapi, $findIndex, $snackbar } = useNuxtApp(); -var pagename = props.pagename; -var radioOption = ref(); +const { $empty, $copy, $stripHtml, $updateapi, $insertapi, $findIndex, $snackbar } = useNuxtApp(); +const radioOption = ref(); var login = { id: 1 }; -var errors = []; -var radioType = undefined; -var radioDefault = 0; -var radioSave = ref("new"); -var note = undefined; -var status = undefined; -var name = undefined; +const errors = ref([]); +const radioType = ref(); +const radioDefault = 0; +const radioSave = ref("overwrite"); +const name = ref(); +const note = ref(); +const status = undefined; var currentsetting = undefined; +var pagename = props.pagename; var pagedata = store[props.pagename]; +const isLoading = ref(false); + async function saveSetting() { - errors = []; + errors.value = []; let detail = pagename ? { fields: pagedata.fields } : {}; if (pagename) { let element = pagedata.tablesetting || {}; @@ -139,19 +148,21 @@ async function saveSetting() { if (props.option) detail.option = props.option; if (props.data) detail.data = props.data; let data = { - user: login.id, - name: name, - detail: detail, - note: note, - type: radioType.id, + // user: login.id, + user: undefined, + name: name.value, + detail, + note, + type: radioType.value.id, classify: props.classify ? props.classify : store.settingclass.find((v) => v.code === "data-field").id, default: radioDefault, update_time: new Date(), }; let result; + isLoading.value = true; if (radioSave.value === "new") { - if ($empty(name)) { - return errors.push({ + if ($empty(name.value)) { + return errors.value.push({ name: "name", msg: "Tên thiết lập không được bỏ trống", }); @@ -163,6 +174,7 @@ async function saveSetting() { copy.update_time = new Date(); result = await $updateapi("usersetting", copy); } + isLoading.value = false; if (radioSave.value === "new") { emit("modalevent", { name: "opensetting", data: result }); } else { @@ -187,11 +199,12 @@ function changeOption(v) { radioOption.value = v.code; } function initData() { - radioType = store.settingtype.find((v) => v.code === "private"); + radioType.value = store.settingtype.find((v) => v.code === "private"); if (props.pagename) currentsetting = $copy(pagedata.setting ? pagedata.setting : undefined); - if (!currentsetting) radioSave.value = "new"; + // disable temp: for now, radioSave is always 'overwrite' + /* if (!currentsetting) radioSave.value = "new"; else if (currentsetting.user !== login.id) radioSave.value = "new"; - else radioSave.value = "overwrite"; + else radioSave.value = "overwrite"; */ } initData(); diff --git a/app/components/datatable/NewField.vue b/app/components/datatable/NewField.vue index 9dc1b89..666e608 100644 --- a/app/components/datatable/NewField.vue +++ b/app/components/datatable/NewField.vue @@ -2,10 +2,12 @@
-
+

v.name === "name").message }}

Tên trường do hệ thống tự sinh.

-
+
@@ -187,7 +189,12 @@ class="button" @click="editLabel()" > - + + +
@@ -199,53 +206,47 @@

-
- +
-
-

- Tạo cột -

-
+ + /> + diff --git a/app/components/imports/AddProductForm.vue b/app/components/imports/AddProductForm.vue index e8a9975..ed14c5a 100644 --- a/app/components/imports/AddProductForm.vue +++ b/app/components/imports/AddProductForm.vue @@ -20,7 +20,8 @@ const body = ref({ }); function selected(field, data) { - body.value[field] = data.id; + if (data === null) body.value[field] = data; + else body.value[field] = data.id; } async function createProduct() { @@ -31,309 +32,319 @@ async function createProduct() { diff --git a/app/components/imports/AddProductVariant.vue b/app/components/imports/AddProductVariant.vue new file mode 100644 index 0000000..b7349e3 --- /dev/null +++ b/app/components/imports/AddProductVariant.vue @@ -0,0 +1,61 @@ + + + diff --git a/app/components/imports/AddProductVariantForm.vue b/app/components/imports/AddProductVariantForm.vue index 9a9b6ea..28b7825 100644 --- a/app/components/imports/AddProductVariantForm.vue +++ b/app/components/imports/AddProductVariantForm.vue @@ -1,20 +1,33 @@