@newview/permission-service 1.2.58 → 1.2.60

package/dist/permission-service.js

@@ -14,7 +14,6 @@ import { NvComFormUp } from "@newview/file-ui";
 import { SignTaskInfoApi } from "@newview/casign-api";
 import { ProvinceApi, CityApi, AreaApi, DictionaryDetailApi, DictionaryTypeApi } from "@newview/basics-api";
 import { FileApi, OSSFileApi, FileInfoApi } from "@newview/fileservice-api";
-import "@newview/tools";
 import { NvMap } from "@newview/map";
 class DBCenterBaseApi extends BaseApi {
   get ProxyName() {
@@ -2258,7 +2257,7 @@ let RoleInstance$1 = class RoleInstance extends BaseInstance {
           colType: "ro",
           field: "IconUrl",
           title: "图标",
-          width: 80,
+          width: 50,
           align: "center",
           format: (h, params) => {
             const iconUrl = params.row.IconUrl;
@@ -2284,18 +2283,31 @@ let RoleInstance$1 = class RoleInstance extends BaseInstance {
             return h(Tag, { color: option.color }, () => option.text);
           }
         },
-        { colType: "ro", field: "OrderNo", title: "排序号", width: 90, align: "center" },
+        { colType: "ro", field: "OrderNo", title: "排序号", width: 70, align: "center" },
         {
           colType: "ro",
           field: "Operates",
           title: "功能点权限",
+          showOverflow: false,
           format: (h, params) => {
-            const operates = this.utilities.isNull(params.row.Operates) ? [] : JSON.parse(params.row.Operates);
+            let operates = this.utilities.isNull(params.row.Operates) ? [] : JSON.parse(params.row.Operates);
             if (operates.length == 0) {
-              return "";
+              operates = [
+                { code: "add", name: "新增" },
+                { code: "edit", name: "编辑" },
+                { code: "delete", name: "删除" },
+                { code: "view", name: "查看" },
+                { code: "save", name: "保存" },
+                { code: "print", name: "打印" },
+                { code: "recall", name: "撤回" },
+                { code: "permit", name: "提交" },
+                { code: "import", name: "导入" },
+                { code: "export", name: "导出" }
+              ];
             }
             const allOperates = [];
             const allChk = h(Checkbox, {
+              style: "white-space: nowrap;margin-right:0;",
               label: "all",
               "model-value": params.row.IsAllChk,
               "onUpdate:model-value": (value) => {
@@ -2317,16 +2329,22 @@ let RoleInstance$1 = class RoleInstance extends BaseInstance {
             }
             const chkGroup = h(CheckboxGroup, {
               "model-value": params.row.RoleOperates,
-              "onUpdate:model-value": (value) => {
+              onOnChange: (value) => {
                 params.row.RoleOperates = value;
                 this.setRoleModuleIsChange(params.row);
-                if (value) {
-                  params.row.IsChk = value;
-                  this.setRoleModuleIsChange(params.row);
-                }
               }
+              // 'onUpdate:model-value': (value: any) => {
+              //     params.row.RoleOperates = value;
+              //     this.setRoleModuleIsChange(params.row);
+              //     // 选中行
+              //     if (value) {
+              //         params.row.IsChk = value;
+              //         this.setRoleModuleIsChange(params.row);
+              //         // this.changeParentRoleModuleStatus(params.row);
+              //     }
+              // }
             }, () => chkList);
-            return h(Space, () => [allChk, dividerChk, chkGroup]);
+            return h("div", { class: "nv-flex" }, [allChk, dividerChk, h("div", { class: "nv-flex-1", style: "white-space: pre-wrap;margin-left: 4px;" }, chkGroup)]);
           }
         }
       ],
@@ -2608,13 +2626,13 @@ let RoleInstance$1 = class RoleInstance extends BaseInstance {
       isChange = true;
     } else {
       for (const item of data.OrgRoleOperates) {
-        if (data.RoleOperates.filter((d2) => d2 == item).length == 0) {
+        if (data.RoleOperates.filter((d) => d == item).length == 0) {
           isChange = true;
           break;
         }
       }
       for (const item of data.RoleOperates) {
-        if (data.OrgRoleOperates.filter((d2) => d2 == item).length == 0) {
+        if (data.OrgRoleOperates.filter((d) => d == item).length == 0) {
           isChange = true;
           break;
         }
@@ -2630,7 +2648,7 @@ let RoleInstance$1 = class RoleInstance extends BaseInstance {
     const datas = this.moduleGrid.value.getDatas();
     const parentDatas = datas.filter((item) => item.Id == data.PId && item.IsChk == !data.IsChk);
     for (const item of parentDatas) {
-      item.IsChk = data.IsChk == false ? datas.filter((d2) => d2.PId == item.Id && d2.IsChk == true).length > 0 : true;
+      item.IsChk = data.IsChk == false ? datas.filter((d) => d.PId == item.Id && d.IsChk == true).length > 0 : true;
       this.setRoleModuleIsChange(item);
       this.changeParentRoleModuleStatus(item);
     }
@@ -2668,7 +2686,7 @@ let RoleInstance$1 = class RoleInstance extends BaseInstance {
   }
   //#endregion 导入角色 END
 };
-const Role_vue_vue_type_style_index_0_scoped_a12a6a42_lang = "";
+const Role_vue_vue_type_style_index_0_scoped_7e692d16_lang = "";
 const _hoisted_1$l = { style: { "height": "650px", "overflow-y": "auto", "position": "relative" } };
 const _hoisted_2$a = {
   class: "import-role",
@@ -2716,7 +2734,7 @@ function _sfc_render$m(_ctx, _cache, $props, $setup, $data, $options) {
         draggable: "",
         mask: true,
         "mask-closable": false,
-        width: 1300,
+        width: 1360,
         title: "模块权限",
         styles: { top: "3%" }
       }, {
@@ -2876,7 +2894,7 @@ function _sfc_render$m(_ctx, _cache, $props, $setup, $data, $options) {
     _: 1
   });
 }
-const Role = /* @__PURE__ */ _export_sfc(_sfc_main$m, [["render", _sfc_render$m], ["__scopeId", "data-v-a12a6a42"]]);
+const Role = /* @__PURE__ */ _export_sfc(_sfc_main$m, [["render", _sfc_render$m], ["__scopeId", "data-v-7e692d16"]]);
 const propDefine$l = {
   linkParam: {
     // 带入的参数
@@ -5058,7 +5076,7 @@ let UserinforInstance$1 = class UserinforInstance extends BaseInstance {
       let userRoles = this.utilities.parseApiResult(apiResult);
       let insertRecords = [];
       for (const item of chkDatas) {
-        if (userRoles.findIndex((d2) => d2.RoleId == item.Id) == -1) {
+        if (userRoles.findIndex((d) => d.RoleId == item.Id) == -1) {
           insertRecords.push({
             PlatformId: this.selectedPlatform.Id,
             UserId: this.currentUser.Id,
@@ -5068,7 +5086,7 @@ let UserinforInstance$1 = class UserinforInstance extends BaseInstance {
       }
       let deleteRecords = [];
       for (const item of userRoles) {
-        if (chkDatas.findIndex((d2) => d2.Id == item.RoleId) == -1) {
+        if (chkDatas.findIndex((d) => d.Id == item.RoleId) == -1) {
           deleteRecords.push(item.Id);
         }
       }
@@ -6811,7 +6829,7 @@ let UserinforSLInstance$1 = class UserinforSLInstance extends BaseInstance {
       let userRoles = this.utilities.parseApiResult(apiResult);
       let insertRecords = [];
       for (const item of chkDatas) {
-        if (userRoles.findIndex((d2) => d2.RoleId == item.Id) == -1) {
+        if (userRoles.findIndex((d) => d.RoleId == item.Id) == -1) {
           insertRecords.push({
             PlatformId: this.selectedPlatform.Id,
             UserId: this.currentUser.Id,
@@ -6821,7 +6839,7 @@ let UserinforSLInstance$1 = class UserinforSLInstance extends BaseInstance {
       }
       let deleteRecords = [];
       for (const item of userRoles) {
-        if (chkDatas.findIndex((d2) => d2.Id == item.RoleId) == -1) {
+        if (chkDatas.findIndex((d) => d.Id == item.RoleId) == -1) {
           deleteRecords.push(item.Id);
         }
       }
@@ -9469,9 +9487,9 @@ class GeneralConfigurationInstance extends BaseInstance {
       }
       let gridRes = this.props.configType == "GC" ? this.utilities.deepCopy(JSON.parse(this.nowRow.ProjectConfig)) : this.utilities.deepCopy(JSON.parse(this.nowRow.ConstructConfig));
       gridRes.forEach((x) => {
-        data.forEach((s2) => {
-          if (x.model == s2.model) {
-            Object.assign(x, s2);
+        data.forEach((s) => {
+          if (x.model == s.model) {
+            Object.assign(x, s);
           }
         });
       });
@@ -9506,9 +9524,9 @@ class GeneralConfigurationInstance extends BaseInstance {
         onOk: async () => {
           let res = this.props.configType == "GC" ? this.utilities.deepCopy(JSON.parse(this.nowRow.ProjectConfig)) : this.utilities.deepCopy(JSON.parse(this.nowRow.ConstructConfig));
           data.forEach((x) => {
-            res.forEach((s2, i2) => {
-              if (x.prop == s2.prop) {
-                res.splice(i2, 1);
+            res.forEach((s, i) => {
+              if (x.prop == s.prop) {
+                res.splice(i, 1);
               }
             });
           });
@@ -9624,7 +9642,7 @@ class GeneralConfigurationInstance extends BaseInstance {
       }
       this.isShowDicModalLoading.value = true;
       let newArr = [];
-      data.forEach((x, i2) => {
+      data.forEach((x, i) => {
         newArr.push({
           label: x.DetailInfor,
           prop: x.DetailValue,
@@ -9633,7 +9651,7 @@ class GeneralConfigurationInstance extends BaseInstance {
           seltype: "Input",
           append: "",
           span: 8,
-          orderNum: i2,
+          orderNum: i,
           // 排序号
           requiredd: 1,
           // 1 必填 0 可空
@@ -10138,7 +10156,7 @@ class PlatformInstance2 extends BaseInstance {
     }, true);
     const platId = (_a = this.storageInfo.getCurrentPlatform()) == null ? void 0 : _a.Id;
     this.platformGrid.value.loadData(async (option) => {
-      const apiResult = await this.platformApi.getEntitiesPageDynamic(option.page, option.pageSize, QueryWrapper.create().eq("Id", platId).or((i2) => i2.allEq({
+      const apiResult = await this.platformApi.getEntitiesPageDynamic(option.page, option.pageSize, QueryWrapper.create().eq("Id", platId).or((i) => i.allEq({
         PId: platId
       })).orderBy(["OrderNo"]));
       const data = this.utilities.parseApiResult(apiResult);
@@ -10446,7 +10464,7 @@ class RoleInstance2 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((i2) => i2.allEq({
+      const apiResult = await this.platformApi.getEntities(QueryWrapper.create().eq("Id", platId).or((i) => i.allEq({
         PId: platId
       })).orderBy(["OrderNo"]));
       this.platData.value = this.utilities.parseApiResult(apiResult);
@@ -11173,13 +11191,13 @@ class RoleInstance2 extends BaseInstance {
       isChange = true;
     } else {
       for (const item of data.OrgRoleOperates) {
-        if (data.RoleOperates.filter((d2) => d2 == item).length == 0) {
+        if (data.RoleOperates.filter((d) => d == item).length == 0) {
           isChange = true;
           break;
         }
       }
       for (const item of data.RoleOperates) {
-        if (data.OrgRoleOperates.filter((d2) => d2 == item).length == 0) {
+        if (data.OrgRoleOperates.filter((d) => d == item).length == 0) {
           isChange = true;
           break;
         }
@@ -11195,7 +11213,7 @@ class RoleInstance2 extends BaseInstance {
     const datas = this.moduleGrid.value.getDatas();
     const parentDatas = datas.filter((item) => item.Id == data.PId && item.IsChk == !data.IsChk);
     for (const item of parentDatas) {
-      item.IsChk = data.IsChk == false ? datas.filter((d2) => d2.PId == item.Id && d2.IsChk == true).length > 0 : true;
+      item.IsChk = data.IsChk == false ? datas.filter((d) => d.PId == item.Id && d.IsChk == true).length > 0 : true;
       this.setRoleModuleIsChange(item);
       this.changeParentRoleModuleStatus(item);
     }
@@ -11214,7 +11232,7 @@ class RoleInstance2 extends BaseInstance {
   async loadOriginPlatforms() {
     var _a;
     const platId = (_a = this.storageInfo.getCurrentPlatform()) == null ? void 0 : _a.Id;
-    const apiResult = await this.platformApi.getEntities(QueryWrapper.create().eq("Id", platId).ne("Id", this.platId.value).or((i2) => i2.allEq({
+    const apiResult = await this.platformApi.getEntities(QueryWrapper.create().eq("Id", platId).ne("Id", this.platId.value).or((i) => i.allEq({
       PId: platId
     })).orderBy(["OrderNo"]));
     this.originPlatform.list = this.utilities.parseApiResult(apiResult);
@@ -12116,7 +12134,7 @@ class InstitutionInstance2 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((i2) => i2.allEq({
+      const apiResult = await this.platformApi.getEntities(QueryWrapper.create().eq("Id", platId).or((i) => i.allEq({
         PId: platId
       })).orderBy(["OrderNo"]));
       this.platData.value = this.utilities.parseApiResult(apiResult);
@@ -12881,7 +12899,7 @@ class InstitutionInstance2 extends BaseInstance {
   async loadOriginPlatforms() {
     var _a;
     const platId = (_a = this.storageInfo.getCurrentPlatform()) == null ? void 0 : _a.Id;
-    const apiResult = await this.platformApi.getEntities(QueryWrapper.create().eq("Id", platId).ne("Id", this.platId.value).or((i2) => i2.allEq({
+    const apiResult = await this.platformApi.getEntities(QueryWrapper.create().eq("Id", platId).ne("Id", this.platId.value).or((i) => i.allEq({
       PId: platId
     })).orderBy(["OrderNo"]));
     this.originPlatform.list = this.utilities.parseApiResult(apiResult);
@@ -13524,7 +13542,7 @@ class UserinforInstance2 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((i2) => i2.allEq({
+      const apiResult = await this.platformApi.getEntities(QueryWrapper.create().eq("Id", platId).or((i) => i.allEq({
         PId: platId
       })).orderBy(["OrderNo"]));
       this.platData.value = this.utilities.parseApiResult(apiResult);
@@ -14075,7 +14093,7 @@ class UserinforInstance2 extends BaseInstance {
       let userRoles = this.utilities.parseApiResult(apiResult);
       let insertRecords = [];
       for (const item of chkDatas) {
-        if (userRoles.findIndex((d2) => d2.RoleId == item.Id) == -1) {
+        if (userRoles.findIndex((d) => d.RoleId == item.Id) == -1) {
           insertRecords.push({
             PlatformId: this.selectedPlatform.Id,
             UserId: this.currentUser.Id,
@@ -14085,7 +14103,7 @@ class UserinforInstance2 extends BaseInstance {
       }
       let deleteRecords = [];
       for (const item of userRoles) {
-        if (chkDatas.findIndex((d2) => d2.Id == item.RoleId) == -1) {
+        if (chkDatas.findIndex((d) => d.Id == item.RoleId) == -1) {
           deleteRecords.push(item.Id);
         }
       }
@@ -14322,6 +14340,7 @@ class UserinforInstance2 extends BaseInstance {
       this.saveingUserSign.value = true;
       const apiResult = await this.userSignApi.save(this.userSignFormModel);
       const result = this.utilities.parseApiResult(apiResult);
+      await this.userinforApi.save({ Id: this.userSignFormModel.UserId, UserSignImgToken: this.userSignFormModel.CAUserSealToken, UserSignatureImgToken: this.userSignFormModel.CAUserYZToken });
       this.saveingUserSign.value = false;
       if (result) {
         this.message.success("保存成功");
@@ -14362,10 +14381,16 @@ class UserinforInstance2 extends BaseInstance {
         content: "确定要清除该印章图片吗？",
         onOk: async () => {
           await new FileApi().deleteByToken(this.userSignFormModel.CAUserSealImg);
-          const apiResult = await this.userSignApi.save({ Id: this.userSignFormModel.Id, CAUserSealImg: "" });
-          const result = this.utilities.parseApiResult(apiResult);
-          if (result) {
+          if (this.userSignFormModel.Id) {
+            const apiResult = await this.userSignApi.save({ Id: this.userSignFormModel.Id, CAUserSealImg: "", CAUserSealToken: "" });
+            const result = this.utilities.parseApiResult(apiResult);
+            if (result) {
+              this.userSignFormModel.CAUserSealImg = "";
+              this.userSignFormModel.CAUserSealToken = "";
+            }
+          } else {
             this.userSignFormModel.CAUserSealImg = "";
+            this.userSignFormModel.CAUserSealToken = "";
           }
         }
       });
@@ -14494,10 +14519,16 @@ class UserinforInstance2 extends BaseInstance {
         content: "确定要清除该圆章图片吗？",
         onOk: async () => {
           await new FileApi().deleteByToken(this.userSignFormModel.CAUserYZToken);
-          const apiResult = await this.userSignApi.save({ Id: this.userSignFormModel.Id, CAUserYZImg: "" });
-          const result = this.utilities.parseApiResult(apiResult);
-          if (result) {
+          if (this.userSignFormModel.Id) {
+            const apiResult = await this.userSignApi.save({ Id: this.userSignFormModel.Id, CAUserYZImg: "", CAUserYZToken: "" });
+            const result = this.utilities.parseApiResult(apiResult);
+            if (result) {
+              this.userSignFormModel.CAUserYZImg = "";
+              this.userSignFormModel.CAUserYZToken = "";
+            }
+          } else {
             this.userSignFormModel.CAUserYZImg = "";
+            this.userSignFormModel.CAUserYZToken = "";
           }
         }
       });
@@ -14869,6 +14900,8 @@ class UserinforInstance2 extends BaseInstance {
       this.userSignFormModel.CAUserYZKey = "";
       this.userSignFormModel.CAUserSealImg = "";
       this.userSignFormModel.CAUserYZImg = "";
+      this.userSignFormModel.CAUserSealToken = "";
+      this.userSignFormModel.CAUserYZToken = "";
     }
   }
   /**
@@ -14879,7 +14912,7 @@ class UserinforInstance2 extends BaseInstance {
    */
   async uploadUserSignImg(userId, token, img) {
     var _a, _b, _c;
-    let ossClient = await new OSSFileApi().getOSSClient();
+    let ossClient = await new OSSFileApi();
     let fileName = "用户签名" + userId + ".png";
     let FileCabinePath = ((_a = this.storageInfo.getCurrentPlatform()) == null ? void 0 : _a.OssRootPath) + "/0/0/";
     let catalog = "root";
@@ -15667,7 +15700,7 @@ class UserinforSLInstance2 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((i2) => i2.allEq({
+      const apiResult = await this.platformApi.getEntities(QueryWrapper.create().eq("Id", platId).or((i) => i.allEq({
         PId: platId
       })).orderBy(["OrderNo"]));
       this.platData.value = this.utilities.parseApiResult(apiResult);
@@ -16225,7 +16258,7 @@ class UserinforSLInstance2 extends BaseInstance {
       let userRoles = this.utilities.parseApiResult(apiResult);
       let insertRecords = [];
       for (const item of chkDatas) {
-        if (userRoles.findIndex((d2) => d2.RoleId == item.Id) == -1) {
+        if (userRoles.findIndex((d) => d.RoleId == item.Id) == -1) {
           insertRecords.push({
             PlatformId: this.selectedPlatform.Id,
             UserId: this.currentUser.Id,
@@ -16235,7 +16268,7 @@ class UserinforSLInstance2 extends BaseInstance {
       }
       let deleteRecords = [];
       for (const item of userRoles) {
-        if (chkDatas.findIndex((d2) => d2.Id == item.RoleId) == -1) {
+        if (chkDatas.findIndex((d) => d.Id == item.RoleId) == -1) {
           deleteRecords.push(item.Id);
         }
       }
@@ -17069,7 +17102,7 @@ class UserinforSLInstance2 extends BaseInstance {
    */
   async uploadUserSignImg(userId, token, img) {
     var _a, _b, _c;
-    let ossClient = await new OSSFileApi().getOSSClient();
+    let ossClient = await new OSSFileApi();
     let fileName = "用户签名" + userId + ".png";
     let FileCabinePath = ((_a = this.storageInfo.getCurrentPlatform()) == null ? void 0 : _a.OssRootPath) + "/0/0/";
     let catalog = "root";
@@ -17871,60 +17904,6 @@ function _sfc_render$7(_ctx, _cache, $props, $setup, $data, $options) {
   });
 }
 const subuserinforSL = /* @__PURE__ */ _export_sfc(_sfc_main$7, [["render", _sfc_render$7], ["__scopeId", "data-v-b5ff2a50"]]);
-function r(t, e) {
-  for (var n = 0; n < e.length; n++) {
-    var r2 = e[n];
-    r2.enumerable = r2.enumerable || false, r2.configurable = true, "value" in r2 && (r2.writable = true), Object.defineProperty(t, s(r2.key), r2);
-  }
-}
-function o(t, e, n) {
-  return e && r(t.prototype, e), n && r(t, n), Object.defineProperty(t, "prototype", { writable: false }), t;
-}
-function i(t, e) {
-  t.prototype = Object.create(e.prototype), t.prototype.constructor = t, u(t, e);
-}
-function u(t, e) {
-  return u = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function(t2, e2) {
-    return t2.__proto__ = e2, t2;
-  }, u(t, e);
-}
-function s(t) {
-  var e = function(t2) {
-    if ("object" != typeof t2 || !t2)
-      return t2;
-    var e2 = t2[Symbol.toPrimitive];
-    if (void 0 !== e2) {
-      var n = e2.call(t2, "string");
-      if ("object" != typeof n)
-        return n;
-      throw new TypeError("@@toPrimitive must return a primitive value.");
-    }
-    return String(t2);
-  }(t);
-  return "symbol" == typeof e ? e : e + "";
-}
-var d = /* @__PURE__ */ function(t) {
-  function e() {
-    return t.apply(this, arguments) || this;
-  }
-  return i(e, t), o(e, [{ key: "ProxyName", get: function() {
-    return "PermissionApi";
-  } }]);
-}(BaseApi), y = /* @__PURE__ */ function(t) {
-  function e() {
-    return t.apply(this, arguments) || this;
-  }
-  return i(e, t), o(e, [{ key: "ControllerName", get: function() {
-    return "Platform";
-  } }]);
-}(d), C = /* @__PURE__ */ function(t) {
-  function e() {
-    return t.apply(this, arguments) || this;
-  }
-  return i(e, t), o(e, [{ key: "ControllerName", get: function() {
-    return "LoginLog";
-  } }]);
-}(d);
 const propDefine$6 = {
   linkParam: {
     // 带入的参数
@@ -17956,14 +17935,14 @@ let Instance$2 = class Instance extends BaseInstance {
     __publicField(this, "ctx");
     // 全局属性
     /** 主表 */
-    __publicField(this, "mainApi", new C());
+    __publicField(this, "mainApi", new LoginLogApi());
     /** 人员信息 */
     __publicField(this, "userInfo", this.storageInfo.getUser());
     /** 机构信息 */
     __publicField(this, "businessInfo", this.storageInfo.getCurrentInsTree());
     /** 项目信息 */
     __publicField(this, "projectInfo", this.storageInfo.getCurrentPlatform());
-    __publicField(this, "platformApi", new y());
+    __publicField(this, "platformApi", new PlatformApi());
     //#region Grid 
     // 私有属性 | private
     // 响应属性 | ref、reactive、computed、watch
@@ -18281,13 +18260,13 @@ let Instance$2 = class Instance extends BaseInstance {
       let qw = QueryWrapper.create();
       if (this.props.linkParam == "sub") {
         const platId = (_a = this.storageInfo.getCurrentPlatform()) == null ? void 0 : _a.Id;
-        qw.eq("Id", platId).or((i2) => i2.allEq({
+        qw.eq("Id", platId).or((i) => i.allEq({
           PId: platId
         })).orderBy(["OrderNo"]);
       } else if (this.props.linkParam == "")
         ;
       else {
-        qw.eq("Id", this.props.linkParam).or((i2) => i2.allEq({
+        qw.eq("Id", this.props.linkParam).or((i) => i.allEq({
           PId: this.props.linkParam
         })).orderBy(["OrderNo"]);
       }
@@ -18553,7 +18532,7 @@ class ModuleInstance2 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((i2) => i2.allEq({
+      const apiResult = await this.platformApi.getEntities(QueryWrapper.create().eq("Id", platId).or((i) => i.allEq({
         PId: platId
       })).orderBy(["OrderNo"]));
       this.platData.value = this.utilities.parseApiResult(apiResult);
@@ -19325,7 +19304,7 @@ class ModuleInstance2 extends BaseInstance {
   async loadOriginPlatforms() {
     var _a;
     const platId = (_a = this.storageInfo.getCurrentPlatform()) == null ? void 0 : _a.Id;
-    const apiResult = await this.platformApi.getEntities(QueryWrapper.create().eq("Id", platId).ne("Id", this.selectedPlatform.Id).or((i2) => i2.allEq({
+    const apiResult = await this.platformApi.getEntities(QueryWrapper.create().eq("Id", platId).ne("Id", this.selectedPlatform.Id).or((i) => i.allEq({
       PId: platId
     })).orderBy(["OrderNo"]));
     this.originPlatform.list = this.utilities.parseApiResult(apiResult);
@@ -32246,9 +32225,9 @@ var Utils = {
           }
         }
         const argArray = [];
-        for (let i2 = 1; i2 <= maxLength; i2++) {
+        for (let i = 1; i <= maxLength; i++) {
           let dollar = "";
-          for (let j = 0; j < i2; j++) {
+          for (let j = 0; j < i; j++) {
             dollar += "$";
           }
           argArray.push(dollar);
@@ -32773,8 +32752,8 @@ Enumerable.prototype.traverseDepthFirst = function(func, resultSelector) {
         try {
           Utils.dispose(enumerator);
         } finally {
-          Enumerable.from(enumeratorStack).forEach(function(s2) {
-            s2.dispose();
+          Enumerable.from(enumeratorStack).forEach(function(s) {
+            s.dispose();
           });
         }
       }
@@ -33627,8 +33606,8 @@ Enumerable.prototype.shuffle = function() {
       },
       function() {
         if (buffer.length > 0) {
-          const i2 = Math.floor(Math.random() * buffer.length);
-          return this.yieldReturn(buffer.splice(i2, 1)[0]);
+          const i = Math.floor(Math.random() * buffer.length);
+          return this.yieldReturn(buffer.splice(i, 1)[0]);
         }
         return false;
       },
@@ -33796,8 +33775,8 @@ Enumerable.prototype.average = function(selector) {
 Enumerable.prototype.count = function(predicate) {
   predicate = predicate == null ? Functions.True : Utils.createLambda(predicate);
   var count = 0;
-  this.forEach(function(x, i2) {
-    if (predicate(x, i2))
+  this.forEach(function(x, i) {
+    if (predicate(x, i))
       ++count;
   });
   return count;
@@ -33838,8 +33817,8 @@ Enumerable.prototype.sum = function(selector) {
 Enumerable.prototype.elementAt = function(index2) {
   var value;
   var found = false;
-  this.forEach(function(x, i2) {
-    if (i2 == index2) {
+  this.forEach(function(x, i) {
+    if (i == index2) {
       value = x;
       found = true;
       return false;
@@ -33854,8 +33833,8 @@ Enumerable.prototype.elementAtOrDefault = function(index2, defaultValue) {
     defaultValue = null;
   var value;
   var found = false;
-  this.forEach(function(x, i2) {
-    if (i2 == index2) {
+  this.forEach(function(x, i) {
+    if (i == index2) {
       value = x;
       found = true;
       return false;
@@ -34101,16 +34080,16 @@ Enumerable.prototype.takeFromLast = function(count) {
 Enumerable.prototype.indexOf = function(item) {
   var found = null;
   if (typeof item === Types.Function) {
-    this.forEach(function(x, i2) {
-      if (item(x, i2)) {
-        found = i2;
+    this.forEach(function(x, i) {
+      if (item(x, i)) {
+        found = i;
         return false;
       }
     });
   } else {
-    this.forEach(function(x, i2) {
+    this.forEach(function(x, i) {
       if (x === item) {
-        found = i2;
+        found = i;
         return false;
       }
     });
@@ -34120,14 +34099,14 @@ Enumerable.prototype.indexOf = function(item) {
 Enumerable.prototype.lastIndexOf = function(item) {
   var result = -1;
   if (typeof item === Types.Function) {
-    this.forEach(function(x, i2) {
-      if (item(x, i2))
-        result = i2;
+    this.forEach(function(x, i) {
+      if (item(x, i))
+        result = i;
     });
   } else {
-    this.forEach(function(x, i2) {
+    this.forEach(function(x, i) {
       if (x === item)
-        result = i2;
+        result = i;
     });
   }
   return result;
@@ -34455,8 +34434,8 @@ SortContext.prototype.GenerateKeys = function(source) {
   var len = source.length;
   var keySelector = this.keySelector;
   var keys = new Array(len);
-  for (let i2 = 0; i2 < len; i2++)
-    keys[i2] = keySelector(source[i2]);
+  for (let i = 0; i < len; i++)
+    keys[i] = keySelector(source[i]);
   this.keys = keys;
   if (this.child != null)
     this.child.GenerateKeys(source);
@@ -34739,10 +34718,10 @@ var Dictionary = function() {
       var entry = new HashEntry(key, value);
       if (callHasOwnProperty(this.buckets, hash)) {
         const array = this.buckets[hash];
-        for (let i2 = 0; i2 < array.length; i2++) {
-          if (this.compareSelector(array[i2].key) === compareKey) {
-            this.entryList.replace(array[i2], entry);
-            array[i2] = entry;
+        for (let i = 0; i < array.length; i++) {
+          if (this.compareSelector(array[i].key) === compareKey) {
+            this.entryList.replace(array[i], entry);
+            array[i] = entry;
             return;
           }
         }
@@ -34759,8 +34738,8 @@ var Dictionary = function() {
       if (!callHasOwnProperty(this.buckets, hash))
         return void 0;
       var array = this.buckets[hash];
-      for (let i2 = 0; i2 < array.length; i2++) {
-        const entry = array[i2];
+      for (let i = 0; i < array.length; i++) {
+        const entry = array[i];
         if (this.compareSelector(entry.key) === compareKey)
           return entry.value;
       }
@@ -34771,11 +34750,11 @@ var Dictionary = function() {
       var hash = computeHashCode(compareKey);
       if (callHasOwnProperty(this.buckets, hash)) {
         const array = this.buckets[hash];
-        for (let i2 = 0; i2 < array.length; i2++) {
-          if (this.compareSelector(array[i2].key) === compareKey) {
+        for (let i = 0; i < array.length; i++) {
+          if (this.compareSelector(array[i].key) === compareKey) {
             const newEntry = new HashEntry(key, value);
-            this.entryList.replace(array[i2], newEntry);
-            array[i2] = newEntry;
+            this.entryList.replace(array[i], newEntry);
+            array[i] = newEntry;
             return true;
           }
         }
@@ -34788,8 +34767,8 @@ var Dictionary = function() {
       if (!callHasOwnProperty(this.buckets, hash))
         return false;
       var array = this.buckets[hash];
-      for (let i2 = 0; i2 < array.length; i2++) {
-        if (this.compareSelector(array[i2].key) === compareKey)
+      for (let i = 0; i < array.length; i++) {
+        if (this.compareSelector(array[i].key) === compareKey)
           return true;
       }
       return false;
@@ -34805,10 +34784,10 @@ var Dictionary = function() {
       if (!callHasOwnProperty(this.buckets, hash))
         return;
       var array = this.buckets[hash];
-      for (let i2 = 0; i2 < array.length; i2++) {
-        if (this.compareSelector(array[i2].key) === compareKey) {
-          this.entryList.remove(array[i2]);
-          array.splice(i2, 1);
+      for (let i = 0; i < array.length; i++) {
+        if (this.compareSelector(array[i].key) === compareKey) {
+          this.entryList.remove(array[i]);
+          array.splice(i, 1);
           if (array.length == 0)
             delete this.buckets[hash];
           this.countField--;
@@ -35076,7 +35055,7 @@ let ProjectUserinforInstance$1 = class ProjectUserinforInstance extends BaseInst
       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((i2) => i2.allEq({
+      const apiResult = await this.platformApi.getEntities(QueryWrapper.create().eq("Id", platId).or((i) => i.allEq({
         PId: platId
       })).orderBy(["OrderNo"]));
       this.platData.value = this.utilities.parseApiResult(apiResult);
@@ -35750,7 +35729,7 @@ class ProjectSummaryInstance extends BaseInstance {
       if (arr && arr.length > 0) {
         this.isShowForm.value = true;
         this.isShowSpin.value = true;
-        arr.forEach((x, i2) => {
+        arr.forEach((x, i) => {
           if (x.type == "region") {
             let regionArr = [
               {
@@ -35809,7 +35788,7 @@ class ProjectSummaryInstance extends BaseInstance {
                 ] : []
               }
             ];
-            arr.splice(i2, 1, ...regionArr);
+            arr.splice(i, 1, ...regionArr);
           }
           if (x.requiredd > 0) {
             switch (x.type) {
@@ -35838,15 +35817,15 @@ class ProjectSummaryInstance extends BaseInstance {
       }
       this.mainFormItems.splice(0, this.mainFormItems.length, ...arr);
       console.log("xxxxxxxxxxxxx", this.mainFormItems);
-      this.mainFormItems.forEach((x, i2) => {
+      this.mainFormItems.forEach((x, i) => {
         if (x.model == "Province") {
-          this.provinceIndex.value = i2;
+          this.provinceIndex.value = i;
         }
         if (x.model == "City") {
-          this.cityIndex.value = i2;
+          this.cityIndex.value = i;
         }
         if (x.model == "Area") {
-          this.areaIndex.value = i2;
+          this.areaIndex.value = i;
         }
       });
       console.log("xxxxxxxxxxxxx", this.mainFormItems);
@@ -36103,7 +36082,7 @@ class ProjectUserinforInstance2 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((i2) => i2.allEq({
+      const apiResult = await this.platformApi.getEntities(QueryWrapper.create().eq("Id", platId).or((i) => i.allEq({
         PId: platId
       })).orderBy(["OrderNo"]));
       this.platData.value = this.utilities.parseApiResult(apiResult);
@@ -36611,7 +36590,7 @@ class ProjectUserinforInstance2 extends BaseInstance {
       let userRoles = this.utilities.parseApiResult(apiResult);
       let insertRecords = [];
       for (const item of chkDatas) {
-        if (userRoles.findIndex((d2) => d2.RoleId == item.Id) == -1) {
+        if (userRoles.findIndex((d) => d.RoleId == item.Id) == -1) {
           insertRecords.push({
             PlatformId: this.selectedPlatform.Id,
             UserId: this.currentUser.Id,
@@ -36621,7 +36600,7 @@ class ProjectUserinforInstance2 extends BaseInstance {
       }
       let deleteRecords = [];
       for (const item of userRoles) {
-        if (chkDatas.findIndex((d2) => d2.Id == item.RoleId) == -1) {
+        if (chkDatas.findIndex((d) => d.Id == item.RoleId) == -1) {
           deleteRecords.push(item.Id);
         }
       }
@@ -37155,8 +37134,8 @@ class ProjectUserinforInstance2 extends BaseInstance {
     }
   }
 }
-const ProjectUserinfor_vue_vue_type_style_index_0_scoped_585a48b7_lang = "";
-const _withScopeId = (n) => (pushScopeId("data-v-585a48b7"), n = n(), popScopeId(), n);
+const ProjectUserinfor_vue_vue_type_style_index_0_scoped_07e382fc_lang = "";
+const _withScopeId = (n) => (pushScopeId("data-v-07e382fc"), n = n(), popScopeId(), n);
 const _hoisted_1$1 = { class: "instree-search" };
 const _hoisted_2 = { class: "instree-list" };
 const _hoisted_3 = { style: { "height": "600px", "overflow-y": "auto" } };
@@ -37276,7 +37255,7 @@ function _sfc_render$2(_ctx, _cache, $props, $setup, $data, $options) {
       }, 8, ["onChange"]),
       createVNode(_component_NvBox, {
         width: _ctx.userBoxWidth,
-        title: "用户列表111"
+        title: "用户列表"
       }, {
         default: withCtx(() => [
           createVNode(_component_NvGrid, {
@@ -37521,7 +37500,7 @@ function _sfc_render$2(_ctx, _cache, $props, $setup, $data, $options) {
     _: 1
   });
 }
-const projectUser = /* @__PURE__ */ _export_sfc(_sfc_main$2, [["render", _sfc_render$2], ["__scopeId", "data-v-585a48b7"]]);
+const projectUser = /* @__PURE__ */ _export_sfc(_sfc_main$2, [["render", _sfc_render$2], ["__scopeId", "data-v-07e382fc"]]);
 const propDefine$1 = {
   linkParam: {
     // 带入的参数
@@ -37985,7 +37964,7 @@ class Instance3 extends BaseInstance {
       var _a;
       this.spinPlatShow.value = true;
       const platId = (_a = this.storageInfo.getCurrentPlatform()) == null ? void 0 : _a.Id;
-      let apiResult = this.utilities.parseApiResult(await this.platformApi.getEntities(QueryWrapper.create().eq("Id", platId).or((i2) => i2.allEq({
+      let apiResult = this.utilities.parseApiResult(await this.platformApi.getEntities(QueryWrapper.create().eq("Id", platId).or((i) => i.allEq({
         PId: platId
       })).orderBy(["OrderNo"])));
       console.log(apiResult, "平台信息");