@newview/permission-service 1.2.25 → 1.2.26

package/README.md

@@ -1,3 +1,7 @@
+### 版本 1.2.26
+
+1、功能缺陷修改
+
 ### 版本 1.2.25
 
 1、项目概况修改

package/dist/permission-service.js

@@ -5,7 +5,7 @@ var __publicField = (obj, key, value) => {
   return value;
 };
 import { BaseInstance } from "@newview/base-vue";
-import { defineComponent, ref, reactive, onMounted, resolveComponent, openBlock, createBlock, withCtx, createVNode, createElementVNode, createTextVNode, nextTick, toDisplayString, createElementBlock, Fragment, renderList, withDirectives, vShow, pushScopeId, popScopeId, onUnmounted, createCommentVNode, withModifiers } from "vue";
+import { defineComponent, ref, reactive, onMounted, resolveComponent, openBlock, createBlock, withCtx, createVNode, createElementVNode, createTextVNode, nextTick, toDisplayString, createElementBlock, Fragment, renderList, withDirectives, vShow, pushScopeId, popScopeId, onUnmounted, createCommentVNode, computed, withModifiers } from "vue";
 import { PlatformApi, PlatformGroupApi, ModuleApi, RoleApi, RoleModuleApi, InstitutionRoleApi, InstitutionTypeApi, InstitutioninforApi, InstitutionPlatformApi, InstitutionTreeApi, EnterpriseApi, LoginLogApi, UserinforApi, InstitutionUserApi, UserRoleApi, OAuthApi, UserSignApi, InstitutionLinePointApi, InstitutionPointApi, ProjectSummaryApi, DataBoardModuleApi, DataInistitutionRelationApi, DataInstitutionBoardRelationApi } from "@newview/permission-api";
 import { QueryWrapper, BaseApi } from "@newview/infrastructure";
 import { Icon, Tag, Checkbox, Divider, CheckboxGroup, Space } from "view-ui-plus";
@@ -8650,7 +8650,7 @@ class RoleInstance2 extends BaseInstance {
   }
   //#endregion 导入角色 END
 }
-const Role_vue_vue_type_style_index_0_scoped_414834fa_lang = "";
+const Role_vue_vue_type_style_index_0_scoped_bbf1cb02_lang = "";
 const _hoisted_1$9 = { style: { "height": "650px", "overflow-y": "auto", "position": "relative" } };
 const _hoisted_2$5 = {
   class: "import-role",
@@ -8844,7 +8844,7 @@ function _sfc_render$a(_ctx, _cache, $props, $setup, $data, $options) {
                     default: withCtx(() => [
                       (openBlock(true), createElementBlock(Fragment, null, renderList(_ctx.originPlatform.list, (item, index2) => {
                         return openBlock(), createBlock(_component_Option, {
-                          key: _ctx.originPlatform.selectedId + "" + index2,
+                          key: index2,
                           value: item.Id
                         }, {
                           default: withCtx(() => [
@@ -8921,7 +8921,7 @@ function _sfc_render$a(_ctx, _cache, $props, $setup, $data, $options) {
     _: 1
   });
 }
-const subrole = /* @__PURE__ */ _export_sfc(_sfc_main$a, [["render", _sfc_render$a], ["__scopeId", "data-v-414834fa"]]);
+const subrole = /* @__PURE__ */ _export_sfc(_sfc_main$a, [["render", _sfc_render$a], ["__scopeId", "data-v-bbf1cb02"]]);
 const propDefine$9 = {
   linkParam: {
     // 带入的参数
@@ -10439,7 +10439,7 @@ class InstitutionInstance2 extends BaseInstance {
   }
   //#endregion 绑定角色 END
 }
-const Institution_vue_vue_type_style_index_0_scoped_ed65a91d_lang = "";
+const Institution_vue_vue_type_style_index_0_scoped_ba4186ba_lang = "";
 const _hoisted_1$7 = { style: { "width": "100%", "height": "100%", "position": "relative" } };
 const _hoisted_2$4 = { style: { "height": "500px", "overflow-y": "auto" } };
 const _hoisted_3$4 = {
@@ -10680,7 +10680,7 @@ function _sfc_render$8(_ctx, _cache, $props, $setup, $data, $options) {
                       default: withCtx(() => [
                         (openBlock(true), createElementBlock(Fragment, null, renderList(_ctx.originPlatform.list, (item, index2) => {
                           return openBlock(), createBlock(_component_Option, {
-                            key: _ctx.originPlatform.selectedId + "" + index2,
+                            key: index2,
                             value: item.Id
                           }, {
                             default: withCtx(() => [
@@ -10752,7 +10752,7 @@ function _sfc_render$8(_ctx, _cache, $props, $setup, $data, $options) {
     _: 1
   });
 }
-const subinstitution = /* @__PURE__ */ _export_sfc(_sfc_main$8, [["render", _sfc_render$8], ["__scopeId", "data-v-ed65a91d"]]);
+const subinstitution = /* @__PURE__ */ _export_sfc(_sfc_main$8, [["render", _sfc_render$8], ["__scopeId", "data-v-ba4186ba"]]);
 const propDefine$7 = {};
 const _sfc_main$7 = defineComponent({
   name: "LoginLog",
@@ -11193,6 +11193,9 @@ class UserinforInstance2 extends BaseInstance {
     __publicField(this, "doChangeUserBoxWidth", (isExpand) => {
       this.userBoxWidth.value = isExpand ? "calc(100% - 300px)" : "calc(100% - 45px)";
     });
+    __publicField(this, "expiredDateDisabled", computed(() => {
+      return this.userFormModel.Id == 0;
+    }));
     //#endregion 用户列表 END
     //#region 编辑用户
     // 响应属性 | ref、reactive、computed、watch
@@ -11219,6 +11222,7 @@ class UserinforInstance2 extends BaseInstance {
       LastUpdateUserName: "",
       LastUpdateDate: ""
     }));
+    __publicField(this, "isDe", false);
     __publicField(this, "userFormItems", reactive([
       {
         model: "",
@@ -11263,7 +11267,14 @@ class UserinforInstance2 extends BaseInstance {
               transfer: true
             }
           },
-          { model: "ExpiredDate", label: "密码过期时间", type: "DatePicker" },
+          {
+            model: "ExpiredDate",
+            label: "密码过期时间",
+            type: "DatePicker",
+            datePickerProp: {
+              disabled: true
+            }
+          },
           {
             model: "PwdAuthentication",
             label: "密码强认证",
@@ -11759,6 +11770,13 @@ class UserinforInstance2 extends BaseInstance {
       option.success(datas);
     });
   }
+  // dateDis = computed(() => {
+  //     return this.userFormModel.Id == 0
+  // });
+  dateDis() {
+    debugger;
+    return this.userFormModel.Id == 0;
+  }
   // 私有方法 | private 方法名() {}
   /**
    * 编辑用户信息
@@ -11964,8 +11982,8 @@ class UserinforInstance2 extends BaseInstance {
   // 响应式方法 | xxx = () => {}
   //#endregion 重置密码  END
 }
-const Userinfor_vue_vue_type_style_index_0_scoped_d910e362_lang = "";
-const _withScopeId$2 = (n) => (pushScopeId("data-v-d910e362"), n = n(), popScopeId(), n);
+const Userinfor_vue_vue_type_style_index_0_scoped_6a60ce29_lang = "";
+const _withScopeId$2 = (n) => (pushScopeId("data-v-6a60ce29"), n = n(), popScopeId(), n);
 const _hoisted_1$5 = { class: "instree-search" };
 const _hoisted_2$3 = { class: "instree-list" };
 const _hoisted_3$3 = { style: { "height": "600px", "overflow-y": "auto" } };
@@ -12086,7 +12104,7 @@ function _sfc_render$6(_ctx, _cache, $props, $setup, $data, $options) {
       }, 8, ["onChange"]),
       createVNode(_component_NvBox, {
         width: _ctx.userBoxWidth,
-        title: "用户列表1"
+        title: "用户列表"
       }, {
         default: withCtx(() => [
           createVNode(_component_NvGrid, {
@@ -12136,11 +12154,12 @@ function _sfc_render$6(_ctx, _cache, $props, $setup, $data, $options) {
               rules: _ctx.userFormRule
             }, {
               default: withCtx(() => [
-                createVNode(_component_NvComForm, {
+                _ctx.showEditUser ? (openBlock(), createBlock(_component_NvComForm, {
+                  key: 0,
                   ref: "userComForm",
                   formModel: _ctx.userFormModel,
                   formItems: _ctx.userFormItems
-                }, null, 8, ["formModel", "formItems"])
+                }, null, 8, ["formModel", "formItems"])) : createCommentVNode("", true)
               ]),
               _: 1
             }, 8, ["model", "rules"]),
@@ -12377,7 +12396,7 @@ function _sfc_render$6(_ctx, _cache, $props, $setup, $data, $options) {
     _: 1
   });
 }
-const subuserinfor = /* @__PURE__ */ _export_sfc(_sfc_main$6, [["render", _sfc_render$6], ["__scopeId", "data-v-d910e362"]]);
+const subuserinfor = /* @__PURE__ */ _export_sfc(_sfc_main$6, [["render", _sfc_render$6], ["__scopeId", "data-v-6a60ce29"]]);
 const propDefine$5 = {
   linkParam: {
     // 带入的参数
@@ -26186,7 +26205,7 @@ let ProjectUserinforInstance$1 = class ProjectUserinforInstance extends BaseInst
         }
       }
       if (this.polyline.getLatLngs().length > 0) {
-        const params = this.polyline.getLatLngs().map((item) => {
+        const params = this.polyline.getLatLngs().map((item, index2) => {
           return {
             Id: 0,
             Longitude: item.lng,
@@ -26196,7 +26215,8 @@ let ProjectUserinforInstance$1 = class ProjectUserinforInstance extends BaseInst
             InsTreeId: this.selectedInsTree.Id,
             InsName: this.selectedInsTree.InstitutionAbbreviation,
             InstitutionId: this.selectedInsTree.InstitutionId,
-            Altitude: 0
+            Altitude: 0,
+            OrderNo: index2 + 1
           };
         });
         const res = this.utilities.parseApiResult(await this.institutionLinePointApi.saves(params));
@@ -26379,15 +26399,6 @@ let ProjectUserinforInstance$1 = class ProjectUserinforInstance extends BaseInst
       titleField: "name"
     }));
     // 私有方法 | private 方法名() {}
-    // private async loadPintData() {
-    //     this.groupData.value!.loadData(async (option) => {
-    //         let res = this.utilities.parseApiResult(await this.institutionPointApi.getEntities())
-    //         res.list = res.list.map((item) => {
-    //             return { ...item, Id: item.indexCode }
-    //         })
-    //         option.success(res.list)
-    //     })
-    // }
     // 响应式方法 | xxx = () => {}
     //#endregion 右侧点list END
     //#region 导入数据 
@@ -26408,7 +26419,7 @@ let ProjectUserinforInstance$1 = class ProjectUserinforInstance extends BaseInst
       this.isImporting.value = true;
       console.log(datas, "表格导入数据");
       this.refExcelImport.value.messageInfo(`***数据导入开始***'`);
-      datas = datas.map((item) => {
+      datas = datas.map((item, index2) => {
         return {
           Id: 0,
           Longitude: item["经度"],
@@ -26418,7 +26429,8 @@ let ProjectUserinforInstance$1 = class ProjectUserinforInstance extends BaseInst
           InsTreeId: this.selectedInsTree.Id,
           InsName: this.selectedInsTree.InstitutionAbbreviation,
           InstitutionId: this.selectedInsTree.InstitutionId,
-          Altitude: 0
+          Altitude: 0,
+          OrderNo: index2 + 1
         };
       });
       this.utilities.parseApiResult(await this.institutionLinePointApi.saves(datas));
@@ -27051,6 +27063,7 @@ class ProjectSummaryInstance extends BaseInstance {
           this.areaIndex.value = i;
         }
       });
+      console.log("xxxxxxxxxxxxx", this.mainFormItems);
       this.getForm(this.mainFormItems);
     } else {
       this.isShowForm.value = false;
@@ -27099,6 +27112,9 @@ class ProjectSummaryInstance extends BaseInstance {
         console.log("表单数据xxxx", res);
         Object.assign(this.nowData, res[0]);
         let formData = JSON.parse(res[0].ConfigData);
+        for (let [key, value] of Object.entries(formData)) {
+          formData[key] = formData.toString();
+        }
         console.log("xxxxxxxxxx解析json", formData);
         Object.assign(formData, {
           Province: res[0].Province ? res[0].Province : "",
@@ -27146,6 +27162,7 @@ class ProjectSummaryInstance extends BaseInstance {
    */
   setProvinceDatas() {
     if (!this.utilities.isNull(this.provinceIndex.value)) {
+      debugger;
       this.mainFormItems[this.provinceIndex.value].selectProp.datas = this.provinces.map((item) => {
         return { text: item.ProvinceName, value: item.ProvinceCode };
       });
@@ -28330,8 +28347,8 @@ class ProjectUserinforInstance2 extends BaseInstance {
     }
   }
 }
-const ProjectUserinfor_vue_vue_type_style_index_0_scoped_86385f96_lang = "";
-const _withScopeId = (n) => (pushScopeId("data-v-86385f96"), n = n(), popScopeId(), n);
+const ProjectUserinfor_vue_vue_type_style_index_0_scoped_d1697a07_lang = "";
+const _withScopeId = (n) => (pushScopeId("data-v-d1697a07"), 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" } };
@@ -28450,7 +28467,7 @@ function _sfc_render$2(_ctx, _cache, $props, $setup, $data, $options) {
       }, 8, ["onChange"]),
       createVNode(_component_NvBox, {
         width: _ctx.userBoxWidth,
-        title: "用户列表"
+        title: "用户列表111"
       }, {
         default: withCtx(() => [
           createVNode(_component_NvGrid, {
@@ -28695,7 +28712,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-86385f96"]]);
+const projectUser = /* @__PURE__ */ _export_sfc(_sfc_main$2, [["render", _sfc_render$2], ["__scopeId", "data-v-d1697a07"]]);
 const propDefine$1 = {
   linkParam: {
     // 带入的参数