fix: [Task]: 软件包列表添加按钮: 验证信息, 用于管理.steedos 下的.npmrc内容 #5617

fix: [Task]: 手动安装软件包表单调整 #5618
|[Task]: 安装软件包不自动启用 #5619

packages/standard-objects/base.client.js

@@ -11,15 +11,18 @@ Steedos.StandardObjects = {
             },
             standard_new:{
                 visible: function (object_name) {
-                    var permissions;
-                    permissions = Creator.getPermissions(object_name);
+                    var permissions = Creator.getPermissions(object_name);
                     if (permissions) {
                         return permissions["allowCreate"];
                     }
                 }
             },
             standard_edit:{
                 visible: function (object_name, record_id, record_permissions) {
+                    var permissions = Creator.getPermissions(object_name);
+                    if (permissions && permissions["allowEdit"] != true) {
+                        return false;
+                    }
                     var perms, record;
                     perms = {};
                     if (record_permissions) {
@@ -36,6 +39,10 @@ Steedos.StandardObjects = {
             },
             standard_delete:{
                 visible: function (object_name, record_id, record_permissions) {
+                    var permissions = Creator.getPermissions(object_name);
+                    if (permissions && permissions["allowDelete"] != true) {
+                        return false;
+                    }
                     var perms, record;
                     perms = {};
                     if (record_permissions) {

services/service-package-registry/main/default/manager/loader.js

@@ -10,6 +10,21 @@ const packagesFilePath = path.join(userDir, 'steedos-packages.yml');
 const metadataApi = require('@steedos/metadata-api');
 const util = require('./util');
 const metaDataCore = require('@steedos/metadata-core');
+const npmRCFilePath = path.join(userDir, '.npmrc')
+
+// 读取.steedos下的.npmrc文件内容
+const getNpmrc = ()=>{
+    let npmrc = "";
+    if(fs.existsSync(npmRCFilePath)){
+        npmrc = fs.readFileSync(npmRCFilePath, 'utf8')
+    }
+    return npmrc;
+}
+
+// 写入.steedos下的.npmrc文件内容
+const setNpmrc = (data)=>{
+    fs.writeFileSync(npmRCFilePath, data);
+}
 
 const getPackageYmlData = (packagePath)=>{
     let packageYmlData = {};
@@ -405,5 +420,8 @@ module.exports = {
     getPackageInfo,
     getPackageMetadata,
     installPackage,
-    getPackageYmlData
+    getPackageYmlData,
+    getNpmrc,
+    setNpmrc,
+    getPackageConfig
 }

services/service-package-registry/main/default/manager/packages.js

@@ -186,9 +186,11 @@ const scanPackageMetadatas = async (packagePath) => {
     return packageMetadatas;
 }
 
-const checkDependencies = async (packagePath)=>{
-    const packageServiceConfig = require(path.join(packagePath, 'package.service.js'));
-    const dependencies = (packageServiceConfig && packageServiceConfig.dependencies) || [];
+const checkDependencies = async (packagePath, dependencies)=>{
+    if(!dependencies){
+        const packageServiceConfig = require(path.join(packagePath, 'package.service.js'));
+        dependencies = (packageServiceConfig && packageServiceConfig.dependencies) || [];
+    }
     for(const item of dependencies){
         const hasService = await objectql.getSteedosSchema().broker.registry.hasService(item);
         if(!hasService){

services/service-package-registry/main/default/manager/registry.js

@@ -14,6 +14,8 @@ let installDenyList = [];
 let installAllAllowed = true;
 let installVersionRestricted = false;
 var activePromise = Promise.resolve();
+const _ = require('lodash');
+const npa = require("npm-package-arg");
 
 log.init({});
 
@@ -268,6 +270,27 @@ async function installModule(module, version, url, registry_url) {
     return activePromise;
 }
 
+async function yarnAddPackage(yarnPackage){
+    var installDir = settings.userDir || ".";
+    var yarnArgs = ['add', '-E', ...yarnPackage.split(' '), '--json'];
+    const data = await exec.run(yarnCommand, yarnArgs, {cwd: installDir}, true);
+    const formatData = JSON.parse(_.last(_.compact(data.stdout.split('\n'))))
+    // 解析 yarn add 返回的结果
+    const steedosPackages = [];
+    _.each(formatData.data.trees, (module)=>{
+        const parsed = npa(module.name);
+        const packagePath = path.dirname(require.resolve(`${parsed.name}/package.json`, {
+            paths: [path.join(installDir, 'node_modules')]
+        }))
+        steedosPackages.push({
+            name: parsed.name,
+            version: parsed.rawSpec,
+            path: packagePath
+        })
+    })
+    return steedosPackages;
+}
+
 
 async function uninstallModule(module){
     if (Buffer.isBuffer(module)) {
@@ -326,5 +349,6 @@ const isPackageUrl = (url)=>{
 module.exports = {
     installModule,
     uninstallModule,
-    isPackageUrl
+    isPackageUrl,
+    yarnAddPackage
 }

services/service-package-registry/main/default/objects/steedos_packages/fields/dependencies.field.yml

@@ -0,0 +1,4 @@
+name: dependencies
+type: select
+multiple: true
+label: 依赖项

services/service-package-registry/main/default/pages/steedos_package_detail.page.amis.json

@@ -68,12 +68,42 @@
                                     "mode": "read",
                                     "className": "mb-4",
                                     "excludedFields": [
-                                        "metadata"
+                                        "metadata",
+                                        "dependencies"
                                     ]
                                 }
                             ],
                             "className": "p-0",
                             "id": "u:5d4e7e3f6ecc"
+                        },
+                        {
+                            "title": "依赖服务",
+                            "body": [
+                                {
+                                    "type": "steedos-object-form",
+                                    "label": "对象表单",
+                                    "objectApiName": "${objectName}",
+                                    "recordId": "${recordId}",
+                                    "appId": "${appId}",
+                                    "id": "u:fec578db3278",
+                                    "mode": "read",
+                                    "className": "mb-4",
+                                    "fields": [
+                                        "dependencies"
+                                    ],
+                                    "fieldsExtend": {
+                                        "dependencies": {
+                                            "label": false,
+                                            "amis": {
+                                                "type": "tpl",
+                                                "tpl": "${dependencies | join: }"
+                                            }
+                                        }
+                                    }
+                                }
+                            ],
+                            "className": "p-0",
+                            "id": "u:5d4e7e3f6ecc"
                         }
                     ],
                     "id": "u:148cf8e840eb"