feat: Improved Git status change #326

dineug · Apr 13, 2024 · 7169bf2 · 7169bf2
1 parent 8d74395
commit 7169bf2
Show file tree

Hide file tree

Showing 15 changed files with 150 additions and 42 deletions.
diff --git a/json-schema/schema.json b/json-schema/schema.json
@@ -138,6 +138,10 @@
         },
         "maxWidthComment": {
           "type": "integer"
+        },
+        "ignoreSaveSettings": {
+          "description": "bit value (scroll: 1) | (zoomLevel: 2)",
+          "type": "integer"
         }
       },
       "required": [

diff --git a/packages/erd-editor-schema/src/parser.ts b/packages/erd-editor-schema/src/parser.ts
@@ -1,8 +1,13 @@
 import { pick } from 'lodash-es';
 
 import { v2ToV3, v3ToV2 } from '@/convert';
+import { bHas } from '@/utils/bit';
 import { type ERDEditorSchemaV2, schemaV2Parser } from '@/v2';
-import { type ERDEditorSchemaV3, schemaV3Parser } from '@/v3';
+import {
+  type ERDEditorSchemaV3,
+  SchemaV3Constants,
+  schemaV3Parser,
+} from '@/v3';
 
 export function parser(source: string): ERDEditorSchemaV3 {
   const json = JSON.parse(source);
@@ -22,6 +27,26 @@ export function toJson(schemaV3: ERDEditorSchemaV3) {
     'collections',
     'lww',
   ]);
+
+  if (
+    bHas(
+      source.settings.ignoreSaveSettings,
+      SchemaV3Constants.SaveSettingType.scroll
+    )
+  ) {
+    source.settings.scrollTop = 0;
+    source.settings.scrollLeft = 0;
+  }
+
+  if (
+    bHas(
+      source.settings.ignoreSaveSettings,
+      SchemaV3Constants.SaveSettingType.zoomLevel
+    )
+  ) {
+    source.settings.zoomLevel = 1;
+  }
+
   return JSON.stringify(source, null, 2);
 }
 

diff --git a/packages/erd-editor-schema/src/v3/parser/settings.ts b/packages/erd-editor-schema/src/v3/parser/settings.ts
@@ -66,6 +66,7 @@ const createSettings = (): Settings => ({
     ColumnType.columnComment,
   ],
   maxWidthComment: -1,
+  ignoreSaveSettings: 0,
 });
 
 const sizeInRange = createInRange(CANVAS_SIZE_MIN, CANVAS_SIZE_MAX);
@@ -96,6 +97,7 @@ export function createAndMergeSettings(json?: DeepPartial<Settings>): Settings {
   assignNumber('scrollTop');
   assignNumber('scrollLeft');
   assignNumber('show');
+  assignNumber('ignoreSaveSettings');
   assignString('databaseName');
   assignString('canvasType');
   assignBoolean('relationshipDataTypeSync');

diff --git a/packages/erd-editor-schema/src/v3/schema/index.ts b/packages/erd-editor-schema/src/v3/schema/index.ts
@@ -33,6 +33,7 @@ import {
   LanguageList,
   NameCase,
   NameCaseList,
+  SaveSettingType,
   Settings,
   Show,
 } from '@/v3/schema/settings';
@@ -83,6 +84,7 @@ export const SchemaV3Constants = {
   ColumnUIKey,
   OrderType,
   OrderTypeList,
+  SaveSettingType,
   CANVAS_SIZE_MAX,
   CANVAS_SIZE_MIN,
   CANVAS_ZOOM_MAX,

diff --git a/packages/erd-editor-schema/src/v3/schema/settings.ts b/packages/erd-editor-schema/src/v3/schema/settings.ts
@@ -18,6 +18,7 @@ export type Settings = {
   relationshipOptimization: boolean;
   columnOrder: number[];
   maxWidthComment: number;
+  ignoreSaveSettings: number;
 };
 
 export const CanvasType = {
@@ -91,6 +92,11 @@ export const BracketType = {
 export const BracketTypeList: ReadonlyArray<number> =
   Object.values(BracketType);
 
+export const SaveSettingType = {
+  scroll: /*    */ 0b0000000000000000000000000000001,
+  zoomLevel: /* */ 0b0000000000000000000000000000010,
+};
+
 export const CANVAS_ZOOM_MIN = 0.1;
 export const CANVAS_ZOOM_MAX = 1;
 export const CANVAS_SIZE_MIN = 2_000;

diff --git a/packages/erd-editor-vscode/package.json b/packages/erd-editor-vscode/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vuerd-vscode",
-  "version": "1.0.19",
+  "version": "1.0.20",
   "private": true,
   "description": "Entity-Relationship Diagram Editor VSCode Extension",
   "icon": "./assets/erd-editor.png",
@@ -50,7 +50,6 @@
     "@dineug/erd-editor-vscode-bridge": "workspace:*",
     "@dineug/erd-editor-vscode-webview": "workspace:*",
     "@types/node": "^18.15.0",
-    "@types/opentype.js": "^1.3.8",
     "@types/vscode": "^1.85.0",
     "base64-arraybuffer": "^1.0.2",
     "crypto-js": "^4.2.0",

diff --git a/packages/erd-editor/package.json b/packages/erd-editor/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@dineug/erd-editor",
-  "version": "3.2.2",
+  "version": "3.2.3",
   "description": "Entity-Relationship Diagram Editor",
   "type": "module",
   "main": "./dist/erd-editor.js",

diff --git a/packages/erd-editor/src/components/settings/Settings.ts b/packages/erd-editor/src/components/settings/Settings.ts
@@ -22,13 +22,15 @@ import SettingsLnb, {
 } from '@/components/settings/settings-lnb/SettingsLnb';
 import Shortcuts from '@/components/settings/shortcuts/Shortcuts';
 import { COLUMN_MIN_WIDTH } from '@/constants/layout';
-import { ColumnTypeToName } from '@/constants/schema';
+import { ColumnTypeToName, SaveSettingType } from '@/constants/schema';
 import {
   changeColumnOrderAction,
+  changeIgnoreSaveSettingsAction,
   changeMaxWidthCommentAction,
   changeRelationshipDataTypeSyncAction,
 } from '@/engine/modules/settings/atom.actions';
 import { fontSize6 } from '@/styles/typography.styles';
+import { bHas } from '@/utils/bit';
 import { recalculateTableWidth } from '@/utils/calcTable';
 import { onPrevent } from '@/utils/domEvent';
 import { relationshipSort } from '@/utils/draw-relationship/sort';
@@ -135,6 +137,28 @@ const Settings: FC<SettingsProps> = (props, ctx) => {
     store.dispatch(changeMaxWidthCommentAction({ value: maxWidthComment }));
   };
 
+  const handleChangeScrollSaveSettings = (value: boolean) => {
+    const { store } = app.value;
+
+    store.dispatch(
+      changeIgnoreSaveSettingsAction({
+        saveSettingType: SaveSettingType.scroll,
+        value: !value,
+      })
+    );
+  };
+
+  const handleChangeZoomLevelSaveSettings = (value: boolean) => {
+    const { store } = app.value;
+
+    store.dispatch(
+      changeIgnoreSaveSettingsAction({
+        saveSettingType: SaveSettingType.zoomLevel,
+        value: !value,
+      })
+    );
+  };
+
   return () => {
     const { store } = app.value;
     const { settings } = store.state;
@@ -160,6 +184,31 @@ const Settings: FC<SettingsProps> = (props, ctx) => {
                         .onChange=${handleChangeRelationshipDataTypeSync}
                       />
                     </div>
+
+                    <div class=${styles.row}>
+                      <div>Save Scroll Information</div>
+                      <div class=${styles.vertical(16)}></div>
+                      <${Switch}
+                        value=${!bHas(
+                          settings.ignoreSaveSettings,
+                          SaveSettingType.scroll
+                        )}
+                        .onChange=${handleChangeScrollSaveSettings}
+                      />
+                    </div>
+
+                    <div class=${styles.row}>
+                      <div>Save Zoom Information</div>
+                      <div class=${styles.vertical(16)}></div>
+                      <${Switch}
+                        value=${!bHas(
+                          settings.ignoreSaveSettings,
+                          SaveSettingType.zoomLevel
+                        )}
+                        .onChange=${handleChangeZoomLevelSaveSettings}
+                      />
+                    </div>
+
                     <div class=${styles.row}>
                       <div>Maximum comment width</div>
                       <div class=${styles.vertical(16)}></div>
@@ -180,6 +229,7 @@ const Settings: FC<SettingsProps> = (props, ctx) => {
                         .onChange=${handleChangeMaxWidthComment}
                       />
                     </div>
+
                     <div class=${styles.row}>
                       <div>Recalculation table width</div>
                       <div class=${styles.vertical(16)}></div>

diff --git a/packages/erd-editor/src/constants/schema.ts b/packages/erd-editor/src/constants/schema.ts
@@ -24,6 +24,7 @@ export const ColumnOption = SchemaV3Constants.ColumnOption;
 export const ColumnUIKey = SchemaV3Constants.ColumnUIKey;
 export const OrderType = SchemaV3Constants.OrderType;
 export const OrderTypeList = SchemaV3Constants.OrderTypeList;
+export const SaveSettingType = SchemaV3Constants.SaveSettingType;
 export const CANVAS_SIZE_MAX = SchemaV3Constants.CANVAS_SIZE_MAX;
 export const CANVAS_SIZE_MIN = SchemaV3Constants.CANVAS_SIZE_MIN;
 export const CANVAS_ZOOM_MAX = SchemaV3Constants.CANVAS_ZOOM_MAX;

diff --git a/packages/erd-editor/src/engine/actions.ts b/packages/erd-editor/src/engine/actions.ts
@@ -138,6 +138,7 @@ export const ChangeActionTypes: ReadonlyArray<ActionType> = [
   'settings.changeRelationshipOptimization',
   'settings.changeColumnOrder',
   'settings.changeMaxWidthComment',
+  'settings.changeIgnoreSaveSettings',
   // editor
   'editor.loadJson',
   'editor.clear',

diff --git a/packages/erd-editor/src/engine/modules/settings/actions.ts b/packages/erd-editor/src/engine/modules/settings/actions.ts
@@ -22,6 +22,7 @@ export const ActionType = {
   changeRelationshipOptimization: 'settings.changeRelationshipOptimization',
   changeColumnOrder: 'settings.changeColumnOrder',
   changeMaxWidthComment: 'settings.changeMaxWidthComment',
+  changeIgnoreSaveSettings: 'settings.changeIgnoreSaveSettings',
 } as const;
 export type ActionType = ValuesType<typeof ActionType>;
 
@@ -82,6 +83,10 @@ export type ActionMap = {
   [ActionType.changeMaxWidthComment]: {
     value: number;
   };
+  [ActionType.changeIgnoreSaveSettings]: {
+    saveSettingType: number;
+    value: boolean;
+  };
 };
 
 export type ReducerType<T extends keyof ActionMap> = Reducer<

diff --git a/packages/erd-editor/src/engine/modules/settings/atom.actions.ts b/packages/erd-editor/src/engine/modules/settings/atom.actions.ts
@@ -266,6 +266,18 @@ const changeMaxWidthComment: ReducerType<
     value === -1 ? value : maxWidthCommentInRange(value);
 };
 
+export const changeIgnoreSaveSettingsAction = createAction<
+  ActionMap[typeof ActionType.changeIgnoreSaveSettings]
+>(ActionType.changeIgnoreSaveSettings);
+
+const changeIgnoreSaveSettings: ReducerType<
+  typeof ActionType.changeIgnoreSaveSettings
+> = ({ settings }, { payload: { saveSettingType, value } }) => {
+  settings.ignoreSaveSettings = value
+    ? settings.ignoreSaveSettings | saveSettingType
+    : settings.ignoreSaveSettings & ~saveSettingType;
+};
+
 export const settingsReducers = {
   [ActionType.changeDatabaseName]: changeDatabaseName,
   [ActionType.resize]: resize,
@@ -284,6 +296,7 @@ export const settingsReducers = {
   [ActionType.changeRelationshipOptimization]: changeRelationshipOptimization,
   [ActionType.changeColumnOrder]: changeColumnOrder,
   [ActionType.changeMaxWidthComment]: changeMaxWidthComment,
+  [ActionType.changeIgnoreSaveSettings]: changeIgnoreSaveSettings,
 };
 
 export const actions = {
@@ -304,4 +317,5 @@ export const actions = {
   changeRelationshipOptimizationAction,
   changeColumnOrderAction,
   changeMaxWidthCommentAction,
+  changeIgnoreSaveSettingsAction,
 };
diff --git a/packages/erd-editor/src/engine/modules/table-column/hooks.ts b/packages/erd-editor/src/engine/modules/table-column/hooks.ts
@@ -95,27 +95,30 @@ const validationForeignKeyHook: CO = function* (channel, state) {
       .collection('tableEntities')
       .selectByIds(doc.tableIds);
     const foreignKeyColumnIdsSet = new Set<string>();
+    const columnCollection = query(collections).collection(
+      'tableColumnEntities'
+    );
 
     for (const { end } of relationships) {
-      query(collections)
-        .collection('tableColumnEntities')
-        .updateMany(end.columnIds, column => {
-          column.ui.keys = column.ui.keys | ColumnUIKey.foreignKey;
-          foreignKeyColumnIdsSet.add(column.id);
-        });
+      const columns = columnCollection.selectByIds(end.columnIds);
+
+      for (const column of columns) {
+        column.ui.keys = column.ui.keys | ColumnUIKey.foreignKey;
+        foreignKeyColumnIdsSet.add(column.id);
+      }
     }
 
     for (const table of tables) {
-      query(collections)
-        .collection('tableColumnEntities')
-        .updateMany(table.columnIds, column => {
-          if (
-            bHas(column.ui.keys, ColumnUIKey.foreignKey) &&
-            !foreignKeyColumnIdsSet.has(column.id)
-          ) {
-            column.ui.keys = column.ui.keys & ~ColumnUIKey.foreignKey;
-          }
-        });
+      const columns = columnCollection.selectByIds(table.columnIds);
+
+      for (const column of columns) {
+        if (
+          bHas(column.ui.keys, ColumnUIKey.foreignKey) &&
+          !foreignKeyColumnIdsSet.has(column.id)
+        ) {
+          column.ui.keys = column.ui.keys & ~ColumnUIKey.foreignKey;
+        }
+      }
     }
   });
 };

diff --git a/packages/erd-editor/src/utils/calcTable.ts b/packages/erd-editor/src/utils/calcTable.ts
@@ -198,19 +198,22 @@ export function recalculateTableWidth(
   { doc: { tableIds }, collections }: RootState,
   { toWidth }: EngineContext
 ) {
-  query(collections)
+  const tables = query(collections)
     .collection('tableEntities')
-    .updateMany(tableIds, table => {
-      table.ui.widthName = textInRange(toWidth(table.name));
-      table.ui.widthComment = textInRange(toWidth(table.comment));
-
-      query(collections)
-        .collection('tableColumnEntities')
-        .updateMany(table.columnIds, column => {
-          column.ui.widthName = textInRange(toWidth(column.name));
-          column.ui.widthDataType = textInRange(toWidth(column.dataType));
-          column.ui.widthDefault = textInRange(toWidth(column.default));
-          column.ui.widthComment = textInRange(toWidth(column.comment));
-        });
-    });
+    .selectByIds(tableIds);
+  const columnCollection = query(collections).collection('tableColumnEntities');
+
+  for (const table of tables) {
+    table.ui.widthName = textInRange(toWidth(table.name));
+    table.ui.widthComment = textInRange(toWidth(table.comment));
+
+    const columns = columnCollection.selectByIds(table.columnIds);
+
+    for (const column of columns) {
+      column.ui.widthName = textInRange(toWidth(column.name));
+      column.ui.widthDataType = textInRange(toWidth(column.dataType));
+      column.ui.widthDefault = textInRange(toWidth(column.default));
+      column.ui.widthComment = textInRange(toWidth(column.comment));
+    }
+  }
 }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml