[Feature]: 台账附件子表，增加第一层文件夹，名称是对象名 #6956 [2.6]

steedos · Jul 12, 2024 · 94c2ee0 · 94c2ee0
1 parent 2dce0d1
commit 94c2ee0
Show file tree

Hide file tree

Showing 16 changed files with 149 additions and 125 deletions.
diff --git a/creator/packages/steedos-objects-core/cfs/stores.coffee b/creator/packages/steedos-objects-core/cfs/stores.coffee
@@ -37,19 +37,25 @@ _.each stores, (store_name)->
                         filename = fileObj.name();
                         filenameInStore = fileObj.name({store: store_name})
 
+                        metadata = fileObj.metadata || {};
+                        objectName = metadata.object_name;
+                        objectFoldPath = ''
+                        if objectName
+                          objectFoldPath = objectName + '/'
+
                         now = new Date
                         year = now.getFullYear()
                         month = now.getMonth() + 1
                         path = require('path')
                         mkdirp = require('mkdirp')
-                        pathname = path.join(process.env.STEEDOS_STORAGE_DIR, "files/#{store_name}/" + year + '/' + month)
+                        pathname = path.join(process.env.STEEDOS_STORAGE_DIR, "files/#{store_name}/" + objectFoldPath + year + '/' + month)
                         # Set absolute path
                         absolutePath = path.resolve(pathname)
                         # Ensure the path exists
                         mkdirp.sync(absolutePath)
 
                         # If no store key found we resolve / generate a key
-                        return year + '/' + month + '/' + fileObj.collectionName + '-' + fileObj._id + '-' + (filenameInStore || filename)
+                        return objectFoldPath + year + '/' + month + '/' + fileObj.collectionName + '-' + fileObj._id + '-' + (filenameInStore || filename)
 
                 })
 

diff --git a/server/bundle/programs/server/packages/modules.js b/server/bundle/programs/server/packages/modules.js
@@ -463,7 +463,7 @@ module.useNode();
                                                                                                       //
 module.exports = {
   "name": "@steedos/objectql",
-  "version": "2.6.11",
+  "version": "2.6.16",
   "main": "lib/index.js"
 };
 
@@ -490,7 +490,7 @@ module.useNode();
                                                                                                       //
 module.exports = {
   "name": "@steedos/i18n",
-  "version": "2.6.11",
+  "version": "2.6.16",
   "main": "lib/index.js"
 };
 
@@ -517,7 +517,7 @@ module.useNode();
                                                                                                       //
 module.exports = {
   "name": "@steedos/core",
-  "version": "2.6.11",
+  "version": "2.6.16",
   "main": "lib/index.js"
 };
 
@@ -544,7 +544,7 @@ module.useNode();
                                                                                                       //
 module.exports = {
   "name": "@steedos/service-meteor-package-loader",
-  "version": "2.6.11",
+  "version": "2.6.16",
   "main": "index.js"
 };
 
@@ -571,7 +571,7 @@ module.useNode();
                                                                                                       //
 module.exports = {
   "name": "@steedos/service-api",
-  "version": "2.6.11",
+  "version": "2.6.16",
   "main": "index.js"
 };
 
@@ -598,7 +598,7 @@ module.useNode();
                                                                                                       //
 module.exports = {
   "name": "@steedos/service-metadata-server",
-  "version": "2.6.11",
+  "version": "2.6.16",
   "main": "index.js"
 };
 
@@ -625,7 +625,7 @@ module.useNode();
                                                                                                       //
 module.exports = {
   "name": "@steedos/service-package-registry",
-  "version": "2.6.11",
+  "version": "2.6.16",
   "main": "package.service.js"
 };
 
@@ -652,7 +652,7 @@ module.useNode();
                                                                                                       //
 module.exports = {
   "name": "@steedos/service-objectql",
-  "version": "2.6.11",
+  "version": "2.6.16",
   "main": "package.service.js"
 };
 
@@ -679,7 +679,7 @@ module.useNode();
                                                                                                       //
 module.exports = {
   "name": "@steedos/service-ui",
-  "version": "2.6.11",
+  "version": "2.6.16",
   "main": "package.service.js"
 };
 
@@ -706,7 +706,7 @@ module.useNode();
                                                                                                       //
 module.exports = {
   "name": "@steedos/service-pages",
-  "version": "2.6.11",
+  "version": "2.6.16",
   "main": "package.service.js"
 };
 
@@ -733,7 +733,7 @@ module.useNode();
                                                                                                       //
 module.exports = {
   "name": "@steedos/router",
-  "version": "2.6.11",
+  "version": "2.6.16",
   "main": "lib/index.js"
 };
 
@@ -760,7 +760,7 @@ module.useNode();
                                                                                                       //
 module.exports = {
   "name": "@steedos/auth",
-  "version": "2.6.11",
+  "version": "2.6.16",
   "main": "lib/index.js"
 };
 
@@ -787,7 +787,7 @@ module.useNode();
                                                                                                       //
 module.exports = {
   "name": "@steedos/workflow",
-  "version": "2.6.11",
+  "version": "2.6.16",
   "main": "index.js"
 };
 

diff --git a/server/bundle/programs/server/packages/steedos_objects-core.js b/server/bundle/programs/server/packages/steedos_objects-core.js
diff --git a/server/bundle/programs/server/packages/steedos_objects-core.js.map b/server/bundle/programs/server/packages/steedos_objects-core.js.map
diff --git a/...d6afbfa6d571fa8e0eb86d000d02178fdf01c3.js → ...109ebb98bc187190001730f9b5c2a54cbaf4bd.js b/...d6afbfa6d571fa8e0eb86d000d02178fdf01c3.js → ...109ebb98bc187190001730f9b5c2a54cbaf4bd.js
diff --git a/...d571fa8e0eb86d000d02178fdf01c3.stats.json → ...bc187190001730f9b5c2a54cbaf4bd.stats.json b/...d571fa8e0eb86d000d02178fdf01c3.stats.json → ...bc187190001730f9b5c2a54cbaf4bd.stats.json
@@ -3,15 +3,15 @@
     "name": "standard-minifier-js",
     "version": "2.6.0"
   },
-  "totalMinifiedBytes": 4303725,
-  "totalMinifiedGzipBytes": 1084321,
+  "totalMinifiedBytes": 4303837,
+  "totalMinifiedGzipBytes": 1084362,
   "minifiedBytesByPackage": {
     "packages/meteor.js": 9504,
     "packages/coffeescript.js": 32,
     "packages/blaze-html-templates.js": 40,
     "packages/modules-runtime.js": 4269,
     "packages/modules.js": [
-      928372,
+      928423,
       {
         "node_modules": {
           "meteor": {
@@ -273,11 +273,11 @@
               },
               "buffer": {
                 "package.json": 76,
-                "index.js": 20102
+                "index.js": 20122
               },
               "base64-js": {
                 "package.json": 79,
-                "index.js": 1448
+                "index.js": 1446
               },
               "ieee754": {
                 "package.json": 78,
@@ -750,7 +750,7 @@
                 },
                 "translations": {
                   "index.js": 1696,
-                  "objectTranslation.js": 5821,
+                  "objectTranslation.js": 5854,
                   "translation.js": 3317,
                   "templates": {
                     "objectTranslation.js": 1399,
@@ -2233,7 +2233,7 @@
     "packages/steedos_cfs-collection-filters.js": 2446,
     "packages/steedos_cfs-worker.js": 38,
     "packages/steedos_objects-core.js": [
-      8293,
+      8354,
       {
         "node_modules": {
           "meteor": {
@@ -2242,7 +2242,7 @@
               "cfs": {
                 "cfs.coffee": 2148,
                 "cfs_fix.coffee": 361,
-                "stores.coffee": 1684
+                "stores.coffee": 1745
               }
             }
           }

diff --git a/server/bundle/programs/web.browser.legacy/program.json b/server/bundle/programs/web.browser.legacy/program.json
@@ -2,24 +2,24 @@
   "format": "web-program-pre1",
   "manifest": [
     {
-      "path": "46d6afbfa6d571fa8e0eb86d000d02178fdf01c3.js",
+      "path": "4e109ebb98bc187190001730f9b5c2a54cbaf4bd.js",
       "where": "client",
       "type": "js",
       "cacheable": true,
-      "url": "/46d6afbfa6d571fa8e0eb86d000d02178fdf01c3.js?meteor_js_resource=true",
-      "size": 4303725,
-      "hash": "46d6afbfa6d571fa8e0eb86d000d02178fdf01c3",
-      "sri": "K2UAcuwldQTfvj+oKT1yGXKila8gQsQFTu9oMOzZBLGRIGuyAYvmK+Kzq8tjlDlo2znZhi9Dr3D8ZEdjYEMTDQ=="
+      "url": "/4e109ebb98bc187190001730f9b5c2a54cbaf4bd.js?meteor_js_resource=true",
+      "size": 4303837,
+      "hash": "4e109ebb98bc187190001730f9b5c2a54cbaf4bd",
+      "sri": "oL2Big8tJUzNaERJkHQXKF7LE3RWuHvto5TkE4WVNE5ehy024OAFM/YVjXKY52hyMmE80NlUzxmANBp/q4gZ+A=="
     },
     {
-      "path": "46d6afbfa6d571fa8e0eb86d000d02178fdf01c3.stats.json",
+      "path": "4e109ebb98bc187190001730f9b5c2a54cbaf4bd.stats.json",
       "where": "client",
       "type": "json",
       "cacheable": true,
-      "url": "/46d6afbfa6d571fa8e0eb86d000d02178fdf01c3.stats.json?meteor_js_resource=true",
+      "url": "/4e109ebb98bc187190001730f9b5c2a54cbaf4bd.stats.json?meteor_js_resource=true",
       "size": 92683,
-      "hash": "841ad7906e9aaf8841c56f05f5e98896f8fef87d",
-      "sri": "NlpDTNbPIUQ4RmrylSgQapxgRQxl9Dz8fNOpQSAEPerfpaMxXcB4NDaIQ/OAw1u/+5hw0Uu3iEI+ZP2NbDGpMw=="
+      "hash": "c37410cc7df1f03e26f09ae3d8817ef6c8618eed",
+      "sri": "IWjRtWsCCDSQL0ZdCdFdQtziudZpkFO35BfVW/hXAFE1TD1Nqd2yA7eSCrgae2JNSQVELW+by1VPleKL/29pWA=="
     },
     {
       "path": "dynamic/node_modules/@steedos/form-builder/dist/form-builder.min.js",

diff --git a/...d6afbfa6d571fa8e0eb86d000d02178fdf01c3.js → ...109ebb98bc187190001730f9b5c2a54cbaf4bd.js b/...d6afbfa6d571fa8e0eb86d000d02178fdf01c3.js → ...109ebb98bc187190001730f9b5c2a54cbaf4bd.js
diff --git a/...d571fa8e0eb86d000d02178fdf01c3.stats.json → ...bc187190001730f9b5c2a54cbaf4bd.stats.json b/...d571fa8e0eb86d000d02178fdf01c3.stats.json → ...bc187190001730f9b5c2a54cbaf4bd.stats.json
@@ -3,15 +3,15 @@
     "name": "standard-minifier-js",
     "version": "2.6.0"
   },
-  "totalMinifiedBytes": 4303725,
-  "totalMinifiedGzipBytes": 1084321,
+  "totalMinifiedBytes": 4303837,
+  "totalMinifiedGzipBytes": 1084362,
   "minifiedBytesByPackage": {
     "packages/meteor.js": 9504,
     "packages/coffeescript.js": 32,
     "packages/blaze-html-templates.js": 40,
     "packages/modules-runtime.js": 4269,
     "packages/modules.js": [
-      928372,
+      928423,
       {
         "node_modules": {
           "meteor": {
@@ -273,11 +273,11 @@
               },
               "buffer": {
                 "package.json": 76,
-                "index.js": 20102
+                "index.js": 20122
               },
               "base64-js": {
                 "package.json": 79,
-                "index.js": 1448
+                "index.js": 1446
               },
               "ieee754": {
                 "package.json": 78,
@@ -750,7 +750,7 @@
                 },
                 "translations": {
                   "index.js": 1696,
-                  "objectTranslation.js": 5821,
+                  "objectTranslation.js": 5854,
                   "translation.js": 3317,
                   "templates": {
                     "objectTranslation.js": 1399,
@@ -2233,7 +2233,7 @@
     "packages/steedos_cfs-collection-filters.js": 2446,
     "packages/steedos_cfs-worker.js": 38,
     "packages/steedos_objects-core.js": [
-      8293,
+      8354,
       {
         "node_modules": {
           "meteor": {
@@ -2242,7 +2242,7 @@
               "cfs": {
                 "cfs.coffee": 2148,
                 "cfs_fix.coffee": 361,
-                "stores.coffee": 1684
+                "stores.coffee": 1745
               }
             }
           }

diff --git a/server/bundle/programs/web.browser/program.json b/server/bundle/programs/web.browser/program.json
@@ -2,24 +2,24 @@
   "format": "web-program-pre1",
   "manifest": [
     {
-      "path": "46d6afbfa6d571fa8e0eb86d000d02178fdf01c3.js",
+      "path": "4e109ebb98bc187190001730f9b5c2a54cbaf4bd.js",
       "where": "client",
       "type": "js",
       "cacheable": true,
-      "url": "/46d6afbfa6d571fa8e0eb86d000d02178fdf01c3.js?meteor_js_resource=true",
-      "size": 4303725,
-      "hash": "46d6afbfa6d571fa8e0eb86d000d02178fdf01c3",
-      "sri": "K2UAcuwldQTfvj+oKT1yGXKila8gQsQFTu9oMOzZBLGRIGuyAYvmK+Kzq8tjlDlo2znZhi9Dr3D8ZEdjYEMTDQ=="
+      "url": "/4e109ebb98bc187190001730f9b5c2a54cbaf4bd.js?meteor_js_resource=true",
+      "size": 4303837,
+      "hash": "4e109ebb98bc187190001730f9b5c2a54cbaf4bd",
+      "sri": "oL2Big8tJUzNaERJkHQXKF7LE3RWuHvto5TkE4WVNE5ehy024OAFM/YVjXKY52hyMmE80NlUzxmANBp/q4gZ+A=="
     },
     {
-      "path": "46d6afbfa6d571fa8e0eb86d000d02178fdf01c3.stats.json",
+      "path": "4e109ebb98bc187190001730f9b5c2a54cbaf4bd.stats.json",
       "where": "client",
       "type": "json",
       "cacheable": true,
-      "url": "/46d6afbfa6d571fa8e0eb86d000d02178fdf01c3.stats.json?meteor_js_resource=true",
+      "url": "/4e109ebb98bc187190001730f9b5c2a54cbaf4bd.stats.json?meteor_js_resource=true",
       "size": 92683,
-      "hash": "841ad7906e9aaf8841c56f05f5e98896f8fef87d",
-      "sri": "NlpDTNbPIUQ4RmrylSgQapxgRQxl9Dz8fNOpQSAEPerfpaMxXcB4NDaIQ/OAw1u/+5hw0Uu3iEI+ZP2NbDGpMw=="
+      "hash": "c37410cc7df1f03e26f09ae3d8817ef6c8618eed",
+      "sri": "IWjRtWsCCDSQL0ZdCdFdQtziudZpkFO35BfVW/hXAFE1TD1Nqd2yA7eSCrgae2JNSQVELW+by1VPleKL/29pWA=="
     },
     {
       "path": "dynamic/node_modules/@steedos/form-builder/dist/form-builder.min.js",

diff --git a/...2ba9e3da8c7d7570f1cffd7ec10e272010cd34.js → ...6ccd198da2a23c894715f0b87bab85473372a0.js b/...2ba9e3da8c7d7570f1cffd7ec10e272010cd34.js → ...6ccd198da2a23c894715f0b87bab85473372a0.js
diff --git a/...8c7d7570f1cffd7ec10e272010cd34.stats.json → ...a2a23c894715f0b87bab85473372a0.stats.json b/...8c7d7570f1cffd7ec10e272010cd34.stats.json → ...a2a23c894715f0b87bab85473372a0.stats.json
@@ -3,15 +3,15 @@
     "name": "standard-minifier-js",
     "version": "2.6.0"
   },
-  "totalMinifiedBytes": 4479948,
-  "totalMinifiedGzipBytes": 1143622,
+  "totalMinifiedBytes": 4480060,
+  "totalMinifiedGzipBytes": 1143663,
   "minifiedBytesByPackage": {
     "packages/meteor.js": 9639,
     "packages/coffeescript.js": 32,
     "packages/blaze-html-templates.js": 40,
     "packages/modules-runtime.js": 4269,
     "packages/modules.js": [
-      1027450,
+      1027501,
       {
         "node_modules": {
           "meteor": {
@@ -125,11 +125,11 @@
               },
               "buffer": {
                 "package.json": 76,
-                "index.js": 20102
+                "index.js": 20122
               },
               "base64-js": {
                 "package.json": 79,
-                "index.js": 1448
+                "index.js": 1446
               },
               "ieee754": {
                 "package.json": 78,
@@ -602,7 +602,7 @@
                 },
                 "translations": {
                   "index.js": 1696,
-                  "objectTranslation.js": 5821,
+                  "objectTranslation.js": 5854,
                   "translation.js": 3317,
                   "templates": {
                     "objectTranslation.js": 1399,
@@ -1965,7 +1965,7 @@
     "packages/steedos_cfs-collection-filters.js": 2446,
     "packages/steedos_cfs-worker.js": 38,
     "packages/steedos_objects-core.js": [
-      8330,
+      8391,
       {
         "node_modules": {
           "meteor": {
@@ -1974,7 +1974,7 @@
               "cfs": {
                 "cfs.coffee": 2148,
                 "cfs_fix.coffee": 361,
-                "stores.coffee": 1684
+                "stores.coffee": 1745
               }
             }
           }