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

package/lib/control/tree-grid-ex/tree-grid-ex.cjs

@@ -5,6 +5,7 @@ var vue3Util = require('@ibiz-template/vue3-util');
 var runtime = require('@ibiz-template/runtime');
 require('./tree-grid-ex.css');
 var core = require('@ibiz-template/core');
+var qxUtil = require('qx-util');
 var useRowEditPopover = require('./use-row-edit-popover.cjs');
 
 "use strict";
@@ -66,6 +67,7 @@ const TreeGridExControl = /* @__PURE__ */ vue.defineComponent({
         return temp;
       });
     };
+    const tableRefreshKey = vue.ref(qxUtil.createUUID());
     const treeRootData = vue.computed(() => {
       if (!c.state.isLoaded) {
         return [];
@@ -78,11 +80,15 @@ const TreeGridExControl = /* @__PURE__ */ vue.defineComponent({
       }, []);
     });
     const elTableData = vue.computed(() => {
+      tableRefreshKey.value = qxUtil.createUUID();
       if (treeRootData.value.length === 0) {
         return [];
       }
       return toElNodes(treeRootData.value, true);
     });
+    c.evt.on("onAfterRefreshParent", () => {
+      tableRefreshKey.value = qxUtil.createUUID();
+    });
     const loadData = async (item, treeNode, callback) => {
       let nodes;
       const nodeData = c.getNodeData(item.id);
@@ -157,6 +163,7 @@ const TreeGridExControl = /* @__PURE__ */ vue.defineComponent({
       tableRef,
       elTableData,
       renderColumns,
+      tableRefreshKey,
       renderNoData,
       loadData,
       onRowClick,
@@ -209,6 +216,7 @@ const TreeGridExControl = /* @__PURE__ */ vue.defineComponent({
     }, {
       default: () => [this.c.state.isLoaded && vue.createVNode(vue.resolveComponent("el-table"), {
         "ref": "tableRef",
+        "key": this.tableRefreshKey,
         "class": this.ns.e("table"),
         "border": true,
         "row-key": "id",

package/lib/editor/color-picker/ibiz-color-picker/ibiz-color-picker.cjs

@@ -16,6 +16,7 @@ const IBizColorPicker = /* @__PURE__ */ vue.defineComponent({
     const c = props.controller;
     const currentVal = vue.ref("");
     const colorPicker = vue.ref(null);
+    const predefineColors = vue.ref(["#000000", "#2C2C2C", "#50555C", "#ACB3BF", "#D0D3D9", "#C4C4C4", "#DADADA", "#E5E5E5", "#F0F0F0", "#F24E1E", "#E99C58", "#FFC700", "#FF4D00", "#FF00D6", "#D82E57", "#8E1DE8", "#0ACF83", "#18A0FB", "#A259FF", "#907CFF"]);
     const showFormDefaultContent = vue.computed(() => {
       if (props.controlParams && props.controlParams.editmode === "hover") {
         return true;
@@ -59,6 +60,7 @@ const IBizColorPicker = /* @__PURE__ */ vue.defineComponent({
       ns,
       c,
       currentVal,
+      predefineColors,
       contentStyle,
       colorPicker,
       handleChange,
@@ -85,7 +87,9 @@ const IBizColorPicker = /* @__PURE__ */ vue.defineComponent({
         "onChange": this.handleChange,
         "onBlur": this.onBlur,
         "onFocus": this.onFocus,
-        "size": "small"
+        "size": "small",
+        "predefine": this.predefineColors,
+        "show-alpha": true
       }, null), vue.createVNode("span", {
         "class": this.ns.b("text")
       }, [this.currentVal])]);

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

@@ -163,7 +163,7 @@ const IBizPicker = /* @__PURE__ */ vue.defineComponent({
     vue.onMounted(() => {
       vue.watch(() => props.data[c.valueItem], async (newVal, oldVal) => {
         if (newVal !== oldVal) {
-          if (!isLoaded.value && editorRef.value) {
+          if (!isLoaded.value && editorRef.value && ramda.isNil(props.value)) {
             await onSearch("");
           }
           const curItem = items.value.find((item) => Object.is(item[c.keyName], newVal));

package/lib/editor/data-picker/ibiz-picker-dropdown/ibiz-picker-dropdown.cjs

@@ -91,7 +91,7 @@ const IBizPickerDropDown = /* @__PURE__ */ vue.defineComponent({
     vue.onMounted(() => {
       vue.watch(() => props.data[c.valueItem], async (newVal, oldVal) => {
         if (newVal !== oldVal) {
-          if (!isLoaded.value && editorRef.value) {
+          if (!isLoaded.value && editorRef.value && ramda.isNil(props.value)) {
             shouldLoad.value = true;
             await onSearch("");
           }

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/vue3-components",
-  "version": "0.6.0-alpha.3",
+  "version": "0.6.0-alpha.4",
   "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/core": "^0.6.0-alpha.4",
     "@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/model-helper": "^0.6.0-alpha.4",
+    "@ibiz-template/runtime": "^0.6.0-alpha.4",
     "@ibiz-template/theme": "^0.5.0",
-    "@ibiz-template/vue3-util": "^0.6.0-alpha.3",
+    "@ibiz-template/vue3-util": "^0.6.0-alpha.4",
     "@ibiz-template/web-theme": "^1.1.8",
     "@ibiz/model-core": "^0.1.11",
     "@imengyu/vue3-context-menu": "^1.3.5",