@ibiz-template/vue3-util 0.0.3-beta.6 → 0.0.4-beta.1

package/dist/system/index.system.js

@@ -1 +1 @@
-System.register(["@ibiz-template/core","vue-router","vue","qx-util","qs","@ibiz-template/runtime","lodash-es","ramda"],(function(e){"use strict";var n,t,r,o,i,u,a,l,c,s,f,p,d,v,w,g,h,C,m,b,P,y,x,S,V,N,E,D,k,G,R,O,A,M,F,I,L,z,T,W,B,j,K,U,$,q,H,J,Q,X,Y,Z,_,ee,ne,te,re,oe,ie,ue,ae;return{setters:[function(e){n=e.Namespace,t=e.RuntimeError,r=e.onClickOutside,o=e.NOOP,i=e.listenJSEvent},function(e){u=e.useRoute},function(e){a=e.watch,l=e.resolveComponent,c=e.h,s=e.ref,f=e.getCurrentInstance,p=e.isReactive,d=e.toRaw,v=e.reactive,w=e.onBeforeMount,g=e.onMounted,h=e.onBeforeUnmount,C=e.computed},function(e){m=e.isNilOrEmpty,b=e.notNilEmpty,P=e.isFunc},function(e){y=e.default},function(e){x=e.calcRouteContext,S=e.IndexViewController,V=e.EditViewController,N=e.EditView3Controller,E=e.OptViewController,D=e.GridViewController,k=e.DataViewViewController,G=e.ListViewController,R=e.PickupGridViewController,O=e.PickupViewController,A=e.MPickupViewController,M=e.WFDynaEditView3Controller,F=e.WFDynaActionViewController,I=e.WFDynaStartViewController,L=e.WFStepTraceViewController,z=e.AppPortalViewController,T=e.TreeExpViewController,W=e.TabExpViewController,B=e.GridExpViewController,j=e.DashboardViewController,K=e.WizardViewController,U=e.ListExpViewController,$=e.KanbanViewController,q=e.AppMenuController,H=e.EditFormController,J=e.GridController,Q=e.ListController,X=e.SearchFormController,Y=e.ViewPanelController,Z=e.PickupViewPanelController,_=e.DashboardController,ee=e.TreeController,ne=e.DataViewController,te=e.PanelController,re=e.ViewLayoutPanelController,oe=e.WizardPanelController,ie=e.KanbanController},function(e){ue=e.isFunction},function(e){ae=e.isNil}],execute:function(){function le(e){var n=e.getOwnContext(),t=["srfsessionid"];return Object.keys(n).forEach((function(e){t.includes(e)&&delete n[e]})),n}function ce(e){return(e.isFill?e.codeName:(e.refM.resource||"")+e.refM.view).toLowerCase()}function se(e,n){var t;return null===(t=e.getAllPSAppViews())||void 0===t?void 0:t.find((function(e){return ce(e)===n}))}function fe(e,n){var t,r;return"index"===(n=n.toLowerCase())?r=e.getDefaultPSAppIndexView():((null===(t=e.getAllPSSubAppRefs())||void 0===t?void 0:t.length)&&e.getAllPSSubAppRefs().reverse().find((function(e){return!!(r=se(e,n))})),r||(r=se(e,n))),r}function pe(e){for(var n,t=e.matched.length,r=[],o=1;o<=t;o++){var i=e.params["view".concat(o)],u=e.params["params".concat(o)],a=void 0,l=void 0,c=void 0;(a=u&&u!==ibiz.env.routePlaceholder?y.parse(u,{strictNullHandling:!0,delimiter:";"}):void 0)&&(1===o?(l=a,a=void 0):(a.srfnavctx&&(l=JSON.parse(decodeURIComponent(a.srfnavctx)),delete a.srfnavctx),a.srfnav&&(c=a.srfnav,delete a.srfnav))),r.push({viewName:i,context:l,params:a,srfnav:c})}return e.params.appContext&&e.params.appContext!==ibiz.env.routePlaceholder&&(n=y.parse(e.params.appContext,{strictNullHandling:!0,delimiter:";"})),{appContext:n,pathNodes:r}}function de(e){var n="";return e.appContext?n+="/".concat(y.stringify(e.appContext,{delimiter:";",strictNullHandling:!0})):n+="/".concat(ibiz.env.routePlaceholder),e.pathNodes.forEach((function(e,t){var r;if(n+="/".concat(e.viewName,"/"),0===t)b(e.context)&&(r=e.context);else if(r=b(e.params)?e.params:{},b(e.context)){var o=JSON.stringify(e.context);"{}"!==o&&(r.srfnavctx=encodeURIComponent(o))}n+=y.stringify(r,{delimiter:";",strictNullHandling:!0})||ibiz.env.routePlaceholder})),n}e({findView:fe,findViewByName:se,generateRoutePath:function(e,n,t,r){var o,i,u=pe(n),a=2;t.toRouteLevel&&(a=t.toRouteLevel,delete t.toRouteLevel);if(u.pathNodes.splice(a-1,u.pathNodes.length-a+1),t.currentSrfNav){var l=u.pathNodes[u.pathNodes.length-1];l.params=l.params||{},l.params.srfnav=t.currentSrfNav,delete t.currentSrfNav}"appredirectview"===(null===(o=u.pathNodes[0])||void 0===o?void 0:o.viewName)&&((null==r?void 0:r.srfindexname)?(u.pathNodes[0].viewName=r.srfindexname,delete r.srfindexname):u.pathNodes[0].viewName="index");u.pathNodes.push({viewName:e.codeName.toLowerCase(),context:le(t),params:r});var c=null===(i=e.getPSAppDataEntity())||void 0===i?void 0:i.codeName;if(2===a&&c){var s=ibiz.hub.getApp(e.getPSModelService().app).resourcePathUtil.calcPaths(c),f=x(t,s);m(f)?u.pathNodes[0].context=void 0:(u.pathNodes[0].context=f,Object.keys(f).forEach((function(e){var n=u.pathNodes[a-1];n.context&&Object.prototype.hasOwnProperty.call(n.context,e)&&delete n.context[e]})))}return{path:de(u)}},getAutoCompleteProps:He,getCheckboxListProps:Me,getCheckboxProps:Je,getDataPickerProps:We,getDatePickerProps:Ie,getDateRangeProps:Xe,getDropdownProps:Le,getEditorEmits:function(){return{change:function(e,n){return!0},operate:function(e){return!0}}},getEditorProps:ke,getGridAutoCompleteProps:function(){return we(we({},He()),Ge())},getGridCheckboxListProps:function(){return we(we({},Me()),Ge())},getGridCheckboxProps:function(){return we(we({},Je()),Ge())},getGridDataPickerProps:function(){return we(we({},We()),Ge())},getGridDatePickerProps:function(){return we(we({},Ie()),Ge())},getGridDateRangeProps:function(){return we(we({},Xe()),Ge())},getGridDropdownProps:function(){return we(we({},Le()),Ge())},getGridEditorCommonProps:Ge,getGridEditorEmits:function(){return{change:function(e,n){return!0},rowSave:function(){return!0}}},getGridInputIpProps:function(){return we(we({},Ae()),Ge())},getGridInputNumberProps:function(){return we(we({},Oe()),Ge())},getGridInputProps:function(){return we(we({},Re()),Ge())},getGridListBoxProps:function(){return we(we({},qe()),Ge())},getGridNumberRangeProps:function(){return we(we({},Qe()),Ge())},getGridRadioProps:function(){return we(we({},ze()),Ge())},getGridRateProps:function(){return we(we({},Ke()),Ge())},getGridRawProps:function(){return we(we({},Be()),Ge())},getGridSliderProps:function(){return we(we({},Ue()),Ge())},getGridSpanProps:function(){return we(we({},Fe()),Ge())},getGridStepperProps:function(){return we(we({},je()),Ge())},getGridSwitchProps:function(){return we(we({},$e()),Ge())},getGridUploadProps:function(){return we(we({},Te()),Ge())},getInputIpProps:Ae,getInputNumberProps:Oe,getInputProps:Re,getListBoxProps:qe,getNumberRangeProps:Qe,getOrigin:Pe,getOwnRouteContext:le,getRadioProps:ze,getRateProps:Ke,getRawProps:Be,getSliderProps:Ue,getSpanProps:Fe,getStepperProps:je,getSwitchProps:$e,getUploadProps:Te,getViewName:ce,parseRouteViewData:function(e,n,r){var o,i=pe(n),u=i.pathNodes[r-1].viewName;if(!u)throw new t("找不到第".concat(r,"级路由的视图标识"));var a=fe(e,u);if(!a)throw new t("找不到视图".concat(u));var l=a.modelPath,c=a.refM.viewType,s={};(null===(o=ibiz.appData)||void 0===o?void 0:o.context)&&Object.assign(s,ibiz.appData.context);i.appContext&&Object.assign(s,i.appContext);for(var f=0;f<r;f++){var p=i.pathNodes[f];b(p.context)&&Object.assign(s,p.context)}var d=i.pathNodes[r-1],v=d.params,w=d.srfnav;return{viewPath:l,viewType:c,context:s,params:v,srfnav:w}},renderCtrlProvider:function(e,n,t){return function(){if(!e.state.complete)return null;var r=e.providers[n];if(!r)return null;var o=l(r.component);return c(o,we({},t))}},route2routePath:pe,routePath2string:de,useAppMenuController:function(e,n,t){void 0===t&&(t={});return Ve((function(){return new q(e,n,t)}))},useAppPortalViewController:function(e){return Se((function(n,t){return new z(e,n,t)}))},useClickOutside:Ne,useControlController:Ve,useController:function(e){e.force=xe()},useDashboardController:function(e,n,t){void 0===t&&(t={});return Ve((function(){return new _(e,n,t)}))},useDashboardViewController:function(e){return Se((function(n,t){return new j(e,n,t)}))},useDataViewController:function(e,n,t){void 0===t&&(t={});return Ve((function(){var r=new ne(e,n,t);return ye("mdCtrlActiveMode",r.setMdCtrlActiveMode.bind(r)),r}))},useDataViewViewController:function(e){return Se((function(n,t){return new k(e,n,t)}))},useEditFormController:function(e,n,t){void 0===t&&(t={});return Ve((function(){return new H(e,n,t)}))},useEditView3Controller:function(e){return Se((function(n,t){return new N(e,n,t)}))},useEditViewController:function(e){return Se((function(n,t){return new V(e,n,t)}))},useEventListener:Ee,useForce:xe,useForceTogether:function(e,n){var t=n.force,r=xe();n.force=function(e){t(e),r()}},useGridCellEditor:function(e,n){var t=this,r=ibiz.config,o=r.gridEditSaveMode,i=r.gridEditShowMode,u=s(!1),a=s(!1),l=C((function(){return e.readonly||!e.hasError&&"cell"===ibiz.config.gridEditShowMode&&!u.value})),c=s("cell"===i),f=s();if("cell"!==i&&"cell-blur"!==o)return{componentRef:f,isInfoMode:l,autoFocus:c,onOperateChange:function(){},onChange:function(){return ge(t,void 0,void 0,(function(){return he(this,(function(e){return[2]}))}))},onBlur:function(){}};var p=function(){u.value&&("cell-blur"!==o||e.readonly||e.disabled||!a.value||(n.emit("rowSave"),a.value=!1),u.value=!1)},d=s(!1);!0!==n.manualBlur&&Ne(f,(function(e){return ge(t,void 0,void 0,(function(){return he(this,(function(e){return d.value||p(),[2]}))}))}));return Ee(f,"click",(function(e){u.value=!0}),{capture:!0}),Ee(f,"focus",(function(e){u.value=!0}),{capture:!0}),{componentRef:f,isInfoMode:l,autoFocus:c,onOperateChange:function(e){d.value=e},onChange:function(r,o){return ge(t,void 0,void 0,(function(){return he(this,(function(t){return e.disabled||(n.emit("change",r,o),a.value=!0),[2]}))}))},onBlur:p}},useGridController:function(e,n,t){void 0===t&&(t={});return Ve((function(){var r=new J(e,n,t);return ye("mdCtrlActiveMode",r.setMdCtrlActiveMode.bind(r)),ye("isSelectFirstDefault",r.setIsSelectFirstDefault.bind(r)),ye("defaultSelectKeys",r.setDefaultSelectKeys.bind(r)),ye("isExpView",r.setIsExpView.bind(r)),r}))},useGridExpViewController:function(e){return Se((function(n,t){return new B(e,n,t)}))},useGridViewController:function(e){return Se((function(n,t){return new D(e,n,t)}))},useIndexViewController:function(e){return Se((function(n,t){return new S(e,n,t)}))},useKanbanController:function(e,n,t){void 0===t&&(t={});return Ve((function(){var r=new ie(e,n,t);return ye("mdCtrlActiveMode",r.setMdCtrlActiveMode.bind(r)),r}))},useKanbanViewController:function(e){return Se((function(n,t){return new $(e,n,t)}))},useListController:function(e,n,t){void 0===t&&(t={});return Ve((function(){var r=new Q(e,n,t);return ye("mdCtrlActiveMode",r.setMdCtrlActiveMode.bind(r)),ye("isSelectFirstDefault",r.setIsSelectFirstDefault.bind(r)),ye("defaultSelectKeys",r.setDefaultSelectKeys.bind(r)),ye("isExpView",r.setIsExpView.bind(r)),r}))},useListExpViewController:function(e){return Se((function(n,t){return new U(e,n,t)}))},useListViewController:function(e){return Se((function(n,t){return new G(e,n,t)}))},useMPickupViewController:function(e){return Se((function(n,t){return new A(e,n,t)}))},useNamespace:function(e){return new n(e,ibiz.env.namespace)},useOptViewController:function(e){return Se((function(n,t){return new E(e,n,t)}))},usePanelController:function(e,n,t){void 0===t&&(t={});return Ve((function(){var r=new te(e,n,t);return ye("inputData",r.setInputData.bind(r)),r}))},usePickupGridViewController:function(e){return Se((function(n,t){return new R(e,n,t)}))},usePickupViewController:function(e){return Se((function(n,t){return new O(e,n,t)}))},usePickupViewPanelController:function(e,n,t){void 0===t&&(t={});return Ve((function(){return new Z(e,n,t)}))},useProps:be,usePropsWatch:ye,useRouteKey:function(e,n,t){t||(t=s(""));t.value=e.value;var r=new ve(n);return a(e,(function(e,n){e!==n&&r.nextChange((function(){t.value=e}))})),t},useRouterQuery:function(){return u().query},useSearchFormController:function(e,n,t){void 0===t&&(t={});return Ve((function(){return new X(e,n,t)}))},useTabExpViewController:function(e){return Se((function(n,t){return new W(e,n,t)}))},useTreeController:function(e,n,t){void 0===t&&(t={});return Ve((function(){var r=new ee(e,n,t);return ye("defaultSelectKeys",r.setDefaultSelectKeys.bind(r)),ye("isSelectFirstDefault",r.setIsSelectFirstDefault.bind(r)),r}))},useTreeExpViewController:function(e){return Se((function(n,t){return new T(e,n,t)}))},useViewController:Se,useViewLayoutPanelController:function(e,n,t){void 0===t&&(t={});return Ve((function(){return new re(e,n,t)}))},useViewPanelController:function(e,n,t){void 0===t&&(t={});return Ve((function(){return new Y(e,n,t)}))},useWFDynaActionViewController:function(e){return Se((function(n,t){return new F(e,n,t)}))},useWFDynaEditView3Controller:function(e){return Se((function(n,t){return new M(e,n,t)}))},useWFDynaStartViewController:function(e){return Se((function(n,t){return new I(e,n,t)}))},useWFStepTraceViewController:function(e){return Se((function(n,t){return new L(e,n,t)}))},useWizardPanelController:function(e,n,t){void 0===t&&(t={});return Ve((function(){return new oe(e,n,t)}))},useWizardViewController:function(e){return Se((function(n,t){return new K(e,n,t)}))}});var ve=e("RouteListener",function(){function e(e,n){var t=this;this.callbacks=[],this.timers=[],this.wait=500,n&&(this.wait=n),a((function(){return e.path}),(function(e,n){if(e!==n){if(t.callbacks.length)for(var r=0;r<t.callbacks.length;r++){(0,t.callbacks[r])()}if(t.callbacks=[],t.timers.length)for(r=0;r<t.timers.length;r++){var o=t.timers[r];clearTimeout(o)}t.timers=[]}}))}return e.prototype.nextChange=function(e){var n=this;ue(e)&&(this.timers.push(setTimeout((function(){e();var t=n.callbacks.findIndex((function(n){return n===e}));n.callbacks.splice(t,1)}),this.wait)),this.callbacks.push(e))},e}()),we=function(){return we=Object.assign||function(e){for(var n,t=1,r=arguments.length;t<r;t++)for(var o in n=arguments[t])Object.prototype.hasOwnProperty.call(n,o)&&(e[o]=n[o]);return e},we.apply(this,arguments)};function ge(e,n,t,r){return new(t||(t=Promise))((function(o,i){function u(e){try{l(r.next(e))}catch(e){i(e)}}function a(e){try{l(r.throw(e))}catch(e){i(e)}}function l(e){var n;e.done?o(e.value):(n=e.value,n instanceof t?n:new t((function(e){e(n)}))).then(u,a)}l((r=r.apply(e,n||[])).next())}))}function he(e,n){var t,r,o,i,u={label:0,sent:function(){if(1&o[0])throw o[1];return o[1]},trys:[],ops:[]};return i={next:a(0),throw:a(1),return:a(2)},"function"==typeof Symbol&&(i[Symbol.iterator]=function(){return this}),i;function a(a){return function(l){return function(a){if(t)throw new TypeError("Generator is already executing.");for(;i&&(i=0,a[0]&&(u=0)),u;)try{if(t=1,r&&(o=2&a[0]?r.return:a[0]?r.throw||((o=r.return)&&o.call(r),0):r.next)&&!(o=o.call(r,a[1])).done)return o;switch(r=0,o&&(a=[2&a[0],o.value]),a[0]){case 0:case 1:o=a;break;case 4:return u.label++,{value:a[1],done:!1};case 5:u.label++,r=a[1],a=[0];continue;case 7:a=u.ops.pop(),u.trys.pop();continue;default:if(!(o=u.trys,(o=o.length>0&&o[o.length-1])||6!==a[0]&&2!==a[0])){u=0;continue}if(3===a[0]&&(!o||a[1]>o[0]&&a[1]<o[3])){u.label=a[1];break}if(6===a[0]&&u.label<o[1]){u.label=o[1],o=a;break}if(o&&u.label<o[2]){u.label=o[2],u.ops.push(a);break}o[2]&&u.ops.pop(),u.trys.pop();continue}a=n.call(e,u)}catch(e){a=[6,e],r=0}finally{t=o=0}if(5&a[0])throw a[1];return{value:a[0]?a[1]:void 0,done:!0}}([a,l])}}}function Ce(e,n){var t="function"==typeof Symbol&&e[Symbol.iterator];if(!t)return e;var r,o,i=t.call(e),u=[];try{for(;(void 0===n||n-- >0)&&!(r=i.next()).done;)u.push(r.value)}catch(e){o={error:e}}finally{try{r&&!r.done&&(t=i.return)&&t.call(i)}finally{if(o)throw o.error}}return u}function me(e,n,t){if(t||2===arguments.length)for(var r,o=0,i=n.length;o<i;o++)!r&&o in n||(r||(r=Array.prototype.slice.call(n,0,o)),r[o]=n[o]);return e.concat(r||Array.prototype.slice.call(n))}function be(){return f().proxy.$props}function Pe(e){return p(e)?d(e):e}function ye(e,n,t){var r=be();Object.prototype.hasOwnProperty.call(r,e)&&(a((function(){return r[e]}),(function(e,t){n(Pe(e),Pe(t))}),t),n(Pe(r[e]),void 0))}function xe(){var e=f().proxy;return function(n){e.$forceUpdate(),n&&P(n)&&e.$nextTick((function(){n()}))}}function Se(e){var n=f().proxy,t=be(),r=e(t.context,t.params);return r.state=v(r.state),w((function(){t.modal&&(r.modal=t.modal),r.force=xe(),r.emit=function(e){for(var t=[],r=1;r<arguments.length;r++)t[r-1]=arguments[r];return n.$emit.apply(n,me([e],Ce(t),!1))}})),g((function(){return r.init()})),h((function(){return r.destroy()})),r}function Ve(e){var n=f().proxy,t=e();return t.state=v(t.state),w((function(){t.force=xe(),t.emit=function(e){for(var t=[],r=1;r<arguments.length;r++)t[r-1]=arguments[r];return n.$emit.apply(n,me([e],Ce(t),!1))}})),g((function(){return t.init()})),h((function(){return t.destroy()})),t}function Ne(e,n,t){void 0===t&&(t={});var i=o,u=o,l=o,c=function(){i(),i=o,u=o,l=o};return a(e,(function(e,o){if(e!==o)if(ae(e))c();else{var a=r((null==e?void 0:e.$el)||e,n,t);i=a.stop,u=a.pause,l=a.proceed}}),{immediate:!0}),h((function(){i!==o&&c()})),{stop:function(){return i()},pause:function(){return u()},proceed:function(){return l()}}}function Ee(e,n,t,r){void 0===r&&(r={});var u=o;return a(e,(function(e,a){e!==a&&(ae(e)?(u(),u=o):u=i((null==e?void 0:e.$el)||e,n,t,r))}),{immediate:!0}),h((function(){u!==o&&u()})),function(){u()}}var De=e("RequiredProp",(function(e,n,t){this.required=!0,n&&(this.default=n),t&&(this.validator=t),this.type=e}));function ke(){return{value:String,controller:new De(Object),data:new De(Object),disabled:{type:Boolean},readonly:{type:Boolean,default:!1},autoFocus:{type:Boolean,default:!1}}}function Ge(){return{hasError:{type:Boolean}}}function Re(){return we(we({},ke()),{value:String})}function Oe(){return we(we({},ke()),{value:Number})}function Ae(){return we(we({},ke()),{value:String})}function Me(){return we(we({},ke()),{value:[String,Number]})}function Fe(){return we(we({},ke()),{value:[String,Number]})}function Ie(){return we(we({},ke()),{value:String})}function Le(){return we(we({},ke()),{value:String})}function ze(){return we(we({},ke()),{value:[String,Number]})}function Te(){return we(we({},ke()),{value:String})}function We(){return we(we({},ke()),{value:String})}function Be(){return we(we({},ke()),{value:[String,Number]})}function je(){return we(we({},ke()),{value:[String,Number]})}function Ke(){return we(we({},ke()),{value:[String,Number]})}function Ue(){return we(we({},ke()),{value:[String,Number]})}function $e(){return we(we({},ke()),{value:[String,Number]})}function qe(){return we(we({},ke()),{value:[String,Number]})}function He(){return we(we({},ke()),{value:String})}function Je(){return we(we({},ke()),{value:[String,Number]})}function Qe(){return we(we({},ke()),{value:[String,Number]})}function Xe(){return we(we({},ke()),{value:[String,Number]})}}}}));
+System.register(["@ibiz-template/core","vue-router","vue","qx-util","qs","lodash-es","ramda"],(function(e){"use strict";var t,n,r,i,o,a,u,c,s,f,l,p,v,d,m,h,N,x;return{setters:[function(e){t=e.Namespace,n=e.RuntimeError,r=e.onClickOutside,i=e.NOOP,o=e.listenJSEvent},function(e){a=e.useRoute},function(e){u=e.watch,c=e.ref,s=e.createCommentVNode,f=e.getCurrentInstance,l=e.isReactive,p=e.toRaw,v=e.onBeforeUnmount},function(e){d=e.notNilEmpty,m=e.isFunc},function(e){h=e.default},function(e){N=e.isFunction},function(e){x=e.isNil}],execute:function(){function w(e){var t=e.getOwnContext(),n=["srfsessionid"];return Object.keys(t).forEach((function(e){n.includes(e)&&delete t[e]})),t}function g(e){for(var t,n=e.matched.length,r=[],i=1;i<=n;i++){var o=e.params["view".concat(i)],a=e.params["params".concat(i)],u=void 0,c=void 0,s=void 0;(u=a&&a!==ibiz.env.routePlaceholder?h.parse(a,{strictNullHandling:!0,delimiter:";"}):void 0)&&(1===i?(c=u,u=void 0):(u.srfnavctx&&(c=JSON.parse(decodeURIComponent(u.srfnavctx)),delete u.srfnavctx),u.srfnav&&(s=u.srfnav,delete u.srfnav))),r.push({viewName:o,context:c,params:u,srfnav:s})}return e.params.appContext&&e.params.appContext!==ibiz.env.routePlaceholder&&(t=h.parse(e.params.appContext,{strictNullHandling:!0,delimiter:";"})),{appContext:t,pathNodes:r}}function y(e){var t="";return e.appContext?t+="/".concat(h.stringify(e.appContext,{delimiter:";",strictNullHandling:!0})):t+="/".concat(ibiz.env.routePlaceholder),e.pathNodes.forEach((function(e,n){var r;if(t+="/".concat(e.viewName,"/"),0===n)d(e.context)&&(r=e.context);else if(r=d(e.params)?e.params:{},d(e.context)){var i=JSON.stringify(e.context);"{}"!==i&&(r.srfnavctx=encodeURIComponent(i))}t+=h.stringify(r,{delimiter:";",strictNullHandling:!0})||ibiz.env.routePlaceholder})),t}e({findView:function(e,t){return},findViewByName:function(e,t){return},generateRoutePath:function(e,t,n,r){var i=g(t),o=2;n.toRouteLevel&&(o=n.toRouteLevel,delete n.toRouteLevel);if(i.pathNodes.splice(o-1,i.pathNodes.length-o+1),n.currentSrfNav){var a=i.pathNodes[i.pathNodes.length-1];a.params=a.params||{},a.params.srfnav=n.currentSrfNav,delete n.currentSrfNav}t.fullPath.startsWith("/appredirectview")&&((null==r?void 0:r.srfindexname)?(i.pathNodes[0].viewName=r.srfindexname,delete r.srfindexname):i.pathNodes[0].viewName="index");return i.pathNodes.push({viewName:e.codeName.toLowerCase(),context:w(n),params:r}),{path:y(i)}},getOrigin:R,getOwnRouteContext:w,getViewName:function(e){return e.codeName.toLowerCase()},isEmptyVNode:function(e){if(!Array.isArray(e))return e===O;return 1===e.length&&e[0]===O},parseRouteViewData:function(e,t,r){var i=g(t).pathNodes[r-1].viewName;if(!i)throw new n("找不到第".concat(r,"级路由的视图标识"));throw new n("找不到视图".concat(i))},route2routePath:g,routePath2string:y,useClickOutside:function(e,t,n){void 0===n&&(n={});var o=i,a=i,c=i,s=function(){o(),o=i,a=i,c=i};return u(e,(function(e,i){if(e!==i)if(x(e))s();else{var u=r((null==e?void 0:e.$el)||e,t,n);o=u.stop,a=u.pause,c=u.proceed}}),{immediate:!0}),v((function(){o!==i&&s()})),{stop:function(){return o()},pause:function(){return a()},proceed:function(){return c()}}},useController:function(e){e.force=k()},useEventListener:function(e,t,n,r){void 0===r&&(r={});var a=i;return u(e,(function(e,u){e!==u&&(x(e)?(a(),a=i):a=o((null==e?void 0:e.$el)||e,t,n,r))}),{immediate:!0}),v((function(){a!==i&&a()})),function(){a()}},useForce:k,useForceTogether:function(e,t){var n=t.force,r=k();t.force=function(e){n(e),r()}},useNamespace:function(e){return new t(e,ibiz.env.namespace)},useProps:b,usePropsWatch:function(e,t,n){var r=b();Object.prototype.hasOwnProperty.call(r,e)&&(u((function(){return r[e]}),(function(e,n){t(R(e),R(n))}),n),t(R(r[e]),void 0))},useRouteKey:function(e,t,n){n||(n=c(""));n.value=e.value;var r=new C(t);return u(e,(function(e,t){e!==t&&r.nextChange((function(){n.value=e}))})),n},useRouterQuery:function(){return a().query}});var C=e("RouteListener",function(){function e(e,t){var n=this;this.callbacks=[],this.timers=[],this.wait=500,t&&(this.wait=t),u((function(){return e.path}),(function(e,t){if(e!==t){if(n.callbacks.length)for(var r=0;r<n.callbacks.length;r++){(0,n.callbacks[r])()}if(n.callbacks=[],n.timers.length)for(r=0;r<n.timers.length;r++){var i=n.timers[r];clearTimeout(i)}n.timers=[]}}))}return e.prototype.nextChange=function(e){var t=this;N(e)&&(this.timers.push(setTimeout((function(){e();var n=t.callbacks.findIndex((function(t){return t===e}));t.callbacks.splice(n,1)}),this.wait)),this.callbacks.push(e))},e}());function b(){return f().proxy.$props}function R(e){return l(e)?p(e):e}function k(){var e=f().proxy;return function(t){e.$forceUpdate(),t&&m(t)&&e.$nextTick((function(){t()}))}}var O=e("EmptyVNode",s("EmptyVNode"))}}}));

package/out/index.d.ts

@@ -1,5 +1,4 @@
 export * from './interface';
 export * from './use';
 export * from './util';
-export * from './props';
 //# sourceMappingURL=index.d.ts.map

package/out/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAC;AAC5B,cAAc,OAAO,CAAC;AACtB,cAAc,QAAQ,CAAC;AACvB,cAAc,SAAS,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAC;AAC5B,cAAc,OAAO,CAAC;AACtB,cAAc,QAAQ,CAAC"}

package/out/index.js

@@ -1,4 +1,3 @@
 export * from './interface';
 export * from './use';
 export * from './util';
-export * from './props';

package/out/use/index.d.ts

@@ -1,9 +1,6 @@
 export * from './namespace/namespace';
 export * from './route/route';
-export * from './view';
 export * from './vue/vue';
-export * from './widget';
 export * from './click-outside/click-outside';
 export * from './event/event';
-export * from './grid-cell-edit/grid-cell-edit';
 //# sourceMappingURL=index.d.ts.map

package/out/use/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/use/index.ts"],"names":[],"mappings":"AAAA,cAAc,uBAAuB,CAAC;AACtC,cAAc,eAAe,CAAC;AAC9B,cAAc,QAAQ,CAAC;AACvB,cAAc,WAAW,CAAC;AAC1B,cAAc,UAAU,CAAC;AACzB,cAAc,+BAA+B,CAAC;AAC9C,cAAc,eAAe,CAAC;AAC9B,cAAc,iCAAiC,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/use/index.ts"],"names":[],"mappings":"AAAA,cAAc,uBAAuB,CAAC;AACtC,cAAc,eAAe,CAAC;AAC9B,cAAc,WAAW,CAAC;AAC1B,cAAc,+BAA+B,CAAC;AAC9C,cAAc,eAAe,CAAC"}

package/out/use/index.js

@@ -1,8 +1,5 @@
 export * from './namespace/namespace';
 export * from './route/route';
-export * from './view';
 export * from './vue/vue';
-export * from './widget';
 export * from './click-outside/click-outside';
 export * from './event/event';
-export * from './grid-cell-edit/grid-cell-edit';

package/out/use/vue/vue.d.ts

@@ -1,4 +1,4 @@
-import { ComponentPublicInstance, WatchOptions } from 'vue';
+import { ComponentPublicInstance, VNode, WatchOptions } from 'vue';
 /**
  * 获取组件的props,只能在setup里使用
  *
@@ -61,4 +61,17 @@ export declare function useForceTogether(vue: ComponentPublicInstance, controlle
  * @param {IData} controller
  */
 export declare function useController(controller: IData): void;
+/** 全局唯一的空节点 */
+export declare const EmptyVNode: VNode<import("vue").RendererNode, import("vue").RendererElement, {
+    [key: string]: any;
+}>;
+/**
+ * 配合EmptyVNode，判断是否是空节点
+ * @author lxm
+ * @date 2023-03-28 02:20:06
+ * @export
+ * @param {(VNode[] | VNode)} nodes
+ * @return {*}  {boolean}
+ */
+export declare function isEmptyVNode(nodes: VNode[] | VNode): boolean;
 //# sourceMappingURL=vue.d.ts.map

package/out/use/vue/vue.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"vue.d.ts","sourceRoot":"","sources":["../../../src/use/vue/vue.ts"],"names":[],"mappings":"AACA,OAAO,EACL,uBAAuB,EAKvB,YAAY,EACb,MAAM,KAAK,CAAC;AAEb;;;;;;;GAOG;AACH,wBAAgB,QAAQ,IAAI,KAAK,CAGhC;AAED;;;;;;;;GAQG;AAEH,wBAAgB,SAAS,CAAC,GAAG,EAAE,GAAG,OAEjC;AAED;;;;;;;;;GASG;AACH,wBAAgB,aAAa,CAAC,CAAC,GAAG,OAAO,EACvC,GAAG,EAAE,MAAM,EACX,QAAQ,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,MAAM,CAAC,EAAE,CAAC,KAAK,IAAI,EAC1C,OAAO,CAAC,EAAE,YAAY,GAAG,SAAS,QAcnC;AAED;;;;;;;GAOG;AACH,wBAAgB,QAAQ,IAAI,CAAC,QAAQ,CAAC,EAAE,MAAM,IAAI,KAAK,IAAI,CAU1D;AAED;;;;;;;;;GASG;AACH,wBAAgB,gBAAgB,CAC9B,GAAG,EAAE,uBAAuB,EAC5B,UAAU,EAAE;IACV,KAAK,EAAE,CAAC,QAAQ,CAAC,EAAE,MAAM,IAAI,KAAK,IAAI,CAAC;CACxC,GACA,IAAI,CAON;AAED;;;;;;;;GAQG;AACH,wBAAgB,aAAa,CAAC,UAAU,EAAE,KAAK,QAE9C"}
+{"version":3,"file":"vue.d.ts","sourceRoot":"","sources":["../../../src/use/vue/vue.ts"],"names":[],"mappings":"AACA,OAAO,EACL,uBAAuB,EAKvB,KAAK,EAEL,YAAY,EACb,MAAM,KAAK,CAAC;AAEb;;;;;;;GAOG;AACH,wBAAgB,QAAQ,IAAI,KAAK,CAGhC;AAED;;;;;;;;GAQG;AAEH,wBAAgB,SAAS,CAAC,GAAG,EAAE,GAAG,OAEjC;AAED;;;;;;;;;GASG;AACH,wBAAgB,aAAa,CAAC,CAAC,GAAG,OAAO,EACvC,GAAG,EAAE,MAAM,EACX,QAAQ,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,MAAM,CAAC,EAAE,CAAC,KAAK,IAAI,EAC1C,OAAO,CAAC,EAAE,YAAY,GAAG,SAAS,QAcnC;AAED;;;;;;;GAOG;AACH,wBAAgB,QAAQ,IAAI,CAAC,QAAQ,CAAC,EAAE,MAAM,IAAI,KAAK,IAAI,CAU1D;AAED;;;;;;;;;GASG;AACH,wBAAgB,gBAAgB,CAC9B,GAAG,EAAE,uBAAuB,EAC5B,UAAU,EAAE;IACV,KAAK,EAAE,CAAC,QAAQ,CAAC,EAAE,MAAM,IAAI,KAAK,IAAI,CAAC;CACxC,GACA,IAAI,CAON;AAED;;;;;;;;GAQG;AACH,wBAAgB,aAAa,CAAC,UAAU,EAAE,KAAK,QAE9C;AAED,eAAe;AACf,eAAO,MAAM,UAAU;;EAAmC,CAAC;AAE3D;;;;;;;GAOG;AACH,wBAAgB,YAAY,CAAC,KAAK,EAAE,KAAK,EAAE,GAAG,KAAK,WAKlD"}

package/out/use/vue/vue.js

@@ -1,5 +1,5 @@
 import { isFunc } from 'qx-util';
-import { getCurrentInstance, isReactive, toRaw, watch, } from 'vue';
+import { createCommentVNode, getCurrentInstance, isReactive, toRaw, watch, } from 'vue';
 /**
  * 获取组件的props,只能在setup里使用
  *
@@ -94,3 +94,19 @@ export function useForceTogether(vue, controller) {
 export function useController(controller) {
     controller.force = useForce();
 }
+/** 全局唯一的空节点 */
+export const EmptyVNode = createCommentVNode('EmptyVNode');
+/**
+ * 配合EmptyVNode，判断是否是空节点
+ * @author lxm
+ * @date 2023-03-28 02:20:06
+ * @export
+ * @param {(VNode[] | VNode)} nodes
+ * @return {*}  {boolean}
+ */
+export function isEmptyVNode(nodes) {
+    if (!Array.isArray(nodes)) {
+        return nodes === EmptyVNode;
+    }
+    return nodes.length === 1 && nodes[0] === EmptyVNode;
+}

package/out/util/index.d.ts

@@ -1,4 +1,3 @@
 export * from './route/route';
 export * from './route/route-listener';
-export * from './render-provider/render-ctrl-provider';
 //# sourceMappingURL=index.d.ts.map

package/out/util/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/util/index.ts"],"names":[],"mappings":"AAAA,cAAc,eAAe,CAAC;AAC9B,cAAc,wBAAwB,CAAC;AACvC,cAAc,wCAAwC,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/util/index.ts"],"names":[],"mappings":"AAAA,cAAc,eAAe,CAAC;AAC9B,cAAc,wBAAwB,CAAC"}

package/out/util/index.js

@@ -1,3 +1,2 @@
 export * from './route/route';
 export * from './route/route-listener';
-export * from './render-provider/render-ctrl-provider';

package/out/util/route/route.d.ts

@@ -1,5 +1,4 @@
-import { IBizContext } from '@ibiz-template/core';
-import { IPSApplication, IPSAppView, IPSSubAppRef } from '@ibiz-template/model';
+import { IApplication, IAppView } from '@ibiz/model-core';
 import { RouteLocationNormalizedLoaded as Route } from 'vue-router';
 import { IRoutePath, IRouteViewData } from '../../interface';
 /**
@@ -18,53 +17,53 @@ export declare function getOwnRouteContext(context: IContext): IParams;
  * @author lxm
  * @date 2022-08-17 21:08:00
  * @export
- * @param {IPSAppView} appView 视图模型
+ * @param {IAppView} appView 视图模型
  * @param {Route} route 路由对象
- * @param {(IBizContext | undefined)} [context] 上下文对象
+ * @param {(IContext | undefined)} [context] 上下文对象
  * @param {(IParams | undefined)} [_params] 视图参数
  * @returns {*}  {string}
  */
-export declare function generateRoutePath(appView: IPSAppView, route: Route, context: IBizContext, params?: IParams | undefined): {
+export declare function generateRoutePath(appView: IAppView, route: Route, context: IContext, params?: IParams | undefined): {
     path: string;
 };
 /**
  * 获取视图模型的codeName(小写)
  *
  * @export
- * @param {IPSAppView} model
+ * @param {IAppView} model
  * @returns {*}
  */
-export declare function getViewName(model: IPSAppView): any;
+export declare function getViewName(model: IAppView): string;
 /**
  * 在单个应用里
  * 通过视图的codeName找到视图模型
  *
- * @param {(IPSApplication | IPSSubAppRef)} appModel 主应用或子应用
+ * @param {(IApplication | ISubAppRef)} appModel 主应用或子应用
  * @param {string} viewCodeName 视图名称小写
  * @returns {*}
  */
-export declare function findViewByName(appModel: IPSApplication | IPSSubAppRef, viewCodeName: string): IPSAppView | undefined;
+export declare function findViewByName(_appModel: IApplication, _viewCodeName: string): undefined;
 /**
  * 从子应用和主应用里
  * 通过视图的codeName找视图模型
  *
- * @param {IPSApplication} appModel 主应用
+ * @param {IApplication} appModel 主应用
  * @param {string} viewCodeName 视图名称小写
  * @returns {*}
  */
-export declare function findView(appModel: IPSApplication, viewCodeName: string): IPSAppView | null | undefined;
+export declare function findView(_appModel: IApplication, _viewCodeName: string): undefined;
 /**
  * 解析路由获取对应视图数据
  *
  * @author lxm
  * @date 2022-08-17 22:08:51
  * @export
- * @param {IPSApplication} appModel 视图模型
+ * @param {IApplication} appModel 视图模型
  * @param {Route} route 路由对象
  * @param {number} level 层级
  * @returns {*}  {IRouteViewData}
  */
-export declare function parseRouteViewData(appModel: IPSApplication, route: Route, level: number): IRouteViewData;
+export declare function parseRouteViewData(appModel: IApplication, route: Route, level: number): IRouteViewData;
 /**
  * 路径字符串转换成路由路径对象
  *

package/out/util/route/route.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"route.d.ts","sourceRoot":"","sources":["../../../src/util/route/route.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAgB,MAAM,qBAAqB,CAAC;AAChE,OAAO,EAAE,cAAc,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAEhF,OAAO,EAAE,6BAA6B,IAAI,KAAK,EAAE,MAAM,YAAY,CAAC;AAEpE,OAAO,EAAE,UAAU,EAAkB,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAE7E;;;;;;;;GAQG;AACH,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAS7D;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,iBAAiB,CAC/B,OAAO,EAAE,UAAU,EACnB,KAAK,EAAE,KAAK,EACZ,OAAO,EAAE,WAAW,EACpB,MAAM,CAAC,EAAE,OAAO,GAAG,SAAS,GAC3B;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,CAiElB;AAED;;;;;;GAMG;AACH,wBAAgB,WAAW,CAAC,KAAK,EAAE,UAAU,OAK5C;AAED;;;;;;;GAOG;AACH,wBAAgB,cAAc,CAC5B,QAAQ,EAAE,cAAc,GAAG,YAAY,EACvC,YAAY,EAAE,MAAM,0BAKrB;AAED;;;;;;;GAOG;AACH,wBAAgB,QAAQ,CAAC,QAAQ,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,iCAuBtE;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,kBAAkB,CAChC,QAAQ,EAAE,cAAc,EACxB,KAAK,EAAE,KAAK,EACZ,KAAK,EAAE,MAAM,GACZ,cAAc,CAmDhB;AAED;;;;;;;;GAQG;AACH,wBAAgB,eAAe,CAAC,KAAK,EAAE,KAAK,GAAG,UAAU,CA+DxD;AAED;;;;;;;;GAQG;AACH,wBAAgB,gBAAgB,CAAC,SAAS,EAAE,UAAU,GAAG,MAAM,CAyC9D"}
+{"version":3,"file":"route.d.ts","sourceRoot":"","sources":["../../../src/util/route/route.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAE1D,OAAO,EAAE,6BAA6B,IAAI,KAAK,EAAE,MAAM,YAAY,CAAC;AACpE,OAAO,EAAE,UAAU,EAAkB,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAE7E;;;;;;;;GAQG;AACH,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAS7D;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,iBAAiB,CAC/B,OAAO,EAAE,QAAQ,EACjB,KAAK,EAAE,KAAK,EACZ,OAAO,EAAE,QAAQ,EACjB,MAAM,CAAC,EAAE,OAAO,GAAG,SAAS,GAC3B;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,CAiElB;AAED;;;;;;GAMG;AACH,wBAAgB,WAAW,CAAC,KAAK,EAAE,QAAQ,UAE1C;AAED;;;;;;;GAOG;AACH,wBAAgB,cAAc,CAC5B,SAAS,EAAE,YAAY,EACvB,aAAa,EAAE,MAAM,GACpB,SAAS,CAKX;AAED;;;;;;;GAOG;AACH,wBAAgB,QAAQ,CACtB,SAAS,EAAE,YAAY,EACvB,aAAa,EAAE,MAAM,GACpB,SAAS,CAwBX;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,kBAAkB,CAChC,QAAQ,EAAE,YAAY,EACtB,KAAK,EAAE,KAAK,EACZ,KAAK,EAAE,MAAM,GACZ,cAAc,CA+ChB;AAED;;;;;;;;GAQG;AACH,wBAAgB,eAAe,CAAC,KAAK,EAAE,KAAK,GAAG,UAAU,CA+DxD;AAED;;;;;;;;GAQG;AACH,wBAAgB,gBAAgB,CAAC,SAAS,EAAE,UAAU,GAAG,MAAM,CAyC9D"}

package/out/util/route/route.js

@@ -1,7 +1,6 @@
-import { isNilOrEmpty, notNilEmpty } from 'qx-util';
+import { notNilEmpty } from 'qx-util';
 import { RuntimeError } from '@ibiz-template/core';
 import qs from 'qs';
-import { calcRouteContext } from '@ibiz-template/runtime';
 /**
  * 获取自身的路由上下文，排除了部分不需要路由携带的参数
  *
@@ -27,14 +26,13 @@ export function getOwnRouteContext(context) {
  * @author lxm
  * @date 2022-08-17 21:08:00
  * @export
- * @param {IPSAppView} appView 视图模型
+ * @param {IAppView} appView 视图模型
  * @param {Route} route 路由对象
- * @param {(IBizContext | undefined)} [context] 上下文对象
+ * @param {(IContext | undefined)} [context] 上下文对象
  * @param {(IParams | undefined)} [_params] 视图参数
  * @returns {*}  {string}
  */
 export function generateRoutePath(appView, route, context, params) {
-    var _a, _b;
     const routePath = route2routePath(route);
     // 如果上下文存在toRouteLevel时，使用上下文的层级，否则是第二级路由
     let level = 2;
@@ -54,7 +52,7 @@ export function generateRoutePath(appView, route, context, params) {
         delete context.currentSrfNav;
     }
     // 重定向视图跳转的一级首页路由
-    if (((_a = routePath.pathNodes[0]) === null || _a === void 0 ? void 0 : _a.viewName) === 'appredirectview') {
+    if (route.fullPath.startsWith('/appredirectview')) {
         if (params === null || params === void 0 ? void 0 : params.srfindexname) {
             routePath.pathNodes[0].viewName = params.srfindexname;
             delete params.srfindexname;
@@ -70,26 +68,27 @@ export function generateRoutePath(appView, route, context, params) {
         params,
     });
     // 计算二级视图的资源路径加到index后面
-    const codeName = (_b = appView.getPSAppDataEntity()) === null || _b === void 0 ? void 0 : _b.codeName;
-    if (level === 2 && codeName) {
-        const app = ibiz.hub.getApp(appView.getPSModelService().app);
-        const paths = app.resourcePathUtil.calcPaths(codeName);
-        const resContext = calcRouteContext(context, paths);
-        if (!isNilOrEmpty(resContext)) {
-            // 资源路径不为空,二级视图的上下文删掉多余的资源上下文
-            routePath.pathNodes[0].context = resContext;
-            Object.keys(resContext).forEach(key => {
-                const currentNode = routePath.pathNodes[level - 1];
-                if (currentNode.context &&
-                    Object.prototype.hasOwnProperty.call(currentNode.context, key)) {
-                    delete currentNode.context[key];
-                }
-            });
-        }
-        else {
-            routePath.pathNodes[0].context = undefined;
-        }
-    }
+    // const codeName = appView.getPSAppDataEntity()?.codeName;
+    // if (level === 2 && codeName) {
+    //   const app = ibiz.hub.getApp(appView.getPSModelService().app);
+    //   const paths = app.resourcePathUtil.calcPaths(codeName);
+    //   const resContext = calcRouteContext(context, paths);
+    //   if (!isNilOrEmpty(resContext)) {
+    //     // 资源路径不为空,二级视图的上下文删掉多余的资源上下文
+    //     routePath.pathNodes[0].context = resContext;
+    //     Object.keys(resContext).forEach(key => {
+    //       const currentNode = routePath.pathNodes[level - 1];
+    //       if (
+    //         currentNode.context &&
+    //         Object.prototype.hasOwnProperty.call(currentNode.context, key)
+    //       ) {
+    //         delete currentNode.context[key];
+    //       }
+    //     });
+    //   } else {
+    //     routePath.pathNodes[0].context = undefined;
+    //   }
+    // }
     // 视图参数通过query传递
     return { path: routePath2string(routePath) };
 }
@@ -97,62 +96,58 @@ export function generateRoutePath(appView, route, context, params) {
  * 获取视图模型的codeName(小写)
  *
  * @export
- * @param {IPSAppView} model
+ * @param {IAppView} model
  * @returns {*}
  */
 export function getViewName(model) {
-    const viewName = model.isFill
-        ? model.codeName
-        : (model.refM.resource || '') + model.refM.view;
-    return viewName.toLowerCase();
+    return model.codeName.toLowerCase();
 }
 /**
  * 在单个应用里
  * 通过视图的codeName找到视图模型
  *
- * @param {(IPSApplication | IPSSubAppRef)} appModel 主应用或子应用
+ * @param {(IApplication | ISubAppRef)} appModel 主应用或子应用
  * @param {string} viewCodeName 视图名称小写
  * @returns {*}
  */
-export function findViewByName(appModel, viewCodeName) {
-    var _a;
-    return (_a = appModel.getAllPSAppViews()) === null || _a === void 0 ? void 0 : _a.find((model) => {
-        return getViewName(model) === viewCodeName;
-    });
+export function findViewByName(_appModel, _viewCodeName) {
+    // return appModel.getAllPSAppViews()?.find((model: IAppView) => {
+    //   return getViewName(model) === viewCodeName;
+    // });
+    return undefined;
 }
 /**
  * 从子应用和主应用里
  * 通过视图的codeName找视图模型
  *
- * @param {IPSApplication} appModel 主应用
+ * @param {IApplication} appModel 主应用
  * @param {string} viewCodeName 视图名称小写
  * @returns {*}
  */
-export function findView(appModel, viewCodeName) {
-    var _a;
-    let viewModel;
-    viewCodeName = viewCodeName.toLowerCase();
-    // index找默认首页视图，其他匹配codeName
-    if (viewCodeName === 'index') {
-        viewModel = appModel.getDefaultPSAppIndexView();
-    }
-    else {
-        // 先查找子应用，找到则不继续找了,优先从最后面的子应用找起
-        if ((_a = appModel.getAllPSSubAppRefs()) === null || _a === void 0 ? void 0 : _a.length) {
-            appModel
-                .getAllPSSubAppRefs()
-                .reverse()
-                .find(sub => {
-                viewModel = findViewByName(sub, viewCodeName);
-                return !!viewModel;
-            });
-        }
-        // 子应用里没有就在主应用里找。
-        if (!viewModel) {
-            viewModel = findViewByName(appModel, viewCodeName);
-        }
-    }
-    return viewModel;
+export function findView(_appModel, _viewCodeName) {
+    // let viewModel: IAppView | null | undefined;
+    // viewCodeName = viewCodeName.toLowerCase();
+    // // index找默认首页视图，其他匹配codeName
+    // if (viewCodeName === 'index') {
+    //   viewModel = appModel.getDefaultPSAppIndexView();
+    // } else {
+    //   // 先查找子应用，找到则不继续找了,优先从最后面的子应用找起
+    //   if (appModel.getAllPSSubAppRefs()?.length) {
+    //     appModel
+    //       .getAllPSSubAppRefs()!
+    //       .reverse()
+    //       .find(sub => {
+    //         viewModel = findViewByName(sub, viewCodeName);
+    //         return !!viewModel;
+    //       });
+    //   }
+    //   // 子应用里没有就在主应用里找。
+    //   if (!viewModel) {
+    //     viewModel = findViewByName(appModel, viewCodeName);
+    //   }
+    // }
+    // return viewModel;
+    return undefined;
 }
 /**
  * 解析路由获取对应视图数据
@@ -160,7 +155,7 @@ export function findView(appModel, viewCodeName) {
  * @author lxm
  * @date 2022-08-17 22:08:51
  * @export
- * @param {IPSApplication} appModel 视图模型
+ * @param {IApplication} appModel 视图模型
  * @param {Route} route 路由对象
  * @param {number} level 层级
  * @returns {*}  {IRouteViewData}
@@ -180,8 +175,6 @@ export function parseRouteViewData(appModel, route, level) {
     if (!viewModel) {
         throw new RuntimeError(`找不到视图${viewCodeName}`);
     }
-    const modelPath = viewModel.modelPath;
-    const { viewType } = viewModel.refM;
     // !解析上下文参数,整合当前层级之前所有的上下文参数
     const context = {};
     // 合并appData里的应用上下文
@@ -203,8 +196,7 @@ export function parseRouteViewData(appModel, route, level) {
     // 最后一级路由对应的视图才会解析视图参数
     const { params, srfnav } = routePath.pathNodes[level - 1];
     return {
-        viewPath: modelPath,
-        viewType,
+        viewType: '',
         context,
         params,
         srfnav,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/vue3-util",
-  "version": "0.0.3-beta.6",
+  "version": "0.0.4-beta.1",
   "description": "vue3 工具包",
   "type": "module",
   "main": "out/index.js",
@@ -29,25 +29,25 @@
   "author": "chitanda",
   "license": "MIT",
   "devDependencies": {
-    "@ibiz-template/core": "^0.0.3-beta.5",
-    "@ibiz-template/model": "^0.0.3-beta.6",
-    "@ibiz-template/runtime": "^0.0.3-beta.6",
+    "@ibiz-template/core": "^0.0.4-beta.1",
+    "@ibiz-template/runtime": "^0.0.4-beta.1",
+    "@ibiz/model-core": "^0.0.2",
     "@types/qs": "^6.9.7",
     "qs": "^6.11.1",
     "qx-util": "^0.4.8",
-    "ramda": "^0.28.0",
+    "ramda": "^0.29.0",
     "vue": "^3.2.47",
     "vue-router": "^4.1.6"
   },
   "peerDependencies": {
     "@ibiz-template/core": "^0.0.3-beta.0",
-    "@ibiz-template/model": "^0.0.3-beta.0",
     "@ibiz-template/runtime": "^0.0.3-beta.0",
+    "@ibiz/model-core": "^0.0.2",
     "qs": "^6.11.0",
     "qx-util": "^0.4.8",
     "ramda": "^0.28.0",
     "vue": "^3.2.45",
     "vue-router": "^4.1.6"
   },
-  "gitHead": "e21743071367b8b7c96734436f6ef8a1755ffae6"
+  "gitHead": "2a299785cb6ccc9b25353e77d40d864d94c0c496"
 }

package/src/index.ts

@@ -1,4 +1,3 @@
 export * from './interface';
 export * from './use';
 export * from './util';
-export * from './props';

package/src/use/index.ts

@@ -1,8 +1,5 @@
 export * from './namespace/namespace';
 export * from './route/route';
-export * from './view';
 export * from './vue/vue';
-export * from './widget';
 export * from './click-outside/click-outside';
 export * from './event/event';
-export * from './grid-cell-edit/grid-cell-edit';

package/src/use/vue/vue.ts

@@ -1,9 +1,11 @@
 import { isFunc } from 'qx-util';
 import {
   ComponentPublicInstance,
+  createCommentVNode,
   getCurrentInstance,
   isReactive,
   toRaw,
+  VNode,
   watch,
   WatchOptions,
 } from 'vue';
@@ -120,3 +122,21 @@ export function useForceTogether(
 export function useController(controller: IData) {
   controller.force = useForce();
 }
+
+/** 全局唯一的空节点 */
+export const EmptyVNode = createCommentVNode('EmptyVNode');
+
+/**
+ * 配合EmptyVNode，判断是否是空节点
+ * @author lxm
+ * @date 2023-03-28 02:20:06
+ * @export
+ * @param {(VNode[] | VNode)} nodes
+ * @return {*}  {boolean}
+ */
+export function isEmptyVNode(nodes: VNode[] | VNode) {
+  if (!Array.isArray(nodes)) {
+    return nodes === EmptyVNode;
+  }
+  return nodes.length === 1 && nodes[0] === EmptyVNode;
+}

package/src/util/index.ts

@@ -1,3 +1,2 @@
 export * from './route/route';
 export * from './route/route-listener';
-export * from './render-provider/render-ctrl-provider';