cnhis-design-vue 3.1.24-beta.2 → 3.1.24-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/BigTable.vue.d.ts

@@ -912,22 +912,7 @@ declare const _default: import("vue").DefineComponent<{
     NIcon: any;
     CGrid: import("../../../shared/types").SFCWithInstall<import("vue").DefineComponent<{}, any, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{}>>, {}>>;
     checkMethod: ({ row }: {
-        row: any; /**
-         * 针对 bigTable 的设置列
-         * type: 列的类型
-         * field: 列字段名（注：属性层级越深，渲染性能将直线下降）
-         * title: 列标题（支持开启国际化）
-         * width: 列宽度（如果为空则均匀分配剩余宽度，如果全部列固定了，可能会存在宽屏下不会铺满，可以配合 "%" 或者 "min-width" 布局）
-         * minWidth: 最小列宽度；会自动将剩余空间按比例分配
-         * resizable: 列是否允许拖动列宽调整大小
-         * visible: 列是否显示
-         * fixed: 将列固定在左侧或者右侧（注意：固定列应该放在左右两侧的位置）
-         * align: 列对齐方式
-         * headerAlign: 表头列的对齐方式
-         * footerAlign: 表尾列的对齐方式
-         * formatter: 格式化显示内容 Function({cellValue, row, column})
-         * sortable: 是否允许列排序
-         */
+        row: any;
     }) => boolean;
     visibleMethod: ({ row }: any) => boolean;
     getRowStyle: ({ row }: any) => string | null;

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

@@ -63,7 +63,9 @@ var EditInput = defineComponent({
     };
     function keyup(event) {
       if (event.key == "Enter") {
-        onBlur();
+        setTimeout(() => {
+          onBlur();
+        }, 100);
       }
     }
     watch(() => attrs.value, (value) => {

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

@@ -1,20 +1,3 @@
-export * from './input';
-export * from './select';
-export * from './formItem';
-export * from './textarea';
-export * from './inputNumber';
-export * from './lineBar';
-export * from './inputGroup';
-export * from './date';
-export * from './levelSearchCascade';
-export * from './jsonCombination';
-export * from './combination';
-export * from './checkbox';
-export * from './switch';
-export * from './radio';
-export * from './labelSelect';
-export * from './slider';
-export * from './complex';
-export * from './simpleComponent';
-export * from './search';
-export * from './searchCascade';
+import { Component } from 'vue';
+declare const exportModules: Record<string, Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions>>;
+export default exportModules;

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

@@ -1,20 +1,49 @@
-export { INPUT } from './input.js';
-export { SELECT } from './select.js';
-export { FORM_ITEM } from './formItem.js';
-export { TEXTAREA } from './textarea.js';
-export { INPUT_NUMBER } from './inputNumber.js';
-export { LINEBAR } from './lineBar/index.js';
-export { INPUT_GROUP } from './inputGroup.js';
-export { DATE } from './date.js';
-export { LEVEL_SEARCH_CASCADE } from './levelSearchCascade.js';
-export { JSON_COMBINATION } from './jsonCombination/index.js';
-export { COMBINATION } from './combination.js';
-export { CHECKBOX } from './checkbox.js';
-export { SWITCH } from './switch.js';
-export { RADIO } from './radio.js';
-export { LABEL } from './labelSelect.js';
-export { SLIDER } from './slider.js';
-export { COMPLEX } from './complex.js';
-export { BUTTON, LINE_BREAKS, TEXT } from './simpleComponent.js';
-export { SEARCH } from './search.js';
-export { SEARCH_CASCADE } from './searchCascade.js';
+import * as checkbox from './checkbox.js';
+import * as combination from './combination.js';
+import * as complex from './complex.js';
+import * as date from './date.js';
+import * as formItem from './formItem.js';
+import * as input from './input.js';
+import * as inputGroup from './inputGroup.js';
+import * as inputNumber from './inputNumber.js';
+import * as index from './jsonCombination/index.js';
+import * as labelSelect from './labelSelect.js';
+import * as levelSearchCascade from './levelSearchCascade.js';
+import * as index$1 from './lineBar/index.js';
+import * as radio from './radio.js';
+import * as search from './search.js';
+import * as searchCascade from './searchCascade.js';
+import * as select from './select.js';
+import * as simpleComponent from './simpleComponent.js';
+import * as slider from './slider.js';
+import * as _switch from './switch.js';
+import * as textarea from './textarea.js';
+
+const modules = Object.assign({
+  "./checkbox.tsx": checkbox,
+  "./combination.tsx": combination,
+  "./complex.tsx": complex,
+  "./date.tsx": date,
+  "./formItem.tsx": formItem,
+  "./input.tsx": input,
+  "./inputGroup.ts": inputGroup,
+  "./inputNumber.tsx": inputNumber,
+  "./jsonCombination/index.tsx": index,
+  "./labelSelect.tsx": labelSelect,
+  "./levelSearchCascade.tsx": levelSearchCascade,
+  "./lineBar/index.ts": index$1,
+  "./radio.tsx": radio,
+  "./search.tsx": search,
+  "./searchCascade.tsx": searchCascade,
+  "./select.tsx": select,
+  "./simpleComponent.tsx": simpleComponent,
+  "./slider.tsx": slider,
+  "./switch.tsx": _switch,
+  "./textarea.tsx": textarea
+});
+const exportModules = Object.values(modules).reduce((result, m) => {
+  Object.assign(result, m);
+  return result;
+}, {});
+
+export { exportModules as default };

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

@@ -7,8 +7,8 @@ import { formRenderLog } from '../../utils/index.js';
 import { connect, mapProps } from '@formily/vue';
 import SearchCascader from '../../../../search-cascader/index.js';
 import script$1 from '../../../../../shared/components/no-data/NoData.js';
-import { useFormField } from '../../hooks/useFormField.js';
 import { visitedDecorator, assignUpdateValue } from '../../utils/schema.js';
+import { useFormField } from '../../hooks/useFormField.js';
 import { useFormRequest } from '../../hooks/useFormRequest.js';
 
 const script = defineComponent({

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

@@ -22,25 +22,7 @@ import '../../hooks/useFormValidator.js';
 import '@formily/core';
 import '@vue/shared';
 import { connect, mapProps } from '@formily/vue';
-import './input.js';
-import './select.js';
-import './formItem.js';
-import './textarea.js';
-import './inputNumber.js';
-import './lineBar/index.js';
-import './inputGroup.js';
-import './date.js';
-import './levelSearchCascade.js';
-import './jsonCombination/index.js';
-import './combination.js';
-import './checkbox.js';
-import './switch.js';
-import './radio.js';
-import './labelSelect.js';
-import './slider.js';
-import './complex.js';
-import './simpleComponent.js';
-import './searchCascade.js';
+import './index.js';
 import { NSelect } from 'naive-ui';
 import { visitedDecorator, assignUpdateValue, assignClearBindVisited } from '../../utils/schema.js';
 

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

@@ -21,25 +21,7 @@ import '../../../../../shared/utils/tapable/AsyncSeriesWaterfallHook.js';
 import '../../hooks/useFormValidator.js';
 import '@vue/shared';
 import { connect, mapProps } from '@formily/vue';
-import './input.js';
-import './select.js';
-import './formItem.js';
-import './textarea.js';
-import './inputNumber.js';
-import './lineBar/index.js';
-import './inputGroup.js';
-import './date.js';
-import './levelSearchCascade.js';
-import './jsonCombination/index.js';
-import './combination.js';
-import './checkbox.js';
-import './switch.js';
-import './radio.js';
-import './labelSelect.js';
-import './slider.js';
-import './complex.js';
-import './simpleComponent.js';
-import './search.js';
+import './index.js';
 import { NCascader } from 'naive-ui';
 import { assignUpdateValue, traverseDependKey } from '../../utils/schema.js';
 

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

@@ -21,25 +21,7 @@ import '../../../../../shared/utils/tapable/AsyncSeriesWaterfallHook.js';
 import '../../hooks/useFormValidator.js';
 import '@vue/shared';
 import { connect, mapProps } from '@formily/vue';
-import './input.js';
-import './formItem.js';
-import './textarea.js';
-import './inputNumber.js';
-import './lineBar/index.js';
-import './inputGroup.js';
-import './date.js';
-import './levelSearchCascade.js';
-import './jsonCombination/index.js';
-import './combination.js';
-import './checkbox.js';
-import './switch.js';
-import './radio.js';
-import './labelSelect.js';
-import './slider.js';
-import './complex.js';
-import './simpleComponent.js';
-import './search.js';
-import './searchCascade.js';
+import './index.js';
 import { NSelect } from 'naive-ui';
 import { traverseDependKey, visitedDecorator, assignUpdateValue, assignClearBindVisited } from '../../utils/schema.js';
 

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

@@ -4,7 +4,7 @@ import { cloneDeep } from 'lodash-es';
 import { provide, computed, readonly } from 'vue';
 import { createSchemaField } from '@formily/vue';
 import '../../index.js';
-import * as index from '../components/renderer/index.js';
+import exportModules from '../components/renderer/index.js';
 import { useFormRenderLifeCycle } from './useFormRenderLifeCycle.js';
 import { usePresetScope } from './usePresetScope.js';
 import { injectOrProvide, presetRequestHandler } from '../utils/index.js';
@@ -30,7 +30,7 @@ function useFormContext(props, formModel) {
   const SchemaField = injectOrProvide(
     InjectionSchemaField,
     () => createSchemaField({
-      components: { ...index, ...props.components },
+      components: { ...exportModules, ...props.components },
       scope: Object.assign({}, usePresetScope(), props.scope)
     }).SchemaField
   );

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

@@ -1,7 +1,7 @@
 import { COMPONENT_NAMESPACE } from '../../shared/global/variable.js';
 import { safeComponentRegister } from '../../shared/utils/index.js';
 import script from './src/IhoTable.js';
-import * as index from './src/plugins/index.js';
+import exportModules from './src/plugins/index.js';
 import 'vue';
 import 'lodash-es';
 import './src/constants/index.js';
@@ -22,7 +22,7 @@ export { defineTablePlugin, useTablePlugin } from './src/hooks/useTablePlugin.js
 const { use } = useTablePlugin();
 const useIhoTablePresetPlugins = (instance) => {
   use(
-    Object.values(index).map((plugin) => plugin()),
+    Object.values(exportModules).map((plugin) => plugin()),
     instance
   );
 };

package/es/components/iho-table/src/plugins/index.d.ts

@@ -1,5 +1,3 @@
-export * from './defaultConfigPlugin';
-export * from './lowCodeFieldAdaptorPlugin';
-export * from './rendererPlugins';
-export * from './rowGroupSettingPlugin';
-export * from './virtualTreePlugin';
+import { TablePlugin } from '../../../../../es/components/iho-table';
+declare const exportModules: Record<string, () => TablePlugin>;
+export default exportModules;

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

@@ -1,15 +1,39 @@
-export { defaultConfigPlugin } from './defaultConfigPlugin/index.js';
-export { lowCodeFieldAdaptorPlugin } from './lowCodeFieldAdaptorPlugin/index.js';
-export { labelRendererPlugin } from './rendererPlugins/widgets/labelRendererPlugin.js';
-export { defaultRendererPlugin } from './rendererPlugins/widgets/defaultRendererPlugin.js';
-export { colorRendererPlugin } from './rendererPlugins/widgets/colorRendererPlugin.js';
-export { seqRendererPlugin } from './rendererPlugins/widgets/seqRendererPlugin.js';
-export { checkRendererPlugin } from './rendererPlugins/widgets/checkRendererPlugin.js';
-export { pictureRendererPlugin } from './rendererPlugins/widgets/pictureRendererPlugin.js';
-export { inputRendererPlugin } from './rendererPlugins/editableWidgets/inputRendererPlugin.js';
-export { separateRendererPlugins } from './rendererPlugins/editableWidgets/separateRendererPlugin/index.js';
-export { selectRendererPlugin } from './rendererPlugins/editableWidgets/selectRendererPlugin/index.js';
-export { dateRendererPlugin } from './rendererPlugins/editableWidgets/dateRendererPlugin/index.js';
-export { timeRendererPlugin } from './rendererPlugins/editableWidgets/timeRendererPlugin/index.js';
-export { rowGroupSettingPlugin } from './rowGroupSettingPlugin/index.js';
-export { virtualTreePlugin } from './virtualTreePlugin/index.js';
+import * as index from './defaultConfigPlugin/index.js';
+import * as index$1 from './lowCodeFieldAdaptorPlugin/index.js';
+import * as index$2 from './rendererPlugins/editableWidgets/dateRendererPlugin/index.js';
+import * as inputRendererPlugin from './rendererPlugins/editableWidgets/inputRendererPlugin.js';
+import * as index$3 from './rendererPlugins/editableWidgets/selectRendererPlugin/index.js';
+import * as index$4 from './rendererPlugins/editableWidgets/separateRendererPlugin/index.js';
+import * as index$5 from './rendererPlugins/editableWidgets/timeRendererPlugin/index.js';
+import * as checkRendererPlugin from './rendererPlugins/widgets/checkRendererPlugin.js';
+import * as colorRendererPlugin from './rendererPlugins/widgets/colorRendererPlugin.js';
+import * as defaultRendererPlugin from './rendererPlugins/widgets/defaultRendererPlugin.js';
+import * as labelRendererPlugin from './rendererPlugins/widgets/labelRendererPlugin.js';
+import * as pictureRendererPlugin from './rendererPlugins/widgets/pictureRendererPlugin.js';
+import * as seqRendererPlugin from './rendererPlugins/widgets/seqRendererPlugin.js';
+import * as index$6 from './rowGroupSettingPlugin/index.js';
+import * as index$7 from './virtualTreePlugin/index.js';
+
+const plugins = Object.assign({
+  "./defaultConfigPlugin/index.ts": index,
+  "./lowCodeFieldAdaptorPlugin/index.ts": index$1,
+  "./rendererPlugins/editableWidgets/dateRendererPlugin/index.tsx": index$2,
+  "./rendererPlugins/editableWidgets/inputRendererPlugin.tsx": inputRendererPlugin,
+  "./rendererPlugins/editableWidgets/selectRendererPlugin/index.tsx": index$3,
+  "./rendererPlugins/editableWidgets/separateRendererPlugin/index.tsx": index$4,
+  "./rendererPlugins/editableWidgets/timeRendererPlugin/index.tsx": index$5,
+  "./rendererPlugins/widgets/checkRendererPlugin.tsx": checkRendererPlugin,
+  "./rendererPlugins/widgets/colorRendererPlugin.tsx": colorRendererPlugin,
+  "./rendererPlugins/widgets/defaultRendererPlugin.tsx": defaultRendererPlugin,
+  "./rendererPlugins/widgets/labelRendererPlugin.tsx": labelRendererPlugin,
+  "./rendererPlugins/widgets/pictureRendererPlugin.tsx": pictureRendererPlugin,
+  "./rendererPlugins/widgets/seqRendererPlugin.tsx": seqRendererPlugin,
+  "./rowGroupSettingPlugin/index.ts": index$6,
+  "./virtualTreePlugin/index.ts": index$7
+});
+const exportModules = Object.values(plugins).reduce((result, m) => {
+  Object.assign(result, m);
+  return result;
+}, {});
+
+export { exportModules as default };

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

@@ -1,4 +1,4 @@
-import { defineComponent, inject, ref, watch, computed, onMounted, onDeactivated, openBlock, createBlock, unref, withCtx, createElementVNode, withModifiers, normalizeStyle, toDisplayString, renderSlot, createVNode } from 'vue';
+import { defineComponent, inject, ref, watch, computed, onDeactivated, openBlock, createBlock, unref, withCtx, createElementVNode, withModifiers, normalizeStyle, toDisplayString, renderSlot, createVNode } from 'vue';
 import { cloneDeep, isObject, isArray } from 'lodash-es';
 import { NPopover, NInput } from 'naive-ui';
 import { InjectionIhoTableEmits, InjectionIhoTableHandler } from '../../../../constants/index.js';
@@ -8,7 +8,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "editSeparate",
   props: {
     value: {},
-    height: { type: Number },
+    height: { type: Number, default: 48 },
     column: { type: Object, required: true },
     row: { type: Object, required: true },
     displayContent: { type: String, default: "" },
@@ -55,16 +55,13 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     }
     const style = computed(() => ({
       border: "1px solid #f5f5f5",
-      height: props.height + "px",
+      height: props.height - 16 + "px",
       padding: "4px 0 4px 0",
       background: "white",
+      wordBreak: "keep-all",
       boxSizing: "border-box",
       "border-radius": "4px"
     }));
-    const elementRef = ref();
-    onMounted(() => {
-      console.log(elementRef.value);
-    });
     onDeactivated(onClose);
     return (_ctx, _cache) => {
       return openBlock(), createBlock(unref(NPopover), {
@@ -77,8 +74,6 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       }, {
         trigger: withCtx(() => [
           createElementVNode("div", {
-            ref_key: "elementRef",
-            ref: elementRef,
             onClick: _cache[0] || (_cache[0] = withModifiers(($event) => show.value = !show.value, ["stop"])),
             style: normalizeStyle(unref(style))
           }, toDisplayString(__props.displayContent || " "), 5)