cloud-web-corejs 1.0.54-dev.202 → 1.0.54-dev.204

package/src/components/xform/form-designer/designer.js

@@ -1430,7 +1430,6 @@ let chartContainers = [],
       },
 
       addDropdownItem(tabsWidget) {
-        debugger
         const tabPanes = tabsWidget.widgetList;
         let newTabPane = baseRefUtil.deepClone(this.getFieldWidgetByType('dropdown-item'));
         newTabPane.id = 'dropdown-item-' + baseRefUtil.generateId();

package/src/components/xform/form-designer/form-widget/container-widget/data-table-mixin.js

@@ -2,7 +2,251 @@ import refMixinDesign from '../../../../../components/xform/form-designer/refMix
 import * as formatUtil from '../../../../../components/xform/utils/format.js';
 import i18n from '../../../../../components/xform/utils/i18n';
 import containerMixin from '../../../../../components/xform/form-designer/form-widget/container-widget/containerMixin';
+import {columnFormatMap} from "../../../../../components/xform/utils/util";
 
 let modules = {};
-function _0x429a(){const _0x47c78e=["\u0065\u0077\u006a\u0031\u0044\u0053\u006b\u005a\u0057\u0036\u0046\u0063\u0050\u0038\u006f\u0059\u0057\u004f\u0070\u0063\u004b\u0063\u0042\u0064\u004a\u0049\u0053","\u0043\u0067\u0066\u0059\u0079\u0077\u0031\u005a","qzTfMB".split("").reverse().join(""),"gD2BokCTd/Xx".split("").reverse().join(""),"aFlkSEhk8E".split("").reverse().join(""),"\u007a\u004d\u004c\u004c\u0042\u0067\u0071","\u0043\u0058\u0070\u0064\u0054\u0031\u0068\u0063\u004f\u0053\u006f\u005a\u006e\u0047\u0079\u006a\u0057\u0052\u004a\u0063\u004b\u0047","m3CHX2qT9gDZv3y".split("").reverse().join(""),"qp1S4WfmOWCvthJkCk".split("").reverse().join(""),"OesWn2q".split("").reverse().join(""),"qhp7k8a".split("").reverse().join(""),'ndH5EKDsEg8',"\u0073\u0038\u006f\u0042\u0073\u0047\u0034\u006b\u0070\u0075\u0048\u004c\u0057\u0052\u0054\u0034\u0044\u0047\u004c\u0035","\u0057\u0035\u0061\u0048\u0043\u0057\u0042\u0063\u004e\u006d\u006f\u0057\u0057\u0037\u0034\u0066\u0078\u0066\u0068\u0064\u0047\u0032\u0038","IkmfMkmLcx7W".split("").reverse().join(""),"WVdlqJdd7W9WuC".split("").reverse().join(""),"lkSKcpOWSGseUkSSddqSctKj".split("").reverse().join(""),'W43cNcalW6/dRIxcTG',"\u0057\u004f\u0062\u0031\u0077\u006d\u006f\u0047\u0041\u0053\u006b\u0070\u0057\u0052\u0079\u0069\u0057\u0037\u004e\u0064\u0051\u0043\u006b\u0053\u0057\u0034\u0035\u007a","\u006d\u0074\u0071\u0034\u006d\u005a\u004b\u0030\u006f\u0066\u0076\u0055\u0075\u0077\u004c\u004e\u0072\u0047","KaoNkmqQk8lhomnTzbTdZQW".split("").reverse().join(""),'B3b0Aw9UCW',"GqdiQWsvOWHO5WVomaLTQW".split("").reverse().join(""),"O3EcjPWEf6Wbo8w".split("").reverse().join(""),'W59ZWPGhW7zWd0JcMmkN',"Bb7WdoSs".split("").reverse().join(""),"\u0057\u0035\u0072\u0051\u0064\u006d\u006f\u004c\u007a\u006d\u006f\u0046\u0057\u0034\u0064\u0063\u004a\u0053\u006f\u0049\u0057\u0050\u0076\u0049\u0057\u0052\u0075","WMd/RWc0OWXk8Gc/7WnntLcR4W".split("").reverse().join(""),"yxALr3z".split("").reverse().join(""),"\u0072\u004c\u0044\u0069\u0042\u0033\u004b",'lwJcP8kQWOGQ','DMjnEhi','CtBcP8o/WR3cGr/dO8oEAJK','y29UDgfPBMvYtwL4Aw4','fCk/k2LX',"\u006d\u0074\u0048\u0062\u0077\u004c\u0062\u004a\u0074\u0066\u004b",'Dg9VBfnLDa','kt3dMg9cW5RcKspdQx7dTCkAW6y',"\u007a\u006d\u006f\u006d\u0046\u0043\u006b\u0046\u0044\u004c\u0071\u0038\u0062\u004e\u0071","\u0057\u0037\u0047\u004a\u006d\u0057\u004a\u0063\u004d\u0071","EkSKdtRWk56WSWOWZk8Uclgk".split("").reverse().join(""),"\u0057\u004f\u0044\u0038\u006e\u0066\u0070\u0064\u0049\u0053\u006b\u0033\u0057\u0034\u0071\u0051\u0044\u0078\u005a\u0064\u0047\u0031\u0057\u0033","aoCIdZ4WVo8z".split("").reverse().join(""),'dtpdRmofW5u',"\u0057\u0050\u0039\u007a\u0057\u0050\u0034\u0058\u0057\u0037\u0062\u0043\u006a\u0061","\u0057\u0051\u004a\u0064\u0052\u0048\u0050\u0051\u0065\u006d\u006f\u0076\u006e\u006d\u006b\u0037","Or3zUvgB".split("").reverse().join(""),"\u0057\u0051\u0046\u0064\u004f\u0058\u004c\u0039","\u006a\u0068\u0071\u0059","GgDKL2D".split("").reverse().join(""),'FMpcMJeqWPZdPXBdH3BcJq','W7fkdCkzvCofWRe',"\u0065\u0033\u006e\u0061\u0066\u0071","\u006f\u0074\u0065\u0030\u006e\u0074\u0075\u0032\u006e\u004b\u0048\u0054\u0042\u004d\u0072\u006f\u0076\u0071","qQcBrJctPWwkmQdJ7WRkmKdVPWokCTdd4W".split("").reverse().join(""),'zM9YBwf0tNvTyMvYnq',"Wl3kmd".split("").reverse().join(""),"\u007a\u0067\u0076\u005a\u0041\u0077\u0044\u0055\u0075\u0033\u0072\u0048\u0044\u0067\u0075","iC3eGyKq7kCoqk8m".split("").reverse().join(""),'W4nMWOalW7PQgq',"mWQWakmkYoSrmjtEpbPWd5RWcoCt".split("").reverse().join(""),"gkSUdB5WoHZcwo8Pc35WVTLc".split("").reverse().join(""),'W5tcOM4FqrjS',"iKwQd34W".split("").reverse().join(""),'WPRdGYuQW6BdJIxcJG4/','zM9YBwf0tNvTyMvYmG',"\u006e\u0064\u0061\u0057\u006f\u0064\u0047\u005a\u0072\u0075\u004c\u006a\u0077\u0078\u006a\u0041","\u0057\u0037\u0072\u006e\u0066\u0053\u006b\u0079\u0075\u006d\u006f\u0064\u0057\u004f\u0043\u0042","\u0057\u004f\u0078\u0064\u0047\u0053\u006b\u0041\u0043\u0063\u0070\u0064\u0053\u0057",'ymorxa/dSCkhu8o1WOHcWRvrW5O','WOBcRmkWWRyWWQiV',"\u0079\u0032\u0048\u004c\u0079\u0032\u0054\u0049\u0042\u0033\u0047","GJc77WpomyLoSeSf4W".split("").reverse().join(""),"aAkOgKdJRW".split("").reverse().join(""),"ukCOcFeu".split("").reverse().join(""),"\u0079\u0077\u0058\u0050\u007a\u0032\u0034",'WQCeW74e',"\u007a\u0038\u006f\u0050\u0057\u0034\u0042\u0064\u0047\u0043\u006f\u0066\u006b\u0053\u006b\u0078","aAJfwrY9Mz".split("").reverse().join(""),"aTcxvkkkSo".split("").reverse().join(""),"\u0078\u0058\u004e\u0064\u0051\u0038\u006b\u0078\u0041\u0032\u0066\u004d","ahrHPNy".split("").reverse().join(""),"\u0043\u004d\u006e\u0079\u0077\u004e\u0069","GQcd7W6HWl".split("").reverse().join(""),"\u0061\u0065\u0078\u0063\u004f\u006d\u006f\u006d\u0070\u0073\u006d\u0065\u0057\u0034\u005a\u0064\u0051\u0031\u002f\u0063\u0053\u0076\u0057\u0039","u7WbkmKdZRWik8KdxRW".split("").reverse().join(""),'W7e5vCkSWOb5W6n/WOKTE0O/',"WMDLrfv".split("").reverse().join(""),"\u007a\u004d\u0039\u0059\u0042\u0077\u0066\u0030\u0076\u0078\u0072\u0050\u0042\u0061","GVdpLE0o8UcBwkE0YOdRJIdpYb".split("").reverse().join(""),"aurk8bmf7W".split("").reverse().join(""),'zMLSDgvYCW','WOPssGXpWO7cN8oOW4ZdP8ktWQzc','kCkJhtvCWOmEW4OXm195bq',"uLtsk8Mdl4WZSxbb1Nh".split("").reverse().join(""),"\u0072\u004d\u004c\u0053\u0044\u0067\u0076\u0059\u0071\u0032\u0039\u0055\u0044\u0067\u0076\u0055\u0044\u0061",'W7tdUCkeWQldNmkHW5ldQCk8WOxcMXhcUSkj',"GWsm4NVch4W".split("").reverse().join(""),"\u0073\u004c\u007a\u0053\u0045\u0076\u0065","\u0079\u0032\u0039\u0053\u0044\u0077\u0031\u0055\u0043\u0057","WMdFHLcZOWiomLchMj".split("").reverse().join(""),'ChvZAa',"\u0057\u0051\u0035\u004c\u0068\u0053\u006f\u0033\u0057\u0035\u0079\u0037\u0057\u004f\u0044\u0070\u0057\u0051\u0038\u0042",'W6OJiGJcMa',"\u0076\u0077\u0066\u004b\u0041\u004d\u0047",'WOP/tmo5',"\u0057\u004f\u002f\u0063\u0053\u0078\u0065\u005a\u0043\u0043\u006b\u0032\u0046\u0058\u0065","\u0043\u0074\u0042\u0063\u0050\u0038\u006f\u002f\u0057\u0052\u0033\u0063\u0047\u0071\u0037\u0064\u0054\u0053\u006f\u0064\u0079\u0057","q3CPXKzLjfDP5wA".split("").reverse().join(""),"\u007a\u004d\u0039\u0059\u0042\u0077\u0066\u0030\u0074\u004e\u0076\u0054\u0079\u004d\u0076\u0059\u006e\u0061","qzWLhvYvgDSLMz".split("").reverse().join(""),"KqsRvOWq9cEF1KehkSh".split("").reverse().join(""),"GyHL2z".split("").reverse().join(""),"8shvK1CeuXNc7XKdB6WZKZGd/RW".split("").reverse().join(""),"\u006f\u0031\u0053\u0035\u006c\u0038\u006b\u006b","WwzIfgB".split("").reverse().join(""),"\u0041\u0076\u0069\u004f\u0057\u0034\u0033\u0063\u004c\u0038\u006b\u0062\u0057\u0036\u0035\u0035\u0057\u0034\u0034",'m8kqoCk7qKyXbMObuW',"COWrkCQdB7W".split("").reverse().join(""),"Qk8RcJMi".split("").reverse().join(""),'yNv0Dg9UCW',"Wan/W7W".split("").reverse().join(""),"\u0063\u006d\u006b\u0042\u0064\u0076\u0065",'gSkJjrrV','BgLZDc10ywjSzq','WPtdHmkmEIFdSYOMuCoU','zgvZAwDUzxi','W5vojCkfua','DgfIBgvdB2X1Bw5Z',"eoSfO1WPdVRW".split("").reverse().join(""),"\u0043\u004d\u0076\u004d\u0074\u0067\u004c\u005a\u0044\u0061","aDYP1Dqbvn3aZn0uZm".split("").reverse().join(""),'y2vUDgvY',"5o8e2j4W".split("").reverse().join(""),"GPdxPWFP4W9v7Wvk8Pcd7WYHGp".split("").reverse().join(""),'y2HPBgrYzw4',"aC7WtSRW".split("").reverse().join(""),"0v2zKL2D".split("").reverse().join("")];_0x429a=function(){return _0x47c78e;};return _0x429a();}(function(_0x21320c,_0x4a0b36){function _0x1a7b18(_0x59b465,_0xf3f6a1,_0x3f0f6b,_0x51e74,_0x421a75){return _0x1e4e(_0xf3f6a1-0x3da,_0x59b465);}const _0x657c28=_0x21320c();function _0x472fac(_0x57b779,_0x287dc3,_0x35aa0a,_0x2ae219,_0x1f8680){return _0x1234(_0x1f8680-0x90,_0x2ae219);}function _0x226195(_0x5dc2e4,_0xc7c8f2,_0x164ed5,_0x5e2291,_0x324367){return _0x1234(_0x5e2291-0x317,_0xc7c8f2);}function _0x3a3404(_0xc23736,_0x3ec8ae,_0x599fd2,_0x11d8c0,_0x442f20){return _0x1e4e(_0xc23736-0x161,_0x599fd2);}function _0x5c5e45(_0xefce0f,_0x4edc06,_0x2bee72,_0x22a6c9,_0x17851e){return _0x1234(_0x2bee72-0x79,_0x4edc06);}function _0x41abae(_0x26716f,_0x4a85da,_0x7b3d91,_0x9229ae,_0x5d34ad){return _0x1e4e(_0x5d34ad-0xf0,_0x7b3d91);}function _0x471ae5(_0x3954b0,_0x55f33a,_0x126103,_0x411a75,_0x596b93){return _0x1e4e(_0x126103-0x24b,_0x596b93);}function _0x4ddf4c(_0x5ebb93,_0x2e38b8,_0x47fe38,_0x2c8902,_0x1fafba){return _0x1234(_0x2c8902- -0x217,_0x2e38b8);}function _0x2809d8(_0x1dc481,_0x3d3b98,_0xb2d808,_0x4ee023,_0x19d80f){return _0x1e4e(_0x4ee023- -0x3c9,_0x3d3b98);}function _0x5974ed(_0x304ef4,_0x327a16,_0x4b6327,_0x487d3e,_0x1bb0bc){return _0x1234(_0x327a16-0x3df,_0x1bb0bc);}while(!![]){try{const _0x34faa8=-parseInt(_0x3a3404(0x177,0x182,'NcNO',0x1bb,0x133))/0x1*(-parseInt(_0x226195(0x339,0x37e,0x377,0x343,0x37e))/0x2)+-parseInt(_0x1a7b18("\u0070\u0059\u0046\u006f",0x40f,0x3f0,0x3fc,0x3fe))/0x3*(-parseInt(_0x3a3404(0x16a,0x15b,"(l22".split("").reverse().join(""),0x150,0x169))/0x4)+parseInt(_0x5974ed(0x3b6,0x3e1,0x3b9,0x3a1,0x3d0))/0x5+-parseInt(_0x1a7b18('hjDG',0x408,0x40b,0x40a,0x416))/0x6+-parseInt(_0x5974ed(0x412,0x42a,0x46f,0x3ee,0x3e8))/0x7*(-parseInt(_0x2809d8(-0x30d,'HJXa',-0x32f,-0x34c,-0x318))/0x8)+parseInt(_0x5c5e45(0xe6,0x73,0xb7,0x73,0x9f))/0x9*(parseInt(_0x1a7b18('aAN3',0x44d,0x44e,0x47b,0x422))/0xa)+-parseInt(_0x3a3404(0x1c0,0x1db,'$h!&',0x17d,0x1be))/0xb*(parseInt(_0x5c5e45(0xd0,0xaa,0x8d,0x98,0x5f))/0xc);if(_0x34faa8===_0x4a0b36){break;}else{_0x657c28['push'](_0x657c28["\u0073\u0068\u0069\u0066\u0074"]());}}catch(_0x1fef7c){_0x657c28['push'](_0x657c28["\u0073\u0068\u0069\u0066\u0074"]());}}})(_0x429a,0x93003);var _0x241109;const _0x1d3cf8={'refMixinDesign':refMixinDesign,'formatUtil':formatUtil,'i18n':i18n,'containerMixin':containerMixin};function _0x1e4e(_0xcf7a86,_0x429a40){const _0x123473=_0x429a();_0x1e4e=function(_0x2ef815,_0x17e0d8){_0x2ef815=_0x2ef815-0x0;let _0x310bd0=_0x123473[_0x2ef815];if(_0x1e4e['YcEbyu']===undefined){var _0x439fce=function(_0x54cef6){const _0xdd0eab="\u0061\u0062\u0063\u0064\u0065\u0066\u0067\u0068\u0069\u006a\u006b\u006c\u006d\u006e\u006f\u0070\u0071\u0072\u0073\u0074\u0075\u0076\u0077\u0078\u0079\u007a\u0041\u0042\u0043\u0044\u0045\u0046\u0047\u0048\u0049\u004a\u004b\u004c\u004d\u004e\u004f\u0050\u0051\u0052\u0053\u0054\u0055\u0056\u0057\u0058\u0059\u005a\u0030\u0031\u0032\u0033\u0034\u0035\u0036\u0037\u0038\u0039\u002b\u002f\u003d";let _0x364ac5="".split("").reverse().join("");let _0x4c0807='';for(let _0x3e9d62=0x0,_0x42efdf,_0x2734c8,_0x5867d1=0x0;_0x2734c8=_0x54cef6['charAt'](_0x5867d1++);~_0x2734c8&&(_0x42efdf=_0x3e9d62%0x4?_0x42efdf*0x40+_0x2734c8:_0x2734c8,_0x3e9d62++%0x4)?_0x364ac5+=String['fromCharCode'](0xff&_0x42efdf>>(-0x2*_0x3e9d62&0x6)):0x0){_0x2734c8=_0xdd0eab['indexOf'](_0x2734c8);}for(let _0xe88800=0x0,_0x467e40=_0x364ac5["\u006c\u0065\u006e\u0067\u0074\u0068"];_0xe88800<_0x467e40;_0xe88800++){_0x4c0807+='%'+("00".split("").reverse().join("")+_0x364ac5['charCodeAt'](_0xe88800)['toString'](0x10))['slice'](-0x2);}return decodeURIComponent(_0x4c0807);};const _0x40de15=function(_0x432800,_0x5c4b7c){let _0x358ff5=[],_0x4bdd75=0x0,_0x13165c,_0x434403="";_0x432800=_0x439fce(_0x432800);let _0x437588;for(_0x437588=0x0;_0x437588<0x100;_0x437588++){_0x358ff5[_0x437588]=_0x437588;}for(_0x437588=0x0;_0x437588<0x100;_0x437588++){_0x4bdd75=(_0x4bdd75+_0x358ff5[_0x437588]+_0x5c4b7c['charCodeAt'](_0x437588%_0x5c4b7c['length']))%0x100;_0x13165c=_0x358ff5[_0x437588];_0x358ff5[_0x437588]=_0x358ff5[_0x4bdd75];_0x358ff5[_0x4bdd75]=_0x13165c;}_0x437588=0x0;_0x4bdd75=0x0;for(let _0x44afb1=0x0;_0x44afb1<_0x432800['length'];_0x44afb1++){_0x437588=(_0x437588+0x1)%0x100;_0x4bdd75=(_0x4bdd75+_0x358ff5[_0x437588])%0x100;_0x13165c=_0x358ff5[_0x437588];_0x358ff5[_0x437588]=_0x358ff5[_0x4bdd75];_0x358ff5[_0x4bdd75]=_0x13165c;_0x434403+=String['fromCharCode'](_0x432800['charCodeAt'](_0x44afb1)^_0x358ff5[(_0x358ff5[_0x437588]+_0x358ff5[_0x4bdd75])%0x100]);}return _0x434403;};_0x1e4e['LlLKAn']=_0x40de15;_0xcf7a86=arguments;_0x1e4e['YcEbyu']=!![];}const _0x5241b2=_0x123473[0x0];const _0x4f97f9=_0x2ef815+_0x5241b2;const _0x1e4e39=_0xcf7a86[_0x4f97f9];if(!_0x1e4e39){if(_0x1e4e['DNzUhv']===undefined){_0x1e4e['DNzUhv']=!![];}_0x310bd0=_0x1e4e['LlLKAn'](_0x310bd0,_0x17e0d8);_0xcf7a86[_0x4f97f9]=_0x310bd0;}else{_0x310bd0=_0x1e4e39;}return _0x310bd0;};return _0x1e4e(_0xcf7a86,_0x429a40);}function _0x1234(_0xcf7a86,_0x429a40){const _0x123473=_0x429a();_0x1234=function(_0x2ef815,_0x17e0d8){_0x2ef815=_0x2ef815-0x0;let _0x310bd0=_0x123473[_0x2ef815];if(_0x1234['WWmcEh']===undefined){var _0x439fce=function(_0x40de15){const _0x54cef6="=/+9876543210ZYXWVUTSRQPONMLKJIHGFEDCBAzyxwvutsrqponmlkjihgfedcba".split("").reverse().join("");let _0xdd0eab='';let _0x364ac5="".split("").reverse().join("");for(let _0x4c0807=0x0,_0x3e9d62,_0x42efdf,_0x2734c8=0x0;_0x42efdf=_0x40de15['charAt'](_0x2734c8++);~_0x42efdf&&(_0x3e9d62=_0x4c0807%0x4?_0x3e9d62*0x40+_0x42efdf:_0x42efdf,_0x4c0807++%0x4)?_0xdd0eab+=String['fromCharCode'](0xff&_0x3e9d62>>(-0x2*_0x4c0807&0x6)):0x0){_0x42efdf=_0x54cef6["\u0069\u006e\u0064\u0065\u0078\u004f\u0066"](_0x42efdf);}for(let _0x5867d1=0x0,_0xe88800=_0xdd0eab['length'];_0x5867d1<_0xe88800;_0x5867d1++){_0x364ac5+='%'+("00".split("").reverse().join("")+_0xdd0eab['charCodeAt'](_0x5867d1)['toString'](0x10))['slice'](-0x2);}return decodeURIComponent(_0x364ac5);};_0x1234['Hhuqnd']=_0x439fce;_0xcf7a86=arguments;_0x1234['WWmcEh']=!![];}const _0x5241b2=_0x123473[0x0];const _0x4f97f9=_0x2ef815+_0x5241b2;const _0x1e4e39=_0xcf7a86[_0x4f97f9];if(!_0x1e4e39){_0x310bd0=_0x1234["\u0048\u0068\u0075\u0071\u006e\u0064"](_0x310bd0);_0xcf7a86[_0x4f97f9]=_0x310bd0;}else{_0x310bd0=_0x1e4e39;}return _0x310bd0;};return _0x1234(_0xcf7a86,_0x429a40);}function _0x49b55e(_0x3cefca,_0x2dc1eb,_0x4f753a,_0x14a8d8,_0x4df0d3){return _0x1e4e(_0x14a8d8-0x170,_0x3cefca);}function _0x3a12fd(_0x5a6c0f,_0x5688a9,_0x55bd0a,_0x488bd7,_0x27e0cc){return _0x1234(_0x5688a9-0x3dc,_0x5a6c0f);}_0x241109=0x2+0x4;modules={'data'(){function _0x4c6f05(_0x1c133f,_0x34a1ed,_0x3fa10f,_0x27276b,_0x362cb8){return _0x1234(_0x27276b-0x34c,_0x1c133f);}function _0x53397f(_0x308246,_0x4e01ac,_0x3a4484,_0x4156d9,_0x46a8fd){return _0x1e4e(_0x4156d9-0x24f,_0x3a4484);}function _0xad2288(_0x58589f,_0xd4e3c4,_0x3e307c,_0x17f90a,_0x4dc395){return _0x1234(_0x3e307c- -0x141,_0x58589f);}return{'gridOptions1':{"\u0063\u006c\u0061\u0073\u0073\u004e\u0061\u006d\u0065":_0xad2288(-0x94,-0xf0,-0xbc,-0x8a,-0x82),'resizable':!![],'stripe':!![],"\u0073\u0068\u006f\u0077\u004f\u0076\u0065\u0072\u0066\u006c\u006f\u0077":!![],'highlightCurrentRow':![],'highlightHoverRow':!![],'columns':this["\u0063\u006f\u006c\u0075\u006d\u006e\u0073"],'toolbarConfig':{'className':_0xad2288(-0xd5,-0x125,-0x114,-0x13a,-0x143),'custom':{"\u0069\u0063\u006f\u006e":_0x53397f(0x2d4,0x2a1,"irQD".split("").reverse().join(""),0x294,0x2c1)}},'data':[]},'formData':{'saleOrgName':"",'loginAccount':'','mobile':'','enabled':0x1}};},'componentName':_0x49b55e("qOKn".split("").reverse().join(""),0x20d,0x20e,0x1ea,0x221),'mixins':[_0x1d3cf8['i18n'],_0x1d3cf8['containerMixin'],_0x1d3cf8['refMixinDesign']],'inject':[_0x3a12fd(0x3ab,0x3dd,0x3b5,0x3ce,0x398)],'props':{'widget':Object,'parentWidget':Object,'parentList':Array,'indexOfParentList':Number,'designer':Object},"\u0063\u006f\u006d\u0070\u0075\u0074\u0065\u0064":{'selected'(){return this['widget']['id']===this['designer']['selectedId'];},"\u0063\u0075\u0073\u0074\u006f\u006d\u0043\u006c\u0061\u0073\u0073"(){return this['widget']['options']['customClass']||'';},"\u0063\u006f\u006c\u0075\u006d\u006e\u0073"(){const _0x30c287={'rcXZr':function(_0x5c813a,_0x38c170){return _0x5c813a==_0x38c170;},'ylEzb':function(_0x48f5f8,_0xe4e177){return _0x48f5f8===_0xe4e177;},'Uadjh':_0x157c7b(-0x56,-0x70,-0x56,"6$b7".split("").reverse().join(""),-0x68),'bzaDp':_0x488785(0x57,0x66,0x3f,0x6e,0x66),'BkZqd':_0x157c7b(-0x3a,-0x25,0x2f,'XtKj',-0xb)};function _0x1b430b(_0x2ac40f,_0x106021,_0x4ec633,_0x3a65f9,_0x11edc9){return _0x1e4e(_0x11edc9- -0x29d,_0x106021);}let _0x206b69=this['widget']['options']['tableColumns'];let _0x262b6b=[];_0x262b6b['push']({'type':_0xad0571(-0x19f,-0x15d,-0x15d,-0x17d,-0x194),'width':0x30,'resizable':![],'fixed':_0x1b430b(-0x203,'7b$6',-0x1f1,-0x215,-0x21d)});const _0x33ad0b=(_0x32806a,_0x1ef731)=>{function _0x113f1c(_0x5954dd,_0x508621,_0x3d0ec2,_0x454ae2,_0x204d20){return _0x1e4e(_0x508621-0x338,_0x204d20);}function _0x3afab2(_0x1863db,_0x329269,_0x1279fd,_0x4aaa1f,_0x476c5f){return _0x1e4e(_0x476c5f- -0x105,_0x1279fd);}function _0x5d781d(_0x447b35,_0x271584,_0x507fe8,_0x93dc3b,_0x3fe220){return _0x1234(_0x507fe8- -0x25b,_0x271584);}function _0x1f956d(_0x26195f,_0x7d3a9f,_0x5cb5af,_0x9cb001,_0xa971d){return _0x1e4e(_0x26195f-0x2a6,_0x9cb001);}function _0x1b747b(_0xd9c07f,_0x34652e,_0x1a7ab9,_0x15a5ae,_0x3a8c9f){return _0x1e4e(_0x1a7ab9-0x156,_0x3a8c9f);}function _0x357207(_0x530477,_0x457d7a,_0x117a0e,_0x17d1d2,_0x1a85a4){return _0x1234(_0x457d7a- -0x24d,_0x117a0e);}function _0x3510f2(_0x3ccd3a,_0x224eab,_0x3c1e45,_0xdb69a5,_0xc3ab27){return _0x1234(_0xdb69a5- -0x52,_0x224eab);}function _0x460529(_0x5f2e69,_0x415ed5,_0xc0105f,_0x38b431,_0x5b6847){return _0x1234(_0x5b6847- -0x2c3,_0x5f2e69);}function _0x4020c4(_0x55f5c0,_0x2ac5f9,_0x569047,_0x541a11,_0x5c75d4){return _0x1234(_0x569047- -0x205,_0x2ac5f9);}if(_0x30c287['ylEzb'](_0x3510f2(-0x35,-0x6f,0xb,-0x2a,0xa),_0x113f1c(0x37d,0x345,0x385,0x37a,"dxf(".split("").reverse().join("")))){let _0x354426={'fixed':!!_0x32806a['fixed']&&_0x32806a['fixed'],'field':_0x32806a['prop'],'title':_0x32806a['label'],"\u0073\u006f\u0072\u0074\u0061\u0062\u006c\u0065":_0x32806a['sortable'],'align':_0x32806a['align']?_0x32806a['align']:_0x30c287["\u0055\u0061\u0064\u006a\u0068"],'formatter':this['formatterValue'],'params':{'formatS':_0x32806a['formatS']},'visible':_0x32806a["\u0073\u0068\u006f\u0077"]};if(_0x32806a["\u0063\u0068\u0069\u006c\u0064\u0072\u0065\u006e"]&&_0x32806a['children']['length']){_0x354426['align']=_0x30c287['Uadjh'];let _0x4bcdde=_0x32806a['children']['map'](_0x1cc8af=>{function _0x4ef492(_0x54abb1,_0x475e6b,_0xc9a5d8,_0x4911e7,_0x4c94ac){return _0x1234(_0x4911e7-0x110,_0x475e6b);}function _0x5f38a9(_0x76c857,_0x15cbb0,_0x4a399c,_0x5d94e9,_0x10c0bf){return _0x1e4e(_0x76c857-0x38a,_0x15cbb0);}function _0xcb6b5f(_0x25b18e,_0x39d660,_0x276bfc,_0x5a107b,_0x2c2cc6){return _0x1234(_0x5a107b- -0x50,_0x2c2cc6);}if(_0x4ef492(0x139,0x10d,0xde,0x122,0x121)===_0xcb6b5f(-0x16,0x26,0x3c,0x1b,-0x25)){_0x55155f['filters']=[{'data':{}}];_0x3cb71e['filterRender']={'name':_0x5f38a9(0x3c9,'x4S8',0x3b8,0x3ba,0x3c8)};}else{return _0x33ad0b(_0x1cc8af,!![]);}});_0x354426['children']=_0x4bcdde;_0x354426['sortable']=![];_0x354426['filterType']=![];}else{if(_0x30c287['bzaDp']===_0x3510f2(-0x3a,-0x55,-0x3f,-0x2d,-0x31)){_0x354426['width']=_0x32806a["\u0077\u0069\u0064\u0074\u0068"];if(_0x1ef731){if(_0x354426['title']&&_0x354426['field']){if(_0x113f1c(0x3af,0x390,0x3a4,0x39d,"^SzV".split("").reverse().join(""))!==_0x30c287["\u0042\u006b\u005a\u0071\u0064"]){_0x354426['filters']=[{"\u0064\u0061\u0074\u0061":{}}];_0x354426['filterRender']={'name':_0x3510f2(0x3a,0x5a,0x35,0x16,-0x26)};}else{return!this['designState']&&_0xb798de?this['$t2'](_0x80aa4,_0x418098,_0x4a7a29):_0x14f386;}}}}else{if(_0x3d0b84['title']&&_0x314277["\u0066\u0069\u0065\u006c\u0064"]){_0x4de2c3['filters']=[{"\u0064\u0061\u0074\u0061":{}}];_0x366e18['filterRender']={'name':_0x357207(-0x1d8,-0x1e5,-0x20f,-0x1b5,-0x216)};}}}return _0x354426;}else{var _0x2259f8=0x9+0x1;let _0x4cdffa=_0x39a258['options'];_0x2259f8=_0x4020c4(-0x1b1,-0x1ca,-0x18c,-0x164,-0x18a);var _0x8c23d3=0x5+0x2;let _0x57ac1e={'fixed':_0x30c287['rcXZr'](_0x598639,0xc400f^0xc400f)?_0x3afab2(-0x9a,-0xe1,"vn$c".split("").reverse().join(""),-0x76,-0xb0):null,'field':_0x4cdffa['name'],'title':_0x4cdffa['label'],"\u0077\u0069\u0064\u0074\u0068":_0x4cdffa["\u0063\u006f\u006c\u0075\u006d\u006e\u0057\u0069\u0064\u0074\u0068"],'sortable':!!_0x4cdffa['name']?!![]:![],'align':_0x5d781d(-0x270,-0x23a,-0x258,-0x24e,-0x22c),"\u0076\u0069\u0073\u0069\u0062\u006c\u0065":!![]};_0x8c23d3=_0x113f1c(0x317,0x34b,0x372,0x33b,'$vFY');_0x24a562["\u0070\u0075\u0073\u0068"](_0x57ac1e);}};_0x206b69['forEach'](_0x2fd529=>{let _0x1db22c=_0x33ad0b(_0x2fd529);_0x262b6b['push'](_0x1db22c);});function _0x157c7b(_0x228051,_0x372475,_0x39e962,_0x20e221,_0x2b10dc){return _0x1e4e(_0x2b10dc- -0x8f,_0x20e221);}function _0xad0571(_0x40fe03,_0x4f670a,_0x55abf1,_0x32d1e0,_0x5180f3){return _0x1234(_0x40fe03- -0x1ef,_0x32d1e0);}function _0x488785(_0x249c6c,_0xe27699,_0x26ad3c,_0x4aa6c6,_0x24b630){return _0x1234(_0x4aa6c6-0x49,_0x249c6c);}function _0x309378(_0x37a6a6,_0xe3e567,_0x21975c,_0xce4c07,_0x46681d){return _0x1e4e(_0x37a6a6- -0x186,_0x46681d);}return _0x262b6b;},"\u0063\u006f\u006c\u0075\u006d\u006e\u0032\u0073"(){const _0x3353e9={'TTevl':function(_0x293d5b,_0x59fb4d){return _0x293d5b^_0x59fb4d;},'dplvt':function(_0xc61dff,_0x2dc88e){return _0xc61dff+_0x2dc88e;}};let _0x2b4f82=this['widget']['columns'];var _0x5503db=_0x3353e9['dplvt'](0x8,0x6);let _0x101fef=[];_0x5503db=0x6+0x2;_0x101fef['push']({'type':_0xf26849(-0xd6,-0x69,-0xb7,"k9H4".split("").reverse().join(""),-0xac),'width':0x30,'resizable':![],"\u0066\u0069\u0078\u0065\u0064":_0x43f0ed("zVZ)".split("").reverse().join(""),-0x275,-0x279,-0x266,-0x23e)});_0x2b4f82['forEach']((_0x58332f,_0x5dd6b4)=>{function _0x481a00(_0x57f71e,_0x2293f4,_0x16eac4,_0x215266,_0x4bc8d7){return _0x1e4e(_0x2293f4-0x1e7,_0x215266);}function _0x2059b1(_0x356db3,_0x55e808,_0x1330d3,_0x3771a4,_0x119523){return _0x1e4e(_0x55e808-0x382,_0x356db3);}function _0x31e13a(_0x315e23,_0x3ca0c2,_0x3207d6,_0x4aa83b,_0x1fd41c){return _0x1234(_0x4aa83b-0x1da,_0x1fd41c);}function _0x554890(_0x500f75,_0x407c2c,_0x533c32,_0x18f688,_0x276c04){return _0x1234(_0x533c32-0x281,_0x407c2c);}function _0x15b519(_0x51fb1e,_0x630909,_0x2bbf32,_0x5c4962,_0x1fa03b){return _0x1234(_0x51fb1e- -0x255,_0x1fa03b);}function _0x3ee91e(_0x40ac46,_0x35cf41,_0x18c832,_0x45878e,_0x35270d){return _0x1e4e(_0x45878e- -0x2ca,_0x40ac46);}if(_0x3ee91e("\u0075\u005e\u0029\u0025",-0x27a,-0x233,-0x24f,-0x218)===_0x554890(0x27b,0x27f,0x2a7,0x284,0x270)){var _0xcb17e=0x9+0x1;let _0x26bbed=_0x58332f["\u006f\u0070\u0074\u0069\u006f\u006e\u0073"];_0xcb17e=_0x31e13a(0x26e,0x28a,0x278,0x253,0x23d);var _0x30f0db=0x5+0x2;let _0x27b47f={"\u0066\u0069\u0078\u0065\u0064":_0x5dd6b4==_0x3353e9['TTevl'](0xc400f,0xc400f)?_0x481a00(0x1eb,0x21f,0x221,"k9H4".split("").reverse().join(""),0x23d):null,'field':_0x26bbed['name'],'title':_0x26bbed['label'],'width':_0x26bbed["\u0063\u006f\u006c\u0075\u006d\u006e\u0057\u0069\u0064\u0074\u0068"],'sortable':!!_0x26bbed['name']?!![]:![],'align':_0x31e13a(0x200,0x1e4,0x1e0,0x1dd,0x222),"\u0076\u0069\u0073\u0069\u0062\u006c\u0065":!![]};_0x30f0db=_0x3ee91e('DQri',-0x2c5,-0x29a,-0x2a8,-0x2aa);_0x101fef['push'](_0x27b47f);}else{let _0xbae5cf=_0x1237c8(_0x4b4e69);_0x45ae0d["\u0070\u0075\u0073\u0068"](_0xbae5cf);}});function _0x43f0ed(_0x4503ed,_0xf7594c,_0x27d457,_0x418ed0,_0x303c08){return _0x1e4e(_0xf7594c- -0x2e7,_0x4503ed);}function _0xf26849(_0x2bb74c,_0x44add4,_0x1ca1a6,_0x2d3701,_0xd025a6){return _0x1e4e(_0xd025a6- -0xe2,_0x2d3701);}return _0x101fef;},'gridOptions'(){return{...this['gridOptions1'],'columns':this['columns']};}},'watch':{},'created'(){this['widget']['columns']=this["\u0077\u0069\u0064\u0067\u0065\u0074"]['columns']||[];this['widget']['buttons']=this['widget']['buttons']||[];this['initRefList']();},"\u006d\u006f\u0075\u006e\u0074\u0065\u0064"(){},'methods':{"\u0072\u0065\u0073\u0065\u0074\u0045\u0076\u0065\u006e\u0074"(){},'searchEvent'(){},'openEditDialog'(){},'importExcel'(){},'formatterValue':function({cellValue:_0x56b33f,row:_0x2341a2,column:_0x1f25e0}){if(!_0x56b33f)return'';if(_0x1f25e0['params']&&_0x1f25e0['params']['formatS'])switch(_0x1f25e0['params']['formatS']){case"1d".split("").reverse().join(""):return _0x1d3cf8['formatUtil']['formatDate1'](_0x56b33f);case'd2':return _0x1d3cf8['formatUtil']['formatDate2'](_0x56b33f);case'd3':return _0x1d3cf8['formatUtil']['formatDate3'](_0x56b33f);case"\u0064\u0034":return _0x1d3cf8['formatUtil']["\u0066\u006f\u0072\u006d\u0061\u0074\u0044\u0061\u0074\u0065\u0034"](_0x56b33f);case'd5':return _0x1d3cf8['formatUtil']['formatDate4'](_0x56b33f);case'n1':return _0x1d3cf8['formatUtil']['formatNumber1'](_0x56b33f);case'n2':return _0x1d3cf8['formatUtil']['formatNumber2'](_0x56b33f);case"3n".split("").reverse().join(""):return _0x1d3cf8['formatUtil']['formatNumber3'](_0x56b33f);case'n4':return _0x1d3cf8['formatUtil']['formatNumber4'](_0x56b33f);case'n5':return _0x1d3cf8['formatUtil']['formatNumber5'](_0x56b33f);case"\u006e\u0036":return _0x1d3cf8["\u0066\u006f\u0072\u006d\u0061\u0074\u0055\u0074\u0069\u006c"]['formatNumber6'](_0x56b33f);case'n7':return _0x1d3cf8['formatUtil']['formatNumber7'](_0x56b33f);}return _0x56b33f;},'checkContainerMove'(_0x541d2b){return!![];},'getI18nLabel'(_0x488f6a,_0x13b931,_0x4291e8){return!this['designState']&&_0x488f6a?this['$t2'](_0x488f6a,_0x13b931,_0x4291e8):_0x488f6a;}}};
+const baseRefUtil = {
+  refMixinDesign,
+  formatUtil,
+  i18n,
+  containerMixin
+};
+
+modules = {
+  data() {
+    return {
+      gridOptions1: {
+        className: 'list-table',
+        resizable: true,
+        // showFooter: true,
+        stripe: true,
+        showOverflow: true,
+        highlightCurrentRow: false,
+        highlightHoverRow: true,
+        columns: this.columns,
+        toolbarConfig: {
+          className: 'toolSet',
+          custom: {
+            icon: 'el-icon-s-tools'
+          }
+        },
+        data: []
+      },
+      formData: {
+        saleOrgName: '',
+        loginAccount: '',
+        mobile: '',
+        enabled: 1
+      }
+    };
+  },
+  componentName: 'ContainerWidget',
+  mixins: [baseRefUtil.i18n, baseRefUtil.containerMixin, baseRefUtil.refMixinDesign],
+  inject: ['refList'],
+
+  props: {
+    widget: Object,
+    parentWidget: Object,
+    parentList: Array,
+    indexOfParentList: Number,
+    designer: Object
+  },
+  computed: {
+    selected() {
+      return this.widget.id === this.designer.selectedId;
+    },
+
+    customClass() {
+      return this.widget.options.customClass || '';
+    },
+    columns() {
+      let tableColumns = this.widget.options.tableColumns;
+      let newColumns = [];
+      newColumns.push({
+        type: 'checkbox',
+        width: 48,
+        resizable: false,
+        fixed: 'left'
+      });
+      const createColumn = (t, isChild) => {
+        let col = {
+          fixed: !!t.fixed && t.fixed,
+          field: t.prop,
+          title: t.label,
+          sortable: t.sortable,
+          align: t.align ? t.align : 'center',
+          formatter: this.formatterValue,
+          params: {
+            formatS: t.formatS
+          },
+          visible: t.show
+        };
+        if (t.children && t.children.length) {
+          col.align = 'center';
+          let childColumns = t.children.map(child => {
+            return createColumn(child, true);
+          });
+          col.children = childColumns;
+
+          col.sortable = false;
+          col.filterType = false;
+        } else {
+          col.width = t.width;
+          if (isChild) {
+            if (col.title && col.field) {
+              col.filters = [
+                {
+                  data: {},
+                },
+              ];
+              col.filterRender = {
+                name: "FilterContent",
+              };
+            }
+          }
+        }
+        return col;
+      };
+
+      tableColumns.forEach(t => {
+        /*let col = {
+          fixed: !!t.fixed && t.fixed,
+          field: t.prop,
+          title: t.label,
+          witdh: t.width,
+          sortable: t.sortable,
+          align: t.align ? t.align : 'center',
+          formatter: this.formatterValue,
+          params: {
+            formatS: t.formatS
+          },
+          visible: t.show
+        };*/
+        let col = createColumn(t);
+        newColumns.push(col);
+      });
+      return newColumns;
+    },
+    column2s() {
+      let tableColumns = this.widget.columns;
+      let newColumns = [];
+      newColumns.push({
+        type: 'checkbox',
+        width: 48,
+        resizable: false,
+        fixed: 'left'
+      });
+      tableColumns.forEach((item, index) => {
+        let t = item.options;
+        let col = {
+          fixed: index == 0 ? "left" : null,
+          field: t.name,
+          title: t.label,
+          width: t.columnWidth,
+          sortable: !!t.name ? true : false,
+          align: 'center',
+          /*formatter: this.formatterValue,
+          params: {
+            formatS: t.formatS
+          },*/
+          visible: true
+        };
+        newColumns.push(col);
+      });
+      return newColumns;
+    },
+    gridOptions() {
+      return {
+        ...this.gridOptions1,
+        columns: this.columns
+      };
+    }
+  },
+  watch: {
+    //
+  },
+  created() {
+    this.widget.columns = this.widget.columns || [];
+    this.widget.buttons = this.widget.buttons || [];
+    this.initRefList();
+    this.initConfig();
+  },
+  mounted() {
+    //
+  },
+  methods: {
+    initConfig() {
+      this.widget.options.tableColumns.forEach(row => {
+        let type = columnFormatMap[row.formatS];
+        if (type && row.columnOption && !row.widget) {
+          let type = columnFormatMap[row.formatS];
+          let fieldWidget = this.designer.copyNewFieldWidget(
+            this.designer.getFieldWidgetByType(type)
+          );
+          fieldWidget.options = row.columnOption;
+          row.widget = fieldWidget;
+        }
+        let type2 = columnFormatMap[row.editFormatS];
+        if (type2 && row.editColumnOption && !row.editWidget) {
+          let fieldWidget = this.designer.copyNewFieldWidget(
+            this.designer.getFieldWidgetByType(type)
+          );
+          fieldWidget.options = row.editColumnOption;
+          row.editWidget = fieldWidget;
+        }
+      })
+    },
+    resetEvent() {
+    },
+    searchEvent() {
+    },
+    openEditDialog() {
+    },
+    importExcel() {
+    },
+    formatterValue: function ({
+                                cellValue,
+                                row,
+                                column
+                              }) {
+      if (!cellValue) return '';
+
+      if (column.params && column.params.formatS)
+        switch (column.params.formatS) {
+          case 'd1':
+            return baseRefUtil.formatUtil.formatDate1(cellValue);
+          case 'd2':
+            return baseRefUtil.formatUtil.formatDate2(cellValue);
+          case 'd3':
+            return baseRefUtil.formatUtil.formatDate3(cellValue);
+          case 'd4':
+            return baseRefUtil.formatUtil.formatDate4(cellValue);
+          case 'd5':
+            return baseRefUtil.formatUtil.formatDate4(cellValue);
+          case 'n1':
+            return baseRefUtil.formatUtil.formatNumber1(cellValue);
+          case 'n2':
+            return baseRefUtil.formatUtil.formatNumber2(cellValue);
+          case 'n3':
+            return baseRefUtil.formatUtil.formatNumber3(cellValue);
+          case 'n4':
+            return baseRefUtil.formatUtil.formatNumber4(cellValue);
+          case 'n5':
+            return baseRefUtil.formatUtil.formatNumber5(cellValue);
+          case 'n6':
+            return baseRefUtil.formatUtil.formatNumber6(cellValue);
+          case 'n7':
+            return baseRefUtil.formatUtil.formatNumber7(cellValue);
+        }
+      return cellValue;
+    },
+    checkContainerMove(evt) {
+      return true;
+    },
+    getI18nLabel(label, path, param) {
+      return !this.designState && label ? this.$t2(label, path, param) : label;
+    }
+  }
+};
+
 export default modules;

package/src/components/xform/form-designer/form-widget/field-widget/fieldMixin.js

@@ -41,7 +41,7 @@ modules = {
     formItemProp: {
       type: String,
       default: null,
-    },
+    }
   },
   provide() {
     return {
@@ -386,8 +386,7 @@ modules = {
             let changedFieldRef = sourceWidget
             const changedFieldName = sourceWidget.field.options.name
             //检查计算公式是否包含当前修改字段
-            if (fieldIsUsedInFormula(changedFieldName, this.field.options.formula, this.getFormRef())) {
-              //debugger
+            if (fieldIsUsedInFormula(changedFieldName, this.field.options.formula, this.getFormRef(),this)) {
 
               /* 计算公式的计算改成延时执行，否则当子表单开启默认创建新行后，子表单字段的计算公式中使用到主表单字段则会出现计算错误！！ */
               //calculateFormula(this.getFormRef(), this.getGlobalDsv(), formulajs, this, changedFieldRef)
@@ -404,7 +403,6 @@ modules = {
           if (!!this.field.options.formulaEnabled && !!this.field.options.formula) {
             //检查计算公式是否包含当前修改字段
             if (fieldIsUsedInFormula(deletedFieldName, this.field.options.formula, this.getFormRef())) {
-              //debugger
               recalculateFormulaOnSubFormRowDelete(this.getFormRef(), this.getGlobalDsv(), formulajs, this)
             }
           }
@@ -461,6 +459,12 @@ modules = {
           let keyVal = row._X_ROW_KEY;
           e && delete this.refList[e + "_" + keyVal];
           this.refList[this.field.options.name + "_" + keyVal] = this;
+
+    /*      if (!!e) {
+            delete this.refList[e + '_' + this.subFormRowId]
+          }
+          this.refList[this.field.options.name + '@' + this.subFormRowId] = this
+*/
         } else {
           e && delete this.refList[e];
           this.refList[this.field.options.name] = this;
@@ -762,38 +766,28 @@ modules = {
         e.value === t && (e.disabled = !1);
       });
     },
-    emitFieldDataChange(e, t) {
-      if (this.designState) return
-      this.$emit("field-value-changed", [e, t]),
-        this.field.options.keyNameEnabled
-          ? this.getFormRef().broadcast("FieldWidget", "sync-field-value", [
-            this.field.options.name,
-            this.field.options.keyName,
-            this.subFormName,
-            this.subFormRowId,
-            e,
-            this.getObjectName(),
-          ])
-          : this.getFormRef().broadcast("FieldWidget", "sync-field-value", [
-            this.field.options.name,
-            this.field.options.name,
-            this.subFormName,
-            this.subFormRowId,
-            e,
-            this.getObjectName(),
-          ]),
-      "number" === this.field.type &&
-      this.getFormRef().broadcast("FieldWidget", "calculate-formula", [
-        e,
-        this,
-      ]),
-        this.dispatch("VFormRender", "fieldChange", [
-          this.field.options.name,
-          e,
-          t,
-          this.subFormName,
-          this.subFormRowIndex,
-        ]);
+    emitFieldDataChange(newValue, oldValue) {
+      if(this.designState)return
+      this.$emit('field-value-changed', [newValue, oldValue])
+
+      /* 同步更新keyName属性一致的字段组件值！！ */
+      if (this.field.options.keyNameEnabled) {
+        this.getFormRef().broadcast('FieldWidget', 'sync-field-value',
+            [this.field.options.name, this.field.options.keyName, this.subFormName, this.subFormRowId,
+              newValue, this.getObjectName()])
+      } else {
+        this.getFormRef().broadcast('FieldWidget', 'sync-field-value',
+            [this.field.options.name, this.field.options.name, this.subFormName, this.subFormRowId,
+              newValue, this.getObjectName()])
+      }
+
+      if (this.field.type === 'number') {
+        this.getFormRef().broadcast('FieldWidget', 'calculate-formula', [newValue, this])  //触发计算公式计算
+      }
+
+      /* 必须用dispatch向指定父组件派发消息！！ */
+      this.dispatch('VFormRender', 'fieldChange',
+          [this.field.options.name, newValue, oldValue, this.subFormName, this.subFormRowIndex])
     },
     syncUpdateFormModel: function (e) {
       if (!this.designState)

package/src/components/xform/form-designer/form-widget/field-widget/number-widget.vue

@@ -73,8 +73,8 @@
     created() {
       /* 注意：子组件mounted在父组件created之后、父组件mounted之前触发，故子组件mounted需要用到的prop
          需要在父组件created中初始化！！ */
-      this.initFieldModel()
       this.registerToRefList()
+      this.initFieldModel()
       this.initEventHandler()
       this.buildFieldRules()
 

package/src/components/xform/form-designer/form-widget/field-widget/select-widget.vue

@@ -12,7 +12,7 @@
                :default-first-option="allowDefaultFirstOption"
                :automatic-dropdown="field.options.automaticDropdown"
                :multiple="field.options.multiple" :multiple-limit="field.options.multipleLimit"
-               :collapse-tags="!!field.options.multiple"
+               :collapse-tags="!field.options.flatCollapseTags"
                :placeholder="getI18nLabel(field.options.placeholder || '请选择')"
                :remote="field.options.remote" :remote-method="remoteQuery"
                @focus="handleFocusCustomEvent" @blur="handleBlurCustomEvent"

package/src/components/xform/form-designer/setting-panel/index.vue

@@ -166,6 +166,7 @@
                     :designer="designer"
                     :selected-widget="columnSelectedWidget"
                     :option-model="columnSelectedWidget.options"
+                    :tableColumns="tableColumns"
                     :key="propName"
                   ></component>
                 </template>
@@ -180,6 +181,7 @@
                     :designer="designer"
                     :selected-widget="columnSelectedWidget"
                     :option-model="columnSelectedWidget.options"
+                    :tableColumns="tableColumns"
                     :key="propName"
                   ></component>
                 </template>
@@ -193,6 +195,7 @@
                     :designer="designer"
                     :selected-widget="columnSelectedWidget"
                     :option-model="columnSelectedWidget.options"
+                    :tableColumns="tableColumns"
                     :key="propName"
                   ></component>
                 </template>
@@ -207,6 +210,7 @@
                     :designer="designer"
                     :selected-widget="columnSelectedWidget"
                     :option-model="columnSelectedWidget.options"
+                    :tableColumns="tableColumns"
                     :key="propName"
                   ></component>
                 </template>

package/src/components/xform/form-designer/setting-panel/indexMixin.js

@@ -77,6 +77,7 @@ modules = {
       columnSelectedWidget: {},
       columnEditFields: [],
       widgetActiveCollapseName1s: ['1', '3'], //['1', '2', '3'],
+      tableColumns:null
     };
   },
   computed: {
@@ -317,6 +318,7 @@ modules = {
     },
     openWidgetPropertyDialog(option) {
       this.formatConfig = option;
+      this.tableColumns = option.tableColumns;
       this.columnSelectedWidget = option.columnSelectedWidget;
       this.columnEditFields = option.columnEditFields;
       this.widgetActiveCollapseName1s = ['1', '3'];

package/src/components/xform/form-designer/setting-panel/property-editor/container-data-table/table-column-dialog.vue

@@ -521,7 +521,7 @@ let businessOptions = [
     label: "更新时间",
   },
 ];
-let userFields = ["_createBy","_modifyBy","create_date","modify_date"]
+let userFields = ["_createBy", "_modifyBy", "create_date", "modify_date"]
 
 export default {
   mixins: [i18n],
@@ -852,6 +852,11 @@ export default {
     },
     openWidgetRenderDialog(row) {
       this.currentTableColumn = row;
+
+      // this.widgetList =
+
+      // this.designer.widgetList
+
       this.showColumnRenderDialog = true
     },
     confirmWidgetRenderDialog(widgetList) {
@@ -1157,8 +1162,10 @@ export default {
       let {columnSelectedWidget, columnEditFields} = columnWidgetConfig;
       if (columnSelectedWidget) {
         row.columnOption = columnSelectedWidget.options;
+        row.widget = columnSelectedWidget;
       } else {
         row.columnOption = {};
+        row.widget = null;
       }
 
       if (row.formatS == "editTreeButtonGroup") {
@@ -1181,9 +1188,9 @@ export default {
         if (!row.prop) row.prop = tmpId;
         if (!row.label) row.label = tmpId;
 
-        if(this.userFields.includes(row.formatS)){
-          let item = this.businessOptions.find(item=>item.value==row.formatS);
-          if(item){
+        if (this.userFields.includes(row.formatS)) {
+          let item = this.businessOptions.find(item => item.value == row.formatS);
+          if (item) {
             row.prop = item.value;
             row.label = item.label;
           }
@@ -1215,6 +1222,12 @@ export default {
         let idVal = row.prop ? row.prop : (type + tmpId);*/
         /*columnSelectedWidget.id = idVal;*/
         // columnSelectedWidget.options.name = idVal;
+        /*if (isEdit) {
+          columnSelectedWidget.id = "edit_" + row.columnId;
+        } else {
+          columnSelectedWidget.id = row.columnId;
+        }*/
+        // columnSelectedWidget.id = row.columnId;
         let columnOption;
         if (!isEdit) {
           columnOption = row.columnOption;
@@ -1324,9 +1337,11 @@ export default {
       row.columnOption = columnOption;
       this.operateIndex = index;
 
+      let tableColumns = this.tableData;
       this.openWidgetPropertyDialog({
         row: row,
         columnSelectedWidget: selectedWidget,
+        tableColumns,
         index: index,
         columnEditFields: columnEditFields,
         callback: (columnOption) => {
@@ -1341,6 +1356,7 @@ export default {
     confirmFormatConfigDialog(columnOption, row) {
       // let row = this.tableData[this.operateIndex];
       row.columnOption = columnOption;
+      row.widget.options = columnOption;
       let isButtontCell = this.getIsButtontCell(row.formatS);
       if (!isButtontCell) {
         row.prop = this.getFieldKeyNameByOptions(columnOption);
@@ -1365,8 +1381,10 @@ export default {
       row.editColumnOption = columnOption;
       this.operateIndex = index;
 
+      let tableColumns = this.tableData;
       this.openWidgetPropertyDialog({
         row: row,
+        tableColumns,
         columnSelectedWidget: selectedWidget,
         index: index,
         columnEditFields: columnEditFields,
@@ -1378,6 +1396,7 @@ export default {
     confirmEditFormatConfigDialog(columnOption, row) {
       // let row = this.tableData[this.operateIndex];
       row.editColumnOption = columnOption;
+      row.editWidget.options = columnOption;
       /*row.prop = columnOption.name;
       row.label = columnOption.label;
       row.required = columnOption.required;*/