@@ -110,7 +110,7 @@ import assetConfig from "@/config/asset"
import saveDialog from "./save.vue";
import moveDialog from "./move.vue";
import * as imageConversion from 'image-conversion';
-import {ref, onMounted, nextTick, getCurrentInstance, computed} from "vue"
+import {ref, onMounted, nextTick, getCurrentInstance} from "vue"
import tools from "@/utils/tools"
import config from "@/config"
@@ -164,7 +164,7 @@ async function open() {
async function getMenu() {
menuLoading.value = true
- const res = await assetConfig.menuListObj();
+ const res = await assetConfig.menuListObj({type: props.type});
menu.value = tools.makeTreeData(res.data, 0, "category_id")
menu.value.unshift({
'category_id': 0,
@@ -269,10 +269,12 @@ function moveFile() {
async function moveSuccess(category_id) {
const _value = JSON.parse(JSON.stringify(value.value))
- const ids = props.multiple ? _value.map(i=>i[assetConfig.fileProps.id]) :[ _value[assetConfig.fileProps.id]];
+ const ids = props.multiple ? _value.map(i => i[assetConfig.fileProps.id]) : [_value[assetConfig.fileProps.id]];
if (!ids) return;
const res = await assetConfig.moveFileObj({ids: ids, category_id: category_id});
proxy.$message.success(res.msg)
+ // 清空选中值
+ value.value = props.multiple ? [] : ''
getData()
}
@@ -348,14 +350,14 @@ function uploadError(err) {
function editCategory(data) {
dialog.value.save = true
nextTick(() => {
- saveRef.value.open('edit', menu.value, data)
+ saveRef.value.setType(props.type).setMenu(menu.value).open('edit', data)
})
}
function addCategory() {
dialog.value.save = true
nextTick(() => {
- saveRef.value.open('add', menu.value, null, menuRef.value.getCurrentKey())
+ saveRef.value.setType(props.type).setMenu(menu.value).open('add', null, menuRef.value.getCurrentKey())
})
}
@@ -383,8 +385,6 @@ async function delCategory() {
var node = menuRef.value.getNode(item)
if (node == null) {
reload()
- } else if (node.isCurrent) {
- saveRef.value.setData({})
}
menuRef.value.remove(item)
})
diff --git a/src/components/piAsset/save.vue b/src/components/piAsset/save.vue
index ba4e7f4..3d3130c 100644
--- a/src/components/piAsset/save.vue
+++ b/src/components/piAsset/save.vue
@@ -25,6 +25,7 @@ import assetConfig from "@/config/asset"
import {getCurrentInstance, ref} from "vue"
defineExpose({
+ setType,
open
})
@@ -45,7 +46,8 @@ let form = ref({
category_id: null,
category_name: "",
pid: 0,
- rank: 1
+ rank: 1,
+ type: ""
})
let rules = ref({
category_name: [
@@ -59,12 +61,9 @@ let menuProps = ref({
checkStrictly: true
})
-function open(_mode = 'add', _menu = null, data = null, pid=null) {
+function open(_mode = 'add', data = null, pid = null) {
mode.value = _mode;
visible.value = true;
- if (_menu) {
- menu.value = _menu
- }
if (pid) {
form.value.pid = pid
}
@@ -73,6 +72,16 @@ function open(_mode = 'add', _menu = null, data = null, pid=null) {
}
}
+function setType(type) {
+ form.value.type = type
+ return {open, setMenu};
+}
+
+function setMenu(_menu) {
+ menu.value = _menu
+ return {open, setType};
+}
+
async function submit() {
// 校验登录
const validate = await formRef.value.validate().catch(() => {
diff --git a/src/components/piEditor/ext/extImage.ts b/src/components/piEditor/ext/extImage.ts
index 7e2cfc9..62bbc7d 100644
--- a/src/components/piEditor/ext/extImage.ts
+++ b/src/components/piEditor/ext/extImage.ts
@@ -8,7 +8,6 @@ export default class ExtImage implements IButtonMenu{
// 执行逻辑
exec(editor: IDomEditor, value?: any) {
- console.log(editor.getConfig()?.MENU_CONF?.headerSelect)
const fn = editor.getConfig()?.MENU_CONF?.extImage?.callback
if (fn) fn()
}
diff --git a/src/views/monitor/crontab/save.vue b/src/views/monitor/crontab/save.vue
index d85b8f1..42a4e6d 100644
--- a/src/views/monitor/crontab/save.vue
+++ b/src/views/monitor/crontab/save.vue
@@ -1,5 +1,5 @@
-
+
@@ -20,8 +20,7 @@
-
-
+
diff --git a/src/views/tools/form/center.vue b/src/views/tools/form/center.vue
new file mode 100644
index 0000000..1ca3b40
--- /dev/null
+++ b/src/views/tools/form/center.vue
@@ -0,0 +1,16 @@
+
+
+
+
+
+
+
diff --git a/src/views/tools/form/index.vue b/src/views/tools/form/index.vue
new file mode 100644
index 0000000..602b2be
--- /dev/null
+++ b/src/views/tools/form/index.vue
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/tools/form/left.vue b/src/views/tools/form/left.vue
new file mode 100644
index 0000000..8b33c33
--- /dev/null
+++ b/src/views/tools/form/left.vue
@@ -0,0 +1,287 @@
+
+
+
+
+
+
+
+ 输入组件
+
+
+
+
+
+
松开鼠标组件将添加到此处
+
+
+
+
+ {{ element.title }}
+
+
+
+
+
+
+ 选择组件
+
+
+
+
+
+
松开鼠标组件将添加到此处
+
+
+
+
+ {{ element.title }}
+
+
+
+
+
+
+ 布局组件
+
+
+
+
+
+
松开鼠标组件将添加到此处
+
+
+
+
+ {{ element.title }}
+
+
+
+
+
+
+ 内置组件
+
+
+
+
+
+
松开鼠标组件将添加到此处
+
+
+
+
+ {{ element.title }}
+
+