@newview/permission-service 1.2.6 → 1.2.7

package/README.md

@@ -1,3 +1,3 @@
-版本 1.2.6
+版本 1.2.7
 
-1. subPlatform 功能新增菜单模块
+1. subPlatform 功能问题修复

package/dist/permission-service.js

@@ -24603,6 +24603,9 @@ class GeneralConfigurationInstance extends BaseInstance {
     if (res && res.length > 0) {
       Object.assign(this.nowRow, res[0]);
       let data = this.props.configType == "GC" ? this.utilities.deepCopy(JSON.parse(res[0].ProjectConfig)) : this.utilities.deepCopy(JSON.parse(res[0].ConstructConfig));
+      if (data && data.length > 0) {
+        data = data.sort((a, b) => a.orderNum - b.orderNum);
+      }
       this.loadMainData(data);
     }
   }
@@ -24989,6 +24992,7 @@ class PlatformInstance2 extends BaseInstance {
     * @param data 
     */
   doEditPlatform(data) {
+    var _a;
     const user = this.storageInfo.getUser();
     this.platformFormModel.Id = data.Id;
     this.platformFormModel.SKey = data.SKey;
@@ -25003,6 +25007,14 @@ class PlatformInstance2 extends BaseInstance {
     this.platformFormModel.LastUpdateUserId = user.Id;
     this.platformFormModel.LastUpdateUserName = user.UserName;
     this.platformFormModel.LastUpdateDate = this.utilities.getCurrentDate();
+    this.platformFormModel.PId = data.PId;
+    const tableData = (_a = this.platformGrid.value) == null ? void 0 : _a.getDatas();
+    this.platformFormItems[4].selectProp.datas = tableData.length > 0 ? tableData == null ? void 0 : tableData.map((item) => {
+      return {
+        value: item.Id,
+        text: item.PlatformAbbreviation
+      };
+    }) : [];
     this.editPlatformModalTitle.value = `编辑 - ${data.PlatformName}`;
     this.showEditPlatform.value = true;
   }
@@ -25030,14 +25042,14 @@ class PlatformInstance2 extends BaseInstance {
     this.platformFormItems[4].selectProp.datas = data.length > 0 ? data == null ? void 0 : data.map((item) => {
       return {
         value: item.Id,
-        text: item.PlatformName
+        text: item.PlatformAbbreviation
       };
     }) : [];
     this.showEditPlatform.value = true;
   }
   //#endregion 系统平台编辑  END
 }
-const Platform_vue_vue_type_style_index_0_scoped_0cbccbdc_lang = "";
+const Platform_vue_vue_type_style_index_0_scoped_30a3712d_lang = "";
 const _hoisted_1$6 = { style: { "height": "500px", "overflow-y": "auto" } };
 function _sfc_render$6(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_NvGrid = resolveComponent("NvGrid");
@@ -25142,7 +25154,7 @@ function _sfc_render$6(_ctx, _cache, $props, $setup, $data, $options) {
     _: 1
   });
 }
-const subplatform = /* @__PURE__ */ _export_sfc(_sfc_main$6, [["render", _sfc_render$6], ["__scopeId", "data-v-0cbccbdc"]]);
+const subplatform = /* @__PURE__ */ _export_sfc(_sfc_main$6, [["render", _sfc_render$6], ["__scopeId", "data-v-30a3712d"]]);
 const propDefine$5 = {
   linkParam: {
     // 带入的参数
@@ -25778,7 +25790,6 @@ class RoleInstance2 extends BaseInstance {
      */
     __publicField(this, "doChangeOriginPlatform", () => {
       const values = this.originPlatform.list.filter((item) => item.Id == this.originPlatform.selectedId);
-      debugger;
       if (values.length > 0) {
         this.originPlatform.selectedItem = values[0];
       } else {
@@ -26273,9 +26284,7 @@ class EnterpriseInstance2 extends BaseInstance {
       var _a;
       this.spinPlatShow.value = true;
       const platId = (_a = this.storageInfo.getCurrentPlatform()) == null ? void 0 : _a.Id;
-      const apiResult = await this.platformApi.getEntities(QueryWrapper.create().eq("Id", platId).or((i) => i.allEq({
-        PId: platId
-      })).orderBy(["OrderNo"]));
+      const apiResult = await this.platformApi.getEntities(QueryWrapper.create().eq("Id", platId).orderBy(["OrderNo"]));
       this.platData.value = this.utilities.parseApiResult(apiResult);
       this.spinPlatShow.value = false;
       if (this.platData.value.length > 0)
@@ -26821,6 +26830,7 @@ class InstitutionInstance2 extends BaseInstance {
     // 私有属性 | private
     // 响应属性 | ref、reactive、computed、watch
     __publicField(this, "platId", ref(0));
+    __publicField(this, "selectPlat", ref({}));
     __publicField(this, "platData", ref([]));
     __publicField(this, "spinPlatShow", ref(false));
     // 私有方法 | private 方法名() {}
@@ -26837,11 +26847,12 @@ class InstitutionInstance2 extends BaseInstance {
       })).orderBy(["OrderNo"]));
       this.platData.value = this.utilities.parseApiResult(apiResult);
       this.spinPlatShow.value = false;
-      if (this.platData.value.length > 0)
+      if (this.platData.value.length > 0) {
         this.platId.value = this.platData.value[0].Id;
-      nextTick(() => {
-        this.doPlatformListSelect();
-      });
+        nextTick(() => {
+          this.doPlatformListSelect(this.platId.value);
+        });
+      }
     });
     //#endregion 系统平台  END
     //#region 机构类别
@@ -27000,7 +27011,9 @@ class InstitutionInstance2 extends BaseInstance {
      * 系统平台List选中事件
      * @param data 
      */
-    __publicField(this, "doPlatformListSelect", async () => {
+    __publicField(this, "doPlatformListSelect", async (data) => {
+      const res = this.platData.value.find((item) => item.Id == data);
+      this.selectPlat.value = res;
       await this.loadEnterprises();
       this.loadInstitutionGridData(this.platId.value, "", "", "");
       this.loadInstitutionTree();
@@ -27521,7 +27534,14 @@ class InstitutionInstance2 extends BaseInstance {
    */
   setEnterpriseDatas() {
     const datas = [];
-    for (const item of this.enterprises.filter((item2) => item2.PlatformId == this.platId.value)) {
+    let plat = [];
+    if (this.selectPlat.PId !== 0) {
+      plat = this.platData.value.filter((item) => item.Id == this.selectPlat.value.PId || this.selectPlat.value.Id == item.Id);
+    } else {
+      plat = this.platData.value.filter((item) => item.Id == this.selectPlat.value.Id);
+    }
+    const res = this.enterprises.filter((itemA) => plat.some((itemB) => itemB.Id == itemA.PlatformId));
+    for (const item of res) {
       datas.push({ text: item.EnterpriseName, value: item.Id });
     }
     this.institutionFormItems[3].selectProp.datas = datas;