From c71f45ca6a15149703fdf12f4d0f68a226d10a7e Mon Sep 17 00:00:00 2001
From: chenos <chenlinxh@gmail.com>
Date: Wed, 27 Apr 2022 20:23:33 +0800
Subject: [PATCH] feat: improve code

---
 .env.example                                  |  1 +
 packages/app/client/src/pages/document.ejs    | 23 +++++++++++++++++++
 .../src/acl/Configuration/RoleConfigure.tsx   |  8 +++----
 .../src/acl/Configuration/schemas/roles.ts    |  2 +-
 packages/core/client/src/locale/zh_CN.ts      |  6 ++++-
 .../resources/templates/load-src-from-npm.js  |  6 ++---
 6 files changed, 37 insertions(+), 9 deletions(-)

diff --git a/.env.example b/.env.example
index 783b92cb22..eeabcc8734 100644
--- a/.env.example
+++ b/.env.example
@@ -10,6 +10,7 @@ SERVER_BASE_PATH=/api/
 SERVER_BASE_URL=
 
 DB_DIALECT=sqlite
+DB_STORAGE=db.sqlite
 
 # DB_HOST=localhost
 # DB_PORT=5432
diff --git a/packages/app/client/src/pages/document.ejs b/packages/app/client/src/pages/document.ejs
index f1de646ee4..c5197757bc 100644
--- a/packages/app/client/src/pages/document.ejs
+++ b/packages/app/client/src/pages/document.ejs
@@ -7,6 +7,29 @@
   <link rel="icon" type="image/png" sizes="32x32" href="/favicon/favicon-32x32.png">
   <link rel="icon" type="image/png" sizes="16x16" href="/favicon/favicon-16x16.png">
   <link rel="manifest" href="/favicon/site.webmanifest">
+  <style>
+  /* width */
+  .win ::-webkit-scrollbar {
+    width: 8px;
+    height: 8px;
+  }
+  /* Track */
+  .win ::-webkit-scrollbar-track {
+    background: #f1f1f1;
+  }
+  /* Handle */
+  .win ::-webkit-scrollbar-thumb {
+    background: #c0c0c0;
+    border-radius: 4px;
+  }
+  /* Handle on hover */
+  .win ::-webkit-scrollbar-thumb:hover {
+    background: #a8a8a8;
+  }
+  .win .rc-virtual-list-scrollbar-thumb {
+    background: #c0c0c0 !important;
+  }
+  </style>
   <script>
     showLog=true;function log(m){if(window.console&&showLog){console.log(m)}}function css_browser_selector(u){var uaInfo={},screens=[320,480,640,768,1024,1152,1280,1440,1680,1920,2560],allScreens=screens.length,ua=u.toLowerCase(),is=function(t){return RegExp(t,'i').test(ua)},version=function(p,n){n=n.replace('.','_');var i=n.indexOf('_'),ver='';while(i>0){ver+=' '+p+n.substring(0,i);i=n.indexOf('_',i+1)}ver+=' '+p+n;return ver},g='gecko',w='webkit',c='chrome',f='firefox',s='safari',o='opera',m='mobile',a='android',bb='blackberry',lang='lang_',dv='device_',html=document.documentElement,b=[(!/opera|webtv/i.test(ua)&&/msie\s(\d+)/.test(ua))||/trident\/.*rv:([0-9]{1,}[\.0-9]{0,})/.test(ua)?'ie ie'+(/trident\/4\.0/.test(ua)?'8':RegExp.$1=='11.0'?'11':RegExp.$1):is('firefox/')?g+' '+f+(/firefox\/((\d+)(\.(\d+))(\.\d+)*)/.test(ua)?' '+f+RegExp.$2+' '+f+RegExp.$2+'_'+RegExp.$4:''):is('gecko/')?g:is('opera')?o+(/version\/((\d+)(\.(\d+))(\.\d+)*)/.test(ua)?' '+o+RegExp.$2+' '+o+RegExp.$2+'_'+RegExp.$4:/opera(\s|\/)(\d+)\.(\d+)/.test(ua)?' '+o+RegExp.$2+' '+o+RegExp.$2+'_'+RegExp.$3:''):is('konqueror')?'konqueror':is('blackberry')?bb+(/Version\/(\d+)(\.(\d+)+)/i.test(ua)?' '+bb+RegExp.$1+' '+bb+RegExp.$1+RegExp.$2.replace('.','_'):/Blackberry ?(([0-9]+)([a-z]?))[\/|;]/gi.test(ua)?' '+bb+RegExp.$2+(RegExp.$3?' '+bb+RegExp.$2+RegExp.$3:''):''):is('android')?a+(/Version\/(\d+)(\.(\d+))+/i.test(ua)?' '+a+RegExp.$1+' '+a+RegExp.$1+RegExp.$2.replace('.','_'):'')+(/Android (.+); (.+) Build/i.test(ua)?' '+dv+RegExp.$2.replace(/ /g,'_').replace(/-/g,'_'):''):is('chrome')?w+' '+c+(/chrome\/((\d+)(\.(\d+))(\.\d+)*)/.test(ua)?' '+c+RegExp.$2+(RegExp.$4>0?' '+c+RegExp.$2+'_'+RegExp.$4:''):''):is('iron')?w+' iron':is('applewebkit/')?w+' '+s+(/version\/((\d+)(\.(\d+))(\.\d+)*)/.test(ua)?' '+s+RegExp.$2+' '+s+RegExp.$2+RegExp.$3.replace('.','_'):/ Safari\/(\d+)/i.test(ua)?RegExp.$1=='419'||RegExp.$1=='417'||RegExp.$1=='416'||RegExp.$1=='412'?' '+s+'2_0':RegExp.$1=='312'?' '+s+'1_3':RegExp.$1=='125'?' '+s+'1_2':RegExp.$1=='85'?' '+s+'1_0':'':''):is('mozilla/')?g:'',is('android|mobi|mobile|j2me|iphone|ipod|ipad|blackberry|playbook|kindle|silk',)?m:'',is('j2me')?'j2me':is('ipad|ipod|iphone')?(/CPU( iPhone)? OS (\d+[_|\.]\d+([_|\.]\d+)*)/i.test(ua)?'ios'+version('ios',RegExp.$2):'')+' '+(/(ip(ad|od|hone))/gi.test(ua)?RegExp.$1:''):is('playbook')?'playbook':is('kindle|silk')?'kindle':is('playbook')?'playbook':is('mac')?'mac'+(/mac os x ((\d+)[.|_](\d+))/.test(ua)?' mac'+RegExp.$2+' mac'+RegExp.$1.replace('.','_'):''):is('win')?'win'+(is('windows nt 6.2')?' win8':is('windows nt 6.1')?' win7':is('windows nt 6.0')?' vista':is('windows nt 5.2')||is('windows nt 5.1')?' win_xp':is('windows nt 5.0')?' win_2k':is('windows nt 4.0')||is('WinNT4.0')?' win_nt':''):is('freebsd')?'freebsd':is('x11|linux')?'linux':'',/[; |\[](([a-z]{2})(\-[a-z]{2})?)[)|;|\]]/i.test(ua)?(lang+RegExp.$2).replace('-','_')+(RegExp.$3!=''?(' '+lang+RegExp.$1).replace('-','_'):''):'',is('ipad|iphone|ipod')&&!is('safari')?'ipad_app':'',];console.debug(ua);function screenSize(){var w=window.outerWidth||html.clientWidth;var h=window.outerHeight||html.clientHeight;uaInfo.orientation=w<h?'portrait':'landscape';html.className=html.className.replace(/ ?orientation_\w+/g,'').replace(/ [min|max|cl]+[w|h]_\d+/g,'');for(var i=allScreens-1;i>=0;i--){if(w>=screens[i]){uaInfo.maxw=screens[i];break}}widthClasses='';for(var info in uaInfo){widthClasses+=' '+info+'_'+uaInfo[info]}html.className=html.className+widthClasses;return widthClasses}window.onresize=screenSize;screenSize();function retina(){var r=window.devicePixelRatio>1;if(r){html.className+=' retina'}else{html.className+=' non-retina'}}retina();var cssbs=b.join(' ')+' js ';html.className=(cssbs+html.className.replace(/\b(no[-|_]?)?js\b/g,'')).replace(/^ /,'').replace(/ +/g,' ');return cssbs}css_browser_selector(navigator.userAgent);
   </script>
diff --git a/packages/core/client/src/acl/Configuration/RoleConfigure.tsx b/packages/core/client/src/acl/Configuration/RoleConfigure.tsx
index 64fb8b9854..548daaf770 100644
--- a/packages/core/client/src/acl/Configuration/RoleConfigure.tsx
+++ b/packages/core/client/src/acl/Configuration/RoleConfigure.tsx
@@ -47,11 +47,11 @@ export const RoleConfigure = () => {
             title: t('Configure permissions'),
             'x-decorator': 'FormItem',
             'x-component': 'Checkbox',
-            'x-content': '允许配置系统，包括界面配置、数据表配置、权限配置、系统配置等全部配置项',
+            'x-content': t('Allows configuration of the whole system, including UI, collections, permissions, etc.'),
           },
           'strategy.actions': {
-            title: t('General action permissions'),
-            description: '所有数据表都默认使用通用数据操作权限；同时，可以针对每个数据表单独配置权限。',
+            title: t('Global action permissions'),
+            description: t('All collections use general action permissions by default; permission configured individually will override the default one.'),
             'x-component': 'StrategyActions',
             'x-decorator': 'FormItem',
           },
@@ -59,7 +59,7 @@ export const RoleConfigure = () => {
             title: t('Menu permissions'),
             'x-decorator': 'FormItem',
             'x-component': 'Checkbox',
-            'x-content': '新增菜单项默认允许访问',
+            'x-content': t('New menu items are allowed to be accessed by default.'),
           },
         },
       }}
diff --git a/packages/core/client/src/acl/Configuration/schemas/roles.ts b/packages/core/client/src/acl/Configuration/schemas/roles.ts
index fd9acaa437..c4ce726d61 100644
--- a/packages/core/client/src/acl/Configuration/schemas/roles.ts
+++ b/packages/core/client/src/acl/Configuration/schemas/roles.ts
@@ -241,7 +241,7 @@ export const roleSchema: ISchema = {
                               properties: {
                                 tab1: {
                                   type: 'void',
-                                  title: '{{t("Global permissions")}}',
+                                  title: '{{t("General permissions")}}',
                                   'x-component': 'Tabs.TabPane',
                                   'x-component-props': {},
                                   properties: {
diff --git a/packages/core/client/src/locale/zh_CN.ts b/packages/core/client/src/locale/zh_CN.ts
index 52118a40fd..be95b0892b 100644
--- a/packages/core/client/src/locale/zh_CN.ts
+++ b/packages/core/client/src/locale/zh_CN.ts
@@ -364,8 +364,12 @@ export default {
 
   'Role display name': '角色名称',
   'Default role': '默认角色',
-
+  'All collections use general action permissions by default; permission configured individually will override the default one.': '所有数据表都默认使用通用数据操作权限；同时，可以针对每个数据表单独配置权限。',
+  'Allows configuration of the whole system, including UI, collections, permissions, etc.': '允许配置系统，包括界面配置、数据表配置、权限配置、系统配置等全部配置项',
+  'New menu items are allowed to be accessed by default.': '新增菜单项默认允许访问',
   'Global permissions': '全局配置',
+  'General permissions': '通用配置',
+  'Global action permissions': '全局操作权限',
   'General action permissions': '通用操作权限',
   'Action display name': '操作名称',
   'Allow': '允许',
diff --git a/packages/core/create-nocobase-app/src/resources/templates/load-src-from-npm.js b/packages/core/create-nocobase-app/src/resources/templates/load-src-from-npm.js
index 251c4b3fcd..4a15562808 100644
--- a/packages/core/create-nocobase-app/src/resources/templates/load-src-from-npm.js
+++ b/packages/core/create-nocobase-app/src/resources/templates/load-src-from-npm.js
@@ -40,9 +40,9 @@ module.exports = async (packageName, target) => {
     cwd: target,
     strip: 1,
     k: true,
-    filter(path, entry) {
-      return !(path.startsWith('package/lib') || path.startsWith('package/esm') || path.startsWith('package/dist'));
-    },
+    // filter(path, entry) {
+    //   return !(path.startsWith('package/lib') || path.startsWith('package/esm') || path.startsWith('package/dist'));
+    // },
   });
 
   await fsP.unlink(tarballFile);