@newview/ui 1.1.6 → 1.1.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@newview/ui",
-  "version": "1.1.6",
+  "version": "1.1.7",
   "author": "newview",
   "type": "module",
   "main": "./dist/newview-ui.umd.cjs",
@@ -37,7 +37,6 @@
     "ace-builds": "^1.23.1",
     "bin-editor-next": "^1.1.0",
     "dayjs": "1.11.7",
-    "docx": "8.2.2",
     "jquery": "3.6.3",
     "jszip": "3.10.1",
     "linq": "4.0.1",

package/types/DocxTemplat.d.ts

@@ -1,5 +1,5 @@
-export * as DocxTemplat from 'docx'
-import {Document} from 'docx'
+import { Table, TableCell, ImageRun, Footer, TextRun, Header, Paragraph, TableRow, HeightRule, WidthType, VerticalAlign, Document, TableOfContents, StyleLevel, HeadingLevel, AlignmentType, Tab, NumberFormat, PageNumber, LineRuleType, Packer } from "docx";
+export { Table, TableCell, ImageRun, Footer, TextRun, Header, Paragraph, TableRow, HeightRule, WidthType, VerticalAlign, Document, TableOfContents, StyleLevel, HeadingLevel, AlignmentType, Tab, NumberFormat, PageNumber, LineRuleType, Packer }
 export enum FontSize {
     初号 = "42pt",
     小初 = "36pt",
@@ -15,6 +15,29 @@ export enum FontSize {
     小五 = "9pt",
 }
 
-export async function GetImageArr(imgPath): Promises<ArrayBuffer> { }
 
-export async function downloadFile(docx: Document) { }
+
+import { BaseInstance } from "@newview/base-vue";
+import type { DefineComponent } from 'vue';
+
+export declare class DocxDesignerInstance extends BaseInstance {
+
+}
+
+export declare const DocxDesigner: DefineComponent<{
+    
+}>
+export declare const ContentTree: DefineComponent<{
+    
+}>
+export declare class ContentTreeInstance extends BaseInstance {
+
+}
+
+export declare class ContentTreeViewInstance extends BaseInstance {
+
+}
+
+export declare const ContentTreeView: DefineComponent<{
+    
+}>

package/types/Grid.d.ts

@@ -78,7 +78,7 @@ export interface GridOptions {
     /**
      * 列参数
      */
-    columns?: GridColumn[];    
+    columns?: GridColumn[];
 }
 
 /**
@@ -182,14 +182,17 @@ export interface GridSelectProp {
      */
     data?: GridSelectOptionProp[],
     multiple?: boolean,
-    clearable?: boolean
+    clearable?: boolean,
+    transfer?: boolean
 }
 
 /**
  * 树形下拉配置
  */
 export interface GridTreeSelectProp {
-    data?: GridTreeSelectOptionProp[]
+    data?: GridTreeSelectOptionProp[],
+    multiple?: boolean,
+    transfer?: boolean
 }
 
 /**
@@ -260,6 +263,10 @@ export interface GridSetting {
      * 树配置
      */
     treeConfig?: VxeTablePropTypes.TreeConfig;
+    /**
+     * 分页组件配置
+     */
+    pageConfig?: PageConfig
     /**
      * 是否显示边框
      */
@@ -310,6 +317,17 @@ export interface SearchConfig {
     defaultShowSearch?: boolean;
 }
 
+
+/**
+ * 分页组件配置
+ */
+export interface PageConfig {
+    /**
+     * 简洁版
+     */
+    simple?: boolean
+}
+
 /**
  * 事件
  */
@@ -349,6 +367,13 @@ export interface GridEvent extends VxeTableListeners {
      * 编辑行之前事件
      */
     event_editRowBefore?: (row: any, parentRow: any) => any;
+
+    /**
+     * 数据加载完成事件
+     * @param datas 
+     * @returns 
+     */
+    event_loaded?: (datas: any[]) => void;
 }
 
 /**

package/types/LuckySheet.d.ts

@@ -203,7 +203,7 @@ export declare class SheetApi {
     /**
      * 获取sheet页sheettag属性 19
      */
-    getSheetTag(sheetIndex: number): any;
+    getSheetTag(sheetIndex?: number): any;
 
     /**
      * 获取指定sheetIndex的信息表头表尾等
@@ -846,6 +846,10 @@ export declare class PrintApi {
      * @returns 
      */
     getPrintContent(): Promise<string>;
+    /**
+     * 获取预览内容
+     */
+    getPreviewContent(): Promise<string>;
 }
 
 export declare class GraphicsApi {
@@ -978,11 +982,13 @@ export declare class MergeApi {
 
     /**
      * 解除某个区域的合并
-     * @param start A1
-     * @param end B2
-     * @param strhandle
+     * @param row1 
+     * @param col1 
+     * @param row2 
+     * @param col2 
+     * @param strhandle 
      */
-    deMerg(start: string, end: string, strhandle?: string): void;
+    deMerg(row1: number, col1: number, row2: number, col2: number, strhandle?: string): void;
 
 }
 

package/types/Toolbar.d.ts

@@ -37,6 +37,10 @@ export declare interface ToolbarOption {
      * 是否禁用
      */
     isEnable?: Function;
+    /**
+     * 加载中
+     */
+    loading?: Function;
     /**
      * 按钮大小，可选值为 large、small、default 或者不设置
      */

package/vite.config.ts

@@ -26,12 +26,15 @@ export default defineConfig({
         "qrcodejs2",
         "sass",
         "view-ui-plus",
-        "vue",
         "vue-router",
         "vxe-table",
         "x2js",
         "xe-utils",
-        "xlsx"
+        "xlsx",
+        "vue",
+        "sortablejs",
+        "vue-draggable-next",
+        "@vue-office/docx"
       ],
       output: {
         globals: {