plain-design 1.0.0-beta.55 → 1.0.0-beta.57

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "plain-design",
-  "version": "1.0.0-beta.55",
+  "version": "1.0.0-beta.57",
   "description": "",
   "main": "dist/plain-design.min.js",
   "module": "dist/plain-design.commonjs.min.js",

package/src/packages/components/AutoTable/auto-table.scss

@@ -28,6 +28,10 @@
         margin-top: $margin;
       }
     }
+
+    & + .#{componentName(auto-table)} {
+      margin-top: $margin;
+    }
   }
 
   .virtual-table-head-table {

package/src/packages/i18n/i18n.utils.ts

@@ -158,7 +158,17 @@ export const i18n = (() => {
    * @date    2023/10/11 9:30
    */
   const setLangs = (langs: any) => {
-    state.langs = deepmerge(state.langs, langs);
+
+    let mergeLangs = {} as any;
+    Object.keys({ ...state.langs, ...langs }).forEach(localeName => {
+      mergeLangs[localeName] = {
+        ...state.langs[localeName],
+        ...langs[localeName]
+      };
+    });
+
+    state.langs = mergeLangs;
+
     hooks.onUpdateLangs.exec(undefined);
   };
 

package/src/packages/i18n/lang/en-us.ts

@@ -9,52 +9,52 @@ export const EnUsLocale: tZhCnLocale = {
     reset: 'Reset',
     loading: 'Loading',
     loaded: 'Loaded',
-    loadFailed: 'Load Failed',
+    loadFailed: 'Load failed',
     clear: 'Clear',
     close: 'Close',
-    width: 'width',
-    empty: 'no data',
-    more: 'more',
-    selectData: 'select data',
-    selectPieceOfData: 'select piece of data',
-    selectAtLeastOnePieceOfData: 'select at lease on piece of data',
-    prevStep: 'previous step',
-    nextStep: 'next step',
-    total: 'total',
-    data: 'rows',
-    go: 'go',
-    page: 'page',
-    totalPage: 'total {total} rows',
-    collapse: 'collapse',
-    main: 'main',
-    fixed: 'fixed',
-    hide: 'hidden',
-    exportData: 'export data',
-    custom: 'custom',
-    setting: 'setting',
-    asc: 'asc',
-    desc: 'desc',
-    sort: 'sort',
-    name: 'name',
-    pleaseSelect: 'please select',
-    noData: 'no data',
-    noMatch: 'no match',
-    query: 'query',
-    id: 'id',
-    isEmpty: 'is empty',
-    isNotEmpty: 'is not empty',
-    largerThan: 'larger than',
-    lessThan: 'less than',
-    and: 'and',
-    invalidAmount: 'invalid amount',
-    province: 'province',
-    city: 'city',
-    district: 'district',
-    lookUp: 'look up',
-    operation: 'operation',
-    noFilter: 'no filter',
+    width: 'Width',
+    empty: 'No data',
+    more: 'More',
+    selectData: 'Select Data',
+    selectPieceOfData: 'Select piece of data',
+    selectAtLeastOnePieceOfData: 'Select at lease on piece of data',
+    prevStep: 'Previous step',
+    nextStep: 'Next step',
+    total: 'Total',
+    data: 'Rows',
+    go: 'Go',
+    page: 'Page',
+    totalPage: 'Total {total} rows',
+    collapse: 'Collapse',
+    main: 'Main',
+    fixed: 'Fixed',
+    hide: 'Hidden',
+    exportData: 'Export data',
+    custom: 'Custom',
+    setting: 'Setting',
+    asc: 'Asc',
+    desc: 'Desc',
+    sort: 'Sort',
+    name: 'Name',
+    pleaseSelect: 'Please select',
+    noData: 'No data',
+    noMatch: 'No match',
+    query: 'Search',
+    id: 'ID',
+    isEmpty: 'Is empty',
+    isNotEmpty: 'Is not empty',
+    largerThan: 'Larger than',
+    lessThan: 'Less than',
+    and: 'And',
+    invalidAmount: 'Invalid amount',
+    province: 'Province',
+    city: 'City',
+    district: 'District',
+    lookUp: 'Look up',
+    operation: 'Operation',
+    noFilter: 'No filter',
     validate: {
-      require: ' require',
+      require: ' Require',
       notMatchPattern: ' not match patter',
       canNotUseMinInAnyType: ' any type cannot use min validation',
       canNotUseMaxInAnyType: ' any type cannot use max validation',
@@ -82,41 +82,41 @@ export const EnUsLocale: tZhCnLocale = {
 
     },
     filter: {
-      like: 'like',
-      equal: 'equal',
-      notInclude: 'not include',
-      include: 'include',
-      range: 'range',
+      like: 'Like',
+      equal: 'Equal',
+      notInclude: 'Not include',
+      include: 'Include',
+      range: 'Range',
     },
     select: {
-      all: 'all',
-      reverse: 'reverse',
-      none: 'clear',
-      selectOptionsAtMost: 'select {val} options at most',
-      selectOptionsAtLeast: 'select {val} options at least',
+      all: 'All',
+      reverse: 'Reverse',
+      none: 'Clear',
+      selectOptionsAtMost: 'Select {val} options at most',
+      selectOptionsAtLeast: 'Select {val} options at least',
     },
-    zoomIn: 'zoom in',
-    zoomOut: 'zoom out',
-    address: 'address',
+    zoomIn: 'Zoom in',
+    zoomOut: 'Zoom out',
+    address: 'Address',
     edit: {
-      create: 'create',
-      edit: 'edit',
-      remove: 'delete',
-      apply: 'apply',
-      override: 'override',
-      copy: 'copy',
-      rename: 'rename',
-      add: 'add',
-      expandAll: 'expand all',
-      collapseAll: 'collapse all',
-      summary: 'sum',
-      save: 'save',
-      done: 'done',
+      create: 'Create',
+      edit: 'Edit',
+      remove: 'Delete',
+      apply: 'Apply',
+      override: 'Override',
+      copy: 'Copy',
+      rename: 'Rename',
+      add: 'Add',
+      expandAll: 'Expand all',
+      collapseAll: 'Collapse all',
+      summary: 'Sum',
+      save: 'Save',
+      done: 'Done',
     },
   },
   formatter: {
-    week: 'year gggg,week ww',
-    quarter: 'year YYYY, quarter Q',
+    week: 'Year gggg,week ww',
+    quarter: 'Year YYYY, quarter Q',
   },
   week: {
     sunday: 'SUN',
@@ -142,132 +142,132 @@ export const EnUsLocale: tZhCnLocale = {
     december: 'DEV',
   },
   file: {
-    upload: 'upload',
-    selectFile: 'select file',
-    toBeUpload: 'to be upload',
-    uploadFailed: 'upload failed',
-    dropFilesOr: 'drop file here, or',
+    upload: 'Upload',
+    selectFile: 'Select file',
+    toBeUpload: 'To be upload',
+    uploadFailed: 'Upload failed',
+    dropFilesOr: 'Drop file here, or',
     clickToUpload: 'click to upload',
     oversize: '[{filename}]file size is {filesize}MB，the maximunize is {max}MB',
-    notUpload: 'not upload',
+    notUpload: 'Not upload',
     areYouSureToDeleteFile: 'Are you sure to delete {name} ?',
-    uploadFileSucceed: 'file {name} upload success',
+    uploadFileSucceed: 'File {name} upload success',
   },
   image: {
-    compressByImageMeasure: 'compress by image measure',
-    compressByImageCapacity: 'compress by image capacity',
-    noPicture: 'no picture',
-    rotation90: 'rotate 90 degree',
-    rotation_90: 'rotate -90 degree',
-    prevPicture: 'previous pickture',
-    nextPicture: 'next picture',
+    compressByImageMeasure: 'Compress by image measure',
+    compressByImageCapacity: 'Compress by image capacity',
+    noPicture: 'No picture',
+    rotation90: 'Rotate 90 degree',
+    rotation_90: 'Rotate -90 degree',
+    prevPicture: 'Previous pickture',
+    nextPicture: 'Next picture',
   },
   table: {
-    exportingData: 'exporting data',
-    exportCompleted: 'export completed',
-    exportFailed: 'export failed',
-    expression: 'expresison',
-    configSeniorFilter: 'senior filter',
-    formFilter: 'form filter',
-    formQuery: 'form query',
-    searchBar: 'search bar',
-    pleaseEditSearchParam: 'please input search param directly',
-    allFilter: 'all filter',
-    noFilter: 'no filter',
-    clearAll: 'clear all',
-    pleaseInputThConfigurationName: 'please input configuration name',
-    bak: 'backup',
+    exportingData: 'Exporting data',
+    exportCompleted: 'Export completed',
+    exportFailed: 'Export failed',
+    expression: 'Expresison',
+    configSeniorFilter: 'Senior filter',
+    formFilter: 'Form filter',
+    formQuery: 'Form query',
+    searchBar: 'Search bar',
+    pleaseEditSearchParam: 'Please input search param directly',
+    allFilter: 'All filter',
+    noFilter: 'No filter',
+    clearAll: 'Clear all',
+    pleaseInputThConfigurationName: 'Please input configuration name',
+    bak: 'Backup',
     areYouSureToOverrideTheConfiguration: 'Are you sure to override "{title}" to be the latest configuration',
-    cacheSetting: 'cache setting',
-    clearFilterSortAndConfiguration: 'clear filter, sort and configuration',
-    withoutAnyConfiguration: 'use none configuration',
-    saveToNewConfiguration: 'save current to be new configuration',
-    cacheName: 'cache name',
-    createTime: 'create time',
-    customSetting: 'custom setting',
-    title: 'title',
-    alignType: 'align type',
-    alignLeft: 'left',
-    alignCenter: 'center',
-    alignRight: 'right',
+    cacheSetting: 'Cache setting',
+    clearFilterSortAndConfiguration: 'Clear filter, sort and configuration',
+    withoutAnyConfiguration: 'Use none configuration',
+    saveToNewConfiguration: 'Save current to be new configuration',
+    cacheName: 'Cache name',
+    createTime: 'Create time',
+    customSetting: 'Custom setting',
+    title: 'Title',
+    alignType: 'Align type',
+    alignLeft: 'Left',
+    alignCenter: 'Center',
+    alignRight: 'Right',
     exportCurrentPageData: 'Export current page data',
     exportDataInTable: 'Export data showed in table',
     exportCurrentAllData: 'Export current all data',
-    exportAllDataWithFilterSortMaybeFailedWithLargeData: 'export all data by sort and filter condition(maybe failed with latge data)',
+    exportAllDataWithFilterSortMaybeFailedWithLargeData: 'Export all data by sort and filter condition(maybe failed with latge data)',
     selectDataToExport: 'Select data to export',
-    customSelectDataToExport: 'custom select data to export',
-    selectExportType: 'select export type',
-    selectExportFields: 'select export fields',
-    exportType: 'export type',
-    exportFields: 'export fields',
-    exportData: 'export data',
-    exportShowData: 'export show data',
-    fieldName: 'field name',
-    exportAgain: 'export again',
-    importData: 'import data',
-    pleaseEnterCompleteParamsForCondition: 'please input complete param for the {invalidIndex} condition ',
-    seniorFilter: 'senior filter',
-    pleaseAddFilterCondition: 'please add filter condition',
-    seniorQuery: 'senior query',
-    ascOrDesc: 'asc or desc',
-    formEdit: 'form edit',
-    batchCreate: 'batch create',
-    batchDelete: 'batch delete',
-    batchEdit: 'batch edit',
-    batchModify: 'batch modify',
-    seniorSort: 'senior sort',
-    canNotDeleteUsingCache: 'can not delete cache which is using',
-    columnFilter: 'column filter',
-    distinctFilter: 'distinct filter',
+    customSelectDataToExport: 'Custom select data to export',
+    selectExportType: 'Select export type',
+    selectExportFields: 'Select export fields',
+    exportType: 'Export type',
+    exportFields: 'Export fields',
+    exportData: 'Export data',
+    exportShowData: 'Export show data',
+    fieldName: 'Field name',
+    exportAgain: 'Export again',
+    importData: 'Import data',
+    pleaseEnterCompleteParamsForCondition: 'Please input complete param for the {invalidIndex} condition ',
+    seniorFilter: 'Senior filter',
+    pleaseAddFilterCondition: 'Please add filter condition',
+    seniorQuery: 'Senior query',
+    ascOrDesc: 'Asc Or Desc',
+    formEdit: 'Form edit',
+    batchCreate: 'Batch create',
+    batchDelete: 'Batch delete',
+    batchEdit: 'Batch edit',
+    batchModify: 'Batch modify',
+    seniorSort: 'Senior sort',
+    canNotDeleteUsingCache: 'Can not delete cache which is using',
+    columnFilter: 'Column filter',
+    distinctFilter: 'Distinct filter',
     filterTipInclude: '{field} includes {val}',
-    clearDistinctFilter: 'clear distinct filter',
-    continueCreate: 'continue create',
-    pleaseSelectOneRecord: 'please select one record',
-    selectRowToDelete: 'select row to delete',
+    clearDistinctFilter: 'Clear distinct filter',
+    continueCreate: 'Continue create',
+    pleaseSelectOneRecord: 'Please select one record',
+    selectRowToDelete: 'Select row to delete',
     areYouSureYouWantToDeleteTheData: 'Are you sure to delete the {index} record?',
-    deleteFailed: 'delete failed',
-    savingData: 'saving',
-    articleDataVerificationFailed: 'the {index} record is invalid',
-    pleaseEnterTheNumberOfRowsToCreate: 'please input the number of rows to create',
-    deleting: 'deleting',
-    deleteSucceed: 'delete succeed',
-    queryTotalFailed: 'query total failed',
-    sortInTypeOrderOfField: 'sort by {description}',
-    pleaseEnterSearchKey: 'please input search key',
+    deleteFailed: 'Delete failed',
+    savingData: 'Saving',
+    articleDataVerificationFailed: 'The {index} record is invalid',
+    pleaseEnterTheNumberOfRowsToCreate: 'Please input the number of rows to create',
+    deleting: 'Deleting',
+    deleteSucceed: 'Delete succeed',
+    queryTotalFailed: 'Query total failed',
+    sortInTypeOrderOfField: 'Sort by {description}',
+    pleaseEnterSearchKey: 'Please input search key',
     rowPerPage: '{num} per page',
-    checkAll: 'check all',
-    checkClear: 'check clear',
-    fixedLeft: 'fixed left',
-    fixedRight: 'fixed right',
-    pleaseClickNext: 'please click next step',
-    tableScrollTips: 'scroll by wheeling on table head or scroll with wheeling and press alt to scroll horizontal',
-    pleaseEnterNewConfigName: 'please input new config name',
-    queryTotal: 'query total',
-    columnTitle: 'column title',
+    checkAll: 'Check all',
+    checkClear: 'Check clear',
+    fixedLeft: 'Fixed left',
+    fixedRight: 'Fixed right',
+    pleaseClickNext: 'Please click next step',
+    tableScrollTips: 'Scroll by wheeling on table head or scroll with wheeling and press alt to scroll horizontal',
+    pleaseEnterNewConfigName: 'Please input new config name',
+    queryTotal: 'Query total',
+    columnTitle: 'Column title',
   },
   theme: {
     inputMode: 'INPUT MODE',
-    inputModeFlat: 'flat',
-    inputModelStroke: 'stroke',
+    inputModeFlat: 'Flat',
+    inputModelStroke: 'Stroke',
     buttonMode: 'BUTTON MODE',
-    buttonModeFlat: 'flat',
-    buttonModeFill: 'fill',
-    buttonModeOutline: 'outline',
-    buttonModeStroke: 'stroke',
-    buttonModeText: 'text',
+    buttonModeFlat: 'Flat',
+    buttonModeFill: 'Fill',
+    buttonModeOutline: 'Outline',
+    buttonModeStroke: 'Stroke',
+    buttonModeText: 'Text',
     primaryColor: 'PRIMARY COLOR',
     size: 'SIZE',
-    sizeLarge: 'large',
-    sizeNormal: 'normal',
-    sizeSmall: 'small',
-    sizeMini: 'mini',
+    sizeLarge: 'Large',
+    sizeNormal: 'Normal',
+    sizeSmall: 'Small',
+    sizeMini: 'Mini',
     darkMode: 'DARK MODE',
-    darkModeOn: 'dark',
-    darkModeOff: 'light',
+    darkModeOn: 'Dark',
+    darkModeOff: 'Light',
     radiusMode: 'RADIUS MODE',
-    radiusModeRound: 'round',
-    radiusModeNormal: 'filet',
-    radiusModeNone: 'none',
+    radiusModeRound: 'Round',
+    radiusModeNormal: 'Filet',
+    radiusModeNone: 'None',
     scale: 'SCALE',
     reset: 'RESET',
   },