@ibiz-template/vue3-util 0.7.41-alpha.4 → 0.7.41-alpha.40

package/lib/use/vue-use/computed-async.cjs

@@ -0,0 +1,68 @@
+'use strict';
+
+var core = require('@ibiz-template/core');
+var vue = require('vue');
+
+"use strict";
+function computedAsync(evaluationCallback, initialState, optionsOrRef) {
+  let options;
+  if (vue.isRef(optionsOrRef)) {
+    options = {
+      evaluating: optionsOrRef
+    };
+  } else {
+    options = optionsOrRef || {};
+  }
+  const {
+    lazy = false,
+    flush = "pre",
+    evaluating = void 0,
+    shallow = true,
+    onError = core.NOOP
+  } = options;
+  const started = vue.shallowRef(!lazy);
+  const current = shallow ? vue.shallowRef(initialState) : vue.ref(initialState);
+  let counter = 0;
+  vue.watchEffect(
+    async (onInvalidate) => {
+      if (!started.value)
+        return;
+      counter++;
+      const counterAtBeginning = counter;
+      let hasFinished = false;
+      if (evaluating) {
+        Promise.resolve().then(() => {
+          evaluating.value = true;
+        });
+      }
+      try {
+        const result = await evaluationCallback((cancelCallback) => {
+          onInvalidate(() => {
+            if (evaluating)
+              evaluating.value = false;
+            if (!hasFinished)
+              cancelCallback();
+          });
+        });
+        if (counterAtBeginning === counter)
+          current.value = result;
+      } catch (e) {
+        onError(e);
+      } finally {
+        if (evaluating && counterAtBeginning === counter)
+          evaluating.value = false;
+        hasFinished = true;
+      }
+    },
+    { flush }
+  );
+  if (lazy) {
+    return vue.computed(() => {
+      started.value = true;
+      return current.value;
+    });
+  }
+  return current;
+}
+
+exports.computedAsync = computedAsync;

package/lib/use/vue-use/index.cjs

@@ -0,0 +1,7 @@
+'use strict';
+
+var computedAsync = require('./computed-async.cjs');
+
+"use strict";
+
+exports.computedAsync = computedAsync.computedAsync;

package/lib/util/index.cjs

@@ -3,7 +3,6 @@
 var route = require('./route/route.cjs');
 var routeListener = require('./route/route-listener.cjs');
 var install = require('./install.cjs');
-var prepareControl = require('./control/prepare-control.cjs');
 var render = require('./render/render.cjs');
 var overlayContainer = require('./overlay-container/overlay-container.cjs');
 var overlayPopoverContainer = require('./overlay-popover-container/overlay-popover-container.cjs');
@@ -27,7 +26,6 @@ exports.route2routePath = route.route2routePath;
 exports.routePath2string = route.routePath2string;
 exports.RouteListener = routeListener.RouteListener;
 exports.withInstall = install.withInstall;
-exports.prepareControl = prepareControl.prepareControl;
 exports.hasEmptyPanelRenderer = render.hasEmptyPanelRenderer;
 exports.renderString = render.renderString;
 exports.OverlayContainer = overlayContainer.OverlayContainer;

package/lib/util/overlay-container/overlay-container.cjs

@@ -3,6 +3,7 @@
 var qxUtil = require('qx-util');
 var vue = require('vue');
 var core = require('@ibiz-template/core');
+var lodashEs = require('lodash-es');
 
 "use strict";
 class OverlayContainer {
@@ -44,13 +45,17 @@ class OverlayContainer {
     const self = this;
     const { render, opts } = this;
     const container = document.createElement("div");
-    document.body.appendChild(container);
+    let appendTo = document.body;
+    if (lodashEs.isElement(opts == null ? void 0 : opts.appendTo)) {
+      appendTo = opts == null ? void 0 : opts.appendTo;
+    }
+    appendTo.appendChild(container);
     const vm = OverlayContainer.createVueApp({
       mounted() {
         self.modal = this.$refs.root;
       },
       unmounted() {
-        document.body.removeChild(container);
+        appendTo.removeChild(container);
         self.evt.emit("dismiss", self.result);
       },
       render() {

package/lib/util/overlay-view-util/overlay-view-util.cjs

@@ -4,10 +4,11 @@ var vue = require('vue');
 
 "use strict";
 function createOverlayView(props) {
-  return (modal) => {
+  return (modal, viewShellHooks) => {
     const viewShell = vue.resolveComponent("IBizViewShell");
     return vue.h(viewShell, {
       ...props,
+      viewShellHooks,
       modal
     });
   };

package/lib/util/render/render.cjs

@@ -1,6 +1,7 @@
 'use strict';
 
 var ramda = require('ramda');
+var runtime = require('@ibiz-template/runtime');
 
 "use strict";
 function renderString(value) {
@@ -26,7 +27,9 @@ const hasEmptyPanelRenderer = (c) => {
   if (!controlRenders || controlRenders.length === 0) {
     return false;
   }
-  return !!controlRenders.find((item) => item.id === "emptypanel");
+  return !!controlRenders.find(
+    (item) => item.id === runtime.PredefinedControlRender.EMPTYPANEL
+  );
 };
 
 exports.hasEmptyPanelRenderer = hasEmptyPanelRenderer;

package/lib/util/route/route.cjs

@@ -38,7 +38,7 @@ function route2routePath(route, isRouteModal = false) {
         params = void 0;
       } else {
         if (params.srfnavctx) {
-          context = JSON.parse(decodeURIComponent(params.srfnavctx));
+          context = JSON.parse(params.srfnavctx);
           delete params.srfnavctx;
         }
         if (params.srfnav) {
@@ -119,8 +119,13 @@ function getOwnRouteContext(context) {
     }
     delete ownContext.attributekeys;
   }
+  let srfKeepNull = false;
+  if (Object.prototype.hasOwnProperty.call(ownContext, "srfkeepnull")) {
+    srfKeepNull = ownContext.srfkeepnull === true || ownContext.srfkeepnull === "true";
+    delete ownContext.srfkeepnull;
+  }
   Object.keys(ownContext).forEach((key) => {
-    if (excludeKeys.includes(key) || ramda.isNil(ownContext[key])) {
+    if (excludeKeys.includes(key) || !srfKeepNull && ramda.isNil(ownContext[key])) {
       delete ownContext[key];
     }
   });
@@ -176,6 +181,7 @@ async function calcResRoutePath(routePath, context, appDataEntityId, appId) {
   }
 }
 async function generateRoutePath(appView, route, context, params) {
+  var _a;
   const routePath = route2routePath(route);
   let depth = context.srfdefaulttoroutedepth || 2;
   if (context.toRouteDepth) {
@@ -188,6 +194,10 @@ async function generateRoutePath(appView, route, context, params) {
       };
     }
   }
+  let srfmenuitem = params == null ? void 0 : params.srfmenuitem;
+  if (!srfmenuitem && routePath.pathNodes.length > 1) {
+    srfmenuitem = (_a = routePath.pathNodes[1].params) == null ? void 0 : _a.srfmenuitem;
+  }
   routePath.pathNodes.splice(depth - 1, routePath.pathNodes.length - depth + 1);
   if (context.currentSrfNav) {
     const currentNode = routePath.pathNodes[routePath.pathNodes.length - 1];
@@ -221,6 +231,10 @@ async function generateRoutePath(appView, route, context, params) {
       delete routePath.pathNodes[0].context[deName];
     }
   }
+  if (srfmenuitem && routePath.pathNodes.length > 1) {
+    const tempParams = routePath.pathNodes[1].params || {};
+    routePath.pathNodes[1].params = { ...tempParams, srfmenuitem };
+  }
   return { path: routePath2string(routePath) };
 }
 async function generateRoutePathByModal(appView, route, context, params) {
@@ -310,7 +324,7 @@ function getNestedRoutePath(route, depth, noSrfNav = true) {
   if (noSrfNav) {
     delete pathNode.srfnav;
   }
-  if (pathNode.context) {
+  if (!ibiz.env.isMob && pathNode.context) {
     delete pathNode.context.srfnavctrlid;
   }
   return routePath2string(routePath);
@@ -321,7 +335,8 @@ function onRouteChange(callback, depth) {
     throw new core.RuntimeError(ibiz.i18n.t("vue3Util.util.routeCorrectly"));
   }
   vue.watch(
-    () => route == null ? void 0 : route.path,
+    // fix: odoo脚本触发路径query变更未触发路由变更事件
+    () => route == null ? void 0 : route.fullPath,
     () => {
       const currentKey = getNestedRoutePath(route, depth);
       callback({ currentKey, fullPath: route.fullPath });

package/lib/view/common/index.cjs

@@ -5,6 +5,7 @@ require('../../util/index.cjs');
 var view_provider = require('./view.provider.cjs');
 var view = require('./view.cjs');
 var appDataUploadView_provider = require('../app-data-upload-view/app-data-upload-view.provider.cjs');
+var mdCustomView_provider = require('../md-custom-view/md-custom-view.provider.cjs');
 var install = require('../../util/install.cjs');
 
 "use strict";
@@ -15,6 +16,7 @@ const IBizView = install.withInstall(view.View, function(v) {
     "APPDATAUPLOADVIEW",
     () => new appDataUploadView_provider.AppDataUploadViewProvider()
   );
+  runtime.registerViewProvider("DEMDCUSTOMVIEW", () => new mdCustomView_provider.MDCustomViewProvider());
 });
 
 exports.IBizView = IBizView;

package/lib/view/common/view.cjs

@@ -129,6 +129,19 @@ const View = /* @__PURE__ */ vue.defineComponent({
       }
       return vue.h(comp, ctrlProps);
     };
+    let watermarkDestroy;
+    vue.onMounted(() => {
+      vue.nextTick(async () => {
+        const container = document.getElementById(c.id);
+        const appView = await ibiz.hub.config.view.get(c.model.id);
+        if (!container || !(appView == null ? void 0 : appView.waterMarkOption))
+          return;
+        watermarkDestroy = ibiz.util.watermark.mount(appView.waterMarkOption, container, c.context, c.params, c.state.srfactiveviewdata || {});
+      });
+    });
+    vue.onBeforeUnmount(() => {
+      watermarkDestroy == null ? void 0 : watermarkDestroy();
+    });
     return {
       c,
       ns,

package/lib/view/html-view/html-view.cjs

@@ -1,7 +1,6 @@
 'use strict';
 
 var vue = require('vue');
-var core = require('@ibiz-template/core');
 var runtime = require('@ibiz-template/runtime');
 require('../../use/index.cjs');
 require('./html-view.css');
@@ -31,7 +30,7 @@ const HtmlView = /* @__PURE__ */ vue.defineComponent({
   setup() {
     var _a;
     const ns = namespace.useNamespace("view");
-    const c = useViewController.useViewController((...args) => new runtime.ViewController(...args));
+    const c = useViewController.useViewController((model, ...args) => new runtime.HtmlViewController(model, ...args));
     const controls = ((_a = c.model.viewLayoutPanel) == null ? void 0 : _a.controls) || c.model.controls;
     const {
       viewType,
@@ -42,16 +41,8 @@ const HtmlView = /* @__PURE__ */ vue.defineComponent({
     const sysCssName = sysCss == null ? void 0 : sysCss.cssName;
     const viewClassNames = [ns.b(), ns.b(typeClass), ns.m(codeName), sysCssName];
     const isLoading = vue.ref(false);
-    const url = vue.computed(() => {
-      const {
-        htmlUrl
-      } = c.model;
-      if (htmlUrl)
-        return core.StringUtil.fill(htmlUrl, c.context, c.params);
-      return "";
-    });
     vue.onBeforeMount(() => {
-      if (url.value) {
+      if (c.state.htmlUrl) {
         isLoading.value = true;
       }
     });
@@ -63,17 +54,18 @@ const HtmlView = /* @__PURE__ */ vue.defineComponent({
       ns,
       controls,
       viewClassNames,
-      url,
       isLoading,
       onLoad
     };
   },
   render() {
-    if (this.url) {
+    if (!this.c.state.isCreated)
+      return;
+    if (this.c.state.htmlUrl) {
       return vue.withDirectives(vue.createVNode("div", {
         "class": this.viewClassNames
       }, [vue.createVNode("iframe", {
-        "src": this.url,
+        "src": this.c.state.htmlUrl,
         "onLoad": () => this.onLoad()
       }, null)]), [[vue.resolveDirective("loading"), this.isLoading]]);
     }

package/lib/view/md-custom-view/md-custom-view.provider.cjs

@@ -0,0 +1,15 @@
+'use strict';
+
+var runtime = require('@ibiz-template/runtime');
+
+"use strict";
+class MDCustomViewProvider {
+  constructor() {
+    this.component = "IBizView";
+  }
+  createController(model, context, params, ctx) {
+    return new runtime.MDCustomViewController(model, context, params, ctx);
+  }
+}
+
+exports.MDCustomViewProvider = MDCustomViewProvider;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/vue3-util",
-  "version": "0.7.41-alpha.4",
+  "version": "0.7.41-alpha.40",
   "description": "通用组件库(vue3)",
   "main": "lib/index.cjs",
   "types": "es/index.d.ts",
@@ -36,11 +36,11 @@
   "author": "iBiz",
   "license": "MIT",
   "devDependencies": {
-    "@ibiz-template/cli": "^0.3.10",
-    "@ibiz-template/core": "^0.7.41-alpha.2",
-    "@ibiz-template/runtime": "^0.7.41-alpha.4",
+    "@ibiz-template/cli": "^0.3.23",
+    "@ibiz-template/core": "^0.7.41-alpha.35",
+    "@ibiz-template/runtime": "^0.7.41-alpha.40",
     "@ibiz-template/theme": "^0.7.39",
-    "@ibiz/model-core": "^0.1.77",
+    "@ibiz/model-core": "^0.1.83",
     "@types/path-browserify": "^1.0.2",
     "@types/qs": "^6.9.11",
     "@types/systemjs": "^6.13.5",
@@ -57,7 +57,7 @@
   "peerDependencies": {
     "@ibiz-template/core": "^0.6.0",
     "@ibiz-template/runtime": "^0.6.0",
-    "@ibiz/model-core": "^0.1.77",
+    "@ibiz/model-core": "^0.1.83",
     "dayjs": "^1.11.10",
     "path-browserify": "^1.0.1",
     "pinia": "^2.1.7",
@@ -67,5 +67,5 @@
     "vue": "^3.3.8",
     "vue-router": "^4.2.4"
   },
-  "gitHead": "a955f789ed730edef91eb1b98eda471a35cf82eb"
+  "gitHead": "9130d847c61eb8a06101d28df72dad72288e6e2b"
 }

package/es/panel-component/panel-container/panel-container.controller.d.ts

@@ -1,21 +0,0 @@
-import { PanelItemController } from '@ibiz-template/runtime';
-import { IPanelContainer } from '@ibiz/model-core';
-import { PanelContainerState } from './panel-container.state';
-/**
- * 面板容器控制器
- *
- * @export
- * @class PanelContainerController
- * @extends {PanelItemController}
- */
-export declare class PanelContainerController extends PanelItemController<IPanelContainer> {
-    /**
-     * @description 面板容器状态
-     * @exposedoc
-     * @type {PanelContainerState}
-     * @memberof PanelContainerController
-     */
-    state: PanelContainerState;
-    protected createState(): PanelContainerState;
-}
-//# sourceMappingURL=panel-container.controller.d.ts.map

package/es/panel-component/panel-container/panel-container.controller.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"panel-container.controller.d.ts","sourceRoot":"","sources":["../../../src/panel-component/panel-container/panel-container.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAC7D,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAE9D;;;;;;GAMG;AACH,qBAAa,wBAAyB,SAAQ,mBAAmB,CAAC,eAAe,CAAC;IAChF;;;;;OAKG;IACK,KAAK,EAAE,mBAAmB,CAAC;IAEnC,SAAS,CAAC,WAAW,IAAI,mBAAmB;CAG7C"}

package/es/panel-component/panel-container/panel-container.controller.mjs

@@ -1,12 +0,0 @@
-import { PanelItemController } from '@ibiz-template/runtime';
-import { PanelContainerState } from './panel-container.state.mjs';
-
-"use strict";
-class PanelContainerController extends PanelItemController {
-  createState() {
-    var _a;
-    return new PanelContainerState((_a = this.parent) == null ? void 0 : _a.state);
-  }
-}
-
-export { PanelContainerController };

package/es/panel-component/panel-container/panel-container.state.d.ts

@@ -1,10 +0,0 @@
-import { PanelItemState } from '@ibiz-template/runtime';
-/**
- * @description 面板容器状态
- * @export
- * @class PanelContainerState
- * @extends {PanelItemState}
- */
-export declare class PanelContainerState extends PanelItemState {
-}
-//# sourceMappingURL=panel-container.state.d.ts.map

package/es/panel-component/panel-container/panel-container.state.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"panel-container.state.d.ts","sourceRoot":"","sources":["../../../src/panel-component/panel-container/panel-container.state.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAExD;;;;;GAKG;AACH,qBAAa,mBAAoB,SAAQ,cAAc;CAAG"}

package/es/panel-component/panel-container/panel-container.state.mjs

@@ -1,7 +0,0 @@
-import { PanelItemState } from '@ibiz-template/runtime';
-
-"use strict";
-class PanelContainerState extends PanelItemState {
-}
-
-export { PanelContainerState };

package/es/util/control/prepare-control.d.ts

@@ -1,15 +0,0 @@
-import { Namespace } from '@ibiz-template/core';
-import { IControlController } from '@ibiz-template/runtime';
-/**
- * 部件UI组件准备参数
- * @author lxm
- * @date 2023-06-15 09:51:23
- * @export
- * @param {IControlController} c
- * @return {*}
- */
-export declare function prepareControl(c: IControlController): {
-    controlClass: string[];
-    ns: Namespace;
-};
-//# sourceMappingURL=prepare-control.d.ts.map

package/es/util/control/prepare-control.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"prepare-control.d.ts","sourceRoot":"","sources":["../../../src/util/control/prepare-control.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAG5D;;;;;;;GAOG;AACH,wBAAgB,cAAc,CAAC,CAAC,EAAE,kBAAkB,GAAG;IACrD,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,EAAE,EAAE,SAAS,CAAC;CACf,CAiBA"}

package/es/util/control/prepare-control.mjs

@@ -1,22 +0,0 @@
-import '../../use/index.mjs';
-import { useNamespace } from '../../use/namespace/namespace.mjs';
-
-"use strict";
-function prepareControl(c) {
-  const commonNs = useNamespace("control");
-  const { controlType, sysCss, codeName } = c.model;
-  const typeClass = controlType.toLowerCase();
-  const sysCssName = sysCss == null ? void 0 : sysCss.cssName;
-  const ns = useNamespace("control-".concat(typeClass));
-  const controlClass = [
-    commonNs.b(),
-    commonNs.b(typeClass),
-    commonNs.m(codeName)
-  ];
-  if (sysCssName) {
-    controlClass.push(sysCssName);
-  }
-  return { controlClass, ns };
-}
-
-export { prepareControl };

package/lib/panel-component/panel-container/panel-container.controller.cjs

@@ -1,14 +0,0 @@
-'use strict';
-
-var runtime = require('@ibiz-template/runtime');
-var panelContainer_state = require('./panel-container.state.cjs');
-
-"use strict";
-class PanelContainerController extends runtime.PanelItemController {
-  createState() {
-    var _a;
-    return new panelContainer_state.PanelContainerState((_a = this.parent) == null ? void 0 : _a.state);
-  }
-}
-
-exports.PanelContainerController = PanelContainerController;

package/lib/panel-component/panel-container/panel-container.state.cjs

@@ -1,9 +0,0 @@
-'use strict';
-
-var runtime = require('@ibiz-template/runtime');
-
-"use strict";
-class PanelContainerState extends runtime.PanelItemState {
-}
-
-exports.PanelContainerState = PanelContainerState;

package/lib/util/control/prepare-control.cjs

@@ -1,24 +0,0 @@
-'use strict';
-
-require('../../use/index.cjs');
-var namespace = require('../../use/namespace/namespace.cjs');
-
-"use strict";
-function prepareControl(c) {
-  const commonNs = namespace.useNamespace("control");
-  const { controlType, sysCss, codeName } = c.model;
-  const typeClass = controlType.toLowerCase();
-  const sysCssName = sysCss == null ? void 0 : sysCss.cssName;
-  const ns = namespace.useNamespace("control-".concat(typeClass));
-  const controlClass = [
-    commonNs.b(),
-    commonNs.b(typeClass),
-    commonNs.m(codeName)
-  ];
-  if (sysCssName) {
-    controlClass.push(sysCssName);
-  }
-  return { controlClass, ns };
-}
-
-exports.prepareControl = prepareControl;