@newview/permission-service 1.2.6 → 1.2.8

package/README.md

@@ -1,3 +1,8 @@
-版本 1.2.6
-
-1. subPlatform 功能新增菜单模块
+版本 1.2.8
+1. 项目标段概况配置修改
+版本 1.2.7
+1. subPlatform 功能问题修复
+版本 1.2.2
+1. 功能增加
+版本 1.2.1
+1. thirdparty 文件夹 第三方信息

package/dist/permission-service.js

@@ -3752,7 +3752,7 @@ let RoleInstance$1 = class RoleInstance extends BaseInstance {
           isHover: true
         },
         isPagination: true,
-        pageSize: 10
+        pageSize: 15
       },
       searchOptions: [
         {
@@ -4050,7 +4050,8 @@ let RoleInstance$1 = class RoleInstance extends BaseInstance {
         },
         treeConfig: {
           expandAll: true
-        }
+        },
+        pageSize: 15
       },
       searchOptions: [
         {
@@ -4502,7 +4503,7 @@ let RoleInstance$1 = class RoleInstance extends BaseInstance {
   }
   //#endregion 导入角色 END
 };
-const Role_vue_vue_type_style_index_0_scoped_086753a2_lang = "";
+const Role_vue_vue_type_style_index_0_scoped_df8b5532_lang = "";
 const _hoisted_1$h = { style: { "height": "650px", "overflow-y": "auto", "position": "relative" } };
 const _hoisted_2$8 = {
   class: "import-role",
@@ -4529,7 +4530,7 @@ function _sfc_render$i(_ctx, _cache, $props, $setup, $data, $options) {
     default: withCtx(() => [
       createVNode(_component_NvBox, {
         width: "100%",
-        title: "角色列表"
+        title: "角色列表2"
       }, {
         default: withCtx(() => [
           createVNode(_component_NvGrid, {
@@ -4710,7 +4711,7 @@ function _sfc_render$i(_ctx, _cache, $props, $setup, $data, $options) {
     _: 1
   });
 }
-const Role = /* @__PURE__ */ _export_sfc(_sfc_main$i, [["render", _sfc_render$i], ["__scopeId", "data-v-086753a2"]]);
+const Role = /* @__PURE__ */ _export_sfc(_sfc_main$i, [["render", _sfc_render$i], ["__scopeId", "data-v-df8b5532"]]);
 const propDefine$h = {
   linkParam: {
     // 带入的参数
@@ -24233,7 +24234,8 @@ class GeneralConfigurationInstance extends BaseInstance {
               { value: "TextEditor", text: "富文本" },
               { value: "DatePicker", text: "日期选择" },
               { value: "TimePicker", text: "时间选择" },
-              { value: "UploadFile", text: "附件" }
+              { value: "UploadFile", text: "附件" },
+              { value: "region", text: "地区选择" }
             ]
           },
           change: (row) => {
@@ -24273,6 +24275,9 @@ class GeneralConfigurationInstance extends BaseInstance {
                 row.type = "TextEditor";
                 row.textHeight = 160;
                 break;
+              case "region":
+                row.type = "region";
+                break;
             }
           }
         },
@@ -24603,6 +24608,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 +24997,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 +25012,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 +25047,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 +25159,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 +25795,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 +26289,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 +26835,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 +26852,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 +27016,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 +27539,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;