cnhis-design-vue 3.1.18-beta.3 → 3.1.18-beta.6

package/es/components/big-table/index.js

@@ -1,7 +1,7 @@
 import { COMPONENT_NAMESPACE } from '../../shared/global/variable.js';
 import { safeComponentRegister } from '../../shared/utils/index.js';
 import { loadVxeTable } from '../../shared/utils/loadVxe.js';
-import '../../shared/utils/utilExpand.js';
+import { expandXEUtils } from '../../shared/utils/utilExpand.js';
 import '../index.js';
 import script from './src/BigTable.js';
 export { useColumnConfigAdaptor } from './src/hooks/useColumnConfigAdaptor.js';
@@ -12,6 +12,7 @@ BigTable.install = function(app) {
   safeComponentRegister(app, BigTable, COMPONENT_NAMESPACE + "BigTable");
   safeComponentRegister(app, Grid, COMPONENT_NAMESPACE + "Grid");
   loadVxeTable(app);
+  return expandXEUtils();
 };
 
 export { BigTable as default };

package/es/components/big-table/src/BigTable.vue.d.ts

@@ -1247,9 +1247,7 @@ declare const _default: import("vue").DefineComponent<{
                 textColorTextHoverPrimary: string;
                 textColorTextPressedPrimary: string;
                 textColorTextFocusPrimary: string;
-                textColorTextDisabledPrimary: string; /**
-                 * tsx渲染表格
-                 */
+                textColorTextDisabledPrimary: string;
                 textColorGhostPrimary: string;
                 textColorGhostHoverPrimary: string;
                 textColorGhostPressedPrimary: string;
@@ -1328,7 +1326,6 @@ declare const _default: import("vue").DefineComponent<{
                 textColorTextPressedWarning: string;
                 textColorTextFocusWarning: string;
                 textColorTextDisabledWarning: string;
-                /** string */
                 textColorGhostWarning: string;
                 textColorGhostHoverWarning: string;
                 textColorGhostPressedWarning: string;

package/es/components/big-table/src/BigTable.vue_vue_type_script_setup_true_lang.js

@@ -1318,8 +1318,15 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
     };
     const handlerClickRow = (data) => {
       var _a;
-      if (((_a = attr.checkboxConfig) == null ? void 0 : _a.trigger) === "default")
+      let {
+        row,
+        $event = {},
+        $rowIndex
+      } = data;
+      if (((_a = attr.checkboxConfig) == null ? void 0 : _a.trigger) === "default") {
+        emit("handlerClickRow", row, $rowIndex);
         return false;
+      }
       if (isScanMultiTable.value || props.isInlineOperating)
         return false;
       if (XEUtils.has(data == null ? void 0 : data.row, GROUP_TITLE_KEY))
@@ -1328,11 +1335,6 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
         return false;
       let table = xGrid.value;
       isAboutNestTable.value && emit("resetNestLastClickTable", table);
-      let {
-        row,
-        $event = {},
-        $rowIndex
-      } = data;
       let {
         className,
         tagName

package/es/components/field-set/src/FieldSet.js

@@ -36,15 +36,15 @@ const _hoisted_18 = /* @__PURE__ */ createElementVNode("span", {
 const _hoisted_19 = /* @__PURE__ */ createElementVNode("span", null, "\u62D6\u62FD\u8C03\u6574\u987A\u5E8F", -1);
 const _hoisted_20 = /* @__PURE__ */ createElementVNode("span", { style: { "width": "14px", "margin-right": "6px" } }, null, -1);
 const _hoisted_21 = { class: "width-show" };
-const _hoisted_22 = { class: "width-show" };
-const _hoisted_23 = {
+const _hoisted_22 = {
   key: 0,
   class: "width-show"
 };
-const _hoisted_24 = {
+const _hoisted_23 = {
   key: 1,
   class: "width-show"
 };
+const _hoisted_24 = { class: "width-show" };
 const _hoisted_25 = { class: "width-showed" };
 const _hoisted_26 = { class: "width-word" };
 const _hoisted_27 = { class: "width-showed" };
@@ -86,7 +86,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       columnName: "name",
       isShow: "show",
       isSort: "sort",
-      isFixed: "fixedShow",
+      isFixed: "fixedWay",
       colWidth: "columnWidth"
     };
     const selectOptions = [
@@ -110,11 +110,18 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         result.forEach((item) => {
           if (props.type == "old") {
             if (Reflect.has(item, key)) {
-              item[fieldsMapping[key]] = item[key];
+              if (key == "isFixed") {
+                item["fixedWay"] = item[key] == 1 ? "LEFT" : item[key] == 2 ? "RIGHT" : "NONE";
+              } else {
+                item[fieldsMapping[key]] = item[key];
+              }
               Reflect.deleteProperty(item, key);
             }
           }
-          item.columnWidth = Number(item.columnWidth);
+          item.columnWidth = +item.columnWidth;
+          if (!Reflect.has(item, "alias")) {
+            item.alias = "";
+          }
         });
       });
       return result;
@@ -151,7 +158,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
               visible: item.show,
               sequence: i,
               sortable: item.sort,
-              title: item.alias || item.title,
+              title: item.alias,
               fixed: item.fixedWay,
               minWidth: item.columnWidth,
               ...props.isEdit ? {
@@ -317,18 +324,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                             [vShow, element.id != "0001"]
                           ])
                         ]),
-                        createCommentVNode(" \u6392\u5E8F "),
-                        createElementVNode("span", _hoisted_22, [
-                          withDirectives(createVNode(unref(NCheckbox), {
-                            checked: element.sort,
-                            "onUpdate:checked": ($event) => element.sort = $event,
-                            disabled: element.notParticipatingSort == 1
-                          }, null, 8, ["checked", "onUpdate:checked", "disabled"]), [
-                            [vShow, element.id != "0001"]
-                          ])
-                        ]),
                         createCommentVNode(" \u662F\u5426\u53EF\u7F16\u8F91 "),
-                        __props.isEdit ? (openBlock(), createElementBlock("span", _hoisted_23, [
+                        __props.isEdit ? (openBlock(), createElementBlock("span", _hoisted_22, [
                           withDirectives(createVNode(unref(NCheckbox), {
                             checked: element.editable,
                             "onUpdate:checked": ($event) => element.editable = $event
@@ -337,7 +334,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                           ])
                         ])) : createCommentVNode("v-if", true),
                         createCommentVNode(" \u662F\u5426\u5FC5\u586B "),
-                        __props.isEdit ? (openBlock(), createElementBlock("span", _hoisted_24, [
+                        __props.isEdit ? (openBlock(), createElementBlock("span", _hoisted_23, [
                           withDirectives(createVNode(unref(NCheckbox), {
                             checked: element.required,
                             "onUpdate:checked": ($event) => element.required = $event
@@ -345,6 +342,16 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                             [vShow, element.id != "0001"]
                           ])
                         ])) : createCommentVNode("v-if", true),
+                        createCommentVNode(" \u6392\u5E8F "),
+                        createElementVNode("span", _hoisted_24, [
+                          withDirectives(createVNode(unref(NCheckbox), {
+                            checked: element.sort,
+                            "onUpdate:checked": ($event) => element.sort = $event,
+                            disabled: element.notParticipatingSort == 1
+                          }, null, 8, ["checked", "onUpdate:checked", "disabled"]), [
+                            [vShow, element.id != "0001"]
+                          ])
+                        ]),
                         createCommentVNode(" \u56FA\u5B9A "),
                         createElementVNode("span", _hoisted_25, [
                           createVNode(unref(NSelect), {

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

@@ -14,7 +14,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
   setup(__props) {
     const props = __props;
     const currentActiveEditField = inject(InjectionActiveFieldItem);
-    function active() {
+    function setActiveField() {
       currentActiveEditField.value = props.fieldItem;
     }
     const classList = computed(() => {
@@ -35,7 +35,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         secondary: !unref(disabled),
         dashed: unref(disabled)
       }, unref(bindHover)(__props.fieldItem), {
-        onClick: withModifiers(active, ["stop"]),
+        onClick: withModifiers(setActiveField, ["stop"]),
         class: unref(classList)
       }), {
         default: withCtx(() => [

package/es/components/form-config/src/components/renderer/DefaultNode.vue.d.ts

@@ -24,7 +24,7 @@ declare const _default: import("vue").DefineComponent<{
         [x: `on${string}`]: ((...args: any[]) => any) | ((...args: unknown[]) => any) | undefined;
     }>>;
     currentActiveEditField: import("vue").Ref<import("../../../../../shared/types").UndefinedAble<FormConfigItem>>;
-    active: () => void;
+    setActiveField: () => void;
     classList: import("vue").ComputedRef<(string | {
         'is-active': boolean;
     })[]>;

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

@@ -1,5 +1,5 @@
 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 { createForm, onFieldValueChange } from '@formily/core';
 import { FormProvider, FormConsumer } from '@formily/vue';
 import { isObject } from '@vue/shared';
 import { cloneDeep, isArray } from 'lodash-es';
@@ -146,17 +146,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         formModel.setFieldState(path, handler);
       },
       resetFields(path = "*") {
-        formModel.setFieldState(path, (field) => {
-          var _a;
-          if (isField(field)) {
-            field.modified = false;
-            field.visited = false;
-            field.feedbacks = [];
-            field.selfModified = false;
-            field.caches = {};
-            field.value = (_a = field.initialValue) != null ? _a : null;
-          }
-        });
+        formModel.reset(path);
       },
       async queryWidget(key) {
         return scrollbarRef.value ? await queryWidget(key, scrollbarRef.value, props.fieldList || []) : null;

package/es/components/form-render/src/components/renderer/cascader.js

@@ -8,7 +8,7 @@ import '../../../index.js';
 import '@formily/path';
 import '@vue/shared';
 import 'date-fns';
-import { assignUpdateValue, traverseDependKey } from '../../utils/schema.js';
+import { assignUpdateValue, assignValueBindKey, traverseDependKey } from '../../utils/schema.js';
 import { useFormField } from '../../hooks/useFormField.js';
 import '../../../../../shared/utils/tapable/SyncHook.js';
 import '../../../../../shared/utils/tapable/SyncBailHook.js';
@@ -203,6 +203,6 @@ const script = defineComponent({
 });
 const SEARCH_CASCADE = connect(script, mapProps({
   dataSource: "options"
-}, assignUpdateValue));
+}, assignUpdateValue, assignValueBindKey));
 
 export { SEARCH_CASCADE };

package/es/components/form-render/src/components/renderer/checkbox.js

@@ -3,7 +3,7 @@ import '@formily/path';
 import '@vue/shared';
 import 'lodash-es';
 import 'date-fns';
-import { assignUpdateValue } from '../../utils/schema.js';
+import { assignUpdateValue, assignValueBindKey } from '../../utils/schema.js';
 import { connect, mapProps } from '@formily/vue';
 import { NCheckboxGroup, NSpace, NCheckbox } from 'naive-ui';
 
@@ -40,6 +40,6 @@ const script = defineComponent({
 });
 const CHECKBOX = connect(script, mapProps({
   dataSource: "options"
-}, assignUpdateValue));
+}, assignUpdateValue, assignValueBindKey));
 
 export { CHECKBOX };

package/es/components/form-render/src/components/renderer/date.js

@@ -8,7 +8,7 @@ import { useCommonInjection } from '../../hooks/useCommonInjection.js';
 import '@formily/path';
 import '@vue/shared';
 import 'lodash-es';
-import { assignUpdateValue } from '../../utils/schema.js';
+import { assignUpdateValue, assignValueBindKey } from '../../utils/schema.js';
 
 const script = defineComponent({
   props: {
@@ -112,6 +112,6 @@ const script = defineComponent({
     }), null);
   }
 });
-const DATE = connect(script, mapProps(assignUpdateValue));
+const DATE = connect(script, mapProps(assignUpdateValue, assignValueBindKey));
 
 export { DATE };

package/es/components/form-render/src/components/renderer/input.d.ts

@@ -1,15 +1,23 @@
 export declare const INPUT: import("vue").DefineComponent<{
+    value: {
+        type: StringConstructor;
+    };
     prefix: {
         type: StringConstructor;
     };
     suffix: {
         type: StringConstructor;
     };
-}, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+}, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, "update:value"[], "update:value", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+    value: {
+        type: StringConstructor;
+    };
     prefix: {
         type: StringConstructor;
     };
     suffix: {
         type: StringConstructor;
     };
-}>>, {}>;
+}>> & {
+    "onUpdate:value"?: ((...args: any[]) => any) | undefined;
+}, {}>;

package/es/components/form-render/src/components/renderer/input.js

@@ -1,4 +1,5 @@
-import { defineComponent, createVNode } from 'vue';
+import { defineComponent, computed, createVNode } from 'vue';
+import { useCommonInjection } from '../../hooks/useCommonInjection.js';
 import { createInputSlot } from '../../utils/index.js';
 import { connect, mapProps } from '@formily/vue';
 import { NInput } from 'naive-ui';
@@ -7,6 +8,9 @@ import { assignUpdateValue } from '../../utils/schema.js';
 const script = defineComponent({
   name: "FormInput",
   props: {
+    value: {
+      type: String
+    },
     prefix: {
       type: String
     },
@@ -14,10 +18,22 @@ const script = defineComponent({
       type: String
     }
   },
-  setup(props) {
+  emits: ["update:value"],
+  setup(props, {
+    emit
+  }) {
+    const valueRef = computed({
+      get: () => props.value,
+      set: (v) => emit("update:value", v)
+    });
+    const key = useCommonInjection().injectValueBindKey(valueRef);
     const _slots = createInputSlot(props);
     return () => {
-      return createVNode(NInput, null, _slots.value);
+      return createVNode(NInput, {
+        "key": key.value,
+        "value": valueRef.value,
+        "onUpdate:value": ($event) => valueRef.value = $event
+      }, _slots.value);
     };
   }
 });

package/es/components/form-render/src/components/renderer/inputNumber.js

@@ -39,8 +39,10 @@ const script = defineComponent({
         return (_a = props.onChange) == null ? void 0 : _a.call(props, v);
       }
     });
+    const key = useCommonInjection().injectValueBindKey(valueRef);
     return () => {
       return createVNode(NInputNumber, {
+        "key": key.value,
         "value": valueRef.value,
         "onUpdate:value": ($event) => valueRef.value = $event,
         "show-button": false

package/es/components/form-render/src/components/renderer/radio.js

@@ -5,7 +5,7 @@ import { NRadioGroup, NSpace, NRadio } from 'naive-ui';
 import '@formily/path';
 import '@vue/shared';
 import 'date-fns';
-import { assignUpdateValue } from '../../utils/schema.js';
+import { assignUpdateValue, assignValueBindKey } from '../../utils/schema.js';
 
 const script = defineComponent({
   props: {
@@ -64,6 +64,6 @@ const script = defineComponent({
 });
 const RADIO = connect(script, mapProps({
   dataSource: "options"
-}, assignUpdateValue));
+}, assignUpdateValue, assignValueBindKey));
 
 export { RADIO };

package/es/components/form-render/src/components/renderer/select.js

@@ -37,7 +37,7 @@ import './slider.js';
 import './complex.js';
 import './simpleComponent.js';
 import { NSelect } from 'naive-ui';
-import { assignUpdateValue, traverseDependKey } from '../../utils/schema.js';
+import { assignUpdateValue, assignValueBindKey, traverseDependKey } from '../../utils/schema.js';
 
 const script = defineComponent({
   name: "FormSelect",
@@ -190,6 +190,6 @@ const script = defineComponent({
 });
 const SELECT = connect(script, mapProps({
   dataSource: "options"
-}, assignUpdateValue));
+}, assignUpdateValue, assignValueBindKey));
 
 export { SELECT };

package/es/components/form-render/src/components/renderer/slider.js

@@ -2,7 +2,7 @@ import { defineComponent, computed, createVNode } from 'vue';
 import { connect, mapProps } from '@formily/vue';
 import { NSlider } from 'naive-ui';
 import { parseNumberFromMaybeString } from '../../utils/index.js';
-import { assignUpdateValue } from '../../utils/schema.js';
+import { assignUpdateValue, assignValueBindKey } from '../../utils/schema.js';
 
 const script = defineComponent({
   props: {
@@ -24,7 +24,7 @@ const script = defineComponent({
     }, null);
   }
 });
-const SLIDER = connect(script, mapProps((props, field) => {
+const SLIDER = connect(script, mapProps(assignUpdateValue, (props, field) => {
   const _props = assignUpdateValue(props, field);
   if (Array.isArray(_props.option)) {
     _props.marks = _props.option.reduce((fin, option) => {
@@ -33,6 +33,6 @@ const SLIDER = connect(script, mapProps((props, field) => {
     }, {});
   }
   return _props;
-}));
+}, assignValueBindKey));
 
 export { SLIDER };

package/es/components/form-render/src/components/renderer/switch.js

@@ -4,7 +4,7 @@ import '@formily/path';
 import '@vue/shared';
 import 'lodash-es';
 import 'date-fns';
-import { assignUpdateValue } from '../../utils/schema.js';
+import { assignUpdateValue, assignValueBindKey } from '../../utils/schema.js';
 import { connect, mapProps } from '@formily/vue';
 
 const script = defineComponent({
@@ -46,6 +46,6 @@ const script = defineComponent({
     };
   }
 });
-const SWITCH = connect(script, mapProps(assignUpdateValue));
+const SWITCH = connect(script, mapProps(assignUpdateValue, assignValueBindKey));
 
 export { SWITCH };