diff --git a/package.json b/package.json
index a6deef4a..fc3c4432 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "yudao-ui-admin-vue3",
- "version": "1.7.3-snapshot",
+ "version": "1.8.0-snapshot",
"description": "基于vue3、vite4、element-plus、typesScript",
"author": "xingyu",
"private": false,
@@ -72,6 +72,7 @@
"vuedraggable": "^4.1.0",
"vxe-table": "^4.3.11",
"web-storage-cache": "^1.1.1",
+ "xe-utils": "^3.5.7",
"xml-js": "^1.6.11"
},
"devDependencies": {
diff --git a/src/api/mall/product/spu.ts b/src/api/mall/product/spu.ts
index 40bd5b1f..0ea324b8 100644
--- a/src/api/mall/product/spu.ts
+++ b/src/api/mall/product/spu.ts
@@ -105,8 +105,3 @@ export const exportSpu = async (params) => {
export const getSpuSimpleList = async () => {
return request.get({ url: '/product/spu/get-simple-list' })
}
-
-// 获得商品 SPU 精简列表
-export const getSpuSimpleList = async () => {
- return request.get({ url: '/product/spu/get-simple-list' })
-}
diff --git a/src/views/bpm/form/formEditor.vue b/src/views/bpm/form/formEditor.vue
index b8d3bad5..904efe4e 100644
--- a/src/views/bpm/form/formEditor.vue
+++ b/src/views/bpm/form/formEditor.vue
@@ -3,8 +3,6 @@
-
-
@@ -13,7 +11,7 @@
@@ -68,7 +66,6 @@ const message = useMessage() // 消息
const { query } = useRoute() // 路由
const designer = ref() // 表单设计器
-const type = ref(-1)
const formValue = ref('')
const dialogTitle = ref('')
const dialogVisible = ref(false) // 弹窗是否展示
@@ -116,20 +113,7 @@ const submitForm = async () => {
dialogLoading.value = false
}
}
-const showJson = () => {
- openModel('生成JSON')
- type.value = 0
- formValue.value = designer.value.getRule()
-}
-const showOption = () => {
- openModel('生成Options')
- type.value = 1
- formValue.value = designer.value.getOption()
-}
-const openModel = (title: string) => {
- dialogVisible1.value = true
- dialogTitle.value = title
-}
+
/** 复制 **/
const copy = async (text: string) => {
// const { copy, copied, isSupported } = useClipboard({ source: JSON.stringify(text) })
@@ -152,22 +136,6 @@ const copy = async (text: string) => {
oInput.remove()
}
-/**
- * 代码高亮
- */
-import hljs from 'highlight.js' // 导入代码高亮文件
-import 'highlight.js/styles/github.css' // 导入代码高亮样式
-import java from 'highlight.js/lib/languages/java'
-import xml from 'highlight.js/lib/languages/java'
-import javascript from 'highlight.js/lib/languages/javascript'
-import sql from 'highlight.js/lib/languages/sql'
-import typescript from 'highlight.js/lib/languages/typescript'
-const highlightedCode = (item) => {
- const language = item.filePath.substring(item.filePath.lastIndexOf('.') + 1)
- const result = hljs.highlight(language, item.code || '', true)
- return result.value || ' '
-}
-
/** 初始化 **/
onMounted(async () => {
// 场景一:新增表单
@@ -180,13 +148,5 @@ onMounted(async () => {
formValues.value = data
setConfAndFields(designer, data.conf, data.fields)
})
- // 注册代码高亮的各种语言
- hljs.registerLanguage('java', java)
- hljs.registerLanguage('xml', xml)
- hljs.registerLanguage('html', xml)
- hljs.registerLanguage('vue', xml)
- hljs.registerLanguage('javascript', javascript)
- hljs.registerLanguage('sql', sql)
- hljs.registerLanguage('typescript', typescript)
})
diff --git a/src/views/infra/build/index.vue b/src/views/infra/build/index.vue
index 338c62e0..9ddfbcbb 100644
--- a/src/views/infra/build/index.vue
+++ b/src/views/infra/build/index.vue
@@ -36,7 +36,6 @@ import hljs from 'highlight.js' // 导入代码高亮文件
import 'highlight.js/styles/github.css' // 导入代码高亮样式
import xml from 'highlight.js/lib/languages/java'
import json from 'highlight.js/lib/languages/json'
-import formCreate from '@form-create/element-ui'
const { t } = useI18n() // 国际化
const message = useMessage() // 消息