浏览代码

显示设置时,增加一个属性参数

dusenyao 1 年之前
父节点
当前提交
5aaff52f3c

+ 4 - 2
src/views/book/courseware/create/components/CreateCanvas.vue

@@ -248,9 +248,11 @@ export default {
      * 显示设置
      * @param {object} setting
      * @param {string} type
+     * @param {string} id
+     * @param {object} params
      */
-    showSetting(setting, type, id) {
-      this.$emit('showSetting', setting, type, id);
+    showSetting(setting, type, id, params = {}) {
+      this.$emit('showSetting', setting, type, id, params);
     },
     /**
      * 计算组件移动

+ 0 - 2
src/views/book/courseware/create/components/base/common/UploadFile.vue

@@ -225,12 +225,10 @@ export default {
 
       files
         .filter((p) => {
-          console.log(p.progress);
           let pro = p.progress || -1;
           return pro <= 0;
         })
         .forEach((file) => {
-          console.log(file);
           let form = new FormData();
           form.append(file.name, file.raw, file.name);
           fileUpload('Mid', form, {

+ 5 - 1
src/views/book/courseware/create/components/common/SettingMixin.js

@@ -3,10 +3,12 @@ import { snGenerationMethodList, checkString } from '@/views/book/courseware/dat
 
 import SerialNumberPosition from '@/views/book/courseware/create/components/common/SerialNumberPosition.vue';
 import SelectSerialNumberStyle from '@/views/book/courseware/create/components/base/common/SelectSerialNumberStyle.vue';
+import tinymce from 'tinymce/tinymce';
 
 const mixin = {
   data() {
     return {
+      param: {},
       switchSerialNumber,
       computedQuestionNumber,
       snGenerationMethodList,
@@ -25,9 +27,11 @@ const mixin = {
     /**
      * @description 设置属性
      * @param {object} property 属性
+     * @param {object} param 参数
      */
-    setSetting(property) {
+    setSetting(property, param) {
       this.property = property;
+      this.param = param;
     },
 
     /**

+ 9 - 4
src/views/book/courseware/create/index.vue

@@ -142,19 +142,24 @@ export default {
     },
     /**
      * 显示设置
-     * @param {object} setting
-     * @param {string} type
+     * @param {object} setting 组件设置
+     * @param {string} type 组件类型
+     * @param {string} id 组件id
+     * @param {object} params 组件参数
      */
-    showSetting(setting, type, id) {
+    showSetting(setting, type, id, params = {}) {
       this.curSettingType = type;
       this.curSettingId = id;
       this.$nextTick(() => {
-        this.$refs.setting.setSetting(setting);
+        this.$refs.setting.setSetting(setting, params);
       });
     },
     setBackgroundImage(...data) {
       this.$refs.createCanvas.setBackgroundImage(...data);
     },
+    getRichTextContent() {
+      return this.$refs.createCanvas.getRichTextContent();
+    },
   },
 };
 </script>

+ 3 - 3
src/views/book/courseware/data/common.js

@@ -51,9 +51,9 @@ export const arrangeTypeList = [
  * @param {string} str
  */
 export function checkString(str) {
-  const number = /\d/.test(str); // 判断是否包含数字
-  const letter = /[a-z]/.test(str); // 判断是否包含字母
-  const capital = /[A-Z]/.test(str); // 判断是否包含大写字母
+  const number = /^\d/.test(str); // 判断是否包含数字
+  const letter = /^[a-z]/.test(str); // 判断是否包含字母
+  const capital = /^[A-Z]/.test(str); // 判断是否包含大写字母
   const bracket_number = /\(\d+\)/.test(str); // 判断是否包含括号数字,例如 (123)
   const obj = { number, letter, capital, bracket_number };
   let strType = Object.keys(obj).find((key) => obj[key]);