cnhis-design-vue 3.1.11-beta.1 → 3.1.11-beta.4

package/README.md

@@ -1,23 +1,23 @@
-# Vue 3 + Typescript + Vite
-
-This template should help get you started developing with Vue 3 and Typescript in Vite. The template uses Vue 3 `<script setup>` SFCs, check out the [script setup docs](https://v3.vuejs.org/api/sfc-script-setup.html#sfc-script-setup) to learn more.
-
-## Recommended IDE Setup
-
-- [VSCode](https://code.visualstudio.com/) + [Volar](https://marketplace.visualstudio.com/items?itemName=johnsoncodehk.volar)
-
-## Type Support For `.vue` Imports in TS
-
-Since TypeScript cannot handle type information for `.vue` imports, they are shimmed to be a generic Vue component type by default. In most cases this is fine if you don't really care about component prop types outside of templates. However, if you wish to get actual prop types in `.vue` imports (for example to get props validation when using manual `h(...)` calls), you can enable Volar's `.vue` type support plugin by running `Volar: Switch TS Plugin on/off` from VSCode command palette.
-
-## 使用
-```JavaScript
-import { createApp } from "vue";
-import App from "./App.vue";
-import cui from "cnhis-design-vue";
-import "cnhis-design-vue/es/index.css";
-
-const app = createApp(App);
-app.use(cui);
-app.mount("#app");
+# Vue 3 + Typescript + Vite
+
+This template should help get you started developing with Vue 3 and Typescript in Vite. The template uses Vue 3 `<script setup>` SFCs, check out the [script setup docs](https://v3.vuejs.org/api/sfc-script-setup.html#sfc-script-setup) to learn more.
+
+## Recommended IDE Setup
+
+- [VSCode](https://code.visualstudio.com/) + [Volar](https://marketplace.visualstudio.com/items?itemName=johnsoncodehk.volar)
+
+## Type Support For `.vue` Imports in TS
+
+Since TypeScript cannot handle type information for `.vue` imports, they are shimmed to be a generic Vue component type by default. In most cases this is fine if you don't really care about component prop types outside of templates. However, if you wish to get actual prop types in `.vue` imports (for example to get props validation when using manual `h(...)` calls), you can enable Volar's `.vue` type support plugin by running `Volar: Switch TS Plugin on/off` from VSCode command palette.
+
+## 使用
+```JavaScript
+import { createApp } from "vue";
+import App from "./App.vue";
+import cui from "cnhis-design-vue";
+import "cnhis-design-vue/es/index.css";
+
+const app = createApp(App);
+app.use(cui);
+app.mount("#app");
 ```

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

@@ -975,11 +975,10 @@ var script = /* @__PURE__ */ defineComponent({
         if (index === 0) {
           return null;
         } else if (index === 1) {
-          return getFooterGroup(columns, data, props);
+          return groupText;
         }
         return null;
       });
-      console.log("\u603B\u8BA1", groupText);
       emit("setGroupText", groupText);
       state.groupText = groupText;
       return [groupColumns];
@@ -2226,6 +2225,7 @@ var script = /* @__PURE__ */ defineComponent({
         "tree-config": unref(treeConfig),
         "row-id": unref(handleRowId),
         "row-class-name": getRowClassName,
+        "cell-class-name": _ctx.columnConfig.cellClassName || null,
         "row-config": state.rowConfig,
         "show-footer": _ctx.showFooter && !props.isInlineOperating,
         "footer-method": footerMethod,
@@ -2328,7 +2328,7 @@ var script = /* @__PURE__ */ defineComponent({
           }
         })]),
         _: 3
-      }, 16, ["seq-config", "tree-config", "row-id", "row-config", "show-footer", "checkbox-config", "row-style", "edit-config", "expand-config", "keyboard-config", "edit-rules", "onScroll", "onKeydown"]), createCommentVNode(" `${refreshRow}\u6761\u66F4\u65B0` "), withDirectives(createElementVNode("div", {
+      }, 16, ["seq-config", "tree-config", "row-id", "cell-class-name", "row-config", "show-footer", "checkbox-config", "row-style", "edit-config", "expand-config", "keyboard-config", "edit-rules", "onScroll", "onKeydown"]), createCommentVNode(" `${refreshRow}\u6761\u66F4\u65B0` "), withDirectives(createElementVNode("div", {
         class: "refresh",
         onClick: hanldeClickRefresh
       }, [createVNode(unref(NIcon), {

package/es/packages/big-table/src/components/edit-form/edit-select.js

@@ -32,7 +32,9 @@ var EditSelect = defineComponent({
       options: [],
       loading: false,
       keyword: "",
-      config: {}
+      config: {
+        multiple: props.col.multiple || false
+      }
     });
     const setOptions = async () => {
       if (props.col.options) {

package/es/packages/chunk-upload/src/hooks/upload-computed.js

@@ -12,7 +12,7 @@ const UploadComputed = (props, state, config) => {
   };
   const handleProcessParams = (params, file) => {
     let res = {
-      channel,
+      channel: channel.value,
       md5: file.uniqueIdentifier,
       name: params.filename,
       chunk: params.chunkNumber - 1,
@@ -43,10 +43,12 @@ const UploadComputed = (props, state, config) => {
     };
   });
   const channel = computed(() => {
-    if (Object.keys(state.uploadConfig || {}).length === 0) {
+    let obj = state.uploadConfig;
+    if (Object.keys(obj || {}).length === 0) {
       return void 0;
     }
-    return props.uploaderType === "file" ? state.uploadConfig.fileChannel : state.uploadConfig.channel;
+    let res = props.uploaderType === "file" ? obj.fileChannel : obj.channel;
+    return res || obj.fileChannel;
   });
   const uploadArguments = computed(() => {
     return {

package/es/packages/drag-layout/src/DragLayout.vue.d.ts

@@ -101,12 +101,11 @@ declare const _default: import("vue").DefineComponent<{
             readonly default: 24;
         };
         readonly itemResponsive: BooleanConstructor;
-        readonly collapsed: BooleanConstructor;
+        readonly collapsed: BooleanConstructor; /** line 类型 */
         readonly collapsedRows: {
             readonly type: NumberConstructor;
             readonly default: 1;
         };
-        /** line 类型 */
         readonly itemStyle: import("vue").PropType<string | import("vue").CSSProperties>;
         readonly xGap: {
             readonly type: import("vue").PropType<string | number>;
@@ -15327,7 +15326,7 @@ declare const _default: import("vue").DefineComponent<{
                 dotColorActive: string;
                 dotColorDisabled: string;
                 buttonBorderColor: string;
-                buttonBorderColorActive: string;
+                buttonBorderColorActive: string; /** line 类型 */
                 buttonBorderColorHover: string;
                 buttonColor: string;
                 buttonColorActive: string;

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

@@ -393,11 +393,6 @@ declare const FormRender: SFCWithInstall<import("vue").DefineComponent<{
     onScroll: () => Promise<void>;
     updateCurrentAnchor: (id: string) => Promise<void>;
     bindTitle: (info: import("../../../es/src/types").AnyObject) => import("../../../es/src/types").AnyObject;
-    validate: () => Promise<void>;
-    getFormValues: () => {
-        [x: string]: any;
-    };
-    setFieldState: import("@formily/core").IFieldStateSetter;
     FormConsumer: import("vue").DefineComponent<{}, () => any, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, import("vue").EmitsOptions, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{}>>, {}>;
     FormProvider: import("vue").DefineComponent<Record<"form", any>, unknown, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<Record<"form", any>>>, {
         form: any;

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

@@ -393,11 +393,6 @@ declare const _default: import("vue").DefineComponent<{
     onScroll: () => Promise<void>;
     updateCurrentAnchor: (id: string) => Promise<void>;
     bindTitle: (info: AnyObject) => AnyObject;
-    validate: () => Promise<void>;
-    getFormValues: () => {
-        [x: string]: any;
-    };
-    setFieldState: import("@formily/core").IFieldStateSetter;
     FormConsumer: import("vue").DefineComponent<{}, () => any, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, import("vue").EmitsOptions, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{}>>, {}>;
     FormProvider: import("vue").DefineComponent<Record<"form", any>, unknown, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<Record<"form", any>>>, {
         form: any;

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

@@ -1,13 +1,13 @@
 import { defineComponent, computed, watch, openBlock, createBlock, unref, withCtx, createElementBlock, createVNode, Fragment, renderList, createCommentVNode, createElementVNode, normalizeStyle, renderSlot, toDisplayString } from 'vue';
-import { createForm, onFieldValueChange } from '@formily/core';
+import { createForm, onFieldValueChange, isField } from '@formily/core';
 import { FormProvider, FormConsumer } from '@formily/vue';
 import { cloneDeep } from 'lodash-es';
 import { NForm, NTabs, NTabPane } from 'naive-ui';
 import { useFormContext } from './hooks/useFormContext.js';
 import { useInitialData } from './hooks/useInitialData.js';
+import { useFieldList2Schema } from './hooks/useFieldList2Schema.js';
 import { useAnchor } from './hooks/useAnchor.js';
 import { useFieldVisitor } from './hooks/useFieldVisitor.js';
-import { useFieldList2Schema } from './hooks/useFieldList2Schema.js';
 
 const _hoisted_1 = {
   key: 0,
@@ -87,19 +87,31 @@ var script = /* @__PURE__ */ defineComponent({
       info.title = formModel.query(info.path).get("title");
       return info;
     }
-    function validate() {
-      return formModel.validate().catch((err) => {
-        return Promise.reject(Array.isArray(err) ? err.map(bindTitle) : err);
-      });
-    }
-    function getFormValues() {
-      return formModel.getFormState().values;
-    }
-    const setFieldState = formModel.setFieldState.bind(formModel);
     expose({
-      validate,
-      getFormValues,
-      setFieldState
+      validate(path = "*") {
+        return formModel.validate(path).catch((err) => {
+          return Promise.reject(Array.isArray(err) ? err.map(bindTitle) : err);
+        });
+      },
+      getFormValues() {
+        return formModel.getFormState().values;
+      },
+      setFieldState(path, handler) {
+        formModel.setFieldState(path, handler);
+      },
+      resetFields(path = "*") {
+        formModel.setFieldState(path, async (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;
+          }
+        });
+      }
     });
     return (_ctx, _cache) => {
       return openBlock(), createBlock(unref(NForm), null, {

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

@@ -1,13 +1,32 @@
+import { CSSProperties, PropType } from 'vue';
 export declare const COMPLEX: import("vue").DefineComponent<{
     span: {
         type: NumberConstructor;
         default: number;
     };
+    display: {
+        type: PropType<"flex" | "grid">;
+        default: string;
+    };
+    wrapperStyle: {
+        type: PropType<CSSProperties>;
+        default: () => {};
+    };
 }, () => 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<{
     span: {
         type: NumberConstructor;
         default: number;
     };
+    display: {
+        type: PropType<"flex" | "grid">;
+        default: string;
+    };
+    wrapperStyle: {
+        type: PropType<CSSProperties>;
+        default: () => {};
+    };
 }>>, {
     span: number;
+    display: "flex" | "grid";
+    wrapperStyle: CSSProperties;
 }>;

package/es/packages/form-render/src/components/renderer/complex.js

@@ -7,11 +7,18 @@ const script = defineComponent({
     span: {
       type: Number,
       default: 6
+    },
+    display: {
+      type: String,
+      default: "grid"
+    },
+    wrapperStyle: {
+      type: Object,
+      default: () => ({})
     }
   },
   setup(props, {
-    slots,
-    attrs
+    slots
   }) {
     function onChange(e) {
       e.stopPropagation();
@@ -20,7 +27,8 @@ const script = defineComponent({
       return createVNode("section", {
         "class": "form-render__complex"
       }, [createVNode("section", {
-        "class": "form-render__complexContent",
+        "class": `form-render__complexContent--${props.display}`,
+        "style": props.wrapperStyle,
         "onChange": onChange
       }, [slots.default && slots.default()])]);
     };

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

@@ -1,5 +1,4 @@
-import { useCommonLog } from './useCommonLog.js';
-import { useFormRequest } from './useFormRequest.js';
+import { useFormRequest, useCommonLog } from '../../../../packages/form-render';
 
 class AsyncQueueEntry {
   constructor(item, key, callback) {

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

@@ -1,5 +1,5 @@
 import { FieldItem } from '../types';
-import { BusinessCollector } from './useBusinessBinding';
+import { BusinessCollector } from '../../../../../es/packages/form-render';
 /**
  * @description 胶水层, 将低代码平台中的fieldList转换为JSONSchema
  */

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

@@ -1,7 +1,7 @@
+import { pick } from 'lodash-es';
 import { arrayed, transformDateFormat } from '../utils/index.js';
-import { useFormValidator } from './useFormValidator.js';
+import { useFormValidator, useTypeNormalize } from '../../../../packages/form-render';
 import { isObject } from '@vueuse/core';
-import { useTypeNormalize } from './useTypeNormalize.js';
 
 function useFieldList2Schema(collector) {
   const { createValidatorSchema } = useFormValidator();
@@ -133,6 +133,8 @@ function useFieldList2Schema(collector) {
     const properties = Array.isArray(item.properties) ? transform(item.properties) : {};
     schema.type = item.fieldType || "void";
     schema.properties = properties;
+    Object.assign(schema["x-decorator-props"], { showFeedback: false });
+    Object.assign(schema["x-component-props"], pick(item, ["wrapperStyle", "display"]));
     return schema;
   };
   const creatorMap = /* @__PURE__ */ new Map([

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

@@ -1,9 +1,9 @@
-import { createSchemaField } from '@formily/vue';
 import { provide } from 'vue';
+import { createSchemaField } from '@formily/vue';
 import { useAsyncQueue, useBusinessBinding, useChangeContext, useFormItemDeps } from '../../../../packages/form-render';
 import * as components from '../../../../packages/form-render/src/components/renderer';
-import { InjectAsyncQueue, InjectionSchemaField, InjectionBusinessCollector, InjectionChangeContextCollector, InjectionFormItemDepsCollector } from '../../../../packages/form-render/src/constants';
 import { injectOrProvide } from '../../../../packages/form-render/src/utils';
+import { InjectAsyncQueue, InjectionSchemaField, InjectionBusinessCollector, InjectionChangeContextCollector, InjectionFormItemDepsCollector } from '../../../../packages/form-render/src/constants';
 
 function useFormContext(props) {
   const asyncQueue = injectOrProvide(InjectAsyncQueue, () => useAsyncQueue().create(props.parallelism));

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

@@ -23,6 +23,7 @@ export declare type FormRenderExpose = {
     validate(): Promise<void>;
     getFormValues(): AnyObject;
     setFieldState(path: string, setter: (field: Field) => void): void;
+    resetFields(path?: string): void;
 };
 export declare type FormChangeContext = Partial<{
     currentOption: AnyObject;

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

@@ -88,8 +88,12 @@
 .form-render__complex {
   width: 100%;
 }
-.form-render__complexContent {
+.form-render__complexContent--grid {
   display: grid !important;
   grid-template-columns: repeat(var(--column), minmax(0px, 1fr));
   gap: 0 8px;
 }
+.form-render__complexContent--flex {
+  display: flex !important;
+  gap: 0 8px;
+}

package/es/packages/index.css

@@ -2704,8 +2704,12 @@ body > .vxe-table--tooltip-wrapper {
 .form-render__complex {
   width: 100%;
 }
-.form-render__complexContent {
+.form-render__complexContent--grid {
   display: grid !important;
   grid-template-columns: repeat(var(--column), minmax(0px, 1fr));
   gap: 0 8px;
 }
+.form-render__complexContent--flex {
+  display: flex !important;
+  gap: 0 8px;
+}

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

@@ -260,11 +260,14 @@ var script = /* @__PURE__ */ defineComponent({
     const confirmSubmit = (message2) => {
       dialog.warning({
         title: "\u6E29\u99A8\u63D0\u793A",
-        content: message2,
+        content: () => h("div", { style: {
+          paddingLeft: "30px"
+        } }, message2),
         positiveText: "\u786E\u5B9A",
         negativeText: "\u53D6\u6D88",
         maskClosable: false,
         closable: false,
+        positiveButtonProps: { type: "primary" },
         onPositiveClick: () => {
           onSubmitForm();
         },

package/global.d.ts

@@ -1,8 +1,8 @@
-import * as NaiveUI from 'naive-ui';
-
-declare module 'naive-ui' {
-  // @ts-ignore
-  export const NTree: any;
-}
-
-export {};
+import * as NaiveUI from 'naive-ui';
+
+declare module 'naive-ui' {
+  // @ts-ignore
+  export const NTree: any;
+}
+
+export {};

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cnhis-design-vue",
   "private": false,
-  "version": "3.1.11-beta.1",
+  "version": "3.1.11-beta.4",
   "license": "ISC",
   "module": "es/packages/index.js",
   "main": "es/packages/index.js",
@@ -26,7 +26,7 @@
   },
   "peerDependencies": {
     "naive-ui": "^2.29.0",
-    "vue": ">=3.2.0"
+    "vue": "^3.2.0"
   },
   "dependencies": {
     "@formily/core": "^2.1.9",