@ibiz-template/runtime 0.1.2 → 0.1.3

package/dist/index.esm.js

@@ -711,7 +711,9 @@ function calcLayoutHeightWidth(layoutPos) {
   if (widthMode === "FULL") {
     result.width = "100%";
   } else if (width && width > 0) {
-    if (widthMode === "PERCENTAGE") {
+    if (width > 0 && width <= 1) {
+      result.width = "".concat(width * 100, "%");
+    } else if (widthMode === "PERCENTAGE") {
       result.width = "".concat(width, "%");
     } else {
       result.width = "".concat(width, "px");
@@ -720,7 +722,9 @@ function calcLayoutHeightWidth(layoutPos) {
   if (heightMode === "FULL") {
     result.height = "100%";
   } else if (height && height > 0) {
-    if (heightMode === "PERCENTAGE") {
+    if (height > 0 && height <= 1) {
+      result.height = "".concat(height * 100, "%");
+    } else if (heightMode === "PERCENTAGE") {
       result.height = "".concat(height, "%");
     } else {
       result.height = "".concat(height, "px");
@@ -1085,21 +1089,13 @@ async function openDERedirectView(appView, context, params = {}, data = []) {
     );
     throw new RuntimeModelError(
       appView,
-      "\u672A\u627E\u5230\u91CD\u5B9A\u5411\u6807\u8BC6[".concat(rdTag, "]\u6216[").concat(deRdTag, "]\u6216[").concat(wfRdTag, "]\u5BF9\u5E94\u89C6\u56FE")
+      "\u672A\u627E\u5230\u91CD\u5B9A\u5411\u6807\u8BC6[".concat(rdTag, "]\u6216[").concat(deRdTag, "]\u6216\u5DE5\u4F5C\u6D41[").concat(wfRdTag, "]\u5BF9\u5E94\u89C6\u56FE")
     );
   }
   return { ok: true, data: [] };
 }
 async function calcDERdTag(entity, rdView, params, data) {
   let rdTag = "";
-  const typeFieldId = rdView.typeAppDEFieldId;
-  if (typeFieldId) {
-    const { codeName } = findFieldById(entity, typeFieldId);
-    const value = data[codeName.toLowerCase()];
-    if (notNilEmpty2(value)) {
-      return value;
-    }
-  }
   const defView = "".concat(ibiz.env.isMob ? "MOB" : "", "EDITVIEW");
   const srfWf = params.srfwf;
   if (notNilEmpty2(srfWf)) {
@@ -1109,9 +1105,19 @@ async function calcDERdTag(entity, rdView, params, data) {
     return "".concat(defView, ":").concat(srfWf.toUpperCase());
   }
   let typeValue = "";
-  if (entity.indexTypeAppDEFieldId) {
-    const { codeName } = findFieldById(entity, entity.indexTypeAppDEFieldId);
-    typeValue = data[codeName.toLowerCase()];
+  const typeFieldId = rdView.typeAppDEFieldId;
+  if (typeFieldId) {
+    const { codeName } = findFieldById(entity, typeFieldId);
+    const value = data[codeName.toLowerCase()];
+    if (notNilEmpty2(value)) {
+      typeValue = value;
+    }
+  }
+  if (isNilOrEmpty2(typeValue)) {
+    if (entity.indexTypeAppDEFieldId) {
+      const { codeName } = findFieldById(entity, entity.indexTypeAppDEFieldId);
+      typeValue = data[codeName.toLowerCase()];
+    }
   }
   if (isNilOrEmpty2(typeValue)) {
     if (entity.formTypeAppDEFieldId) {
@@ -1120,7 +1126,7 @@ async function calcDERdTag(entity, rdView, params, data) {
     }
   }
   if (notNilEmpty2(typeValue)) {
-    rdTag = "".concat(defView, ":").concat(typeValue);
+    rdTag = "".concat(defView, ":").concat(typeValue.toUpperCase());
   } else {
     rdTag = "".concat(defView);
   }
@@ -8182,7 +8188,7 @@ var MDViewEngine = class extends ViewEngineBase {
       view: this.view
     }));
     if (result === -1) {
-      throw new RuntimeModelError20(this.view.model, "\u7F3A\u5C11opendata\u7684\u89C6\u56FE\u903B\u8F91");
+      ibiz.log.warn("\u89C6\u56FE[".concat(this.view.model.codeName, "]\uFF0C\u672A\u914D\u7F6E\u7F16\u8F91\u6253\u5F00\u89C6\u56FE"));
     }
   }
   /**
@@ -12122,6 +12128,7 @@ var MDControlController = class extends ControlController {
     this.state.isLoaded = false;
     this.state.singleSelect = true;
     this.state.mdctrlActiveMode = 0;
+    this.state.groups = [];
   }
   /**
    * 设置排序
@@ -12169,35 +12176,34 @@ var MDControlController = class extends ControlController {
    * @date 2022-08-19 14:08:50
    */
   async load(args = {}) {
-    const isInitialLoad = args.isInitialLoad === true;
-    const isLoadMore = args.isLoadMore === true;
-    if (isInitialLoad) {
-      this.state.curPage = 1;
-    } else if (isLoadMore) {
-      this.state.curPage += 1;
-    }
-    const { context } = this.handlerAbilityParams(args);
-    const params = await this.getFetchParams(args == null ? void 0 : args.params);
     await this.startLoading();
-    let res;
     try {
-      res = await this.service.fetch(context, params);
+      const isInitialLoad = args.isInitialLoad === true;
+      const isLoadMore = args.isLoadMore === true;
+      if (isInitialLoad) {
+        this.state.curPage = 1;
+      } else if (isLoadMore) {
+        this.state.curPage += 1;
+      }
+      const { context } = this.handlerAbilityParams(args);
+      const params = await this.getFetchParams(args == null ? void 0 : args.params);
+      const res = await this.service.fetch(context, params);
       if (typeof res.total === "number") {
         this.state.total = res.total;
       }
+      if (isLoadMore) {
+        this.state.items.push(...res.data);
+      } else {
+        this.state.items = res.data;
+      }
+      await this.afterLoad(args, res.data);
+      this.state.isLoaded = true;
+      await this._evt.emit("onLoadSuccess", {
+        isInitialLoad
+      });
     } finally {
       await this.endLoading();
     }
-    if (isLoadMore) {
-      this.state.items.push(...res.data);
-    } else {
-      this.state.items = res.data;
-    }
-    await this.afterLoad(args, res.data);
-    this.state.isLoaded = true;
-    await this._evt.emit("onLoadSuccess", {
-      isInitialLoad
-    });
     return this.state.items;
   }
   /**