cnhis-design-vue 3.1.9-beta.12 → 3.1.9-beta.13

package/es/packages/form-render/index.d.ts

@@ -251,7 +251,7 @@ declare const FormRender: SFCWithInstall<import("vue").DefineComponent<{
         "x-read-pretty"?: boolean | undefined;
         "x-compile-omitted"?: string[] | undefined;
     }>>;
-    renderSchema: import("vue").ComputedRef<import("@formily/json-schema").Stringify<{
+    parsedSchema: import("vue").ComputedRef<import("@formily/json-schema").Stringify<{
         [key: symbol]: any;
         [key: `x-${string}`]: any;
         [key: `x-${number}`]: any;

package/es/packages/form-render/index.js

@@ -13,6 +13,7 @@ export { useFormValidator } from './src/hooks/useFormValidator.js';
 export { BusinessCollector, useBusinessBinding } from './src/hooks/useBusinessBinding.js';
 export { ContextCollector, useChangeContext } from './src/hooks/useChangeContext.js';
 export { FormItemDepsCollector, useFormItemDeps } from './src/hooks/useFormItemDeps.js';
+export { useInitialData } from './src/hooks/useInitialData.js';
 
 const FormRender = script;
 FormRender.install = function(app) {

package/es/packages/form-render/src/FormRender.vue.d.ts

@@ -251,7 +251,7 @@ declare const _default: import("vue").DefineComponent<{
         "x-read-pretty"?: boolean | undefined;
         "x-compile-omitted"?: string[] | undefined;
     }>>;
-    renderSchema: import("vue").ComputedRef<import("@formily/vue").Stringify<{
+    parsedSchema: import("vue").ComputedRef<import("@formily/vue").Stringify<{
         [key: symbol]: any;
         [key: `x-${string}`]: any;
         [key: `x-${number}`]: any;

package/es/packages/form-render/src/FormRender.vue_vue_type_script_setup_true_lang.js

@@ -7,6 +7,7 @@ import * as index from './components/index.js';
 import { InjectionBusinessCollector, InjectionChangeContextCollector, InjectionFormItemDepsCollector, InjectAsyncQueue, InjectionSchemaField } from './constants/index.js';
 import { injectOrProvide } from './utils/index.js';
 import { useBusinessBinding } from './hooks/useBusinessBinding.js';
+import { useInitialData } from './hooks/useInitialData.js';
 import { useAsyncQueue } from './hooks/useAsyncQueue.js';
 import { useChangeContext } from './hooks/useChangeContext.js';
 import { useFormItemDeps } from './hooks/useFormItemDeps.js';
@@ -43,10 +44,11 @@ var script = /* @__PURE__ */ defineComponent({
     const formItemDepsCollector = useFormItemDeps().create();
     provide(InjectionFormItemDepsCollector, formItemDepsCollector);
     const formModel = createForm({
-      initialValues: props.initialData,
+      initialValues: useInitialData().assignInitialData(props.initialData, props.fieldList),
       effects() {
         onFieldValueChange("*", (field) => {
           const fieldKey = field.props.name.toString();
+          console.log("emitChange");
           emit("formChange", {
             fieldInstance: field,
             fieldKey,
@@ -60,12 +62,15 @@ var script = /* @__PURE__ */ defineComponent({
       }
     });
     const SchemaField = injectOrProvide(InjectionSchemaField, () => createSchemaField({
-      components: { ...index, ...props.components },
+      components: {
+        ...index,
+        ...props.components
+      },
       scope: props.scope
     }).SchemaField);
     const { traverse } = useFieldVisitor();
     const { transform } = useFieldList2Schema(businessCollector);
-    const renderSchema = computed(() => {
+    const parsedSchema = computed(() => {
       if (props.schema) {
         return props.schema;
       }
@@ -103,7 +108,7 @@ var script = /* @__PURE__ */ defineComponent({
           createVNode(unref(FormProvider), { form: unref(formModel) }, {
             default: withCtx(() => [
               renderSlot(_ctx.$slots, "default", { schemaFiled: unref(SchemaField) }, () => [
-                createVNode(unref(SchemaField), { schema: unref(renderSchema) }, null, 8, ["schema"])
+                createVNode(unref(SchemaField), { schema: unref(parsedSchema) }, null, 8, ["schema"])
               ]),
               __props.consumer ? (openBlock(), createBlock(unref(FormConsumer), { key: 0 }, {
                 default: withCtx(({ form }) => [

package/es/packages/form-render/src/hooks/index.d.ts

@@ -9,3 +9,4 @@ export * from './useFormValidator';
 export * from './useBusinessBinding';
 export * from './useChangeContext';
 export * from './useFormItemDeps';
+export * from './useInitialData';

package/es/packages/form-render/src/hooks/index.js

@@ -9,3 +9,4 @@ export { useFormValidator } from './useFormValidator.js';
 export { BusinessCollector, useBusinessBinding } from './useBusinessBinding.js';
 export { ContextCollector, useChangeContext } from './useChangeContext.js';
 export { FormItemDepsCollector, useFormItemDeps } from './useFormItemDeps.js';
+export { useInitialData } from './useInitialData.js';

package/es/packages/form-render/src/hooks/useInitialData.d.ts

@@ -0,0 +1,5 @@
+import { AnyObject } from '../../../../../es/src/types';
+import { FieldItem } from '../../../../../es/packages/form-render';
+export declare function useInitialData(): {
+    assignInitialData: (initialData?: AnyObject, fieldList?: FieldItem[]) => AnyObject;
+};

package/es/packages/form-render/src/hooks/useInitialData.js

@@ -0,0 +1,11 @@
+function useInitialData() {
+  function assignInitialData(initialData, fieldList) {
+    return Object.assign({}, initialData, fieldList == null ? void 0 : fieldList.reduce((fin, cur) => {
+      cur.default_val && (fin[cur.val_key] = cur.default_val);
+      return fin;
+    }, {}));
+  }
+  return { assignInitialData };
+}
+
+export { useInitialData };

package/es/packages/index.css

@@ -1557,6 +1557,12 @@ body > .vxe-table--tooltip-wrapper {
   max-width: 300px;
   border-bottom: 1px solid #d9d9d9;
 }
+.c-choice-wrap .choose-other {
+  flex: 1;
+}
+.c-choice-wrap .other-span {
+  word-break: break-all;
+}
 .c-choice-wrap.choice-wrap-1 label {
   width: 100%;
 }
@@ -1636,6 +1642,9 @@ body > .vxe-table--tooltip-wrapper {
 .c-scale .scale-container.scale-container-nopadding {
   height: 100%;
 }
+.c-scale .scale-container.scale-container-hasfooter {
+  height: calc(100% - 50px);
+}
 .c-scale .scale-container::-webkit-scrollbar {
   width: 10px;
   height: 6px;
@@ -1673,7 +1682,6 @@ body > .vxe-table--tooltip-wrapper {
   width: 100%;
 }
 .main {
-  padding: 0 16px;
   box-sizing: border-box;
 }
 .main .scale-label-required {
@@ -1708,12 +1716,13 @@ body > .vxe-table--tooltip-wrapper {
   position: absolute;
   bottom: 0;
   left: 0;
+  display: flex;
+  align-items: center;
   width: 100%;
-  border-top: 1px solid #e8e8e8;
-  padding-top: 12px;
   height: 50px;
-  box-sizing: border-box;
   background: #fff;
+  box-sizing: border-box;
+  border-top: 1px solid #e8e8e8;
 }
 .footer .n-button + .n-button {
   margin-left: 8px;

package/es/packages/index.js

@@ -43,6 +43,7 @@ export { useFormValidator } from './form-render/src/hooks/useFormValidator.js';
 export { BusinessCollector, useBusinessBinding } from './form-render/src/hooks/useBusinessBinding.js';
 export { ContextCollector, useChangeContext } from './form-render/src/hooks/useChangeContext.js';
 export { FormItemDepsCollector, useFormItemDeps } from './form-render/src/hooks/useFormItemDeps.js';
+export { useInitialData } from './form-render/src/hooks/useInitialData.js';
 
 const components = {
   CGrid: Grid,

package/es/packages/scale-view/src/ScaleView.vue_vue_type_script_setup_true_lang.js

@@ -192,6 +192,10 @@ var script = /* @__PURE__ */ defineComponent({
           isSetObj && (state.choiceComObj[item.val_key] = choiceObj);
           nextLogicEvent(val, item, state.formArray);
           break;
+        case "EVALUATE_RADIO_BLOCK":
+        case "EVALUATE_CHECKBOX_BLOCK":
+          nextLogicEvent(val, item, state.formArray);
+          break;
         case "DATE":
         case "TIME":
         case "DATETIME":
@@ -313,7 +317,7 @@ var script = /* @__PURE__ */ defineComponent({
                 ref: countdownDom
               }, unref(evaluateCountdownProps), { onCloseEvaluateCountdown: closeEvaluateCountdown }), null, 16)) : createCommentVNode("v-if", true),
               createElementVNode("div", {
-                class: normalizeClass(["scale-container", { "scale-container-nopadding": unref(handlePageClass) }]),
+                class: normalizeClass(["scale-container", { "scale-container-nopadding": unref(handlePageClass), "scale-container-hasfooter": unref(showSaveBtn) }]),
                 style: normalizeStyle(unref(scaleStyle))
               }, [
                 unref(hasScore) ? (openBlock(), createBlock(unref(ScaleScore), {
@@ -386,7 +390,7 @@ var script = /* @__PURE__ */ defineComponent({
                   key: 0,
                   onClick: onSubmit,
                   disabled: state.banSubmit,
-                  type: "info"
+                  type: "primary"
                 }, {
                   default: withCtx(() => [
                     _hoisted_8

package/es/packages/scale-view/src/components/composables/choose-common.d.ts

@@ -7,4 +7,5 @@ export default function (props: any, state: any): {
     showPreSuffix: import("vue").ComputedRef<(o: any) => any>;
     handleDefPreSuffix: (v: any, i: number, curValue: any, isCheckbox?: boolean, hasOther?: boolean) => any;
     handleOptions: (options: any) => any;
+    stopClick: (e: any) => void;
 };

package/es/packages/scale-view/src/components/composables/choose-common.js

@@ -63,6 +63,10 @@ function chooseCommon(props, state) {
       return null;
     }).filter(Boolean) || [];
   };
+  const stopClick = (e) => {
+    e.preventDefault();
+    e.stopPropagation();
+  };
   return {
     choiceUseKey,
     choiceColor,
@@ -71,7 +75,8 @@ function chooseCommon(props, state) {
     isCheckboxItem,
     showPreSuffix,
     handleDefPreSuffix,
-    handleOptions
+    handleOptions,
+    stopClick
   };
 }
 

package/es/packages/scale-view/src/components/formitem/r-checkbox.js

@@ -52,7 +52,8 @@ var scriptCheckbox = defineComponent({
       choiceUseKey,
       isCheckboxItem,
       showPreSuffix,
-      handleOptions
+      handleOptions,
+      stopClick
     } = chooseCommon(props, state);
     const chooseStyleSetting = ((_b = (_a = props.item) == null ? void 0 : _a.setting) == null ? void 0 : _b.chooseStyleSetting) || 1;
     const handlePreview = (e, url) => {
@@ -206,7 +207,8 @@ var scriptCheckbox = defineComponent({
     };
     const renderPresuffix = (o, i) => {
       return createVNode("div", {
-        "class": "presuffix-wrap"
+        "class": "presuffix-wrap",
+        "onClick": stopClick
       }, [o.prefix && createVNode("span", {
         "class": "prefix-span",
         "style": {
@@ -233,11 +235,15 @@ var scriptCheckbox = defineComponent({
       return createVNode("span", {
         "style": {
           color: choiceColor.value(o)
-        }
+        },
+        "class": "other-span"
       }, [o.label]);
     };
     const renderOther = (o) => {
-      return createVNode(resolveComponent("n-input"), {
+      return createVNode("div", {
+        "class": "choose-other",
+        "onClick": stopClick
+      }, [createVNode(resolveComponent("n-input"), {
         "value": state.othersText,
         "onUpdate:value": [($event) => state.othersText = $event, () => handleCheckboxOther(true)],
         "disabled": props.isLock || props.inputLock,
@@ -246,7 +252,7 @@ var scriptCheckbox = defineComponent({
         },
         "placeholder": "\u8BF7\u8F93\u5165",
         "bordered": false
-      }, null);
+      }, null)]);
     };
     const hasPreSuffix = (o) => {
       return isCheckboxItem.value && showPreSuffix.value(o);

package/es/packages/scale-view/src/components/formitem/r-radio.js

@@ -51,7 +51,8 @@ var scriptRadio = defineComponent({
       choiceUseKey,
       isRadioItem,
       showPreSuffix,
-      handleOptions
+      handleOptions,
+      stopClick
     } = chooseCommon(props, state);
     const chooseStyleSetting = ((_b = (_a = props.item) == null ? void 0 : _a.setting) == null ? void 0 : _b.chooseStyleSetting) || 1;
     const handlePreview = (e, url) => {
@@ -125,7 +126,8 @@ var scriptRadio = defineComponent({
     }, {
       immediate: true
     });
-    const inputPreSuffixChange = (o, i) => {
+    const inputPreSuffixChange = (val, o, i) => {
+      state.optionsPreSuffixObj[o.key] = val;
       state.curvalue = o.key;
       let choiceObj = {
         othersText: state.othersText,
@@ -165,7 +167,8 @@ var scriptRadio = defineComponent({
     };
     const renderPresuffix = (o, i) => {
       return createVNode("div", {
-        "class": "presuffix-wrap"
+        "class": "presuffix-wrap",
+        "onClick": stopClick
       }, [o.prefix && createVNode("span", {
         "class": "prefix-span",
         "style": {
@@ -180,7 +183,7 @@ var scriptRadio = defineComponent({
         },
         "placeholder": "\u8BF7\u8F93\u5165",
         "bordered": false,
-        "onInput": () => inputPreSuffixChange(o)
+        "on-update:value": (val) => inputPreSuffixChange(val, o)
       }, null), o.suffix && createVNode("span", {
         "class": "suffix-span",
         "style": {
@@ -192,11 +195,15 @@ var scriptRadio = defineComponent({
       return createVNode("span", {
         "style": {
           color: choiceColor.value(o)
-        }
+        },
+        "class": "other-span"
       }, [o.label]);
     };
     const renderOther = (o) => {
-      return createVNode(resolveComponent("n-input"), {
+      return createVNode("div", {
+        "class": "choose-other",
+        "onClick": stopClick
+      }, [createVNode(resolveComponent("n-input"), {
         "value": state.othersText,
         "onUpdate:value": [($event) => state.othersText = $event, inputChange],
         "disabled": props.isLock || props.inputLock,
@@ -205,7 +212,7 @@ var scriptRadio = defineComponent({
         },
         "placeholder": "\u8BF7\u8F93\u5165",
         "bordered": false
-      }, null);
+      }, null)]);
     };
     const hasPreSuffix = (o) => {
       return isRadioItem.value && showPreSuffix.value(o);

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

@@ -127,7 +127,9 @@ const ScaleViewInit = (props, state, emit, config) => {
     list = list.filter((v) => !filterArr.includes(v.type));
     state.formArray = formatArray(list || []);
     state.form = defaultFormValue(state.formArray);
-    state.rules = formatRules(state.formArray);
+    if (!props.noBtn) {
+      state.rules = formatRules(state.formArray);
+    }
     state.fontSize = data.fontSize;
     state.spinning = false;
     state.hasFrontAddress = false;

package/es/packages/scale-view/style/index.css

@@ -54,6 +54,12 @@
   max-width: 300px;
   border-bottom: 1px solid #d9d9d9;
 }
+.c-choice-wrap .choose-other {
+  flex: 1;
+}
+.c-choice-wrap .other-span {
+  word-break: break-all;
+}
 .c-choice-wrap.choice-wrap-1 label {
   width: 100%;
 }
@@ -133,6 +139,9 @@
 .c-scale .scale-container.scale-container-nopadding {
   height: 100%;
 }
+.c-scale .scale-container.scale-container-hasfooter {
+  height: calc(100% - 50px);
+}
 .c-scale .scale-container::-webkit-scrollbar {
   width: 10px;
   height: 6px;
@@ -170,7 +179,6 @@
   width: 100%;
 }
 .main {
-  padding: 0 16px;
   box-sizing: border-box;
 }
 .main .scale-label-required {
@@ -205,12 +213,13 @@
   position: absolute;
   bottom: 0;
   left: 0;
+  display: flex;
+  align-items: center;
   width: 100%;
-  border-top: 1px solid #e8e8e8;
-  padding-top: 12px;
   height: 50px;
-  box-sizing: border-box;
   background: #fff;
+  box-sizing: border-box;
+  border-top: 1px solid #e8e8e8;
 }
 .footer .n-button + .n-button {
   margin-left: 8px;

package/es/packages/select-label/src/LabelFormContent.vue_vue_type_script_setup_true_lang.js

@@ -326,7 +326,6 @@ var script = /* @__PURE__ */ defineComponent({
     return (_ctx, _cache) => {
       return openBlock(), createElementBlock("div", {
         class: "c-label-form-content",
-        key: unref(theKey),
         ref_key: "labelFormContent",
         ref: labelFormContent
       }, [
@@ -434,7 +433,7 @@ var script = /* @__PURE__ */ defineComponent({
         ], 512), [
           [vShow, !unref(allDisable)]
         ])
-      ]);
+      ], 512);
     };
   }
 });

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cnhis-design-vue",
   "private": false,
-  "version": "3.1.9-beta.12",
+  "version": "3.1.9-beta.13",
   "license": "ISC",
   "module": "es/packages/index.js",
   "main": "es/packages/index.js",
@@ -32,7 +32,6 @@
     "@formily/core": "^2.1.9",
     "@formily/vue": "^2.1.9",
     "@highlightjs/vue-plugin": "^2.1.0",
-    "@types/fabric": "^4.5.9",
     "@vicons/ionicons5": "^0.12.0",
     "@vueuse/core": "^8.6.0",
     "@vueuse/shared": "^8.6.0",
@@ -41,9 +40,7 @@
     "axios": "^0.27.2",
     "babel-preset-typescript": "7.0.0-alpha.19",
     "bpmn-js": "^9.2.2",
-    "canvas": "^2.9.3",
     "crypto-js": "^4.1.1",
-    "fabric": "^5.2.1",
     "highlight.js": "^11.5.1",
     "lodash": "^4.17.21",
     "lodash-es": "^4.17.21",

package/es/packages/bpmn-workflow/src/BpmnWorkflow.d.js

@@ -1 +0,0 @@
-

package/es/packages/bpmn-workflow/types/BpmnViewer.d.js

@@ -1 +0,0 @@
-

package/es/packages/bpmn-workflow/types/ModelingModule.d.js

@@ -1 +0,0 @@
-

package/es/packages/bpmn-workflow/types/MoveCanvasModule.d.js

@@ -1 +0,0 @@
-

package/es/packages/fabric-chart/src/Center.js

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

package/es/packages/fabric-chart/src/Center.vue.d.ts

@@ -1,2 +0,0 @@
-declare const _default: import("vue").DefineComponent<{}, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, import("vue").EmitsOptions, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{}>>, {}>;
-export default _default;

package/es/packages/fabric-chart/src/Center.vue_vue_type_script_setup_true_lang.js

@@ -1,15 +0,0 @@
-import { defineComponent } from 'vue';
-import useGrid from './hooks/useGrid.js';
-import { drawLine } from './hooks/useDraw.js';
-
-var script = /* @__PURE__ */ defineComponent({
-  __name: "Center",
-  setup(__props) {
-    useGrid(drawLine);
-    return (_ctx, _cache) => {
-      return null;
-    };
-  }
-});
-
-export { script as default };

package/es/packages/fabric-chart/src/Top.js

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

package/es/packages/fabric-chart/src/Top.vue_vue_type_script_setup_true_lang.js

@@ -1,128 +0,0 @@
-import { defineComponent, inject, onMounted, nextTick } from 'vue';
-import { fabric } from 'fabric';
-import { defaultStyle, drawTextGroup, defaultTextStyle, defaultRectStyle } from './hooks/useDraw.js';
-import { InjectionCanvas, InjectionPropItems } from './interface.js';
-
-var script = /* @__PURE__ */ defineComponent({
-  __name: "Top",
-  setup(__props) {
-    const canvas = inject(InjectionCanvas);
-    const propItems = inject(InjectionPropItems);
-    const { originY, grid, originX, xCellWidth, gridXNumber, top } = propItems;
-    function drawTop() {
-      let list = [];
-      drawTopDate(top, list);
-      drawTopDay(top, list);
-      drawTopTime(top, list);
-      const group = list.length > 0 ? new fabric.Group([...list], { ...defaultStyle }) : null;
-      group && group.sendToBack();
-      group && canvas.value.add(group);
-    }
-    function drawTopTime(top2, list) {
-      var _a, _b;
-      const dateHeight = ((_a = top2.date) == null ? void 0 : _a.height) || 0;
-      const dayHeight = top2.dayHeight || 0;
-      const height = originY - dateHeight - dayHeight;
-      const titleHeight = dayHeight + height;
-      const title = drawTextGroup({
-        width: originX,
-        height: titleHeight,
-        ...defaultRectStyle
-      }, {
-        ...defaultTextStyle,
-        ...((_b = top2.date) == null ? void 0 : _b.style) || {}
-      }, {
-        left: 0,
-        top: dateHeight
-      }, top2.xScalevalue.title);
-      list.push(title);
-      let timeList = [];
-      for (let j = 0; j < grid.mainXCell; j++) {
-        timeList.push(top2.xScalevalue.list);
-      }
-      timeList.flat().forEach((v, i) => {
-        var _a2;
-        const left = originX + i * xCellWidth;
-        const textGroup = drawTextGroup({
-          width: xCellWidth,
-          height
-        }, {
-          ...defaultTextStyle,
-          ...((_a2 = top2.date) == null ? void 0 : _a2.style) || {}
-        }, {
-          left,
-          top: dateHeight + dayHeight
-        }, v);
-        list.push(textGroup);
-      });
-    }
-    function drawTopDay(top2, list) {
-      var _a;
-      if (!top2.dayHeight)
-        return false;
-      const height = top2.dayHeight;
-      const width = xCellWidth * grid.subSecondXCell;
-      const dayList = gridXNumber / grid.subSecondXCell;
-      for (let i = 0; i < dayList; i++) {
-        const left = originX + i * width;
-        const value = i % 2 === 0 ? "\u4E0A\u5348" : "\u4E0B\u5348";
-        const textGroup = drawTextGroup({
-          width,
-          height
-        }, {
-          ...defaultTextStyle,
-          ...((_a = top2.date) == null ? void 0 : _a.style) || {}
-        }, {
-          left,
-          top: top2.date.height || 0
-        }, value);
-        list.push(textGroup);
-      }
-    }
-    function drawTopDate(top2, list) {
-      var _a;
-      if (!top2.date.height)
-        return false;
-      const height = top2.date.height;
-      const title = drawTextGroup({
-        width: originX,
-        height,
-        ...defaultRectStyle
-      }, {
-        ...defaultTextStyle,
-        ...((_a = top2.date) == null ? void 0 : _a.style) || {}
-      }, {
-        left: 0,
-        top: 0
-      }, top2.date.title);
-      list.push(title);
-      const width = xCellWidth * grid.subXCell;
-      top2.date.list.forEach((v, i) => {
-        var _a2;
-        const left = originX + i * width;
-        const textGroup = drawTextGroup({
-          width,
-          height
-        }, {
-          ...defaultTextStyle,
-          ...((_a2 = top2.date) == null ? void 0 : _a2.style) || {}
-        }, {
-          left,
-          top: 0
-        }, v);
-        list.push(textGroup);
-      });
-    }
-    onMounted(() => {
-      nextTick(() => {
-        drawTop();
-        canvas.value.renderAll();
-      });
-    });
-    return (_ctx, _cache) => {
-      return null;
-    };
-  }
-});
-
-export { script as default };