fix: resolve memory limit and type issues in app configuration (#154)

- Fix totalMemory access issue by moving duplexDisplay from filter to method
- Replace deprecated document.domain with window.location.hostname
- Ensure consistent string type handling for min_memory values
- Add proper number type conversion for vue-slider min prop

Author: jerrykuku

.env.dev

@@ -1,7 +1,7 @@
 # .env.dev
 NODE_ENV=dev
 #VUE_APP_DEV_IP=demo.casaos.io
-VUE_APP_DEV_IP=10.0.0.77
+VUE_APP_DEV_IP=10.0.0.111
 # VUE_APP_DEV_IP=10.147.20.1
 # VUE_APP_DEV_IP=192.168.2.15
 # VUE_APP_DEV_IP=192.168.2.219

src/components/AppSetting/ComposeConfig.vue

@@ -198,8 +198,8 @@
           <b-field :label="$t('Memory Limit')">
             <vue-slider
               :max="totalMemory"
-              :min="memory_min"
-              :value="service.deploy.resources.limits.memory | duplexDisplay"
+              :min="getMinMemory(service)"
+              :value="duplexDisplay(service)"
               :tooltip-formatter="formatMemoryTooltip"
               @change="(v) => (service.deploy.resources.limits.memory = v)"
             ></vue-slider>
@@ -279,7 +279,7 @@ import "vue-slider-component/theme/default.css";
 import YAML from "yaml";
 import lowerFirst from "lodash/lowerFirst";
 import isNil from "lodash/isNil";
-import { isNumber, isString } from "lodash/lang";
+import { isString } from "lodash/lang";
 import cloneDeep from "lodash/cloneDeep";
 import merge from "lodash/merge";
 import i18n from "@/mixins/base/common-i18n";
@@ -358,7 +358,7 @@ export default {
             deploy: {
               resources: {
                 limits: {
-                  memory: "268435456",
+                  memory: "0",
                 },
               },
             },
@@ -526,7 +526,7 @@ export default {
   },
   created() {
     // Set Front-end base url
-    this.baseUrl = `${document.domain}`;
+    this.baseUrl = `${window.location.hostname}`;
     // update Service Name.
     this.$emit("updateDockerComposeServiceName", this.firstAppName);
   },
@@ -558,6 +558,7 @@ export default {
           this.isFetching = false;
         });
     }, 500),
+    
     // format memory
     formatMemoryTooltip(memory) {
       // 将 字节 转换成 MB 或 GB 并且取整
@@ -824,7 +825,7 @@ export default {
       }
 
       // 判断是否存在
-      const memory = composeServicesItemInput?.deploy?.resources?.limits?.memory ?? "0";
+      const memory = composeServicesItemInput?.deploy?.resources?.limits?.memory ?? this.totalMemory;
       let newMemory = 0;
       if (memory) {
         if (/[Mm]$/.test(memory)) {
@@ -1047,11 +1048,23 @@ export default {
     getLateField(image) {
       return image?.split(":")[1];
     },
-  },
-  filters: {
-    duplexDisplay(val) {
-      // units is M
-      return val < 268435456 ? 268435456 : val;
+
+    getMinMemory(service) {
+      const reservedMemory = service?.deploy?.resources?.reservations?.memory;
+      return Number(reservedMemory) || 268435456;
+    },
+
+    duplexDisplay(service) {
+      // units is byte
+      const min_memory = this.getMinMemory(service);
+
+      if (service?.deploy?.resources?.limits?.memory == 0) {
+        return this.totalMemory;
+      } else if (service?.deploy?.resources?.limits?.memory < min_memory) {
+        return min_memory;
+      } else {
+        return service?.deploy?.resources?.limits?.memory;
+      }
     },
   },
 };

src/components/AppStore/AppDetail/AppInfoTable.vue

@@ -27,10 +27,10 @@
 
 		<div class="level-item has-text-centered">
 			<div>
-				<p class="heading "><span class="is-hidden-mobile">{{
+				<p class="heading"><span class="is-hidden-mobile">{{
 						$t('REQUIRE')
 					}} </span>{{ $t('MEMORY') }}</p>
-				<p class="title has-text-weight-normal">{{ appDetailData.min_memory }}</p>
+				<p class="title has-text-weight-normal">{{ appDetailData.min_memory/1024/1024 }}</p>
 				<p class="footing is-size-14px">MB</p>
 			</div>
 		</div>

src/components/Apps/AppPanel.vue

@@ -500,19 +500,31 @@ export default {
       this.isLoading = true;
       let { min_memory, compose } = await this.$openAPI.appManagement.appStore.composeApp(id).then((res) => {
         // A district that is reserved for resource.
+        // 遍历 res.data.data.compose.services 如果存在 deploy?.resources?.reservations?.memory 则返回累加值。
+        let min_memory = 0;
+        for (const service in res.data.data.compose.services) {
+          if (res.data.data.compose.services[service]?.deploy?.resources?.reservations?.memory) {
+            let memoryValue = res.data.data.compose.services[service]?.deploy?.resources?.reservations?.memory;
+            // 统一转换为字节数进行累加
+            if (typeof memoryValue === 'string') {
+              if (memoryValue.includes("GB") || memoryValue.includes("G")) {
+                min_memory += Number(memoryValue.replace(/[^\d.]/g, '')) * 1024 * 1024 * 1024;
+              } else if (memoryValue.includes("MB") || memoryValue.includes("M")) {
+                min_memory += Number(memoryValue.replace(/[^\d.]/g, '')) * 1024 * 1024;
+              } else {
+                min_memory += Number(memoryValue) || 0;
+              }
+            } else {
+              min_memory += Number(memoryValue) || 0;
+            }
+          }
+        }
         return {
-          min_memory: res.data.data.compose.services[id]?.deploy?.resources?.reservations?.memory || "0",
+          min_memory: min_memory, // 统一返回字节数
           compose: res.data.data.compose,
         };
       });
 
-      if (min_memory.includes("GB")) {
-        min_memory = min_memory.replace("GB", "") * 1024;
-      } else if (min_memory.includes("MB")) {
-        min_memory = min_memory.replace("MB", "");
-      } else {
-        min_memory = min_memory / 1024 / 1024;
-      }
       this.$openAPI.appManagement.appStore
         .composeAppStoreInfo(id)
         .then((res) => {