diff --git a/comps/form/field/type/TypeUpload.tsx b/comps/form/field/type/TypeUpload.tsx index 3052c05..907efc5 100755 --- a/comps/form/field/type/TypeUpload.tsx +++ b/comps/form/field/type/TypeUpload.tsx @@ -5,11 +5,12 @@ import { FMLocal, FieldLocal } from "../../typings"; import { PropTypeInput } from "./TypeInput"; import * as XLSX from "xlsx"; + export const FieldUpload: FC<{ field: FieldLocal; fm: FMLocal; prop: PropTypeInput; - on_change: (e: any) => void | Promise + on_change: (e: any) => void | Promise; }> = ({ field, fm, prop, on_change }) => { let type_field = prop.sub_type; let value: any = fm.data[field.name]; @@ -21,7 +22,8 @@ export const FieldUpload: FC<{ drop: false as boolean, }); let display: any = null; - const disabled = typeof field.disabled === "function" ? field.disabled() : field.disabled; + const disabled = + typeof field.disabled === "function" ? field.disabled() : field.disabled; return (
{ - const binaryStr = e.target.result; - const workbook = XLSX.read(binaryStr, { type: 'binary' }); - - const worksheet = workbook.Sheets[workbook.SheetNames[0]]; - const jsonData = XLSX.utils.sheet_to_json(worksheet); - if (typeof on_change === "function") { - const res = on_change({value: jsonData}); - } - } + const binaryStr = e.target.result; + const workbook = XLSX.read(binaryStr, { type: "binary" }); + + const worksheet = workbook.Sheets[workbook.SheetNames[0]]; + const jsonData = XLSX.utils.sheet_to_json(worksheet); + if (typeof on_change === "function") { + const res = on_change({ value: jsonData }); + } + }; reader.readAsBinaryString(file); } else { const formData = new FormData(); formData.append("file", file); - const response = await fetch( - "https://prasi.avolut.com/_proxy/https%3A%2F%2Feam.avolut.com%2F_upload", - { - method: "POST", - body: formData, - } - ); + + let url = siteurl("/_upload"); + if (location.hostname === 'prasi.avolut.com' || location.host === 'localhost:4550') { + const newurl = new URL(location.href); + newurl.pathname = `/_proxy/https://julong-dev.avolut.com/_upload`; + url = newurl.toString(); + } + + const response = await fetch(url, { + method: "POST", + body: formData, + }); if (response.ok) { const contentType: any = response.headers.get("content-type"); diff --git a/preset/login/utils/load.ts b/preset/login/utils/load.ts index a539c41..ec76d40 100755 --- a/preset/login/utils/load.ts +++ b/preset/login/utils/load.ts @@ -6,7 +6,7 @@ const parse = parser.exportAsFunctionAny("en-US"); export const loadSession = (url_login?: string) => { if (!isEditor) { let id_site = ""; - if (location.hostname === "prasi.avolut.com") { + if (location.hostname === "prasi.avolut.com" || location.host === "localhost:4550") { const parts = location.pathname.split("/"); id_site = parts[2]; } diff --git a/preset/login/utils/logout.ts b/preset/login/utils/logout.ts index 7c84eb9..97b4be9 100755 --- a/preset/login/utils/logout.ts +++ b/preset/login/utils/logout.ts @@ -14,13 +14,18 @@ export const logout = (url_login?: string) => { } let id_site = ""; - if (location.hostname === "prasi.avolut.com") { + if ( + location.hostname === "prasi.avolut.com" || + location.host === "localhost:4550" + ) { const parts = location.pathname.split("/"); id_site = parts[2]; } if (localStorage.getItem("user" + id_site)) { localStorage.removeItem("user" + id_site); } - if (url_login !== getPathname()) - location.href = `${getBasename()}${url_login}`; + if (url_login !== getPathname()) { + console.log(url_login, getPathname()); + // location.href = `${getBasename()}${url_login}`; + } }; diff --git a/preset/login/utils/register.ts b/preset/login/utils/register.ts index 4bcf952..be69f9c 100755 --- a/preset/login/utils/register.ts +++ b/preset/login/utils/register.ts @@ -21,7 +21,10 @@ export const registerSession = (session: RG) => { }; let id_site = ""; - if (location.hostname === "prasi.avolut.com") { + if ( + location.hostname === "prasi.avolut.com" || + location.host === "localhost:4550" + ) { const parts = location.pathname.split("/"); id_site = parts[2]; } diff --git a/utils/pathname.ts b/utils/pathname.ts index 849fbef..ed4b360 100755 --- a/utils/pathname.ts +++ b/utils/pathname.ts @@ -1,5 +1,8 @@ export const getPathname = (url?: string) => { - if (["prasi.avolut.com"].includes(location.hostname)) { + if ( + ["prasi.avolut.com"].includes(location.hostname) || + location.host === "localhost:4550" + ) { if ( location.pathname.startsWith("/vi") || location.pathname.startsWith("/prod") ||