cnhis-design-vue 3.1.35-beta.5 → 3.1.35-beta.7

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/index.d.ts

@@ -729,10 +729,7 @@ declare const BigTable: SFCWithInstall<import("vue").DefineComponent<{
         records: any;
     }) => void;
     radioOnChange: (rowData?: {}) => void;
-    sortChange: ({ property, order }: {
-        property: any;
-        order: any;
-    }) => false | undefined;
+    sortChange: (params: any) => false | undefined;
     showDrawer: () => void;
     handleCellMouseenter: ({ column, $event }: {
         column: any;

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

@@ -728,10 +728,7 @@ declare const _default: import("vue").DefineComponent<{
         records: any;
     }) => void;
     radioOnChange: (rowData?: {}) => void;
-    sortChange: ({ property, order }: {
-        property: any;
-        order: any;
-    }) => false | undefined;
+    sortChange: (params: any) => false | undefined;
     showDrawer: () => void;
     handleCellMouseenter: ({ column, $event }: {
         column: any;

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

@@ -851,7 +851,8 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       field.filterSort = sort;
       emit("sortChange", {
         prop: field.columnName,
-        order: sort
+        order: sort,
+        column: field
       });
     };
     const handleFilterSeach = (val, field) => {
@@ -971,7 +972,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       if (isFunction(item.headerSlotFn))
         return () => item.headerSlotFn(item);
       if (type === "format")
-        return [item.isEdit ? createVNode(NIcon, {
+        return [item.isEdit && !props.columnConfig.noEditIcon ? createVNode(NIcon, {
           "component": CreateOutline,
           "class": "is-edit"
         }, null) : null, createVNode("span", {
@@ -981,7 +982,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
         return [item.treeNode && state.isTree == 1 && !props.columnConfig.noExpandIcon ? createVNode(NIcon, {
           "component": state.isExpand && state.total < 1001 ? CaretDown : CaretForward,
           "onClick": (e) => triggerExpand(e, state.isExpand)
-        }, null) : null, item.isEdit ? createVNode(NIcon, {
+        }, null) : null, item.isEdit && !props.columnConfig.noEditIcon ? createVNode(NIcon, {
           "component": CreateOutline,
           "class": "is-edit"
         }, null) : null, createVNode("span", {
@@ -1542,17 +1543,11 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
         ...row
       }]);
     };
-    const sortChange = ({
-      property,
-      order
-    }) => {
+    const sortChange = (params) => {
       if (props.isInlineOperating)
         return false;
       Object.values(state.filterFields).forEach((item) => item.filterSort = null);
-      emit("sortChange", {
-        prop: property,
-        order
-      });
+      emit("sortChange", params);
     };
     const showDrawer = () => {
       const theads = xGrid.value.$el.childNodes[0].childNodes[1].childNodes[0].getElementsByClassName("mycolumn");