@ibiz-template/vue3-components 0.6.0-alpha.3 → 0.6.0

package/lib/editor/data-picker/picker-editor.controller.cjs

@@ -295,7 +295,14 @@ class PickerEditorController extends runtime.EditorController {
     }
     if (this.objectValueField) {
       Object.assign(object, {
-        [this.objectValueField]: ramda.clone(select)
+        [this.objectValueField]: {
+          ...select
+        }
+      });
+    }
+    if (select.srfnodeid) {
+      Object.assign(object, {
+        srfnodeid: select.srfnodeid
       });
     }
     return object;

package/lib/editor/span/span/span.css

@@ -1 +1 @@
-.ibiz-span{display:inline-block;font-size:var(--ibiz-form-item-font-size);line-height:var(--ibiz-form-item-line-height);color:var(--ibiz-form-item-text-color);white-space:pre-line}.ibiz-span--readonly{color:var(--ibiz-form-item-readonly-color)}.ibiz-span__code-list{display:inline-block;height:100%}.ibiz-form-item .ibiz-span.is-show-default{padding:var(--ibiz-form-item-hover-edit-padding)}
+.ibiz-span{display:inline-block;font-size:var(--ibiz-form-item-font-size);line-height:var(--ibiz-form-item-line-height);color:var(--ibiz-form-item-text-color);white-space:pre-line}.ibiz-span--readonly{color:var(--ibiz-form-item-readonly-color)}.ibiz-span__code-list{height:100%}.ibiz-form-item .ibiz-span.is-show-default{padding:var(--ibiz-form-item-hover-edit-padding)}

package/lib/panel-component/user-message/internal-message/common/internal-message-default/internal-message-default.provider.cjs

@@ -41,25 +41,11 @@ class InternalMessageDefaultProvider {
    */
   async openRedirectView(msg, redirectUrl) {
     await ibiz.hub.notice.internalMessage.markRead(msg);
-    let viewId = "";
-    const params = {};
-    const url = new URL(redirectUrl);
-    if (url.searchParams.size > 0) {
-      url.searchParams.forEach((value, _key) => {
-        params[_key] = value;
-      });
-    }
-    const rdTagItems = url.pathname.replace("//", "").split("/");
-    const [appOrViewTag, viewTag] = rdTagItems;
-    if (viewTag) {
-      viewId = viewTag;
-    } else {
-      viewId = appOrViewTag;
-    }
+    const { viewId, context, params } = runtime.parseViewProtocol(redirectUrl);
     ibiz.commands.execute(
       runtime.OpenAppViewCommand.TAG,
       viewId,
-      core.IBizContext.create({}),
+      core.IBizContext.create(context),
       params
     );
   }

package/lib/util/app-modal/app-modal-component.cjs

@@ -18,7 +18,6 @@ const AppModalComponent = /* @__PURE__ */ vue.defineComponent({
   setup(props, ctx) {
     const ns = vue3Util.useNamespace("modal");
     const isShow = vue.ref(false);
-    let data;
     const {
       zIndex
     } = vue3Util.useUIStore();
@@ -52,10 +51,10 @@ const AppModalComponent = /* @__PURE__ */ vue.defineComponent({
     const modal = new runtime.Modal({
       mode: runtime.ViewMode.MODAL,
       viewUsage: 2,
-      dismiss: (_data) => {
+      dismiss: (data) => {
         zIndex.decrement();
         isShow.value = false;
-        data = _data;
+        ctx.emit("dismiss", data);
       }
     });
     const onBeforeClose = async (done) => {
@@ -70,9 +69,6 @@ const AppModalComponent = /* @__PURE__ */ vue.defineComponent({
     const present = () => {
       isShow.value = true;
     };
-    const onClosed = () => {
-      ctx.emit("dismiss", data);
-    };
     return {
       ns,
       isShow,
@@ -82,7 +78,6 @@ const AppModalComponent = /* @__PURE__ */ vue.defineComponent({
       modal,
       present,
       dismiss,
-      onClosed,
       onBeforeClose
     };
   },
@@ -94,8 +89,7 @@ const AppModalComponent = /* @__PURE__ */ vue.defineComponent({
       class: [this.ns.b(), this.options.placement && this.ns.m(this.options.placement), this.options.modalClass],
       style: this.customStyle,
       zIndex: this.modalZIndex,
-      onClosed: this.onClosed,
-      onBeforeClose: this.onBeforeClose,
+      beforeClose: this.onBeforeClose,
       ...this.options
     }, (_b = (_a = this.$slots).default) == null ? void 0 : _b.call(_a, this.modal));
   }

package/lib/view-engine/edit-view.engine.cjs

@@ -269,11 +269,12 @@ class EditViewEngine extends runtime.ViewEngineBase {
    * @return {*}  {void}
    */
   initMarkOpenData() {
-    if (ramda.isNil(this.view.modal.routeDepth)) {
+    if (ramda.isNil(this.view.modal.routeDepth) || !this.view.model.markOpenDataMode) {
       return;
     }
-    let srfkey;
-    const callback = (data) => {
+    const modes = this.view.model.markOpenDataMode.split(";");
+    let hasOpenConfirm = false;
+    const callback = async (data) => {
       if (!this.view.state.activated) {
         return;
       }
@@ -294,44 +295,93 @@ class EditViewEngine extends runtime.ViewEngineBase {
       }
       ibiz.notification.info({
         position: "bottom-right",
-        title: data.username,
-        desc: "".concat(actionMsg, " ").concat(this.view.state.caption, "-").concat(dataInfo)
-      });
-    };
-    this.form.evt.on("onLoadSuccess", (event) => {
-      const formData = event.data[0];
-      srfkey = formData.srfkey;
-      ibiz.markOpenData.action(this.deName, srfkey, "VIEW");
-      ibiz.markOpenData.subscribe(this.deName, srfkey, callback);
-      this.view.evt.on("onDestroyed", () => {
-        ibiz.markOpenData.unsubscribe(this.deName, srfkey, callback);
+        title: "\u901A\u77E5",
+        desc: "".concat(modes.includes("DISPLAYOPPERSON") ? data.username : "\u6709\u4EBA", " ").concat(actionMsg, " ").concat(this.view.state.caption, "-").concat(dataInfo)
       });
-    });
-    let isWait = false;
-    const actionEdit = () => {
-      if (!srfkey || isWait) {
-        return;
+      if (hasOpenConfirm === false && data.action === "UPDATE" && modes.includes("NOTICERELOAD")) {
+        hasOpenConfirm = true;
+        const isReload = await this.reloadConfirm();
+        if (isReload) {
+          this.refresh();
+        }
+        hasOpenConfirm = false;
       }
-      isWait = true;
-      ibiz.markOpenData.action(this.deName, srfkey, "EDIT");
-      setTimeout(
-        () => {
-          isWait = false;
-        },
-        1e3 * 60 * 5
-      );
     };
-    this.form.evt.on("onFormDataChange", actionEdit);
-    this.form.evt.on("onSaveSuccess", () => {
-      if (srfkey) {
-        ibiz.markOpenData.action(this.deName, srfkey, "UPDATE");
-      }
-    });
-    this.view.evt.on("onCloseView", () => {
-      if (srfkey) {
-        ibiz.markOpenData.action(this.deName, srfkey, "CLOSE");
-      }
+    const doActions = [];
+    if (modes.includes("EDITDATA") || modes.includes("DISPLAYOPPERSON") || modes.includes("NOTICERELOAD")) {
+      doActions.push("EDIT", "VIEW", "UPDATE", "CLOSE");
+    } else if (modes.includes("OPENDATA")) {
+      doActions.push("VIEW", "CLOSE");
+    }
+    if (doActions.length === 0) {
+      return;
+    }
+    let srfkey;
+    let hasSubscribe = false;
+    if (doActions.includes("VIEW")) {
+      this.form.evt.on("onLoadSuccess", (event) => {
+        const formData = event.data[0];
+        srfkey = formData.srfkey;
+        ibiz.markOpenData.action(this.deName, srfkey, "VIEW");
+        if (!hasSubscribe) {
+          ibiz.markOpenData.subscribe(this.deName, srfkey, callback);
+          this.view.evt.on("onDestroyed", () => {
+            ibiz.markOpenData.unsubscribe(this.deName, srfkey, callback);
+          });
+          hasSubscribe = true;
+        }
+      });
+    }
+    if (doActions.includes("EDIT")) {
+      let isWait = false;
+      const actionEdit = () => {
+        if (!srfkey || isWait) {
+          return;
+        }
+        isWait = true;
+        ibiz.markOpenData.action(this.deName, srfkey, "EDIT");
+        setTimeout(
+          () => {
+            isWait = false;
+          },
+          1e3 * 60 * 5
+        );
+      };
+      this.form.evt.on("onFormDataChange", actionEdit);
+    }
+    if (doActions.includes("UPDATE")) {
+      this.form.evt.on("onSaveSuccess", () => {
+        if (srfkey) {
+          ibiz.markOpenData.action(this.deName, srfkey, "UPDATE");
+        }
+      });
+    }
+    if (doActions.includes("CLOSE")) {
+      this.view.evt.on("onCloseView", () => {
+        if (srfkey) {
+          ibiz.markOpenData.action(this.deName, srfkey, "CLOSE");
+        }
+      });
+    }
+  }
+  /**
+   * 刷新确认
+   * @author lxm
+   * @date 2024-02-06 11:40:36
+   * @return {*}  {Promise<boolean>}
+   */
+  async reloadConfirm() {
+    const result = await ibiz.confirm.info({
+      title: "\u662F\u5426\u5237\u65B0",
+      desc: "\u6570\u636E\u5DF2\u88AB\u4FEE\u6539\u662F\u5426\u5237\u65B0\u9875\u9762\uFF1F"
     });
+    if (result && this.form.state.modified) {
+      return ibiz.confirm.warning({
+        title: "\u5237\u65B0\u63D0\u9192",
+        desc: "\u8868\u5355\u6570\u636E\u5DF2\u7ECF\u4FEE\u6539\uFF0C\u786E\u5B9A\u8981\u5237\u65B0\uFF1F"
+      });
+    }
+    return result;
   }
 }
 

package/lib/view-engine/pickup-tree-view.engine.cjs

@@ -4,7 +4,23 @@ var runtime = require('@ibiz-template/runtime');
 var treeView_engine = require('./tree-view.engine.cjs');
 
 "use strict";
+var __defProp = Object.defineProperty;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __publicField = (obj, key, value) => {
+  __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
+  return value;
+};
 class PickupTreeViewEngine extends treeView_engine.TreeViewEngine {
+  constructor() {
+    super(...arguments);
+    /**
+     * 选中数据
+     *
+     * @type {IData[]}
+     * @memberof PickupViewEngine
+     */
+    __publicField(this, "selectData", []);
+  }
   /**
    * 创建完成
    *
@@ -18,6 +34,41 @@ class PickupTreeViewEngine extends treeView_engine.TreeViewEngine {
       this.view.slotProps.tree = {};
     }
     this.view.slotProps.tree.singleSelect = this.view.state.singleSelect;
+    if (this.view.state.selectedData) {
+      this.selectData = this.view.state.selectedData.map((item) => {
+        return {
+          ...item,
+          _id: item.srfnodeid
+        };
+      });
+      const set = /* @__PURE__ */ new Set();
+      this.selectData.forEach((item) => {
+        if (item.srfnodeid) {
+          const keys = this.calcExpandKeys(item.srfnodeid);
+          keys.forEach((key) => set.add(key));
+        }
+      });
+      this.view.slotProps.tree.defaultExpandedKeys = Array.from(set);
+    }
+  }
+  /**
+   * 根据key计算需要展开的节点标识
+   * @author lxm
+   * @date 2023-11-07 02:42:45
+   * @param {string} key
+   * @return {*}  {string[]}
+   */
+  calcExpandKeys(key) {
+    const expandedKeys = [];
+    key.split(":").forEach((item, index) => {
+      if (index === 0) {
+        expandedKeys.push(item);
+      } else {
+        expandedKeys.push("".concat(expandedKeys[index - 1], ":").concat(item));
+      }
+    });
+    expandedKeys.pop();
+    return expandedKeys;
   }
   /**
    * 挂载完成
@@ -28,15 +79,21 @@ class PickupTreeViewEngine extends treeView_engine.TreeViewEngine {
    */
   async onMounted() {
     const { model } = this.view;
+    let forbiddenSelectionChange = false;
     this.xdataControl.evt.on("onSelectionChange", async (event) => {
-      if (event.data[0] && event.data[0] instanceof runtime.TreeDataSetNodeData) {
-        event.data[0] = event.data[0]._deData;
+      if (forbiddenSelectionChange) {
+        return;
       }
       this.view.evt.emit("onSelectionChange", { ...event });
     });
     this.xdataControl.evt.on("onActive", async (event) => {
       this.view.evt.emit("onDataActive", { ...event });
     });
+    this.xdataControl.evt.on("onLoadSuccess", () => {
+      forbiddenSelectionChange = true;
+      this.xdataControl.setSelection(this.selectData);
+      forbiddenSelectionChange = false;
+    });
     if (!this.view.state.noLoadDefault && model.loadDefault) {
       this.load();
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/vue3-components",
-  "version": "0.6.0-alpha.3",
+  "version": "0.6.0",
   "description": "使用 rollup 编译 vue 组件或者 jsx",
   "main": "lib/index.cjs",
   "module": "es/index.mjs",
@@ -27,12 +27,12 @@
     "@floating-ui/dom": "^1.5.3",
     "@ibiz-template-plugin/ai-chat": "^0.0.1",
     "@ibiz-template-plugin/gantt": "0.1.1",
-    "@ibiz-template/core": "^0.5.7-alpha.10",
-    "@ibiz-template/devtool": "0.0.1-dev.3",
-    "@ibiz-template/model-helper": "^0.6.0-alpha.3",
-    "@ibiz-template/runtime": "^0.6.0-alpha.3",
+    "@ibiz-template/core": "^0.6.0",
+    "@ibiz-template/devtool": "0.0.1-alpha.0",
+    "@ibiz-template/model-helper": "^0.6.0",
+    "@ibiz-template/runtime": "^0.6.0",
     "@ibiz-template/theme": "^0.5.0",
-    "@ibiz-template/vue3-util": "^0.6.0-alpha.3",
+    "@ibiz-template/vue3-util": "^0.6.0",
     "@ibiz-template/web-theme": "^1.1.8",
     "@ibiz/model-core": "^0.1.11",
     "@imengyu/vue3-context-menu": "^1.3.5",