@ibiz-template/vue3-components 0.7.41-alpha.16 → 0.7.41-alpha.18

package/lib/view-engine/mpickup-view-engine.cjs

@@ -35,10 +35,6 @@ class MPickupViewEngine extends pickupView_engine.PickupViewEngine {
     }
     const { childNames } = this.view;
     childNames.push("simplelist");
-    if (this.view.params.selecteddata) {
-      this.selectData = JSON.parse(this.view.params.selecteddata);
-      delete this.view.params.selecteddata;
-    }
     if (!this.view.slotProps.simplelist) {
       this.view.slotProps.simplelist = {};
     }
@@ -63,7 +59,7 @@ class MPickupViewEngine extends pickupView_engine.PickupViewEngine {
     this.simpleList.evt.on("onActive", (event) => {
       this.simpleListActive(event.data);
     });
-    this.simpleList.setData(this.selectData);
+    this.setSelectedData(this.selectData);
   }
   async call(key, args) {
     if (key === runtime.SysUIActionTag.CANCEL) {
@@ -119,7 +115,7 @@ class MPickupViewEngine extends pickupView_engine.PickupViewEngine {
         items.splice(index, 1);
       }
     });
-    this.simpleList.setData(items);
+    this.setSelectedData(items);
   }
   /**
    * 添加选中
@@ -144,7 +140,7 @@ class MPickupViewEngine extends pickupView_engine.PickupViewEngine {
     const allData = this.simpleList.getAllData();
     const items = [...allData, ...data];
     const uniqueItems = this.handleUniqueItems(items);
-    this.simpleList.setData(uniqueItems);
+    this.setSelectedData(uniqueItems);
   }
   /**
    * 去重数组
@@ -180,7 +176,7 @@ class MPickupViewEngine extends pickupView_engine.PickupViewEngine {
    * @memberof MPickupViewEngine
    */
   removeAll() {
-    this.simpleList.setData([]);
+    this.setSelectedData([]);
   }
   /**
    * 删除选中
@@ -200,6 +196,16 @@ class MPickupViewEngine extends pickupView_engine.PickupViewEngine {
         items.splice(index, 1);
       }
     });
+    this.setSelectedData(items);
+  }
+  /**
+   * @description 设置选中数据
+   * @protected
+   * @param {IData[]} items
+   * @memberof MPickupViewEngine
+   */
+  setSelectedData(items) {
+    super.setSelectedData(items);
     this.simpleList.setData(items);
   }
   /**

package/lib/view-engine/pickup-view.engine.cjs

@@ -41,6 +41,10 @@ class PickupViewEngine extends runtime.ViewEngineBase {
     await super.onCreated();
     const { childNames } = this.view;
     childNames.push("pickupviewpanel");
+    if (this.view.params.selecteddata) {
+      this.selectData = JSON.parse(this.view.params.selecteddata);
+      delete this.view.params.selecteddata;
+    }
   }
   /**
    * 视图mounted生命周期执行逻辑
@@ -57,6 +61,17 @@ class PickupViewEngine extends runtime.ViewEngineBase {
     this.pickupViewPanel.evt.on("onDataActive", (event) => {
       this.pickupViewPanelDataActive(event.data);
     });
+    this.setSelectedData(this.selectData);
+  }
+  /**
+   * @description 设置选中数据
+   * @protected
+   * @param {IData[]} items
+   * @memberof PickupViewEngine
+   */
+  setSelectedData(items) {
+    this.selectData = items;
+    this.pickupViewPanel.setSelectedData(items);
   }
   /**
    *  选则面板激活数据

package/lib/view-engine/tab-exp-view.engine.cjs

@@ -169,7 +169,7 @@ class TabExpViewEngine extends runtime.ViewEngineBase {
   calcViewHeaderVisible() {
     let showHeader = super.calcViewHeaderVisible();
     const { tabLayout } = this.view.model;
-    if (tabLayout === void 0 || tabLayout === "TOP" && runtime.getControl(this.view.model, "tabexppanel")) {
+    if (tabLayout === void 0 || ["TOP", "TOP_DROPDOWNLIST"].includes(tabLayout) && runtime.getControl(this.view.model, "tabexppanel")) {
       showHeader = true;
     }
     return showHeader;

package/lib/view-engine/tab-search-view.engine.cjs

@@ -115,8 +115,10 @@ class TabSearchViewEngine extends tabExpView_engine.TabExpViewEngine {
         }
       }
     }
-    this.searchBar.placeHolder = caption || "";
-    this.searchBar.state.quickSearchPlaceHolder = caption || "";
+    if (this.searchBar) {
+      this.searchBar.placeHolder = caption || "";
+      this.searchBar.state.quickSearchPlaceHolder = caption || "";
+    }
   }
   async call(key, args) {
     if (key === runtime.SysUIActionTag.SEARCH) {

package/lib/view-engine/tree-view.engine.cjs

@@ -5,31 +5,37 @@ var core = require('@ibiz-template/core');
 
 "use strict";
 class TreeViewEngine extends runtime.MDViewEngine {
-  get tree() {
-    return this.view.getController("tree");
-  }
   async onCreated() {
     await super.onCreated();
     if (!this.view.slotProps.tree) {
       this.view.slotProps.tree = {};
     }
   }
+  get tree() {
+    return this.view.getController("tree");
+  }
   async call(key, args) {
     var _a;
     if (key === runtime.SysUIActionTag.REFRESH_ALL) {
-      await this.tree.refresh();
+      await this.xdataControl.refresh();
       return null;
     }
     if (key === runtime.SysUIActionTag.REFRESH) {
       if ((_a = args == null ? void 0 : args.data) == null ? void 0 : _a[0]) {
-        await this.tree.refreshNodeChildren(args.data[0], false);
+        await this.xdataControl.refreshNodeChildren(
+          args.data[0],
+          false
+        );
       } else {
-        await this.tree.refresh();
+        await this.xdataControl.refresh();
       }
       return null;
     }
     if (key === runtime.SysUIActionTag.REFRESH_PARENT) {
-      await this.tree.refreshNodeChildren(args.data[0], true);
+      await this.xdataControl.refreshNodeChildren(
+        args.data[0],
+        true
+      );
       return null;
     }
     if (key === runtime.SysUIActionTag.EXPAND) {
@@ -42,7 +48,10 @@ class TreeViewEngine extends runtime.MDViewEngine {
       if (!tag) {
         throw new core.RuntimeError(ibiz.i18n.t("viewEngine.noExpandTag"));
       }
-      this.tree.changeCollapse({ tag, expand: true });
+      this.xdataControl.changeCollapse({
+        tag,
+        expand: true
+      });
       return null;
     }
     if (key === runtime.SysUIActionTag.COLLAPSE) {
@@ -55,19 +64,38 @@ class TreeViewEngine extends runtime.MDViewEngine {
       if (!tag) {
         throw new core.RuntimeError(ibiz.i18n.t("viewEngine.noCollapseTag"));
       }
-      this.tree.changeCollapse({ tag, expand: false });
+      this.xdataControl.changeCollapse({
+        tag,
+        expand: false
+      });
       return null;
     }
     if (key === runtime.SysUIActionTag.EXPANDALL) {
-      this.tree.changeCollapse({ expand: true });
+      this.xdataControl.changeCollapse({ expand: true });
       return null;
     }
     if (key === runtime.SysUIActionTag.COLLAPSEALL) {
-      this.tree.changeCollapse({ expand: false });
+      this.xdataControl.changeCollapse({ expand: false });
       return null;
     }
     return super.call(key, args);
   }
+  async openData(args) {
+    const { data, event } = args;
+    const result = await this.xdataControl.openData(
+      data[0],
+      event
+    );
+    return result;
+  }
+  async newData(args) {
+    const { data, event } = args;
+    const result = await this.xdataControl.newData(
+      data[0],
+      event
+    );
+    return result;
+  }
 }
 
 exports.TreeViewEngine = TreeViewEngine;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/vue3-components",
-  "version": "0.7.41-alpha.16",
+  "version": "0.7.41-alpha.18",
   "description": "web端组件库(vue3)",
   "main": "lib/index.cjs",
   "module": "es/index.mjs",
@@ -31,16 +31,16 @@
     "@amap/amap-jsapi-loader": "^1.0.1",
     "@floating-ui/dom": "^1.5.3",
     "@ibiz-template-plugin/ai-chat": "^0.0.28",
-    "@ibiz-template-plugin/gantt": "0.1.8-alpha.270",
+    "@ibiz-template-plugin/gantt": "0.1.8-alpha.299",
     "@ibiz-template-plugin/bi-report": "0.0.26",
     "@ibiz-template-plugin/data-view": "0.0.4",
-    "@ibiz-template/core": "0.7.41-alpha.14",
+    "@ibiz-template/core": "0.7.41-alpha.18",
     "@ibiz-template/devtool": "0.0.11",
-    "@ibiz-template/model-helper": "0.7.41-alpha.16",
-    "@ibiz-template/runtime": "0.7.41-alpha.16",
+    "@ibiz-template/model-helper": "0.7.41-alpha.18",
+    "@ibiz-template/runtime": "0.7.41-alpha.18",
     "@ibiz-template/theme": "0.7.39",
-    "@ibiz-template/vue3-util": "0.7.41-alpha.16",
-    "@ibiz-template/web-theme": "3.5.0",
+    "@ibiz-template/vue3-util": "0.7.41-alpha.18",
+    "@ibiz-template/web-theme": "3.8.0",
     "@ibiz/model-core": "^0.1.79",
     "@imengyu/vue3-context-menu": "^1.3.5",
     "@monaco-editor/loader": "^1.4.0",
@@ -66,14 +66,16 @@
     "vue-i18n": "^9.6.5",
     "vue-router": "^4.2.5",
     "vuedraggable": "^4.1.0",
+    "sortablejs": "^1.15.6",
     "snabbdom": "^3.3.1",
     "xlsx": "^0.18.5"
   },
   "devDependencies": {
     "@commitlint/cli": "^18.5.0",
     "@commitlint/config-conventional": "^18.5.0",
-    "@ibiz-template/cli": "^0.3.10",
+    "@ibiz-template/cli": "^0.3.23",
     "@types/lodash-es": "^4.17.12",
+    "@types/sortablejs": "^1.15.8",
     "@types/node": "^20.11.5",
     "@types/nprogress": "^0.2.3",
     "@types/qs": "^6.9.11",

package/dist/chart-8QfxarWf.js

@@ -1 +0,0 @@
-System.register(["vue","@ibiz-template/vue3-util","echarts","qx-util","lodash-es","@ibiz-template/runtime"],(function(e){"use strict";var t,i,a,l,r,n,o,s,d,c,h,u,m,p,v,f,g,w;return{setters:[function(e){t=e.defineComponent,i=e.ref,a=e.watch,l=e.onMounted,r=e.onBeforeUnmount,n=e.createVNode,o=e.resolveComponent,s=e.nextTick,d=e.isVNode},function(e){c=e.useControlController,h=e.useNamespace,u=e.hasEmptyPanelRenderer,m=e.IBizCustomRender},function(e){p=e.init},function(e){v=e.createUUID},function(e){f=e.isArray},function(e){g=e.ChartController,w=e.ControlVO}],execute:function(){function b(e){return"function"==typeof e||"[object Object]"===Object.prototype.toString.call(e)&&!d(e)}e("default",t({name:"IBizChartControl",props:{modelData:{type:Object,required:!0},context:{type:Object,required:!0},params:{type:Object,default:()=>({})},provider:{type:Object},mdctrlActiveMode:{type:Number,default:void 0},loadDefault:{type:Boolean,default:!0},isSimple:{type:Boolean,required:!1},data:{type:Array,required:!1}},emits:["drillDetail"],setup(e,{emit:t}){const d=c(((...e)=>new g(...e))),D=h("control-".concat(d.model.controlType.toLowerCase())),y=i(),z=i(0),C=v(),L=i(!1),x=i({}),P=i();let R;const S=()=>{e.data&&(d.state.items=e.data.map((e=>new w(e))),d.afterLoad({},d.state.items))};d.evt.on("onCreated",(async()=>{e.isSimple&&(S(),d.state.isSimple=!0,d.state.isLoaded=!0)})),a((()=>e.data),(()=>{e.isSimple&&S()}),{deep:!0});const B=async()=>{await s();const e=document.getElementById(C);e&&("bottom"===d.state.gridPosition||"top"===d.state.gridPosition?z.value=e.offsetHeight/2-8:z.value=e.offsetHeight-16)},E=()=>{L.value=!1},N=()=>{L.value||d.changeTooltipState(!0)};let O;l((()=>{var t,i;const a=p(y.value);d.initChart(a),window.addEventListener("resize",B),window.addEventListener("pointerdown",E),window.addEventListener("click",N),y.value&&ResizeObserver&&(O=new ResizeObserver((()=>{d.resizeChart()})),O.observe(y.value)),B();let l=(null==(i=null==(t=e.modelData.controlParam)?void 0:t.ctrlParams)?void 0:i.ENABLEDRILLDETAIL)||d.controlParams.enabledrilldetail;if(l&&!f(l))try{l=JSON.parse(l)}catch(e){ibiz.log.error(e),l=void 0}(null==l?void 0:l.length)&&a.on("click",(e=>{const t=d.computedClickSerieModel(e);if(!t||ibiz.fullscreenUtil.isFullScreen)return;const i=l.find((e=>e.name===t.valueField));i&&i.isDrill&&(R=e,(e=>{if(e.event){const t=e.event.event,{offsetX:i,offsetY:a}=e.event,{clientWidth:l}=t.target;x.value=i+160>l?{top:"".concat(a-20,"px"),left:"".concat(i-160,"px")}:{top:"".concat(a,"px"),left:"".concat(i+16,"px")}}})(e),a.dispatchAction({type:"hideTip"}),d.changeTooltipState(!1),L.value=!0)}))}));a((()=>d.state.showGrid),(()=>{B()}),{immediate:!0});return r((()=>{window.removeEventListener("resize",B),window.removeEventListener("pointerdown",E),window.removeEventListener("click",N),null==O||O.disconnect()})),{c:d,ns:D,chartRef:y,uuid:C,showCheck:L,drillDetailPos:x,drillDetailRef:P,openDrillDetail:e=>{e.stopPropagation(),e.preventDefault(),L.value=!1,d.changeTooltipState(!0);const i=d.computedDrillDetailParam(R);t("drillDetail",i)},renderGrid:()=>{let e;return n(o("el-table"),{ref:"tableRef",data:d.state.gridData||[],border:!0,style:{width:"100%"},"max-height":z.value,"header-row-class-name":D.e("grid-header")},b(e=d.state.gridHeaders.map((e=>n(o("el-table-column"),{prop:e.id,align:"center",label:e.name},null))))?e:{default:()=>[e]})},renderNoData:()=>{if(0===d.state.items.length){const e={};return u(d)&&Object.assign(e,{customRender:()=>n(m,{controller:d},null)}),n(o("iBizNoData"),{text:d.model.emptyText,emptyTextLanguageRes:d.model.emptyTextLanguageRes,hideNoDataImage:d.state.hideNoDataImage},b(e)?e:{default:()=>[e]})}}}},render(){return n(o("iBizControlBase"),{controller:this.c},{default:()=>[n("div",{id:this.uuid,class:this.ns.b("chart-container")},[this.renderNoData(),n("div",{class:[this.ns.e("chart-grid"),this.ns.is("no-data",0===this.c.state.items.length),this.ns.is("show-grid",this.c.state.showGrid),{[this.ns.em("chart-grid",this.c.state.gridPosition)]:this.c.state.showGrid}]},[n("div",{class:[this.ns.e("chart-grid-container"),this.ns.is(this.c.state.gridPosition,this.c.state.showGrid),this.ns.is("no-grid",!this.c.state.showGrid)]},[n("div",{ref:"chartRef",class:[this.ns.e("chart")]},[ibiz.i18n.t("control.chart.chartPlaceholder")]),this.showCheck?n("div",{ref:"drillDetailRef",class:this.ns.e("drill-detail"),style:this.drillDetailPos,onPointerdown:this.openDrillDetail},[n("div",{class:this.ns.em("drill-detail","item")},[n("svg",{viewBox:"0 0 16 16",xmlns:"http://www.w3.org/2000/svg",height:"1em",width:"1em",focusable:"false",fill:"currentColor"},[n("g",{id:"aspnormal/preview","stroke-width":"1","fill-rule":"evenodd"},[n("path",{d:"M11.626 0c1.057 0 1.923.818 2 1.855l.005.15v3.411a.6.6 0 0 1-1.192.097l-.008-.097.001-1.348V2.005c0-.41-.31-.749-.705-.799l-.101-.006h-9.62c-.41 0-.75.308-.8.704l-.006.101v11.989c0 .41.308.75.705.8l.101.006h5.906l.017-.004.016-.003h2.074a.598.598 0 1 1 .107 1.187l-.095.01V16H2.006a2.006 2.006 0 0 1-2-1.856L0 13.994V2.005C0 .948.818.082 1.856.005L2.006 0h9.62zm-1.595 6.328a3.669 3.669 0 0 1 3.665 3.665c0 .79-.251 1.523-.678 2.123l2.412 2.412a.6.6 0 1 1-.848.85l-2.41-2.412a3.646 3.646 0 0 1-2.14.692 3.67 3.67 0 0 1-3.667-3.665 3.67 3.67 0 0 1 3.666-3.665zm-5.106 5.29a.6.6 0 0 1 .097 1.191l-.097.008H2.85a.6.6 0 0 1-.097-1.192l.097-.008h2.074zm5.106-4.09a2.468 2.468 0 0 0-2.466 2.465 2.468 2.468 0 0 0 2.466 2.466 2.47 2.47 0 0 0 2.466-2.466 2.469 2.469 0 0 0-2.466-2.465zm-4.815-.126a.6.6 0 0 1 .097 1.193l-.097.007h-2.35A.6.6 0 0 1 2.77 7.41l.098-.008h2.349zm5.58-4a.6.6 0 0 1 .097 1.192l-.097.008H2.867A.6.6 0 0 1 2.77 3.41l.097-.008h7.929z",id:"asp合并形状"},null)])]),n("div",{class:this.ns.em("drill-detail","item-text")},[ibiz.i18n.t("control.chart.drillDetail")])])]):null]),this.c.state.showGrid?n("div",{class:this.ns.e("grid")},[this.renderGrid()]):null])])]})}}))}}}));

package/dist/ibiz-markdown-editor-0VHzFa2l.js

@@ -1 +0,0 @@
-System.register(["vue","@ibiz-template/vue3-util","qx-util","cherry-markdown"],(function(e){"use strict";var t,l,n,o,r,i,a,s,c,d,u,h,m,v;return{setters:[function(e){t=e.defineComponent,l=e.ref,n=e.watch,o=e.onMounted,r=e.onBeforeUnmount,i=e.onUnmounted,a=e.createVNode,s=e.nextTick},function(e){c=e.getMarkDownProps,d=e.getEditorEmits,u=e.useNamespace,h=e.useUIStore},function(e){m=e.createUUID},function(e){v=e.default}],execute:function(){e("default",t({name:"IBizMarkDown",props:c(),emits:d(),setup(e,{emit:t}){var a,c;const d=u("markdown"),b=e.controller,f=l("");let p=null;const g=m(),y=ibiz.util.file.getUploadHeaders(),w=l({...y}),k=l(""),C=l(""),x=(null==(a=null==b?void 0:b.editorParams)?void 0:a.customTheme)||(null==(c=null==b?void 0:b.editorParams)?void 0:c.customtheme),{UIStore:U}=h(),z=l(x||U.theme),E=l("editOnly");let B=null,T=0;const D=l({});let M=!1;n((()=>e.data),(e=>{if(e&&b){const t=ibiz.util.file.calcFileUpDownUrl(b.context,b.params,e,b.editorParams);k.value=t.uploadUrl,C.value=t.downloadUrl}}),{immediate:!0,deep:!0});const P=l(),S=async(e,t)=>{const l=await ibiz.util.file.fileUpload(k.value,e,w.value);t(C.value.replace("%fileId%",l.fileid))},I=()=>null==p?void 0:p.getMarkdown(),N=e=>{M=!0,null==p||p.setMarkdown(e,!1)};n((()=>e.value),((e,t)=>{e!==t&&(f.value=e||"")}),{immediate:!0}),n(f,((e,t)=>{const l=I();e!==t&&l!==e&&N(e)}));const O=e=>{t("change",I(),null==b?void 0:b.model.id,M),M=!1},V=(e,t)=>({[e]:t}),q=(e,t="")=>{const l=document.createElement(e);return l.className=t,l},R=e=>q("i","ch-icon ch-icon-".concat(e)),j=d.e("fullscreen"),H=e=>{for(;e.firstChild;)e.removeChild(e.firstChild)},L=()=>{if(p&&P.value){const e=p.editor.options.editorDom.parentElement;if(!e)return{};const t=e.classList,l=P.value.querySelector(".".concat(j));return l?{parentElement:e,cherryClass:t,fullscreenNode:l}:{}}return{}},A=()=>{const{parentElement:e,cherryClass:t,fullscreenNode:l}=L();e&&t&&l&&(H(l),l.appendChild(R("fullscreen")),l.title=ibiz.i18n.t("editor.common.fullscreen"),t.remove("fullscreen"),null==e||e.blur(),e.setAttribute("tabindex","-1"))},W=()=>{const{cherryClass:e}=L();return null==e?void 0:e.contains("fullscreen")},F=()=>{p&&P.value&&(W()?A():(()=>{const{parentElement:e,cherryClass:t,fullscreenNode:l}=L();e&&t&&l&&(H(l),l.appendChild(R("minscreen")),t.add("fullscreen"),l.title=ibiz.i18n.t("editor.common.minimize"),e.setAttribute("tabindex","-1"),s((()=>null==e?void 0:e.focus())))})())},G=e=>{e.stopPropagation(),"Escape"===e.key&&W()&&A()};n((()=>U.theme),(e=>{z.value=x||e,null==p||p.setTheme(z.value),null==p||p.setCodeBlockTheme(z.value)}));return o((()=>{var t;(e.disabled||e.readonly)&&(E.value="previewOnly"),s((()=>{var t;p=new v({id:g,value:f.value,previewer:{enablePreviewerBubble:!(e.disabled||e.readonly)},themeSettings:{mainTheme:z.value,codeBlockTheme:z.value},fileUpload:S,emoji:{useUnicode:!0},header:{anchorStyle:"autonumber"},editor:{height:"100%",defaultModel:E.value,codemirror:{autofocus:!1}},toolbars:{toolbar:["bold","italic","underline","strikethrough","|","color","header","|","list","image",{insert:["link","hr","br","code","formula","toc","table","line-table","bar-table"]},"settings","togglePreview"],bubble:["bold","italic","underline","strikethrough","sub","sup","|","size","color"],float:["h1","h2","h3","|","checklist","quote","quickTable","code"],customMenu:[],sidebar:[]},callback:{afterChange:O,beforeImageMounted:V},engine:{syntax:{table:{enableChart:!1,externals:["echarts"]}}}}),p.setTheme(z.value),x&&(p.setTheme(x),p.setCodeBlockTheme(x));const l=q("span","".concat(j," cherry-toolbar-button"));l.title=ibiz.i18n.t("editor.common.fullscreen"),l.onclick=F,l.appendChild(R("fullscreen"));const n=e.disabled?p.editor.options.editorDom.parentElement:null==(t=p.editor.options.editorDom.parentElement)?void 0:t.querySelector(".cherry-toolbar>.toolbar-right");null==n||n.appendChild(l)})),(()=>{if(window.ResizeObserver&&P.value){const e={width:P.value.offsetWidth?"".concat(P.value.offsetWidth,"px"):"100%"};b&&"number"==typeof b.parent.model.height&&Object.assign(e,{height:"".concat(b.parent.model.height,"px")}),D.value=d.cssVarBlock(e),B=new ResizeObserver((e=>{const t=e[0].contentRect.width;if(t!==T){const l={width:"".concat(e[0].contentRect.width,"px")};b&&"number"==typeof b.parent.model.height&&Object.assign(l,{height:"".concat(b.parent.model.height,"px")}),D.value=d.cssVarBlock(l),T=t}})),B.observe(P.value)}})(),null==(t=P.value)||t.addEventListener("keydown",G.bind(this))})),r((()=>{var e;null==(e=P.value)||e.removeEventListener("keydown",G.bind(this))})),i((()=>{p=null,B&&B.disconnect()})),{ns:d,currentVal:f,id:g,editor:p,markDownBox:P,headers:w,theme:z,defaultModel:E,cssVars:D,getCherryHtml:()=>null==p?void 0:p.getHtml(),getCherryContent:I,setCherryContent:N}},render(){return a("div",{ref:"markDownBox",class:[this.ns.b(),this.ns.is("disabled",this.disabled)]},[a("div",{id:this.id,style:this.cssVars,class:this.ns.b("cherry")},null)])}}))}}}));