1
0
mirror of https://github.com/PanJiaChen/vue-element-admin.git synced 2025-08-13 15:15:53 +08:00

Improve request util (#712)

* Improve request util
- Improve request util based on basic and generic request
- Add ADempiere request layer (use it as template for others)
- Add Release information from github
- Chamge ADempiere request API fos a custom request

* Add release version

* Add rt-3.2 version

* Minmor change

* Add default action for release

* Add echo

* just a test

* Test release

* Add Release no version for test

* Add test for publish

* Add release no from tag
This commit is contained in:
Yamel Senih 2021-04-04 16:38:38 -04:00 committed by GitHub
parent e2d23df27e
commit 2b1d8f73ff
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
26 changed files with 108 additions and 153 deletions

View File

@ -30,6 +30,7 @@ jobs:
node-version: 12 node-version: 12
registry-url: https://registry.npmjs.org/ registry-url: https://registry.npmjs.org/
- run: npm i - run: npm i
- run: sed -i "s|releaseNoForDocumentation|${{ github.event.release.tag_name }}|g" config/default.json
- run: npm run build:prod --if-present - run: npm run build:prod --if-present
- uses: TheDoctor0/zip-release@0.4.1 - uses: TheDoctor0/zip-release@0.4.1
with: with:

View File

@ -10,5 +10,9 @@
"images": { "images": {
"url": "https://api.erpya.com/adempiere-api/img" "url": "https://api.erpya.com/adempiere-api/img"
} }
},
"repository": {
"url": "https://api.github.com",
"releaseNo": "releaseNoForDocumentation"
} }
} }

View File

@ -1,6 +1,5 @@
// Get Instance for connection // Get Instance for connection
import request from '@/utils/request' import { request } from '@/utils/ADempiere/request'
import { config } from '@/utils/ADempiere/config'
/** /**
* Request a browser search * Request a browser search
@ -39,7 +38,6 @@ export function requestBrowserSearch({
}) })
return request({ return request({
baseURL: config.adempiere.api.url,
url: '/ui/list-browser-items', url: '/ui/list-browser-items',
data: { data: {
// Running Parameters // Running Parameters

View File

@ -2,8 +2,7 @@
// please if you want to implement a custom dashboard create a new fielwith api definition // please if you want to implement a custom dashboard create a new fielwith api definition
// Get Instance for connection // Get Instance for connection
import request from '@/utils/request' import { request } from '@/utils/ADempiere/request'
import { config } from '@/utils/ADempiere/config'
// Get Recent Items based on selection option // Get Recent Items based on selection option
export function requestListRecentItems({ export function requestListRecentItems({
@ -13,7 +12,6 @@ export function requestListRecentItems({
pageSize pageSize
}) { }) {
return request({ return request({
baseURL: config.adempiere.api.url,
url: '/logs/list-recent-items', url: '/logs/list-recent-items',
method: 'post', method: 'post',
data: { data: {
@ -45,7 +43,6 @@ export function getFavoritesFromServer({
pageSize pageSize
}) { }) {
return request({ return request({
baseURL: config.adempiere.api.url,
url: '/dashboard/list-favorites', url: '/dashboard/list-favorites',
method: 'post', method: 'post',
data: { data: {
@ -81,7 +78,6 @@ export function getPendingDocumentsFromServer({
pageSize pageSize
}) { }) {
return request({ return request({
baseURL: config.adempiere.api.url,
url: '/dashboard/list-pending-documents', url: '/dashboard/list-pending-documents',
method: 'post', method: 'post',
data: { data: {
@ -117,7 +113,6 @@ export function requestLisDashboards({
pageSize pageSize
}) { }) {
return request({ return request({
baseURL: config.adempiere.api.url,
url: '/dashboard/list-dashboards', url: '/dashboard/list-dashboards',
method: 'post', method: 'post',
data: { data: {

View File

@ -1,6 +1,5 @@
// Get Instance for connection // Get Instance for connection
import request from '@/utils/request' import { request } from '@/utils/ADempiere/request'
import { config } from '@/utils/ADempiere/config'
/** /**
* Request dictionary Window metadata * Request dictionary Window metadata
@ -12,7 +11,6 @@ export function requestWindowMetadata({
id id
}) { }) {
return request({ return request({
baseURL: config.adempiere.api.url,
url: '/dictionary/window', url: '/dictionary/window',
method: 'get', method: 'get',
params: { params: {
@ -37,7 +35,6 @@ export function requestProcessMetadata({
id id
}) { }) {
return request({ return request({
baseURL: config.adempiere.api.url,
url: '/dictionary/process', url: '/dictionary/process',
method: 'get', method: 'get',
params: { params: {
@ -62,7 +59,6 @@ export function requestBrowserMetadata({
id id
}) { }) {
return request({ return request({
baseURL: config.adempiere.api.url,
url: '/dictionary/browser', url: '/dictionary/browser',
method: 'get', method: 'get',
params: { params: {
@ -87,7 +83,6 @@ export function requestForm({
id id
}) { }) {
return request({ return request({
baseURL: config.adempiere.api.url,
url: '/dictionary/form', url: '/dictionary/form',
method: 'get', method: 'get',
params: { params: {
@ -113,7 +108,6 @@ export function requestFieldMetadata({
elementColumnName elementColumnName
}) { }) {
return request({ return request({
baseURL: config.adempiere.api.url,
url: '/dictionary/field', url: '/dictionary/field',
method: 'get', method: 'get',
params: { params: {
@ -158,7 +152,6 @@ export function requestValidationRule({
id id
}) { }) {
return request({ return request({
baseURL: config.adempiere.api.url,
url: '/dictionary/validation', url: '/dictionary/validation',
method: 'get', method: 'get',
params: { params: {

View File

@ -1,6 +1,5 @@
// Get Instance for connection // Get Instance for connection
import request from '@/utils/request' import { request } from '@/utils/ADempiere/request'
import { config } from '@/utils/ADempiere/config'
const clientVersion = '1.0.0' const clientVersion = '1.0.0'
const applicationType = 'ADempiere-Vue' const applicationType = 'ADempiere-Vue'
@ -18,7 +17,6 @@ export function requestEnrollUser({
eMail eMail
}) { }) {
return request({ return request({
baseURL: config.adempiere.api.url,
url: '/enrollment/enroll', url: '/enrollment/enroll',
data: { data: {
user_name: userName, user_name: userName,
@ -51,7 +49,6 @@ export function requestForgotPassword(eMailOrUserName) {
} }
return request({ return request({
baseURL: config.adempiere.api.url,
url: '/enrollment/reset-password', url: '/enrollment/reset-password',
data: { data: {
user_name: userName, user_name: userName,
@ -78,7 +75,6 @@ export function requestChangePassword({
password password
}) { }) {
return request({ return request({
baseURL: config.adempiere.api.url,
url: '/enrollment/change-password', url: '/enrollment/change-password',
data: { data: {
token, token,
@ -104,7 +100,6 @@ export function requestActivateUser({
token token
}) { }) {
return request({ return request({
baseURL: config.adempiere.api.url,
url: '/enrollment/activate-user', url: '/enrollment/activate-user',
data: { data: {
token, token,

View File

@ -1,7 +1,6 @@
// Service for backend based on API // Service for backend based on API
// use this service for consume all related to preference of field // use this service for consume all related to preference of field
import request from '@/utils/request' import { request } from '@/utils/ADempiere/request'
import { config } from '@/utils/ADempiere/config'
// Update preference from API using criteria // Update preference from API using criteria
export function setPreference({ export function setPreference({
@ -15,7 +14,6 @@ export function setPreference({
isForCurrentContainer isForCurrentContainer
}) { }) {
return request({ return request({
baseURL: config.adempiere.api.url,
url: '/ui/set-preference', url: '/ui/set-preference',
method: 'post', method: 'post',
data: { data: {
@ -41,7 +39,6 @@ export function deletePreference({
isForCurrentContainer isForCurrentContainer
}) { }) {
return request({ return request({
baseURL: config.adempiere.api.url,
url: '/ui/delete-preference', url: '/ui/delete-preference',
method: 'post', method: 'post',
data: { data: {

View File

@ -1,6 +1,5 @@
// Get Instance for connection // Get Instance for connection
import request from '@/utils/request' import { request } from '@/utils/ADempiere/request'
import { config } from '@/utils/ADempiere/config'
import { isEmptyValue } from '@/utils/ADempiere' import { isEmptyValue } from '@/utils/ADempiere'
@ -16,7 +15,6 @@ export function requestGetPointOfSales({
posUuid posUuid
}) { }) {
return request({ return request({
baseURL: config.adempiere.api.url,
url: '/pos/get-point-of-sales', url: '/pos/get-point-of-sales',
method: 'post', method: 'post',
data: { data: {
@ -37,7 +35,6 @@ export function requestListPointOfSales({
pageToken pageToken
}) { }) {
return request({ return request({
baseURL: config.adempiere.api.url,
url: '/pos/list-point-of-sales', url: '/pos/list-point-of-sales',
method: 'post', method: 'post',
data: { data: {
@ -69,7 +66,6 @@ export function requestCreateOrder({
salesRepresentativeUuid salesRepresentativeUuid
}) { }) {
return request({ return request({
baseURL: config.adempiere.api.url,
url: '/pos/create-order', url: '/pos/create-order',
method: 'post', method: 'post',
data: { data: {
@ -94,7 +90,6 @@ export function requestUpdateOrder({
description description
}) { }) {
return request({ return request({
baseURL: config.adempiere.api.url,
url: '/pos/update-order', url: '/pos/update-order',
method: 'post', method: 'post',
data: { data: {
@ -114,7 +109,6 @@ export function requestUpdateOrder({
// Get order from uuid // Get order from uuid
export function requestGetOrder(orderUuid) { export function requestGetOrder(orderUuid) {
return request({ return request({
baseURL: config.adempiere.api.url,
url: '/pos/get-order', url: '/pos/get-order',
method: 'post', method: 'post',
data: { data: {
@ -137,7 +131,6 @@ export function requestDeleteOrder({
// salesRepresentativeUuid // salesRepresentativeUuid
}) { }) {
return request({ return request({
baseURL: config.adempiere.api.url,
url: '/pos/delete-order', url: '/pos/delete-order',
method: 'post', method: 'post',
data: { data: {
@ -213,7 +206,6 @@ export function requestListOrders({
*/ */
return request({ return request({
baseURL: config.adempiere.api.url,
url: '/pos/list-orders', url: '/pos/list-orders',
method: 'post', method: 'post',
data: { data: {
@ -260,7 +252,6 @@ export function requestCreateOrderLine({
discountRate discountRate
}) { }) {
return request({ return request({
baseURL: config.adempiere.api.url,
url: '/pos/create-order-line', url: '/pos/create-order-line',
method: 'post', method: 'post',
data: { data: {
@ -290,7 +281,6 @@ export function requestUpdateOrderLine({
discountRate discountRate
}) { }) {
return request({ return request({
baseURL: config.adempiere.api.url,
url: '/pos/update-order-line', url: '/pos/update-order-line',
method: 'post', method: 'post',
data: { data: {
@ -314,7 +304,6 @@ export function requestDeleteOrderLine({
orderLineUuid orderLineUuid
}) { }) {
return request({ return request({
baseURL: config.adempiere.api.url,
url: '/pos/delete-order-line', url: '/pos/delete-order-line',
method: 'post', method: 'post',
data: { data: {
@ -332,7 +321,6 @@ export function requestListOrderLines({
pageToken pageToken
}) { }) {
return request({ return request({
baseURL: config.adempiere.api.url,
url: '/pos/list-order-lines', url: '/pos/list-order-lines',
method: 'post', method: 'post',
data: { data: {
@ -358,7 +346,6 @@ export function requestListOrderLines({
export function getKeyLayout({ keyLayoutUuid }) { export function getKeyLayout({ keyLayoutUuid }) {
return request({ return request({
baseURL: config.adempiere.api.url,
url: '/pos/get-key-layout', url: '/pos/get-key-layout',
method: 'post', method: 'post',
data: { data: {
@ -385,7 +372,6 @@ export function getProductPriceList({
pageToken pageToken
}) { }) {
return request({ return request({
baseURL: config.adempiere.api.url,
url: '/pos/list-product-prices', url: '/pos/list-product-prices',
method: 'post', method: 'post',
data: { data: {
@ -473,7 +459,6 @@ export function createPayment({
currencyUuid currencyUuid
}) { }) {
return request({ return request({
baseURL: config.adempiere.api.url,
url: '/pos/create-payment', url: '/pos/create-payment',
method: 'post', method: 'post',
data: { data: {
@ -506,7 +491,6 @@ export function updatePayment({
tenderTypeCode tenderTypeCode
}) { }) {
return request({ return request({
baseURL: config.adempiere.api.url,
url: '/pos/update-payment', url: '/pos/update-payment',
method: 'post', method: 'post',
data: { data: {
@ -530,7 +514,6 @@ export function deletePayment({
paymentUuid paymentUuid
}) { }) {
return request({ return request({
baseURL: config.adempiere.api.url,
url: '/pos/delete-payment', url: '/pos/delete-payment',
method: 'post', method: 'post',
data: { data: {
@ -549,7 +532,6 @@ export function getPaymentsList({
orderUuid orderUuid
}) { }) {
return request({ return request({
baseURL: config.adempiere.api.url,
url: '/pos/list-payments', url: '/pos/list-payments',
method: 'post', method: 'post',
data: { data: {
@ -611,7 +593,6 @@ export function processOrder({
}) })
} }
return request({ return request({
baseURL: config.adempiere.api.url,
url: '/pos/process-order', url: '/pos/process-order',
method: 'post', method: 'post',
data: { data: {

View File

@ -1,6 +1,5 @@
// Get Instance for connectionimport { // Get Instance for connectionimport {
import request from '@/utils/request' import { request } from '@/utils/ADempiere/request'
import { config } from '@/utils/ADempiere/config'
// List Point of sales // List Point of sales
export function requestGetProductPrice({ export function requestGetProductPrice({
@ -14,7 +13,6 @@ export function requestGetProductPrice({
validFrom validFrom
}) { }) {
return request({ return request({
baseURL: config.adempiere.api.url,
url: '/pos/get-product-price', url: '/pos/get-product-price',
method: 'post', method: 'post',
data: { data: {

View File

@ -1,6 +1,5 @@
// Get Instance for connection // Get Instance for connection
import request from '@/utils/request' import { request } from '@/utils/ADempiere/request'
import { config } from '@/utils/ADempiere/config'
/** /**
* Create entity * Create entity
@ -19,7 +18,6 @@ export function requestCreateEntity({
}) })
return request({ return request({
baseURL: config.adempiere.api.url,
url: '/data/create', url: '/data/create',
method: 'post', method: 'post',
data: { data: {
@ -55,7 +53,6 @@ export function requestUpdateEntity({
}) })
return request({ return request({
baseURL: config.adempiere.api.url,
url: '/data/update', url: '/data/update',
method: 'post', method: 'post',
data: { data: {
@ -84,7 +81,6 @@ export function requestDeleteEntity({
recordUuid recordUuid
}) { }) {
return request({ return request({
baseURL: config.adempiere.api.url,
url: '/data/delete', url: '/data/delete',
method: 'post', method: 'post',
data: { data: {
@ -110,7 +106,6 @@ export function rollbackEntity({
eventType eventType
}) { }) {
return request({ return request({
baseURL: config.adempiere.api.url,
url: '/data/rollback-entity', url: '/data/rollback-entity',
method: 'post', method: 'post',
data: { data: {
@ -134,7 +129,6 @@ export function requestGetEntity({
recordUuid recordUuid
}) { }) {
return request({ return request({
baseURL: config.adempiere.api.url,
url: '/data/entity', url: '/data/entity',
method: 'get', method: 'get',
params: { params: {
@ -183,7 +177,6 @@ export function requestListEntities({
}) })
return request({ return request({
baseURL: config.adempiere.api.url,
url: '/data/list', url: '/data/list',
method: 'post', method: 'post',
data: { data: {
@ -226,7 +219,6 @@ export function requestTranslations({
pageSize pageSize
}) { }) {
return request({ return request({
baseURL: config.adempiere.api.url,
url: '/ui/list-translations', url: '/ui/list-translations',
method: 'post', method: 'post',
data: { data: {
@ -261,7 +253,6 @@ export function requestResource({ resourceUuid }, callBack = {
onEnd: () => {} onEnd: () => {}
}) { }) {
const stream = request({ const stream = request({
baseURL: config.adempiere.api.url,
url: '/resource', url: '/resource',
method: 'get', method: 'get',
params: { params: {
@ -302,7 +293,6 @@ export function requestImage({
}) })
return request({ return request({
baseURL: config.adempiere.api.url,
url: urn, url: urn,
method: 'get', method: 'get',
responseType: 'arraybuffer' responseType: 'arraybuffer'

View File

@ -1,6 +1,5 @@
// Get Instance for connection // Get Instance for connection
import request from '@/utils/request' import { request } from '@/utils/ADempiere/request'
import { config } from '@/utils/ADempiere/config'
import { convertPrivateAccess } from '@/utils/ADempiere/apiConverts/privateAccess.js' import { convertPrivateAccess } from '@/utils/ADempiere/apiConverts/privateAccess.js'
@ -11,7 +10,6 @@ export function requestGetPrivateAccess({
recordUuid recordUuid
}) { }) {
return request({ return request({
baseURL: config.adempiere.api.url,
url: '/ui/get-private-access', url: '/ui/get-private-access',
method: 'post', method: 'post',
data: { data: {
@ -32,7 +30,6 @@ export function requestLockPrivateAccess({
recordUuid recordUuid
}) { }) {
return request({ return request({
baseURL: config.adempiere.api.url,
url: '/ui/lock-private-access', url: '/ui/lock-private-access',
method: 'post', method: 'post',
data: { data: {
@ -53,7 +50,6 @@ export function requestUnlockPrivateAccess({
recordUuid recordUuid
}) { }) {
return request({ return request({
baseURL: config.adempiere.api.url,
url: '/ui/unlock-private-access', url: '/ui/unlock-private-access',
method: 'post', method: 'post',
data: { data: {
@ -81,7 +77,6 @@ export function getAccessList({
sessionUuid sessionUuid
}) { }) {
return request({ return request({
baseURL: config.adempiere.api.url,
url: '/ui/update-access-record', url: '/ui/update-access-record',
method: 'post', method: 'post',
params: { params: {
@ -110,7 +105,6 @@ export function updateAccessRecord({
listRecord listRecord
}) { }) {
return request({ return request({
baseURL: config.adempiere.api.url,
url: '/ui/update-access-record', url: '/ui/update-access-record',
method: 'post', method: 'post',
params: { params: {

View File

@ -1,6 +1,5 @@
// Get Instance for connection // Get Instance for connection
import request from '@/utils/request' import { request } from '@/utils/ADempiere/request'
import { config } from '@/utils/ADempiere/config'
/** /**
* Request a process * Request a process
@ -42,7 +41,6 @@ export function requestRunProcess({
}) })
return request({ return request({
baseURL: config.adempiere.api.url,
url: '/data/process', url: '/data/process',
method: 'post', method: 'post',
data: { data: {
@ -78,7 +76,6 @@ export function requestListProcessesLogs({
}) { }) {
// Get Process Activity // Get Process Activity
return request({ return request({
baseURL: config.adempiere.api.url,
url: '/logs/list-process-logs', url: '/logs/list-process-logs',
method: 'post', method: 'post',
data: { data: {

View File

@ -1,6 +1,5 @@
// Get Instance for connection // Get Instance for connection
import request from '@/utils/request' import { request } from '@/utils/ADempiere/request'
import { config } from '@/utils/ADempiere/config'
/** /**
* Request Pending Documents List * Request Pending Documents List
@ -14,7 +13,6 @@ export function requestListReportsViews({
pageSize pageSize
}) { }) {
return request({ return request({
baseURL: config.adempiere.api.url,
url: '/ui/list-report-views', url: '/ui/list-report-views',
method: 'post', method: 'post',
data: { data: {
@ -48,7 +46,6 @@ export function requestListPrintFormats({
pageSize pageSize
}) { }) {
return request({ return request({
baseURL: config.adempiere.api.url,
url: '/ui/list-print-formats', url: '/ui/list-print-formats',
method: 'post', method: 'post',
data: { data: {
@ -75,7 +72,6 @@ export function requestListDrillTables({
pageSize pageSize
}) { }) {
return request({ return request({
baseURL: config.adempiere.api.url,
url: '/ui/list-drill-tables', url: '/ui/list-drill-tables',
method: 'post', method: 'post',
data: { data: {
@ -114,7 +110,6 @@ export function requestGetReportOutput({
orderByClause orderByClause
}) { }) {
return request({ return request({
baseURL: config.adempiere.api.url,
url: '/ui/get-report-output', url: '/ui/get-report-output',
method: 'post', method: 'post',
data: { data: {

View File

@ -1,6 +1,5 @@
// Get Instance for connection // Get Instance for connection
import request from '@/utils/request' import { request } from '@/utils/ADempiere/request'
import { config } from '@/utils/ADempiere/config'
/** /**
* Run callout request * Run callout request
@ -27,7 +26,6 @@ export function runCallOutRequest({
attributesList = [] attributesList = []
}) { }) {
return request({ return request({
baseURL: config.adempiere.api.url,
url: '/ui/run-callout', url: '/ui/run-callout',
method: 'post', method: 'post',
data: { data: {

View File

@ -1,6 +1,5 @@
// Get Instance for connection // Get Instance for connection
import request from '@/utils/request' import { request } from '@/utils/ADempiere/request'
import { config } from '@/utils/ADempiere/config'
// Get Organization list from role // Get Organization list from role
export function requestOrganizationsList({ export function requestOrganizationsList({
@ -10,7 +9,6 @@ export function requestOrganizationsList({
pageSize pageSize
}) { }) {
return request({ return request({
baseURL: config.adempiere.api.url,
url: '/core/list-organizations', url: '/core/list-organizations',
method: 'post', method: 'post',
data: { data: {
@ -44,7 +42,6 @@ export function requestWarehousesList({
pageSize pageSize
}) { }) {
return request({ return request({
baseURL: config.adempiere.api.url,
url: '/core/list-warehouses', url: '/core/list-warehouses',
method: 'post', method: 'post',
data: { data: {
@ -76,7 +73,6 @@ export function requestGetCountryDefinition({
uuid uuid
}) { }) {
return request({ return request({
baseURL: config.adempiere.api.url,
url: '/core/country', url: '/core/country',
method: 'get', method: 'get',
params: { params: {
@ -97,7 +93,6 @@ export function requestLanguagesList({
pageSize pageSize
}) { }) {
return request({ return request({
baseURL: config.adempiere.api.url,
url: '/core/list-languages', url: '/core/list-languages',
method: 'post', method: 'post',
params: { params: {
@ -145,7 +140,6 @@ export function requestCreateBusinessPartner({
posUuid posUuid
}) { }) {
return request({ return request({
baseURL: config.adempiere.api.url,
url: '/core/create-business-partner', url: '/core/create-business-partner',
method: 'post', method: 'post',
data: { data: {
@ -185,7 +179,6 @@ export function requestGetBusinessPartner({
searchValue searchValue
}) { }) {
return request({ return request({
baseURL: config.adempiere.api.url,
url: '/core/get-business-partner', url: '/core/get-business-partner',
method: 'get', method: 'get',
params: { params: {
@ -213,7 +206,6 @@ export function requestListBusinessPartner({
pageToken pageToken
}) { }) {
return request({ return request({
baseURL: config.adempiere.api.url,
url: '/core/list-business-partner', url: '/core/list-business-partner',
method: 'post', method: 'post',
data: { data: {
@ -259,7 +251,6 @@ export function requestGetConversionRate({
conversionDate conversionDate
}) { }) {
return request({ return request({
baseURL: config.adempiere.api.url,
url: '/core/get-conversion-rate', url: '/core/get-conversion-rate',
method: 'post', method: 'post',
data: { data: {

View File

@ -1,6 +1,5 @@
// Get Instance for connection // Get Instance for connection
import request from '@/utils/request' import { request } from '@/utils/ADempiere/request'
import { config } from '@/utils/ADempiere/config'
/** /**
* Get Attachment * Get Attachment
@ -12,7 +11,6 @@ export function requestResourceReference({
recordUuid recordUuid
}) { }) {
return request({ return request({
baseURL: config.adempiere.api.url,
url: '/ui/resource-reference', url: '/ui/resource-reference',
method: 'get', method: 'get',
params: { params: {
@ -37,7 +35,6 @@ export function requestAttachment({
recordUuid recordUuid
}) { }) {
return request({ return request({
baseURL: config.adempiere.api.url,
url: '/ui/attachment', url: '/ui/attachment',
method: 'get', method: 'get',
params: { params: {

View File

@ -1,6 +1,5 @@
// Get Instance for connection // Get Instance for connection
import request from '@/utils/request' import { request } from '@/utils/ADempiere/request'
import { config } from '@/utils/ADempiere/config'
import { isEmptyValue } from '@/utils/ADempiere/valueUtils.js' import { isEmptyValue } from '@/utils/ADempiere/valueUtils.js'
@ -23,7 +22,6 @@ export function requestLookup({
}] }]
} }
return request({ return request({
baseURL: config.adempiere.api.url,
url: '/ui/get-lookup-item', url: '/ui/get-lookup-item',
method: 'post', method: 'post',
data: { data: {
@ -65,7 +63,6 @@ export function requestLookupList({
} }
return request({ return request({
baseURL: config.adempiere.api.url,
url: '/ui/list-lookup-items', url: '/ui/list-lookup-items',
method: 'post', method: 'post',
data: { data: {
@ -105,7 +102,6 @@ export function requestReferencesList({
pageSize pageSize
}) { }) {
return request({ return request({
baseURL: config.adempiere.api.url,
url: '/ui/list-references', url: '/ui/list-references',
method: 'post', method: 'post',
data: { data: {
@ -130,7 +126,6 @@ export function requestReferencesList({
// Get default value for a field // Get default value for a field
export function requestDefaultValue(query) { export function requestDefaultValue(query) {
return request({ return request({
baseURL: config.adempiere.api.url,
url: '/ui/get-default-value', url: '/ui/get-default-value',
method: 'post', method: 'post',
data: { data: {
@ -154,7 +149,6 @@ export function requestGetContextInfoValue({
query query
}) { }) {
return request({ return request({
baseURL: config.adempiere.api.url,
url: '/ui/get-context-info-value', url: '/ui/get-context-info-value',
method: 'post', method: 'post',
data: { data: {

View File

@ -1,6 +1,5 @@
// Get Instance for connection // Get Instance for connection
import request from '@/utils/request' import { request } from '@/utils/ADempiere/request'
import { config } from '@/utils/ADempiere/config'
// Get list of log for a records // Get list of log for a records
export function requestListEntityLogs({ export function requestListEntityLogs({
@ -11,7 +10,6 @@ export function requestListEntityLogs({
pageSize pageSize
}) { }) {
return request({ return request({
baseURL: config.adempiere.api.url,
url: '/logs/list-entity-logs', url: '/logs/list-entity-logs',
method: 'post', method: 'post',
data: { data: {
@ -47,7 +45,6 @@ export function requestListWorkflowsLogs({
pageSize pageSize
}) { }) {
return request({ return request({
baseURL: config.adempiere.api.url,
url: '/logs/list-workflow-logs', url: '/logs/list-workflow-logs',
method: 'post', method: 'post',
data: { data: {
@ -81,7 +78,6 @@ export function requestListWorkflows({
pageSize pageSize
}) { }) {
return request({ return request({
baseURL: config.adempiere.api.url,
url: '/workflow/list-workflow', url: '/workflow/list-workflow',
method: 'post', method: 'post',
data: { data: {
@ -120,7 +116,6 @@ export function requestListEntityChats({
pageSize pageSize
}) { }) {
return request({ return request({
baseURL: config.adempiere.api.url,
url: '/logs/list-entity-chats', url: '/logs/list-entity-chats',
method: 'post', method: 'post',
data: { data: {
@ -159,7 +154,6 @@ export function requestListChatsEntries({
pageSize pageSize
}) { }) {
return request({ return request({
baseURL: config.adempiere.api.url,
url: '/logs/list-chat-entries', url: '/logs/list-chat-entries',
method: 'post', method: 'post',
data: { data: {
@ -198,7 +192,6 @@ export function requestCreateChatEntry({
comment comment
}) { }) {
return request({ return request({
baseURL: config.adempiere.api.url,
url: '/ui/create-chat-entry', url: '/ui/create-chat-entry',
method: 'post', method: 'post',
data: { data: {
@ -234,7 +227,6 @@ export function requestListDocumentStatuses({
pageToken pageToken
}) { }) {
return request({ return request({
baseURL: config.adempiere.api.url,
url: '/workflow/list-document-statuses', url: '/workflow/list-document-statuses',
method: 'post', method: 'post',
data: { data: {
@ -269,7 +261,6 @@ export function requestListDocumentActions({
pageToken pageToken
}) { }) {
return request({ return request({
baseURL: config.adempiere.api.url,
url: '/workflow/list-document-actions', url: '/workflow/list-document-actions',
method: 'post', method: 'post',
data: { data: {

View File

@ -0,0 +1,16 @@
// Service for get ADempiere Vue releases from repo.
// Add here any service related with it
import request from '@/utils/request'
import { config } from '@/utils/ADempiere/config'
// Fetch releases from repository
export function fetchReleasesList() {
return request({
baseURL: config.repository.url,
url: '/repos/adempiere/adempiere-vue/releases',
method: 'get',
headers: {
'Accept': 'application/vnd.github.v3+json'
}
})
}

View File

@ -1,9 +1,7 @@
import request from '@/utils/request' import { request } from '@/utils/ADempiere/request'
import { config } from '@/utils/ADempiere/config'
export function getRoutes() { export function getRoutes() {
return request({ return request({
baseURL: config.adempiere.api.url,
url: '/vue-element-admin/routes', url: '/vue-element-admin/routes',
method: 'get' method: 'get'
}) })
@ -11,7 +9,6 @@ export function getRoutes() {
export function getRoles() { export function getRoles() {
return request({ return request({
baseURL: config.adempiere.api.url,
url: '/vue-element-admin/roles', url: '/vue-element-admin/roles',
method: 'get' method: 'get'
}) })
@ -19,7 +16,6 @@ export function getRoles() {
export function requestRolesList(token) { export function requestRolesList(token) {
return request({ return request({
baseURL: config.adempiere.api.url,
url: 'user/roles', url: 'user/roles',
method: 'get', method: 'get',
params: { params: {
@ -38,7 +34,6 @@ export function requestRolesList(token) {
export function addRole(data) { export function addRole(data) {
return request({ return request({
baseURL: config.adempiere.api.url,
url: '/vue-element-admin/role', url: '/vue-element-admin/role',
method: 'post', method: 'post',
data data
@ -47,7 +42,6 @@ export function addRole(data) {
export function updateRole(id, data) { export function updateRole(id, data) {
return request({ return request({
baseURL: config.adempiere.api.url,
url: `/vue-element-admin/role/${id}`, url: `/vue-element-admin/role/${id}`,
method: 'put', method: 'put',
data data
@ -56,7 +50,6 @@ export function updateRole(id, data) {
export function deleteRole(id) { export function deleteRole(id) {
return request({ return request({
baseURL: config.adempiere.api.url,
url: `/vue-element-admin/role/${id}`, url: `/vue-element-admin/role/${id}`,
method: 'delete' method: 'delete'
}) })
@ -74,7 +67,6 @@ export function requestChangeRole({
warehouseUuid warehouseUuid
}) { }) {
return request({ return request({
baseURL: config.adempiere.api.url,
url: 'user/change-role', url: 'user/change-role',
method: 'post', method: 'post',
data: { data: {

View File

@ -1,6 +1,5 @@
// Instance for connection // Instance for connection
import request from '@/utils/request' import { request } from '@/utils/ADempiere/request'
import { config } from '@/utils/ADempiere/config'
/** /**
* Make login by UserName and password, this function can return user data for show * Make login by UserName and password, this function can return user data for show
@ -15,7 +14,6 @@ export function login({
token token
}) { }) {
return request({ return request({
baseURL: config.adempiere.api.url,
url: '/user/login', url: '/user/login',
method: 'post', method: 'post',
data: { data: {
@ -34,7 +32,6 @@ export function login({
*/ */
export function requestUserInfoFromSession(token) { export function requestUserInfoFromSession(token) {
return request({ return request({
baseURL: config.adempiere.api.url,
url: '/user/info', url: '/user/info',
method: 'get', method: 'get',
params: { params: {
@ -52,7 +49,6 @@ export function requestUserInfoFromSession(token) {
*/ */
export function requestSessionInfo(token) { export function requestSessionInfo(token) {
return request({ return request({
baseURL: config.adempiere.api.url,
url: '/user/session', url: '/user/session',
method: 'get', method: 'get',
params: { params: {
@ -74,7 +70,6 @@ export function requestMenu({
sessionUuid sessionUuid
}) { }) {
return request({ return request({
baseURL: config.adempiere.api.url,
url: '/user/menu', url: '/user/menu',
method: 'get', method: 'get',
params: { params: {
@ -92,7 +87,6 @@ export function requestMenu({
*/ */
export function logout(token) { export function logout(token) {
return request({ return request({
baseURL: config.adempiere.api.url,
method: 'post', method: 'post',
url: '/user/logout', url: '/user/logout',
data: { data: {

View File

@ -97,7 +97,8 @@ export default {
}, },
documentation: { documentation: {
documentation: 'Documentation', documentation: 'Documentation',
github: 'Github Repository' github: 'Github Repository',
releases: 'Releases'
}, },
permission: { permission: {
addRole: 'New Role', addRole: 'New Role',

View File

@ -97,7 +97,8 @@ export default {
}, },
documentation: { documentation: {
documentation: 'Documentación', documentation: 'Documentación',
github: 'Repositorio Github' github: 'Repositorio Github',
releases: 'Liberaciones'
}, },
permission: { permission: {
addRole: 'Nuevo rol', addRole: 'Nuevo rol',

View File

@ -0,0 +1,23 @@
// Default request connection for ADempiere with default url
import requestAPI from '@/utils/request'
import { config } from '@/utils/ADempiere/config'
import { getToken } from '@/utils/auth'
import { getLanguage } from '@/lang/index'
// Request with default parameters
export function request(requestValues) {
if (!requestValues) {
requestValues = {}
}
if (!requestValues.params) {
requestValues.params = {}
}
requestValues.baseURL = config.adempiere.api.url
requestValues.params.token = getToken()
requestValues.params.language = getLanguage() || 'en_US'
return new Promise(resolve => {
requestAPI(requestValues).then(response => {
resolve(response.result)
})
})
}

View File

@ -1,8 +1,6 @@
import axios from 'axios' import axios from 'axios'
import { MessageBox, Message } from 'element-ui' import { MessageBox, Message } from 'element-ui'
import store from '@/store' import store from '@/store'
import { getToken } from '@/utils/auth'
import { getLanguage } from '@/lang/index'
// create an axios instance // create an axios instance
const service = axios.create({ const service = axios.create({
@ -19,14 +17,12 @@ service.interceptors.request.use(
if (!config.params) { if (!config.params) {
config.params = {} config.params = {}
} }
config.params.token = getToken()
config.params.language = getLanguage() || 'en_US'
// Set header // Set header
if (store.getters.token) { if (store.getters.token) {
// let each request carry token // let each request carry token
// ['X-Token'] is a custom headers key // ['X-Token'] is a custom headers key
// please modify it according to the actual situation // please modify it according to the actual situation
config.headers['X-Token'] = getToken() // config.headers['X-Token'] = getToken()
} }
return config return config
}, },
@ -74,7 +70,7 @@ service.interceptors.response.use(
} }
return Promise.reject(new Error(res.message || res.result || 'Error')) return Promise.reject(new Error(res.message || res.result || 'Error'))
} else { } else {
return res.result return res
} }
}, },
error => { error => {

View File

@ -1,33 +1,56 @@
<template> <template>
<div class="app-container documentation-container"> <div class="app-container documentation-container">
<a class="document-btn" target="_blank" href="https://store.akveo.com/products/vue-java-admin-dashboard-spring?utm_campaign=akveo_store-Vue-Vue_demo%2Fgithub&utm_source=vue_admin&utm_medium=referral&utm_content=demo_English_button">Java backend integration</a> <a class="document-btn" target="_blank" href="https://adempiere.github.io/adempiere-vue-site/">{{ $t('documentation.documentation') }}</a>
<a class="document-btn" target="_blank" href="https://panjiachen.github.io/vue-element-admin-site/">Documentation</a> <a class="document-btn" target="_blank" href="https://github.com/adempiere/adempiere-vue">{{ $t('documentation.github') }}</a>
<a class="document-btn" target="_blank" href="https://github.com/PanJiaChen/vue-element-admin/">Github Repository</a> <dropdown-menu class="document-btn" :items="releasesList" :title="releasesLabel" />
<a class="document-btn" target="_blank" href="https://panjiachen.gitee.io/vue-element-admin-site/zh/">国内文档</a> <div id="markdown" v-markdown="releaseNotes.body" />
<dropdown-menu class="document-btn" :items="articleList" title="系列文章" />
<a class="document-btn" target="_blank" href="https://panjiachen.github.io/vue-element-admin-site/zh/job/">内推招聘</a>
</div> </div>
</template> </template>
<script> <script>
import DropdownMenu from '@/components/Share/DropdownMenu' import DropdownMenu from '@/components/Share/DropdownMenu'
import { fetchReleasesList } from '@/api/documentation/releases'
import { config } from '@/utils/ADempiere/config'
export default { export default {
name: 'Documentation', name: 'Documentation',
components: { DropdownMenu }, components: { DropdownMenu },
data() { data() {
return { return {
articleList: [ releasesList: [],
{ title: '基础篇', href: 'https://juejin.im/post/59097cd7a22b9d0065fb61d2' }, releaseNotes: {
{ title: '登录权限篇', href: 'https://juejin.im/post/591aa14f570c35006961acac' }, body: ''
{ title: '实战篇', href: 'https://juejin.im/post/593121aa0ce4630057f70d35' }, },
{ title: 'vue-admin-template 篇', href: 'https://juejin.im/post/595b4d776fb9a06bbe7dba56' }, releasesLabel: this.$t('documentation.releases')
{ title: 'v4.0 篇', href: 'https://juejin.im/post/5c92ff94f265da6128275a85' }, }
{ title: '自行封装 component', href: 'https://segmentfault.com/a/1190000009090836' }, },
{ title: '优雅的使用 icon', href: 'https://juejin.im/post/59bb864b5188257e7a427c09' }, created() {
{ title: 'webpack4', href: 'https://juejin.im/post/59bb864b5188257e7a427c09' }, this.loadReleasesList()
{ title: 'webpack4', href: 'https://juejin.im/post/5b5d6d6f6fb9a04fea58aabc' } },
] methods: {
loadReleasesList() {
fetchReleasesList()
.then(response => {
if (response) {
response.forEach(release => {
this.releasesList.push({
title: release.name,
href: release.html_url,
author: release.author.login,
body: release.body,
created_at: release.created_at
})
})
if (config.repository.releaseNo !== undefined && this.releasesList.length > 0) {
this.releaseNotes = this.releasesList.find(release => {
return release.title === config.repository.releaseNo
})
if (!this.releaseNotes) {
this.releaseNotes = ''
}
}
}
})
} }
} }
} }