commit：前端webpack版本

OrangeFormsOpen-VUE3/src/components/AdvanceQuery/index.vue

@@ -149,7 +149,7 @@ const loadGroupData = () => {
         }
         if (currentGroup.value == null) currentGroup.value = dataList[0];
         setTimeout(() => {
-          if (groupTree.value)
+          if (groupTree.value && currentGroup.value)
             groupTree.value.setCurrentKey(currentGroup.value[props.treePanel.keyColumnName]);
         }, 50);
       })

OrangeFormsOpen-VUE3/src/components/Dialog/index.ts

@@ -70,11 +70,10 @@ export class Dialog {
         },
       };
 
-      let layerOptions = {
+      let layerOptions: ANY_OBJECT = {
         title: title,
         type: 1,
-        skin:
-          'layer-dialog ' + (window.innerWidth <= 1900 ? 'container-default' : 'container-large'),
+        skin: 'layui-layer-page',
         resize: false,
         offset: 'auto',
         shadeClose: false,
@@ -103,7 +102,8 @@ export class Dialog {
 
       console.log('dialog params', params);
       //layerOptions.content = h(component, params);
-      layerOptions.content = h(Layout, () => h(component, params));
+      const vueComponent = h(Layout, () => h(component, params));
+      layerOptions.content = vueComponent;
 
       const id = layer.open(layerOptions);
       observer.index = id;

OrangeFormsOpen-VUE3/src/components/SpreadSheet/component/sheet.js

@@ -965,6 +965,9 @@ const getWidth = () => {
   return '100%';
 };
 export default class Sheet {
+  cell(ri, ci, sheetIndex) {
+    throw new Error('Method not implemented.');
+  }
   constructor(targetEl, data) {
     this.eventMap = createEventEmitter();
     const { showToolbar, showContextmenu, mode } = data.settings;

OrangeFormsOpen-VUE3/src/components/SpreadSheet/index.d.ts

@@ -1,193 +0,0 @@
-declare module 'x-data-spreadsheet' {
-  export interface ExtendToolbarOption {
-    tip?: string;
-    el?: HTMLElement;
-    icon?: string;
-    onClick?: (data: object, sheet: object) => void;
-  }
-  export interface Options {
-    mode?: 'edit' | 'read';
-    showToolbar?: boolean;
-    showGrid?: boolean;
-    showContextmenu?: boolean;
-    showBottomBar?: boolean;
-    extendToolbar?: {
-      left?: ExtendToolbarOption[];
-      right?: ExtendToolbarOption[];
-    };
-    autoFocus?: boolean;
-    view?: {
-      height: () => number;
-      width: () => number;
-    };
-    row?: {
-      len: number;
-      height: number;
-    };
-    col?: {
-      len: number;
-      width: number;
-      indexWidth: number;
-      minWidth: number;
-    };
-    style?: {
-      bgcolor: string;
-      align: 'left' | 'center' | 'right';
-      valign: 'top' | 'middle' | 'bottom';
-      textwrap: boolean;
-      strike: boolean;
-      underline: boolean;
-      color: string;
-      font: {
-        name: 'Helvetica';
-        size: number;
-        bold: boolean;
-        italic: false;
-      };
-    };
-  }
-
-  export type CELL_SELECTED = 'cell-selected';
-  export type CELLS_SELECTED = 'cells-selected';
-  export type CELL_EDITED = 'cell-edited';
-
-  export type CellMerge = [number, number];
-
-  export interface SpreadsheetEventHandler {
-    (envt: CELL_SELECTED, callback: (cell: Cell, rowIndex: number, colIndex: number) => void): void;
-    (
-      envt: CELLS_SELECTED,
-      callback: (
-        cell: Cell,
-        parameters: { sri: number; sci: number; eri: number; eci: number },
-      ) => void,
-    ): void;
-    (evnt: CELL_EDITED, callback: (text: string, rowIndex: number, colIndex: number) => void): void;
-  }
-
-  export interface ColProperties {
-    width?: number;
-  }
-
-  /**
-   * Data for representing a cell
-   */
-  export interface CellData {
-    text: string;
-    style?: number;
-    merge?: CellMerge;
-  }
-  /**
-   * Data for representing a row
-   */
-  export interface RowData {
-    cells: {
-      [key: number]: CellData;
-    };
-  }
-
-  /**
-   * Data for representing a sheet
-   */
-  export interface SheetData {
-    name?: string;
-    freeze?: string;
-    styles?: CellStyle[];
-    merges?: string[];
-    cols?: {
-      len?: number;
-      [key: number]: ColProperties;
-    };
-    rows?: {
-      [key: number]: RowData;
-    };
-  }
-
-  /**
-   * Data for representing a spreadsheet
-   */
-  export interface SpreadsheetData {
-    [index: number]: SheetData;
-  }
-
-  export interface CellStyle {
-    align?: 'left' | 'center' | 'right';
-    valign?: 'top' | 'middle' | 'bottom';
-    font?: {
-      bold?: boolean;
-    };
-    bgcolor?: string;
-    textwrap?: boolean;
-    color?: string;
-    border?: {
-      top?: string[];
-      right?: string[];
-      bottom?: string[];
-      left?: string[];
-    };
-  }
-  export interface Editor {}
-  export interface Element {}
-
-  export interface Row {}
-  export interface Table {}
-  export interface Cell {}
-  export interface Sheet {}
-
-  export default class Spreadsheet {
-    constructor(container: string | HTMLElement, opts?: Options);
-    on: SpreadsheetEventHandler;
-    /**
-     * retrieve cell
-     * @param rowIndex {number} row index
-     * @param colIndex {number} column index
-     * @param sheetIndex {number} sheet iindex
-     */
-    cell(rowIndex: number, colIndex: number, sheetIndex: number): Cell;
-    /**
-     * retrieve cell style
-     * @param rowIndex
-     * @param colIndex
-     * @param sheetIndex
-     */
-    cellStyle(rowIndex: number, colIndex: number, sheetIndex: number): CellStyle;
-    /**
-     * get/set cell text
-     * @param rowIndex
-     * @param colIndex
-     * @param text
-     * @param sheetIndex
-     */
-    cellText(rowIndex: number, colIndex: number, text: string, sheetIndex?: number): this;
-    /**
-     * remove current sheet
-     */
-    deleteSheet(): void;
-
-    /**s
-     * load data
-     * @param json
-     */
-    loadData(json: Record<string, any>): this;
-    /**
-     * get data
-     */
-    getData(): Record<string, any>;
-    /**
-     * bind handler to change event, including data change and user actions
-     * @param callback
-     */
-    change(callback: (json: Record<string, any>) => void): this;
-    /**
-     * set locale
-     * @param lang
-     * @param message
-     */
-    static locale(lang: string, message: object): void;
-  }
-  global {
-    interface Window {
-      x_spreadsheet(container: string | HTMLElement, opts?: Options): Spreadsheet;
-    }
-  }
-}

OrangeFormsOpen-VUE3/src/components/layout/components/SubMenu.vue

@@ -23,7 +23,7 @@
         }}</span>
       </template>
       <template v-for="child in menu.children" :key="child.menuId">
-        <sub-menu class="nest-menu" :menu="child" :isChild="true" />
+        <sub-menu class="nest-menu" :index="child.menuId" :menu="child" :isChild="true" />
       </template>
     </el-sub-menu>
   </div>
@@ -63,7 +63,7 @@ const getTextStyle = (isShow: boolean) => {
 .nest-menu :deep(.el-menu-item span:first-child),
 .nest-menu :deep(.el-menu-item .menu-icon:first-child),
 .nest-menu :deep(.el-submenu__title span:first-child) {
-  padding-left: 8px !important;
+  padding-left: 14px !important;
 }
 .nest-menu :deep(.el-submenu__title .menu-icon:first-child) {
   margin-left: 8px !important;

OrangeFormsOpen-VUE3/src/components/layout/index.vue

@@ -144,7 +144,7 @@ const route = useRoute();
 const layoutStore = useLayoutStore();
 const loginStore = useLoginStore();
 const documentClientHeight = inject('documentClientHeight', ref(500));
-const projectName = import.meta.env.VITE_PROJECT_NAME;
+const projectName = process.env.VUE_APP_PROJECT_NAME;
 
 const { getUploadFileUrl } = useUpload();