cnhis-design-vue 3.1.40-beta.0 → 3.1.40-beta.2

package/es/components/scale-view/src/hooks/scaleview-computed.js

@@ -5,7 +5,8 @@ import moment from 'moment';
 import { componentMapStr } from './use-component.js';
 
 const ScaleViewComputed = (props, state, config) => {
-  let { query } = config;
+  const { query } = config;
+  const cur = new Date().getTime();
   const queryformBoldOpen = computed(() => {
     return (query == null ? void 0 : query.formBoldOpen) == 1;
   });
@@ -15,8 +16,43 @@ const ScaleViewComputed = (props, state, config) => {
       return false;
     return (query == null ? void 0 : query.evatip) == 1 || ((_a = props.params) == null ? void 0 : _a.evatip) == 1;
   });
+  const evaluateResultSetting = computed(() => {
+    var _a;
+    return ((_a = state.config) == null ? void 0 : _a.evaluateResultSetting) || {};
+  });
+  const getEvaluateTime = computed(() => {
+    const { evaluateTime } = evaluateResultSetting.value;
+    return +evaluateTime;
+  });
+  const evaluateStartTime = computed(() => {
+    var _a;
+    return (_a = evaluateResultSetting.value) == null ? void 0 : _a.evaluateStartTime;
+  });
+  const getEvaluateStartTime = computed(() => {
+    const tempSt = new Date(evaluateStartTime.value);
+    const isValidDate = XEUtils.isValidDate(tempSt);
+    if (!isValidDate)
+      return false;
+    return tempSt;
+  });
+  const evaBanEnd = computed(() => {
+    if (!evaluateStartTime.value || !getEvaluateTime.value)
+      return false;
+    const startTime = getEvaluateStartTime.value;
+    if (!startTime)
+      return false;
+    const endTime = moment(evaluateStartTime.value).add(getEvaluateTime.value, "minutes").valueOf();
+    return cur >= endTime;
+  });
+  const evaBanStart = computed(() => {
+    const startTime = getEvaluateStartTime.value;
+    if (!startTime)
+      return false;
+    const sT = moment(startTime).valueOf();
+    return cur < sT;
+  });
   const isFormBoldOpen = computed(() => (item) => {
-    let res = item.required;
+    const res = item.required;
     if (!props.styleSetting || !Object.keys(props.styleSetting).length || !("formBoldOpen" in props.styleSetting)) {
       return res && queryformBoldOpen.value;
     }
@@ -53,15 +89,15 @@ const ScaleViewComputed = (props, state, config) => {
   });
   const handleShowQuestionNumber = computed(() => (item) => {
     var _a;
-    let { type } = item || {};
-    let tempTile = ((_a = state.config) == null ? void 0 : _a.autoQuestionNumber) === false ? item.showTitle : `${item.softcode}\u3001${item.showTitle}`;
+    const { type } = item || {};
+    const tempTile = ((_a = state.config) == null ? void 0 : _a.autoQuestionNumber) === false ? item.showTitle : `${item.softcode}\u3001${item.showTitle}`;
     if (!isEvaluation(type))
       return tempTile;
-    let score = handleEvaluationScore(item);
+    const score = handleEvaluationScore(item);
     return `${tempTile}&nbsp;<span style="color:#2d7aff;" class="score-i">${score}</span>`;
   });
   const hasScore = computed(() => {
-    let { config: config2 } = state;
+    const { config: config2 } = state;
     if (!config2 || !Object.keys(config2).length)
       return false;
     if ("totalScore" in config2)
@@ -70,9 +106,17 @@ const ScaleViewComputed = (props, state, config) => {
   });
   const isPreviewScale = computed(() => {
     var _a;
-    let guage_id = (_a = state.ids) == null ? void 0 : _a.guage_id;
+    const guage_id = (_a = props.ids) == null ? void 0 : _a.guage_id;
     return guage_id && props.noBtn;
   });
+  const skipCover = computed(() => {
+    const params = props.params || {};
+    if (!("skipCover" in params)) {
+      return false;
+    }
+    const res = params.skipCover && !evaBanStart.value && !evaBanEnd.value;
+    return res;
+  });
   const showEvaluateEntry = computed(() => {
     return !isPreviewScale.value && state.showEvaluatePage && state.showEvaluateSettingWrap && !state.isFinished && !props.noBtn && !props.hideBtn;
   });
@@ -80,8 +124,8 @@ const ScaleViewComputed = (props, state, config) => {
     return !isPreviewScale.value && !showEvaluateEntry.value && state.showEvaluateCountdownWrap && !state.isFinished && !props.noBtn && !props.hideBtn;
   });
   const hasEvaluateResultSetting = computed(() => {
-    let { evaluateResultSetting = {} } = state.config;
-    let valueArr = Object.values(evaluateResultSetting).filter((item) => {
+    const { evaluateResultSetting: evaluateResultSetting2 = {} } = state.config;
+    const valueArr = Object.values(evaluateResultSetting2).filter((item) => {
       if (item)
         return true;
     }) || [];
@@ -91,11 +135,11 @@ const ScaleViewComputed = (props, state, config) => {
     return state.paramsEvaluate && Object.keys(state.paramsEvaluate).length;
   });
   const hasDefault = computed(() => {
-    let hash = window.location.search;
+    const hash = window.location.search || window.location.hash;
     if (!hash)
       return;
-    let defaultVariable = ["evaname", "evadesc", "evast", "evadur", "evaan"];
-    let hasDefaultItem = defaultVariable.find((item) => hash.includes(item));
+    const defaultVariable = ["evaname", "evadesc", "evast", "evadur", "evaan"];
+    const hasDefaultItem = defaultVariable.find((item) => hash.includes(item));
     return state.paramsEvaluate || hasDefaultItem;
   });
   const showSaveBtn = computed(() => {
@@ -111,7 +155,7 @@ const ScaleViewComputed = (props, state, config) => {
     return !!props.hideBtn || !!props.isLock || state.isFinished;
   });
   const showEvaluateLabel = computed(() => (item) => {
-    let obj = {
+    const obj = {
       EVALUATE_RADIO_BLOCK: "\u5355\u9009\u9898",
       EVALUATE_CHECKBOX_BLOCK: "\u591A\u9009\u9898"
     };
@@ -119,17 +163,17 @@ const ScaleViewComputed = (props, state, config) => {
   });
   const showAnswerParse = computed(() => (item) => {
     var _a;
-    let { evaluateAnswer, checkAnswerMode, evaluateStartTime, evaluateTime } = ((_a = state.config) == null ? void 0 : _a.evaluateResultSetting) || {};
-    let arr = ["EVALUATE_RADIO_BLOCK", "EVALUATE_CHECKBOX_BLOCK", "EVALUATE_SELECT", "EVALUATE_INPUT"];
-    let maxScore = (item == null ? void 0 : item.scoreConfigs) || 0;
-    let isShow = evaluateAnswer && state.isFinished && arr.includes(item.type) && maxScore;
-    if (!evaluateStartTime || !evaluateTime || checkAnswerMode && checkAnswerMode == 1) {
+    const { evaluateAnswer, checkAnswerMode, evaluateStartTime: evaluateStartTime2, evaluateTime } = ((_a = state.config) == null ? void 0 : _a.evaluateResultSetting) || {};
+    const arr = ["EVALUATE_RADIO_BLOCK", "EVALUATE_CHECKBOX_BLOCK", "EVALUATE_SELECT", "EVALUATE_INPUT"];
+    const maxScore = (item == null ? void 0 : item.scoreConfigs) || 0;
+    const isShow = evaluateAnswer && state.isFinished && arr.includes(item.type) && maxScore;
+    if (!evaluateStartTime2 || !evaluateTime || checkAnswerMode && checkAnswerMode == 1) {
       return isShow;
     }
-    if (!XEUtils.isValidDate(new Date(evaluateStartTime)))
+    if (!XEUtils.isValidDate(new Date(evaluateStartTime2)))
       return isShow;
-    let endTime = moment(evaluateStartTime).add(evaluateTime, "minutes");
-    let isRang = endTime.diff(moment(), "seconds", true);
+    const endTime = moment(evaluateStartTime2).add(evaluateTime, "minutes");
+    const isRang = endTime.diff(moment(), "seconds", true);
     return isShow && isRang <= 0;
   });
   const tipMsg = computed(() => {
@@ -184,8 +228,8 @@ const ScaleViewComputed = (props, state, config) => {
   const propsConfig = computed(() => (item, index) => {
     var _a;
     const propType = componentMapStr[item.type];
-    let useProps = comProsMap[propType] || {};
-    let propsObj = {
+    const useProps = comProsMap[propType] || {};
+    const propsObj = {
       form: state.form,
       item,
       index,
@@ -232,8 +276,8 @@ const ScaleViewComputed = (props, state, config) => {
     const { relation_logic_is, condition, relation_logic } = relationLogicObj;
     if (relation_logic_is) {
       const results = condition.map((c) => {
-        let mItem = formArray.filter((f) => f.seq == c.subject_seq)[0];
-        let key = formKey(mItem);
+        const mItem = formArray.filter((f) => f.seq == c.subject_seq)[0];
+        const key = formKey(mItem);
         if (XEUtils.isArray(form[key])) {
           return form[key].some((v) => c.value.includes(v));
         } else {
@@ -254,25 +298,25 @@ const ScaleViewComputed = (props, state, config) => {
     return item.databaseTitle || item.title;
   };
   const handleEvaluationScore = (ele) => {
-    let { minScore = 0, maxScore = 0, scoreType } = ele.scoreConfigs || {};
+    const { minScore = 0, maxScore = 0, scoreType } = ele.scoreConfigs || {};
     return `(${maxScore}\u5206)`;
   };
   const evaluatePageProps = computed(() => {
-    var _a, _b;
+    var _a;
     return {
       formArray: state.formArray,
       evaluateResultConfig: ((_a = state.config) == null ? void 0 : _a.evaluateResultConfig) || {},
-      evaluateResultSetting: ((_b = state.config) == null ? void 0 : _b.evaluateResultSetting) || {},
+      evaluateResultSetting: evaluateResultSetting.value,
       isFinished: state.isFinished,
       maxScore: state.maxScore
     };
   });
   const evaluateCountdownProps = computed(() => {
-    var _a, _b;
+    var _a;
     return {
       formArray: state.formArray,
       evaluateResultConfig: ((_a = state.config) == null ? void 0 : _a.evaluateResultConfig) || {},
-      evaluateResultSetting: ((_b = state.config) == null ? void 0 : _b.evaluateResultSetting) || {},
+      evaluateResultSetting: evaluateResultSetting.value,
       form: state.form,
       isFinished: state.isFinished,
       currentTime: state.currentTime,
@@ -302,7 +346,8 @@ const ScaleViewComputed = (props, state, config) => {
     showEvent,
     formKey,
     evaluatePageProps,
-    evaluateCountdownProps
+    evaluateCountdownProps,
+    skipCover
   };
 };
 

package/es/components/scale-view/src/hooks/use-evaluate.js

@@ -3,7 +3,7 @@ import moment from 'moment';
 import XEUtils from 'xe-utils';
 
 const useEvaluate = (props, state, config) => {
-  let { emit } = config;
+  const { emit } = config;
   const evaluateState = reactive({
     totalLen: 0,
     timer: null,
@@ -29,22 +29,22 @@ const useEvaluate = (props, state, config) => {
     return (_a = props.evaluateResultSetting) == null ? void 0 : _a.evaluateStartTime;
   });
   const getEvaluateStartTime = computed(() => {
-    let tempSt = new Date(evaluateStartTime.value);
-    let isValidDate = XEUtils.isValidDate(tempSt);
+    const tempSt = new Date(evaluateStartTime.value);
+    const isValidDate = XEUtils.isValidDate(tempSt);
     if (!isValidDate)
       return false;
     return tempSt;
   });
   const getEvaluateTime = computed(() => {
-    let { evaluateTime } = props.evaluateResultSetting;
+    const { evaluateTime } = props.evaluateResultSetting;
     return +evaluateTime;
   });
   const getEvaluateEnd = computed(() => {
-    if (!showRange)
+    if (!showRange.value)
       return false;
     if (!getEvaluateTime.value)
       return false;
-    let rangTime = moment(evaluateStartTime.value).add(getEvaluateTime.value, "minutes").valueOf();
+    const rangTime = moment(evaluateStartTime.value).add(getEvaluateTime.value, "minutes").valueOf();
     if (state.curTime >= rangTime)
       return true;
     return props.isFinished;
@@ -56,7 +56,7 @@ const useEvaluate = (props, state, config) => {
     return "\u5F00\u59CB\u6D4B\u8BC4";
   });
   const disabledEvaluate = computed(() => {
-    let res = getEvaluateStartTime.value && !evaluateState.isTimeOut || getEvaluateEnd.value;
+    const res = getEvaluateStartTime.value && !evaluateState.isTimeOut || getEvaluateEnd.value;
     return res;
   });
   const showRange = computed(() => {
@@ -71,7 +71,7 @@ const useEvaluate = (props, state, config) => {
       return false;
     if (getEvaluateStartTime.value)
       return true;
-    let rangTime = moment(evaluateStartTime.value).add(getEvaluateTime.value, "minutes").valueOf();
+    const rangTime = moment(evaluateStartTime.value).add(getEvaluateTime.value, "minutes").valueOf();
     return state.curTime < rangTime;
   });
   onMounted(() => {
@@ -83,23 +83,23 @@ const useEvaluate = (props, state, config) => {
   const isBanStart = () => {
     if (!evaluateStartTime.value || !getEvaluateTime.value)
       return false;
-    let startTime = getEvaluateStartTime.value;
+    const startTime = getEvaluateStartTime.value;
     if (!startTime)
       return false;
-    let endTime = moment(evaluateStartTime.value).add(getEvaluateTime.value, "minutes").valueOf();
-    let cur = new Date().getTime();
+    const endTime = moment(evaluateStartTime.value).add(getEvaluateTime.value, "minutes").valueOf();
+    const cur = new Date().getTime();
     return cur >= endTime;
   };
   const getTotalLen = () => {
     var _a;
-    let arrList = (_a = props.formArray) == null ? void 0 : _a.filter((item) => !evaluateState.filterArr.includes(item.type) && !item.hide);
+    const arrList = (_a = props.formArray) == null ? void 0 : _a.filter((item) => !evaluateState.filterArr.includes(item.type) && !item.hide);
     if (!arrList || !arrList.length)
       return;
     evaluateState.totalLen = arrList.length;
   };
   const countdown = (startTime) => {
     clearTimer();
-    let msec = startTime - new Date().getTime();
+    const msec = startTime - new Date().getTime();
     if (msec <= 0) {
       evaluateState.countdownStr = "00:00:00";
       evaluateState.isTimeOut = true;

package/es/components/shortcut-provider/src/ShortcutProvider.vue.js

@@ -1,4 +1,4 @@
-import { defineComponent, ref, provide, onBeforeUnmount, openBlock, createElementBlock, renderSlot } from 'vue';
+import { defineComponent, ref, provide, onBeforeUnmount, openBlock, createElementBlock, createCommentVNode, renderSlot } from 'vue';
 import { uuidGenerator } from '../../../shared/utils/index.js';
 import { InjectionShortcutManager } from './constants/index.js';
 import '../index.js';
@@ -26,6 +26,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         class: "shortcut-provider",
         tabindex: -9999
       }, [
+        createCommentVNode("  \u9700\u8981\u7ED1\u5B9A\u8BE5\u4F5C\u7528\u57DF\u5FEB\u6377\u952E\u7684\u5185\u5BB9  "),
         renderSlot(_ctx.$slots, "default")
       ], 512);
     };

package/es/env.d.ts

@@ -1,24 +1,24 @@
-/// <reference types="vite/client" />
-
-interface ImportMetaEnv {
-  readonly VITE_APP_TYPE: string;
-  // 更多环境变量...
-}
-
-interface ImportMeta {
-  readonly env: ImportMetaEnv;
-}
-
-declare module '*.vue' {
-// @ts-ignore
-  import type { App, defineComponent } from 'vue';
-  // // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/ban-types
-  // // const component: DefineComponent<{}, {}, any>
-  const component: ReturnType<typeof defineComponent> & {
-    install(app: App): void;
-  };
-  // @ts-ignore
-  export default component;
-}
-
-declare module '*.js';
+/// <reference types="vite/client" />
+
+interface ImportMetaEnv {
+  readonly VITE_APP_TYPE: string;
+  // 更多环境变量...
+}
+
+interface ImportMeta {
+  readonly env: ImportMetaEnv;
+}
+
+declare module '*.vue' {
+// @ts-ignore
+  import type { App, defineComponent } from 'vue';
+  // // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/ban-types
+  // // const component: DefineComponent<{}, {}, any>
+  const component: ReturnType<typeof defineComponent> & {
+    install(app: App): void;
+  };
+  // @ts-ignore
+  export default component;
+}
+
+declare module '*.js';