Merge remote-tracking branch 'origin/master'

 Bin/PLTWEB/server/lib/plt-clientbase-1.0.RELEASE.jar

Binary files differ

 Bin/PLTWEB/server/lib/plt-common-1.0.RELEASE.jar

Binary files differ

 Bin/PLTWEB/server/lib/plt-slice-1.0.RELEASE.jar

Binary files differ

 Bin/PLTWEB/server/lib/plt-starter-2024.1-SNAPSHOT.jar

Binary files differ

 Bin/PLTWEB/server/lib/plt-web-api-2024.1-SNAPSHOT.jar

Binary files differ

 Bin/PLTWEB/server/lib/plt-web-base-2024.1-SNAPSHOT.jar

Binary files differ

 Bin/PLTWEB/server/lib/plt-web-permission-2024.1-SNAPSHOT.jar

Binary files differ

 Bin/PLTWEB/server/plt-web.jar

Binary files differ

 Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/PLActionParamDTO.java

@@ -33,5 +33,5 @@
    /**
     * 父action的ID
     */
    public String action;
    public String actionOid;
}

 Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsActionServiceImpl.java

@@ -524,7 +524,7 @@
        param.name = dto.getName();
        param.defaultValue = dto.getDefaultValue();
        param.description = dto.getDescription();
        param.action = dto.getAction();
        param.action = dto.getActionOid();
        String message = platformClientUtil.getUIService().createPLActionParam(param);

        if(message.startsWith("0")) {
@@ -547,7 +547,7 @@
        param.name = dto.getName();
        param.defaultValue = dto.getDefaultValue();
        param.description = dto.getDescription();
        param.action = dto.getAction();
        param.action = dto.getActionOid();
        String message = platformClientUtil.getUIService().editPLActionParam(param);

        if(message.startsWith("0")) {
@@ -589,7 +589,7 @@
        List<PLActionParamDTO> dtos = new ArrayList<>();
        for (PLActionParam paramArray : paramArrays) {
            PLActionParamDTO dto = new PLActionParamDTO();
            dto.setAction(paramArray.action);
            dto.setActionOid(paramArray.action);
            dto.setOid(paramArray.oid);
            dto.setName(paramArray.name);
            dto.setDescription(paramArray.description);

 Source/plt-web/plt-web-ui/src/views/authority/ui/uiAuthorization/UIDialog.vue

@@ -9,21 +9,23 @@
             :close-on-click-modal="false"
             @close="cancelDialog">
    <el-container style="height: 550px">
    <el-aside>
      <basic-container style="height: 500px">
        <avue-tree ref="tree" :data="treeData" :option="treeOption" @node-click="nodeClick">
    <el-aside style="height: 500px">
      <basic-container v-loading="leftLoading">
        <div style="height: 425px">
          <avue-tree ref="tree" :data="treeData" :option="treeOption" @node-click="nodeClick">
          <span slot-scope="{ node, data }" class="el-tree-node__label">
           <span>
              <i class="el-icon-user-solid"></i>
                {{ (node || {}).label }}
            </span>
          </span>
        </avue-tree>
          </avue-tree>
        </div>
      </basic-container>
    </el-aside>

    <el-main>
      <basic-container style="height: 500px">
    <el-main style="height: 500px">
      <basic-container v-loading="rightLoading">
        <h3 style="margin: 0">模块权限配置</h3>
        <div style="height: 445px;">
          <avue-tree ref="uiTree" :data="uiTreeData" :option="uiTreeOption">
@@ -54,6 +56,8 @@
name: "UIDialog",
  data() {
    return {
      leftLoading:false,
      rightLoading:false,
      dialog: {
        showDialog: false,
        title: "UI授权",
@@ -104,18 +108,18 @@
      this.dialog.showDialog = false;
    },
    getTreeList() {
      const loading = this.$loading({});
      this.leftLoading = true;
      gridRoles().then(res => {
        this.treeData = res.data.data;
        loading.close();
        this.leftLoading = false;
      }).catch(error=>{
        loading.close();
        this.leftLoading = false;
      })
    },
    // 角色点击
    nodeClick(row,node) {
      this.nodeRow = row;
      const loading = this.$loading({});
      this.rightLoading = true;
      const params = {
        'conditionMap[roleId]': this.nodeRow.oid,
        'conditionMap[type]': this.type,
@@ -136,9 +140,9 @@
          label: res.data.data[0].text,
          children: res.data.data[0].children
        }];
        loading.close();
        this.rightLoading = false;
      }).catch(error => {
        loading.close();
        this.rightLoading = false;
      })
    },
    //处理树

 Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/Aciton/index.vue

@@ -362,6 +362,7 @@
            label: '分类',
            prop: 'plActionCls',
            type: 'tree',
            defaultExpandedKeys:['root'],
            props: {
              label: 'name',
              value: 'id',