cnhis-design-vue 3.1.17-beta.3 → 3.1.17-beta.4

package/es/packages/form-config/src/components/renderer/index.d.ts

@@ -0,0 +1,4 @@
+import CloseButton from './CloseButton.vue';
+import ComplexNode from './ComplexNode.vue';
+import DefaultNode from './DefaultNode.vue';
+export { CloseButton, ComplexNode, DefaultNode };

package/es/packages/form-config/src/components/renderer/index.js

@@ -0,0 +1,3 @@
+export { default as CloseButton } from './CloseButton.js';
+export { default as ComplexNode } from './ComplexNode.js';
+export { default as DefaultNode } from './DefaultNode.js';

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

@@ -1,3 +1,3 @@
 export * from './usePresetRenderer';
-export * from './useSortable';
+export * from './useSortalbeConfig';
 export * from './useConfigurationField';

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

@@ -1,3 +1,3 @@
 export { usePresetRenderer } from './usePresetRenderer.js';
-export { useSortable } from './useSortable.js';
+export { useSortableConfig } from './useSortalbeConfig.js';
 export { useConfigurationField } from './useConfigurationField.js';

package/es/packages/form-config/src/hooks/usePresetRenderer.js

@@ -1,7 +1,6 @@
 import { isString, isArray, isFunction } from 'lodash-es';
 import { computed } from 'vue';
-import DefaultNode from '../components/DefaultNode.js';
-import ComplexNode from '../components/ComplexNode.js';
+import { DefaultNode, ComplexNode } from '../../../../packages/form-config/src/components';
 
 function usePresetRenderer() {
   const renderDefaultNode = {

package/es/packages/form-config/src/hooks/{useSortable.d.ts → useSortalbeConfig.d.ts}

@@ -1,6 +1,6 @@
 import Sortable from 'sortablejs';
-export declare function useSortable(): {
-    commonConfig: {
+export declare function useSortableConfig(): {
+    getCommonConfig: () => {
         onMove: ({ to, from }: Sortable.SortableEvent) => void;
         onChoose: ({ target, item }: Sortable.SortableEvent) => void;
         onUnchoose: ({ from, to, target, item }: Sortable.SortableEvent) => void;

package/es/packages/form-config/src/hooks/{useSortable.js → useSortalbeConfig.js}

@@ -1,4 +1,4 @@
-function useSortable() {
+function useSortableConfig() {
   let timer = null;
   function onChoose({ target, item }) {
     timer = setTimeout(() => {
@@ -17,11 +17,11 @@ function useSortable() {
   function onMove({ to, from }) {
     prevTo == null ? void 0 : prevTo.classList.remove("is-choosing-area");
     prevTo = to;
-    from.classList.remove("is-choosing-area");
+    to !== from && from.classList.remove("is-choosing-area");
     to.classList.add("is-choosing-area");
   }
-  const commonConfig = { onMove, onChoose, onUnchoose, tag: "section", animation: "150", "item-key": "key" };
-  return { commonConfig };
+  const getCommonConfig = () => ({ onMove, onChoose, onUnchoose, tag: "section", animation: "150", "item-key": "key" });
+  return { getCommonConfig };
 }
 
-export { useSortable };
+export { useSortableConfig };

package/es/packages/form-config/src/utils/index.d.ts

@@ -1,7 +1,5 @@
-import { Func } from '../../../../../es/src/types';
 import { FormConfigItem, FormConfigWidth } from '../../../../../es/packages/form-config';
 export declare function layoutWidthEnum2Column(layoutWidthEnum: FormConfigWidth): number;
-export declare function stopModifier(fn: Func): (event: Event, ...args: unknown[]) => any;
 export declare function bindHover(fieldItem: FormConfigItem): {
     onMouseenter: () => FormConfigItem;
     onMouseleave: () => undefined;

package/es/packages/form-config/src/utils/index.js

@@ -1,4 +1,4 @@
-import { ref, withModifiers } from 'vue';
+import { ref } from 'vue';
 
 function layoutWidthEnum2Column(layoutWidthEnum) {
   const transferMap = {
@@ -14,9 +14,6 @@ function layoutWidthEnum2Column(layoutWidthEnum) {
   };
   return transferMap[layoutWidthEnum] || 12;
 }
-function stopModifier(fn) {
-  return withModifiers(fn, ["stop"]);
-}
 const hovering = ref();
 function bindHover(fieldItem) {
   return {
@@ -26,4 +23,4 @@ function bindHover(fieldItem) {
   };
 }
 
-export { bindHover, layoutWidthEnum2Column, stopModifier };
+export { bindHover, layoutWidthEnum2Column };

package/es/packages/form-config/style/index.css

@@ -7,7 +7,6 @@
   box-sizing: border-box;
   flex-shrink: 0;
   width: 200px;
-  background: white;
 }
 .form-config__materialHeader {
   display: flex;
@@ -27,13 +26,7 @@
   gap: 8px;
 }
 .form-config__materialContentItem {
-  display: flex;
-  align-items: center;
-  padding: 8px;
   cursor: move;
-  border: 1px dashed #d9d9d9;
-  box-sizing: border-box;
-  background-color: #fafafa;
   grid-column: span var(--item-column) / span var(--item-column);
 }
 .form-config__displayWrapper {
@@ -57,7 +50,6 @@
   overflow-y: auto;
   max-height: var(--max-height);
   height: fit-content;
-  background: #eeeeee;
   display: grid !important;
   grid-template-columns: repeat(24, minmax(0px, 1fr));
   gap: 8px;
@@ -71,7 +63,6 @@
   box-sizing: border-box;
   flex-shrink: 0;
   width: 240px;
-  background: white;
 }
 .form-config__configHeader {
   display: flex;
@@ -88,17 +79,18 @@
 }
 .form-config__renderer {
   cursor: move;
+  width: 100%;
+  height: 100%;
+  justify-content: flex-start;
 }
 .form-config__renderer--default {
+  width: 100%;
   display: flex;
   align-items: center;
   padding: 8px;
-  border: 1px dashed #d9d9d9;
   box-sizing: border-box;
-  background-color: #fafafa;
   user-select: none;
   position: relative;
-  width: 100%;
 }
 .form-config__renderer--complex {
   border: 1px dashed skyblue;
@@ -122,7 +114,7 @@
   display: flex;
 }
 .form-config .is-disabled {
-  background: #e5e5e5;
+  background: #e5e5e5 !important;
 }
 .form-config .is-required {
   padding-left: 16px !important;
@@ -134,20 +126,22 @@
   color: red;
 }
 .form-config .is-active {
-  color: #5585f5;
+  color: #5585f5 !important;
 }
 .form-config .is-choosing {
   box-shadow: #5585f5 0 0 0 2px !important;
+  opacity: 0.7;
 }
 .form-config .is-choosing-area {
-  background: #f0f7ff;
+  background: rgba(128, 128, 128, 0.1);
 }
-.form-config [is-hovering='true'] > .form-config__renderer--closeButton {
+.form-config [is-hovering='true'] .form-config__renderer--closeButton {
   visibility: visible;
 }
 .form-config .form-config__renderer--closeButton {
   position: absolute;
   visibility: hidden;
-  top: 12px;
+  top: 50%;
+  transform: translateY(-50%);
   right: 5px;
 }

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

@@ -1,4 +1,4 @@
-import { defineComponent, ref, computed, watch, openBlock, createBlock, unref, withCtx, createElementBlock, createVNode, isRef, Fragment, renderList, createCommentVNode, createElementVNode, normalizeStyle, renderSlot, toDisplayString, nextTick } from 'vue';
+import { defineComponent, ref, computed, watch, openBlock, createBlock, unref, withCtx, createElementBlock, createVNode, isRef, Fragment, renderList, createCommentVNode, createElementVNode, normalizeStyle, toDisplayString, nextTick } from 'vue';
 import { createForm, onFieldValueChange, isField } from '@formily/core';
 import { FormProvider, FormConsumer } from '@formily/vue';
 import { isObject } from '@vue/shared';
@@ -183,9 +183,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
               }, [
                 createVNode(unref(FormProvider), { form: unref(formModel) }, {
                   default: withCtx(() => [
-                    renderSlot(_ctx.$slots, "default", { schemaFiled: unref(SchemaField) }, () => [
-                      createVNode(unref(SchemaField), { schema: unref(parsedSchema) }, null, 8, ["schema"])
-                    ]),
+                    createVNode(unref(SchemaField), { schema: unref(parsedSchema) }, null, 8, ["schema"]),
                     __props.consumer ? (openBlock(), createBlock(unref(FormConsumer), { key: 0 }, {
                       default: withCtx(({ form }) => [
                         createElementVNode("div", _hoisted_2, toDisplayString(JSON.stringify(form.values, null, 2)), 1)
@@ -193,14 +191,14 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                       _: 1
                     })) : createCommentVNode("v-if", true)
                   ]),
-                  _: 3
+                  _: 1
                 }, 8, ["form"])
               ], 36)
             ]),
-            _: 3
+            _: 1
           }, 8, ["theme-overrides"])
         ]),
-        _: 3
+        _: 1
       });
     };
   }

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

@@ -228,8 +228,7 @@ function useFieldListAdaptor(collector) {
       return fin;
     }, {});
     function bindIndex(schema, idx) {
-      schema["x-index"] = idx;
-      return schema;
+      return { ...schema, "x-index": idx };
     }
     function createFieldName(fieldItem) {
       if (fieldItem.suffixConfig) {

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

@@ -28,10 +28,7 @@ function useFormContext(props, formModel) {
     }
   }));
   const SchemaField = injectOrProvide(InjectionSchemaField, () => createSchemaField({
-    components: {
-      ...components,
-      ...props.components
-    },
+    components: { ...components, ...props.components },
     scope: Object.assign({}, usePresetScope(), props.scope)
   }).SchemaField);
   const businessCollector = useBusinessBinding().create(formModel, props.businessFormatter);

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

@@ -3,6 +3,7 @@ import { DependKeyType } from '../../../../../es/packages/form-render';
 export declare class FormItemDepsCollector {
     private readonly collector;
     setDeps(key: string, dependKeys: DependKeyType, callback: Func): void;
+    getDeps(dependKey: string): Map<string, Func<any[], any>> | undefined;
     trigger(dependKey: string, payload?: unknown): void;
 }
 export declare function useFormItemDeps(): {

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

@@ -12,9 +12,12 @@ class FormItemDepsCollector {
       this.collector.set(dependKey, map);
     });
   }
+  getDeps(dependKey) {
+    return this.collector.get(dependKey);
+  }
   trigger(dependKey, payload) {
-    const map = this.collector.get(dependKey);
-    map && map.forEach((cb) => isFunction(cb) && cb(payload));
+    var _a;
+    (_a = this.getDeps(dependKey)) == null ? void 0 : _a.forEach((cb) => isFunction(cb) && cb(payload));
   }
 }
 function useFormItemDeps() {

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

@@ -4,7 +4,7 @@ import { isObject } from '@vue/shared';
 import { isNumber, isString, isFunction } from 'lodash-es';
 export { isIdCard, isMobile, parseAge2Birthday, parseAge2FromContext, parseBirthday, parseIdCard, transformDateFormat } from './business.js';
 export { queryDecorator, queryInput } from './dom.js';
-export { assignUpdateValue, createLinebarId, createObjSchema, elementIdEscape, fieldKeyEscape, getParentLinebar, traverseDependKey, traverseFieldList, traverseSchema } from './schema.js';
+export { assignUpdateValue, createLinebarId, createObjSchema, elementIdEscape, fieldKeyEscape, getParentLinebar, traverseDependKey, traverseSchema } from './schema.js';
 
 function formRenderLog(message, type = "log") {
   console[type](`[FormRender]: ${message}`);

package/es/packages/form-render/src/utils/schema.d.ts

@@ -13,7 +13,6 @@ export declare function getParentLinebar(key: string, fieldList: FieldItem[]): s
 export declare function assignUpdateValue(props: AnyObject, field: GeneralField): {
     [x: string]: any;
 };
-export declare function traverseFieldList(fieldList: FieldItem[], handler: (field: FieldItem) => void): void;
 export declare function createObjSchema(properties: Record<string, ISchema>): {
     type: string;
     properties: Record<string, import("@formily/json-schema/esm/types").Stringify<{

package/es/packages/form-render/src/utils/schema.js

@@ -79,19 +79,8 @@ function assignUpdateValue(props, field) {
   }
   return _props;
 }
-function traverseFieldList(fieldList, handler) {
-  function traverse(fieldList2) {
-    if (!isArray(fieldList2))
-      return;
-    fieldList2.forEach((field) => {
-      handler(field);
-      traverse(field.properties);
-    });
-  }
-  traverse(fieldList);
-}
 function createObjSchema(properties) {
   return { type: "object", properties };
 }
 
-export { assignUpdateValue, createLinebarId, createObjSchema, elementIdEscape, fieldKeyEscape, getParentLinebar, traverseDependKey, traverseFieldList, traverseSchema };
+export { assignUpdateValue, createLinebarId, createObjSchema, elementIdEscape, fieldKeyEscape, getParentLinebar, traverseDependKey, traverseSchema };

package/es/packages/index.css

@@ -3189,7 +3189,6 @@ body > .vxe-table--tooltip-wrapper {
   box-sizing: border-box;
   flex-shrink: 0;
   width: 200px;
-  background: white;
 }
 .form-config__materialHeader {
   display: flex;
@@ -3209,13 +3208,7 @@ body > .vxe-table--tooltip-wrapper {
   gap: 8px;
 }
 .form-config__materialContentItem {
-  display: flex;
-  align-items: center;
-  padding: 8px;
   cursor: move;
-  border: 1px dashed #d9d9d9;
-  box-sizing: border-box;
-  background-color: #fafafa;
   grid-column: span var(--item-column) / span var(--item-column);
 }
 .form-config__displayWrapper {
@@ -3239,7 +3232,6 @@ body > .vxe-table--tooltip-wrapper {
   overflow-y: auto;
   max-height: var(--max-height);
   height: fit-content;
-  background: #eeeeee;
   display: grid !important;
   grid-template-columns: repeat(24, minmax(0px, 1fr));
   gap: 8px;
@@ -3253,7 +3245,6 @@ body > .vxe-table--tooltip-wrapper {
   box-sizing: border-box;
   flex-shrink: 0;
   width: 240px;
-  background: white;
 }
 .form-config__configHeader {
   display: flex;
@@ -3270,17 +3261,18 @@ body > .vxe-table--tooltip-wrapper {
 }
 .form-config__renderer {
   cursor: move;
+  width: 100%;
+  height: 100%;
+  justify-content: flex-start;
 }
 .form-config__renderer--default {
+  width: 100%;
   display: flex;
   align-items: center;
   padding: 8px;
-  border: 1px dashed #d9d9d9;
   box-sizing: border-box;
-  background-color: #fafafa;
   user-select: none;
   position: relative;
-  width: 100%;
 }
 .form-config__renderer--complex {
   border: 1px dashed skyblue;
@@ -3304,7 +3296,7 @@ body > .vxe-table--tooltip-wrapper {
   display: flex;
 }
 .form-config .is-disabled {
-  background: #e5e5e5;
+  background: #e5e5e5 !important;
 }
 .form-config .is-required {
   padding-left: 16px !important;
@@ -3316,20 +3308,22 @@ body > .vxe-table--tooltip-wrapper {
   color: red;
 }
 .form-config .is-active {
-  color: #5585f5;
+  color: #5585f5 !important;
 }
 .form-config .is-choosing {
   box-shadow: #5585f5 0 0 0 2px !important;
+  opacity: 0.7;
 }
 .form-config .is-choosing-area {
-  background: #f0f7ff;
+  background: rgba(128, 128, 128, 0.1);
 }
-.form-config [is-hovering='true'] > .form-config__renderer--closeButton {
+.form-config [is-hovering='true'] .form-config__renderer--closeButton {
   visibility: visible;
 }
 .form-config .form-config__renderer--closeButton {
   position: absolute;
   visibility: hidden;
-  top: 12px;
+  top: 50%;
+  transform: translateY(-50%);
   right: 5px;
 }

package/es/packages/shortcut-setter/src/ShortcutSetter.js

@@ -44,7 +44,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             placeholder: shortcut.placeholder,
             operation: shortcut.operation
           },
-          elem_width: 12
+          elem_width: 6
         };
       });
       key.value++;
@@ -83,6 +83,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     });
     return (_ctx, _cache) => {
       return openBlock(), createBlock(unref(FormRender), {
+        column: 12,
         key: key.value,
         "label-placement": "left",
         "field-list": fieldList.value,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cnhis-design-vue",
   "private": false,
-  "version": "3.1.17-beta.3",
+  "version": "3.1.17-beta.4",
   "license": "ISC",
   "module": "es/packages/index.js",
   "main": "es/packages/index.js",

package/es/packages/form-config/src/components/DefaultNode.js

@@ -1,54 +0,0 @@
-import { defineComponent, inject, computed, resolveComponent, openBlock, createElementBlock, mergeProps, unref, withModifiers, createVNode, normalizeClass, withCtx, createTextVNode, toDisplayString } from 'vue';
-import { InjectionActiveFieldItem, WidgetTextMap } from '../../../../packages/form-config/src/constants';
-import { bindHover } from '../../../../packages/form-config/src/utils';
-import CloseButton from '../../../../packages/form-config/src/components/CloseButton';
-import _export_sfc from '../../../../_virtual/plugin-vue_export-helper.js';
-
-const _hoisted_1 = ["onClick"];
-const _sfc_main = /* @__PURE__ */ defineComponent({
-  __name: "DefaultNode",
-  props: {
-    fieldItem: { type: Object, required: true },
-    textFormatter: { type: Function, required: true }
-  },
-  setup(__props) {
-    const props = __props;
-    const currentActiveEditField = inject(InjectionActiveFieldItem);
-    function active() {
-      currentActiveEditField.value = props.fieldItem;
-    }
-    const classList = computed(() => {
-      return [{ "is-active": currentActiveEditField.value === props.fieldItem }, "form-config__renderer"];
-    });
-    const ellipsisClassList = computed(() => {
-      return [
-        "form-config__renderer--default",
-        { "is-required": props.fieldItem.required, "is-disabled": props.fieldItem.editable === false }
-      ];
-    });
-    function getDisplayText() {
-      const type = WidgetTextMap.get(props.fieldItem.type);
-      return props.textFormatter(props.fieldItem, `${props.fieldItem.name}${type ? `(${type})` : ""}`);
-    }
-    return (_ctx, _cache) => {
-      const _component_n_ellipsis = resolveComponent("n-ellipsis");
-      return openBlock(), createElementBlock("section", mergeProps(unref(bindHover)(__props.fieldItem), {
-        onClick: withModifiers(active, ["stop"]),
-        class: unref(classList)
-      }), [
-        createVNode(_component_n_ellipsis, {
-          class: normalizeClass(unref(ellipsisClassList))
-        }, {
-          default: withCtx(() => [
-            createTextVNode(toDisplayString(getDisplayText()), 1)
-          ]),
-          _: 1
-        }, 8, ["class"]),
-        createVNode(CloseButton, { "field-item": __props.fieldItem }, null, 8, ["field-item"])
-      ], 16, _hoisted_1);
-    };
-  }
-});
-var DefaultNode = /* @__PURE__ */ _export_sfc(_sfc_main, [["__file", "DefaultNode.vue"]]);
-
-export { DefaultNode as default };