Merge branch 'qi'
This commit is contained in:
commit
aeb0a58f5c
@ -1,7 +1,7 @@
|
|||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
import {defineEmits, onMounted, ref} from 'vue'
|
import {defineEmits, onMounted, ref} from 'vue'
|
||||||
import {MathStatement} from '../support/parse'
|
import {MathStatement} from '../support/parse'
|
||||||
import Katex from '../components/Katex.vue'
|
import Katex from './Katex.vue'
|
||||||
import { v4 as uuidv4 } from 'uuid'
|
import { v4 as uuidv4 } from 'uuid'
|
||||||
import {StatementID} from '../support/types'
|
import {StatementID} from '../support/types'
|
||||||
|
|
||||||
@ -64,7 +64,7 @@ onMounted(() => {
|
|||||||
|
|
||||||
<template>
|
<template>
|
||||||
<q-card>
|
<q-card>
|
||||||
<q-card-section>
|
<q-card-section v-if="expressionValue">
|
||||||
<div style="display: flex; justify-content: center">
|
<div style="display: flex; justify-content: center">
|
||||||
<Katex
|
<Katex
|
||||||
:key="expressionPreviewKey"
|
:key="expressionPreviewKey"
|
@ -69,7 +69,7 @@ onMounted(() => {
|
|||||||
<template>
|
<template>
|
||||||
<q-card>
|
<q-card>
|
||||||
<q-card-section>
|
<q-card-section>
|
||||||
<div style="display: flex; justify-content: center">
|
<div v-if="functionValue" style="display: flex; justify-content: center">
|
||||||
<Katex
|
<Katex
|
||||||
:key="functionPreviewKey"
|
:key="functionPreviewKey"
|
||||||
:statement="functionPreview"
|
:statement="functionPreview"
|
||||||
|
@ -39,7 +39,7 @@ computed(() => value = getValueStatement())
|
|||||||
</style>
|
</style>
|
||||||
|
|
||||||
<template>
|
<template>
|
||||||
<div class="math-statement" style="background: white">
|
<div class="math-statement" style="background: var(--q-dark)">
|
||||||
<div class="content">
|
<div class="content">
|
||||||
<Katex :statement="statement" size="big"/>
|
<Katex :statement="statement" size="big"/>
|
||||||
<div class="result" v-if="value">
|
<div class="result" v-if="value">
|
||||||
|
@ -3,7 +3,7 @@ import * as math from 'mathjs'
|
|||||||
import {onMounted, ref} from 'vue'
|
import {onMounted, ref} from 'vue'
|
||||||
import {MathStatement} from '../support/parse'
|
import {MathStatement} from '../support/parse'
|
||||||
import {v4 as uuidv4} from 'uuid'
|
import {v4 as uuidv4} from 'uuid'
|
||||||
import Katex from '../components/Katex.vue'
|
import Katex from './Katex.vue'
|
||||||
import {StatementID} from '../support/types'
|
import {StatementID} from '../support/types'
|
||||||
|
|
||||||
const props = defineProps<{
|
const props = defineProps<{
|
@ -5,8 +5,8 @@ import { MathPage } from '../support/page'
|
|||||||
import { MathStatement } from '../support/parse'
|
import { MathStatement } from '../support/parse'
|
||||||
import { ChartBox, EvaluationResult, hasOwnProperty } from '../support/types'
|
import { ChartBox, EvaluationResult, hasOwnProperty } from '../support/types'
|
||||||
import Statement from '../components/Statement.vue'
|
import Statement from '../components/Statement.vue'
|
||||||
import VarDeclEditor from './VarDeclEditor.vue'
|
import VarDeclEditor from '../components/VarDeclEditor.vue'
|
||||||
import ExpressionEditor from './ExpressionEditor.vue'
|
import ExpressionEditor from '../components/ExpressionEditor.vue'
|
||||||
import TextBox from '../components/TextBox.vue'
|
import TextBox from '../components/TextBox.vue'
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
import ImageBox from '../components/ImageBox.vue'
|
import ImageBox from '../components/ImageBox.vue'
|
||||||
|
Loading…
Reference in New Issue
Block a user