From e067f714c0588407b1c20ddd6b7af3b2043e35f8 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期一, 29 九月 2025 11:29:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao
---
admin/src/components/system/dict/OperaDictDataWindow.vue | 114 +++++++++++++++++++++-----------------------------------
1 files changed, 43 insertions(+), 71 deletions(-)
diff --git a/admin/src/components/system/dict/OperaDictDataWindow.vue b/admin/src/components/system/dict/OperaDictDataWindow.vue
index b9ebd40..1d9970e 100644
--- a/admin/src/components/system/dict/OperaDictDataWindow.vue
+++ b/admin/src/components/system/dict/OperaDictDataWindow.vue
@@ -1,21 +1,33 @@
<template>
<GlobalWindow
- :title="title"
- :visible.sync="visible"
- :confirm-working="isWorking.create"
- @confirm="confirm"
+ :title="title"
+ :visible.sync="visible"
+ :confirm-working="isWorking.create"
+ @confirm="confirm"
>
<el-form :model="form" ref="form" :rules="rules">
+ <el-form-item label="鏁版嵁璇存槑" prop="label" required>
+ <el-input v-model="form.remark" placeholder="璇疯緭鍏ユ暟鎹鏄�" v-trim/>
+ </el-form-item>
<el-form-item label="鏁版嵁鏍囩" prop="label" required>
- <el-input v-model="form.label" placeholder="璇疯緭鍏ユ暟鎹爣绛�" v-trim maxlength="50"/>
+ <el-input v-model="form.label" placeholder="璇疯緭鍏ユ暟鎹爣绛�" v-trim/>
+ </el-form-item>
+ <el-form-item label="鏄惁瀵屾枃鏈�" prop="istext" >
+ <el-radio-group v-model="form.istext">
+ <el-radio :label="0" value="0">鏂囨湰</el-radio>
+ <el-radio :label="1" value="1">鍥剧墖|鏂囦欢</el-radio>
+ <el-radio :label="2" value="2">瀵屾枃鏈�</el-radio>
+ </el-radio-group>
+<!-- <el-switch v-model="form.istext" :active-value="true" :inactive-value="false"/>
+ <span class="status-text">{{form.istext | disabledText1}}</span>-->
</el-form-item>
<el-form-item label="鏁版嵁鍊�" prop="code" required>
- <el-tiptap
- v-if="[175].includes(form.id)"
- v-model="form.code"
- :extensions="extensions"
- />
- <el-input v-else v-model="form.code" placeholder="璇疯緭鍏ユ暟鎹��" v-trim />
+ <template v-if="form.istext == 1" >
+ <UploadFile :uploadData="{ folder: 'richeditor',fileType:'' }" :fileList="fileList" @uploadSuccess="fileUploaded" />
+ <el-input readonly v-model="form.code" placeholder="瀹屾暣鏁版嵁鍊�" v-trim/>
+ </template>
+ <RichEditor v-if="form.istext == 2" :richData="form.code" :styleEditor="styleEditor" @getWangedditor="getWangedditor" :readonly="false"/>
+ <el-input v-if="form.istext == 0" v-model="form.code" placeholder="璇疯緭鍏ユ暟鎹��" v-trim/>
</el-form-item>
<el-form-item label="鐘舵��" prop="disabled" required class="form-item-status">
<el-switch v-model="form.disabled" :active-value="false" :inactive-value="true"/>
@@ -28,45 +40,26 @@
<script>
import BaseOpera from '@/components/base/BaseOpera'
import GlobalWindow from '@/components/common/GlobalWindow'
-import { upload } from '@/api/system/common'
-import {
- // necessary extensions
- Doc,
- Text,
- Paragraph,
- Heading,
- Bold,
- Underline,
- Italic,
- Strike,
- ListItem,
- BulletList,
- OrderedList,
- Image,
- Blockquote,
- TextAlign,
- Indent,
- Table,
- TableHeader,
- TableCell,
- TableRow,
- TextColor,
- HorizontalRule
-} from 'element-tiptap'
+import RichEditor from '@/components/common/RichEditor'
+import UploadFile from "@/components/common/UploadFile"
export default {
name: 'OperaDictDataWindow',
extends: BaseOpera,
- components: { GlobalWindow },
+ components: {UploadFile, GlobalWindow,RichEditor },
data () {
return {
// 琛ㄥ崟鏁版嵁
+ styleEditor:'border: 1px solid #ccc;display: inline-block;',
form: {
id: null,
dictId: null,
code: '',
label: '',
- disabled: false
+ disabled: false,
+ istext: 0,
+ remark: ''
},
+ fileList: [],
// 楠岃瘉瑙勫垯
rules: {
label: [
@@ -75,42 +68,16 @@
code: [
{ required: true, message: '璇疯緭鍏ユ暟鎹��' }
]
- },
- extensions: [
- new Doc(),
- new Text(),
- new Paragraph(),
- new Heading({ level: 5 }),
- new Bold({ bubble: true }),
- new Underline({ bubble: true, menubar: false }),
- new Italic(),
- new Strike(),
- new ListItem(),
- new BulletList(),
- new OrderedList(),
- new Image({
- uploadRequest (file) {
- const fd = new FormData()
- fd.append('folder', 'visit')
- fd.append('file', file)
- return upload(fd).then(res => {
- return res.url
- })
- }
- }),
- new Blockquote(),
- new TextAlign(),
- new Indent(),
- new Table(),
- new TableHeader(),
- new TableCell(),
- new TableRow(),
- new HorizontalRule(),
- new TextColor()
- ]
+ }
}
},
methods: {
+ fileUploaded(data){
+ this.form.code = data.fileurlFull
+ },
+ getWangedditor(val){
+ this.form.code =val
+ },
/**
* @title 绐楀彛鏍囬
* @dict 鎵�灞炲瓧鍏窱D
@@ -119,12 +86,15 @@
open (title, dictId, target) {
this.title = title
this.visible = true
+
+ this.form.istext = 0
// 鏂板缓
if (target == null) {
this.$nextTick(() => {
this.$refs.form.resetFields()
this.form.id = null
this.form.dictId = dictId
+ this.form.istext=0
})
return
}
@@ -132,6 +102,8 @@
this.$nextTick(() => {
for (const key in this.form) {
this.form[key] = target[key]
+ this.form.dictId = dictId
+ this.form.istext = 0
}
})
}
--
Gitblit v1.9.3