@zscreate/form-component 1.1.411 → 1.1.413

package/dist/form-component.css

@@ -319,16 +319,16 @@ ul li[data-v-c8780a30] {
   width: 347px !important;
 }
 
-ul[data-v-50d14dfb],
-li[data-v-50d14dfb],
-dl[data-v-50d14dfb],
-dt[data-v-50d14dfb],
-dd[data-v-50d14dfb] {
+ul[data-v-f2744ade],
+li[data-v-f2744ade],
+dl[data-v-f2744ade],
+dt[data-v-f2744ade],
+dd[data-v-f2744ade] {
   list-style-type: none;
   padding: 0;
   margin: 0;
 }
-.flowwork-warp[data-v-50d14dfb] {
+.flowwork-warp[data-v-f2744ade] {
   position: absolute;
   left: 0;
   right: 0;
@@ -336,7 +336,7 @@ dd[data-v-50d14dfb] {
   bottom: 64px;
   background: #fff;
 }
-.g1_workflow_warp[data-v-50d14dfb] {
+.g1_workflow_warp[data-v-f2744ade] {
   border: 1px solid #dfdfdf;
   margin: auto;
   position: absolute;
@@ -345,12 +345,12 @@ dd[data-v-50d14dfb] {
   bottom: 0;
   top: 0;
 }
-.g1_workflow_warp li[data-v-50d14dfb] {
+.g1_workflow_warp li[data-v-f2744ade] {
   width: 100%;
   position: relative;
   text-align: center;
 }
-.g1-sider_tool1[data-v-50d14dfb] {
+.g1-sider_tool1[data-v-f2744ade] {
   width: 100px;
   position: absolute;
   left: 0;
@@ -359,37 +359,37 @@ dd[data-v-50d14dfb] {
   border-right: 1px solid #dfdfdf;
   overflow-y: auto;
 }
-.g1-sider_tool1 .tool_box[data-v-50d14dfb] {
+.g1-sider_tool1 .tool_box[data-v-f2744ade] {
   margin-top: 15px;
 }
-.g1-sider_tool1 .tool_box .tool[data-v-50d14dfb] {
+.g1-sider_tool1 .tool_box .tool[data-v-f2744ade] {
   text-align: center;
   font-size: 12px;
   color: #fff;
 }
 /* 公用图形 */
-.end[data-v-50d14dfb] {
+.end[data-v-f2744ade] {
   border-radius: 100%;
 }
-.comm[data-v-50d14dfb] {
+.comm[data-v-f2744ade] {
   border-radius: 0px;
 }
-.gate[data-v-50d14dfb] {
+.gate[data-v-f2744ade] {
   width: 60px;
   border-radius: 0;
 }
-.gate .inner[data-v-50d14dfb] {
+.gate .inner[data-v-f2744ade] {
   display: inline-block;
   font-size: 16px;
 }
-.g1-form_main1[data-v-50d14dfb] {
+.g1-form_main1[data-v-f2744ade] {
   position: absolute;
   left: 100px;
   right: 0;
   top: 0;
   bottom: 0;
 }
-.g1-form_main1 .head[data-v-50d14dfb] {
+.g1-form_main1 .head[data-v-f2744ade] {
   height: 46px;
   line-height: 46px;
   text-align: left;
@@ -397,11 +397,11 @@ dd[data-v-50d14dfb] {
   box-sizing: border-box;
   border-bottom: 1px solid #d8d8d8;
 }
-.g1-form_main1 .head .ant-btn[data-v-50d14dfb] {
+.g1-form_main1 .head .ant-btn[data-v-f2744ade] {
   height: 32px;
   margin-right: 10px;
 }
-.g1-form_main1 .main[data-v-50d14dfb] {
+.g1-form_main1 .main[data-v-f2744ade] {
   position: absolute;
   left: 0 !important;
   right: 0px;
@@ -410,12 +410,12 @@ dd[data-v-50d14dfb] {
   overflow: auto;
   box-sizing: border-box;
 }
-.g1-form_main1 .main #flowContainer[data-v-50d14dfb] {
+.g1-form_main1 .main #flowContainer[data-v-f2744ade] {
   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-50d14dfb] {
+.g1-form_main1 .sider-pannel[data-v-f2744ade] {
   width: 250px;
   padding: 0 15px;
   position: absolute;
@@ -425,7 +425,7 @@ dd[data-v-50d14dfb] {
   border-left: 1px solid #dfdfdf;
   background-color: #fff;
 }
-.g1-form_main1 .sider-pannel .sider-panel-inner[data-v-50d14dfb] {
+.g1-form_main1 .sider-pannel .sider-panel-inner[data-v-f2744ade] {
   width: 100%;
   height: 100%;
   padding: 15px;
@@ -436,7 +436,7 @@ dd[data-v-50d14dfb] {
   top: 0;
   overflow-y: auto;
 }
-.g1-form_main1 .sider-pannel .sider-open[data-v-50d14dfb] {
+.g1-form_main1 .sider-pannel .sider-open[data-v-f2744ade] {
   width: 36px;
   height: 60px;
   line-height: 60px;
@@ -452,14 +452,14 @@ dd[data-v-50d14dfb] {
   background-color: #fff;
 }
 /* 视图图形 */
-.flow-view[data-v-50d14dfb] {
+.flow-view[data-v-f2744ade] {
   position: absolute;
   left: 0;
   right: 0;
   top: 0;
   bottom: 0;
 }
-.flow-view .inner .flow-node-drag[data-v-50d14dfb] {
+.flow-view .inner .flow-node-drag[data-v-f2744ade] {
   width: 12px;
   height: 12px;
   display: block;
@@ -470,27 +470,27 @@ dd[data-v-50d14dfb] {
   cursor: crosshair;
   background: rgba(24, 144, 255, 0.6);
 }
-.flow-view .inner .flow-node-drag[data-v-50d14dfb]:nth-child(1) {
+.flow-view .inner .flow-node-drag[data-v-f2744ade]:nth-child(1) {
   left: -6px;
   top: 0;
   bottom: 0;
 }
-.flow-view .inner .flow-node-drag[data-v-50d14dfb]:nth-child(2) {
+.flow-view .inner .flow-node-drag[data-v-f2744ade]:nth-child(2) {
   top: -6px;
   left: 0;
   right: 0;
 }
-.flow-view .inner .flow-node-drag[data-v-50d14dfb]:nth-child(3) {
+.flow-view .inner .flow-node-drag[data-v-f2744ade]:nth-child(3) {
   right: -6px;
   top: 0;
   bottom: 0;
 }
-.flow-view .inner .flow-node-drag[data-v-50d14dfb]:nth-child(4) {
+.flow-view .inner .flow-node-drag[data-v-f2744ade]:nth-child(4) {
   bottom: -6px;
   left: 0;
   right: 0;
 }
-.flow-view .tool[data-v-50d14dfb] {
+.flow-view .tool[data-v-f2744ade] {
   width: 100%;
   height: 100%;
   margin: 0;
@@ -498,14 +498,14 @@ dd[data-v-50d14dfb] {
   box-shadow: 5px 5px 3px #d4d0d0;
   background: #fbfbfb;
 }
-.flow-view .tool .iconfont[data-v-50d14dfb] {
+.flow-view .tool .iconfont[data-v-f2744ade] {
   font-size: 100%;
   color: #858587;
 }
-.flow-view .exclude_gateway[data-v-50d14dfb] {
+.flow-view .exclude_gateway[data-v-f2744ade] {
   box-shadow: 0 0 0 #ccc;
 }
-.flow-view .gate[data-v-50d14dfb] {
+.flow-view .gate[data-v-f2744ade] {
   line-height: 50px;
   position: absolute;
   left: 0;
@@ -513,9 +513,9 @@ dd[data-v-50d14dfb] {
   top: 0;
   bottom: 0;
 }
-.flow-view .ordinary_gateway[data-v-50d14dfb],
-.flow-view .parall_gateway[data-v-50d14dfb],
-.flow-view .exclude_gateway[data-v-50d14dfb] {
+.flow-view .ordinary_gateway[data-v-f2744ade],
+.flow-view .parall_gateway[data-v-f2744ade],
+.flow-view .exclude_gateway[data-v-f2744ade] {
   border: none;
   border-radius: 0;
   background-size: cover;
@@ -523,35 +523,35 @@ dd[data-v-50d14dfb] {
   background-position: center center;
   box-shadow: 0 0 0 #ccc;
 }
-.flow-view .ordinary_gateway .flow-node-drag[data-v-50d14dfb]:nth-child(1),
-.flow-view .parall_gateway .flow-node-drag[data-v-50d14dfb]:nth-child(1),
-.flow-view .exclude_gateway .flow-node-drag[data-v-50d14dfb]:nth-child(1) {
+.flow-view .ordinary_gateway .flow-node-drag[data-v-f2744ade]:nth-child(1),
+.flow-view .parall_gateway .flow-node-drag[data-v-f2744ade]:nth-child(1),
+.flow-view .exclude_gateway .flow-node-drag[data-v-f2744ade]:nth-child(1) {
   left: 0;
   top: 0;
   bottom: 0;
 }
-.flow-view .ordinary_gateway .flow-node-drag[data-v-50d14dfb]:nth-child(2),
-.flow-view .parall_gateway .flow-node-drag[data-v-50d14dfb]:nth-child(2),
-.flow-view .exclude_gateway .flow-node-drag[data-v-50d14dfb]:nth-child(2) {
+.flow-view .ordinary_gateway .flow-node-drag[data-v-f2744ade]:nth-child(2),
+.flow-view .parall_gateway .flow-node-drag[data-v-f2744ade]:nth-child(2),
+.flow-view .exclude_gateway .flow-node-drag[data-v-f2744ade]:nth-child(2) {
   top: 0;
   left: 0;
   right: 0;
 }
-.flow-view .ordinary_gateway .flow-node-drag[data-v-50d14dfb]:nth-child(3),
-.flow-view .parall_gateway .flow-node-drag[data-v-50d14dfb]:nth-child(3),
-.flow-view .exclude_gateway .flow-node-drag[data-v-50d14dfb]:nth-child(3) {
+.flow-view .ordinary_gateway .flow-node-drag[data-v-f2744ade]:nth-child(3),
+.flow-view .parall_gateway .flow-node-drag[data-v-f2744ade]:nth-child(3),
+.flow-view .exclude_gateway .flow-node-drag[data-v-f2744ade]:nth-child(3) {
   right: 0;
   top: 0;
   bottom: 0;
 }
-.flow-view .ordinary_gateway .flow-node-drag[data-v-50d14dfb]:nth-child(4),
-.flow-view .parall_gateway .flow-node-drag[data-v-50d14dfb]:nth-child(4),
-.flow-view .exclude_gateway .flow-node-drag[data-v-50d14dfb]:nth-child(4) {
+.flow-view .ordinary_gateway .flow-node-drag[data-v-f2744ade]:nth-child(4),
+.flow-view .parall_gateway .flow-node-drag[data-v-f2744ade]:nth-child(4),
+.flow-view .exclude_gateway .flow-node-drag[data-v-f2744ade]:nth-child(4) {
   bottom: 0;
   left: 0;
   right: 0;
 }
-.flow-view .exclude_gateway[data-v-50d14dfb] {
+.flow-view .exclude_gateway[data-v-f2744ade] {
   width: 70%;
   height: 70%;
   margin: 15%;
@@ -560,7 +560,7 @@ dd[data-v-50d14dfb] {
   transform: rotate(45deg);
   position: relative;
 }
-.flow-view .exclude_gateway[data-v-50d14dfb]::before {
+.flow-view .exclude_gateway[data-v-f2744ade]::before {
   content: '';
   width: 2px;
   background-color: #7a7a7a;
@@ -570,7 +570,7 @@ dd[data-v-50d14dfb] {
   top: calc(50% - 10px);
   left: calc(50% - 1px);
 }
-.flow-view .exclude_gateway[data-v-50d14dfb]::after {
+.flow-view .exclude_gateway[data-v-f2744ade]::after {
   content: '';
   width: 20px;
   background-color: #7a7a7a;
@@ -580,7 +580,7 @@ dd[data-v-50d14dfb] {
   top: calc(50% - 1px);
   left: calc(50% - 10px);
 }
-.flow-view .parall_gateway[data-v-50d14dfb] {
+.flow-view .parall_gateway[data-v-f2744ade] {
   width: 70%;
   height: 70%;
   margin: 15%;
@@ -589,7 +589,7 @@ dd[data-v-50d14dfb] {
   transform: rotate(45deg);
   position: relative;
 }
-.flow-view .parall_gateway[data-v-50d14dfb]::after {
+.flow-view .parall_gateway[data-v-f2744ade]::after {
   content: '';
   width: 20px;
   background-color: #7a7a7a;
@@ -601,7 +601,7 @@ dd[data-v-50d14dfb] {
   filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=1);
   transform: rotate(45deg);
 }
-.flow-view .parall_gateway[data-v-50d14dfb]::before {
+.flow-view .parall_gateway[data-v-f2744ade]::before {
   content: '';
   width: 2px;
   background-color: #7a7a7a;
@@ -614,7 +614,7 @@ dd[data-v-50d14dfb] {
   transform: rotate(45deg);
 }
 /* 线条工具 */
-.lineTool[data-v-50d14dfb] {
+.lineTool[data-v-f2744ade] {
   width: 130px;
   height: 26px;
   border: 1px solid #1890ff;
@@ -622,7 +622,7 @@ dd[data-v-50d14dfb] {
   background-color: #fff;
   text-align: left;
 }
-.lineTool li[data-v-50d14dfb] {
+.lineTool li[data-v-f2744ade] {
   width: 30px;
   height: 26px;
   display: inline-block;
@@ -630,14 +630,14 @@ dd[data-v-50d14dfb] {
   text-align: center;
   color: #1890ff;
 }
-.tool-drag a .inner[data-v-50d14dfb] {
+.tool-drag a .inner[data-v-f2744ade] {
   color: #f00 !important;
 }
-.ant-layout-footer[data-v-50d14dfb] {
+.ant-layout-footer[data-v-f2744ade] {
   z-index: 10;
 }
 
-#flowContainer[data-v-50d14dfb] {
+#flowContainer[data-v-f2744ade] {
   width: 1000000px;
   height: 1000000px;
   position: absolute;
@@ -650,7 +650,7 @@ dd[data-v-50d14dfb] {
   left: -500000px;
   top: -500000px; */
 }
-.labelClass[data-v-50d14dfb] {
+.labelClass[data-v-f2744ade] {
   padding: 0 3px;
   font-size: 12px;
   cursor: pointer;
@@ -661,14 +661,14 @@ dd[data-v-50d14dfb] {
   border-radius: 3px;
   background: rgba(24, 144, 255, 0.6);
 }
-.loading[data-v-50d14dfb] {
+.loading[data-v-f2744ade] {
   height: 100%;
   width: 100%;
   display: flex;
   align-items: center;
   justify-content: center;
 }
-[data-v-50d14dfb] .labelClass {
+[data-v-f2744ade] .labelClass {
   background-color: #539dfa !important;
   padding: 5px;
   border-radius: 5px;
@@ -8233,4 +8233,7 @@ li.CodeMirror-hint-active {
   background: rgba(70, 194, 111, 0.2);
   color: #46c26f;
 }
+.formula_textarea_content .CodeMirror {
+  height: 180px !important;
+}
 

package/dist/form-component.umd.js

@@ -150807,7 +150807,7 @@ function toString(value) {
 /***/ ((module) => {
 
 "use strict";
-module.exports = {"rE":"1.1.411"};
+module.exports = {"rE":"1.1.413"};
 
 /***/ })
 
@@ -152750,7 +152750,7 @@ icon_Icon.install = function (Vue) {
 };
 
 /* harmony default export */ const icon = (icon_Icon);
-;// CONCATENATED MODULE: ./node_modules/_vue-loader@15.11.1@vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/_vue-loader@15.11.1@vue-loader/lib/index.js??vue-loader-options!./src/flow/panel.vue?vue&type=template&id=50d14dfb&scoped=true
+;// CONCATENATED MODULE: ./node_modules/_vue-loader@15.11.1@vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/_vue-loader@15.11.1@vue-loader/lib/index.js??vue-loader-options!./src/flow/panel.vue?vue&type=template&id=f2744ade&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(),(_vm.dataConditionPanelVisible)?_c('dataConditionPanel',{ref:"dataConditionPanel",attrs:{"formId":_vm.data.nodeForm.formId,"formDesigerData":_vm.formDesigerData},on:{"isPanelShow":_vm.isPanelShow}}):_vm._e(),_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,"isFlowPanelZJAF":_vm.isFlowPanelZJAF},on:{"isPanelShow":_vm.isPanelShow}}):_vm._e(),(_vm.userDesignVisible)?_c('userDesign',{ref:"userDesign",attrs:{"formId":_vm.data.nodeForm.formId,"formDesigerData":_vm.formDesigerData,"isFlowPanelZJAF":_vm.isFlowPanelZJAF},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 = []
 
@@ -160354,6 +160354,227 @@ var userDesign_component = (0,componentNormalizer/* default */.A)(
           initData.nodeForm.excelName = '';
           initData.nodeForm.excelId = '';
         }
+        //兼容老版本流程中的抄送人和人员配置，写入最新数据
+        initData.nodeList.forEach(node => {
+          var _node$info$copyMap, _node$info$copyMap2;
+          if (node.name === '普通') {
+            if (!node.info.taskAssigneeList && !node.info.taskAssignee.assigneeType) {
+              debugger;
+              let taskAssigneeList = [{
+                title: '人员1',
+                activitiId: node.id,
+                //节点id
+                activitiName: node.info.title,
+                //节点title
+                assigneeType: "",
+                // 人员类型
+                assigneeVal: "",
+                // 选择的值
+                executeType: 1,
+                //执行类型
+                condition: {
+                  condition: "",
+                  toTitle: node.info.title,
+                  circulationConditions: '0',
+                  conditionType: '0',
+                  conditionList: [{
+                    dictName: undefined,
+                    operationType: '1',
+                    conditionContent: {
+                      options: {},
+                      value: ''
+                    },
+                    OperationTypewidth: '82px'
+                  }]
+                }
+              }];
+              node.info.taskAssigneeList = taskAssigneeList;
+            } else if (!node.info.taskAssigneeList && node.info.taskAssignee.assigneeType) {
+              let taskAssigneeList = [{
+                title: '人员1',
+                activitiId: node.info.taskAssignee.activitiId,
+                //节点id
+                activitiName: node.info.taskAssignee.activitiName,
+                //节点title
+                assigneeType: node.info.taskAssignee.assigneeType,
+                // 人员类型
+                assigneeVal: node.info.taskAssignee.assigneeVal,
+                // 选择的值
+                executeType: node.info.taskAssignee.executeType,
+                //执行类型
+                assigneeList: node.info.taskAssignee.assigneeList ? node.info.taskAssignee.assigneeList : undefined,
+                assigneeText: node.info.taskAssignee.assigneeText ? node.info.taskAssignee.assigneeText : undefined,
+                condition: {
+                  condition: "",
+                  toTitle: node.info.title,
+                  circulationConditions: '0',
+                  conditionType: '0',
+                  conditionList: [{
+                    dictName: undefined,
+                    operationType: '1',
+                    conditionContent: {
+                      options: {},
+                      value: ''
+                    },
+                    OperationTypewidth: '82px'
+                  }]
+                }
+              }];
+              node.info.taskAssigneeList = taskAssigneeList;
+              let taskAssignee = {
+                activitiId: node.id,
+                //节点id
+                activitiName: node.info.title,
+                //节点title
+                assigneeType: "",
+                // 人员类型
+                assigneeVal: "",
+                // 选择的值
+                executeType: 1 //执行类型
+              };
+              node.info.taskAssignee = taskAssignee;
+            }
+            if (!node.info.taskAssignee || !node.info.taskAssignee.activitiId || !node.info.taskAssignee.activitiName) {
+              let taskAssignee = {
+                activitiId: node.id,
+                //节点id
+                activitiName: node.info.title,
+                //节点title
+                assigneeType: "",
+                // 人员类型
+                assigneeVal: "",
+                // 选择的值
+                executeType: 1 //执行类型
+              };
+              node.info.taskAssignee = taskAssignee;
+            }
+            if (node.info.taskAssignee) {
+              let taskAssignee = {
+                activitiId: node.info.taskAssignee.activitiId,
+                //节点id
+                activitiName: node.info.taskAssignee.activitiName,
+                //节点title
+                assigneeType: "",
+                // 人员类型
+                assigneeVal: "",
+                // 选择的值
+                executeType: node.info.taskAssignee.executeType //执行类型
+              };
+              node.info.taskAssignee = taskAssignee;
+            }
+          }
+          if (!node.info.copyDesignList && !((_node$info$copyMap = node.info.copyMap) !== null && _node$info$copyMap !== void 0 && _node$info$copyMap.assigneeType)) {
+            let copyDesignList = [{
+              title: '抄送人1',
+              activitiId: node.id,
+              //节点id
+              activitiName: node.info.title,
+              //节点title
+              assigneeType: "",
+              // 人员类型
+              assigneeVal: "",
+              // 选择的值
+              executeType: 1,
+              //执行类型
+              condition: {
+                condition: "",
+                toTitle: node.info.title,
+                circulationConditions: '0',
+                conditionType: '0',
+                conditionList: [{
+                  dictName: undefined,
+                  operationType: '1',
+                  conditionContent: {
+                    options: {},
+                    value: ''
+                  },
+                  OperationTypewidth: '82px'
+                }]
+              }
+            }];
+            node.info.copyDesignList = copyDesignList;
+          } else if (!node.info.copyDesignList && (_node$info$copyMap2 = node.info.copyMap) !== null && _node$info$copyMap2 !== void 0 && _node$info$copyMap2.assigneeType) {
+            let copyDesignList = [{
+              title: '抄送人1',
+              activitiId: node.info.copyMap.activitiId,
+              //节点id
+              activitiName: node.info.copyMap.activitiName,
+              //节点title
+              assigneeType: node.info.copyMap.assigneeType,
+              // 人员类型
+              assigneeVal: node.info.copyMap.assigneeVal,
+              // 选择的值
+              executeType: node.info.copyMap.executeType,
+              //执行类型
+              assigneeList: node.info.copyMap.assigneeList ? node.info.copyMap.assigneeList : undefined,
+              assigneeText: node.info.copyMap.assigneeText ? node.info.copyMap.assigneeText : undefined,
+              condition: {
+                condition: "",
+                toTitle: node.info.title,
+                circulationConditions: '0',
+                conditionType: '0',
+                conditionList: [{
+                  dictName: undefined,
+                  operationType: '1',
+                  conditionContent: {
+                    options: {},
+                    value: ''
+                  },
+                  OperationTypewidth: '82px'
+                }]
+              }
+            }];
+            node.info.copyDesignList = copyDesignList;
+            node.info.copyMap = {
+              activitiId: node.info.copyMap.activitiId,
+              //节点id
+              activitiName: node.info.copyMap.activitiName,
+              //节点title
+              assigneeType: "",
+              // 人员类型
+              assigneeVal: "",
+              // 选择的值
+              executeType: 1 //执行类型
+            };
+          }
+          if (node.info.copyMap) {
+            node.info.copyMap = {
+              activitiId: node.id,
+              //节点id
+              activitiName: node.info.title,
+              //节点title
+              assigneeType: "",
+              // 人员类型
+              assigneeVal: "",
+              // 选择的值
+              executeType: '' //执行类型
+            };
+          }
+        });
+        initData.lineList.forEach(item => {
+          if (!item.condition) {
+            item.condition = {
+              to: item.to,
+              from: item.from,
+              condition: "",
+              circulationConditions: '0',
+              conditionType: '0',
+              conditionList: [{
+                dictName: undefined,
+                operationType: '1',
+                conditionContent: {
+                  options: {},
+                  value: ''
+                },
+                OperationTypewidth: '82px',
+                visibleChildren: false
+              }]
+            };
+            item.condition.fromTitle = initData.nodeList.filter(el => el.id == item.from)[0].info.title;
+            item.condition.toTitle = initData.nodeList.filter(el => el.id == item.to)[0].info.title;
+            debugger;
+          }
+        });
         this.data = initData;
         this.$set(this.data, 'nodeForm', initData.nodeForm);
         this.flowData = lodash_default().cloneDeep(initData);
@@ -160406,7 +160627,7 @@ var userDesign_component = (0,componentNormalizer/* default */.A)(
               }
               //兼容老版本流程中的抄送人和人员配置，写入最新数据
               initData.nodeList.forEach(node => {
-                var _node$info$copyMap, _node$info$copyMap2;
+                var _node$info$copyMap3, _node$info$copyMap4;
                 if (node.name === '普通') {
                   if (!node.info.taskAssigneeList && !node.info.taskAssignee.assigneeType) {
                     debugger;
@@ -160513,7 +160734,7 @@ var userDesign_component = (0,componentNormalizer/* default */.A)(
                     node.info.taskAssignee = taskAssignee;
                   }
                 }
-                if (!node.info.copyDesignList && !((_node$info$copyMap = node.info.copyMap) !== null && _node$info$copyMap !== void 0 && _node$info$copyMap.assigneeType)) {
+                if (!node.info.copyDesignList && !((_node$info$copyMap3 = node.info.copyMap) !== null && _node$info$copyMap3 !== void 0 && _node$info$copyMap3.assigneeType)) {
                   let copyDesignList = [{
                     title: '抄送人1',
                     activitiId: node.id,
@@ -160543,7 +160764,7 @@ var userDesign_component = (0,componentNormalizer/* default */.A)(
                     }
                   }];
                   node.info.copyDesignList = copyDesignList;
-                } else if (!node.info.copyDesignList && (_node$info$copyMap2 = node.info.copyMap) !== null && _node$info$copyMap2 !== void 0 && _node$info$copyMap2.assigneeType) {
+                } else if (!node.info.copyDesignList && (_node$info$copyMap4 = node.info.copyMap) !== null && _node$info$copyMap4 !== void 0 && _node$info$copyMap4.assigneeType) {
                   let copyDesignList = [{
                     title: '抄送人1',
                     activitiId: node.info.copyMap.activitiId,
@@ -161596,15 +161817,15 @@ var userDesign_component = (0,componentNormalizer/* default */.A)(
 });
 ;// 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.8.1@mini-css-extract-plugin/dist/loader.js??clonedRuleSet-32.use[0]!./node_modules/_css-loader@6.10.0@css-loader/dist/cjs.js??clonedRuleSet-32.use[1]!./node_modules/_vue-loader@15.11.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.11.1@vue-loader/lib/index.js??vue-loader-options!./src/flow/panel.vue?vue&type=style&index=0&id=50d14dfb&prod&lang=less&scoped=true
+;// CONCATENATED MODULE: ./node_modules/_mini-css-extract-plugin@2.8.1@mini-css-extract-plugin/dist/loader.js??clonedRuleSet-32.use[0]!./node_modules/_css-loader@6.10.0@css-loader/dist/cjs.js??clonedRuleSet-32.use[1]!./node_modules/_vue-loader@15.11.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.11.1@vue-loader/lib/index.js??vue-loader-options!./src/flow/panel.vue?vue&type=style&index=0&id=f2744ade&prod&lang=less&scoped=true
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./src/flow/panel.vue?vue&type=style&index=0&id=50d14dfb&prod&lang=less&scoped=true
+;// CONCATENATED MODULE: ./src/flow/panel.vue?vue&type=style&index=0&id=f2744ade&prod&lang=less&scoped=true
 
-;// CONCATENATED MODULE: ./node_modules/_mini-css-extract-plugin@2.8.1@mini-css-extract-plugin/dist/loader.js??clonedRuleSet-32.use[0]!./node_modules/_css-loader@6.10.0@css-loader/dist/cjs.js??clonedRuleSet-32.use[1]!./node_modules/_vue-loader@15.11.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.11.1@vue-loader/lib/index.js??vue-loader-options!./src/flow/panel.vue?vue&type=style&index=1&id=50d14dfb&prod&lang=less&scoped=true
+;// CONCATENATED MODULE: ./node_modules/_mini-css-extract-plugin@2.8.1@mini-css-extract-plugin/dist/loader.js??clonedRuleSet-32.use[0]!./node_modules/_css-loader@6.10.0@css-loader/dist/cjs.js??clonedRuleSet-32.use[1]!./node_modules/_vue-loader@15.11.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.11.1@vue-loader/lib/index.js??vue-loader-options!./src/flow/panel.vue?vue&type=style&index=1&id=f2744ade&prod&lang=less&scoped=true
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./src/flow/panel.vue?vue&type=style&index=1&id=50d14dfb&prod&lang=less&scoped=true
+;// CONCATENATED MODULE: ./src/flow/panel.vue?vue&type=style&index=1&id=f2744ade&prod&lang=less&scoped=true
 
 ;// CONCATENATED MODULE: ./src/flow/panel.vue
 
@@ -161622,7 +161843,7 @@ var panel_component = (0,componentNormalizer/* default */.A)(
   staticRenderFns,
   false,
   null,
-  "50d14dfb",
+  "f2744ade",
   null
   
 )
@@ -173958,8 +174179,8 @@ var warpFormulaEditvue_type_template_id_f3920ca4_render = function () {var _vm=t
 var warpFormulaEditvue_type_template_id_f3920ca4_staticRenderFns = []
 
 
-;// CONCATENATED MODULE: ./node_modules/_vue-loader@15.11.1@vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/_vue-loader@15.11.1@vue-loader/lib/index.js??vue-loader-options!./src/form/formula/formula-edit.vue?vue&type=template&id=78072acc
-var formula_editvue_type_template_id_78072acc_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('a-modal',{staticClass:"form-formula-dialog",attrs:{"visible":_vm.dialogVisible,"width":"800px","append-to-body":""},on:{"update:visible":function($event){_vm.dialogVisible=$event},"cancel":_vm.closeDialog}},[_c('template',{slot:"title"},[_c('div',{staticStyle:{"display":"flex"}},[_vm._v(" 公式编辑 "),_c('div',{staticStyle:{"color":"#838892","margin-left":"10px","font-size":"12px"}},[_vm._v("使用数学运算符编辑公式")])])]),(_vm.dialogVisible)?_c('div',{on:{"click":function($event){_vm.replaceVisible && (_vm.replaceVisible = false)}}},[_c('div',{staticClass:"formula-head-title"},[_c('div',{staticClass:"CodeMirror-wrap",staticStyle:{"line-height":"18px"}},[_c('div',{staticClass:"head-options"},[_c('div',{staticStyle:{"overflow":"hidden","line-break":"anywhere","text-overflow":"ellipsis","white-space":"nowrap"},attrs:{"title":_vm.widgetName}},[_vm._v(" "+_vm._s(_vm.widgetName)+" ")]),_c('span',{staticStyle:{"margin-right":"auto"}},[_vm._v(" =")]),_c('div',{staticClass:"head-opt-btns"},[_c('button',{on:{"click":function($event){return _vm.handleClick('copy')}}},[_c('form-iconfont',{staticStyle:{"font-size":"15px"},attrs:{"type":"icon-Copy"}}),_vm._v("复制")],1),_c('a-popconfirm',{attrs:{"visible":_vm.replaceVisible,"placement":"bottomRight","ok-text":"确认","icon":[],"cancel-text":"取消"},on:{"cancel":function($event){_vm.replaceVisible = false},"confirm":_vm.replaceConfirm}},[_c('template',{slot:"title"},[_c('div',{staticClass:"replace-param-content",staticStyle:{"width":"200px","margin-left":"-20px"}},[_c('div',{staticClass:"tip"},[_vm._v(" 仅支持替换引用的当前表单字段 ")]),_c('a-form',{attrs:{"form":_vm.replaceForm}},[_c('a-form-item',{staticStyle:{"margin-bottom":"0"},attrs:{"label":"1. 选择要替换的变量"}},[_c('a-select',{directives:[{name:"decorator",rawName:"v-decorator",value:([
+;// CONCATENATED MODULE: ./node_modules/_vue-loader@15.11.1@vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/_vue-loader@15.11.1@vue-loader/lib/index.js??vue-loader-options!./src/form/formula/formula-edit.vue?vue&type=template&id=7942203f
+var formula_editvue_type_template_id_7942203f_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('a-modal',{staticClass:"form-formula-dialog",attrs:{"visible":_vm.dialogVisible,"width":"800px","append-to-body":""},on:{"update:visible":function($event){_vm.dialogVisible=$event},"cancel":_vm.closeDialog}},[_c('template',{slot:"title"},[_c('div',{staticStyle:{"display":"flex"}},[_vm._v(" 公式编辑 "),_c('div',{staticStyle:{"color":"#838892","margin-left":"10px","font-size":"12px"}},[_vm._v("使用数学运算符编辑公式")])])]),(_vm.dialogVisible)?_c('div',{on:{"click":function($event){_vm.replaceVisible && (_vm.replaceVisible = false)}}},[_c('div',{staticClass:"formula-head-title"},[_c('div',{staticClass:"CodeMirror-wrap",staticStyle:{"line-height":"18px"}},[_c('div',{staticClass:"head-options"},[_c('div',{staticStyle:{"overflow":"hidden","line-break":"anywhere","text-overflow":"ellipsis","white-space":"nowrap"},attrs:{"title":_vm.widgetName}},[_vm._v(" "+_vm._s(_vm.widgetName)+" ")]),_c('span',{staticStyle:{"margin-right":"auto"}},[_vm._v(" =")]),_c('div',{staticClass:"head-opt-btns"},[_c('button',{on:{"click":function($event){return _vm.handleClick('copy')}}},[_c('form-iconfont',{staticStyle:{"font-size":"15px"},attrs:{"type":"icon-Copy"}}),_vm._v("复制")],1),_c('a-popconfirm',{attrs:{"visible":_vm.replaceVisible,"placement":"bottomRight","ok-text":"确认","icon":[],"cancel-text":"取消"},on:{"cancel":function($event){_vm.replaceVisible = false},"confirm":_vm.replaceConfirm}},[_c('template',{slot:"title"},[_c('div',{staticClass:"replace-param-content",staticStyle:{"width":"200px","margin-left":"-20px"}},[_c('div',{staticClass:"tip"},[_vm._v(" 仅支持替换引用的当前表单字段 ")]),_c('a-form',{attrs:{"form":_vm.replaceForm}},[_c('a-form-item',{staticStyle:{"margin-bottom":"0"},attrs:{"label":"1. 选择要替换的变量"}},[_c('a-select',{directives:[{name:"decorator",rawName:"v-decorator",value:([
                             'curr',
                             {
                               rules: [{ required: true, message: '此内容必填' }],
@@ -173967,8 +174188,8 @@ var formula_editvue_type_template_id_78072acc_render = function () {var _vm=this
                             'replace',
                             {
                               rules: [{ required: true, message: '此内容必填' }],
-                            } ]),expression:"[\n                            'replace',\n                            {\n                              rules: [{ required: true, message: '此内容必填' }],\n                            },\n                          ]"}],staticClass:"param-combo",staticStyle:{"width":"100%"},attrs:{"show-search":"","filterOption":_vm.replaceFilterOption}},_vm._l((Object.keys(_vm.f_dataObj)),function(item){return _c('a-select-option',{key:item,attrs:{"title":_vm.f_dataObj[item]}},[_vm._v(_vm._s(_vm.f_dataObj[item]))])}),1)],1):_vm._e()],1)],1)]),_c('button',{on:{"click":function($event){return _vm.handleClick('replace')}}},[_c('form-iconfont',{staticStyle:{"font-size":"14px"},attrs:{"type":"icon-replace"}}),_vm._v("替换变量")],1)],2),_c('a-popconfirm',{attrs:{"placement":"bottomRight","icon":[],"ok-text":"确认","cancel-text":"取消"},on:{"confirm":function($event){_vm.form.remark = _vm.remark}}},[_c('template',{slot:"title"},[_c('div',{staticStyle:{"margin-left":"-20px","width":"200px"}},[_c('a-textarea',{staticStyle:{"height":"100px","resize":"none"},attrs:{"auto-size":false,"placeholder":"请输入备注"},model:{value:(_vm.remark),callback:function ($$v) {_vm.remark=$$v},expression:"remark"}})],1)]),_c('button',{on:{"click":function($event){return _vm.handleClick('remark')}}},[_c('form-iconfont',{staticStyle:{"font-size":"12px"},attrs:{"type":"icon-beizhu"}}),_vm._v("备注")],1)],2),_c('button',{on:{"click":function($event){return _vm.handleClick('debug')}}},[_c('form-iconfont',{staticStyle:{"font-size":"14px"},attrs:{"type":"icon-tiaoshi"}}),_vm._v("调试")],1)],1)]),_c('div',{staticStyle:{"padding":"0 5px"}},[_c('textarea',{ref:"formula",staticClass:"cm-s-default",staticStyle:{"height":"180px","font-size":"14px"}})])]),(_vm.err_msg)?_c('div',{staticClass:"formula-error"},[_vm._v(" "+_vm._s(_vm.err_msg)+" ")]):_vm._e()]),_c('a-row',[_c('a-col',{attrs:{"span":8}},[_c('div',{staticClass:"formula-info-main"},[_c('div',{staticClass:"head",staticStyle:{"height":"35px"}},[_c('a-input',{attrs:{"allow-clear":"","placeholder":"搜索变量"},model:{value:(_vm.search_variable),callback:function ($$v) {_vm.search_variable=$$v},expression:"search_variable"}},[_c('a-icon',{attrs:{"slot":"prefix","type":"search"},slot:"prefix"})],1)],1),_c('div',{staticClass:"formula-container"},[(_vm.boData.length === 0)?_c('div',{staticClass:"empty-tip"},[_vm._v("无可用变量，请添加或保存表单后重试")]):(_vm.filter_boData.length === 0)?_c('div',{staticClass:"empty-tip"},[_vm._v("无搜索结果")]):_vm._e(),_vm._l((_vm.filter_boData),function(item,idx){return _c('div',{key:item.id,on:{"click":function($event){return _vm.clickBoNode(item)}}},[_c('div',{staticClass:"variable-list"},[_c('div',{attrs:{"title":item.name}},[_vm._v(_vm._s(item.name))]),_c('div',{class:("style-" + (item.type))},[_vm._v(_vm._s(_vm.TypesName[item.type]))])])])})],2)])]),_c('a-col',{attrs:{"span":6}},[_c('div',{staticClass:"formula-info-main ",staticStyle:{"border-left":"none","border-right":"none"}},[_c('div',{staticClass:"head",staticStyle:{"height":"35px"}},[_c('a-input',{attrs:{"allow-clear":"","placeholder":"搜索函数"},model:{value:(_vm.search_methods),callback:function ($$v) {_vm.search_methods=$$v},expression:"search_methods"}},[_c('a-icon',{attrs:{"slot":"prefix","type":"search"},slot:"prefix"})],1)],1),_c('div',{staticStyle:{"height":"100%","overflow-y":"auto"},on:{"mouseleave":_vm.handleMouseLeave}},[(_vm.filter_treeData.length === 0)?_c('div',{staticClass:"empty-tip"},[_vm._v("没有对应的函数")]):_vm._e(),_c('div',{staticClass:"formula-menu"},[_c('div',{staticClass:"formula-list"},_vm._l((_vm.filter_treeData),function(tree,idx){return _c('div',{key:tree.key,class:("formula-category " + (_vm.expandIndex[idx] ? 'expand': ''))},[_c('div',{staticClass:"title",on:{"click":function($event){return _vm.$set(_vm.expandIndex,idx, !_vm.expandIndex[idx])}}},[_c('form-iconfont',{staticClass:"arrow-icon",staticStyle:{"font-size":"13px"},attrs:{"type":"icon-rightyou"}}),_vm._v(" "+_vm._s(tree.title)+" ")],1),_c('div',{staticClass:"children"},_vm._l((tree.children),function(child){return _c('div',{key:child.title,class:("formula-item " + (_vm.formulaIntro.title === child.title ? 'select': '')),on:{"click":function($event){return _vm.clickFunctionNode(child)},"mouseenter":function($event){return _vm.handleFunctionHover(child)}}},[_c('span',{staticClass:"formula-item-name"},[_vm._v(_vm._s(child.title))]),_c('span',{staticClass:"formula-item-subName"},[_vm._v(_vm._s(child.subName))])])}),0)])}),0)])])])]),_c('a-col',{attrs:{"span":10}},[_c('div',{staticClass:"formula-info-main "},[(_vm.formulaIntro)?_c('div',{staticClass:"formula-intro"},[_c('div',{staticClass:"formula-title head"},[_vm._v(_vm._s(_vm.formulaIntro.name))]),_c('div',{staticStyle:{"padding":"0 10px"}},[_c('div',{staticStyle:{"line-height":"22px"}},[_c('div',{staticClass:"intro",staticStyle:{"margin":"5px 0"}},[_vm._v(" "+_vm._s(_vm.formulaIntro.intro)+" ")]),_c('div',{staticClass:"usage",staticStyle:{"margin-bottom":"5px","line-break":"anywhere"}},[_vm._v("用法："),_c('span',{staticClass:"formula-name"},[_vm._v(_vm._s(_vm.formulaIntro.name))]),_vm._v(_vm._s(_vm.formulaIntro.usage.replace(_vm.formulaIntro.name, '')))]),_c('div',{staticClass:"example",staticStyle:{"margin-bottom":"5px","line-break":"anywhere"}},[_vm._v("示例："),_c('span',{domProps:{"innerHTML":_vm._s(_vm.formulaIntro.example)}})])])])]):_vm._e(),_c('div',{staticClass:"formula-container"},[(!_vm.formulaIntro)?_c('ul',{staticStyle:{"padding-left":"20px"}},[_c('li',{staticStyle:{"list-style":"initial","margin-bottom":"20px"}},[_vm._v(" 从左侧面板选择字段名和函数，或输入函数 ")]),_c('li',{staticStyle:{"list-style":"initial"}},[_vm._v("公式编辑样式举例："),_c('span',{staticClass:"formula-name"},[_vm._v(" AVERAGE")]),_vm._v("("),_c('span',{staticClass:"formula-field"},[_vm._v("基本工资")]),_vm._v(","),_c('span',{staticClass:"formula-field"},[_vm._v("加班工资")]),_vm._v(") ")])]):_vm._e()])])])],1)],1):_vm._e(),_c('div',{attrs:{"slot":"footer"},slot:"footer"},[_c('a-button',{on:{"click":_vm.closeDialog}},[_vm._v("取消")]),_c('a-button',{attrs:{"type":"primary"},on:{"click":_vm.handleConfirm}},[_vm._v("确定")])],1)],2)}
-var formula_editvue_type_template_id_78072acc_staticRenderFns = []
+                            } ]),expression:"[\n                            'replace',\n                            {\n                              rules: [{ required: true, message: '此内容必填' }],\n                            },\n                          ]"}],staticClass:"param-combo",staticStyle:{"width":"100%"},attrs:{"show-search":"","filterOption":_vm.replaceFilterOption}},_vm._l((Object.keys(_vm.f_dataObj)),function(item){return _c('a-select-option',{key:item,attrs:{"title":_vm.f_dataObj[item]}},[_vm._v(_vm._s(_vm.f_dataObj[item]))])}),1)],1):_vm._e()],1)],1)]),_c('button',{on:{"click":function($event){return _vm.handleClick('replace')}}},[_c('form-iconfont',{staticStyle:{"font-size":"14px"},attrs:{"type":"icon-replace"}}),_vm._v("替换变量")],1)],2),_c('a-popconfirm',{attrs:{"placement":"bottomRight","icon":[],"ok-text":"确认","cancel-text":"取消"},on:{"confirm":function($event){_vm.form.remark = _vm.remark}}},[_c('template',{slot:"title"},[_c('div',{staticStyle:{"margin-left":"-20px","width":"200px"}},[_c('a-textarea',{staticStyle:{"height":"100px","resize":"none"},attrs:{"auto-size":false,"placeholder":"请输入备注"},model:{value:(_vm.remark),callback:function ($$v) {_vm.remark=$$v},expression:"remark"}})],1)]),_c('button',{on:{"click":function($event){return _vm.handleClick('remark')}}},[_c('form-iconfont',{staticStyle:{"font-size":"12px"},attrs:{"type":"icon-beizhu"}}),_vm._v("备注")],1)],2),_c('button',{on:{"click":function($event){return _vm.handleClick('debug')}}},[_c('form-iconfont',{staticStyle:{"font-size":"14px"},attrs:{"type":"icon-tiaoshi"}}),_vm._v("调试")],1)],1)]),_c('div',{staticClass:"formula_textarea_content",staticStyle:{"padding":"0 5px"}},[_c('textarea',{ref:"formula",staticClass:"cm-s-default",staticStyle:{"height":"180px","font-size":"14px"}})])]),(_vm.err_msg)?_c('div',{staticClass:"formula-error"},[_vm._v(" "+_vm._s(_vm.err_msg)+" ")]):_vm._e()]),_c('a-row',[_c('a-col',{attrs:{"span":8}},[_c('div',{staticClass:"formula-info-main"},[_c('div',{staticClass:"head",staticStyle:{"height":"35px"}},[_c('a-input',{attrs:{"allow-clear":"","placeholder":"搜索变量"},model:{value:(_vm.search_variable),callback:function ($$v) {_vm.search_variable=$$v},expression:"search_variable"}},[_c('a-icon',{attrs:{"slot":"prefix","type":"search"},slot:"prefix"})],1)],1),_c('div',{staticClass:"formula-container"},[(_vm.boData.length === 0)?_c('div',{staticClass:"empty-tip"},[_vm._v("无可用变量，请添加或保存表单后重试")]):(_vm.filter_boData.length === 0)?_c('div',{staticClass:"empty-tip"},[_vm._v("无搜索结果")]):_vm._e(),_vm._l((_vm.filter_boData),function(item,idx){return _c('div',{key:item.id,on:{"click":function($event){return _vm.clickBoNode(item)}}},[_c('div',{staticClass:"variable-list"},[_c('div',{attrs:{"title":item.name}},[_vm._v(_vm._s(item.name))]),_c('div',{class:("style-" + (item.type))},[_vm._v(_vm._s(_vm.TypesName[item.type]))])])])})],2)])]),_c('a-col',{attrs:{"span":6}},[_c('div',{staticClass:"formula-info-main ",staticStyle:{"border-left":"none","border-right":"none"}},[_c('div',{staticClass:"head",staticStyle:{"height":"35px"}},[_c('a-input',{attrs:{"allow-clear":"","placeholder":"搜索函数"},model:{value:(_vm.search_methods),callback:function ($$v) {_vm.search_methods=$$v},expression:"search_methods"}},[_c('a-icon',{attrs:{"slot":"prefix","type":"search"},slot:"prefix"})],1)],1),_c('div',{staticStyle:{"height":"100%","overflow-y":"auto"},on:{"mouseleave":_vm.handleMouseLeave}},[(_vm.filter_treeData.length === 0)?_c('div',{staticClass:"empty-tip"},[_vm._v("没有对应的函数")]):_vm._e(),_c('div',{staticClass:"formula-menu"},[_c('div',{staticClass:"formula-list"},_vm._l((_vm.filter_treeData),function(tree,idx){return _c('div',{key:tree.key,class:("formula-category " + (_vm.expandIndex[idx] ? 'expand': ''))},[_c('div',{staticClass:"title",on:{"click":function($event){return _vm.$set(_vm.expandIndex,idx, !_vm.expandIndex[idx])}}},[_c('form-iconfont',{staticClass:"arrow-icon",staticStyle:{"font-size":"13px"},attrs:{"type":"icon-rightyou"}}),_vm._v(" "+_vm._s(tree.title)+" ")],1),_c('div',{staticClass:"children"},_vm._l((tree.children),function(child){return _c('div',{key:child.title,class:("formula-item " + (_vm.formulaIntro.title === child.title ? 'select': '')),on:{"click":function($event){return _vm.clickFunctionNode(child)},"mouseenter":function($event){return _vm.handleFunctionHover(child)}}},[_c('span',{staticClass:"formula-item-name"},[_vm._v(_vm._s(child.title))]),_c('span',{staticClass:"formula-item-subName"},[_vm._v(_vm._s(child.subName))])])}),0)])}),0)])])])]),_c('a-col',{attrs:{"span":10}},[_c('div',{staticClass:"formula-info-main "},[(_vm.formulaIntro)?_c('div',{staticClass:"formula-intro"},[_c('div',{staticClass:"formula-title head"},[_vm._v(_vm._s(_vm.formulaIntro.name))]),_c('div',{staticStyle:{"padding":"0 10px"}},[_c('div',{staticStyle:{"line-height":"22px"}},[_c('div',{staticClass:"intro",staticStyle:{"margin":"5px 0"}},[_vm._v(" "+_vm._s(_vm.formulaIntro.intro)+" ")]),_c('div',{staticClass:"usage",staticStyle:{"margin-bottom":"5px","line-break":"anywhere"}},[_vm._v("用法："),_c('span',{staticClass:"formula-name"},[_vm._v(_vm._s(_vm.formulaIntro.name))]),_vm._v(_vm._s(_vm.formulaIntro.usage.replace(_vm.formulaIntro.name, '')))]),_c('div',{staticClass:"example",staticStyle:{"margin-bottom":"5px","line-break":"anywhere"}},[_vm._v("示例："),_c('span',{domProps:{"innerHTML":_vm._s(_vm.formulaIntro.example)}})])])])]):_vm._e(),_c('div',{staticClass:"formula-container"},[(!_vm.formulaIntro)?_c('ul',{staticStyle:{"padding-left":"20px"}},[_c('li',{staticStyle:{"list-style":"initial","margin-bottom":"20px"}},[_vm._v(" 从左侧面板选择字段名和函数，或输入函数 ")]),_c('li',{staticStyle:{"list-style":"initial"}},[_vm._v("公式编辑样式举例："),_c('span',{staticClass:"formula-name"},[_vm._v(" AVERAGE")]),_vm._v("("),_c('span',{staticClass:"formula-field"},[_vm._v("基本工资")]),_vm._v(","),_c('span',{staticClass:"formula-field"},[_vm._v("加班工资")]),_vm._v(") ")])]):_vm._e()])])])],1)],1):_vm._e(),_c('div',{attrs:{"slot":"footer"},slot:"footer"},[_c('a-button',{on:{"click":_vm.closeDialog}},[_vm._v("取消")]),_c('a-button',{attrs:{"type":"primary"},on:{"click":_vm.handleConfirm}},[_vm._v("确定")])],1)],2)}
+var formula_editvue_type_template_id_7942203f_staticRenderFns = []
 
 
 // EXTERNAL MODULE: ./node_modules/_lodash-es@4.17.21@lodash-es/debounce.js + 1 modules
@@ -175844,25 +176065,25 @@ list_2.forEach(item => {
 });
 ;// CONCATENATED MODULE: ./src/form/formula/formula-edit.vue?vue&type=script&lang=js
  /* harmony default export */ const formula_formula_editvue_type_script_lang_js = (formula_editvue_type_script_lang_js); 
-;// CONCATENATED MODULE: ./node_modules/_mini-css-extract-plugin@2.8.1@mini-css-extract-plugin/dist/loader.js??clonedRuleSet-32.use[0]!./node_modules/_css-loader@6.10.0@css-loader/dist/cjs.js??clonedRuleSet-32.use[1]!./node_modules/_vue-loader@15.11.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.11.1@vue-loader/lib/index.js??vue-loader-options!./src/form/formula/formula-edit.vue?vue&type=style&index=0&id=78072acc&prod&lang=less
+;// CONCATENATED MODULE: ./node_modules/_mini-css-extract-plugin@2.8.1@mini-css-extract-plugin/dist/loader.js??clonedRuleSet-32.use[0]!./node_modules/_css-loader@6.10.0@css-loader/dist/cjs.js??clonedRuleSet-32.use[1]!./node_modules/_vue-loader@15.11.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.11.1@vue-loader/lib/index.js??vue-loader-options!./src/form/formula/formula-edit.vue?vue&type=style&index=0&id=7942203f&prod&lang=less
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./src/form/formula/formula-edit.vue?vue&type=style&index=0&id=78072acc&prod&lang=less
+;// CONCATENATED MODULE: ./src/form/formula/formula-edit.vue?vue&type=style&index=0&id=7942203f&prod&lang=less
 
-;// CONCATENATED MODULE: ./node_modules/_mini-css-extract-plugin@2.8.1@mini-css-extract-plugin/dist/loader.js??clonedRuleSet-12.use[0]!./node_modules/_css-loader@6.10.0@css-loader/dist/cjs.js??clonedRuleSet-12.use[1]!./node_modules/_vue-loader@15.11.1@vue-loader/lib/loaders/stylePostLoader.js!./node_modules/_postcss-loader@6.2.1@postcss-loader/dist/cjs.js??clonedRuleSet-12.use[2]!./node_modules/_vue-loader@15.11.1@vue-loader/lib/index.js??vue-loader-options!./src/form/formula/formula-edit.vue?vue&type=style&index=1&id=78072acc&prod&lang=css
+;// CONCATENATED MODULE: ./node_modules/_mini-css-extract-plugin@2.8.1@mini-css-extract-plugin/dist/loader.js??clonedRuleSet-12.use[0]!./node_modules/_css-loader@6.10.0@css-loader/dist/cjs.js??clonedRuleSet-12.use[1]!./node_modules/_vue-loader@15.11.1@vue-loader/lib/loaders/stylePostLoader.js!./node_modules/_postcss-loader@6.2.1@postcss-loader/dist/cjs.js??clonedRuleSet-12.use[2]!./node_modules/_vue-loader@15.11.1@vue-loader/lib/index.js??vue-loader-options!./src/form/formula/formula-edit.vue?vue&type=style&index=1&id=7942203f&prod&lang=css
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./src/form/formula/formula-edit.vue?vue&type=style&index=1&id=78072acc&prod&lang=css
+;// CONCATENATED MODULE: ./src/form/formula/formula-edit.vue?vue&type=style&index=1&id=7942203f&prod&lang=css
 
-;// CONCATENATED MODULE: ./node_modules/_mini-css-extract-plugin@2.8.1@mini-css-extract-plugin/dist/loader.js??clonedRuleSet-12.use[0]!./node_modules/_css-loader@6.10.0@css-loader/dist/cjs.js??clonedRuleSet-12.use[1]!./node_modules/_vue-loader@15.11.1@vue-loader/lib/loaders/stylePostLoader.js!./node_modules/_postcss-loader@6.2.1@postcss-loader/dist/cjs.js??clonedRuleSet-12.use[2]!./node_modules/_vue-loader@15.11.1@vue-loader/lib/index.js??vue-loader-options!./src/form/formula/formula-edit.vue?vue&type=style&index=2&id=78072acc&prod&lang=css
+;// CONCATENATED MODULE: ./node_modules/_mini-css-extract-plugin@2.8.1@mini-css-extract-plugin/dist/loader.js??clonedRuleSet-12.use[0]!./node_modules/_css-loader@6.10.0@css-loader/dist/cjs.js??clonedRuleSet-12.use[1]!./node_modules/_vue-loader@15.11.1@vue-loader/lib/loaders/stylePostLoader.js!./node_modules/_postcss-loader@6.2.1@postcss-loader/dist/cjs.js??clonedRuleSet-12.use[2]!./node_modules/_vue-loader@15.11.1@vue-loader/lib/index.js??vue-loader-options!./src/form/formula/formula-edit.vue?vue&type=style&index=2&id=7942203f&prod&lang=css
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./src/form/formula/formula-edit.vue?vue&type=style&index=2&id=78072acc&prod&lang=css
+;// CONCATENATED MODULE: ./src/form/formula/formula-edit.vue?vue&type=style&index=2&id=7942203f&prod&lang=css
 
-;// CONCATENATED MODULE: ./node_modules/_mini-css-extract-plugin@2.8.1@mini-css-extract-plugin/dist/loader.js??clonedRuleSet-32.use[0]!./node_modules/_css-loader@6.10.0@css-loader/dist/cjs.js??clonedRuleSet-32.use[1]!./node_modules/_vue-loader@15.11.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.11.1@vue-loader/lib/index.js??vue-loader-options!./src/form/formula/formula-edit.vue?vue&type=style&index=3&id=78072acc&prod&lang=less
+;// CONCATENATED MODULE: ./node_modules/_mini-css-extract-plugin@2.8.1@mini-css-extract-plugin/dist/loader.js??clonedRuleSet-32.use[0]!./node_modules/_css-loader@6.10.0@css-loader/dist/cjs.js??clonedRuleSet-32.use[1]!./node_modules/_vue-loader@15.11.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.11.1@vue-loader/lib/index.js??vue-loader-options!./src/form/formula/formula-edit.vue?vue&type=style&index=3&id=7942203f&prod&lang=less
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./src/form/formula/formula-edit.vue?vue&type=style&index=3&id=78072acc&prod&lang=less
+;// CONCATENATED MODULE: ./src/form/formula/formula-edit.vue?vue&type=style&index=3&id=7942203f&prod&lang=less
 
 ;// CONCATENATED MODULE: ./src/form/formula/formula-edit.vue
 
@@ -175878,8 +176099,8 @@ list_2.forEach(item => {
 
 var formula_edit_component = (0,componentNormalizer/* default */.A)(
   formula_formula_editvue_type_script_lang_js,
-  formula_editvue_type_template_id_78072acc_render,
-  formula_editvue_type_template_id_78072acc_staticRenderFns,
+  formula_editvue_type_template_id_7942203f_render,
+  formula_editvue_type_template_id_7942203f_staticRenderFns,
   false,
   null,
   null,

package/package.json

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