From 4eaa4825f30f086de4b889951e50a2eda48ff19d Mon Sep 17 00:00:00 2001 From: Mungunbagana Batzorig Date: Tue, 9 May 2023 18:08:32 +0800 Subject: [PATCH 1/8] kb changes --- src/app.vue | 105 +++++++++--------- src/modules/dataform/elements/DateTime.vue | 10 +- src/modules/dataform/utils/date.js | 4 +- src/modules/datagrid/Datagrid.vue | 1 - src/modules/krud/templates/edit.vue | 2 +- src/modules/page/views/index.vue | 2 +- .../role/views/ProductItem/ProductItem.vue | 2 +- src/pages/role/views/index.vue | 18 +-- .../components/user-control/UserControl.vue | 37 +++--- 9 files changed, 91 insertions(+), 90 deletions(-) diff --git a/src/app.vue b/src/app.vue index 7af485e..a27704a 100644 --- a/src/app.vue +++ b/src/app.vue @@ -60,61 +60,62 @@ -
  • -
  • - {{ lang.data_processor }} -
    • + + + + -
  • - - - {{ lang.data_settings }} - -
    • -
  • - - - {{ lang._chart }} - -
    • -
  • - - - {{ lang.original_preparation }} - -
    • -
  • - - - {{ lang._report }} - -
    • -
  • - - - {{ lang.analysis }} - -
    • + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -
  • - - - {{ lang.target_statement }} - -
    • -
  • - -   - {{ lang.graphql_management }} - -
    • + + + + + + + + + + + + + + + + + + + -
  • - - - Вэб хуудас - -
  • {{ lang.usersAndUserGroups }} diff --git a/src/modules/dataform/elements/DateTime.vue b/src/modules/dataform/elements/DateTime.vue index 95a6140..abc72f4 100644 --- a/src/modules/dataform/elements/DateTime.vue +++ b/src/modules/dataform/elements/DateTime.vue @@ -1,8 +1,10 @@ diff --git a/src/modules/dataform/utils/date.js b/src/modules/dataform/utils/date.js index f6b5c73..a309271 100644 --- a/src/modules/dataform/utils/date.js +++ b/src/modules/dataform/utils/date.js @@ -23,11 +23,11 @@ export function toTime(time) { } export function toDateTime(datetime) { - return Moment(datetime, 'YYYY-MM-DD HH:mm:ss') + return Moment(datetime, 'YYYY-MM-DD HH:mm:ss').tz('Asia/Ulaanbaatar') } export function now() { - return Moment().format("YYYY-MM-DD HH:mm:ss") + return Moment().tz('Asia/Ulaanbaatar').format("YYYY-MM-DD HH:mm:ss") } export function getDateTime(date) { diff --git a/src/modules/datagrid/Datagrid.vue b/src/modules/datagrid/Datagrid.vue index c11aa39..f34f440 100644 --- a/src/modules/datagrid/Datagrid.vue +++ b/src/modules/datagrid/Datagrid.vue @@ -620,7 +620,6 @@ export default { actionsVisibility: this.$props.actionvisibility, } }; - if (this.permissions) { if (this.permissions.r || this.permissions.u || this.permissions.d) { if (this.actionPosition == 0) { diff --git a/src/modules/krud/templates/edit.vue b/src/modules/krud/templates/edit.vue index 26d62d8..f4ced0a 100644 --- a/src/modules/krud/templates/edit.vue +++ b/src/modules/krud/templates/edit.vue @@ -14,7 +14,7 @@ -
    +
    diff --git a/src/modules/page/views/index.vue b/src/modules/page/views/index.vue index 0175e4f..f8fa94c 100644 --- a/src/modules/page/views/index.vue +++ b/src/modules/page/views/index.vue @@ -4,7 +4,7 @@
      -
    • - - - {{lang.personalInfo}} - -
      • -
    • - - - {{lang.changePass}} - -
      • -
    • - - - {{lang.superAdminManagement}} - -
      • + + + + + + + + + + + + + + + + + + +
    • From 5d43ffc1165f292c4c515b5bb89d3e40f922e602 Mon Sep 17 00:00:00 2001 From: Mungunbagana Batzorig Date: Tue, 23 May 2023 21:02:30 +0800 Subject: [PATCH 2/8] lgoo --- src/app.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app.vue b/src/app.vue index 6a40321..ac263ec 100644 --- a/src/app.vue +++ b/src/app.vue @@ -4,9 +4,9 @@
      @@ -48,23 +48,23 @@ - + - + - + - +
      @@ -83,10 +83,20 @@ v-if="col.type == 'section'">
      + + class='pz-col-input'/> + Нуух + + +
      @@ -94,7 +104,7 @@ - +
      + class='pz-col-input'/> + class='pz-col-input'/>
      - +
      @@ -213,20 +223,22 @@
      - +
      + class='pz-col-input'/> + class='pz-col-input' :placeholder='lang.Get_name' + autocomplete="off"/>
      - + - +
      @@ -306,11 +318,11 @@
      + + diff --git a/src/modules/dataform/elements/subform/Grid.vue b/src/modules/dataform/elements/subform/Grid.vue index f9edeb3..723f38a 100644 --- a/src/modules/dataform/elements/subform/Grid.vue +++ b/src/modules/dataform/elements/subform/Grid.vue @@ -1,7 +1,7 @@ + :model="users" :query="query" :roles="roles" :is-top="false" + :layout="layout"> -
      @@ -112,12 +118,12 @@
      - {{lang.registrationIsNotConfirmed}} + {{ lang.registrationIsNotConfirmed }}
      - {{lang.registrationConfirmed}} + {{ lang.registrationConfirmed }}
      @@ -126,40 +132,45 @@
      • - {{lang.firstNameandLastName}} + {{ lang.firstNameandLastName }} + v-if="user.first_name != null && user.first_name !=''">{{ user.first_name }} - + v-if="user.last_name != null && user.last_name !=''"> {{ user.last_name }} +
      • - {{lang.email}} + {{ lang.email }} - + v-if="user.email != null && user.email != ''">{{ user.email }} +
      • - {{lang.mobile}} + {{ lang.mobile }} - + v-if="user.phone != null && user.phone != ''">{{ user.phone }} +
      • - {{ !isDeleted ? lang.createdDate : lang.deleted}} - {{ !isDeleted ? setMoment(user.created_at) : user.deleted_at}} + {{ !isDeleted ? lang.createdDate : lang.deleted }} + {{ !isDeleted ? setMoment(user.created_at) : user.deleted_at }}
      @@ -170,7 +181,8 @@ - + @@ -180,12 +192,12 @@ import moment from 'moment'; import pagination from "./pagination"; export default { - props:['baseUrl'], + props: ['baseUrl'], computed: { lang() { const labels = ['db', 'usersAndUserGroups', 'users', 'userGroupsPermission', 'sendDBSchema', 'userList', 'totalEmployees', 'categorySearch', 'sort', 'searchForInformation', 'noMatchingData', 'addUser', - 'registrationConfirmed','registrationIsNotConfirmed', 'createdDate', 'firstNameandLastName', 'noInfo', 'noData', 'email', + 'registrationConfirmed', 'registrationIsNotConfirmed', 'createdDate', 'firstNameandLastName', 'noInfo', 'noData', 'email', 'ruconfinfo', 'ruconfinfoDelete', 'created', 'deleted', 'listOfDeletedUsers', 'byLoginName', 'yes', 'no', 'completeDestruction', 'recovery', 'edit', '' ]; @@ -207,7 +219,7 @@ export default { return obj; }, {}); }, - url(){ + url() { return this.baseUrl ? this.baseUrl : ""; }, }, @@ -280,10 +292,14 @@ export default { editUser(id) { this.editMode = true; this.showForm = true; - this.$refs.agentForm.editModel(id); + this.$nextTick(() => { + if (this.$refs.agentForm) { + this.$refs.agentForm.editModel(id); + } + }); }, deleteUser(id) { - axios.get(this.url+'/agent/delete/' + id).then(o => { + axios.get(this.url + '/agent/delete/' + id).then(o => { if (o.status) { this.$Message.success(`${this._messageTranslate.userDeleted}`); let deletedUser = this.users.data.find(item => item.id == id); @@ -297,7 +313,7 @@ export default { }) }, deleteUserComplete(id) { - axios.get(this.url+'/agent/delete/complete/' + id).then(o => { + axios.get(this.url + '/agent/delete/complete/' + id).then(o => { if (o.status) { this.$Message.success(`${this._messageTranslate.userDeleted}`) this.deletedUsers.data = this.deletedUsers.data.filter(item => item.id != id); @@ -308,7 +324,7 @@ export default { }) }, restoreUser(id) { - axios.get(this.url+'/agent/restore/' + id) + axios.get(this.url + '/agent/restore/' + id) .then(o => { if (o.status) { this.$Message.success(`${this._messageTranslate.UserInformationRestored}`); @@ -326,7 +342,7 @@ export default { }); }, showDefaultAvatar(e) { - e.target.src = this.url+"/assets/lambda/images/avatar.png"; + e.target.src = this.url + "/assets/lambda/images/avatar.png"; }, searchUser() { if (this.q == null || this.q == '') { @@ -336,7 +352,7 @@ export default { } }, handleSearch(q) { - axios.get(this.url+'/agent/search/' + q).then(o => { + axios.get(this.url + '/agent/search/' + q).then(o => { if (o.data.status) { this.users = o.data.data; } else { @@ -345,11 +361,11 @@ export default { }); }, getRoles() { - axios.get(this.url+'/agent/roles').then(({data}) => { + axios.get(this.url + '/agent/roles').then(({data}) => { this.roles = data; }) }, - wordSwap(words){ + wordSwap(words) { console.log("words"); console.log(words); //words = this.lang().words; diff --git a/src/modules/dataform/DataformMixin.js b/src/modules/dataform/DataformMixin.js index 4a06b85..8f1f2d0 100644 --- a/src/modules/dataform/DataformMixin.js +++ b/src/modules/dataform/DataformMixin.js @@ -855,7 +855,7 @@ export default { } }, - editModel(id, editData) { + editModel(id, editData=null) { if (editData) { this.model = {...this.model, ...editData} if (this.ui && this.ui.hasOwnProperty('schema')) { diff --git a/src/template/paper/components/ribbon/ribbon.scss b/src/template/paper/components/ribbon/ribbon.scss index 72228db..7de244f 100644 --- a/src/template/paper/components/ribbon/ribbon.scss +++ b/src/template/paper/components/ribbon/ribbon.scss @@ -42,4 +42,4 @@ ul.ribbon { } } } -} \ No newline at end of file +} From f36ff8b57fb60b5b077b9298473482789caeeda7 Mon Sep 17 00:00:00 2001 From: Mungunbagana Batzorig Date: Tue, 2 Sep 2025 18:55:57 +0800 Subject: [PATCH 8/8] slug added on form --- src/modules/dataform/FormBuilder.vue | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/modules/dataform/FormBuilder.vue b/src/modules/dataform/FormBuilder.vue index 1e875f6..968346e 100644 --- a/src/modules/dataform/FormBuilder.vue +++ b/src/modules/dataform/FormBuilder.vue @@ -7,6 +7,10 @@
      +
      + + +
      @@ -616,6 +620,7 @@ export default { //Form part isModelSelected: false, formName: null, + slug: null, editor: Editor, dataform: { formType: 'normal', @@ -1053,6 +1058,7 @@ export default { let res = await axios.get(this.$props.src + '/builder') try { this.formName = res.data.data.hasOwnProperty('name') ? res.data.data.name : res.data.data.model + this.slug = res.data.data.hasOwnProperty('slug') ? res.data.data.slug : res.data.data.model this.dataform = JSON.parse(res.data.data.schema) await this.callOtherFormsGrids() await this.updateSyncForm() @@ -1507,6 +1513,7 @@ export default { let data = { name: this.formName, + slug: this.slug, schema: JSON.stringify(this.dataform) } let defualtURL = `/lambda/puzzle/schema/form`