cc-core-cli 1.0.87 → 1.0.89

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cc-core-cli",
-  "version": "1.0.87",
+  "version": "1.0.89",
   "description": "Command Line Interface tool for generating project templates for the (Your Platform's Name) platform.",
   "main": "bin/index.js",
   "scripts": {

package/template/admin/public/static/styles/layout.less

@@ -47,7 +47,7 @@ html {
         // width: calc(100% - 250px);
 
         &.collapsed {
-            padding-left: 96px;
+            // padding-left: 96px;
         }
 
         .menu-lv4 {
@@ -454,7 +454,7 @@ html {
         .icon-collapsed {
             display: none !important ;
         }
-
+    
         .logo-collapsed {
             width: 50px;
         }
@@ -503,7 +503,7 @@ html {
                 justify-content: flex-end;
                 display: flex !important;
             }
-
+            
             .logo-collapsed {
                 width: 80%;
             }
@@ -758,17 +758,18 @@ html {
                     }
 
                     a.no-icon {
-                        padding-left: 8px;
+                        padding-left: 0px;
 
                         &:hover {
-                            padding-left: 12px;
-                        }
+                            padding-left: 8px;
+                        }             
                     }
                 }
 
                 .ant-menu-submenu-title {
                     .menu-label {
                         transition: padding 0.2s;
+                         padding-left: 4px;
                     }
 
                     &:hover {
@@ -882,11 +883,16 @@ html {
                         border-radius: unset;
                         background-color: unset;
                         color: @menu-item-color !important;
+                        
 
                         .ant-menu-submenu-arrow {
                             color: @menu-item-color !important;
                         }
                     }
+                    
+                    .ant-menu-sub.ant-menu-inline {
+                        padding-left: 26px;
+                    }
                 }
 
                 .icon_menu {
@@ -1431,4 +1437,4 @@ html {
         background-color: transparent;
         -webkit-tap-highlight-color: transparent;
     }
-}
+}

package/template/admin/public/static/styles/style.less

@@ -1911,4 +1911,19 @@ h4.ant-typography {
 
 .chartwidget-canvas:hover .chartwidget-download-button {
     display: block;
+}
+
+.buttonvariable{
+    min-width: 180px;
+    max-width: 100%;
+    overflow: hidden;
+    display: flex;
+    text-align: center;
+    justify-content: center;
+    color: var(--text-color-var) !important;
+    background-color: var(--background-color-var) !important;
+}
+.buttonvariable:hover{
+    background-color: var(--background-color-hover-var) !important;
+    color: var(--text-color-hover-var) !important;
 }

package/template/core/package.json

@@ -17,7 +17,7 @@
     "lint": "eslint \"{src,apps,libs,test}/**/*.ts\" --fix"
   },
   "dependencies": {
-    "@shopstack/cc-core-lib": "^2.5.41"
+    "@shopstack/cc-core-lib": "^2.5.101"
   },
   "devDependencies": {
     "@types/bull": "^3.14.4",

package/template/core/src/core/core.controller.ts

@@ -425,9 +425,14 @@ export class CoreController {
   @Basic()
   @Patch("/:entity/import_validate")
   async importValidate(@Param() params: any, @Body() body): Promise<boolean> {
-    return this.service.importValidate(params.entity, body.data, body.id,
+    return this.service.importValidate(
+      params.entity,
+      body.id,
       body.code,
+      body.data,
+      body.data_text,
       body.original_data,
-      body.filename);
+      body.filename
+    );
   }
 }

package/template/core/src/core/core.service.ts

@@ -619,11 +619,19 @@ export class CoreService implements OnModuleInit {
     id: string,
     code: string,
     data: any,
+    dataText: string,
     originalData,
     filename
   ): Promise<any> {
     const service = await this._getService(entityName);
-    return service.importValidate(id, code, data, originalData, filename);
+    return service.importValidate(
+      id,
+      code,
+      data,
+      dataText,
+      originalData,
+      filename
+    );
   }
 }