zova-core 5.0.96 → 5.0.99
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/bean/beanControllerBase.d.ts +4 -0
- package/dist/bean/beanControllerBase.d.ts.map +1 -1
- package/dist/bean/beanControllerBase.js +2 -1
- package/dist/bean/beanControllerBase.js.map +1 -1
- package/dist/composables/useController.js +11 -4
- package/dist/composables/useController.js.map +1 -1
- package/dist/types/interface/component.d.ts +0 -1
- package/dist/types/interface/component.d.ts.map +1 -1
- package/package.json +4 -4
|
@@ -4,6 +4,10 @@ type DefineModelOptions<T = any> = {
|
|
|
4
4
|
get?: (v: T) => any;
|
|
5
5
|
set?: (v: T) => any;
|
|
6
6
|
};
|
|
7
|
+
export interface PropsBase<Controller = unknown, Slots = unknown> {
|
|
8
|
+
controllerRef?: (ref: Controller) => void;
|
|
9
|
+
slots?: Slots;
|
|
10
|
+
}
|
|
7
11
|
export declare class BeanControllerBase<TScopeModule = unknown, Props = unknown, Emits = unknown, Slots = unknown> extends BeanBase<TScopeModule> {
|
|
8
12
|
$props: Props;
|
|
9
13
|
$emit: Emits;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"beanControllerBase.d.ts","sourceRoot":"","sources":["../../src/bean/beanControllerBase.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"beanControllerBase.d.ts","sourceRoot":"","sources":["../../src/bean/beanControllerBase.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAIzC,KAAK,IAAI,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;AAEpC,KAAK,kBAAkB,CAAC,CAAC,GAAG,GAAG,IAAI;IACjC,GAAG,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,KAAK,GAAG,CAAC;IACpB,GAAG,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,KAAK,GAAG,CAAC;CACrB,CAAC;AAEF,MAAM,WAAW,SAAS,CAAC,UAAU,GAAG,OAAO,EAAE,KAAK,GAAG,OAAO;IAC9D,aAAa,CAAC,EAAE,CAAC,GAAG,EAAE,UAAU,KAAK,IAAI,CAAC;IAC1C,KAAK,CAAC,EAAE,KAAK,CAAC;CACf;AAED,qBAAa,kBAAkB,CAC7B,YAAY,GAAG,OAAO,EACtB,KAAK,GAAG,OAAO,EACf,KAAK,GAAG,OAAO,EACf,KAAK,GAAG,OAAO,CACf,SAAQ,QAAQ,CAAC,YAAY,CAAC;IACvB,MAAM,EAAE,KAAK,CAAC;IACd,KAAK,EAAE,KAAK,CAAC;IACb,MAAM,EAAE,KAAK,CAAC;IACd,MAAM,EAAE,IAAI,CAAC;IAYpB,SAAS,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,kBAAkB,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,GAAG,KAAK,CAAC,YAAY,CAAC;IAC3F,SAAS,CAAC,SAAS,CAAC,CAAC,SAAS,MAAM,KAAK,EAAE,IAAI,EAAE,CAAC,EAAE,OAAO,CAAC,EAAE,kBAAkB,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC;CAStG"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { markRaw, useModel } from 'vue';
|
|
2
2
|
import { BeanBase } from './beanBase.js';
|
|
3
|
+
import { Cast } from '../types/utils/cast.js';
|
|
3
4
|
export class BeanControllerBase extends BeanBase {
|
|
4
5
|
$props;
|
|
5
6
|
$emit;
|
|
@@ -9,8 +10,8 @@ export class BeanControllerBase extends BeanBase {
|
|
|
9
10
|
__initControllerData(controllerData) {
|
|
10
11
|
this.$props = controllerData.props;
|
|
11
12
|
this.$emit = controllerData.context.emit;
|
|
12
|
-
this.$slots = (controllerData.context.slots ? markRaw(controllerData.context.slots) : undefined);
|
|
13
13
|
this.$attrs = (controllerData.context.attrs ? markRaw(controllerData.context.attrs) : undefined);
|
|
14
|
+
this.$slots = Object.assign({}, Cast(this.$props).slots, controllerData.context.slots);
|
|
14
15
|
this.app.meta.module._monkeyModuleSync('controllerDataInit', undefined, controllerData, this);
|
|
15
16
|
}
|
|
16
17
|
$useModel(name, options) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"beanControllerBase.js","sourceRoot":"","sources":["../../src/bean/beanControllerBase.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,KAAK,CAAC;AACxC,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"beanControllerBase.js","sourceRoot":"","sources":["../../src/bean/beanControllerBase.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,KAAK,CAAC;AACxC,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAEzC,OAAO,EAAE,IAAI,EAAE,MAAM,wBAAwB,CAAC;AAc9C,MAAM,OAAO,kBAKX,SAAQ,QAAsB;IACvB,MAAM,CAAQ;IACd,KAAK,CAAQ;IACb,MAAM,CAAQ;IACd,MAAM,CAAO;IAEpB,gBAAgB;IACT,oBAAoB,CAAC,cAA+B;QACzD,IAAI,CAAC,MAAM,GAAG,cAAc,CAAC,KAAc,CAAC;QAC5C,IAAI,CAAC,KAAK,GAAG,cAAc,CAAC,OAAO,CAAC,IAAa,CAAC;QAClD,IAAI,CAAC,MAAM,GAAG,CAAC,cAAc,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,cAAc,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAS,CAAC;QACzG,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,cAAc,CAAC,OAAO,CAAC,KAAK,CAAU,CAAC;QAChG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,iBAAiB,CAAC,oBAAoB,EAAE,SAAS,EAAE,cAAc,EAAE,IAAI,CAAC,CAAC;IAChG,CAAC;IAKS,SAAS,CAAC,IAAK,EAAE,OAAQ;QACjC,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE,CAAC;YAC7B,OAAO,GAAG,IAAI,CAAC;YACf,IAAI,GAAG,YAAY,CAAC;QACtB,CAAC;QACD,IAAI,CAAC,IAAI;YAAE,IAAI,GAAG,YAAY,CAAC;QAC/B,OAAO,QAAQ,CAAC,IAAI,CAAC,MAAa,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;IACrD,CAAC;CACF"}
|
|
@@ -37,7 +37,7 @@ async function _useController(controllerData, controllerBeanFullName, renderBean
|
|
|
37
37
|
// dispose
|
|
38
38
|
onBeforeUnmount(() => {
|
|
39
39
|
// undefined better than null
|
|
40
|
-
ctx
|
|
40
|
+
setControllerRef(ctx, false);
|
|
41
41
|
if (ctx.bean !== ctx.app.bean) {
|
|
42
42
|
ctx.bean.dispose();
|
|
43
43
|
}
|
|
@@ -58,11 +58,18 @@ async function _useController(controllerData, controllerBeanFullName, renderBean
|
|
|
58
58
|
ctx.meta.util.instanceScope(() => {
|
|
59
59
|
queuePostFlushCb(() => {
|
|
60
60
|
ctx.meta.state.mounted.touch();
|
|
61
|
-
|
|
62
|
-
// instanceScope useless for emit, because emiter and receiver not the same instance
|
|
63
|
-
ctx.instance.emit('controllerRef', controller);
|
|
61
|
+
setControllerRef(ctx, true);
|
|
64
62
|
});
|
|
65
63
|
});
|
|
66
64
|
//});
|
|
67
65
|
}
|
|
66
|
+
function setControllerRef(ctx, on) {
|
|
67
|
+
const controller = ctx.bean._getBeanSyncOnly(BeanControllerIdentifier);
|
|
68
|
+
if (!controller)
|
|
69
|
+
return;
|
|
70
|
+
// instanceScope useless for emit, because emiter and receiver not the same instance
|
|
71
|
+
if (controller.$props?.controllerRef) {
|
|
72
|
+
controller.$props.controllerRef(on ? controller : undefined);
|
|
73
|
+
}
|
|
74
|
+
}
|
|
68
75
|
//# sourceMappingURL=useController.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useController.js","sourceRoot":"","sources":["../../src/composables/useController.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,eAAe,EAAE,WAAW,EAAE,gBAAgB,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,KAAK,CAAC;AAE7G,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AACvD,OAAO,EACL,wBAAwB,EACxB,oBAAoB,EACpB,mBAAmB,GAGpB,MAAM,iBAAiB,CAAC;AAYzB,uCAAuC;AACvC,6HAA6H;AAC7H,MAAM,UAAU,iBAAiB,CAC/B,sBAA8C,EAC9C,kBAA2C,EAC3C,iBAA0C;IAE1C,iBAAiB;IACjB,MAAM,cAAc,GAAG,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC;IACvC,iBAAiB;IACjB,cAAc,CAAC,cAAc,EAAE,sBAAsB,EAAE,kBAAkB,EAAE,iBAAiB,CAAC,CAAC;AAChG,CAAC;AAgBD,uCAAuC;AACvC,iCAAiC;AACjC,gCAAgC;AAChC,+BAA+B;AAC/B,oCAAoC;AACpC,iCAAiC;AACjC,gCAAgC;AAChC,KAAK;AACL,MAAM,UAAU,aAAa,CAC3B,KAA0B,EAC1B,IAAyB,EACzB,sBAA8C,EAC9C,kBAA2C,EAC3C,iBAA0C;IAE1C,QAAQ;IACR,MAAM,KAAK,GAAG,QAAQ,EAAE,CAAC;IACzB,QAAQ;IACR,MAAM,KAAK,GAAG,QAAQ,EAAE,CAAC;IACzB,iBAAiB;IACjB,MAAM,cAAc,GAAG,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE,CAAC;IAClE,iBAAiB;IACjB,cAAc,CAAC,cAAc,EAAE,sBAAsB,EAAE,kBAAkB,EAAE,iBAAiB,CAAC,CAAC;AAChG,CAAC;AAED,KAAK,UAAU,cAAc,CAC3B,cAA+B,EAC/B,sBAA8C,EAC9C,kBAA2C,EAC3C,iBAA0C;IAE1C,MAAM;IACN,MAAM,GAAG,GAAG,IAAI,WAAW,CAAC,kBAAkB,EAAG,CAAC,CAAC;IACnD,SAAS;IACT,IAAI,GAAG,CAAC,GAAG,EAAE,CAAC;QACZ,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,iBAAiB,CAAC,uBAAuB,EAAE,SAAS,EAAE,cAAc,CAAC,CAAC;IAC5F,CAAC;IACD,UAAU;IACV,eAAe,CAAC,GAAG,EAAE;QACnB,6BAA6B;QAC7B,
|
|
1
|
+
{"version":3,"file":"useController.js","sourceRoot":"","sources":["../../src/composables/useController.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"component.d.ts","sourceRoot":"","sources":["../../../src/types/interface/component.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC;AACb,OAAO,iBAAiB,CAAC;AACzB,OAAO,kBAAkB,CAAC;AAE1B,OAAO,QAAQ,KAAK,CAAC;IACnB,UAAiB,sBAAsB;QACrC,IAAI,CAAC,EAAE;YACL,MAAM,CAAC,EAAE,OAAO,CAAC;SAClB,CAAC;KACH;IAED,UAAiB,qBAAqB;
|
|
1
|
+
{"version":3,"file":"component.d.ts","sourceRoot":"","sources":["../../../src/types/interface/component.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC;AACb,OAAO,iBAAiB,CAAC;AACzB,OAAO,kBAAkB,CAAC;AAE1B,OAAO,QAAQ,KAAK,CAAC;IACnB,UAAiB,sBAAsB;QACrC,IAAI,CAAC,EAAE;YACL,MAAM,CAAC,EAAE,OAAO,CAAC;SAClB,CAAC;KACH;IAED,UAAiB,qBAAqB;KAAG;CAC1C;AAED,OAAO,QAAQ,iBAAiB,CAAC;IAC/B,UAAU,GAAG,CAAC;QAEZ,UAAiB,mBAAmB;YAClC,KAAK,CAAC,EAAE,OAAO,CAAC;YAChB,KAAK,CAAC,EAAE,OAAO,CAAC;SACjB;KACF;CACF;AAED,OAAO,QAAQ,kBAAkB,CAAC;IAChC,UAAiB,mBAAmB;QAClC,OAAO,CAAC,EAAE,MAAM,CAAC;KAClB;IAED,UAAiB,aAAa;QAC5B,aAAa,CAAC,EAAE,MAAM,CAAC;QACvB,cAAc,CAAC,EAAE,MAAM,CAAC;QACxB,WAAW,CAAC,EAAE,MAAM,CAAC;KACtB;CACF"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "zova-core",
|
|
3
|
-
"version": "5.0.
|
|
3
|
+
"version": "5.0.99",
|
|
4
4
|
"description": "A vue3 framework with ioc",
|
|
5
5
|
"publishConfig": {
|
|
6
6
|
"access": "public"
|
|
@@ -43,8 +43,8 @@
|
|
|
43
43
|
"@cabloy/last-word": "^1.0.13",
|
|
44
44
|
"@cabloy/localeutil": "^1.0.4",
|
|
45
45
|
"@cabloy/module-info": "^1.0.19",
|
|
46
|
-
"@cabloy/vue-reactivity": "^3.4.
|
|
47
|
-
"@cabloy/vue-runtime-core": "^3.4.
|
|
46
|
+
"@cabloy/vue-reactivity": "^3.4.34",
|
|
47
|
+
"@cabloy/vue-runtime-core": "^3.4.34",
|
|
48
48
|
"@types/js-cookie": "^3.0.6",
|
|
49
49
|
"@vue/reactivity": "^3.4.27",
|
|
50
50
|
"js-cookie": "^3.0.5",
|
|
@@ -52,5 +52,5 @@
|
|
|
52
52
|
"vue": "^3.4.27",
|
|
53
53
|
"zod": "^3.23.8"
|
|
54
54
|
},
|
|
55
|
-
"gitHead": "
|
|
55
|
+
"gitHead": "d665ca824d3f3ef980565eaba2d5d530bd32e64f"
|
|
56
56
|
}
|