diff --git a/package.json b/package.json index 7b74643..cef436c 100644 --- a/package.json +++ b/package.json @@ -34,7 +34,7 @@ "gen:icon": "esno ./build/generate/icon/index.ts" }, "dependencies": { - "@jeecg/online": "3.4.3-beta", + "@jeecg/online": "3.4.3", "@iconify/iconify": "^2.2.1", "@ant-design/colors": "^6.0.0", "@ant-design/icons-vue": "^6.1.0", diff --git a/src/components/Form/src/hooks/useForm.ts b/src/components/Form/src/hooks/useForm.ts index 1bef263..a4d6f8c 100644 --- a/src/components/Form/src/hooks/useForm.ts +++ b/src/components/Form/src/hooks/useForm.ts @@ -6,6 +6,9 @@ import { ref, onUnmounted, unref, nextTick, watch } from 'vue'; import { isProdMode } from '/@/utils/env'; import { error } from '/@/utils/log'; import { getDynamicProps, getValueType } from '/@/utils'; +import { add } from "/@/components/Form/src/componentMap"; +//集成online专用控件 +import { OnlineSelectCascade, LinkTableCard, LinkTableSelect } from '@jeecg/online'; export declare type ValidateFields = (nameList?: NamePath[]) => Promise; @@ -15,6 +18,11 @@ export function useForm(props?: Props): UseFormReturnType { const formRef = ref>(null); const loadedRef = ref>(false); + //集成online专用控件 + add("OnlineSelectCascade", OnlineSelectCascade) + add("LinkTableCard", LinkTableCard) + add("LinkTableSelect", LinkTableSelect) + async function getForm() { const form = unref(formRef); if (!form) { diff --git a/src/components/Form/src/jeecg/components/JCodeEditor.vue b/src/components/Form/src/jeecg/components/JCodeEditor.vue index 75683b5..9f06e4d 100644 --- a/src/components/Form/src/jeecg/components/JCodeEditor.vue +++ b/src/components/Form/src/jeecg/components/JCodeEditor.vue @@ -197,6 +197,15 @@ }); const getBindValue = Object.assign({}, unref(props), unref(attrs)); + + //update-begin-author:taoyan date:2022-10-18 for: VUEN-2480【严重bug】online vue3测试的问题 8、online js增强样式问题 + function refresh(){ + if(coder){ + coder.refresh(); + } + } + //update-end-author:taoyan date:2022-10-18 for: VUEN-2480【严重bug】online vue3测试的问题 8、online js增强样式问题 + return { state, textarea, @@ -206,6 +215,7 @@ isFullScreen, fullScreenIcon, onToggleFullScreen, + refresh }; }, }); @@ -279,5 +289,10 @@ height: 100%; } } + + /** VUEN-2344【vue3】这个样式有问题,是不是加个边框 */ + .CodeMirror{ + border: 1px solid #ddd; + } } diff --git a/src/components/jeecg/OnLine/SearchFormItem.vue b/src/components/jeecg/OnLine/SearchFormItem.vue index 8966db6..84f647f 100644 --- a/src/components/jeecg/OnLine/SearchFormItem.vue +++ b/src/components/jeecg/OnLine/SearchFormItem.vue @@ -44,7 +44,7 @@ - - - - + + @@ -202,7 +194,10 @@ -