Merge branch 'main' into dev

applications/architecture-dee/public/apiUrl.js

 // 测试环境
-// const VUE_APP_BASE_API = 'http://119.29.37.87:9007' // eslint-disable-line
 const VUE_APP_BASE_API = 'http://1.14.146.148:9002' // eslint-disable-line
+// const VUE_APP_BASE_API = 'http://36.41.67.68:9002' // eslint-disable-line
 // 开发环境
 // const VUE_APP_BASE_API = 'http://106.52.20.189:9002' // eslint-disable-line
 // const VUE_APP_BASE_API = 'http://192.168.0.38:8002' // eslint-disable-line

applications/architecture-dee/public/dee-workflow/chunk-12d55490.f9bd4b0a.js

+(window["webpackJsonp-dee-workflow"]=window["webpackJsonp-dee-workflow"]||[]).push([["chunk-12d55490"],{"13d6":function(e,a,t){var n={"./":"7ca9","./DeeSelectRule":"7e69","./DeeSelectRule.vue":"7e69","./basicInfo":"9891","./basicInfo.vue":"9891","./current-task-owner":"5894","./current-task-owner.vue":"5894","./help-setting":"f006","./help-setting.vue":"f006","./index":"7ca9","./index.js":"7ca9","./moveAndZoom":"750a","./moveAndZoom.js":"750a","./participant-authOrg":"ba31","./participant-authOrg.vue":"ba31","./participant-creator":"7677","./participant-creator.vue":"7677","./participant-group":"c096","./participant-group.vue":"c096","./participant-org":"90ee","./participant-org.vue":"90ee","./participant-pboVar":"11e9","./participant-pboVar.vue":"11e9","./participant-rule":"9ea8","./participant-rule.vue":"9ea8","./participant-starter":"e09c","./participant-starter.vue":"e09c","./participant-team":"c26c","./participant-team.vue":"c26c","./participant-user":"b170","./participant-user.vue":"b170","./participant-var":"8275","./participant-var.vue":"8275","./process-owner":"07eb","./process-owner.vue":"07eb"};function r(e){var a=c(e);return t(a)}function c(e){if(!t.o(n,e)){var a=new Error("Cannot find module '"+e+"'");throw a.code="MODULE_NOT_FOUND",a}return n[e]}r.keys=function(){return Object.keys(n)},r.resolve=c,e.exports=r,r.id="13d6"},"7e69":function(e,a,t){"use strict";t.r(a);var n=function(){var e=this,a=e._self._c;return a("div",{staticClass:"-page"},[a("el-cascader",{attrs:{props:{expandTrigger:"click",lazy:!0,lazyLoad:e.lazyLoad,checkStrictly:!0},options:e.options},on:{change:e.handleChange},model:{value:e.cascaderData,callback:function(a){e.cascaderData=a},expression:"cascaderData"}})],1)},r=[],c=(t("a7e1"),t("a74e")),o=(t("e285"),t("9ebb"),t("df26"),t("42c2")),i=(t("c880"),t("ce9c"),t("8f6b")),p={components:{},props:{value:{type:[Object,Array,String,Number],default:null},itemObj:{type:Object,default:function(){}}},data:function(){return{showCascader:!1,hasObjOptions:!1,cascaderData:"",options:[],hasGetConfigData:!1}},computed:{},watch:{},mounted:function(){this.options.length||this.getFirstOptions()},methods:{getFirstOptions:function(){var e=this;Object(i["c"])({}).then((function(a){e.options=a.items.content?a.items.content.map((function(e){return{label:e.name,value:e.innerName,data:e,leaf:""}})):[]}))},lazyLoad:function(){var e=Object(o["a"])(Object(c["a"])().mark((function e(a,t){var n;return Object(c["a"])().wrap((function(e){while(1)switch(e.prev=e.next){case 0:a&&a.data&&(a.data.children?setTimeout((function(){var e=Array.from(a.data);t(e)})):1===a.level?Object(i["findModelDefByServer"])({modelType:"BASE",serverName:a.value}).then((function(e){var a=e.items.map((function(e){return{value:e.name,label:e.displayName,leaf:"",data:e}}));t(a)})):2===a.level&&(n={indices:["DxDynamicCodeScope"],pageFrom:1,pageSize:10,openProps:[{name:"dynamicCode",pageFrom:1,pageSize:9999,items:[{fieldName:"serverName",operator:"EQ",value:a.parent.value},{fieldName:"modelName",operator:"EQ",value:a.value}]}],searchItems:{operator:"AND",children:[{operator:"AND",items:[{fieldName:"displayName",operator:"EQ",value:"pbo通用作用域"}]}]}},Object(i["getRules"])(n).then((function(e){var a=e.items.content.map((function(e){return{value:e.name,label:e.displayName,leaf:"leaf",data:e}}));t(a)}))));case 1:case"end":return e.stop()}}),e)})));function a(a,t){return e.apply(this,arguments)}return a}(),handleChange:function(e){console.log("vai=======",e)},isObj:function(e){return"[object Object]"===Object.prototype.toString.call(e)}}},u=p,s=t("2be6"),l=Object(s["a"])(u,n,r,!1,null,null,null);a["default"]=l.exports},9891:function(e,a,t){"use strict";t.r(a);var n=function(){var e=this,a=e._self._c;return a("div",{staticClass:"basicInfo-com"},[a("dee-readable-form",{attrs:{"form-data":e.basicInfo}})],1)},r=[],c={name:"BasicInfo",components:{},props:{basicInfo:{type:Array,default:function(){return[]}}},data:function(){return{}},watch:{basicInfo:{handler:function(e,a){this.basicInfo=e}}},mounted:function(){},methods:{}},o=c,i=t("2be6"),p=Object(i["a"])(o,n,r,!1,null,null,null);a["default"]=p.exports}}]);
\ No newline at end of file

applications/architecture-dee/src/commonComponents/components/orgLazyLoadSelect/index.vue

@@ -367,6 +367,7 @@ export default {
 <style lang="scss">
 .OrgLazyLoadSelectCmp {
   font-size: 14px;
+  // height: 40px;
   .text-tag{
     .el-tag{
       margin: 0 4px
@@ -374,30 +375,31 @@ export default {
   }
   .content-wrap {
     display: flex;
+    height: 100%;
     align-items: center;
     .text {
       width: auto;
       line-height: 40px;
       height: 40px;
     }
-    // .el-icon-close{
-    //   width: 20px;
-    //   text-align: right;
-    //   cursor: pointer;
-    //   &:hover {
-    //     color: #409eff;
-    //     font-size: 18px;
-    //   }
-    // }
+    .el-icon-close{
+      // width: 20px;
+      // text-align: center;
+      cursor: pointer;
+      // &:hover {
+      //   color: #409eff;
+      //   font-size: 18px;
+      // }
+    }
     .el-icon-edit {
-      width: 20px;
-      text-align: right;
+      // width: 20px;
+      // text-align: center;
       margin-left: 20px;
       cursor: pointer;
-      &:hover {
-        color: #409eff;
-        font-size: 18px;
-      }
+      // &:hover {
+      //   color: #409eff;
+      //   font-size: 18px;
+      // }
     }
   }
 }