Merge branch 'bugfix/保存标签' into master

dist/static/js/41.59ce7cc086a0fd5ccdfa.js

+webpackJsonp([41],{"9ZvA":function(e,t,a){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var l={name:"recommend-table",props:{data:Array},data:function(){return{tableData:[]}},watch:{data:{immediate:!0,handler:function(e){this.tableData=e}}},methods:{createMemberGroup:function(e){console.log(e)}}},n={render:function(){var e=this,t=e.$createElement,a=e._self._c||t;return a("el-table",{attrs:{data:e.tableData}},[a("el-table-column",{attrs:{label:"查看详情",type:"expand",width:"200"}}),e._v(" "),a("el-table-column",{attrs:{prop:"groupName",label:"分组名称"}}),e._v(" "),a("el-table-column",{attrs:{prop:"describle",label:"分组描述"}}),e._v(" "),a("el-table-column",{attrs:{label:"操作"},scopedSlots:e._u([{key:"default",fn:function(t){return[a("el-button",{attrs:{type:"text"},on:{click:function(a){return e.createMemberGroup(t)}}},[e._v("创建会员分组")])]}}])})],1)},staticRenderFns:[]},r=a("VU/8")(l,n,!1,null,null,null);t.default=r.exports}});
\ No newline at end of file

dist/static/js/42.22bb97fdb8af2923fd97.js

+webpackJsonp([42],{FNcP:function(e,t,r){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var i={render:function(){var e=this.$createElement,t=this._self._c||e;return t("dm-layout",{attrs:{"project-name":"report"}},[t("keep-alive",[this.$route.meta.keepAlive?t("router-view",{key:this.$route.fullPath}):this._e()],1),this._v(" "),this.$route.meta.keepAlive?this._e():t("router-view")],1)},staticRenderFns:[]},l=r("VU/8")({name:"layout"},i,!1,null,null,null);t.default=l.exports}});
\ No newline at end of file

dist/static/js/manifest.de922f03a786b24e0440.js

+!function(e){var c=window.webpackJsonp;window.webpackJsonp=function(f,n,r){for(var b,t,o,i=0,u=[];i<f.length;i++)t=f[i],a[t]&&u.push(a[t][0]),a[t]=0;for(b in n)Object.prototype.hasOwnProperty.call(n,b)&&(e[b]=n[b]);for(c&&c(f,n,r);u.length;)u.shift()();if(r)for(i=0;i<r.length;i++)o=d(d.s=r[i]);return o};var f={},a={45:0};function d(c){if(f[c])return f[c].exports;var a=f[c]={i:c,l:!1,exports:{}};return e[c].call(a.exports,a,a.exports,d),a.l=!0,a.exports}d.e=function(e){var c=a[e];if(0===c)return new Promise(function(e){e()});if(c)return c[2];var f=new Promise(function(f,d){c=a[e]=[f,d]});c[2]=f;var n=document.getElementsByTagName("head")[0],r=document.createElement("script");r.type="text/javascript",r.charset="utf-8",r.async=!0,r.timeout=12e4,d.nc&&r.setAttribute("nonce",d.nc),r.src=d.p+"static/js/"+e+"."+{0:"c1359928ca314df25577",1:"a5b1143fb090193afa6f",2:"81ae51850d0337c4d78b",3:"d4bb4f9e07caaa0a6919",4:"94f1cd605b71e8deb937",5:"4d3364055ca671c32e2d",6:"93156f192f172df19366",7:"ca53016e7e58fc644c0b",8:"0ee171376d4ff4853265",9:"6745d9c9726c50323c7f",10:"b3e0655ae069b2914dce",11:"68de4b03e2b8ab158b45",12:"6d3ccc08185b5616c66d",13:"c722b2027cede6fbcb1e",14:"d03d62ff000415cfc27a",15:"c92c22445248bd4a4d81",16:"39377a8da57579f55943",17:"7fc06d9a260a3731587e",18:"2e5b028cddbfbe797ced",19:"e8301baec07c0e3bd2bd",20:"cecda60b00b6bddc363b",21:"de8f817eef7159f77ade",22:"1a3f8aaed881bd6b641b",23:"f9901700d68e8164c0cf",24:"207519235f04ba4c8c28",25:"41bef842ecf428d6e38a",26:"2997b01bd67ae24fbddb",27:"1c6697b57efbfbecc2af",28:"7763ee5cbe6b03d34549",29:"50e7f1ba3f72a75287b2",30:"01f0ad49b9e9c6c09e87",31:"36f07ba4af45385db792",32:"6cb39db35ea2b6ae26c0",33:"2a3f5e32efc1efa226bc",34:"79eecbc8c5c55d25377e",35:"f6c7eb27d91ddb250e6d",36:"760855f1225cc7c241cf",37:"1235370e5f74f65f2d45",38:"b71e1f4f3b700ad59435",39:"7237db1023fa04cc4184",40:"781d7828660c56b1f9c4",41:"59ce7cc086a0fd5ccdfa",42:"22bb97fdb8af2923fd97"}[e]+".js";var b=setTimeout(t,12e4);function t(){r.onerror=r.onload=null,clearTimeout(b);var c=a[e];0!==c&&(c&&c[1](new Error("Loading chunk "+e+" failed.")),a[e]=void 0)}return r.onerror=r.onload=t,n.appendChild(r),f},d.m=e,d.c=f,d.d=function(e,c,f){d.o(e,c)||Object.defineProperty(e,c,{configurable:!1,enumerable:!0,get:f})},d.n=function(e){var c=e&&e.__esModule?function(){return e.default}:function(){return e};return d.d(c,"a",c),c},d.o=function(e,c){return Object.prototype.hasOwnProperty.call(e,c)},d.p="./",d.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file

src/components/tag/tag-config-options.vue

@@ -1463,12 +1463,15 @@ export default {
         if (!!templateVal.valWidgetId) {
           ids.push(templateVal.valWidgetId);
         }
-        if (!!newTime.length) {
+        if (newTime&&!!newTime.length) {
+          // setTimeout(_ => {
           newTime.forEach((ele, index) => {
             if (!!ele.timeWidgetId) {
               ids.push(ele.timeWidgetId)
+              // this.getTemplateCodeById([ele.timeWidgetId]);
             }
           });
+          // }, 200);
 
         }
         if(ids.length){
@@ -1485,11 +1488,15 @@ export default {
         widgetId: id,
         requestProject: 'gic-member-tag-web'
       }))).then(resArr=>{
-        console.log(resArr);
         if(!resArr||!resArr.length)return;
         resArr.forEach(res=>{
           if(res.errorCode != 1)return;
-          this.handleFindWidgetData(res);
+          try{
+            this.handleFindWidgetData(res);
+          }catch(err){
+            console.log(err)
+          }
+
         })
       }).finally(_=>{
         this.canSave = true;
@@ -1498,7 +1505,7 @@ export default {
     handleFindWidgetData(res){
       let data = res.result;
       for (let key in data) {
-        console.log(data.templateCode)
+        console.log(key)
         if (data.templateCode == 'com023') {
           this[data.templateCode][key] = data[key];
         } else if (data.templateCode == 'com025') {