Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,13 @@
"folderNames": ["icons"],
"rootFolderNames": ["icons"]
},
{
"name": "animate",
"base": "animation",
"color": "purple-400",
"lightColor": "purple-100",
"folderNames": ["animatedList"],
"rootFolderNames": ["animatedList"]
},
]
}
1 change: 1 addition & 0 deletions src/consts.ts
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ export function getNewDatum(): InternalDatum {
key: Math.random(),
fnType: "linear",
graphType: "polyline",
fn: "",
};
}

Expand Down
205 changes: 97 additions & 108 deletions src/editor/datum.vue
Original file line number Diff line number Diff line change
@@ -1,121 +1,116 @@
<template>
<s-fold :folded="hidden" v-if="dataItem" class="plot-data-fold">
<div class="plot-data" ref="block" :class="{ hidden: dataItem.hidden }">
<div class="selectors">
<s-picker
:label="t('inputs.fnType')"
v-model.lazy="dataItem.fnType"
@change="fnTypeChange(dataItem)"
:key="selectKey"
>
<s-picker-item
v-for="(type, index) in fnTypeArr"
:value="type.value"
:selected="index === 0"
<div
class="plot-data"
ref="block"
:class="{ hidden: dataItem.hidden }"
v-if="dataItem"
>
<div class="selectors">
<s-picker
:label="t('inputs.fnType')"
v-model.lazy="dataItem.fnType"
@change="fnTypeChange(dataItem)"
:key="selectKey"
>
<s-picker-item v-for="type in fnTypeArr" :value="type.value">
{{ t(type.label) }}
</s-picker-item>
</s-picker>
<s-picker
:label="t('inputs.graphType')"
v-model.lazy="dataItem.graphType"
v-if="dataItem.graphType !== 'text'"
@change="graphTypeChange(dataItem)"
:key="selectKey"
>
<s-picker-item v-for="type in allowedGraphType" :value="type.value">
{{ t(type.label) }}
</s-picker-item>
</s-picker>
<div style="flex-grow: 1"></div>
<div class="dataBlockBtns">
<s-tooltip>
<s-icon-button
slot="trigger"
@click="deleteDatum"
style="color: var(--s-color-error)"
>
{{ t(type.label) }}
</s-picker-item>
</s-picker>
<s-picker
:label="t('inputs.graphType')"
v-model.lazy="dataItem.graphType"
v-if="dataItem.graphType !== 'text'"
@change="graphTypeChange(dataItem)"
:key="selectKey"
>
<s-picker-item
v-for="(type, index) in allowedGraphType"
:value="type.value"
:selected="index === 0"
<SIconDelete />
</s-icon-button>
{{ t("buttons.del") }}
</s-tooltip>
<s-tooltip>
<s-icon-button
slot="trigger"
@click="dataItem.hidden = !dataItem.hidden"
:type="dataItem.hidden ? 'filled-tonal' : 'standard'"
>
{{ t(type.label) }}
</s-picker-item>
</s-picker>
<div style="flex-grow: 1"></div>
<div class="dataBlockBtns">
<s-tooltip>
<s-icon-button
slot="trigger"
@click="deleteDatum"
style="color: var(--s-color-error)"
>
<SIconDelete />
</s-icon-button>
{{ t("buttons.del") }}
</s-tooltip>
<s-tooltip>
<s-icon-button
slot="trigger"
@click="dataItem.hidden = !dataItem.hidden"
:type="dataItem.hidden ? 'filled-tonal' : 'standard'"
>
<SIconHide />
</s-icon-button>
{{ t("buttons.hide") }}
</s-tooltip>
<s-tooltip>
<s-icon-button
slot="trigger"
@click="
blockFolded = !blockFolded;
console.log(foldShell);
"
>
<s-icon :name="blockFolded ? 'chevron_down' : 'chevron_up'">
</s-icon>
</s-icon-button>
{{ t(blockFolded ? "buttons.expand" : "buttons.collapse") }}
</s-tooltip>
<span class="datablock-drag">
<SIconDrag />
</span>
</div>
<SIconHide />
</s-icon-button>
{{ t("buttons.hide") }}
</s-tooltip>
<s-tooltip>
<s-icon-button
slot="trigger"
@click="
blockFolded = !blockFolded;
console.log(foldShell);
"
>
<s-icon :name="blockFolded ? 'chevron_down' : 'chevron_up'">
</s-icon>
</s-icon-button>
{{ t(blockFolded ? "buttons.expand" : "buttons.collapse") }}
</s-tooltip>
<span class="datablock-drag">
<SIconDrag />
</span>
</div>
</div>

<div class="inputs">
<StrInputs :dataItem="dataItem" :fnType="fnType" />
<div class="inputs">
<StrInputs :dataItem="dataItem" :fnType="fnType" />
<CoordInputs
v-if="fnType.coord"
:dataItem="dataItem"
:fnType="fnType"
:blockFolded="false"
/>
<CoordArrInputs
v-if="fnType.coordArr"
:dataItem="dataItem"
:fnType="fnType"
/>
<SwitchInputs
v-if="fnType.switches"
:dataItem="dataItem"
:fnType="fnType"
:blockFolded="false"
/>
</div>
<s-fold :folded="blockFolded">
<div class="inputs optional">
<s-divider>{{ t("title.moreOptions") }}</s-divider>
<CoordInputs
v-if="fnType.coord"
:dataItem="dataItem"
:fnType="fnType"
:blockFolded="false"
:blockFolded="true"
/>
<CoordArrInputs
v-if="fnType.coordArr"
<OptInputs
v-if="fnType.optInput"
:dataItem="dataItem"
:fnType="fnType"
/>
<SwitchInputs
v-if="fnType.switches"
:dataItem="dataItem"
:fnType="fnType"
:blockFolded="false"
:blockFolded="true"
/>
</div>
<s-fold :folded="blockFolded">
<div class="inputs optional">
<s-divider>{{ t("title.moreOptions") }}</s-divider>
<CoordInputs
v-if="fnType.coord"
:dataItem="dataItem"
:fnType="fnType"
:blockFolded="true"
/>
<OptInputs
v-if="fnType.optInput"
:dataItem="dataItem"
:fnType="fnType"
/>
<SwitchInputs
v-if="fnType.switches"
:dataItem="dataItem"
:fnType="fnType"
:blockFolded="true"
/>
</div>
</s-fold>
</div>
</s-fold>
</s-fold>
</div>
</template>
<script setup lang="ts">
import { useI18n } from "vue-i18n";
Expand All @@ -128,7 +123,7 @@ import {
getFnType,
InternalDatum,
} from "../consts";
import { ref, computed, onMounted } from "vue";
import { ref, computed } from "vue";
import StrInputs from "./inputs/strInputs.vue";
import CoordInputs from "./inputs/coordInputs.vue";
import SwitchInputs from "./inputs/switchInputs.vue";
Expand All @@ -146,18 +141,12 @@ const blockFolded = ref(true);

const foldShell = ref<HTMLElementTagNameMap["s-fold"]>();

const hidden = ref(true);

onMounted(() => setTimeout(() => (hidden.value = false), 0));
import { Snackbar } from "sober";
import { useProfile } from "../consts";
const profile = useProfile();
function deleteDatum() {
hidden.value = true;
const backup = cloneDeep(dataItem.value)!;
setTimeout(() => {
profile.data.splice(props.index, 1);
}, 200);
profile.data.splice(props.index, 1);
Snackbar.builder({
text: t("title.deleteSuccess"),
action: {
Expand Down Expand Up @@ -238,7 +227,7 @@ watch(locale, () => selectKey.value++);
opacity: 0.6;
filter: contrast(0.6) saturate(0.8);
}
.plot-data-fold {
.datumFolder {
border-bottom: var(--s-color-outline-variant) 1px solid;
}
.selectors {
Expand Down
23 changes: 17 additions & 6 deletions src/editor/datumList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,15 @@
:animation="200"
handle=".datablock-drag"
>
<Datum
v-for="(dataItem, i) in profile.data"
v-model="profile.data[i]"
:index="i"
:key="dataItem.key"
/>
<AnimatedList>
<AnimatedListItem
v-for="(dataItem, i) in profile.data"
:key="dataItem.key"
class="datumFolder"
>
<Datum v-model="profile.data[i]" :index="i" />
</AnimatedListItem>
</AnimatedList>
</VueDraggable>
<div class="plot-data add-data" @click="profile.data.push(getNewDatum())">
<s-icon name="add" />
Expand All @@ -26,9 +29,17 @@ const { t } = useI18n();

import { VueDraggable } from "vue-draggable-plus";

import AnimatedList from "@/ui/animatedList/animatedList.vue";
import AnimatedListItem from "@/ui/animatedList/animatedListItem.vue";
import Datum from "./datum.vue";

import { getNewDatum } from "@/consts";
import { useProfile } from "@/consts";
const profile = useProfile();
</script>

<style>
.datumFolder {
border-bottom: var(--s-color-outline-variant) 1px solid;
}
</style>
Loading