From 4345926d07729480b0c42ea2a420a29200a1f339 Mon Sep 17 00:00:00 2001
From: lion <120344285@qq.com>
Date: Fri, 29 Nov 2024 15:43:41 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/XyTinymce/index.vue            |  16 +-
 src/components/wangEditor/index.vue           |  30 +-
 src/components/wangEditor/register.js         | 129 +++++----
 src/mixin/product.js                          |   4 +-
 src/styles/iconfont.css                       | 124 ++++----
 src/styles/iconfont.ttf                       | Bin 8592 -> 10712 bytes
 src/styles/iconfont.woff                      | Bin 4732 -> 6724 bytes
 src/styles/iconfont.woff2                     | Bin 3932 -> 5620 bytes
 src/utils/common.js                           |  13 +
 src/views/application/components/addNotes.vue |  11 +-
 .../product/components/addApplication.vue     |   3 +-
 src/views/product/components/addCategory.vue  |  46 ++-
 src/views/product/components/addPhase.vue     | 264 ++++++++++--------
 src/views/product/components/addProduct.vue   |  76 +++--
 src/views/product/index.vue                   | 100 ++++---
 src/views/resource/components/addFaq.vue      |   4 +-
 src/views/resource/components/addFiles.vue    |   3 +-
 src/views/resource/components/addWebinar.vue  |   4 +-
 vue.config.js                                 |   2 +-
 19 files changed, 502 insertions(+), 327 deletions(-)

diff --git a/src/components/XyTinymce/index.vue b/src/components/XyTinymce/index.vue
index eb2dda5..1d4c894 100644
--- a/src/components/XyTinymce/index.vue
+++ b/src/components/XyTinymce/index.vue
@@ -49,12 +49,14 @@
         default: false,
       },
       plugins: {
-        type: [String, Array],
-        default: "code image axupimgs paste preview searchreplace autolink directionality visualblocks visualchars fullscreen template codesample table charmap hr pagebreak nonbreaking anchor insertdatetime advlist lists wordcount imagetools textpattern help emoticons autosave ",
+        type: [String, Array],
+        // axupimgs 多图上传
+        default: "code image paste preview searchreplace autolink directionality visualblocks visualchars fullscreen template codesample table charmap hr pagebreak nonbreaking anchor insertdatetime advlist lists wordcount imagetools textpattern help emoticons autosave ",
       },
       toolbar: {
-        type: [String, Array],
-        default: ` undo redo restoredraft | code | image | axupimgs | imagetools | assignment | cut copy paste pastetext | forecolor backcolor bold italic underline strikethrough  anchor | alignleft aligncenter alignright alignjustify outdent indent |
+        type: [String, Array],
+        // axupimgs 多图上传
+        default: ` undo redo restoredraft | code | image | imagetools | assignment | cut copy paste pastetext | forecolor backcolor bold italic underline strikethrough  anchor | alignleft aligncenter alignright alignjustify outdent indent |
                 styleselect formatselect fontselect fontsizeselect | table charmap emoticons hr pagebreak | bullist numlist | blockquote subscript superscript removeformat |
                  insertdatetime print preview | fullscreen | bdmap indent2em lineheight formatpainter`,
       },
@@ -69,8 +71,8 @@
         showImg: false,
         imgUploadUrl: `${process.env.VUE_APP_UPLOAD_API}`,
         init: {
-          language_url: "/public/tinymce/langs/zh_CN.js", // 这里需要单独处理
-          language: "zh_CN",
+          // language_url: "/public/tinymce/langs/zh_CN.js", // 这里需要单独处理
+          // language: "zh_CN",
           height: this.height,
           plugins: this.plugins,
           fontsize_formats: "8px 10px 12px 14px 16px 18px 24px 28px 36px",
@@ -92,7 +94,7 @@
         let file = blobInfo.blob();
         const isLt2M = file.size / 1024 < 2048;
         if (!isLt2M) {
-          failure("上传失败，图片不可超过2M!");
+          failure("Upload failed, the image cannot exceed 2M");
           return false;
         }
         let formdate = new FormData();
diff --git a/src/components/wangEditor/index.vue b/src/components/wangEditor/index.vue
index 30d80f4..bed889a 100644
--- a/src/components/wangEditor/index.vue
+++ b/src/components/wangEditor/index.vue
@@ -108,17 +108,27 @@
     methods: {
       // 源码模式点击事件
       clickSource(active, editor) {
-        let value = editor.getHtml();
+        let value = this.editor.getHtml();
+        console.log("getHtml",value)
         // 先将编辑器内容清空
         this.editor.clear();
         if (active) {
-          // 将html代码转换为html代码块 dangerouslyInsertHtml是插入html不是重置html
-          this.editor.dangerouslyInsertHtml(parseEditorCode(value));
+          // 将html代码转换为html代码块 dangerouslyInsertHtml是插入html不是重置html
+
+          value = parseEditorCode(value)
+          console.log("active",value)
+          this.editor.dangerouslyInsertHtml(value);
+          this.html = value
+
         } else {
-          // 将html代码块转换为editor的html
-          this.editor.dangerouslyInsertHtml(parseCodeEditor(value));
-          // console.log("parseCodeEditor(value)", parseCodeEditor(value))
-          value = parseCodeEditor(value);
+          // 将html代码块转换为editor的html
+
+          value = parseCodeEditor(value)
+          console.log("else", value)
+          this.editor.dangerouslyInsertHtml(value);
+          // value = parseCodeEditor(value);
+          console.log("nowHtml",parseCodeEditor(this.editor.getHtml()))
+          this.html = value
         }
       },
       onCreated(editor) {
@@ -133,8 +143,10 @@
       onChange() {
         const text = this.editor.getText();
         // 计算当前输入了多少文字
-        this.useLen = (text || '').length;
-        // 每次富文本内容改变，触发change事件
+        this.useLen = (text || '').length;
+        let value = this.editor.getHtml();
+        // 每次富文本内容改变，触发change事件
+        console.log("this.html",value)
         this.$emit('change', this.html);
       },
 
diff --git a/src/components/wangEditor/register.js b/src/components/wangEditor/register.js
index 87ffa9c..1035533 100644
--- a/src/components/wangEditor/register.js
+++ b/src/components/wangEditor/register.js
@@ -1,65 +1,72 @@
-import SourceMenu from "./sourceMenu.js";
-import prettier from 'prettier/standalone';
-import parserHtml from 'prettier/parser-html';
-
-/**
- * 在编辑器中得到的html源码是没有格式的html字符串
- * 所以需要格式化展示代码
- * 格式化html代码
- */
-export const parserHtmlCode = (code) => {
-  try {
-    return prettier.format(code, {
-      parser: 'html',
-      plugins: [parserHtml],
-      // 格式化的标签不换行 例如span标签等>格式化后会换行
-      htmlWhitespaceSensitivity: 'ignore'
-    });
-  } catch (e) {
-    console.error('格式化代码错误', e);
-    return code;
-  }
-}
-
-/**
- * 将编辑器html转换为代码块内容
- */
-export const parseEditorCode = (html) => {
-  const code = html
-    .replace(/&nbsp;/g, '')
-    .replace(new RegExp('<p><br></p>', 'g'), '');
-  const data = parserHtmlCode(code).trim();
-  const textCode = data
-    .replace(/</g, "&lt;")
-    .replace(/>/g, "&gt;")
+import SourceMenu from "./sourceMenu.js";
+import prettier from 'prettier/standalone';
+import parserHtml from 'prettier/parser-html';
+
+/**
+ * 在编辑器中得到的html源码是没有格式的html字符串
+ * 所以需要格式化展示代码
+ * 格式化html代码
+ */
+export const parserHtmlCode = (code) => {
+  try {
+    return prettier.format(code, {
+      parser: 'html',
+      plugins: [parserHtml],
+      // 格式化的标签不换行 例如span标签等>格式化后会换行
+      htmlWhitespaceSensitivity: 'ignore'
+    });
+  } catch (e) {
+    console.error('格式化代码错误', e);
+    return code;
+  }
+}
+
+/**
+ * 将编辑器html转换为代码块内容
+ */
+export const parseEditorCode = (html) => {
+  const code = html
+    .replace(/&nbsp;/g, '')
+    .replace(new RegExp('<p><br></p>', 'g'), '');
+  const data = parserHtmlCode(code).trim();
+  const textCode = data
+    .replace(/</g, "&lt;")
+    .replace(/>/g, "&gt;")
     .replace(/ /g, "&nbsp;");
-  return `<pre><code class="language-html">${textCode}</code></pre>`;
-}
 
-/**
- * 将代码块转换为编辑器html
- */
-export const parseCodeEditor = (preCode) => {
-  // 转码
-  let data = encodeURI(preCode);
-  // 将&nbsp;转换为空格
-  data = data.replace(/%C2%A0/g, '%20');
-  // 解码
-  data = decodeURI(data);
-  const htmlStr = data
-    .replace('<pre><code class="language-html">', '')
-    .replace('</code></pre>', '')
-    .replace(/&lt;/ig, "<")
+  console.log("textcode",textCode)
+  return `<pre><code class="language-html">${textCode}</code></pre>`;
+  // return `${textCode}`;
+}
+
+/**
+ * 将代码块转换为编辑器html
+ */
+export const parseCodeEditor = (preCode) => {
+  // 转码
+  let data = encodeURI(preCode);
+  // 将&nbsp;转换为空格
+  data = data.replace(/%C2%A0/g, '%20');
+  // 解码
+  data = decodeURI(data);
+  const htmlStr = data
+    .replace('<pre><code class="language-html">', '')
+    .replace('</code></pre>', '')
+    .replace(/&lt;/ig, "<")
     .replace(/&gt;/ig, ">");
-  return htmlStr
-    .replace(new RegExp('\\n', 'g'), '')
-    .replace(new RegExp('<p><br></p>', 'g'), '')
-    .trim();
-}
-
-export const sourceConf = {
-  // 工具栏中的唯一key
-  key: 'source',
-  // 组件
-  factory: () => new SourceMenu()
+    console.log("htmlStr",htmlStr
+      .replace(new RegExp('\\n', 'g'), '')
+      .replace(new RegExp('<p><br></p>', 'g'), '')
+      .trim())
+  return htmlStr
+    .replace(new RegExp('\\n', 'g'), '')
+    .replace(new RegExp('<p><br></p>', 'g'), '')
+    .trim();
+}
+
+export const sourceConf = {
+  // 工具栏中的唯一key
+  key: 'source',
+  // 组件
+  factory: () => new SourceMenu()
 };
diff --git a/src/mixin/product.js b/src/mixin/product.js
index 4027135..6819208 100644
--- a/src/mixin/product.js
+++ b/src/mixin/product.js
@@ -9,11 +9,11 @@ export default {
     }
   },
   created() {
-    this.getProductList()
+    this.getProductParaList()
   },
   methods: {
     // 获取产品参数 有detail的下拉，没有的填写
-    async getProductList(){
+    async getProductParaList(){
       const res = await listparameter({
         page: 1,
         page_size: 999,
diff --git a/src/styles/iconfont.css b/src/styles/iconfont.css
index 9f6fdb2..a82e8b4 100644
--- a/src/styles/iconfont.css
+++ b/src/styles/iconfont.css
@@ -1,8 +1,8 @@
 @font-face {
-  font-family: "iconfont"; /* Project id 4052909 */
-  src: url('iconfont.woff2?t=1683361610626') format('woff2'),
-       url('iconfont.woff?t=1683361610626') format('woff'),
-       url('iconfont.ttf?t=1683361610626') format('truetype');
+  font-family: "iconfont"; /* Project id 4764550 */
+  src: url('iconfont.woff2?t=1732857913289') format('woff2'),
+       url('iconfont.woff?t=1732857913289') format('woff'),
+       url('iconfont.ttf?t=1732857913289') format('truetype');
 }
 
 .iconfont {
@@ -13,107 +13,119 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
-.icon-jurassic_process-list:before {
-  content: "\e6c4";
+.icon-product:before {
+  content: "\e611";
 }
 
-.icon-biaodan:before {
-  content: "\e663";
+.icon-icon_note:before {
+  content: "\e64c";
 }
 
-.icon-biaozhunhuaguizeguanli:before {
-  content: "\e60a";
+.icon-zixunguanli:before {
+  content: "\e610";
 }
 
-.icon-a-zhidu6:before {
-  content: "\eb07";
+.icon-application-parameters:before {
+  content: "\e642";
 }
 
-.icon-dat:before {
-  content: "\e691";
+.icon-chanpinxuanze:before {
+  content: "\e6ca";
 }
 
-.icon-audio:before {
-  content: "\e692";
+.icon-chanpincanshu:before {
+  content: "\e600";
 }
 
-.icon-video:before {
-  content: "\e693";
+.icon-fangwenjilu:before {
+  content: "\e602";
 }
 
-.icon-zip:before {
-  content: "\e694";
+.icon-liuyan:before {
+  content: "\e627";
 }
 
-.icon-image:before {
-  content: "\e695";
+.icon-xuanze:before {
+  content: "\e68b";
 }
 
-.icon-pdf:before {
-  content: "\e696";
+.icon-phase:before {
+  content: "\e620";
 }
 
-.icon-ppt:before {
-  content: "\e697";
+.icon-yonghuzhongxin:before {
+  content: "\e68c";
 }
 
-.icon-21excel:before {
-  content: "\e698";
+.icon-dingdan:before {
+  content: "\e897";
 }
 
-.icon-21word:before {
-  content: "\e699";
+.icon-dingdanjihe:before {
+  content: "\e898";
 }
 
-.icon-21move:before {
-  content: "\e69a";
+.icon-Usermanuals:before {
+  content: "\e607";
 }
 
-.icon-21setting:before {
-  content: "\e69b";
+.icon-interact:before {
+  content: "\e86a";
 }
 
-.icon-21upload:before {
-  content: "\e69c";
+.icon-application:before {
+  content: "\e88a";
 }
 
-.icon-21download:before {
-  content: "\e69d";
+.icon-gonggongshiye:before {
+  content: "\e613";
 }
 
-.icon-21cancel:before {
-  content: "\e69e";
+.icon-ziyuanguanli:before {
+  content: "\e770";
 }
 
-.icon-21ok:before {
-  content: "\e69f";
+.icon--Faq:before {
+  content: "\e60e";
 }
 
-.icon-21copy:before {
-  content: "\e6a0";
+.icon-mulu:before {
+  content: "\e60f";
 }
 
-.icon-21delete:before {
-  content: "\e6a1";
+.icon-yonghuliebiao:before {
+  content: "\e7f1";
 }
 
-.icon-21edit:before {
-  content: "\e6a2";
+.icon-webinar:before {
+  content: "\ec3c";
 }
 
-.icon-21new:before {
-  content: "\e6a3";
+.icon-longzishuxing:before {
+  content: "\e601";
 }
 
-.icon-21folder:before {
-  content: "\e6a4";
+.icon-chanpinfenlei:before {
+  content: "\e656";
 }
 
-.icon-21mutil:before {
-  content: "\e6a5";
+.icon-canshuguanli:before {
+  content: "\e640";
 }
 
-.icon-21file:before {
-  content: "\e6a6";
+.icon-chanpinzhongxin:before {
+  content: "\e603";
+}
+
+.icon-ic_flyer:before {
+  content: "\e60b";
+}
+
+.icon-market-poster:before {
+  content: "\e7a7";
+}
+
+.icon-yingyongfenlei:before {
+  content: "\e6fb";
 }
 
diff --git a/src/styles/iconfont.ttf b/src/styles/iconfont.ttf
index 4e2970e9481479674d3fd3fe1923b0855b82f8a8..1463f410659f9b65cff0b3afd4f6a80714e27900 100644
GIT binary patch
literal 10712
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

literal 8592
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

diff --git a/src/styles/iconfont.woff b/src/styles/iconfont.woff
index b7c5531b929930806824de725401ba9f2a48b138..94db1d9a1e36b999a078809cb28b37213f49cb36 100644
GIT binary patch
delta 6304
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
Wr~=un2{xys&LWC_0g(%XC;$L@SmSg6

delta 4296
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

diff --git a/src/styles/iconfont.woff2 b/src/styles/iconfont.woff2
index 0c051c5ab3470996d1f5754273d853b9fee30e9d..885ba6ae52dc6983ecd77c0567870a6bc127ffbf 100644
GIT binary patch
literal 5620
zcmV<Q6$|QjPew8T0RR9102TBA3jhEB04dl202QSG0RR9100000000000000000000
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
O+Bk3~TKI6M0{{R>V66-Q

literal 3932
zcmV-i52NsRPew8T0RR9101sRM3jhEB03nb701pfR0RR9100000000000000000000
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

diff --git a/src/utils/common.js b/src/utils/common.js
index 5a0712d..6cce6c8 100644
--- a/src/utils/common.js
+++ b/src/utils/common.js
@@ -25,6 +25,19 @@ let base = {
   isUrl (url) {
     return this.checkUrl(url)
   },
+  // 判断数组中 是否有相同的 项
+  findDuplicateKeys(arr, key) {
+    const seen = new Set();
+    const duplicates = new Set();
+    for (const item of arr) {
+      if (seen.has(item[key])) {
+        duplicates.add(item[key]); // 添加重复的key值
+      } else {
+        seen.add(item[key]);
+      }
+    }
+    return Array.from(duplicates); // 将Set转换为数组并返回
+  },
   checkUrl (url) {
     // url= 协议://(ftp的登录信息)[IP|域名](:端口号)(/或?请求参数)
     var strRegex =
diff --git a/src/views/application/components/addNotes.vue b/src/views/application/components/addNotes.vue
index 62e83c2..cdb4fb6 100644
--- a/src/views/application/components/addNotes.vue
+++ b/src/views/application/components/addNotes.vue
@@ -181,7 +181,6 @@
         filesList: [],
         appCategoryList: [],
         productCategoryList:[],
-        showWang: false,
         detail_item: [{
           type: 'index',
           width: 50
@@ -236,9 +235,6 @@
         }
         this.filesList = fileList
       },
-      changeEditor(e) {
-        this.form.content = e
-      },
       addRow() {
         var len = this.form.application_details.length;
         this.form.application_details.push({
@@ -300,9 +296,7 @@
           show_relation: ['applicationDetails']
         }).then(res => {
           this.form = this.base.requestToForm(res, this.form)
-          this.form.content = res.content ? res.content : ''
-          this.form.application_details = res.application_details ? res.application_details : [],
-            this.showWang = true
+          this.form.application_details = res.application_details ? res.application_details : []
           if (res.files && res.files.length > 0) {
             this.filesList = []
             res.files.map(item => {
@@ -322,11 +316,9 @@
           if (this.type === 'editor') {
             this.getDetail()
           }
-          this.showWang = true
         } else {
           this.id = ''
           this.filesList = []
-          this.showWang = false
           this.form = {
             application_type_id: '',
             category_id:[],
@@ -349,7 +341,6 @@
 
 <style scoped lang="scss">
   ::v-deep .file_ids,
-  ::v-deep .content,
   ::v-deep .application_details {
     flex-basis: 100%;
   }
diff --git a/src/views/product/components/addApplication.vue b/src/views/product/components/addApplication.vue
index 3c12c78..85d2168 100644
--- a/src/views/product/components/addApplication.vue
+++ b/src/views/product/components/addApplication.vue
@@ -19,7 +19,8 @@
             <span style="color: red;font-weight: bold;padding-right: 4px;"></span>Content：
           </div>
           <div class="xy-table-item-content">
-            <wangEditor :isShow="isShow" v-show="showWang" :value="form.content" @change="changeEditor"></wangEditor>
+            <!-- <wangEditor :isShow="isShow" v-show="showWang" :value="form.content" @change="changeEditor"></wangEditor> -->
+              <my-tinymce v-if="showWang" @input="changeEditor" :value="form.content"></my-tinymce>
 
           </div>
         </div>
diff --git a/src/views/product/components/addCategory.vue b/src/views/product/components/addCategory.vue
index 24c7716..999be43 100644
--- a/src/views/product/components/addCategory.vue
+++ b/src/views/product/components/addCategory.vue
@@ -61,7 +61,7 @@
                   <template slot-scope="scope">
                     <el-select style="width:100%" @change="(key)=>{changeKey(key,scope.row)}" v-model="scope.row.key"
                       placeholder="Please Select">
-                      <el-option v-for="(pvalue,key,index) in productDetailsKeyList" :key="index" :label="pvalue.key"
+                      <el-option v-for="(pvalue,key,index) in selectList" :key="index" :label="pvalue.key"
                         :value="pvalue.key">
                       </el-option>
                     </el-select>
@@ -125,7 +125,8 @@
           token: ""
         },
         action: `${process.env.VUE_APP_UPLOAD_API}`,
-        pictureList: [],
+        pictureList: [],
+        selectList:[],
         detail_item: [{
           type: 'index',
           width: 50,
@@ -205,7 +206,29 @@
           this.form.picture_id = p_files[0]
         } else {
           this.form.picture_id = ''
-        }
+        }
+
+        if(this.form.product_category_details.length>0){
+          // 判断属性中是否为空
+          for(var p of this.form.product_category_details){
+            if(p.value.length<1){
+              this.$message({
+                type: 'warning',
+                message: `${p.key} cannot be empty in the property`
+              })
+              return
+            }
+          }
+          // 判断属性中 是否有重复的
+          let filterArr = this.base.findDuplicateKeys(this.form.product_category_details,'key')
+          if(filterArr.length>0){
+            this.$message({
+              type: 'warning',
+              message: `${filterArr.join("、")} cannot be repeated in the property`
+            })
+            return
+          }
+        }
         console.log("this.form", this.form)
         // return
         save({
@@ -250,11 +273,26 @@
         if (newVal) {
           if (this.type === 'editor') {
             this.getDetail()
+          }
+          for(var k in this.productDetailsKeyList){
+
+            if(this.productDetailsKeyList[k]["type"]==='select'){
+              this.selectList.push(this.productDetailsKeyList[k])
+              if (this.type === 'add') {
+                this.form.product_category_details.push({
+                  key:this.productDetailsKeyList[k]["key"],
+                  type:this.productDetailsKeyList[k]["type"],
+                  value:[],
+                  list:this.productDetailsKeyList[k]["list"]
+                })
+              }
+            }
           }
         } else {
           this.id = ''
           this.type = "add"
-          this.pictureList = []
+          this.pictureList = []
+          this.selectList = []
           this.form = {
             name: '',
             sort: 0,
diff --git a/src/views/product/components/addPhase.vue b/src/views/product/components/addPhase.vue
index 79c13ca..a3338b0 100644
--- a/src/views/product/components/addPhase.vue
+++ b/src/views/product/components/addPhase.vue
@@ -59,57 +59,57 @@
             </el-upload>
           </div>
         </div>
-      </template>
-
-      <template v-slot:product_category_details>
-        <div class="xy-table-item">
-          <div class="xy-table-item-label" style="font-weight: bold">
-            <span style="color: red;font-weight: bold;padding-right: 4px;"></span>Property：
-          </div>
-          <div class="xy-table-item-content">
-            <el-button type="primary" style="margin-bottom:10px" size="small" @click="addRow">Add</el-button>
-            <xy-table style="width:850px" :list="form.product_category_details" :isPage="false" :height="350"
-              :table-item="detail_item">
-              <template v-slot:key>
-                <el-table-column align='left' label="key" width="340">
-                  <template slot-scope="scope">
-                    <el-select style="width:100%" @change="(key)=>{changeKey(key,scope.row)}" v-model="scope.row.key"
-                      placeholder="Please Select">
-                      <el-option v-for="(pvalue,key,index) in productDetailsKeyList" :key="index" :label="pvalue.key"
-                        :value="pvalue.key">
-                      </el-option>
-                    </el-select>
-                  </template>
-                </el-table-column>
-              </template>
-              <template v-slot:value>
-                <el-table-column align='left' label="value" width="340">
-                  <template slot-scope="scope">
-                    <el-select multiple collapse-tags v-if="scope.row.type==='select'" style="width:100%"
-                      v-model="scope.row.value" placeholder="Please Select">
-                      <el-option v-for="(item,index) in scope.row.list" :key="index" :label="item.value"
-                        :value="item.value">
-                      </el-option>
-                    </el-select>
-                    <el-input v-else placeholder="Please Input" style="width:100%" v-model="scope.row.value"></el-input>
-                  </template>
-                </el-table-column>
-              </template>
-              <template v-slot:btns>
-                <el-table-column align='center' label="operate" width="120" header-align="center">
-                  <template slot-scope="scope">
-                    <el-popconfirm confirm-button-text="confirm" cancel-button-text="cancel" style="margin:0 10px"
-                      @confirm="delRow(scope.$index)" title="Are you sure to delete it?">
-                      <el-button type="danger" size="small" slot="reference">delete</el-button>
-                    </el-popconfirm>
-                  </template>
-                </el-table-column>
-              </template>
-            </xy-table>
-          </div>
-        </div>
-      </template>
-
+      </template>
+
+      <template v-slot:product_category_details>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label" style="font-weight: bold">
+            <span style="color: red;font-weight: bold;padding-right: 4px;"></span>Property：
+          </div>
+          <div class="xy-table-item-content">
+            <el-button type="primary" style="margin-bottom:10px" size="small" @click="addRow">Add</el-button>
+            <xy-table style="width:850px" :list="form.product_category_details" :isPage="false" :height="350"
+              :table-item="detail_item">
+              <template v-slot:key>
+                <el-table-column align='left' label="key" width="340">
+                  <template slot-scope="scope">
+                    <el-select style="width:100%" @change="(key)=>{changeKey(key,scope.row)}" v-model="scope.row.key"
+                      placeholder="Please Select">
+                      <el-option v-for="(pvalue,key,index) in productDetailsKeyList" :key="index" :label="pvalue.key"
+                        :value="pvalue.key">
+                      </el-option>
+                    </el-select>
+                  </template>
+                </el-table-column>
+              </template>
+              <template v-slot:value>
+                <el-table-column align='left' label="value" width="340">
+                  <template slot-scope="scope">
+                    <el-select multiple collapse-tags v-if="scope.row.type==='select'" style="width:100%"
+                      v-model="scope.row.value" placeholder="Please Select">
+                      <el-option v-for="(item,index) in scope.row.list" :key="index" :label="item.value"
+                        :value="item.value">
+                      </el-option>
+                    </el-select>
+                    <el-input v-else placeholder="Please Input" style="width:100%" v-model="scope.row.value"></el-input>
+                  </template>
+                </el-table-column>
+              </template>
+              <template v-slot:btns>
+                <el-table-column align='center' label="operate" width="120" header-align="center">
+                  <template slot-scope="scope">
+                    <el-popconfirm confirm-button-text="confirm" cancel-button-text="cancel" style="margin:0 10px"
+                      @confirm="delRow(scope.$index)" title="Are you sure to delete it?">
+                      <el-button type="danger" size="small" slot="reference">delete</el-button>
+                    </el-popconfirm>
+                  </template>
+                </el-table-column>
+              </template>
+            </xy-table>
+          </div>
+        </div>
+      </template>
+
 
       <template v-slot:product_category_applications>
         <div class="xy-table-item">
@@ -138,7 +138,7 @@
           </div>
         </div>
       </template>
-     <!-- <template v-slot:download_ids>
+      <!-- <template v-slot:download_ids>
         <div class="xy-table-item">
           <div class="xy-table-item-label" style="font-weight: bold">
             <span style="color: red;font-weight: bold;padding-right: 4px;"></span>Downloads：
@@ -153,14 +153,17 @@
       </template> -->
 
 
-      <template v-slot:characteristics>
+      <template v-slot:character>
         <div class="xy-table-item">
           <div class="xy-table-item-label" style="font-weight: bold">
             <span style="color: red;font-weight: bold;padding-right: 4px;"></span>Characteristics：
           </div>
           <div class="xy-table-item-content">
-            <wangEditor :isShow="isShow" v-show="showWang" :value="form.characteristics"
-              @change="(e)=>{changeEditor(e,'characteristics')}"></wangEditor>
+            <!-- <wangEditor :isShow="isShow" v-show="showWang" :value="form.character"
+              @change="(e)=>{changeEditor(e,'character')}"></wangEditor> -->
+
+            <my-tinymce v-if="showWang" @input="(e)=>{changeEditor(e,'character')}"
+              :value="form.character"></my-tinymce>
           </div>
         </div>
       </template>
@@ -189,9 +192,9 @@
     save,
     show,
     index
-  } from "@/api/product/category.js"
-  import {
-    getToken
+  } from "@/api/product/category.js"
+  import {
+    getToken
   } from '@/utils/auth'
   import {
     destroy,
@@ -219,6 +222,7 @@
         pictureList: [],
         downloadsList: [],
         applicationsList: [],
+        selectList: [],
         application_detail_item: [{
           type: 'index',
           width: 50,
@@ -227,34 +231,34 @@
           label: 'Title',
           align: 'left',
           width: 620
-        }],
-        detail_item: [{
-          type: 'index',
-          width: 50,
-        }, {
-          prop: 'key',
-          label: 'Key',
-          align: 'left',
-          width: 620
-        }, {
-          prop: 'value',
-          label: 'Value',
-          align: 'left',
-          width: 620
+        }],
+        detail_item: [{
+          type: 'index',
+          width: 50,
+        }, {
+          prop: 'key',
+          label: 'Key',
+          align: 'left',
+          width: 620
+        }, {
+          prop: 'value',
+          label: 'Value',
+          align: 'left',
+          width: 620
         }],
         form: {
           product_category_links_by_sub: [],
           name: '',
           sort: 0,
           description: '',
-          picture_id: '',
-          product_category_details:[],
+          picture_id: '',
+          product_category_details: [],
 
           product_category_applications: [],
           download_ids: [],
 
-          characteristics: '',
-          packing: '',
+          character: '',
+          // packing: '',
           pid: 0,
         },
         rules: {
@@ -308,21 +312,21 @@
       changeEditor(e, type) {
         this.form[type] = e
       },
-      // 参数 属性product_category_details
-      addRow() {
-        this.form.product_category_details.push({
-          key: '',
-          type:'select',
-          value: []
-        })
-      },
-      delRow(index) {
-        this.form.product_category_details.splice(index, 1)
-      },
-      changeKey(e,row) {
-        row.type = this.productDetailsKeyList[e].type
-        row.list = this.productDetailsKeyList[e].list
-        row.value = row.type=='select'?[]:''
+      // 参数 属性product_category_details
+      addRow() {
+        this.form.product_category_details.push({
+          key: '',
+          type: 'select',
+          value: []
+        })
+      },
+      delRow(index) {
+        this.form.product_category_details.splice(index, 1)
+      },
+      changeKey(e, row) {
+        row.type = this.productDetailsKeyList[e].type
+        row.list = this.productDetailsKeyList[e].list
+        row.value = row.type == 'select' ? [] : ''
       },
       // addApplication
       addAppRow(id, type) {
@@ -381,7 +385,7 @@
             })
           })
         }
-        this.form.product_category_links_by_sub = pc_arr
+        this.form.product_category_links_by_sub = pc_arr
 
         let d_files = []
         if (this.downloadsList.length > 0) {
@@ -409,7 +413,7 @@
           this.form.picture_id = p_files[0]
         } else {
           this.form.picture_id = ''
-        }
+        }
         // application
         let a_ids = []
         if (this.applicationsList.length > 0) {
@@ -419,6 +423,28 @@
           this.form.product_category_applications = a_ids
         }
         this.form.type = 2
+        if (this.form.product_category_details.length > 0) {
+          // 判断属性中是否为空
+          for (var p of this.form.product_category_details) {
+            if (p.value.length < 1) {
+              this.$message({
+                type: 'warning',
+                message: `${p.key} cannot be empty in the property`
+              })
+              return
+            }
+          }
+          // 判断属性中 是否有重复的
+          let filterArr = this.base.findDuplicateKeys(this.form.product_category_details, 'key')
+          if (filterArr.length > 0) {
+            this.$message({
+              type: 'warning',
+              message: `${filterArr.join("、")} cannot be repeated in the property`
+            })
+            return
+          }
+        }
+
         console.log("this.form", this.form)
         // return
         save({
@@ -439,10 +465,10 @@
           show_relation: ['productCategoryApplications', 'picture'],
         }).then(res => {
           this.form = this.base.requestToForm(res, this.form)
-          this.description = res.description ? res.description : ''
-          this.characteristics = res.characteristics ? res.characteristics : ''
-          this.packing = res.packing ? res.packing : ''
-          this.applicationsList = res.product_category_applications
+          this.form.description = res.description ? res.description : ''
+          this.form.character = res.character ? res.character : ''
+          // this.packing = res.packing ? res.packing : ''
+          this.form.applicationsList = res.product_category_applications
           this.showWang = true
 
           // 选择的category
@@ -452,14 +478,14 @@
               this.pcSubList.push(pc.main_category_id)
             })
           }
-          //  参数属性 product_category_details
-          res.product_category_details.map(item=>{
-            item.type = this.productDetailsKeyList[item.key]['type']
-            if(this.productDetailsKeyList[item.key].type==='select'){
-              item.list = this.productDetailsKeyList[item.key]['list']
-            }
-          })
-          this.form.product_category_details = res.product_category_details
+          //  参数属性 product_category_details
+          res.product_category_details.map(item => {
+            item.type = this.productDetailsKeyList[item.key]['type']
+            if (this.productDetailsKeyList[item.key].type === 'select') {
+              item.list = this.productDetailsKeyList[item.key]['list']
+            }
+          })
+          this.form.product_category_details = res.product_category_details
 
           if (res.download && res.download.length > 0) {
             this.downloadsList = []
@@ -488,9 +514,20 @@
           this.getCategoryList()
           if (this.type === 'editor') {
             this.getDetail()
-          } else if (this.type === 'add') {
-            this.form.pid = 0
-            this.form.pName = 'Top'
+          }
+          for (var k in this.productDetailsKeyList) {
+
+            if (this.productDetailsKeyList[k]["type"] === 'select') {
+              this.selectList.push(this.productDetailsKeyList[k])
+              if (this.type === 'add') {
+                this.form.product_category_details.push({
+                  key: this.productDetailsKeyList[k]["key"],
+                  type: this.productDetailsKeyList[k]["type"],
+                  value: [],
+                  list: this.productDetailsKeyList[k]["list"]
+                })
+              }
+            }
           }
           this.showWang = true
         } else {
@@ -500,17 +537,18 @@
           this.downloadsList = []
           this.pictureList = []
           this.applicationsList = []
+          this.selectList = []
           this.form = {
             product_category_links_by_sub: [],
             name: '',
             sort: 0,
-            picture_id: '',
-            product_category_details:[],
+            picture_id: '',
+            product_category_details: [],
             product_category_applications: [],
             download_ids: [],
             description: '',
-            characteristics: '',
-            packing: '',
+            character: '',
+            // packing: '',
             pid: 0,
           }
           this.$refs['dialog'].reset()
@@ -529,7 +567,7 @@
   ::v-deep .download_ids,
   ::v-deep .description,
   ::v-deep .packing,
-  ::v-deep .characteristics,
+  ::v-deep .character,
   {
   flex-basis: 100%;
   }
diff --git a/src/views/product/components/addProduct.vue b/src/views/product/components/addProduct.vue
index 408ad61..181b07d 100644
--- a/src/views/product/components/addProduct.vue
+++ b/src/views/product/components/addProduct.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <xy-dialog ref="dialog" :width="70" :is-show.sync="isShow" :type="'form'" :title="$route.meta.title" :form="form"
+    <xy-dialog ref="dialog" :width="60" :is-show.sync="isShow" :type="'form'" :title="$route.meta.title" :form="form"
       :rules='rules' @submit="submit">
       <template v-slot:name>
         <div class="xy-table-item">
@@ -28,9 +28,9 @@
             <span style="color: red;font-weight: bold;padding-right: 4px;">*</span>Product Phase：
           </div>
           <div class="xy-table-item-content">
-            <el-select multiple style="width:100%" v-model="form.category_id" placeholder="Please Select">
-              <el-option v-for="(item,index) in categoryList" :key="index" :label="item.name" :value="item.id">
-              </el-option>
+            <el-select multiple style="width:100%" v-model="form.category_id" placeholder="Please Select">
+              <el-option v-for="(item,index) in categoryList" :key="index" :label="item.name" :value="item.id">
+              </el-option>
             </el-select>
           </div>
         </div>
@@ -104,9 +104,9 @@
           </div>
           <div class="xy-table-item-content">
             <el-button type="primary" style="margin-bottom:10px" size="small" @click="addRow">Add Row</el-button>
-            <xy-table :list="form.product_details" :isPage="false" :height="350" :table-item="detail_item">
+            <xy-table style="width:850px" :list="form.product_details" :isPage="false" :height="350" :table-item="detail_item">
               <template v-slot:key>
-                <el-table-column align='left' label="key">
+                <el-table-column align='left' label="key" width="340">
                   <template slot-scope="scope">
                     <el-select style="width:100%" @change="(key)=>{changeKey(key,scope.row)}" v-model="scope.row.key"
                       placeholder="Please Select">
@@ -118,7 +118,7 @@
                 </el-table-column>
               </template>
               <template v-slot:value>
-                <el-table-column align='left' label="value">
+                <el-table-column align='left' label="value" width="340">
                   <template slot-scope="scope">
                     <el-select v-if="scope.row.type==='select'" style="width:100%" v-model="scope.row.value"
                       placeholder="Please Select">
@@ -240,7 +240,7 @@
       },
       changeEditor(e) {
         this.form.content = e
-      },
+      },
       // product_details
       addRow() {
         var len = this.form.product_details.length;
@@ -276,7 +276,28 @@
         } else {
           this.form.file_ids = []
         }
-        console.log("this.form", this.form)
+        console.log("this.form", this.form)
+        if (this.form.product_details.length > 0) {
+          // 判断属性中是否为空
+          for (var p of this.form.product_details) {
+            if (this.base.isNull(p.value)) {
+              this.$message({
+                type: 'warning',
+                message: `${p.key} cannot be empty in the product details`
+              })
+              return
+            }
+          }
+          // 判断属性中 是否有重复的
+          let filterArr = this.base.findDuplicateKeys(this.form.product_details, 'key')
+          if (filterArr.length > 0) {
+            this.$message({
+              type: 'warning',
+              message: `${filterArr.join("、")} cannot be repeated in the product details`
+            })
+            return
+          }
+        }
         // return
         save({
           ...this.form
@@ -293,20 +314,20 @@
 
       getDetail() {
         show({
-          id: this.id,
-          show_relation:['productDetails']
+          id: this.id,
+          show_relation: ['productDetails']
         }).then(res => {
           this.form = this.base.requestToForm(res, this.form)
-          // this.form.content = res.content ? res.content : ''
-          this.form.category_id = res.category_id?res.category_id:[]
-          res.product_details.map(item=>{
-            item.type = this.productDetailsKeyList[item.key]['type']
-            if(this.productDetailsKeyList[item.key].type==='select'){
-              item.list = this.productDetailsKeyList[item.key]['list']
-            }
-          })
-
-          this.form.product_details = res.product_details
+          // this.form.content = res.content ? res.content : ''
+          this.form.category_id = res.category_id ? res.category_id : []
+          res.product_details.map(item => {
+            item.type = this.productDetailsKeyList[item.key]['type']
+            if (this.productDetailsKeyList[item.key].type === 'select') {
+              item.list = this.productDetailsKeyList[item.key]['list']
+            }
+          })
+
+          this.form.product_details = res.product_details
 
           // this.showWang = true
           // if (res.files && res.files.length > 0) {
@@ -327,12 +348,21 @@
         if (newVal) {
           if (this.type === 'editor') {
             this.getDetail()
+          } else {
+            for (var k in this.productDetailsKeyList) {
+              this.form.product_details.push({
+                key: this.productDetailsKeyList[k]["key"],
+                type: this.productDetailsKeyList[k]["type"],
+                value: '',
+                list: this.productDetailsKeyList[k]["list"]
+              })
+            }
           }
           this.showWang = true
         } else {
           this.id = ''
           // this.filesList = []
-          this.showWang = false
+          this.showWang = false
           this.form = {
             name: "",
             number: '',
@@ -343,7 +373,7 @@
             show_price: 1,
             file_ids: '',
             product_details: [],
-            content: '',
+            content: '',
           }
           this.$refs['dialog'].reset()
         }
diff --git a/src/views/product/index.vue b/src/views/product/index.vue
index d4720d0..7710ee3 100644
--- a/src/views/product/index.vue
+++ b/src/views/product/index.vue
@@ -24,13 +24,25 @@
         </lx-header>
       </div>
     </div>
-    <xy-table :list="list" :total="total" @pageIndexChange="pageIndexChange"
-      @pageSizeChange="pageSizeChange" :table-item="table_item">
+    <xy-table :list="list" :total="total" @pageIndexChange="pageIndexChange" @pageSizeChange="pageSizeChange"
+      :table-item="table_item">
+
+      <template v-slot:category>
+        <el-table-column align='left' label="Product Phase" width="360" header-align="left">
+          <template slot-scope="scope">
+            <div v-if="scope.row.category.length>0">
+              <el-tag style="margin:5px" v-for="item in scope.row.category">{{item.name}}</el-tag>
+            </div>
+            <div v-else></div>
+          </template>
+        </el-table-column>
+      </template>
       <template v-slot:btns>
         <el-table-column align='left' fixed="right" label="Operate" width="180" header-align="center">
           <template slot-scope="scope">
             <el-button type="primary" size="small" @click="editProduct('editor',scope.row.id)">edit</el-button>
-            <el-popconfirm confirm-button-text="confirm" cancel-button-text="cancel" style="margin:0 10px" @confirm="deleteList(scope.row.id)" title="Are you sure to delete it?">
+            <el-popconfirm confirm-button-text="confirm" cancel-button-text="cancel" style="margin:0 10px"
+              @confirm="deleteList(scope.row.id)" title="Are you sure to delete it?">
               <el-button type="danger" size="small" slot="reference">delete</el-button>
             </el-popconfirm>
           </template>
@@ -43,12 +55,12 @@
 
 <script>
   import addProduct from './components/addProduct.vue';
-  import {
-    index,
-    destroy
-  } from "@/api/product/index.js"
-  import {
-    index as getCategory
+  import {
+    index,
+    destroy
+  } from "@/api/product/index.js"
+  import {
+    index as getCategory
   } from "@/api/product/category.js"
   export default {
     components: {
@@ -60,59 +72,67 @@
           name: '',
           page: 1,
           page_size: 10,
-        },
-        categoryList:[],
+        },
+        categoryList: [],
         total: 0,
         list: [],
         table_item: [{
             type: 'index',
             width: 50,
             fixed: 'left'
+          }, {
+            prop: 'category',
+            label: 'Product Phase(产品项)',
+            align: 'left',
+
           }, {
             prop: 'name',
             label: 'Product Name(产品名称)',
             align: 'left',
+            width: 360
           }, {
             prop: 'number',
             label: 'Product Number(产品编号)',
             align: 'left',
+            width: 360
           }, {
             prop: 'list_price',
             label: 'List Price(产品价格)',
             align: 'left',
+            width: 240
           },
           {
             prop: 'is_visible',
             label: 'Visible(前台是否显示)',
             align: 'center',
-            width: 120,
-            formatter:(cell,data,value)=>{
-              return value==1 ? 'Yes':'No'
+            width: 120,
+            formatter: (cell, data, value) => {
+              return value == 1 ? 'Yes' : 'No'
             }
           },
           {
             prop: 'is_sell',
             label: 'Active(当前是否售卖)',
             align: 'center',
-            width: 120,
-            formatter:(cell,data,value)=>{
-              return value==1 ? 'Yes':'No'
+            width: 120,
+            formatter: (cell, data, value) => {
+              return value == 1 ? 'Yes' : 'No'
             }
           },
           {
             prop: 'show_price',
             label: 'Web Visibility(是否显示价格)',
             align: 'center',
-            width: 120,
-            formatter:(cell,data,value)=>{
-              return value==1 ? 'Yes':'No'
+            width: 120,
+            formatter: (cell, data, value) => {
+              return value == 1 ? 'Yes' : 'No'
             }
           }
         ]
 
       }
     },
-    created() {
+    created() {
       this.getCategoryList()
       this.getList()
     },
@@ -120,8 +140,8 @@
       editProduct(type, id) {
         if (type == 'editor') {
           this.$refs.addProduct.id = id
-        }
-        this.$refs.addProduct.categoryList = this.categoryList
+        }
+        this.$refs.addProduct.categoryList = this.categoryList
         this.$refs.addProduct.type = type
         this.$refs.addProduct.isShow = true
       },
@@ -139,26 +159,32 @@
         this.select.name = ''
         this.getList()
       },
-      async getList() {
-        const res = await index({
-          ...this.select,
-          filter:[{
-            key:'name',
-            op:'like',
-            value:this.select.name
-          }]
+      async getList() {
+        const res = await index({
+          ...this.select,
+          filter: [{
+            key: 'name',
+            op: 'like',
+            value: this.select.name
+          }]
         })
         this.list = res.data
         this.total = res.total
-      },
-      async getCategoryList(){
-        const res = await getCategory({page:1,page_size:999,type:2,sort_name:'sort',sort_type:'ASC'})
-        this.categoryList = res.data
+      },
+      async getCategoryList() {
+        const res = await getCategory({
+          page: 1,
+          page_size: 999,
+          type: 2,
+          sort_name: 'sort',
+          sort_type: 'ASC'
+        })
+        this.categoryList = res.data
       },
       deleteList(id) {
         var that = this;
-        destroy({
-          id:id
+        destroy({
+          id: id
         }).then(response => {
           this.$Message.success('Success');
           this.getList()
diff --git a/src/views/resource/components/addFaq.vue b/src/views/resource/components/addFaq.vue
index da76298..c2e997c 100644
--- a/src/views/resource/components/addFaq.vue
+++ b/src/views/resource/components/addFaq.vue
@@ -31,7 +31,9 @@
             <span style="color: red;font-weight: bold;padding-right: 4px;"></span>Content：
           </div>
           <div class="xy-table-item-content">
-            <wangEditor :isShow="isShow" v-show="showWang" :value="form.content" @change="changeEditor"></wangEditor>
+            <!-- <wangEditor :isShow="isShow" v-show="showWang" :value="form.content" @change="changeEditor"></wangEditor> -->
+          <my-tinymce v-if="showWang" @input="changeEditor" :value="form.content"></my-tinymce>
+
           </div>
         </div>
       </template>
diff --git a/src/views/resource/components/addFiles.vue b/src/views/resource/components/addFiles.vue
index 5914c3c..1a6ca4a 100644
--- a/src/views/resource/components/addFiles.vue
+++ b/src/views/resource/components/addFiles.vue
@@ -45,7 +45,8 @@
             <span style="color: red;font-weight: bold;padding-right: 4px;"></span>Content：
           </div>
           <div class="xy-table-item-content">
-            <wangEditor :isShow="isShow" v-show="showWang" :value="form.content" @change="changeEditor"></wangEditor>
+            <!-- <wangEditor :isShow="isShow" v-show="showWang" :value="form.content" @change="changeEditor"></wangEditor> -->
+            <my-tinymce v-if="showWang" @input="changeEditor" :value="form.content"></my-tinymce>
           </div>
         </div>
       </template>
diff --git a/src/views/resource/components/addWebinar.vue b/src/views/resource/components/addWebinar.vue
index 867b6b8..59378ea 100644
--- a/src/views/resource/components/addWebinar.vue
+++ b/src/views/resource/components/addWebinar.vue
@@ -58,7 +58,9 @@
             <span style="color: red;font-weight: bold;padding-right: 4px;"></span>Content：
           </div>
           <div class="xy-table-item-content">
-            <wangEditor :isShow="isShow" v-show="showWang" :value="form.content" @change="changeEditor"></wangEditor>
+            <!-- <wangEditor :isShow="isShow" v-show="showWang" :value="form.content" @change="changeEditor"></wangEditor> -->
+            <my-tinymce v-if="showWang" @input="changeEditor" :value="form.content"></my-tinymce>
+
           </div>
         </div>
       </template>
diff --git a/vue.config.js b/vue.config.js
index e1ec061..2e40aa3 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -25,7 +25,7 @@ module.exports = {
    * Detail: https://cli.vuejs.org/config/#publicpath
    */
   publicPath: process.env.ENV === 'staging' ? '/admin_test' : '/admin',
-  outputDir: '/Users/mac/Documents/朗业/2024/s-美国赛分/saifen/public/admin_test',
+  outputDir: '/Users/mac/Documents/朗业/2024/s-美国赛分/saifen/public/admin',
   assetsDir: 'static',
   css: {
     loaderOptions: { // 向 CSS 相关的 loader 传递选项