@cqsjjb/course-res-design 0.1.0-beta.1 → 0.1.0-beta.11

package/CourseInfo.js

@@ -2,11 +2,74 @@ import React from 'react';
 import { Descriptions } from 'antd';
 import './CourseInfo.less';
 import { getLabelName } from './utils/tools';
-import { getCourseInfo } from './api/courseLibrary';
+import { getCourseInfo, typePageAction } from './api/courseLibrary';
+
+/** 资源渠道  */
+export const COURSE_CHANNEL_ENUM = {
+  '01': '自有',
+  '02': '购买',
+  '03': '其他'
+};
+/** 资源形式  */
+export const COURSE_MODE_ENUM = {
+  '01': '高清大屏',
+  '02': '慕课',
+  '03': '动画',
+  '04': 'PPT',
+  '05': '音频',
+  '06': '录屏',
+  '07': '情景剧',
+  '08': '实操',
+  '15': '微课',
+  '16': '微视频'
+};
+/** 内置字段 labelTypeCode -> { label, valueKey, enumMap } */
+const INNER_FIELD_MAP = {
+  INDUSTRY: {
+    label: '行业',
+    valueKey: 'categorizeName'
+  },
+  JOB_TYPE: {
+    label: '工种',
+    valueKey: 'jobTypeName'
+  },
+  YEAR: {
+    label: '年份',
+    valueKey: 'yearValue'
+  },
+  REGION: {
+    label: '区域',
+    valueKey: 'regionName'
+  },
+  CHANNEL: {
+    label: '渠道',
+    valueKey: 'courseChannelEnum',
+    enumMap: COURSE_CHANNEL_ENUM
+  },
+  PRODUCER: {
+    label: '制作方',
+    valueKey: 'lecturerName'
+  },
+  RESOURCE_TYPE: {
+    label: '资源类型',
+    valueKey: 'courseModeEnum',
+    enumMap: COURSE_MODE_ENUM
+  },
+  RESOURCE_FORM: {
+    label: '资源形式',
+    valueKey: 'courseModeEnum',
+    enumMap: COURSE_MODE_ENUM
+  },
+  STAR: {
+    label: '星级',
+    valueKey: 'star'
+  }
+};
 export default class CourseInfo extends React.Component {
   state = {
     loading: false,
-    courseInfo: {}
+    courseInfo: {},
+    industryFields: []
   };
   componentDidMount() {
     // 如果提供了 courseId，则内部获取数据
@@ -41,11 +104,19 @@ export default class CourseInfo extends React.Component {
       loading: true
     });
     try {
-      const infoRes = await getCourseInfo({
-        id: courseId,
+      const labelRes = await typePageAction({
         apiBaseName: apiBaseName
       });
-
+      const data = labelRes.data;
+      const arr = Array.isArray(data) ? data : [];
+      const industryFields = arr.filter(item => item?.classificationType === 'INNER' && item?.useEnum === 'TRUE' && item?.requiredEnum === 'TRUE');
+      this.setState({
+        industryFields
+      });
+      const infoRes = await (this.props.getCourseInfoAction ? this.props.getCourseInfoAction() : getCourseInfo({
+        id: courseId,
+        apiBaseName: apiBaseName
+      }));
       // 处理响应数据（兼容不同的响应格式）
       const courseInfo = infoRes?.data || infoRes || {};
       this.setState({
@@ -59,10 +130,22 @@ export default class CourseInfo extends React.Component {
       });
     }
   }
+  getInnerFieldDisplay = item => {
+    const config = INNER_FIELD_MAP[item.labelTypeCode];
+    const label = config?.label ?? item.labelTypeName ?? '-';
+    const raw = config?.valueKey ? this.state.courseInfo[config.valueKey] : this.state.courseInfo[item.labelTypeCode];
+    const value = config?.enumMap && raw != null ? config.enumMap[raw] : raw;
+    return {
+      label,
+      value: value ?? '-'
+    };
+  };
   render() {
     const {
       loading,
-      courseInfo: stateCourseInfo
+      courseInfo: stateCourseInfo,
+      industryFields,
+      customFields
     } = this.state;
     // 如果提供了 courseId，优先使用内部 state 的数据，否则使用 props
     const hasCourseId = !!this.props.courseId;
@@ -78,10 +161,6 @@ export default class CourseInfo extends React.Component {
     }, /*#__PURE__*/React.createElement(Descriptions.Item, {
       label: "\u8BFE\u7A0B\u540D\u79F0"
     }, courseInfo?.courseName || '--'), /*#__PURE__*/React.createElement(Descriptions.Item, {
-      label: "\u7C7B\u76EE"
-    }, courseInfo?.categorizeName ? courseInfo.categorizeName : courseInfo?.courseTypeLabel ? getLabelName(courseInfo?.courseTypeLabel) : '--'), courseInfo?.year && /*#__PURE__*/React.createElement(Descriptions.Item, {
-      label: "\u5E74\u4EFD"
-    }, courseInfo.year), /*#__PURE__*/React.createElement(Descriptions.Item, {
       label: "\u8BFE\u7A0B\u4ECB\u7ECD"
     }, courseInfo?.courseDescription ? /*#__PURE__*/React.createElement("div", {
       dangerouslySetInnerHTML: {
@@ -94,11 +173,21 @@ export default class CourseInfo extends React.Component {
       alt: "\u8BFE\u7A0B\u5C01\u9762",
       width: 84,
       height: 50
-    }) : '--'), courseInfo?.star && /*#__PURE__*/React.createElement(Descriptions.Item, {
-      label: "\u661F\u7EA7"
-    }, courseInfo.star), courseInfo?.jobTypeName && /*#__PURE__*/React.createElement(Descriptions.Item, {
-      label: "\u5DE5\u79CD"
-    }, courseInfo.jobTypeName), /*#__PURE__*/React.createElement(Descriptions.Item, {
+    }) : '--'), industryFields.map((item, idx) => {
+      const {
+        label,
+        value
+      } = this.getInnerFieldDisplay(item);
+      return /*#__PURE__*/React.createElement(Descriptions.Item, {
+        key: item.id ?? idx,
+        label: label
+      }, value);
+    }), JSON.parse(stateCourseInfo.dynamicTags || '[]')?.map((item, idx) => {
+      return /*#__PURE__*/React.createElement(Descriptions.Item, {
+        key: item.id ?? idx,
+        label: item.fieldkey
+      }, item.fieldValue);
+    }), /*#__PURE__*/React.createElement(Descriptions.Item, {
       label: "\u8BFE\u7A0B\u6807\u7B7E"
     }, getLabelName(courseInfo?.courseLabel) || '--')));
   }

package/Designable.d.ts

@@ -36,6 +36,10 @@ export interface DesignableProps {
     apiBaseName?: 'res' | 'courseScd';
     [key: string]: any;
   };
+  // 入口类型
+  entry?: 'res' | 'reslib-app';
+  // 资源分类
+  sourceClassify?: ['PUBLIC' | 'PRIVATE'];
   /** 关闭事件回调 */
   onClose?: (data: DesignableCloseData) => void;
   /** iframe 的源地址，如果提供则优先级高于 host */

package/Designable.js

@@ -9,12 +9,14 @@ export const Designable = ({
   data = {},
   onClose,
   src,
-  visible = true
+  visible = true,
+  entry = 'res',
+  sourceClassify = ['PUBLIC', 'PRIVATE']
 }) => {
   const iframeRef = useRef(null);
 
   // 计算 iframe 的 src
-  const iframeSrc = src || `${host}/res-design/setting`;
+  const iframeSrc = src || `${host}/res-design/setting?entry=${entry}&sourceClassify=${sourceClassify.join(',')}`;
 
   // 处理 iframe 加载完成
   const handleIframeLoad = () => {

package/Preview.js

@@ -66,10 +66,10 @@ export default class FormPreview extends React.Component {
     });
     try {
       // 并行请求两个接口
-      const [menuRes, infoRes] = await Promise.all([getCourseMenu({
+      const [menuRes, infoRes] = await Promise.all([this.props.getCourseMenuInfoAction ? this.props.getCourseMenuInfoAction() : getCourseMenu({
         apiBaseName: this.props.apiBaseName,
         id: courseId
-      }), getCourseInfo({
+      }), this.props.getCourseInfoAction ? this.props.getCourseInfoAction() : getCourseInfo({
         apiBaseName: this.props.apiBaseName,
         id: courseId
       })]);
@@ -364,7 +364,8 @@ export default class FormPreview extends React.Component {
         borderRadius: '10px'
       },
       courseInfo: courseInfo,
-      apiBaseName: this.props.apiBaseName
+      apiBaseName: this.props.apiBaseName,
+      extraApiParams: this.props.extraApiParams
     })), /*#__PURE__*/React.createElement("div", {
       className: "course-preview__item-video-info"
     }, /*#__PURE__*/React.createElement("a", null, "\u89C6\u9891\u65F6\u957F\uFF1A", secondToFormat(Number(item.resourceTotalIden))), courseInfo?.hourRuleId ? /*#__PURE__*/React.createElement("a", null, "\u53C2\u8003\u5B66\u65F6\uFF1A", item.resourceHour || '--', "\u5B66\u65F6") : '', /*#__PURE__*/React.createElement("a", null, "\u8BD5\u770B\u5206\u949F\uFF1A", item.auditionTime || '--'), JSON.parse(item.testExamJson || '[]')?.length > 0 && /*#__PURE__*/React.createElement("a", {

package/PreviewVideo.js

@@ -21,7 +21,8 @@ const PreviewVideo = ({
   disabled,
   onChange,
   style,
-  apiBaseName = 'res'
+  apiBaseName = 'res',
+  extraApiParams
 }) => {
   const [openPreviewVideo, setOpenPreviewVideo] = useState(false);
   const [jjbWebResSelectorShow, setJjbWebResSelectorShow] = useState(false);
@@ -52,7 +53,8 @@ const PreviewVideo = ({
         data: url
       } = await globalApi.getResUrlAction({
         fileId: fileArr[0].id,
-        apiBaseName: apiBaseName
+        apiBaseName: apiBaseName,
+        extraApiParams
       });
       obj.resourceUrl = url ? url.length > 0 ? url[0].url : fileArr[0].fileUrl : fileArr[0].fileUrl;
     } catch (err) {
@@ -62,7 +64,8 @@ const PreviewVideo = ({
     try {
       await courseLibraryApi.getResources({
         fileId: fileArr[0].id,
-        apiBaseName: apiBaseName
+        apiBaseName: apiBaseName,
+        extraApiParams
       }).then(res => {
         if (res.success) {
           obj.testExamJson = JSON.stringify(res.data);
@@ -78,7 +81,8 @@ const PreviewVideo = ({
       } = await courseLibraryApi.getTemplateHour({
         duration: fileArr[0].duration,
         ruleId: courseInfo.hourRuleId,
-        apiBaseName: apiBaseName
+        apiBaseName: apiBaseName,
+        ...extraApiParams
       });
       if (data.length > 0) {
         obj.resourceHour = data[0].hour;
@@ -155,6 +159,7 @@ const PreviewVideo = ({
     from: "https://cdn.cqjjb.cn/jjb1-web-jjb-web-saas-res-selector/latest/index.js",
     componentKey: "jjbWebResSelector",
     componentProps: {
+      apiBaseName: apiBaseName,
       sourceType: ['media'],
       onOk: handleResSelectorOk,
       onCancel: handleResSelectorCancel
@@ -172,7 +177,8 @@ const PreviewVideo = ({
     id: fileId,
     src: resourceUrl,
     apiBaseName: apiBaseName,
-    courseInfo: courseInfo
+    courseInfo: courseInfo,
+    extraApiParams: extraApiParams
   })));
 };
 PreviewVideo.propTypes = {

package/VideoPlayer.js

@@ -9,6 +9,7 @@ const VideoPlayer = props => {
     id,
     courseInfo,
     apiBaseName,
+    extraApiParams,
     ...rest
   } = props;
   const [tracks, setTracks] = useState([]);
@@ -19,7 +20,8 @@ const VideoPlayer = props => {
       getResUrlAction({
         fileId: id,
         courseId: courseInfo?.id,
-        apiBaseName: apiBaseName
+        apiBaseName: apiBaseName,
+        extraApiParams
       }).then(res => {
         if (res.data) {
           setNewSrc(res.data?.map((item, index) => {
@@ -47,7 +49,8 @@ const VideoPlayer = props => {
       getVideoCaption({
         fileId: id,
         courseId: courseInfo?.id,
-        apiBaseName: apiBaseName
+        apiBaseName: apiBaseName,
+        extraApiParams
       }).then(res => {
         if (res.data?.length) {
           setTracks(res.data.map((item, index) => {

package/api/courseLibrary.js

@@ -1,4 +1,5 @@
-import request, { API_BASE_NAME } from '../utils/request';
+import request from '../utils/request';
+import { getApiBaseName } from './utils';
 
 /**
  * 资源库获取试题
@@ -6,7 +7,10 @@ import request, { API_BASE_NAME } from '../utils/request';
  * @returns {Promise}
  */
 export const getResources = params => {
-  return request.get(`/${params.apiBaseName || API_BASE_NAME}/course/getResExam/${params.fileId}`);
+  const { apiBaseName, fileId, extraApiParams } = params;
+  return request.get(`/${getApiBaseName(apiBaseName)}/course/getResExam/${fileId}`, {
+    params: extraApiParams
+  });
 };
 
 /**
@@ -15,7 +19,7 @@ export const getResources = params => {
  * @returns {Promise}
  */
 export const getTemplateHour = params => {
-  return request.post(`/${params.apiBaseName || API_BASE_NAME}/course/getResourceHour`, params);
+  return request.post(`/${getApiBaseName(params?.apiBaseName)}/course/getResourceHour`, params);
 };
 
 /**
@@ -24,14 +28,20 @@ export const getTemplateHour = params => {
  * @returns {Promise}
  */
 export const getCourseMenu = params => {
-  return request.get(`/${params.apiBaseName || API_BASE_NAME}/course/findCourseMenu/${params.id}`);
+  return request.get(`/${getApiBaseName(params?.apiBaseName)}/course/findCourseMenu/${params.id}`);
 };
 
 /**
  * 获取课程基本信息数据（课程信息）
  * @param {object} params - 请求参数，包含 id
- * @returns {Promise}w
+ * @returns {Promise}
  */
 export const getCourseInfo = params => {
-  return request.get(`/${params.apiBaseName || API_BASE_NAME}/course/${params.id}`);
-};
+  return request.get(`/${getApiBaseName(params?.apiBaseName)}/course/${params.id}`);
+};
+
+// 查询标签分类管理列表
+export const typePageAction = params =>
+  request.get(`/${getApiBaseName(params?.apiBaseName)}/typeManage`, {
+    params
+  });

package/api/global.js

@@ -1,4 +1,5 @@
-import request, { API_BASE_NAME } from '../utils/request';
+import request from '../utils/request';
+import { getApiBaseName } from './utils';
 
 /**
  * 根据资源id查询新的视频url
@@ -6,7 +7,10 @@ import request, { API_BASE_NAME } from '../utils/request';
  * @returns {Promise}
  */
 export const getResUrlAction = params => {
-  return request.get(`/${params.apiBaseName || API_BASE_NAME}/course/getVideoUrlByFileId/${params.fileId}`);
+  const { apiBaseName, fileId, extraApiParams } = params;
+  return request.get(`/${getApiBaseName(apiBaseName)}/course/getVideoUrlByFileId/${fileId}`, {
+    params: extraApiParams
+  });
 };
 
 /**
@@ -15,7 +19,11 @@ export const getResUrlAction = params => {
  * @returns {Promise}
  */
 export const getVideoCaption = params => {
+  const { apiBaseName, fileId, extraApiParams } = params;  
   return request.get(
-    `/${params.apiBaseName || API_BASE_NAME}/course/getCaptionListByFileId/${params.fileId}`
+    `/${getApiBaseName(apiBaseName)}/course/getCaptionListByFileId/${fileId}`,
+    {
+      params: extraApiParams
+    }
   );
 };

package/api/utils.js

@@ -0,0 +1,15 @@
+const inIframe = () => {
+    return window.self !== window.top;
+}
+
+export const getApiBaseName = (baseName) => {
+    if(baseName) {
+        return baseName;
+    }
+    try {
+        const location = inIframe() ? window.parent.location : window.location;
+        return location.pathname.match(/^\/(.+)\/[C|c]ontainer/)[1];
+    } catch (error) {
+        return 'res';
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cqsjjb/course-res-design",
-  "version": "0.1.0-beta.1",
+  "version": "0.1.0-beta.11",
   "description": "课程资源设计组件库",
   "main": "index.js",
   "author": "jiaoxiwei",

package/utils/index.js

@@ -4,6 +4,6 @@
  */
 export function getApiHost() {
   return process.env.NODE_ENV === 'development' ?
-      process.env?.app?.API_HOST || 'https://yjap.cqzxaq.com'
-    : window.location.origin;
+      window?.['process']?.['env']?.['app']?.['API_HOST'] || sessionStorage.getItem('API_HOST') || 'https://yjap.cqzxaq.com'
+    : window?.['process']?.['env']?.['app']?.['API_HOST'] || sessionStorage.getItem('API_HOST') || window.location.origin;
 }