@ibiz-template/vue3-util 0.7.38-alpha.57 → 0.7.40-alpha.8

package/lib/use/popover/popover.cjs

@@ -0,0 +1,96 @@
+'use strict';
+
+var qxUtil = require('qx-util');
+var vue = require('vue');
+var core = require('@ibiz-template/core');
+require('../../util/index.cjs');
+var uiStore = require('../../util/store/ui-store/ui-store.cjs');
+
+"use strict";
+function usePopoverzIndex() {
+  const popoverid = "popover_".concat(qxUtil.createUUID());
+  const setPopoverZIndex = (zIndexClass) => {
+    const { zIndex } = uiStore.useUIStore();
+    const transfer = document.getElementsByClassName(popoverid);
+    const modalZIndex = zIndex.increment();
+    if (transfer && transfer.length > 0 && zIndexClass) {
+      for (let i = 0; i < transfer.length; i++) {
+        transfer[i].style.setProperty(
+          zIndexClass,
+          "".concat(modalZIndex)
+        );
+      }
+    }
+  };
+  return {
+    popoverid,
+    setPopoverZIndex
+  };
+}
+function shareCommonAncestor(element1, element2) {
+  if (!element1 || !element2)
+    return false;
+  if (element1 === element2)
+    return true;
+  const ancestorsOfElement1 = /* @__PURE__ */ new Set();
+  let current = element1;
+  while (current) {
+    ancestorsOfElement1.add(current);
+    const parentNode = current.parentNode;
+    if (parentNode && (parentNode.nodeName === "BODY" || parentNode.nodeName === "HTML")) {
+      current = null;
+    } else {
+      current = parentNode;
+    }
+  }
+  current = element2;
+  while (current) {
+    if (ancestorsOfElement1.has(current)) {
+      return true;
+    }
+    current = current.parentNode;
+  }
+  return false;
+}
+function usePopoverVisible(triggerRef, getElement) {
+  let cleanup;
+  const popoverVisible = vue.ref(false);
+  const setPopoverVisible = (visible) => {
+    popoverVisible.value = visible;
+  };
+  vue.watch(
+    () => triggerRef.value,
+    (newValue) => {
+      if (newValue && !cleanup) {
+        cleanup = core.listenJSEvent(
+          window,
+          "click",
+          (evt) => {
+            if (popoverVisible.value && triggerRef.value) {
+              const result = shareCommonAncestor(
+                getElement(triggerRef.value),
+                evt.target
+              );
+              if (result) {
+                popoverVisible.value = false;
+              }
+            }
+          },
+          { capture: true }
+        );
+      }
+    },
+    { immediate: true }
+  );
+  vue.onUnmounted(() => {
+    cleanup == null ? void 0 : cleanup();
+  });
+  return {
+    popoverVisible,
+    setPopoverVisible
+  };
+}
+
+exports.shareCommonAncestor = shareCommonAncestor;
+exports.usePopoverVisible = usePopoverVisible;
+exports.usePopoverzIndex = usePopoverzIndex;

package/lib/use/view/use-view-operation/use-view-operation.cjs

@@ -12,9 +12,14 @@ function useViewOperation(view) {
     if (!viewElement)
       return;
     listenJSEventFuncs = listenJSEventNames.map((eventName) => {
-      return core.listenJSEvent(viewElement, eventName, (event) => {
-        view.setOperateState("MANUAL");
-      });
+      return core.listenJSEvent(
+        viewElement,
+        eventName,
+        (event) => {
+          view.setOperateState("MANUAL");
+        },
+        { once: true, capture: true }
+      );
     });
   });
   vue.onUnmounted(() => {

package/lib/view/de-redirect-view/de-redirect-view.cjs

@@ -21,6 +21,10 @@ const DeRedirectView = /* @__PURE__ */ vue.defineComponent({
     modelData: {
       type: Object,
       required: true
+    },
+    isEmbedCtrlNav: {
+      type: Boolean,
+      default: false
     }
   },
   setup(props) {
@@ -39,6 +43,18 @@ const DeRedirectView = /* @__PURE__ */ vue.defineComponent({
         }
       });
     });
+    if (props.isEmbedCtrlNav) {
+      vue.watch(() => [c.context, c.params], () => {
+        runtime.getDERedirectToView(vue.toRaw(props.modelData), vue.toRaw(c.context), vue.toRaw(c.params)).then(async (result) => {
+          if (result.type === "view") {
+            toViewId.value = result.viewId;
+            toViewContext.value = result.context;
+          }
+        });
+      }, {
+        deep: true
+      });
+    }
     return {
       c,
       toViewId,

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

@@ -1,6 +1,7 @@
 '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');
@@ -42,14 +43,11 @@ const HtmlView = /* @__PURE__ */ vue.defineComponent({
     const viewClassNames = [ns.b(), ns.b(typeClass), ns.m(codeName), sysCssName];
     const isLoading = vue.ref(false);
     const url = vue.computed(() => {
-      if (c.model) {
-        const {
-          htmlUrl
-        } = c.model;
-        if (htmlUrl) {
-          return htmlUrl;
-        }
-      }
+      const {
+        htmlUrl
+      } = c.model;
+      if (htmlUrl)
+        return core.StringUtil.fill(htmlUrl, c.context, c.params);
       return "";
     });
     vue.onBeforeMount(() => {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@ibiz-template/vue3-util",
-  "version": "0.7.38-alpha.57",
-  "description": "vue3 工具包",
+  "version": "0.7.40-alpha.8",
+  "description": "通用组件库(vue3)",
   "main": "lib/index.cjs",
   "types": "es/index.d.ts",
   "system": "./dist/index.system.js",
@@ -11,14 +11,11 @@
       "require": "./lib/index.cjs"
     }
   },
-  "repository": {
-    "type": "git",
-    "url": "https://gitee.com/iBizModeling/ibiz-template.git"
-  },
   "files": [
     "dist",
     "es",
-    "lib"
+    "lib",
+    "README.md"
   ],
   "scripts": {
     "dev": "ibiz-temp build -w",
@@ -36,14 +33,14 @@
     "publish:npm": "npm run build && npm publish --access public --registry=https://registry.npmjs.org/",
     "publish:local": "npm run build && npm publish --access public --registry=http://172.16.240.221:8081/repository/local/"
   },
-  "author": "chitanda",
+  "author": "iBiz",
   "license": "MIT",
   "devDependencies": {
     "@ibiz-template/cli": "^0.3.10",
-    "@ibiz-template/core": "^0.7.38-alpha.57",
-    "@ibiz-template/runtime": "^0.7.38-alpha.57",
-    "@ibiz-template/theme": "^0.7.32",
-    "@ibiz/model-core": "^0.1.64",
+    "@ibiz-template/core": "^0.7.40-alpha.7",
+    "@ibiz-template/runtime": "^0.7.40-alpha.8",
+    "@ibiz-template/theme": "^0.7.39",
+    "@ibiz/model-core": "^0.1.71",
     "@types/path-browserify": "^1.0.2",
     "@types/qs": "^6.9.11",
     "@types/systemjs": "^6.13.5",
@@ -60,7 +57,7 @@
   "peerDependencies": {
     "@ibiz-template/core": "^0.6.0",
     "@ibiz-template/runtime": "^0.6.0",
-    "@ibiz/model-core": "^0.1.64",
+    "@ibiz/model-core": "^0.1.71",
     "dayjs": "^1.11.10",
     "path-browserify": "^1.0.1",
     "pinia": "^2.1.7",