Merge branch 'main' into dev

applications/architecture-dee/public/dee-workflow/chunk-764c250f.432a7402.js

+(window["webpackJsonp-dee-workflow"]=window["webpackJsonp-dee-workflow"]||[]).push([["chunk-764c250f"],{"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")),u={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)}}},s=u,p=t("2be6"),l=Object(p["a"])(s,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"),u=Object(i["a"])(o,n,r,!1,null,null,null);a["default"]=u.exports},a7e1:function(e,a,t){"use strict";t("bc66");var n=t("8c7e"),r=t("3c4f"),c=t("3d85"),o="toString",i=/./[o],u=function(e){t("e385")(RegExp.prototype,o,e,!0)};t("a124")((function(){return"/a/b"!=i.call({source:"a",flags:"b"})}))?u((function(){var e=n(this);return"/".concat(e.source,"/","flags"in e?e.flags:!c&&e instanceof RegExp?r.call(e):void 0)})):i.name!=o&&u((function(){return i.call(this)}))},bc66:function(e,a,t){t("3d85")&&"g"!=/./g.flags&&t("6f0d").f(RegExp.prototype,"flags",{configurable:!0,get:t("3c4f")})}}]);
\ No newline at end of file

applications/dee-task-center/src/business-components/tabCom/task-detail.vue

@@ -21,14 +21,41 @@
           <dee-tools :tools="tools" mode="normal" :collapse="false" />
         </div>
         <task-detail-basicInfo :basic-data="basicData" />
-        <!-- <div v-if="approvalObject.length">
+        <div v-if="approvalObject.length">
           <div class="sub-title" style="padding-bottom:12px">审批对象</div>
-          <div v-for="(x,index) in approvalObject" :key="index">
-            <dee-dynamic-com v-if="x.type==='customComponent'" :ref="name.configName" :com-item="name" :basic-data="basicData" :participant-data="participantData" />
-            <component :is="x.comName" v-else-if="x.comName" :ref="x.configName" :lay-info="x" :basic-data="basicData.businessObject" @to-detail="toDetail" />
-            <component :is="x.configName" v-else :ref="x.configName" :lay-info="x" :basic-data="basicData.businessObject" @to-detail="toDetail" />
+          <div v-for="(name,index) in approvalObject" :key="index">
+            <!-- 高级组件: globalComponents -->
+            <component :is="name.configName" v-if="name && name.type && name.type === 'globalComponents'" :ref="name.refKey" :com-item="name" :basic-data="basicData" :participant-data="participantData" />
+            <!-- 自定义组件: privateComponent -->
+            <dee-as-com
+              v-else-if="name && name.type && name.type === 'privateComponent'"
+              :ref="name.refKey"
+              :component-prop="{...name, selfComponentPath: name.selfComponentPath}"
+              :lay-config="{
+                component: {
+                  registrationType: 'custom',
+                  codeApp: name.webServerName,
+                  codePath: name.selfComponentPath
+                }
+              }"
+              :basic-data="basicData"
+              :participant-data="participantData"
+              @saveStatusChangeEvent="onSaveStatusChangeEvent"
+            />
+            <!-- 表单配置: formConfig -->
+            <dee-as-com
+              v-else-if="name && name.type && name.type === 'formConfig'"
+              :ref="name.refKey"
+              :lay-config="{
+                typeName: name.modelName,
+                layKey: name.keyName
+              }"
+              editor-immediately
+              :basic-data="basicData"
+              :participant-data="participantData"
+            />
           </div>
-        </div> -->
+        </div>
         <div v-if="basicData && basicData.basicInfo && !basicData.basicInfo.forwardFlag">
           <div class="sub-title" style="padding-bottom:12px">任务处理</div>
           <div v-for="(name,index) in dynamicComponents" :key="index">
@@ -531,7 +558,13 @@ export default {
                 el.comName = el.configName
               }
             })
-            this.approvalObject = res.items.approvalObject.filter(r => r.isShow)
+            this.approvalObject = res.items.approvalObject.filter(r => r.isShow).map(m => {
+              return {
+                ...m,
+                // 设置组件引用key
+                refKey: this.$utils.guid()
+              }
+            })
           }
 
           this.participantData = {
@@ -714,6 +747,19 @@ export default {
     finishTask(flag, params, callback, errCallBack) {
       this.$nextTick(function() {
         const validateArray = []
+        // 审批对象表单
+        this.approvalObject.forEach(item => {
+          const vm = this.$refs[item.refKey][0]
+          if (!vm) return
+          if (vm.hasOwnProperty('validate')) {
+            validateArray.push(vm.validate())
+          } else if (vm.$refs.asCom && vm.$refs.asCom.hasOwnProperty('validate')) {
+            validateArray.push(vm.$refs.asCom.validate())
+          } else if (vm.$refs.asCom.$refs && vm.$refs.asCom.$refs.deeForm && vm.$refs.asCom.$refs.deeForm.hasOwnProperty('validate')) {
+            validateArray.push(vm.$refs.asCom.$refs.deeForm.validate())
+          }
+        })
+        // 任务处理
         this.dynamicComponents.forEach(item => {
           if (this.$refs.hasOwnProperty(item.configName)) {
             if (this.$refs[item.configName][0].hasOwnProperty('validate')) {