Commit 09261484 authored by LiXuyang's avatar LiXuyang

Merge remote-tracking branch 'origin/master'

parents 5fe25c6e 08287687
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
value: { type: [Object, String] as PropType<Record<string, any> | string> }, value: { type: [Object, String] as PropType<Record<string, any> | string> },
mode: { mode: {
type: String as PropType<MODE>, type: String as PropType<MODE>,
default: MODE.JSON, default: MODE.SQL,
validator(value: any) { validator(value: any) {
// 这个值必须匹配下列字符串中的一个 // 这个值必须匹配下列字符串中的一个
return Object.values(MODE).includes(value); return Object.values(MODE).includes(value);
......
...@@ -33,10 +33,10 @@ ...@@ -33,10 +33,10 @@
/> />
<BasicForm @register="registerInfoForm" /> <BasicForm @register="registerInfoForm" />
<!-- <div class="editor" v-show="isIndependent === true">--> <!-- <div class="editor" v-show="isIndependent === true">-->
<!-- <textarea v-model="sql" placeholder="请输入内容..."></textarea>--> <!-- CodeEditor v-model:value="sql" />-->
<!-- </div>--> <!-- </div>-->
<div class="editor"> <div class="editor">
<textarea v-model="sql" placeholder="请输入内容..."></textarea> <CodeEditor v-model:value="sql" />
</div> </div>
<a-button type="primary" @click="handleRun">测试运行</a-button> <a-button type="primary" @click="handleRun">测试运行</a-button>
<div v-if="isRun"> <div v-if="isRun">
...@@ -93,6 +93,7 @@ ...@@ -93,6 +93,7 @@
TreeData, TreeData,
associationRulesData, associationRulesData,
} from '@/views/dataQuality/agentClass/mainBody/dataQualityMainBodyData'; } from '@/views/dataQuality/agentClass/mainBody/dataQualityMainBodyData';
import CodeEditor from '@/components/CodeEditor/src/CodeEditor.vue';
const { createMessage } = useMessage(); const { createMessage } = useMessage();
const page = ref('1'); const page = ref('1');
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
</div> </div>
<div class="editor"> <div class="editor">
<textarea v-model="sql" placeholder="请输入内容..."></textarea> <CodeEditor v-model:value="sql" />
</div> </div>
<div class="w-full"> <div class="w-full">
<Card style="margin-bottom: 8px"> <Card style="margin-bottom: 8px">
...@@ -96,6 +96,7 @@ ...@@ -96,6 +96,7 @@
import { useModal } from '@/components/Modal'; import { useModal } from '@/components/Modal';
import { useMessage } from '@/hooks/web/useMessage'; import { useMessage } from '@/hooks/web/useMessage';
import SelectDatasourceModal from '@/views/dataQuality/dataSheet/template/selectDatasourceModal.vue'; import SelectDatasourceModal from '@/views/dataQuality/dataSheet/template/selectDatasourceModal.vue';
import CodeEditor from "@/components/CodeEditor/src/CodeEditor.vue";
const formItem = reactive({ const formItem = reactive({
templateName: '', templateName: '',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment