From b2d360d9113b6955287108ca9e90d76a1f3c1419 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期日, 29 九月 2024 15:05:11 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/zbomyoujia

---
 admin/src/components/system/dict/OperaDictDataWindow.vue |   89 +++++++++++---------------------------------
 1 files changed, 23 insertions(+), 66 deletions(-)

diff --git a/admin/src/components/system/dict/OperaDictDataWindow.vue b/admin/src/components/system/dict/OperaDictDataWindow.vue
index b9ebd40..bc24149 100644
--- a/admin/src/components/system/dict/OperaDictDataWindow.vue
+++ b/admin/src/components/system/dict/OperaDictDataWindow.vue
@@ -9,17 +9,20 @@
       <el-form-item label="鏁版嵁鏍囩" prop="label" required>
         <el-input v-model="form.label" placeholder="璇疯緭鍏ユ暟鎹爣绛�" v-trim maxlength="50"/>
       </el-form-item>
+      <el-form-item label="鏄惁瀵屾枃鏈�" prop="istext" >
+        <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 />
+        <el-input v-if="!form.istext" v-model="form.code" placeholder="璇疯緭鍏ユ暟鎹��" v-trim maxlength="500"/>
+        <RichEditor v-else  :richData="form.code" :styleEditor="styleEditor" @getWangedditor="getWangedditor" :readonly="false"/>
       </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"/>
         <span class="status-text">{{form.disabled | disabledText}}</span>
+      </el-form-item>
+      <el-form-item label="璇存槑" prop="remark">
+        <el-input v-model="form.remark" placeholder="璇疯緭鍏ユ暟鎹鏄�" v-trim />
       </el-form-item>
     </el-form>
   </GlobalWindow>
@@ -28,44 +31,23 @@
 <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'
 export default {
   name: 'OperaDictDataWindow',
   extends: BaseOpera,
-  components: { GlobalWindow },
+  components: { GlobalWindow,RichEditor },
   data () {
     return {
       // 琛ㄥ崟鏁版嵁
+      styleEditor:'border: 1px solid #ccc;display: inline-block;',
       form: {
         id: null,
         dictId: null,
         code: '',
         label: '',
-        disabled: false
+        disabled: false,
+        remark: '',
+        istext: false
       },
       // 楠岃瘉瑙勫垯
       rules: {
@@ -75,42 +57,13 @@
         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: {
+    getWangedditor(val){
+      this.form.code =val
+    },
     /**
      * @title 绐楀彛鏍囬
      * @dict 鎵�灞炲瓧鍏窱D
@@ -119,12 +72,14 @@
     open (title, dictId, target) {
       this.title = title
       this.visible = true
+      this.form.remark=''
       // 鏂板缓
       if (target == null) {
         this.$nextTick(() => {
           this.$refs.form.resetFields()
           this.form.id = null
           this.form.dictId = dictId
+          this.form.istext=false
         })
         return
       }
@@ -132,6 +87,8 @@
       this.$nextTick(() => {
         for (const key in this.form) {
           this.form[key] = target[key]
+          this.form.dictId = dictId
+          this.form.istext=false
         }
       })
     }

--
Gitblit v1.9.3