From 5944d772eccc1edf6a7c4e071ab90205d2c43027 Mon Sep 17 00:00:00 2001 From: Saeid Date: Wed, 11 Dec 2019 14:42:43 +0330 Subject: [PATCH] work in office --- public/mix-manifest.json | 14 ++++---- .../components/Misc/InfoBlock-Multiple.vue | 8 ++--- .../js/Global/components/Misc/InfoBlock.vue | 2 +- .../js/Global/plugins/globalComponent.js | 4 ++- .../Global/utils/common/ProcessTreeArray.js | 36 +++++++++---------- webpack.mix.js | 2 +- 6 files changed, 32 insertions(+), 34 deletions(-) diff --git a/public/mix-manifest.json b/public/mix-manifest.json index 98cedfe..0437fd0 100644 --- a/public/mix-manifest.json +++ b/public/mix-manifest.json @@ -1,9 +1,9 @@ { - "/js/vue/Authentication/app.js": "/js/vue/Authentication/app.js?id=d2a8480263d428c16343", - "/js/vue/Home/app.js": "/js/vue/Home/app.js?id=0f239fae35287df04c3b", - "/js/vue/Modules/CRM/app.js": "/js/vue/Modules/CRM/app.js?id=912cb605e06c39d3765e", - "/js/vue/Product/app.js": "/js/vue/Product/app.js?id=c0cd56af7357da21cfaa", - "/js/vue/SMS/app.js": "/js/vue/SMS/app.js?id=59ac0f5295c33e21c15b", - "/js/vue/Service/app.js": "/js/vue/Service/app.js?id=2080d624a3f0dc4bb9a2", - "/js/vue/User/app.js": "/js/vue/User/app.js?id=45c8ad557c8749eae217" + "/js/vue/Authentication/app.js": "/js/vue/Authentication/app.js?id=e7a471226cef824d1883", + "/js/vue/Home/app.js": "/js/vue/Home/app.js?id=84489e0d471be485b546", + "/js/vue/Modules/CRM/app.js": "/js/vue/Modules/CRM/app.js?id=70bf4cdcfa563811ed08", + "/js/vue/Product/app.js": "/js/vue/Product/app.js?id=4290b19b5a7abd1a32e6", + "/js/vue/SMS/app.js": "/js/vue/SMS/app.js?id=d80af11aed435cac35f1", + "/js/vue/Service/app.js": "/js/vue/Service/app.js?id=eb85c2455d49146ae28f", + "/js/vue/User/app.js": "/js/vue/User/app.js?id=3620a41a5d3c7742cc8f" } diff --git a/resources/js/Global/components/Misc/InfoBlock-Multiple.vue b/resources/js/Global/components/Misc/InfoBlock-Multiple.vue index 62a4fa1..04f562e 100644 --- a/resources/js/Global/components/Misc/InfoBlock-Multiple.vue +++ b/resources/js/Global/components/Misc/InfoBlock-Multiple.vue @@ -13,10 +13,10 @@ diff --git a/resources/js/Global/components/Misc/InfoBlock.vue b/resources/js/Global/components/Misc/InfoBlock.vue index 234e971..ef2756f 100644 --- a/resources/js/Global/components/Misc/InfoBlock.vue +++ b/resources/js/Global/components/Misc/InfoBlock.vue @@ -11,7 +11,7 @@ export default { props: { icon: { default: 'check' }, label: { default: " عنوان " }, - value: { default: " پسر خوب " }, + value: { default: "" }, direction: { default: '' }, valueClass: { default: '' }, }, diff --git a/resources/js/Global/plugins/globalComponent.js b/resources/js/Global/plugins/globalComponent.js index 9bd5a3e..264132b 100644 --- a/resources/js/Global/plugins/globalComponent.js +++ b/resources/js/Global/plugins/globalComponent.js @@ -2,7 +2,7 @@ import Vue from 'vue'; // global Styles import "@Global/scss/style.scss"; - +import "@riophae/vue-treeselect/dist/vue-treeselect.css";//for tree select // global Components import PartTitle from "@Global/components/Dividers/PartTitle.vue"; @@ -14,6 +14,7 @@ import Breadcrumbs from "@Global/components/Misc/Breadcrumbs"; import Dialog from "@Global/components/Modals/Dialog.vue"; import Helper from "@Global/components/Modals/Helper.vue"; import InfoMultiple from "@Global/components/Misc/InfoBlock-Multiple.vue"; +import Treeselect from "@riophae/vue-treeselect"; Vue.component("WM-PartTitle", PartTitle); Vue.component("WM-PageTitle", PageTitle); @@ -24,6 +25,7 @@ Vue.component("wm-info-block-multiple", InfoMultiple); Vue.component("wm-breadcrumbs", Breadcrumbs); Vue.component("wm-dialog", Dialog); Vue.component("wm-helper", Helper); +Vue.component("treeselect", Treeselect); //setTime diff --git a/resources/js/Global/utils/common/ProcessTreeArray.js b/resources/js/Global/utils/common/ProcessTreeArray.js index 9d460e4..d21bfbe 100644 --- a/resources/js/Global/utils/common/ProcessTreeArray.js +++ b/resources/js/Global/utils/common/ProcessTreeArray.js @@ -1,23 +1,3 @@ -// const convertTreeToList = (data) => { -// var arrayList = []; - -// function recursiveFunction(array) { -// for (const iterator of array) { -// if (iterator.children && iterator.children.length) { -// let clone = Object.assign({}, iterator); -// delete clone.children; -// arrayList.push(clone); -// let list = recursiveFunction(iterator.children); -// arrayList.concat(list); -// } else { -// arrayList.push(iterator); -// } -// } -// return arrayList; -// } - -// return recursiveFunction(data); -// }; const convertTreeToList = data => { var arrayList = {}; @@ -259,6 +239,22 @@ const insertTreeArray = ( } return treeArray; }; +// const maxDeep = ( +// treeArray, +// ) => { +// let array = treeArray; +// let maxCount = 0; +// function recursiveFunction(array, count = 0) { +// if (count > maxCount) { +// maxCount++; +// } +// array.forEach(element => { +// element.children; +// }); +// } +// return Array.isArray(array) ? recursiveFunction(array) : maxCount; + +// }; export { convertTreeToList, diff --git a/webpack.mix.js b/webpack.mix.js index c20dd48..322ea35 100644 --- a/webpack.mix.js +++ b/webpack.mix.js @@ -30,7 +30,7 @@ mix.js('resources/js/Home/app.js', 'public/js/vue/Home'); require('./modules/wm-core/webpack.mix'); require('./modules/wm-common/webpack.mix'); require('./modules/wm-crm/webpack.mix'); -require('./modules/wm-store/webpack.mix'); +// require('./modules/wm-store/webpack.mix'); // require('./modules/wm-reservation/webpack.mix');