cnhis-design-vue 3.1.22-beta.0 → 3.1.22-beta.1

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

@@ -329,6 +329,14 @@ declare const BigTable: SFCWithInstall<import("vue").DefineComponent<{
             showInsertStatus?: boolean | undefined;
             showAsterisk?: boolean | undefined;
             autoClear?: boolean | undefined;
+            beforeEditMethod?: ((params: {
+                row: any;
+                rowIndex: number;
+                column: import("vxe-table").VxeTableDefines.ColumnInfo;
+                columnIndex: number;
+                $table: import("vxe-table").VxeTableConstructor & import("vxe-table").VxeTablePrivateMethods;
+                $grid: import("vxe-table").VxeGridConstructor | null | undefined;
+            }) => boolean) | undefined;
             activeMethod?: ((params: {
                 row: any;
                 rowIndex: number;

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

@@ -327,6 +327,14 @@ declare const _default: import("vue").DefineComponent<{
             showInsertStatus?: boolean | undefined;
             showAsterisk?: boolean | undefined;
             autoClear?: boolean | undefined;
+            beforeEditMethod?: ((params: {
+                row: any;
+                rowIndex: number;
+                column: import("vxe-table").VxeTableDefines.ColumnInfo;
+                columnIndex: number;
+                $table: import("vxe-table").VxeTableConstructor & import("vxe-table").VxeTablePrivateMethods;
+                $grid: import("vxe-table").VxeGridConstructor | null | undefined;
+            }) => boolean) | undefined;
             activeMethod?: ((params: {
                 row: any;
                 rowIndex: number;

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

@@ -430,7 +430,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
         };
       }
       const currentColumns = fieldList.map((item, index) => {
-        var _a2, _b2, _c2, _d, _e, _f, _g;
+        var _a2, _b2, _c2, _d, _e, _f, _g, _h;
         let filterField = false;
         let filterItems = [];
         try {
@@ -445,6 +445,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
         let sortable = props.isNestTable ? false : !filterField && item.isSort == 1 && notParticipatingSort != 1 && item.isMerge != 1;
         let treeNode = props.isNestTable ? false : state.isTree != 0 ? index === 0 : false;
         let type = index === 0 && props.showNestTable ? "expand" : "";
+        const isShow = item.isShow == 1 && ((_e = item == null ? void 0 : item.settingObj) == null ? void 0 : _e.isHide) != 1;
         if (isScanMultiTable2) {
           fixed = "";
           sortable = false;
@@ -452,15 +453,15 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
           type = "";
         }
         const col = Object.assign(item, {
-          visible: item.columnName == "operatorColumn" ? showButtonTop == 0 : item.isShow == 1,
+          visible: item.columnName == "operatorColumn" ? showButtonTop == 0 : isShow,
           field: item.columnName,
           title: handleName(item, "title"),
           minWidth: item.colWidth,
           fixed,
           sortable,
           headerClassName: "mycolumn",
-          resizable: (_e = item.resizable) != null ? _e : true,
-          showOverflow: (_f = item.showOverflow) != null ? _f : "title",
+          resizable: (_f = item.resizable) != null ? _f : true,
+          showOverflow: (_g = item.showOverflow) != null ? _g : "title",
           treeNode,
           type,
           slots: {
@@ -475,7 +476,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
         if (filterField && !props.isNestTable && !isScanMultiTable2) {
           state.filterFields[item.columnName] = Object.assign({}, XEUtils.clone({
             ...item,
-            setting: item.settingObj
+            setting: item.settingObj || {}
           }, true), {
             visible: false,
             left: "initial",
@@ -497,7 +498,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
         if (!isScanMultiTable2 && !isFunction(attr.footerMethod) && !isFunction(attr["footer-method"])) {
           col.slots.footer = "tooltip_footer";
         }
-        if (props.showNestTable && state.isTree == 0 && ((_g = props.curNestColumnConfig) == null ? void 0 : _g.isTree) == 0) {
+        if (props.showNestTable && state.isTree == 0 && ((_h = props.curNestColumnConfig) == null ? void 0 : _h.isTree) == 0) {
           col.slots.content = "nest_table_content";
         }
         return col;

package/es/components/field-set/index.d.ts

@@ -19,7 +19,7 @@ declare const FieldSet: SFCWithInstall<import("vue").DefineComponent<{
 }, {
     fieldsMapping: Record<string, string>;
     selectOptions: Record<string, string>[];
-    emit: (event: "onSave" | "onClose", ...args: any[]) => void;
+    emit: (event: "onSave" | "onClose" | "reset", ...args: any[]) => void;
     settingView: any;
     props: Readonly<import("@vue/shared").LooseRequired<Readonly<import("vue").ExtractPropTypes<{
         fields: {
@@ -39,11 +39,11 @@ declare const FieldSet: SFCWithInstall<import("vue").DefineComponent<{
             default: boolean;
         };
     }>> & {
+        onReset?: ((...args: any[]) => any) | undefined;
         onOnSave?: ((...args: any[]) => any) | undefined;
         onOnClose?: ((...args: any[]) => any) | undefined;
     }>>;
     initFields: () => any[];
-    realityFields: import("vue").ComputedRef<any[]>;
     state: {
         spinning: boolean;
         isCustomSearch: boolean;
@@ -212,7 +212,7 @@ declare const FieldSet: SFCWithInstall<import("vue").DefineComponent<{
         modelValue: unknown[];
         componentData: Record<string, any>;
     }>;
-}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("onSave" | "onClose")[], "onSave" | "onClose", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("onSave" | "onClose" | "reset")[], "onSave" | "onClose" | "reset", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     fields: {
         type: import("vue").PropType<any[]>;
         default: () => never[];
@@ -230,6 +230,7 @@ declare const FieldSet: SFCWithInstall<import("vue").DefineComponent<{
         default: boolean;
     };
 }>> & {
+    onReset?: ((...args: any[]) => any) | undefined;
     onOnSave?: ((...args: any[]) => any) | undefined;
     onOnClose?: ((...args: any[]) => any) | undefined;
 }, {

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

@@ -1,4 +1,4 @@
-import { defineComponent, ref, computed, reactive, onMounted, openBlock, createElementBlock, normalizeStyle, createVNode, unref, withCtx, createElementVNode, normalizeClass, createCommentVNode, createBlock, toDisplayString, withDirectives, vShow, renderSlot, createTextVNode } from 'vue';
+import { defineComponent, ref, reactive, watch, onMounted, openBlock, createElementBlock, normalizeStyle, createVNode, unref, withCtx, createElementVNode, normalizeClass, createCommentVNode, createBlock, toDisplayString, withDirectives, vShow, renderSlot, createTextVNode } from 'vue';
 import { NSpin, NCheckbox, NTooltip, NSelect, NInput, NInputNumber, NButton } from 'naive-ui';
 import Draggable from 'vuedraggable';
 import _export_sfc from '../../../_virtual/plugin-vue_export-helper.js';
@@ -78,7 +78,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       default: false
     }
   },
-  emits: ["onSave", "onClose"],
+  emits: ["onSave", "onClose", "reset"],
   setup(__props, { expose, emit }) {
     const props = __props;
     const fieldsMapping = {
@@ -126,12 +126,11 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       });
       return result;
     }
-    const realityFields = computed(initFields);
     const state = reactive({
       spinning: false,
       isCustomSearch: true,
       clickItem: {},
-      fields: realityFields.value,
+      fields: [],
       widthShow: "10%",
       widthLarge: "20%"
     });
@@ -181,6 +180,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     };
     function reset() {
       state.fields = initFields();
+      emit("reset");
     }
     const calculateCheck = (key) => {
       if (!state.fields.length)
@@ -213,6 +213,11 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         state.widthLarge = "15%";
       }
     }
+    watch(() => props.fields, (value) => {
+      if ((value == null ? void 0 : value.length) > 0) {
+        state.fields = initFields();
+      }
+    }, { immediate: true, deep: true });
     onMounted(() => {
       hideTab();
       setWidth();

package/es/components/field-set/src/FieldSet.vue.d.ts

@@ -46,7 +46,7 @@ declare const _default: import("vue").DefineComponent<{
 }, {
     fieldsMapping: Record<string, string>;
     selectOptions: Record<string, string>[];
-    emit: (event: "onSave" | "onClose", ...args: any[]) => void;
+    emit: (event: "onSave" | "onClose" | "reset", ...args: any[]) => void;
     settingView: any;
     props: Readonly<import("@vue/shared").LooseRequired<Readonly<import("vue").ExtractPropTypes<{
         fields: {
@@ -66,11 +66,11 @@ declare const _default: import("vue").DefineComponent<{
             default: boolean;
         };
     }>> & {
+        onReset?: ((...args: any[]) => any) | undefined;
         onOnSave?: ((...args: any[]) => any) | undefined;
         onOnClose?: ((...args: any[]) => any) | undefined;
     }>>;
     initFields: () => any[];
-    realityFields: import("vue").ComputedRef<any[]>;
     state: Istate;
     leftStyle: (ele: Ifields) => {
         background: string | undefined;
@@ -166,7 +166,7 @@ declare const _default: import("vue").DefineComponent<{
         modelValue: unknown[];
         componentData: Record<string, any>;
     }>;
-}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("onSave" | "onClose")[], "onSave" | "onClose", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("onSave" | "onClose" | "reset")[], "onSave" | "onClose" | "reset", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     fields: {
         type: PropType<any[]>;
         default: () => never[];
@@ -184,6 +184,7 @@ declare const _default: import("vue").DefineComponent<{
         default: boolean;
     };
 }>> & {
+    onReset?: ((...args: any[]) => any) | undefined;
     onOnSave?: ((...args: any[]) => any) | undefined;
     onOnClose?: ((...args: any[]) => any) | undefined;
 }, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cnhis-design-vue",
-  "version": "3.1.22-beta.0",
+  "version": "3.1.22-beta.1",
   "license": "ISC",
   "module": "./es/components/index.js",
   "main": "./es/components/index.js",
@@ -66,5 +66,5 @@
     "iOS 7",
     "last 3 iOS versions"
   ],
-  "gitHead": "b705df583d21df6eb4b249b98dc6640283e80317"
+  "gitHead": "0df5a178c3cfc0cd8ff8dc298937c7e00423c2b7"
 }

package/es/components/big-table/src/components/edit-form/useCommon.d.ts

@@ -1,4 +0,0 @@
-export declare const useCommon: (props: any, attrs: any) => {
-    formRef: import("vue").Ref<HTMLElement | null>;
-    isShow: import("vue").Ref<boolean>;
-};

package/es/components/bpmn-workflow/types/BpmnViewer.d.ts

@@ -1 +0,0 @@
-declare module 'bpmn-js/lib/Viewer';

package/es/components/bpmn-workflow/types/ModelingModule.d.ts

@@ -1 +0,0 @@
-declare module 'bpmn-js/lib/features/modeling';

package/es/components/bpmn-workflow/types/MoveCanvasModule.d.ts

@@ -1 +0,0 @@
-declare module 'diagram-js/lib/navigation/movecanvas';