@newview/permission-service 1.2.22 → 1.2.23

package/README.md

@@ -1,10 +1,11 @@
-### 版本 1.2.21
+### 版本 1.2.23
 
 1、地图定点功能修改优化
 
-### 版本 1.2.18
+### 版本 1.2.21
 
-1、增加地图定点功能
+1. 角色列表->模块权限 增加 web/app 区分
+2. 菜单模块->模块图标 app 采用 input 输入方式
 
 ### 版本 1.2.15
 

package/dist/permission-service.js

@@ -788,6 +788,14 @@ let ModuleInstance$1 = class ModuleInstance extends BaseInstance {
       this.selectedPlatform = data;
       this.loadModuleGridData();
     });
+    /**
+     * 模块类型改变
+     * web/app
+     */
+    __publicField(this, "handleModuleTypeChange", () => {
+      this.setModuleFormItems();
+      this.loadModuleGridData();
+    });
     /**
      * 加载模块菜单
      */
@@ -1175,6 +1183,21 @@ let ModuleInstance$1 = class ModuleInstance extends BaseInstance {
     this.props = props;
     this.ctx = ctx;
   }
+  // 私有方法
+  /**
+   * 设置模块表单配置
+   */
+  setModuleFormItems() {
+    if (this.webOrApp.value === 0) {
+      if (this.moduleFormItems[0].children) {
+        this.moduleFormItems[0].children[4].type = "IconSelect";
+      }
+    } else {
+      if (this.moduleFormItems[0].children) {
+        this.moduleFormItems[0].children[4].type = "Input";
+      }
+    }
+  }
   // 私有方法 | private 方法名() {}
   /**
    * 设置编辑模块的PId，并更新相关的数据链
@@ -1408,8 +1431,8 @@ let ModuleInstance$1 = class ModuleInstance extends BaseInstance {
   // 响应式方法 | xxx = () => {}
   //#endregion 业务逻辑  END
 };
-const Module_vue_vue_type_style_index_0_scoped_5a5ef504_lang = "";
-const _withScopeId$4 = (n) => (pushScopeId("data-v-5a5ef504"), n = n(), popScopeId(), n);
+const Module_vue_vue_type_style_index_0_scoped_e41c07fc_lang = "";
+const _withScopeId$4 = (n) => (pushScopeId("data-v-e41c07fc"), n = n(), popScopeId(), n);
 const _hoisted_1$h = { style: { "height": "650px", "overflow-y": "auto" } };
 const _hoisted_2$9 = {
   class: "import-module",
@@ -1456,7 +1479,7 @@ function _sfc_render$h(_ctx, _cache, $props, $setup, $data, $options) {
                 modelValue: _ctx.webOrApp,
                 "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => _ctx.webOrApp = $event),
                 type: "button",
-                onOnChange: _ctx.loadModuleGridData
+                onOnChange: _ctx.handleModuleTypeChange
               }, {
                 default: withCtx(() => [
                   createVNode(_component_Radio, { label: 0 }, {
@@ -1644,7 +1667,7 @@ function _sfc_render$h(_ctx, _cache, $props, $setup, $data, $options) {
     _: 1
   });
 }
-const Module = /* @__PURE__ */ _export_sfc(_sfc_main$h, [["render", _sfc_render$h], ["__scopeId", "data-v-5a5ef504"]]);
+const Module = /* @__PURE__ */ _export_sfc(_sfc_main$h, [["render", _sfc_render$h], ["__scopeId", "data-v-e41c07fc"]]);
 const propDefine$g = {
   linkParam: {
     // 带入的参数
@@ -7826,6 +7849,8 @@ class RoleInstance2 extends BaseInstance {
     __publicField(this, "platId", ref(0));
     __publicField(this, "platData", ref([]));
     __publicField(this, "spinPlatShow", ref(false));
+    __publicField(this, "webOrApp", ref(0));
+    // 0：WEB 1：APP
     // 私有方法 | private 方法名() {}
     // 响应式方法 | xxx = () => {}
     /**
@@ -8291,7 +8316,10 @@ class RoleInstance2 extends BaseInstance {
      */
     __publicField(this, "loadModuleGridData", (searchData) => {
       this.moduleGrid.value.loadData(async (option) => {
-        const queryWrapper = QueryWrapper.create().eq("PlatformId", this.platId.value).ne("ModuleStatus", 0).orderBy(["OrderNo"]);
+        const queryWrapper = QueryWrapper.create().allEq({
+          "PlatformId": this.platId.value,
+          "WebOrApp": this.webOrApp.value
+        }).ne("ModuleStatus", 0).orderBy(["OrderNo"]);
         if (!this.utilities.isNull(searchData.ModuleName)) {
           queryWrapper.like("ModuleName", searchData.ModuleName);
         }
@@ -8622,7 +8650,7 @@ class RoleInstance2 extends BaseInstance {
   }
   //#endregion 导入角色 END
 }
-const Role_vue_vue_type_style_index_0_scoped_ffab91cb_lang = "";
+const Role_vue_vue_type_style_index_0_scoped_414834fa_lang = "";
 const _hoisted_1$7 = { style: { "height": "650px", "overflow-y": "auto", "position": "relative" } };
 const _hoisted_2$5 = {
   class: "import-role",
@@ -8637,6 +8665,8 @@ function _sfc_render$7(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_NvControlGroup = resolveComponent("NvControlGroup");
   const _component_NvGrid = resolveComponent("NvGrid");
   const _component_NvBox = resolveComponent("NvBox");
+  const _component_Radio = resolveComponent("Radio");
+  const _component_RadioGroup = resolveComponent("RadioGroup");
   const _component_Button = resolveComponent("Button");
   const _component_Modal = resolveComponent("Modal");
   const _component_NvComForm = resolveComponent("NvComForm");
@@ -8701,7 +8731,7 @@ function _sfc_render$7(_ctx, _cache, $props, $setup, $data, $options) {
       }),
       createVNode(_component_Modal, {
         modelValue: _ctx.showRoleModule,
-        "onUpdate:modelValue": _cache[2] || (_cache[2] = ($event) => _ctx.showRoleModule = $event),
+        "onUpdate:modelValue": _cache[3] || (_cache[3] = ($event) => _ctx.showRoleModule = $event),
         draggable: "",
         mask: true,
         "mask-closable": false,
@@ -8712,7 +8742,7 @@ function _sfc_render$7(_ctx, _cache, $props, $setup, $data, $options) {
         footer: withCtx(() => [
           createVNode(_component_Button, {
             type: "text",
-            onClick: _cache[1] || (_cache[1] = ($event) => _ctx.showRoleModule = false)
+            onClick: _cache[2] || (_cache[2] = ($event) => _ctx.showRoleModule = false)
           }, {
             default: withCtx(() => [
               createTextVNode("关闭")
@@ -8735,14 +8765,40 @@ function _sfc_render$7(_ctx, _cache, $props, $setup, $data, $options) {
             createVNode(_component_NvGrid, {
               ref: "moduleGrid",
               option: _ctx.moduleGridOption
-            }, null, 8, ["option"])
+            }, {
+              default: withCtx(() => [
+                createVNode(_component_RadioGroup, {
+                  modelValue: _ctx.webOrApp,
+                  "onUpdate:modelValue": _cache[1] || (_cache[1] = ($event) => _ctx.webOrApp = $event),
+                  type: "button",
+                  onOnChange: _ctx.loadModuleGridData
+                }, {
+                  default: withCtx(() => [
+                    createVNode(_component_Radio, { label: 0 }, {
+                      default: withCtx(() => [
+                        createTextVNode("Web")
+                      ]),
+                      _: 1
+                    }),
+                    createVNode(_component_Radio, { label: 1 }, {
+                      default: withCtx(() => [
+                        createTextVNode("App")
+                      ]),
+                      _: 1
+                    })
+                  ]),
+                  _: 1
+                }, 8, ["modelValue", "onOnChange"])
+              ]),
+              _: 1
+            }, 8, ["option"])
           ])
         ]),
         _: 1
       }, 8, ["modelValue"]),
       createVNode(_component_Modal, {
         modelValue: _ctx.showImportRole,
-        "onUpdate:modelValue": _cache[5] || (_cache[5] = ($event) => _ctx.showImportRole = $event),
+        "onUpdate:modelValue": _cache[6] || (_cache[6] = ($event) => _ctx.showImportRole = $event),
         draggable: "",
         mask: true,
         "mask-closable": false,
@@ -8753,7 +8809,7 @@ function _sfc_render$7(_ctx, _cache, $props, $setup, $data, $options) {
         footer: withCtx(() => [
           createVNode(_component_Button, {
             type: "text",
-            onClick: _cache[4] || (_cache[4] = ($event) => _ctx.showImportRole = false)
+            onClick: _cache[5] || (_cache[5] = ($event) => _ctx.showImportRole = false)
           }, {
             default: withCtx(() => [
               createTextVNode("关闭")
@@ -8781,7 +8837,7 @@ function _sfc_render$7(_ctx, _cache, $props, $setup, $data, $options) {
                 default: withCtx(() => [
                   createVNode(_component_Select, {
                     modelValue: _ctx.originPlatform.selectedId,
-                    "onUpdate:modelValue": _cache[3] || (_cache[3] = ($event) => _ctx.originPlatform.selectedId = $event),
+                    "onUpdate:modelValue": _cache[4] || (_cache[4] = ($event) => _ctx.originPlatform.selectedId = $event),
                     onOnChange: _ctx.doChangeOriginPlatform,
                     style: { "width": "250px" }
                   }, {
@@ -8813,7 +8869,7 @@ function _sfc_render$7(_ctx, _cache, $props, $setup, $data, $options) {
       }, 8, ["modelValue"]),
       createVNode(_component_Modal, {
         modelValue: _ctx.showEditRole,
-        "onUpdate:modelValue": _cache[7] || (_cache[7] = ($event) => _ctx.showEditRole = $event),
+        "onUpdate:modelValue": _cache[8] || (_cache[8] = ($event) => _ctx.showEditRole = $event),
         draggable: "",
         mask: true,
         "mask-closable": false,
@@ -8824,7 +8880,7 @@ function _sfc_render$7(_ctx, _cache, $props, $setup, $data, $options) {
         footer: withCtx(() => [
           createVNode(_component_Button, {
             type: "text",
-            onClick: _cache[6] || (_cache[6] = ($event) => _ctx.showEditRole = false)
+            onClick: _cache[7] || (_cache[7] = ($event) => _ctx.showEditRole = false)
           }, {
             default: withCtx(() => [
               createTextVNode("关闭")
@@ -8865,7 +8921,7 @@ function _sfc_render$7(_ctx, _cache, $props, $setup, $data, $options) {
     _: 1
   });
 }
-const subrole = /* @__PURE__ */ _export_sfc(_sfc_main$7, [["render", _sfc_render$7], ["__scopeId", "data-v-ffab91cb"]]);
+const subrole = /* @__PURE__ */ _export_sfc(_sfc_main$7, [["render", _sfc_render$7], ["__scopeId", "data-v-414834fa"]]);
 const propDefine$6 = {
   linkParam: {
     // 带入的参数