mirror of
https://gitee.com/hhyykk/ipms-sjy-ui.git
synced 2025-08-02 04:04:07 +08:00
Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev
Conflicts: src/views/infra/build/index.vue src/views/mall/product/spu/components/DescriptionForm.vue src/views/mall/product/spu/components/OtherSettingsForm.vue src/views/mall/product/spu/components/ProductPropertyAddForm.vue src/views/mall/product/spu/components/SkuList.vue
This commit is contained in:
@@ -23,13 +23,14 @@
|
||||
</el-button>
|
||||
<el-scrollbar height="580">
|
||||
<div>
|
||||
<pre><code v-dompurify-html="highlightedCode(formData)" class="hljs"></code></pre>
|
||||
<pre><code class="hljs" v-html="highlightedCode(formData)"></code></pre>
|
||||
</div>
|
||||
</el-scrollbar>
|
||||
</div>
|
||||
</Dialog>
|
||||
</template>
|
||||
<script lang="ts" name="InfraBuild" setup>
|
||||
<script lang="ts" setup>
|
||||
defineOptions({ name: 'InfraBuild' })
|
||||
import FcDesigner from '@form-create/designer'
|
||||
import { useClipboard } from '@vueuse/core'
|
||||
import { isString } from '@/utils/is'
|
||||
|
Reference in New Issue
Block a user