cnhis-design-vue 3.1.13-beta.0 → 3.1.13-beta.11

package/es/packages/index.css

@@ -249,6 +249,11 @@ body > .vxe-table--tooltip-wrapper {
   height: 100%;
   line-height: unset;
   width: 100%;
+  display: inline-flex;
+}
+.custom-big-table .vxe-table .vxe-table--header .col--seq .vxe-cell--title,
+.custom-big-table .vxe-table .vxe-table--header .col--checkbox .vxe-cell--title {
+  display: inline-block;
 }
 .custom-big-table .vxe-table .vxe-table--footer-wrapper.body--wrapper::-webkit-scrollbar,
 .custom-big-table .vxe-table .vxe-table--body-wrapper::-webkit-scrollbar {
@@ -2474,11 +2479,13 @@ body > .vxe-table--tooltip-wrapper {
   font-size: 14px;
   margin-bottom: 10px;
 }
-.c-time-line .content-name {
+.c-time-line .content-name,
+.c-time-line .content-extra {
   font-size: 16px;
   font-weight: 600;
 }
-.c-time-line .content-name + span {
+.c-time-line .content-name + span,
+.c-time-line .content-extra + span {
   color: #666;
 }
 .c-time-line .content p {
@@ -2486,6 +2493,9 @@ body > .vxe-table--tooltip-wrapper {
   line-height: 20px;
   text-align: left;
 }
+.c-time-line .content-extra {
+  margin-bottom: 8px !important;
+}
 .clearfix:after {
   visibility: hidden;
   display: block;
@@ -2636,7 +2646,7 @@ body > .vxe-table--tooltip-wrapper {
 .form-render__wrapper {
   display: grid !important;
   grid-template-columns: repeat(var(--column), minmax(0px, 1fr));
-  gap: 0 8px;
+  gap: 0 16px;
   max-height: var(--form-height);
   overflow-y: auto;
   position: relative;
@@ -2647,23 +2657,52 @@ body > .vxe-table--tooltip-wrapper {
 .form-render__formItem .n-date-picker {
   width: 100%;
 }
+.form-render__formItemLabel {
+  position: relative;
+  display: flex;
+  align-items: center;
+}
+.form-render__formItemLabel--text.has-annotation {
+  margin-right: 15px;
+}
+.form-render__formItemLabel--icon {
+  display: inline-flex;
+  align-items: center;
+}
+.form-render__formItemLabel--annotation {
+  position: absolute;
+  top: 50%;
+  transform: translateY(-50%);
+  right: calc(var(--icon-right) * 1px);
+  cursor: pointer;
+  color: #0067ee;
+  font-size: 16px;
+  user-select: none;
+  display: inline-flex;
+  align-items: center;
+}
+.form-render__formItemLabel--annotation.is-active {
+  color: rgba(255, 152, 40);
+}
 .form-render__linebar {
   grid-column: span var(--column) / span var(--column);
 }
 .form-render__linebarHeader {
   cursor: pointer;
   display: flex;
-  background: #fafafa;
-  height: 36px;
+  background: #f2f2f2;
+  height: 40px;
+  font-size: 16px;
+  font-weight: 500;
   align-items: center;
   padding: 0 16px;
   margin-bottom: 8px;
-  border: 1px solid #d9d9d9;
+  border-radius: 4px;
 }
 .form-render__linebarItem {
   display: grid !important;
   grid-template-columns: repeat(var(--column), minmax(0px, 1fr));
-  gap: 0 8px;
+  gap: 0 16px;
 }
 .form-render__inputGroup {
   grid-column: span var(--column) / span var(--column);
@@ -2726,12 +2765,21 @@ body > .vxe-table--tooltip-wrapper {
 .form-render__complexContent--grid {
   display: grid !important;
   grid-template-columns: repeat(var(--column), minmax(0px, 1fr));
-  gap: 0 8px;
+  gap: 0 16px;
 }
 .form-render__complexContent--flex {
   display: flex !important;
   gap: 0 8px;
 }
+.form-render .n-form-item-label {
+  display: inline-flex;
+}
+.form-render .n-form-item-label [form-item-hover-show='true'] {
+  visibility: hidden;
+}
+.form-render .n-form-item-label:hover [form-item-hover-show='true'] {
+  visibility: visible;
+}
 .c-fabric-chart-popup-tip,
 .c-fabric-chart-popup-menu {
   position: absolute;
@@ -2775,3 +2823,175 @@ body > .vxe-table--tooltip-wrapper {
 .c-fabric-chart-popup-menu > li.no-click:hover {
   background: #fff;
 }
+.shortcut-provider {
+  outline: none;
+}
+.shortcut-setter-item__wrapper {
+  display: flex;
+}
+.shortcut-setter-item__operation {
+  margin-left: 12px;
+  display: flex;
+  gap: 12px;
+}
+.stepOut {
+  width: 100%;
+  height: 100%;
+  display: flex;
+  justify-content: center;
+  font-size: 16px;
+  font-weight: 500;
+  font-family: PingFangSC-Medium, PingFang SC;
+}
+.stepOut .stepItem {
+  width: 15%;
+  min-width: 65px;
+  height: 180px;
+  float: left;
+  font-family: SimSun;
+  font-size: 16px;
+  text-align: center;
+  position: relative;
+  top: 48px;
+}
+.stepOut .stepItem .lineCircleRight {
+  left: 55%;
+  top: 6px;
+  position: absolute;
+  display: block;
+  border-left-color: white;
+  border-left-width: 0px;
+  width: 30%;
+  border-color: white white white white;
+  border-left-style: hidden;
+  border-left: none;
+  border-top: 1px dashed rgba(3, 2, 2, 0.4);
+  border-right: 1px dashed rgba(3, 2, 2, 0.4);
+  border-bottom: 1px dashed rgba(3, 2, 2, 0.4);
+  border-left: 0px dashed rgba(3, 2, 2, 0.4) !important;
+  height: 100%;
+  border-radius: 0px 25px 25px 0px;
+}
+.stepOut .stepItem .lineCircleLeft {
+  left: 15%;
+  top: 6px;
+  position: absolute;
+  display: block;
+  border-left-color: white;
+  border-left-width: 0px;
+  width: 30%;
+  border-color: white white white white;
+  border-left-style: hidden;
+  border-left: none;
+  border-top: 1px dashed rgba(3, 2, 2, 0.4);
+  border-right: 0px dashed rgba(3, 2, 2, 0.4) !important;
+  border-bottom: 1px dashed rgba(3, 2, 2, 0.4);
+  border-left: 1px dashed rgba(3, 2, 2, 0.4);
+  height: 100%;
+  border-radius: 25px 0px 0px 25px;
+}
+.stepOut .stepItem .lineCircleActive {
+  border-top: 1px solid #2563f4;
+  border-right: 1px solid #2563f4;
+  border-bottom: 1px solid #2563f4;
+  border-left: 1px solid #2563f4;
+}
+.stepOut .stepItem .icon {
+  width: 13px;
+  height: 13px;
+  border-radius: 50%;
+  background: #969696;
+  margin: 0 auto;
+  position: relative;
+  z-index: 888;
+}
+.stepOut .stepItem .active {
+  background-color: #2563f4;
+}
+.stepOut .stepItem .finished {
+  background-color: #5dc055 !important;
+  color: #fff !important;
+  border-color: #5dc055 !important;
+}
+.stepOut .stepItem .labelFinsh {
+  color: #5dc055 !important;
+}
+.stepOut .stepItem .line {
+  position: absolute;
+  top: 6px;
+  left: 55%;
+  border-bottom: 1px dashed rgba(3, 2, 2, 0.4);
+  width: 90%;
+  z-index: 111;
+}
+.stepOut .stepItem .lineActive {
+  border-bottom: 1px solid #2563f4;
+}
+.stepOut .stepItem .stepTopBox {
+  position: absolute;
+  top: -48px;
+  left: 50%;
+  transform: translateX(-50%);
+  max-width: 70%;
+  min-width: 65px;
+  height: 40px;
+  line-height: 40px;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  overflow: hidden;
+  background: rgba(110, 153, 255, 0.11);
+  border-radius: 4px;
+  color: #2563f4;
+  padding: 0px 5px;
+  cursor: pointer;
+}
+.stepOut .stepItem .stepBottomBox {
+  cursor: pointer;
+  width: 100%;
+  min-width: 65px;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+}
+.stepOut .stepItem .stepLabel {
+  width: 100%;
+  color: #212121;
+  line-height: 36px;
+  margin: 0;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  overflow: hidden;
+}
+.stepOut .stepItem .stepExtra {
+  width: 68px;
+  height: 26px;
+  border-radius: 4px;
+  border: 1px solid #cacaca;
+  margin: 0;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  overflow: hidden;
+}
+.stepOut .stepItem .statusTime {
+  color: rgba(0, 0, 0, 0.6);
+  font-size: 14px;
+  font-weight: 400;
+  width: 89px;
+  height: 34px;
+  margin: 0;
+}
+.nodeTipContent {
+  max-height: 200px;
+  max-width: 400px;
+  overflow: auto;
+  text-align: center;
+  padding: 0;
+  margin: 0;
+}
+.nodeTipContent li {
+  list-style: none;
+  margin-bottom: 5px;
+}
+.nodeTipContent li p {
+  margin: 0;
+}

package/es/packages/index.d.ts

@@ -13,12 +13,16 @@ import CFormTable from './form-table';
 import CInfoHeader from './info-header';
 import CTimeLine from './time-line';
 import CBpmnWorkflow from './bpmn-workflow';
+import CStepsWheel from './steps-wheel';
 import Editor from './editor';
 import CFormRender from './form-render';
 import CFabricChart from './fabric-chart';
+import CShortcutProvider from './shortcut-provider';
+import CShortcutSetter from './shortcut-setter';
 export * from './form-render';
+export * from './shortcut-provider';
 declare function install(app: App): void;
-export { CGrid, CBigTable, CFieldSet, CDragLayout, CButtonPrint, CSelectPerson, CSelectLabel, CLabelFormContent, CScaleView, CMap, CVodChunkUpload, CRadio, CCheckbox, CSelect, CDatetime, CFormTable, CInfoHeader, CTimeLine, CBpmnWorkflow, Editor, CFormRender, CFabricChart };
+export { CGrid, CBigTable, CFieldSet, CDragLayout, CButtonPrint, CSelectPerson, CSelectLabel, CLabelFormContent, CScaleView, CMap, CVodChunkUpload, CRadio, CCheckbox, CSelect, CDatetime, CFormTable, CInfoHeader, CTimeLine, CBpmnWorkflow, CStepsWheel, Editor, CFormRender, CFabricChart, CShortcutProvider, CShortcutSetter };
 declare const _default: {
     install: typeof install;
 };

package/es/packages/index.js

@@ -26,12 +26,18 @@ import TimeLine from './time-line/index.js';
 export { default as CTimeLine } from './time-line/index.js';
 import BpmnWorkflow from './bpmn-workflow/index.js';
 export { default as CBpmnWorkflow } from './bpmn-workflow/index.js';
+import StepsWheel from './steps-wheel/index.js';
+export { default as CStepsWheel } from './steps-wheel/index.js';
 import Editor from './editor/index.js';
 export { default as Editor } from './editor/index.js';
 import FormRender from './form-render/index.js';
 export { default as CFormRender } from './form-render/index.js';
 import FabricChart from './fabric-chart/index.js';
 export { default as CFabricChart } from './fabric-chart/index.js';
+import ShortcutProvider from './shortcut-provider/index.js';
+export { default as CShortcutProvider } from './shortcut-provider/index.js';
+import ShortcutSetter from './shortcut-setter/index.js';
+export { default as CShortcutSetter } from './shortcut-setter/index.js';
 export { useFieldListAdaptor } from './form-render/src/hooks/useFieldListAdaptor.js';
 export { useFormRequest } from './form-render/src/hooks/useFormRequest.js';
 export { useCommonLog } from './form-render/src/hooks/useCommonLog.js';
@@ -46,6 +52,8 @@ export { FormItemDepsCollector, useFormItemDeps } from './form-render/src/hooks/
 export { useInitialData } from './form-render/src/hooks/useInitialData.js';
 export { useAnchor } from './form-render/src/hooks/useAnchor.js';
 export { useFormContext } from './form-render/src/hooks/useFormContext.js';
+export { ShortcutManager, useShortcuts } from './shortcut-provider/src/hooks/useShortcuts.js';
+export { useShortcutSignature } from './shortcut-provider/src/hooks/useShortcutSignature.js';
 
 const components = {
   CGrid: Grid,
@@ -67,9 +75,12 @@ const components = {
   CInfoHeader: InfoHeader,
   CTimeLine: TimeLine,
   CBpmnWorkflow: BpmnWorkflow,
+  CStepsWheel: StepsWheel,
   Editor,
   CFormRender: FormRender,
-  CFabricChart: FabricChart
+  CFabricChart: FabricChart,
+  CShortcutProvider: ShortcutProvider,
+  CShortcutSetter: ShortcutSetter
 };
 function install(app) {
   Object.values(components).forEach((component) => {

package/es/packages/scale-view/src/hooks/scaleview-init.js

@@ -303,14 +303,10 @@ const ScaleViewInit = (props, state, emit, config) => {
     let i = 1;
     const results = list.map((item) => {
       const key = formKey(item);
-      let title = (key || "").replace(/\n/g, "");
+      (key || "").replace(/\n/g, "");
       item.showTitle = item.title;
       item.val_key = key;
       item.renderCom = componentMap[item.type];
-      if (title.includes(".")) {
-        let newTitle = title.replace(/\./g, "~-~");
-        item.showTitle = newTitle;
-      }
       item.isShow = true;
       Object.keys(item).forEach((key2) => {
         if (vexutils.isJSON(item[key2])) {

package/es/packages/scale-view/src/hooks/scaleview-submit.js

@@ -82,12 +82,7 @@ const ScaleViewSubmit = (props, state, emit, config) => {
           if (itemTemp.setting && itemTemp.setting.dateType == "date" && tempObj[key])
             tempObj[key] = moment(tempObj[key]).format("YYYY-MM-DD ") + moment().format("HH:mm:ss");
         }
-        if (key.includes("~-~")) {
-          let newKey = keyTemp ? keyTemp.replace(/~-~/g, ".") : key.replace(/~-~/g, ".");
-          res[newKey] = tempObj[key];
-        } else {
-          res[keyTemp || key] = !tempObj[key] ? null : tempObj[key];
-        }
+        res[keyTemp || key] = !tempObj[key] ? null : tempObj[key];
         if (isOnlyOptions(itemTemp.type)) {
           let { options } = itemTemp;
           let useKey = itemTemp.val_key;

package/es/packages/scale-view/src/hooks/scaleview-validate.js

@@ -117,9 +117,6 @@ const ScaleViewValidate = (props, state, config) => {
     const rules = {};
     formArray.forEach((item) => {
       let newTitle = item.val_key;
-      if (newTitle.includes(".")) {
-        newTitle = newTitle.replace(/\./g, "~-~");
-      }
       rules[newTitle] = [];
       if (item.required && !filterArr.includes(item.type)) {
         rules[newTitle].push({

package/es/packages/shortcut-provider/index.d.ts

@@ -0,0 +1,17 @@
+import { SFCWithInstall } from '../../../es/src/types';
+export * from './src/hooks';
+export * from './src/types';
+declare const ShortcutProvider: SFCWithInstall<import("vue").DefineComponent<{
+    cacheKey: StringConstructor;
+}, {
+    shortcutWrapperRef: import("vue").Ref<HTMLElement | undefined>;
+    props: Readonly<import("@vue/shared").LooseRequired<Readonly<import("vue").ExtractPropTypes<{
+        cacheKey: StringConstructor;
+    }>> & {
+        [x: `on${string}`]: ((...args: any[]) => any) | ((...args: unknown[]) => any) | undefined;
+    }>>;
+    manager: import("./src/hooks").ShortcutManager;
+}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+    cacheKey: StringConstructor;
+}>>, {}>>;
+export default ShortcutProvider;

package/es/packages/shortcut-provider/index.js

@@ -0,0 +1,13 @@
+import { COMPONENT_NAMESPACE } from '../../src/global/variable';
+import { safeComponentRegister } from '../../src/utils';
+import './src/ShortcutProvider.js';
+import script from './src/ShortcutProvider.vue_vue_type_script_setup_true_lang.js';
+export { ShortcutManager, useShortcuts } from './src/hooks/useShortcuts.js';
+export { useShortcutSignature } from './src/hooks/useShortcutSignature.js';
+
+const ShortcutProvider = script;
+ShortcutProvider.install = function(app) {
+  safeComponentRegister(app, ShortcutProvider, COMPONENT_NAMESPACE + "ShortcutProvider");
+};
+
+export { ShortcutProvider as default };

package/es/packages/shortcut-provider/src/ShortcutProvider.js

@@ -0,0 +1,4 @@
+import script from './ShortcutProvider.vue_vue_type_script_setup_true_lang.js';
+export { default } from './ShortcutProvider.vue_vue_type_script_setup_true_lang.js';
+
+script.__file = "packages/shortcut-provider/src/ShortcutProvider.vue";

package/es/packages/shortcut-provider/src/ShortcutProvider.vue.d.ts

@@ -0,0 +1,15 @@
+import { ShortcutManager } from '../../../../es/packages/shortcut-provider';
+declare const _default: import("vue").DefineComponent<{
+    cacheKey: StringConstructor;
+}, {
+    shortcutWrapperRef: import("vue").Ref<HTMLElement | undefined>;
+    props: Readonly<import("@vue/shared").LooseRequired<Readonly<import("vue").ExtractPropTypes<{
+        cacheKey: StringConstructor;
+    }>> & {
+        [x: `on${string}`]: ((...args: any[]) => any) | ((...args: unknown[]) => any) | undefined;
+    }>>;
+    manager: ShortcutManager;
+}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+    cacheKey: StringConstructor;
+}>>, {}>;
+export default _default;

package/es/packages/shortcut-provider/src/ShortcutProvider.vue_vue_type_script_setup_true_lang.js

@@ -0,0 +1,32 @@
+import { defineComponent, ref, provide, onBeforeUnmount, openBlock, createElementBlock, renderSlot } from 'vue';
+import { InjectionShortcutManager } from '../../../packages/shortcut-provider/src/constants';
+import { ShortcutManager } from '../../../packages/shortcut-provider';
+
+var script = /* @__PURE__ */ defineComponent({
+  __name: "ShortcutProvider",
+  props: {
+    cacheKey: String
+  },
+  setup(__props) {
+    const props = __props;
+    const shortcutWrapperRef = ref();
+    const manager = new ShortcutManager(shortcutWrapperRef, props.cacheKey).start();
+    provide(InjectionShortcutManager, manager);
+    onBeforeUnmount(() => {
+      manager.destroy();
+    });
+    return (_ctx, _cache) => {
+      return openBlock(), createElementBlock("section", {
+        ref_key: "shortcutWrapperRef",
+        ref: shortcutWrapperRef,
+        "is-shortcut-capture": "",
+        class: "shortcut-provider",
+        tabindex: -9999
+      }, [
+        renderSlot(_ctx.$slots, "default")
+      ], 512);
+    };
+  }
+});
+
+export { script as default };

package/es/packages/shortcut-provider/src/constants/index.d.ts

@@ -0,0 +1,7 @@
+import { InjectionKey } from 'vue';
+import { ShortcutManager } from '../../../../../es/packages/shortcut-provider/src/hooks';
+export declare enum ShortcutStatus {
+    INACTIVE = 0,
+    ACTIVE = 1
+}
+export declare const InjectionShortcutManager: InjectionKey<ShortcutManager>;

package/es/packages/shortcut-provider/src/constants/index.js

@@ -0,0 +1,8 @@
+var ShortcutStatus = /* @__PURE__ */ ((ShortcutStatus2) => {
+  ShortcutStatus2[ShortcutStatus2["INACTIVE"] = 0] = "INACTIVE";
+  ShortcutStatus2[ShortcutStatus2["ACTIVE"] = 1] = "ACTIVE";
+  return ShortcutStatus2;
+})(ShortcutStatus || {});
+const InjectionShortcutManager = Symbol("InjectionShortcutManager");
+
+export { InjectionShortcutManager, ShortcutStatus };

package/es/packages/shortcut-provider/src/hooks/index.d.ts

@@ -0,0 +1,2 @@
+export * from './useShortcuts';
+export * from './useShortcutSignature';

package/es/packages/shortcut-provider/src/hooks/index.js

@@ -0,0 +1,2 @@
+export { ShortcutManager, useShortcuts } from './useShortcuts.js';
+export { useShortcutSignature } from './useShortcutSignature.js';

package/es/packages/shortcut-provider/src/hooks/useShortcutSignature.d.ts

@@ -0,0 +1,4 @@
+export declare function useShortcutSignature(): {
+    signatureRef: import("vue").Ref<() => string>;
+    shortcut: import("vue").ComputedRef<string>;
+};

package/es/packages/shortcut-provider/src/hooks/useShortcutSignature.js

@@ -0,0 +1,12 @@
+import { ref, computed } from 'vue';
+import { transformKey2DisplaySignature } from '../../../../packages/shortcut-provider/src/utils';
+
+function useShortcutSignature() {
+  const signatureRef = ref(() => "");
+  const shortcut = computed(() => {
+    return transformKey2DisplaySignature(signatureRef.value());
+  });
+  return { signatureRef, shortcut };
+}
+
+export { useShortcutSignature };

package/es/packages/shortcut-provider/src/hooks/useShortcuts.d.ts

@@ -0,0 +1,30 @@
+import { ShortcutItem, ShortcutOption, ShortcutSignatureInfo } from '../../../../../es/packages/shortcut-provider/src/types';
+import { MaybeRef } from '@vueuse/core';
+export declare class ShortcutManager {
+    private readonly shortcutCallbackMap;
+    private readonly shortcutCache;
+    private readonly environmentEle;
+    private handle?;
+    static log(message: string, dryRun?: boolean): string;
+    constructor(environmentEle?: MaybeRef<HTMLElement | undefined>, cacheKey?: string);
+    get traverse(): unknown[];
+    query(key: string): any;
+    updateState(key: string, state?: boolean): void;
+    update(key: string, info: KeyboardEvent | Partial<ShortcutSignatureInfo>): void;
+    register(shortcutItem: ShortcutItem): {
+        stop: () => void;
+        signature: () => string;
+    };
+    start(): this;
+    destroy(): void;
+}
+export declare function useShortcuts(glob?: boolean): {
+    register: (shortcut: ShortcutOption) => {
+        stop: () => void;
+        signature: () => string;
+    };
+    traverse: () => unknown[];
+    query: (key: string) => any;
+    update: (key: string, info: KeyboardEvent | Partial<ShortcutSignatureInfo>) => void;
+    updateState: (key: string, state?: boolean) => void;
+};