mirror/minecraft-color-gradient-generator
2
0
Fork 1
mirror of https://github.com/tuanzisama/minecraft-color-gradient-generator.git synced 2025-02-17 12:00:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: text-import

Browse Source
This commit is contained in:
--global 2024-08-25 14:19:23 +08:00
parent 53f26fc248
commit c77233131f
2 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/components/text-import/parser/index.ts
View File

@ -1,7 +1,7 @@
import { colorToHex, isHexColor, isRGBColor } from "@/utils/color";
import { isEmpty, isString } from "lodash-es";
type ParserResult = HexColorString[] | null;
type ParserResult = HexColorString[];
export const hexColorRegExp = /&?#?[a-fA-F0-9]{6}/g;
export const rgbColorRegExp =
@ -9,24 +9,24 @@ export const rgbColorRegExp =
export const parseText = (value: string): ParserResult => {
const parsers = [JSONParser, CommaSeparatedParser, CSSParser];
return parsers.reduce<ParserResult>((prev, func) => (prev === null ? func(value.trim()) : prev), null);
return parsers.reduce<ParserResult>((prev, func) => (prev.length < 2 ? func(value.trim()) : prev), []);
};
function JSONParser(value: string): ParserResult {
try {
const parsed = JSON.parse(value) as unknown[];
const parsed = JSON.parse(value) as string[];
return parsed
.filter((item: unknown) => isString(item))
.reduce((acc, value) => {
.reduce<HexColorString[]>((acc, value) => {
if (isHexColor(value)) {
return acc.concat(value as HexColorString);
} else if (isRGBColor(value)) {
return acc.concat(colorToHex(value));
}
return acc;
}, [] as HexColorString[]);
}, []);
} catch {
return null;
return [];
}
}
@ -40,9 +40,7 @@ function CSSParser(value: string): ParserResult {
const rgbResult = rgbMatchResult.map((rgb) => colorToHex(rgb));
const finalResult = [...hexMatchResult, ...rgbResult];
return !isEmpty(finalResult) ? finalResult : null;
return [...hexMatchResult, ...rgbResult];
}
/**
@ -53,5 +51,5 @@ function CommaSeparatedParser(value: string): ParserResult {
const result = splited.filter((color) => isHexColor(color));
return isEmpty(result) || result.length !== splited.length ? null : (result as HexColorString[]);
return isEmpty(result) || result.length !== splited.length ? [] : (result as HexColorString[]);
}

6
src/components/text-import/text-import.vue
View File

@ -1,7 +1,7 @@
<template>
<t-dialog v-model:visible="dialogVisible" :header="$t('picker.import.title')" width="600px"
:confirm-btn="$t('picker.import.confirm_button')" :cancel-btn="$t('common.close')"
@confirm="onDialogConfirmHandler" destroy-on-close>
:confirm-btn="$t('picker.import.confirm_button')" :cancel-btn="$t('common.close')" @confirm="onDialogConfirmHandler"
destroy-on-close>
<div class="dialog-container">
<t-textarea v-model="textValue" :placeholder="$t('picker.import.placeholder')" name="description"
@ -52,7 +52,7 @@ const onDialogConfirmHandler = () => {
if (textValue.value.trim() !== '') {
const result = parseText(textValue.value)
if (result === null) {
if (result.length < 2) {
MessagePlugin.warning({ content: i18n.t("picker.import.import_failed") });
return
}