diff --git a/zero.Debug/Startup.cs b/zero.Debug/Startup.cs index c48fca8d..3ac17916 100644 --- a/zero.Debug/Startup.cs +++ b/zero.Debug/Startup.cs @@ -42,7 +42,7 @@ namespace zero.Debug ZeroBuilder zero = services .AddZero(Configuration) - .AddCommerce() + //.AddCommerce() .AddPlugin(); services.Configure(opts => opts.AutomaticAuthentication = false); diff --git a/zero.Web.UI/app.js b/zero.Web.UI/app.js index 592f1efe..06aa03f1 100644 --- a/zero.Web.UI/app.js +++ b/zero.Web.UI/app.js @@ -1,14 +1,12 @@ import { createApp } from 'vue'; + import App from './app.vue'; - -zero.apps = { - shared: true -}; - -import registerDirectives from './directives/register.js'; import Router from './config/router.config.js'; +import registerDirectives from './directives/register.js'; import registerComponents from './components/register.js'; -//import registerRenderers from './renderers/register.js'; +import registerRenderers from './renderers/register.js'; + +zero.renderers = zero.renderers || {}; //import '@zero/config/zero.plugins.js'; //import ZeroPlugin from '@zero/plugin.js'; @@ -18,6 +16,8 @@ app.use(Router); registerDirectives(app); registerComponents(app); +registerRenderers(zero.renderers); + //registerRenderers(app); app.mount('#app'); \ No newline at end of file diff --git a/zero.Web.UI/components/buttons/add-button.vue b/zero.Web.UI/components/buttons/add-button.vue index 4ca76f3e..b3509990 100644 --- a/zero.Web.UI/components/buttons/add-button.vue +++ b/zero.Web.UI/components/buttons/add-button.vue @@ -62,7 +62,7 @@ }, hasDropdown() { - return this.decision && zero.apps.shared; + return this.decision && zero.config.shared; } }, diff --git a/zero.Web.UI/components/buttons/icon-button.vue b/zero.Web.UI/components/buttons/icon-button.vue index 2ae9bb81..1c42be46 100644 --- a/zero.Web.UI/components/buttons/icon-button.vue +++ b/zero.Web.UI/components/buttons/icon-button.vue @@ -27,22 +27,19 @@ }, title: { type: String, - default: '' + default: '' }, disabled: Boolean }, - mounted () + setup(props, context) { - - }, - - methods: { - - tryClick(ev) - { - this.$emit('click', ev); - } + return { + tryClick(ev) + { + context.emit('click', ev); + } + }; } } \ No newline at end of file diff --git a/zero.Web.UI/components/datagrid/datagrid.vue b/zero.Web.UI/components/datagrid/datagrid.vue index 321935f7..76a3dc8d 100644 --- a/zero.Web.UI/components/datagrid/datagrid.vue +++ b/zero.Web.UI/components/datagrid/datagrid.vue @@ -61,7 +61,7 @@ name: 'uiDatagrid', props: { - value: { + config: { type: Object, required: true, default: () => @@ -80,11 +80,11 @@ { this.load(true); }, - 'value.search': function (val) + 'config.search': function (val) { this.filter.search = val; }, - 'value.items': function (val) + 'config.items': function (val) { this.initialize(); }, @@ -135,7 +135,7 @@ { this.debouncedUpdate = _debounce(this.update, 300); - this.configuration = _extend(defaultConfig, this.value); + this.configuration = _extend(defaultConfig, this.config); if (this.configuration.order.enabled) { diff --git a/zero.Web.UI/components/forms/error.vue b/zero.Web.UI/components/forms/error.vue index fb7aa10c..e7dfe5d5 100644 --- a/zero.Web.UI/components/forms/error.vue +++ b/zero.Web.UI/components/forms/error.vue @@ -1,5 +1,5 @@