@zscreate/form-component 1.1.364 → 1.1.366

package/dist/form-component.css

@@ -267,16 +267,16 @@ ul li[data-v-c8780a30] {
   width: 347px !important;
 }
 
-ul[data-v-44e82654],
-li[data-v-44e82654],
-dl[data-v-44e82654],
-dt[data-v-44e82654],
-dd[data-v-44e82654] {
+ul[data-v-0d15c43a],
+li[data-v-0d15c43a],
+dl[data-v-0d15c43a],
+dt[data-v-0d15c43a],
+dd[data-v-0d15c43a] {
   list-style-type: none;
   padding: 0;
   margin: 0;
 }
-.flowwork-warp[data-v-44e82654] {
+.flowwork-warp[data-v-0d15c43a] {
   position: absolute;
   left: 0;
   right: 0;
@@ -284,7 +284,7 @@ dd[data-v-44e82654] {
   bottom: 64px;
   background: #fff;
 }
-.g1_workflow_warp[data-v-44e82654] {
+.g1_workflow_warp[data-v-0d15c43a] {
   border: 1px solid #dfdfdf;
   margin: auto;
   position: absolute;
@@ -293,12 +293,12 @@ dd[data-v-44e82654] {
   bottom: 0;
   top: 0;
 }
-.g1_workflow_warp li[data-v-44e82654] {
+.g1_workflow_warp li[data-v-0d15c43a] {
   width: 100%;
   position: relative;
   text-align: center;
 }
-.g1-sider_tool1[data-v-44e82654] {
+.g1-sider_tool1[data-v-0d15c43a] {
   width: 100px;
   position: absolute;
   left: 0;
@@ -307,37 +307,37 @@ dd[data-v-44e82654] {
   border-right: 1px solid #dfdfdf;
   overflow-y: auto;
 }
-.g1-sider_tool1 .tool_box[data-v-44e82654] {
+.g1-sider_tool1 .tool_box[data-v-0d15c43a] {
   margin-top: 15px;
 }
-.g1-sider_tool1 .tool_box .tool[data-v-44e82654] {
+.g1-sider_tool1 .tool_box .tool[data-v-0d15c43a] {
   text-align: center;
   font-size: 12px;
   color: #fff;
 }
 /* 公用图形 */
-.end[data-v-44e82654] {
+.end[data-v-0d15c43a] {
   border-radius: 100%;
 }
-.comm[data-v-44e82654] {
+.comm[data-v-0d15c43a] {
   border-radius: 0px;
 }
-.gate[data-v-44e82654] {
+.gate[data-v-0d15c43a] {
   width: 60px;
   border-radius: 0;
 }
-.gate .inner[data-v-44e82654] {
+.gate .inner[data-v-0d15c43a] {
   display: inline-block;
   font-size: 16px;
 }
-.g1-form_main1[data-v-44e82654] {
+.g1-form_main1[data-v-0d15c43a] {
   position: absolute;
   left: 100px;
   right: 0;
   top: 0;
   bottom: 0;
 }
-.g1-form_main1 .head[data-v-44e82654] {
+.g1-form_main1 .head[data-v-0d15c43a] {
   height: 46px;
   line-height: 46px;
   text-align: left;
@@ -345,11 +345,11 @@ dd[data-v-44e82654] {
   box-sizing: border-box;
   border-bottom: 1px solid #d8d8d8;
 }
-.g1-form_main1 .head .ant-btn[data-v-44e82654] {
+.g1-form_main1 .head .ant-btn[data-v-0d15c43a] {
   height: 32px;
   margin-right: 10px;
 }
-.g1-form_main1 .main[data-v-44e82654] {
+.g1-form_main1 .main[data-v-0d15c43a] {
   position: absolute;
   left: 0 !important;
   right: 0px;
@@ -358,12 +358,12 @@ dd[data-v-44e82654] {
   overflow: auto;
   box-sizing: border-box;
 }
-.g1-form_main1 .main #flowContainer[data-v-44e82654] {
+.g1-form_main1 .main #flowContainer[data-v-0d15c43a] {
   background-image: linear-gradient(90deg, rgba(180, 180, 180, 0.15) 10%, rgba(180, 180, 180, 0) 10%), linear-gradient(rgba(180, 180, 180, 0.15) 10%, rgba(0, 0, 0, 0) 10%);
   background-size: 10px 10px;
   background-color: #fbfbfb;
 }
-.g1-form_main1 .sider-pannel[data-v-44e82654] {
+.g1-form_main1 .sider-pannel[data-v-0d15c43a] {
   width: 250px;
   padding: 0 15px;
   position: absolute;
@@ -373,7 +373,7 @@ dd[data-v-44e82654] {
   border-left: 1px solid #dfdfdf;
   background-color: #fff;
 }
-.g1-form_main1 .sider-pannel .sider-panel-inner[data-v-44e82654] {
+.g1-form_main1 .sider-pannel .sider-panel-inner[data-v-0d15c43a] {
   width: 100%;
   height: 100%;
   padding: 15px;
@@ -384,7 +384,7 @@ dd[data-v-44e82654] {
   top: 0;
   overflow-y: auto;
 }
-.g1-form_main1 .sider-pannel .sider-open[data-v-44e82654] {
+.g1-form_main1 .sider-pannel .sider-open[data-v-0d15c43a] {
   width: 36px;
   height: 60px;
   line-height: 60px;
@@ -400,14 +400,14 @@ dd[data-v-44e82654] {
   background-color: #fff;
 }
 /* 视图图形 */
-.flow-view[data-v-44e82654] {
+.flow-view[data-v-0d15c43a] {
   position: absolute;
   left: 0;
   right: 0;
   top: 0;
   bottom: 0;
 }
-.flow-view .inner .flow-node-drag[data-v-44e82654] {
+.flow-view .inner .flow-node-drag[data-v-0d15c43a] {
   width: 12px;
   height: 12px;
   display: block;
@@ -418,27 +418,27 @@ dd[data-v-44e82654] {
   cursor: crosshair;
   background: rgba(24, 144, 255, 0.6);
 }
-.flow-view .inner .flow-node-drag[data-v-44e82654]:nth-child(1) {
+.flow-view .inner .flow-node-drag[data-v-0d15c43a]:nth-child(1) {
   left: -6px;
   top: 0;
   bottom: 0;
 }
-.flow-view .inner .flow-node-drag[data-v-44e82654]:nth-child(2) {
+.flow-view .inner .flow-node-drag[data-v-0d15c43a]:nth-child(2) {
   top: -6px;
   left: 0;
   right: 0;
 }
-.flow-view .inner .flow-node-drag[data-v-44e82654]:nth-child(3) {
+.flow-view .inner .flow-node-drag[data-v-0d15c43a]:nth-child(3) {
   right: -6px;
   top: 0;
   bottom: 0;
 }
-.flow-view .inner .flow-node-drag[data-v-44e82654]:nth-child(4) {
+.flow-view .inner .flow-node-drag[data-v-0d15c43a]:nth-child(4) {
   bottom: -6px;
   left: 0;
   right: 0;
 }
-.flow-view .tool[data-v-44e82654] {
+.flow-view .tool[data-v-0d15c43a] {
   width: 100%;
   height: 100%;
   margin: 0;
@@ -446,14 +446,14 @@ dd[data-v-44e82654] {
   box-shadow: 5px 5px 3px #d4d0d0;
   background: #fbfbfb;
 }
-.flow-view .tool .iconfont[data-v-44e82654] {
+.flow-view .tool .iconfont[data-v-0d15c43a] {
   font-size: 100%;
   color: #858587;
 }
-.flow-view .exclude_gateway[data-v-44e82654] {
+.flow-view .exclude_gateway[data-v-0d15c43a] {
   box-shadow: 0 0 0 #ccc;
 }
-.flow-view .gate[data-v-44e82654] {
+.flow-view .gate[data-v-0d15c43a] {
   line-height: 50px;
   position: absolute;
   left: 0;
@@ -461,9 +461,9 @@ dd[data-v-44e82654] {
   top: 0;
   bottom: 0;
 }
-.flow-view .ordinary_gateway[data-v-44e82654],
-.flow-view .parall_gateway[data-v-44e82654],
-.flow-view .exclude_gateway[data-v-44e82654] {
+.flow-view .ordinary_gateway[data-v-0d15c43a],
+.flow-view .parall_gateway[data-v-0d15c43a],
+.flow-view .exclude_gateway[data-v-0d15c43a] {
   border: none;
   border-radius: 0;
   background-size: cover;
@@ -471,35 +471,35 @@ dd[data-v-44e82654] {
   background-position: center center;
   box-shadow: 0 0 0 #ccc;
 }
-.flow-view .ordinary_gateway .flow-node-drag[data-v-44e82654]:nth-child(1),
-.flow-view .parall_gateway .flow-node-drag[data-v-44e82654]:nth-child(1),
-.flow-view .exclude_gateway .flow-node-drag[data-v-44e82654]:nth-child(1) {
+.flow-view .ordinary_gateway .flow-node-drag[data-v-0d15c43a]:nth-child(1),
+.flow-view .parall_gateway .flow-node-drag[data-v-0d15c43a]:nth-child(1),
+.flow-view .exclude_gateway .flow-node-drag[data-v-0d15c43a]:nth-child(1) {
   left: 0;
   top: 0;
   bottom: 0;
 }
-.flow-view .ordinary_gateway .flow-node-drag[data-v-44e82654]:nth-child(2),
-.flow-view .parall_gateway .flow-node-drag[data-v-44e82654]:nth-child(2),
-.flow-view .exclude_gateway .flow-node-drag[data-v-44e82654]:nth-child(2) {
+.flow-view .ordinary_gateway .flow-node-drag[data-v-0d15c43a]:nth-child(2),
+.flow-view .parall_gateway .flow-node-drag[data-v-0d15c43a]:nth-child(2),
+.flow-view .exclude_gateway .flow-node-drag[data-v-0d15c43a]:nth-child(2) {
   top: 0;
   left: 0;
   right: 0;
 }
-.flow-view .ordinary_gateway .flow-node-drag[data-v-44e82654]:nth-child(3),
-.flow-view .parall_gateway .flow-node-drag[data-v-44e82654]:nth-child(3),
-.flow-view .exclude_gateway .flow-node-drag[data-v-44e82654]:nth-child(3) {
+.flow-view .ordinary_gateway .flow-node-drag[data-v-0d15c43a]:nth-child(3),
+.flow-view .parall_gateway .flow-node-drag[data-v-0d15c43a]:nth-child(3),
+.flow-view .exclude_gateway .flow-node-drag[data-v-0d15c43a]:nth-child(3) {
   right: 0;
   top: 0;
   bottom: 0;
 }
-.flow-view .ordinary_gateway .flow-node-drag[data-v-44e82654]:nth-child(4),
-.flow-view .parall_gateway .flow-node-drag[data-v-44e82654]:nth-child(4),
-.flow-view .exclude_gateway .flow-node-drag[data-v-44e82654]:nth-child(4) {
+.flow-view .ordinary_gateway .flow-node-drag[data-v-0d15c43a]:nth-child(4),
+.flow-view .parall_gateway .flow-node-drag[data-v-0d15c43a]:nth-child(4),
+.flow-view .exclude_gateway .flow-node-drag[data-v-0d15c43a]:nth-child(4) {
   bottom: 0;
   left: 0;
   right: 0;
 }
-.flow-view .exclude_gateway[data-v-44e82654] {
+.flow-view .exclude_gateway[data-v-0d15c43a] {
   width: 70%;
   height: 70%;
   margin: 15%;
@@ -508,7 +508,7 @@ dd[data-v-44e82654] {
   transform: rotate(45deg);
   position: relative;
 }
-.flow-view .exclude_gateway[data-v-44e82654]::before {
+.flow-view .exclude_gateway[data-v-0d15c43a]::before {
   content: '';
   width: 2px;
   background-color: #7a7a7a;
@@ -518,7 +518,7 @@ dd[data-v-44e82654] {
   top: calc(50% - 10px);
   left: calc(50% - 1px);
 }
-.flow-view .exclude_gateway[data-v-44e82654]::after {
+.flow-view .exclude_gateway[data-v-0d15c43a]::after {
   content: '';
   width: 20px;
   background-color: #7a7a7a;
@@ -528,7 +528,7 @@ dd[data-v-44e82654] {
   top: calc(50% - 1px);
   left: calc(50% - 10px);
 }
-.flow-view .parall_gateway[data-v-44e82654] {
+.flow-view .parall_gateway[data-v-0d15c43a] {
   width: 70%;
   height: 70%;
   margin: 15%;
@@ -537,7 +537,7 @@ dd[data-v-44e82654] {
   transform: rotate(45deg);
   position: relative;
 }
-.flow-view .parall_gateway[data-v-44e82654]::after {
+.flow-view .parall_gateway[data-v-0d15c43a]::after {
   content: '';
   width: 20px;
   background-color: #7a7a7a;
@@ -549,7 +549,7 @@ dd[data-v-44e82654] {
   filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=1);
   transform: rotate(45deg);
 }
-.flow-view .parall_gateway[data-v-44e82654]::before {
+.flow-view .parall_gateway[data-v-0d15c43a]::before {
   content: '';
   width: 2px;
   background-color: #7a7a7a;
@@ -562,7 +562,7 @@ dd[data-v-44e82654] {
   transform: rotate(45deg);
 }
 /* 线条工具 */
-.lineTool[data-v-44e82654] {
+.lineTool[data-v-0d15c43a] {
   width: 130px;
   height: 26px;
   border: 1px solid #1890ff;
@@ -570,7 +570,7 @@ dd[data-v-44e82654] {
   background-color: #fff;
   text-align: left;
 }
-.lineTool li[data-v-44e82654] {
+.lineTool li[data-v-0d15c43a] {
   width: 30px;
   height: 26px;
   display: inline-block;
@@ -578,14 +578,14 @@ dd[data-v-44e82654] {
   text-align: center;
   color: #1890ff;
 }
-.tool-drag a .inner[data-v-44e82654] {
+.tool-drag a .inner[data-v-0d15c43a] {
   color: #f00 !important;
 }
-.ant-layout-footer[data-v-44e82654] {
+.ant-layout-footer[data-v-0d15c43a] {
   z-index: 10;
 }
 
-#flowContainer[data-v-44e82654] {
+#flowContainer[data-v-0d15c43a] {
   width: 1000000px;
   height: 1000000px;
   position: absolute;
@@ -598,7 +598,7 @@ dd[data-v-44e82654] {
   left: -500000px;
   top: -500000px; */
 }
-.labelClass[data-v-44e82654] {
+.labelClass[data-v-0d15c43a] {
   padding: 0 3px;
   font-size: 12px;
   cursor: pointer;
@@ -609,14 +609,14 @@ dd[data-v-44e82654] {
   border-radius: 3px;
   background: rgba(24, 144, 255, 0.6);
 }
-.loading[data-v-44e82654] {
+.loading[data-v-0d15c43a] {
   height: 100%;
   width: 100%;
   display: flex;
   align-items: center;
   justify-content: center;
 }
-[data-v-44e82654] .labelClass {
+[data-v-0d15c43a] .labelClass {
   background-color: #539dfa !important;
   padding: 5px;
   border-radius: 5px;

package/dist/form-component.umd.js

@@ -157684,7 +157684,7 @@ function toString(value) {
 /***/ ((module) => {
 
 "use strict";
-module.exports = {"i8":"1.1.364"};
+module.exports = {"i8":"1.1.366"};
 
 /***/ })
 
@@ -159627,7 +159627,7 @@ icon_Icon.install = function (Vue) {
 };
 
 /* harmony default export */ const icon = (icon_Icon);
-;// CONCATENATED MODULE: ./node_modules/_vue-loader@15.10.1@vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/_vue-loader@15.10.1@vue-loader/lib/index.js??vue-loader-options!./src/flow/panel.vue?vue&type=template&id=44e82654&scoped=true&
+;// CONCATENATED MODULE: ./node_modules/_vue-loader@15.10.1@vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/_vue-loader@15.10.1@vue-loader/lib/index.js??vue-loader-options!./src/flow/panel.vue?vue&type=template&id=0d15c43a&scoped=true&
 var render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return (_vm.easyFlowVisible)?_c('div',{staticClass:"g1_workflow_warp"},[_c('div',{staticClass:"g1-sider_tool1"},[_c('div',{ref:"flowTool",staticClass:"tool_box"},[_c('flowTool',{on:{"addNode":_vm.addNode}})],1)]),_c('div',{ref:"form_main1",staticClass:"g1-form_main1",attrs:{"id":"form_main1"}},[_c('div',{staticClass:"head"},[_c('a-button',{attrs:{"type":"primary","size":"small","icon":"search"},on:{"click":_vm.dataInfo}},[_vm._v("查看")]),_c('a-button',{attrs:{"type":"primary","size":"small","icon":"fund"},on:{"click":function($event){$event.stopPropagation();return _vm.isPanelShow('flowPanel')}}},[_vm._v("设置流程信息 ")]),_c('a-button',{attrs:{"type":"primary","size":"small","icon":"align-left"},on:{"click":function($event){$event.stopPropagation();return _vm.isPanelShow('dataConditionPanel')}}},[_vm._v("查看流程条件 ")]),(!_vm.isFlowPanelMain)?_c('a-button',{attrs:{"type":"primary","size":"small","icon":"save"},on:{"click":_vm.saveData}},[_vm._v("保存")]):_vm._e()],1),_c('div',{ref:"main",staticClass:"main",attrs:{"id":"main"},on:{"click":_vm.closeAddBtn}},[_c('div',{ref:"flowContainer",staticClass:"container",attrs:{"id":"flowContainer"}},[_vm._l((_vm.data.nodeList),function(node){return [_c('flow-node',{directives:[{name:"show",rawName:"v-show",value:(node.show),expression:"node.show"}],key:node.id,ref:"flowNode",refInFor:true,attrs:{"id":node.id,"node":node,"nodeList":_vm.data.nodeList},on:{"clickNode":_vm.clickNode,"lineChange":_vm.lineChange,"deleteNode":_vm.deleteNode,"nodeRightMenu":_vm.nodeRightMenu,"changeNodeSite":_vm.changeNodeSite,"editNode":_vm.editNode,"addNodeClick":_vm.addNodeClick}})]})],2),(_vm.isSavePicLoadingShow)?_c('div',{staticClass:"loading"},[_c('a-spin',{attrs:{"size":"large"}})],1):_vm._e()]),_c('sider-panel',{directives:[{name:"show",rawName:"v-show",value:(_vm.siderPanelVisible),expression:"siderPanelVisible"}],ref:"siderPanel",attrs:{"isFlowPanelZJAF":_vm.isFlowPanelZJAF,"formId":_vm.data.nodeForm.formId,"formDesigerData":_vm.formDesigerData,"verifyListArr":_vm.verifyList},on:{"isPanelShow":_vm.isPanelShow}}),(_vm.linePanelVisible)?_c('line-panel',{ref:"linePanel",attrs:{"formId":_vm.data.nodeForm.formId,"formDesigerData":_vm.formDesigerData},on:{"isPanelShow":_vm.isPanelShow,"setLineData":_vm.setLineData}}):_vm._e(),_c('dataConditionPanel',{directives:[{name:"show",rawName:"v-show",value:(_vm.dataConditionPanelVisible),expression:"dataConditionPanelVisible"}],ref:"dataConditionPanel",attrs:{"formId":_vm.data.nodeForm.formId,"formDesigerData":_vm.formDesigerData},on:{"isPanelShow":_vm.isPanelShow}}),_c('flow-panel',{directives:[{name:"show",rawName:"v-show",value:(_vm.flowPanelVisible),expression:"flowPanelVisible"}],ref:"flowPanel",staticStyle:{"z-index":"10"},attrs:{"data":_vm.data,"id":_vm.id},on:{"isPanelShow":_vm.isPanelShow}}),(_vm.copyDesignVisible)?_c('copyDesign',{ref:"copyDesign",attrs:{"formId":_vm.data.nodeForm.formId,"formDesigerData":_vm.formDesigerData},on:{"isPanelShow":_vm.isPanelShow}}):_vm._e()],1),(_vm.flowInfoVisible)?_c('flow-info',{ref:"flowInfo"}):_vm._e(),(_vm.lineToolVisible)?_c('ul',{ref:"lineTool",staticClass:"lineTool",on:{"mouseleave":_vm.lineToolFn}},[_c('li',{on:{"click":function($event){return _vm.setLineStyle('Flowchart')}}},[_c('svg-icon',{attrs:{"iconName":"icon-yibiaopan"}})],1),_c('li',{on:{"click":function($event){return _vm.setLineStyle('Bezier')}}},[_c('svg-icon',{attrs:{"iconName":"icon-ant-bezier-quadro"}})],1),_c('li',{on:{"click":function($event){return _vm.setLineStyle('Straight')}}},[_c('svg-icon',{attrs:{"iconName":"icon-line"}})],1),_c('li',{on:{"click":_vm.deleteLineView}},[_c('svg-icon',{attrs:{"iconName":"icon-jurassic_line"}})],1)]):_vm._e()],1):_vm._e()}
 var staticRenderFns = []
 
@@ -161315,8 +161315,8 @@ var sider_panelvue_type_template_id_8040a504_render = function () {var _vm=this;
 var sider_panelvue_type_template_id_8040a504_staticRenderFns = []
 
 
-;// CONCATENATED MODULE: ./node_modules/_vue-loader@15.10.1@vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/_vue-loader@15.10.1@vue-loader/lib/index.js??vue-loader-options!./src/flow/select_type.vue?vue&type=template&id=695b5299&
-var select_typevue_type_template_id_695b5299_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',[_c('a-modal',{attrs:{"title":"配置人员类型","width":800,"destroyOnClose":true},on:{"ok":_vm.handleOk,"cancel":_vm.handleCancel},model:{value:(_vm.visible),callback:function ($$v) {_vm.visible=$$v},expression:"visible"}},[_c('div',{staticClass:"table-page-search-wrapper"},[_c('a-form',{attrs:{"layout":"inline"}},[_c('a-row',{directives:[{name:"show",rawName:"v-show",value:(_vm.defaultKey !== 'CandidateFormUsers' && _vm.defaultKey !== 'Script' ),expression:"defaultKey !== 'CandidateFormUsers' && defaultKey !== 'Script' "}],attrs:{"gutter":24}},[(_vm.defaultKey !== 'relationMatrix')?_c('a-col',{attrs:{"md":8,"sm":12}},[_c('a-form-item',[_c('a-tree-select',{staticStyle:{"width":"240px"},attrs:{"dropdown-style":{ maxHeight: '400px', overflow: 'auto' },"placeholder":"请选择部门","tree-data":_vm.treeData,"allow-clear":""},on:{"change":_vm.treechange},model:{value:(_vm.query.depId),callback:function ($$v) {_vm.$set(_vm.query, "depId", $$v)},expression:"query.depId"}})],1)],1):_vm._e(),(_vm.defaultKey === 'relationMatrix')?[_c('a-col',{attrs:{"md":8,"sm":12}},[_c('a-form-item',[_c('a-input',{attrs:{"placeholder":"请输入标签"},model:{value:(_vm.m_tagQuery.tagName),callback:function ($$v) {_vm.$set(_vm.m_tagQuery, "tagName", $$v)},expression:"m_tagQuery.tagName"}})],1)],1)]:_vm._e(),(_vm.showuser && _vm.defaultKey !== 'relationMatrix')?_c('a-col',{attrs:{"md":6,"sm":12}},[_c('a-form-item',[_c('a-select',{staticStyle:{"width":"173px"},attrs:{"placeholder":"请选择角色"},on:{"change":_vm.handleChange},model:{value:(_vm.query.roleId),callback:function ($$v) {_vm.$set(_vm.query, "roleId", $$v)},expression:"query.roleId"}},_vm._l((_vm.userlist),function(item){return _c('a-select-option',{key:item.id,attrs:{"value":item.id}},[_vm._v(" "+_vm._s(item.roleName)+" ")])}),1)],1)],1):_vm._e(),_c('a-col',{directives:[{name:"show",rawName:"v-show",value:(_vm.showname),expression:"showname"}],attrs:{"md":6,"sm":12}},[_c('a-form-item',[_c('a-input',{attrs:{"placeholder":this.defaultKey == 'CandidateGroups' ? '请输入名称' : '请输入姓名'},model:{value:(_vm.query.realname),callback:function ($$v) {_vm.$set(_vm.query, "realname", $$v)},expression:"query.realname"}})],1)],1),_c('a-col',{attrs:{"md":4,"sm":8}},[_c('span',{staticClass:"table-page-search-submitButtons",staticStyle:{"float":"left","overflow":"hidden"}},[_c('a-button',{attrs:{"type":"primary","icon":"search"},on:{"click":_vm.handlesearch}},[_vm._v("查询")])],1)])],2)],1)],1),_c('a-tabs',{attrs:{"activeKey":_vm.defaultKey},on:{"change":_vm.changeTabs}},[_c('a-tab-pane',{key:"Assingee",attrs:{"tab":"个人"}},[_c('a-table',{attrs:{"rowSelection":{
+;// CONCATENATED MODULE: ./node_modules/_vue-loader@15.10.1@vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/_vue-loader@15.10.1@vue-loader/lib/index.js??vue-loader-options!./src/flow/select_type.vue?vue&type=template&id=7da53fb8&
+var select_typevue_type_template_id_7da53fb8_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',[_c('a-modal',{attrs:{"title":"配置人员类型","width":800,"destroyOnClose":true},on:{"ok":_vm.handleOk,"cancel":_vm.handleCancel},model:{value:(_vm.visible),callback:function ($$v) {_vm.visible=$$v},expression:"visible"}},[_c('div',{staticClass:"table-page-search-wrapper"},[_c('a-form',{attrs:{"layout":"inline"}},[_c('a-row',{directives:[{name:"show",rawName:"v-show",value:(_vm.defaultKey !== 'CandidateFormUsers' && _vm.defaultKey !== 'Script' ),expression:"defaultKey !== 'CandidateFormUsers' && defaultKey !== 'Script' "}],attrs:{"gutter":24}},[(_vm.defaultKey !== 'relationMatrix')?_c('a-col',{attrs:{"md":8,"sm":12}},[_c('a-form-item',[_c('a-tree-select',{staticStyle:{"width":"240px"},attrs:{"dropdown-style":{ maxHeight: '400px', overflow: 'auto' },"placeholder":"请选择部门","tree-data":_vm.treeData,"allow-clear":""},on:{"change":_vm.treechange},model:{value:(_vm.query.depId),callback:function ($$v) {_vm.$set(_vm.query, "depId", $$v)},expression:"query.depId"}})],1)],1):_vm._e(),(_vm.defaultKey === 'relationMatrix')?[_c('a-col',{attrs:{"md":8,"sm":12}},[_c('a-form-item',[_c('a-input',{attrs:{"placeholder":"请输入标签"},model:{value:(_vm.m_tagQuery.tagName),callback:function ($$v) {_vm.$set(_vm.m_tagQuery, "tagName", $$v)},expression:"m_tagQuery.tagName"}})],1)],1)]:_vm._e(),(_vm.showuser && _vm.defaultKey !== 'relationMatrix')?_c('a-col',{attrs:{"md":6,"sm":12}},[_c('a-form-item',[_c('a-select',{staticStyle:{"width":"173px"},attrs:{"placeholder":"请选择角色"},on:{"change":_vm.handleChange},model:{value:(_vm.query.roleId),callback:function ($$v) {_vm.$set(_vm.query, "roleId", $$v)},expression:"query.roleId"}},_vm._l((_vm.userlist),function(item){return _c('a-select-option',{key:item.id,attrs:{"value":item.id}},[_vm._v(" "+_vm._s(item.roleName)+" ")])}),1)],1)],1):_vm._e(),_c('a-col',{directives:[{name:"show",rawName:"v-show",value:(_vm.showname),expression:"showname"}],attrs:{"md":6,"sm":12}},[_c('a-form-item',[_c('a-input',{attrs:{"placeholder":this.defaultKey == 'CandidateGroups' ? '请输入名称' : '请输入姓名'},model:{value:(_vm.query.realname),callback:function ($$v) {_vm.$set(_vm.query, "realname", $$v)},expression:"query.realname"}})],1)],1),_c('a-col',{attrs:{"md":4,"sm":8}},[_c('span',{staticClass:"table-page-search-submitButtons",staticStyle:{"float":"left","overflow":"hidden"}},[_c('a-button',{attrs:{"type":"primary","icon":"search"},on:{"click":_vm.handlesearch}},[_vm._v("查询")])],1)])],2)],1)],1),_c('a-tabs',{attrs:{"activeKey":_vm.defaultKey},on:{"change":_vm.changeTabs}},[_c('a-tab-pane',{key:"Assingee",attrs:{"tab":"个人"}},[_c('a-table',{attrs:{"rowSelection":{
             type: 'radio',
             selectedRowKeys: _vm.formData.assingeeValue,
             onChange: _vm.onSelectPersion,
@@ -161327,7 +161327,7 @@ var select_typevue_type_template_id_695b5299_render = function () {var _vm=this;
             onChange: _vm.onSelectPersionWait,
             onSelect: _vm.onSelectUsers,
             onSelectAll: _vm.onSelectAll,
-          },"columns":_vm.columns,"dataSource":_vm.data,"pagination":_vm.ipagination,"size":"small","rowKey":"id"},on:{"change":_vm.handleTableChange}})],1),_c('a-tab-pane',{key:"CandidateGroups",attrs:{"tab":"候选组"}},[_c('a-table',{attrs:{"rowSelection":{
+          },"columns":_vm.columns,"dataSource":_vm.data1,"pagination":_vm.ipagination1,"size":"small","rowKey":"id"},on:{"change":_vm.handleTableChange1}})],1),_c('a-tab-pane',{key:"CandidateGroups",attrs:{"tab":"候选组"}},[_c('a-table',{attrs:{"rowSelection":{
             type: 'checkbox',
             selectedRowKeys: _vm.formData.candidateGroupsValue,
             onChange: _vm.onSelectGroup,
@@ -161346,7 +161346,7 @@ var select_typevue_type_template_id_695b5299_render = function () {var _vm=this;
             onSelect: _vm.onSelectUsers,
             onSelectAll: _vm.onSelectAll
           },"columns":_vm.tagColumns,"dataSource":_vm.tagData,"pagination":_vm.tagIpagination,"size":"small","rowKey":"id"},on:{"change":_vm.handleTagDataTableChange}})],1),_c('a-tab-pane',{key:"Script",attrs:{"tab":"脚本"}},[_c('a-textarea',{attrs:{"placeholder":"请输入脚本任务","rows":4},model:{value:(_vm.formData.scriptValue),callback:function ($$v) {_vm.$set(_vm.formData, "scriptValue", $$v)},expression:"formData.scriptValue"}})],1)],1)],1)],1)}
-var select_typevue_type_template_id_695b5299_staticRenderFns = []
+var select_typevue_type_template_id_7da53fb8_staticRenderFns = []
 
 
 // EXTERNAL MODULE: ./node_modules/_lodash@4.17.21@lodash/lodash.js
@@ -161622,6 +161622,15 @@ const tagColumns = [{
         showQuickJumper: true,
         total: 0
       },
+      ipagination1: {
+        current: 1,
+        pageSize: 10,
+        showTotal: (total, range) => {
+          return range[0] + "-" + range[1] + " 共" + total + "条";
+        },
+        showQuickJumper: true,
+        total: 0
+      },
       ipagination2: {
         current: 1,
         pageSize: 10,
@@ -161687,6 +161696,7 @@ const tagColumns = [{
       cacheSeletedRows: [],
       val: "",
       data: [],
+      data1: [],
       columns,
       grpupColumns,
       formUserColumns,
@@ -161697,10 +161707,15 @@ const tagColumns = [{
       }],
       url: {
         userWithDepart: "/sys/user/userDepartList" // 引入为指定用户查看部门信息需要的url
+      },
+
+      params: {
+        assigneeType: '',
+        //个人Assingee  候选人CandidateUsers  候选组CandidateGroups  表单用户CandidateFormUsers  关系矩阵relationMatrix
+        assigneeVal: ''
       }
     };
   },
-
   methods: {
     clear() {
       this.showname = false;
@@ -161714,6 +161729,7 @@ const tagColumns = [{
       };
     },
     init(key, formId, taskAssignee) {
+      debugger;
       this.defaultKey = key;
       this.clear();
       this.formData = Object.assign(this.formData, {
@@ -161726,9 +161742,17 @@ const tagColumns = [{
           departId: 'applyUserDepart'
         }
       });
+      if (key === 'relationMatrix') {
+        this.params.assigneeType = taskAssignee.assigneeType;
+        this.params.assigneeVal = taskAssignee.assigneeList && taskAssignee.assigneeList.length > 0 ? taskAssignee.assigneeList.map(item => item.tagId).join(',') : '';
+      } else {
+        this.params.assigneeType = taskAssignee.assigneeType;
+        this.params.assigneeVal = taskAssignee.assigneeVal;
+      }
       this.m_tagQuery.tagName = '';
       this.tagQuery.tagName = '';
       this.getpersonal(); //获取人员列表
+      this.getpersonalUser();
       this.getCandidateUsers();
       this.getTagList();
       if (key == "Assingee") {
@@ -161773,7 +161797,8 @@ const tagColumns = [{
         this.setCacheSeletedRows(taskAssignee);
       }
       (0,manage/* getAction */.s7)("/workflow/getFormUserMap", {
-        formId: formId
+        formId: formId,
+        ...this.params
       }).then(res => {
         if (res.success) {
           console.log(this.formData, this.cacheSeletedRows);
@@ -161806,15 +161831,33 @@ const tagColumns = [{
     },
     //获取个人列表
     getpersonal() {
-      QueryCandidatePersonal(this.query).then(res => {
+      console.log(this.params);
+      QueryCandidatePersonal({
+        ...this.query,
+        ...this.params
+      }).then(res => {
         this.data = res.result.records;
         this.ipagination.total = res.result.total;
       });
     },
+    getpersonalUser() {
+      (0,manage/* getAction */.s7)("workflow/queryCandidatePersonalUsers", {
+        ...this.query,
+        ...this.params
+      }).then(res => {
+        if (res.success) {
+          this.data1 = res.result.records;
+          this.ipagination1.total = res.result.total;
+        }
+      });
+    },
     //获取候选组
     getCandidateUsers(idx) {
       this.query2.id = idx;
-      QueryCandidateSet(this.query2).then(res => {
+      QueryCandidateSet({
+        ...this.query2,
+        ...this.params
+      }).then(res => {
         this.groupData = res.result.records;
         this.ipagination2.total = res.result.total;
       });
@@ -161828,7 +161871,7 @@ const tagColumns = [{
       (0,manage/* getAction */.s7)('/zhxymatrix/tags/list', Object.assign({}, this.tagQuery, {
         pageNo,
         pageSize
-      })).then(res => {
+      }, this.params)).then(res => {
         this.tagData = res.result.records;
         this.tagIpagination.current = res.result.current;
         this.tagIpagination.total = res.result.total;
@@ -161846,6 +161889,13 @@ const tagColumns = [{
       this.query.pageSize = pagination.pageSize;
       this.getpersonal();
     },
+    handleTableChange1(pagination, filters, sorter) {
+      //分页、排序、筛选变化时触发
+      this.ipagination1 = pagination;
+      this.query.pageNo = pagination.current;
+      this.query.pageSize = pagination.pageSize;
+      this.getpersonalUser();
+    },
     handleTableChange2(pagination, filters, sorter) {
       //分页、排序、筛选变化时触发
       this.ipagination2 = pagination;
@@ -161886,6 +161936,7 @@ const tagColumns = [{
       this.query.pageNo = 1;
       this.query2.pageNo = 1;
       this.ipagination.current = 1;
+      this.ipagination1.current = 1;
       this.ipagination2.current = 1;
       let params = {
         depId: e
@@ -161897,8 +161948,10 @@ const tagColumns = [{
           this.showuser = true;
         }
       });
-      if (this.defaultKey == "Assingee" || this.defaultKey == "CandidateUsers") {
+      if (this.defaultKey == "Assingee") {
         this.getpersonal();
+      } else if (this.defaultKey == "CandidateUsers") {
+        this.getpersonalUser();
       } else if (this.defaultKey == "CandidateGroups") {
         this.getCandidateUsers(e);
       }
@@ -161915,6 +161968,8 @@ const tagColumns = [{
         this.tagIpagination.current = 1;
         this.tagQuery = Object.assign(this.tagQuery, (0,lodash.cloneDeep)(this.m_tagQuery));
         this.getTagList();
+      } else if (this.defaultKey === 'CandidateUsers') {
+        this.getpersonalUser();
       } else {
         this.getpersonal();
       }
@@ -161966,12 +162021,19 @@ const tagColumns = [{
       this.clear();
       this.cacheSeletedRows = [];
       this.query.tagName = '';
-      if (activeKey == "Assingee" || activeKey == "CandidateUsers") {
+      if (activeKey == "Assingee") {
         this.showname = true;
         this.query.pageNo = 1;
         this.ipagination.current = 1;
         this.query.realname = '';
         this.getpersonal();
+      } else if (activeKey == "CandidateUsers") {
+        this.showname = true;
+        this.query.pageNo = 1;
+        this.ipagination1.current = 1;
+        this.query.realname = '';
+        this.getpersonalUser();
+        // this.showname = false;
       } else if (activeKey == "CandidateGroups") {
         this.getCandidateUsers(this.query.depId);
         // this.showname = false;
@@ -162005,6 +162067,14 @@ const tagColumns = [{
         pageNo: 1,
         pageSize: 10
       };
+      this.query2 = {
+        pageNo: 1,
+        pageSize: 10
+      };
+      this.params = {
+        assigneeType: '',
+        assigneeVal: ''
+      };
       this.ipagination = {
         current: 1,
         pageSize: 10,
@@ -162014,6 +162084,24 @@ const tagColumns = [{
         showQuickJumper: true,
         total: 0
       };
+      this.ipagination1 = {
+        current: 1,
+        pageSize: 10,
+        showTotal: (total, range) => {
+          return range[0] + "-" + range[1] + " 共" + total + "条";
+        },
+        showQuickJumper: true,
+        total: 0
+      };
+      this.ipagination2 = {
+        current: 1,
+        pageSize: 10,
+        showTotal: (total, range) => {
+          return range[0] + "-" + range[1] + " 共" + total + "条";
+        },
+        showQuickJumper: true,
+        total: 0
+      };
     },
     handleOk(e) {
       let currentVal = "";
@@ -162072,8 +162160,8 @@ const tagColumns = [{
 ;
 var select_type_component = (0,componentNormalizer/* default */.Z)(
   flow_select_typevue_type_script_lang_js_,
-  select_typevue_type_template_id_695b5299_render,
-  select_typevue_type_template_id_695b5299_staticRenderFns,
+  select_typevue_type_template_id_7da53fb8_render,
+  select_typevue_type_template_id_7da53fb8_staticRenderFns,
   false,
   null,
   null,
@@ -166460,6 +166548,7 @@ var copyDesign_component = (0,componentNormalizer/* default */.Z)(
       this.flowPanelVisible = false;
       this.linePanelVisible = false;
       this.dataConditionPanelVisible = false;
+      this.copyDesignVisible = false;
       this.siderPanelVisible = true;
       //获取当前节点所有流出的连线信息
       let bhLineData = _this.data.lineList.filter(line => line.from == nodeId);
@@ -166520,6 +166609,7 @@ var copyDesign_component = (0,componentNormalizer/* default */.Z)(
           if (_this.dataConditionPanelVisible) _this.dataConditionPanelVisible = false;
           if (_this.siderPanelVisible) _this.siderPanelVisible = false;
           if (_this.flowPanelVisible) _this.flowPanelVisible = false;
+          if (_this.copyDesignVisible) _this.copyDesignVisible = false;
           _this.data.nodeList.filter((item, index) => {
             if (item.info.type == "gate") {
               item.info.conditions = item.info.conditions.filter(function (node) {
@@ -166795,15 +166885,15 @@ var copyDesign_component = (0,componentNormalizer/* default */.Z)(
 });
 ;// CONCATENATED MODULE: ./src/flow/panel.vue?vue&type=script&lang=js&
  /* harmony default export */ const src_flow_panelvue_type_script_lang_js_ = (panelvue_type_script_lang_js_); 
-;// CONCATENATED MODULE: ./node_modules/_mini-css-extract-plugin@2.7.5@mini-css-extract-plugin/dist/loader.js??clonedRuleSet-32.use[0]!./node_modules/_css-loader@6.7.3@css-loader/dist/cjs.js??clonedRuleSet-32.use[1]!./node_modules/_vue-loader@15.10.1@vue-loader/lib/loaders/stylePostLoader.js!./node_modules/_postcss-loader@6.2.1@postcss-loader/dist/cjs.js??clonedRuleSet-32.use[2]!./node_modules/_less-loader@5.0.0@less-loader/dist/cjs.js??clonedRuleSet-32.use[3]!./node_modules/_vue-loader@15.10.1@vue-loader/lib/index.js??vue-loader-options!./src/flow/panel.vue?vue&type=style&index=0&id=44e82654&prod&lang=less&scoped=true&
+;// CONCATENATED MODULE: ./node_modules/_mini-css-extract-plugin@2.7.5@mini-css-extract-plugin/dist/loader.js??clonedRuleSet-32.use[0]!./node_modules/_css-loader@6.7.3@css-loader/dist/cjs.js??clonedRuleSet-32.use[1]!./node_modules/_vue-loader@15.10.1@vue-loader/lib/loaders/stylePostLoader.js!./node_modules/_postcss-loader@6.2.1@postcss-loader/dist/cjs.js??clonedRuleSet-32.use[2]!./node_modules/_less-loader@5.0.0@less-loader/dist/cjs.js??clonedRuleSet-32.use[3]!./node_modules/_vue-loader@15.10.1@vue-loader/lib/index.js??vue-loader-options!./src/flow/panel.vue?vue&type=style&index=0&id=0d15c43a&prod&lang=less&scoped=true&
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./src/flow/panel.vue?vue&type=style&index=0&id=44e82654&prod&lang=less&scoped=true&
+;// CONCATENATED MODULE: ./src/flow/panel.vue?vue&type=style&index=0&id=0d15c43a&prod&lang=less&scoped=true&
 
-;// CONCATENATED MODULE: ./node_modules/_mini-css-extract-plugin@2.7.5@mini-css-extract-plugin/dist/loader.js??clonedRuleSet-32.use[0]!./node_modules/_css-loader@6.7.3@css-loader/dist/cjs.js??clonedRuleSet-32.use[1]!./node_modules/_vue-loader@15.10.1@vue-loader/lib/loaders/stylePostLoader.js!./node_modules/_postcss-loader@6.2.1@postcss-loader/dist/cjs.js??clonedRuleSet-32.use[2]!./node_modules/_less-loader@5.0.0@less-loader/dist/cjs.js??clonedRuleSet-32.use[3]!./node_modules/_vue-loader@15.10.1@vue-loader/lib/index.js??vue-loader-options!./src/flow/panel.vue?vue&type=style&index=1&id=44e82654&prod&lang=less&scoped=true&
+;// CONCATENATED MODULE: ./node_modules/_mini-css-extract-plugin@2.7.5@mini-css-extract-plugin/dist/loader.js??clonedRuleSet-32.use[0]!./node_modules/_css-loader@6.7.3@css-loader/dist/cjs.js??clonedRuleSet-32.use[1]!./node_modules/_vue-loader@15.10.1@vue-loader/lib/loaders/stylePostLoader.js!./node_modules/_postcss-loader@6.2.1@postcss-loader/dist/cjs.js??clonedRuleSet-32.use[2]!./node_modules/_less-loader@5.0.0@less-loader/dist/cjs.js??clonedRuleSet-32.use[3]!./node_modules/_vue-loader@15.10.1@vue-loader/lib/index.js??vue-loader-options!./src/flow/panel.vue?vue&type=style&index=1&id=0d15c43a&prod&lang=less&scoped=true&
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./src/flow/panel.vue?vue&type=style&index=1&id=44e82654&prod&lang=less&scoped=true&
+;// CONCATENATED MODULE: ./src/flow/panel.vue?vue&type=style&index=1&id=0d15c43a&prod&lang=less&scoped=true&
 
 ;// CONCATENATED MODULE: ./src/flow/panel.vue
 
@@ -166821,7 +166911,7 @@ var panel_component = (0,componentNormalizer/* default */.Z)(
   staticRenderFns,
   false,
   null,
-  "44e82654",
+  "0d15c43a",
   null
   
 )

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zscreate/form-component",
-  "version": "1.1.364",
+  "version": "1.1.366",
   "private": false,
   "description": "",
   "main": "dist/form-component.umd.js",