cnhis-design-vue 3.1.33-beta.1 → 3.1.33-beta.3

package/README.md

@@ -1,123 +1,123 @@
-# 安装
-
-```shell
-npm i cnhis-design-vue@[版本号]
-# or
-yarn add cnhis-design-vue@[版本号] #推荐
-```
-
-## 1.全局引入
-
-```typescript
-// main.ts
-import { createApp } from 'vue';
-import App from './App.vue';
-import 'cnhis-design-vue/es/packages/index.css';
-import cui from 'cnhis-design-vue';
-
-const app = createApp(App);
-app.use(cui).mount('#app');
-```
-
-## 2. 按需引入
-
-组件现在支持了自动按需引入, 但是样式文件需要额外的处理
-
-### 2.1 样式处理方式 1(按需引入样式)
-
-```shell
-# 安装自动导入样式的插件
-npm i -d vite-plugin-style-import
-```
-
-```typescript
-// vite.config.ts
-import { defineConfig } from 'vite';
-import { createStyleImportPlugin } from 'vite-plugin-style-import';
-
-export default defineConfig({
-  plugins: [
-    // ...otherPlugins
-    createStyleImportPlugin({
-      libs: [
-        {
-          libraryName: 'cnhis-design-vue',
-          esModule: true,
-          ensureStyleFile: true,
-          resolveStyle: name => {
-            return `cnhis-design-vue/es/components/${ name.slice(2) }/style/index.css`;
-          }
-        }
-      ]
-    })
-  ]
-});
-```
-
-### 2.2 样式处理方式 2(全局引入样式)
-
-```typescript
-// main.ts
-import 'cnhis-design-vue/es/components/index.css';
-```
-
-## 3. 注意
-
-由于 vxe-table 目前的引入方式是由组件 install 触发的,所以如果需要使用 c-grid/c-big-table 组件,需要全局注册二者任意一个
-
-```typescript
-// main.ts
-import { createApp } from 'vue';
-import App from './App.vue';
-
-import { CGrid } from 'cnhis-design-vue';
-// 或者
-import { CBigTable } from 'cnhis-design-vue';
-
-const app = createApp(App);
-app.use(CGrid);
-// 或者
-app.use(CBigTable);
-app.mount('#app');
-```
-
-## 4.FAQ
-
-### 4.1 项目打包后样式丢失
-
-> 处理方法, 将 cnhis-design-vue 从 vendor 包中移除
-
-```typescript
-// vite.config.ts
-import { defineConfig } from 'vite';
-
-export default defineConfig({
-  rollupOptions: {
-    // ..otherOptions
-    output: {
-      dir: './dist',
-      manualChunks(id: string) {
-        if (id.includes('node_modules') && !id.includes('cnhis-design-vue')) {
-          return 'vendor';
-        }
-      }
-    }
-  }
-});
-```
-
-### 4.2 找不到文件
-
-> 由于组件库输出文件类型由 js 修改成了 mjs, 如果配置了 resolve 属性的项目, 需要将 mjs 文件类型添加至 extensions 中
-
-```javascript
-// vite.config.ts
-const config = {
-  // ...otherOptions
-  resolve: {
-    // ...otherOptions
-    // 如果没有配置, 则不用考虑
-    extensions: ['.js', '.ts', '.vue', '.json', '.mjs']
-  }
-};
-```
+# 安装
+
+```shell
+npm i cnhis-design-vue@[版本号]
+# or
+yarn add cnhis-design-vue@[版本号] #推荐
+```
+
+## 1.全局引入
+
+```typescript
+// main.ts
+import { createApp } from 'vue';
+import App from './App.vue';
+import 'cnhis-design-vue/es/packages/index.css';
+import cui from 'cnhis-design-vue';
+
+const app = createApp(App);
+app.use(cui).mount('#app');
+```
+
+## 2. 按需引入
+
+组件现在支持了自动按需引入, 但是样式文件需要额外的处理
+
+### 2.1 样式处理方式 1(按需引入样式)
+
+```shell
+# 安装自动导入样式的插件
+npm i -d vite-plugin-style-import
+```
+
+```typescript
+// vite.config.ts
+import { defineConfig } from 'vite';
+import { createStyleImportPlugin } from 'vite-plugin-style-import';
+
+export default defineConfig({
+  plugins: [
+    // ...otherPlugins
+    createStyleImportPlugin({
+      libs: [
+        {
+          libraryName: 'cnhis-design-vue',
+          esModule: true,
+          ensureStyleFile: true,
+          resolveStyle: name => {
+            return `cnhis-design-vue/es/components/${ name.slice(2) }/style/index.css`;
+          }
+        }
+      ]
+    })
+  ]
+});
+```
+
+### 2.2 样式处理方式 2(全局引入样式)
+
+```typescript
+// main.ts
+import 'cnhis-design-vue/es/components/index.css';
+```
+
+## 3. 注意
+
+由于 vxe-table 目前的引入方式是由组件 install 触发的,所以如果需要使用 c-grid/c-big-table 组件,需要全局注册二者任意一个
+
+```typescript
+// main.ts
+import { createApp } from 'vue';
+import App from './App.vue';
+
+import { CGrid } from 'cnhis-design-vue';
+// 或者
+import { CBigTable } from 'cnhis-design-vue';
+
+const app = createApp(App);
+app.use(CGrid);
+// 或者
+app.use(CBigTable);
+app.mount('#app');
+```
+
+## 4.FAQ
+
+### 4.1 项目打包后样式丢失
+
+> 处理方法, 将 cnhis-design-vue 从 vendor 包中移除
+
+```typescript
+// vite.config.ts
+import { defineConfig } from 'vite';
+
+export default defineConfig({
+  rollupOptions: {
+    // ..otherOptions
+    output: {
+      dir: './dist',
+      manualChunks(id: string) {
+        if (id.includes('node_modules') && !id.includes('cnhis-design-vue')) {
+          return 'vendor';
+        }
+      }
+    }
+  }
+});
+```
+
+### 4.2 找不到文件
+
+> 由于组件库输出文件类型由 js 修改成了 mjs, 如果配置了 resolve 属性的项目, 需要将 mjs 文件类型添加至 extensions 中
+
+```javascript
+// vite.config.ts
+const config = {
+  // ...otherOptions
+  resolve: {
+    // ...otherOptions
+    // 如果没有配置, 则不用考虑
+    extensions: ['.js', '.ts', '.vue', '.json', '.mjs']
+  }
+};
+```

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

@@ -38,6 +38,7 @@ var EditTime = defineComponent({
     } = useCommon(props, attrs);
     const __value = ref(attrs.formattedValue);
     const onConfirm = (value) => {
+      __value.value = value;
       emit("formChange", {
         value,
         row: props.row,
@@ -58,7 +59,7 @@ var EditTime = defineComponent({
       const strInsert = (str2, length) => {
         const reg = new RegExp("\\w{1," + length + "}", "g");
         const ma = str2.match(reg);
-        return ma.join(":");
+        return ma == null ? void 0 : ma.join(":");
       };
       const result = valueFormat.includes(":") ? strInsert(str, 2) : str;
       return result;

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

@@ -146,6 +146,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       }
     }
     expose({
+      formModel,
       validate(path = "*") {
         return formModel.validate(path).catch((err) => {
           return Promise.reject(Array.isArray(err) ? err.reduce(errInfoNormalize, []) : err);

package/es/components/form-render/src/FormRenderWrapper.vue.js

@@ -1,4 +1,4 @@
-import { defineComponent, ref, openBlock, createBlock, nextTick } from 'vue';
+import { defineComponent, ref, computed, openBlock, createBlock, nextTick } from 'vue';
 import FormRender from './FormRender.vue.js';
 import _export_sfc from '../../../_virtual/plugin-vue_export-helper.js';
 
@@ -29,6 +29,10 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     }, {});
     expose({
       ...exposed,
+      formModel: computed(() => {
+        var _a;
+        return (_a = formRenderRef.value) == null ? void 0 : _a.formModel;
+      }),
       reload
     });
     return (_ctx, _cache) => {

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

@@ -4,8 +4,9 @@ import { isNumber } from 'lodash-es';
 import { NRadioGroup, NSpace, NRadio } from 'naive-ui';
 import '../../../index.js';
 import '../../utils/index.js';
+import { useFormField } from '../../hooks/useFormField.js';
 import { useAutographOptions } from '../../hooks/useFormRenderOptions.js';
-import { assignUpdateValue } from '../../utils/schema.js';
+import { visitedDecorator, assignUpdateValue } from '../../utils/schema.js';
 import { useCommonInjection } from '../../hooks/useCommonInjection.js';
 
 function _isSlot(s) {
@@ -57,21 +58,27 @@ const script = defineComponent({
         emit("update:value", v);
       }
     });
+    const {
+      field
+    } = useFormField();
     const {
       labelKey,
       valueKey,
       options
     } = useAutographOptions(props, valueRef);
     const {
-      injectValueBindKey
+      injectValueBindKey,
+      injectValueValidate
     } = useCommonInjection();
+    injectValueValidate(valueRef);
     const key = injectValueBindKey(valueRef);
     return () => {
       let _slot;
       return createVNode(NRadioGroup, {
         "key": key.value,
         "value": valueRef.value,
-        "onUpdate:value": ($event) => valueRef.value = $event
+        "onUpdate:value": ($event) => valueRef.value = $event,
+        "onClick": visitedDecorator(field)
       }, {
         default: () => [createVNode(NSpace, {
           "vertical": props.vertical

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

@@ -1,5 +1,5 @@
 import { AnyObject, UndefinedAble } from '../../../../../es/shared/types';
-import { DataField, Field } from '@formily/core';
+import { DataField, Field, Form } from '@formily/core';
 import { ISchema } from '@formily/json-schema/esm/types';
 import { Component, FunctionalComponent } from 'vue';
 import { FIELD_BUSINESS_TYPE } from '../../../../../es/components/form-render/src/constants';
@@ -26,6 +26,7 @@ export declare type FormAsyncQueue = AsyncQueue<FormAsyncQueueItem, any, AnyObje
 export declare type AgeContext = Record<'age' | 'day' | 'month' | 'year' | 'hours', number>;
 export declare type IdCardParseInfo = Record<'sex' | 'birthday', string> & AgeContext;
 export declare type FormRenderExpose = {
+    formModel: Form;
     validate(path?: string): Promise<unknown>;
     getFormValues(needCombineExtendKey?: boolean): AnyObject;
     setFormValues(values: AnyObject, needSplitExtendKey?: boolean): AnyObject;

package/es/components/iho-table/src/plugins/rendererPlugins/editableWidgets/dateRendererPlugin/index.js

@@ -1,7 +1,7 @@
 import { createVNode, mergeProps } from 'vue';
 import '../../../../../index.js';
 import { EDITABLE_WIDGET_TYPE } from '../../../../constants/index.js';
-import { useIhoTableFormEvent } from '../../../../utils/index.js';
+import { IhoTableRenderHelper } from '../../../../utils/index.js';
 import EditDate from './editDate.vue.js';
 import { defineTablePlugin } from '../../../../hooks/useTablePlugin.js';
 
@@ -11,38 +11,24 @@ function dateRendererPlugin() {
     name: pluginName,
     vxe(instance) {
       instance.renderer.add(EDITABLE_WIDGET_TYPE.DATE, {
-        renderCell({
-          props
-        }, {
-          row,
-          column
-        }) {
-          return [createVNode("span", null, [row[column.field]])];
-        },
-        renderEdit({
-          props
-        }, {
+        renderCell: IhoTableRenderHelper.createDefaultRenderCell(),
+        renderEdit: IhoTableRenderHelper.createRenderEdit(({
+          fieldItem,
+          emitFormClick,
           row,
           column,
           $rowIndex
-        }) {
-          const {
-            emitFormClick
-          } = useIhoTableFormEvent({
-            row,
-            column,
-            $rowIndex
-          });
+        }) => {
           return [createVNode(EditDate, mergeProps({
             "value": row[column.field],
             "onUpdate:value": ($event) => row[column.field] = $event
-          }, (props == null ? void 0 : props.componentProps) || {}, {
+          }, fieldItem.componentProps, {
             "column": column,
             "row": row,
             "index": $rowIndex,
             "onClick": emitFormClick
           }), null)];
-        }
+        })
       });
     }
   });

package/es/components/iho-table/src/plugins/rendererPlugins/editableWidgets/inputRendererPlugin.js

@@ -2,7 +2,7 @@ import { createVNode, mergeProps } from 'vue';
 import { NInput } from 'naive-ui';
 import '../../../../index.js';
 import { EDITABLE_WIDGET_TYPE } from '../../../constants/index.js';
-import { useIhoTableFormEvent } from '../../../utils/index.js';
+import { IhoTableRenderHelper } from '../../../utils/index.js';
 import { defineTablePlugin } from '../../../hooks/useTablePlugin.js';
 
 function inputRendererPlugin() {
@@ -11,34 +11,21 @@ function inputRendererPlugin() {
     name: pluginName,
     vxe(instance) {
       instance.renderer.add(EDITABLE_WIDGET_TYPE.INPUT, {
-        renderCell(renderOpts, {
-          row,
-          column
-        }) {
-          return [createVNode("span", null, [row[column.field]])];
-        },
-        renderEdit({
-          props
-        }, {
+        renderCell: IhoTableRenderHelper.createDefaultRenderCell(),
+        renderEdit: IhoTableRenderHelper.createRenderEdit(({
+          fieldItem,
           row,
           column,
-          $rowIndex
-        }) {
-          const {
-            emitFormClick,
-            emitFormChange
-          } = useIhoTableFormEvent({
-            row,
-            column,
-            $rowIndex
-          });
+          emitFormChange,
+          emitFormClick
+        }) => {
           return [createVNode(NInput, mergeProps({
             "value": row[column.field],
             "onUpdate:value": ($event) => row[column.field] = $event,
             "onBlur": emitFormChange,
             "onClick": emitFormClick
-          }, props == null ? void 0 : props.componentProps), null)];
-        }
+          }, fieldItem.componentProps), null)];
+        })
       });
     }
   });

package/es/components/iho-table/src/plugins/rendererPlugins/editableWidgets/numberRendererPlugin.js

@@ -2,7 +2,7 @@ import { createVNode, mergeProps } from 'vue';
 import { NInputNumber } from 'naive-ui';
 import '../../../../index.js';
 import { EDITABLE_WIDGET_TYPE } from '../../../constants/index.js';
-import { useIhoTableFormEvent } from '../../../utils/index.js';
+import { IhoTableRenderHelper } from '../../../utils/index.js';
 import { defineTablePlugin } from '../../../hooks/useTablePlugin.js';
 
 function numberRendererPlugin() {
@@ -11,33 +11,20 @@ function numberRendererPlugin() {
     name: pluginName,
     vxe(instance) {
       instance.renderer.add(EDITABLE_WIDGET_TYPE.NUMBER, {
-        renderCell(renderOpts, {
-          row,
-          column
-        }) {
-          return [createVNode("span", null, [row[column.field]])];
-        },
-        renderEdit({
-          props
-        }, {
+        renderCell: IhoTableRenderHelper.createDefaultRenderCell(),
+        renderEdit: IhoTableRenderHelper.createRenderEdit(({
           row,
           column,
-          $rowIndex
-        }) {
-          const {
-            emitFormClick,
-            emitFormChange,
-            createCustomEvent
-          } = useIhoTableFormEvent({
-            row,
-            column,
-            $rowIndex
-          });
+          fieldItem,
+          emitFormClick,
+          emitFormChange,
+          createCustomEvent
+        }) => {
           const {
             placeholder = "\u8BF7\u8F93\u5165"
-          } = (props == null ? void 0 : props.componentProps) || {};
+          } = fieldItem.componentProps || {};
           const config = {
-            ...(props == null ? void 0 : props.componentProps) || {},
+            ...fieldItem.componentProps || {},
             clearable: true,
             placeholder,
             onBlur: createCustomEvent("formChange", {
@@ -50,7 +37,7 @@ function numberRendererPlugin() {
             "value": row[column.field],
             "onUpdate:value": ($event) => row[column.field] = $event
           }, config), null)];
-        }
+        })
       });
     }
   });

package/es/components/iho-table/src/plugins/rendererPlugins/editableWidgets/selectRendererPlugin/index.js

@@ -1,7 +1,7 @@
 import { createVNode, mergeProps } from 'vue';
 import '../../../../../index.js';
 import { EDITABLE_WIDGET_TYPE } from '../../../../constants/index.js';
-import { useIhoTableFormEvent } from '../../../../utils/index.js';
+import { IhoTableRenderHelper } from '../../../../utils/index.js';
 import EditSelect from './editSelect.js';
 import { getDefaultValue } from './selectUtils.js';
 import { defineTablePlugin } from '../../../../hooks/useTablePlugin.js';
@@ -15,26 +15,18 @@ function selectRendererPlugin() {
         renderCell({
           props
         }, {
-          row,
-          column
+          row
         }) {
           return [createVNode("span", null, [getDefaultValue(row, props)])];
         },
-        renderEdit({
-          props
-        }, {
+        renderEdit: IhoTableRenderHelper.createRenderEdit(({
+          fieldItem,
+          emitFormClick,
           row,
           column,
           $rowIndex
-        }) {
-          const {
-            emitFormClick
-          } = useIhoTableFormEvent({
-            row,
-            column,
-            $rowIndex
-          });
-          return [createVNode(EditSelect, mergeProps((props == null ? void 0 : props.componentProps) || {}, {
+        }) => {
+          return [createVNode(EditSelect, mergeProps(fieldItem.componentProps, {
             "column": column,
             "row": row,
             "index": $rowIndex,
@@ -42,7 +34,7 @@ function selectRendererPlugin() {
             "onUpdate:value": ($event) => row[column.field] = $event,
             "onClick": emitFormClick
           }), null)];
-        }
+        })
       });
     }
   });

package/es/components/iho-table/src/plugins/rendererPlugins/editableWidgets/separateRendererPlugin/index.js

@@ -3,7 +3,7 @@ import { traverse } from '../../../../../../../shared/utils/index.js';
 import { isFunction, isObject } from 'lodash-es';
 import '../../../../../index.js';
 import { EDITABLE_WIDGET_TYPE, InjectionIhoTableUUID } from '../../../../constants/index.js';
-import { getRowHeight, useIhoTableFormEvent, getColumnRenderWidth } from '../../../../utils/index.js';
+import { IhoTableRenderHelper, getRowHeight, getColumnRenderWidth } from '../../../../utils/index.js';
 import { isSeparateColumn, contentSeparate, getColumnInfoMaxLength, generateSeparateRowData } from './separateUtils.js';
 import EditSeparate from './editSeparate.vue.js';
 import { defineTablePlugin } from '../../../../hooks/useTablePlugin.js';
@@ -35,27 +35,21 @@ function separateRendererPlugins() {
           };
           return createVNode("section", null, [separateRow.separateData[column.field]]);
         },
-        renderEdit(renderOpts, {
+        renderEdit: IhoTableRenderHelper.createRenderEdit(({
+          fieldItem,
           column,
           row,
-          $rowIndex
-        }) {
-          var _a, _b;
+          emitFormClick
+        }) => {
+          var _a;
           const uuid = inject(InjectionIhoTableUUID);
           const separateRow = getSeparateRowData(uuid, row);
           const height = getRowHeight();
           const slots = {};
-          if ((_a = renderOpts.props) == null ? void 0 : _a.separateSlot) {
-            const separate = toRaw(renderOpts.props.separateSlot);
+          if (fieldItem.separateSlot) {
+            const separate = toRaw(fieldItem.separateSlot);
             slots.menu = isFunction(separate) ? separate : isObject(separate) ? (props) => h(separate, props) : void 0;
           }
-          const {
-            emitFormClick
-          } = useIhoTableFormEvent({
-            row,
-            column,
-            $rowIndex
-          });
           return [createVNode(EditSeparate, {
             "value": row[column.field],
             "onUpdate:value": ($event) => row[column.field] = $event,
@@ -63,10 +57,10 @@ function separateRendererPlugins() {
             "height": height,
             "column": column,
             "row": row,
-            "displayContent": (_b = separateRow == null ? void 0 : separateRow.separateData) == null ? void 0 : _b[column.field],
+            "displayContent": (_a = separateRow == null ? void 0 : separateRow.separateData) == null ? void 0 : _a[column.field],
             "onClick": emitFormClick
           }, slots)];
-        }
+        })
       });
     },
     apply(hooks) {