diff --git a/packages/grid-design/src/preview-providers/grid-design-preview-provider.ts b/packages/grid-design/src/preview-providers/grid-design-preview-provider.ts index 788dd53c818ef7e839ea621e02e87b089ae48008..432840c2e73b44f600fd3151598232aef1a42642 100644 --- a/packages/grid-design/src/preview-providers/grid-design-preview-provider.ts +++ b/packages/grid-design/src/preview-providers/grid-design-preview-provider.ts @@ -32,9 +32,7 @@ export class GridDesignPreViewProvider implements PreViewProviderBase { */ async init(view: GridDesignViewController): Promise { const entityId = view.state.data?.psdeid; - if (!entityId) { - return; - } + if (!entityId || !view.context.srfappid) return; const app = ibiz.hub.getApp(view.model.appId); const uiModeService = await app.deService.getService( view.context, diff --git a/packages/layout-design/src/design-index-view/components/design-bottom-drawer/design-bottom-drawer.scss b/packages/layout-design/src/design-index-view/components/design-bottom-drawer/design-bottom-drawer.scss index 819d916913529a55f55a89754f013e7f71111498..a405dfbee3e90495edaf6d382462827587c8a05e 100644 --- a/packages/layout-design/src/design-index-view/components/design-bottom-drawer/design-bottom-drawer.scss +++ b/packages/layout-design/src/design-index-view/components/design-bottom-drawer/design-bottom-drawer.scss @@ -90,8 +90,7 @@ } @include when(hiden) { - opacity: 0; - height: 0; + display: none; } @include when(collapse) { diff --git a/packages/md-design/src/preview-providers/md-design-preview-provider.ts b/packages/md-design/src/preview-providers/md-design-preview-provider.ts index 8d7b23994abbb676c0dd8c1d3c3d28904badc309..69eaea20028c7303ab3cc0bd316f8163310f13b1 100644 --- a/packages/md-design/src/preview-providers/md-design-preview-provider.ts +++ b/packages/md-design/src/preview-providers/md-design-preview-provider.ts @@ -21,9 +21,7 @@ export class MDDesignPreViewProvider implements PreViewProviderBase { */ async init(view: MDDesignViewController): Promise { const entityId = view.state.data?.psdeid; - if (!entityId) { - return; - } + if (!entityId || !view.context.srfappid) return; const app = ibiz.hub.getApp(view.model.appId); const fieldService = await app.deService.getService( view.context, diff --git a/packages/model-design/src/components/model-clipboard-import-view/model-clipboard-import-view.tsx b/packages/model-design/src/components/model-clipboard-import-view/model-clipboard-import-view.tsx index 888e7e5c667598256dc30c014b1bd29e3779d493..e9172e623b6af7f1cd38a794431682f4204e3983 100644 --- a/packages/model-design/src/components/model-clipboard-import-view/model-clipboard-import-view.tsx +++ b/packages/model-design/src/components/model-clipboard-import-view/model-clipboard-import-view.tsx @@ -1,6 +1,6 @@ /* eslint-disable no-await-in-loop */ import { IModal } from '@ibiz-template/runtime'; -import { PropType, computed, defineComponent } from 'vue'; +import { PropType, computed, defineComponent, ref } from 'vue'; import { useNamespace } from '@ibiz-template/vue3-util'; import draggable from 'vuedraggable'; import { ClipboardData } from '../../model'; @@ -23,6 +23,8 @@ export default defineComponent({ // 模型导入视图控制器 const c = ibiz.modelClipboardImportView; + const cardRef = ref(); + // 重置模型 const initModel = (val: string) => { c.state.modelStr = val; @@ -134,6 +136,16 @@ export default defineComponent({ }); }); + /** + * loading文本不识别动态的因此需要手动修改 + * + */ + const setloadingText = () => { + const loadingText = cardRef.value?.$el.querySelector('.el-loading-text'); + if (loadingText) + loadingText.innerText = `数据导入中:${c.state.importItems.length} / ${c.state.models.length}`; + }; + // 保存模型 const saveModel = async () => { try { @@ -173,6 +185,7 @@ export default defineComponent({ if (res.ok && res.data) { c.state.isModelChange = false; c.state.importItems.push(item); + setloadingText(); } else { ibiz.message.error(res.statusText); isError = true; @@ -205,10 +218,11 @@ export default defineComponent({ }; return { - ns, - modelClipboardController, c, + ns, + cardRef, materialItem, + modelClipboardController, closeView, clearModel, formatData, @@ -222,6 +236,7 @@ export default defineComponent({ const { isLoading, items, importItems, models, modelStr } = this.c.state; return ( item.model), + null, + 2, + ); document.body.appendChild(el); el.select(); const result = document.execCommand('copy'); diff --git a/packages/model-design/src/components/model-clipboard-paste-view/model-clipboard-paste-view.tsx b/packages/model-design/src/components/model-clipboard-paste-view/model-clipboard-paste-view.tsx index 3d32cc4827b22343e99d4e0a9f3ba4b17f45f2de..a90495f7cd7ac69f5e776ff0f77fb876eaf05a39 100644 --- a/packages/model-design/src/components/model-clipboard-paste-view/model-clipboard-paste-view.tsx +++ b/packages/model-design/src/components/model-clipboard-paste-view/model-clipboard-paste-view.tsx @@ -23,6 +23,8 @@ export default defineComponent({ // 模型导入视图控制器 const c = ibiz.modelClipboardPasteView; + const cardRef = ref(); + // 当前激活分页 const activeName = ref<'ModeTree' | 'JSON'>('ModeTree'); @@ -136,6 +138,16 @@ export default defineComponent({ }); }); + /** + * loading文本不识别动态的因此需要手动修改 + * + */ + const setloadingText = () => { + const loadingText = cardRef.value?.$el.querySelector('.el-loading-text'); + if (loadingText) + loadingText.innerText = `数据导入中:${c.state.importItems.length} / ${c.state.models.length}`; + }; + // 保存模型 const saveModel = async () => { try { @@ -175,6 +187,7 @@ export default defineComponent({ if (res.ok && res.data) { c.state.isModelChange = false; c.state.importItems.push(item); + setloadingText(); } else { ibiz.message.error(res.statusText); isError = true; @@ -209,6 +222,7 @@ export default defineComponent({ return { c, ns, + cardRef, activeName, materialItem, modelClipboardController, @@ -225,6 +239,7 @@ export default defineComponent({ const { isLoading, items, importItems, models, modelStr } = this.c.state; return (