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

package/es/editor/data-picker/ibiz-picker-select-view/ibiz-picker-select-view.mjs

@@ -1,8 +1,8 @@
-import { isVNode, ref, computed, watch, onMounted, resolveComponent, createVNode, h, defineComponent } from 'vue';
+import { isVNode, ref, watch, computed, onMounted, resolveComponent, createVNode, h, defineComponent } from 'vue';
 import { getDataPickerProps, getEditorEmits, useNamespace, useFocusAndBlur } from '@ibiz-template/vue3-util';
 import './ibiz-picker-select-view.css';
-import { clone } from 'ramda';
 import { ViewMode, Modal } from '@ibiz-template/runtime';
+import { clone } from 'ramda';
 
 "use strict";
 function _isSlot(s) {
@@ -30,9 +30,24 @@ const IBizPickerSelectView = /* @__PURE__ */ defineComponent({
     const queryValue = ref("");
     const visible = ref(false);
     const pickViewWidth = ref("auto");
-    const context = ref(clone(c.context));
-    const params = ref(clone(c.params));
+    const context = ref(c.context);
+    const params = ref(c.params);
+    watch(() => props.data, (newVal) => {
+      const {
+        context: tempContext,
+        params: tempParams
+      } = c.handlePublicParams(newVal, c.context, c.params);
+      Object.assign(context.value, tempContext);
+      Object.assign(params.value, tempParams);
+    }, {
+      immediate: true,
+      deep: true
+    });
     const isEditable = ref(false);
+    const multipleTempValue = ref(null);
+    const multipleTempText = ref(null);
+    const multipleObjs = ref(null);
+    const showView = ref(false);
     const showFormDefaultContent = computed(() => {
       if (props.controlParams && props.controlParams.editmode === "hover") {
         return true;
@@ -48,12 +63,6 @@ const IBizPickerSelectView = /* @__PURE__ */ defineComponent({
         }, 100);
       }
     };
-    const onInputChange = () => {
-      context.value = {
-        query: queryValue.value,
-        ...context.value
-      };
-    };
     const triggerMenu = (show) => {
       if (props.disabled) {
         return;
@@ -84,10 +93,30 @@ const IBizPickerSelectView = /* @__PURE__ */ defineComponent({
           params.value.selectedData = selectedData.value;
         }
       } else {
-        keySet.value = [];
         const selectItems = [];
+        keySet.value = [];
+        items.value = [];
         if (newVal) {
-          if (!props.data || !c.valueItem || !props.data[c.valueItem]) {
+          if (c.model.valueType === "OBJECTS") {
+            newVal.forEach((item) => {
+              const _item = clone(item);
+              Object.assign(_item, {
+                [c.keyName]: item[c.objectIdField],
+                [c.textName]: item[c.objectNameField]
+              });
+              if (c.objectValueField) {
+                Object.assign(_item, {
+                  ...item[c.objectValueField]
+                });
+                delete _item[c.objectValueField];
+              }
+              if (_item[c.keyName]) {
+                items.value.push(_item);
+                keySet.value.push(_item[c.keyName]);
+              }
+            });
+            selectItems.push(...newVal);
+          } else if (!props.data || !c.valueItem || !props.data[c.valueItem]) {
             ibiz.log.error("\u503C\u9879\u5F02\u5E38");
           } else {
             const tempValue = props.data[c.valueItem].split(",");
@@ -98,7 +127,6 @@ const IBizPickerSelectView = /* @__PURE__ */ defineComponent({
                 srfkey
               });
             });
-            items.value = [];
             selectItems.forEach((item) => {
               keySet.value.push(item.srfkey);
               const index = items.value.findIndex((i) => Object.is(i.srfkey, item.srfkey));
@@ -112,10 +140,10 @@ const IBizPickerSelectView = /* @__PURE__ */ defineComponent({
           }
         }
         selectedData.value = selectItems;
-        params.value.selectedData = selectedData.value;
+        multipleObjs.value = selectItems;
       }
     }, {
-      immediate: false,
+      immediate: true,
       deep: true
     });
     onMounted(() => {
@@ -135,9 +163,26 @@ const IBizPickerSelectView = /* @__PURE__ */ defineComponent({
       }
       emit("change", null);
     };
+    const onInputChange = (e) => {
+      if (!e) {
+        onClear();
+      }
+    };
     const onViewDataChange = (event) => {
       if (event.length === 0) {
-        onClear();
+        if (singleSelect.value) {
+          onClear();
+        } else {
+          items.value = [];
+          if (c.model.valueType === "OBJECTS") {
+            multipleObjs.value = null;
+          } else {
+            if (c.valueItem) {
+              multipleTempValue.value = null;
+            }
+            multipleTempText.value = null;
+          }
+        }
         return;
       }
       if (singleSelect.value) {
@@ -152,6 +197,15 @@ const IBizPickerSelectView = /* @__PURE__ */ defineComponent({
         } else {
           emit("change", tempText);
         }
+      } else if (c.model.valueType === "OBJECTS") {
+        if (event && Array.isArray(event)) {
+          const objs = [];
+          event.forEach((item) => {
+            const obj = c.handleObjectParams(item);
+            objs.push(obj);
+          });
+          multipleObjs.value = objs;
+        }
       } else {
         let tempValue = "";
         let tempText = "";
@@ -174,9 +228,9 @@ const IBizPickerSelectView = /* @__PURE__ */ defineComponent({
         tempValue = tempValue.substring(0, tempValue.length - 1);
         tempText = tempText.substring(0, tempText.length - 1);
         if (c.valueItem) {
-          emit("change", tempValue, c.valueItem);
+          multipleTempValue.value = tempValue;
         }
-        emit("change", tempText);
+        multipleTempText.value = tempText;
       }
     };
     const openLinkView = async (e) => {
@@ -196,20 +250,31 @@ const IBizPickerSelectView = /* @__PURE__ */ defineComponent({
           }
         });
       }
-      let tempValue = "";
-      let tempText = "";
-      val.forEach((select) => {
-        const srfkey = select[c.keyName] ? select[c.keyName] : select.srfkey;
-        tempValue += "".concat(srfkey, ",");
-        const srfmajortext = select[c.textName] ? select[c.textName] : select.srfmajortext;
-        tempText += "".concat(srfmajortext, ",");
-      });
-      tempValue = tempValue.substring(0, tempValue.length - 1);
-      tempText = tempText.substring(0, tempText.length - 1);
-      if (c.valueItem) {
-        emit("change", tempValue, c.valueItem);
+      if (c.model.valueType === "OBJECTS") {
+        const objs = [];
+        val.forEach((item) => {
+          const obj = c.handleObjectParams(item);
+          objs.push(obj);
+        });
+        emit("change", objs);
+      } else {
+        let tempValue = "";
+        let tempText = "";
+        val.forEach((select) => {
+          const srfkey = select[c.keyName] ? select[c.keyName] : select.srfkey;
+          tempValue += "".concat(srfkey, ",");
+          const srfmajortext = select[c.textName] ? select[c.textName] : select.srfmajortext;
+          tempText += "".concat(srfmajortext, ",");
+        });
+        tempValue = tempValue.substring(0, tempValue.length - 1);
+        tempText = tempText.substring(0, tempText.length - 1);
+        if (c.valueItem) {
+          multipleTempValue.value = tempValue;
+          emit("change", tempValue, c.valueItem);
+        }
+        multipleTempText.value = tempText;
+        emit("change", tempText);
       }
-      emit("change", tempText);
     };
     const remoteMethod = (e) => {
       queryValue.value = e;
@@ -217,6 +282,9 @@ const IBizPickerSelectView = /* @__PURE__ */ defineComponent({
     const onSelectionChange = (event) => {
       if (event.data) {
         onViewDataChange(event.data);
+        if (singleSelect.value && editorRef.value) {
+          editorRef.value.handleClose();
+        }
       }
     };
     const modal = new Modal({
@@ -243,8 +311,21 @@ const IBizPickerSelectView = /* @__PURE__ */ defineComponent({
       if (singleSelect.value) {
         return queryValue.value;
       }
-      return selectedData.value.map((item) => item.srfmajortext).join(",");
+      return selectedData.value.map((item) => item[c.textName]).join(",");
     });
+    const onVisibleChange = (e) => {
+      showView.value = e;
+      if (!e && !singleSelect.value) {
+        if (c.model.valueType === "OBJECTS") {
+          emit("change", multipleObjs.value);
+        } else {
+          if (c.valueItem) {
+            emit("change", multipleTempValue.value, c.valueItem);
+          }
+          emit("change", multipleTempText.value);
+        }
+      }
+    };
     return {
       ns,
       c,
@@ -272,7 +353,10 @@ const IBizPickerSelectView = /* @__PURE__ */ defineComponent({
       valueText,
       isEditable,
       setEditable,
-      showFormDefaultContent
+      showFormDefaultContent,
+      onVisibleChange,
+      showView,
+      selectedData
     };
   },
   render() {
@@ -281,7 +365,8 @@ const IBizPickerSelectView = /* @__PURE__ */ defineComponent({
       "trigger": "click",
       "teleported": false,
       "class": this.ns.b("select"),
-      "popper-class": this.ns.b("popper")
+      "popper-class": this.ns.b("popper"),
+      "onVisibleChange": this.onVisibleChange
     }, {
       default: () => {
         let _slot;
@@ -292,6 +377,7 @@ const IBizPickerSelectView = /* @__PURE__ */ defineComponent({
           "disabled": this.disabled,
           "readonly": this.readonly,
           "onChange": this.onInputChange,
+          "clearable": true,
           "onFocus": (e) => {
             this.onFocus(e);
           },
@@ -302,13 +388,13 @@ const IBizPickerSelectView = /* @__PURE__ */ defineComponent({
             return [this.queryValue && !this.disabled && !this.readonly && createVNode("ion-icon", {
               "onClick": this.onClear,
               "name": "clear"
-            }, null), this.c.model.linkAppViewId && this.queryValue && createVNode("ion-icon", {
+            }, null), this.c.model.linkAppViewId && createVNode("ion-icon", {
               "onClick": this.openLinkView,
               "name": "link-arrow"
             }, null)];
           }
         }) : createVNode(resolveComponent("el-select"), {
-          "popper-class": "select",
+          "popper-class": this.ns.b("select-popover"),
           "model-value": this.keySet,
           "placeholder": this.c.placeHolder ? this.c.placeHolder : " ",
           "multiple": true,
@@ -333,19 +419,24 @@ const IBizPickerSelectView = /* @__PURE__ */ defineComponent({
         });
       },
       dropdown: () => {
+        if (!this.showView) {
+          return;
+        }
         const viewShell = resolveComponent("IBizViewShell");
-        return createVNode(resolveComponent("el-dropdown-menu"), null, {
-          default: () => [this.c.pickupView && h(viewShell, {
-            context: this.context,
-            params: this.params,
-            viewId: this.c.pickupView.id,
-            style: {
-              height: "100%",
-              width: this.pickViewWidth
-            },
-            onSelectionChange: this.onSelectionChange,
-            modal: this.modal
-          })]
+        return this.c.pickupView && h(viewShell, {
+          context: this.context,
+          params: this.params,
+          viewId: this.c.pickupView.id,
+          style: {
+            height: "100%",
+            width: this.pickViewWidth
+          },
+          state: {
+            singleSelect: this.singleSelect,
+            selectedData: this.selectedData
+          },
+          onSelectionChange: this.onSelectionChange,
+          modal: this.modal
         });
       }
     });

package/es/editor/data-picker/picker-editor.controller.mjs

@@ -1,6 +1,6 @@
 import { RuntimeModelError } from '@ibiz-template/core';
 import { EditorController, getDeACMode, OpenAppViewCommand } from '@ibiz-template/runtime';
-import { mergeDeepLeft, clone } from 'ramda';
+import { mergeDeepLeft } from 'ramda';
 
 "use strict";
 var __defProp = Object.defineProperty;
@@ -293,7 +293,14 @@ class PickerEditorController extends EditorController {
     }
     if (this.objectValueField) {
       Object.assign(object, {
-        [this.objectValueField]: clone(select)
+        [this.objectValueField]: {
+          ...select
+        }
+      });
+    }
+    if (select.srfnodeid) {
+      Object.assign(object, {
+        srfnodeid: select.srfnodeid
       });
     }
     return object;

package/es/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/es/panel-component/user-message/internal-message/common/internal-message-default/internal-message-default.provider.mjs

@@ -1,5 +1,5 @@
 import { IBizContext } from '@ibiz-template/core';
-import { OpenAppViewCommand } from '@ibiz-template/runtime';
+import { parseViewProtocol, OpenAppViewCommand } from '@ibiz-template/runtime';
 import { h } from 'vue';
 import { InternalMessageDefault } from './internal-message-default.mjs';
 
@@ -39,25 +39,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 } = parseViewProtocol(redirectUrl);
     ibiz.commands.execute(
       OpenAppViewCommand.TAG,
       viewId,
-      IBizContext.create({}),
+      IBizContext.create(context),
       params
     );
   }

package/es/util/app-modal/app-modal-component.d.ts

@@ -21,7 +21,6 @@ export declare const AppModalComponent: import("vue").DefineComponent<{
     modal: Modal;
     present: () => void;
     dismiss: (_data?: IModalData) => void;
-    onClosed: () => void;
     onBeforeClose: (done: () => void) => Promise<void>;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     opts: {

package/es/util/app-modal/app-modal-component.mjs

@@ -16,7 +16,6 @@ const AppModalComponent = /* @__PURE__ */ defineComponent({
   setup(props, ctx) {
     const ns = useNamespace("modal");
     const isShow = ref(false);
-    let data;
     const {
       zIndex
     } = useUIStore();
@@ -50,10 +49,10 @@ const AppModalComponent = /* @__PURE__ */ defineComponent({
     const modal = new Modal({
       mode: ViewMode.MODAL,
       viewUsage: 2,
-      dismiss: (_data) => {
+      dismiss: (data) => {
         zIndex.decrement();
         isShow.value = false;
-        data = _data;
+        ctx.emit("dismiss", data);
       }
     });
     const onBeforeClose = async (done) => {
@@ -68,9 +67,6 @@ const AppModalComponent = /* @__PURE__ */ defineComponent({
     const present = () => {
       isShow.value = true;
     };
-    const onClosed = () => {
-      ctx.emit("dismiss", data);
-    };
     return {
       ns,
       isShow,
@@ -80,7 +76,6 @@ const AppModalComponent = /* @__PURE__ */ defineComponent({
       modal,
       present,
       dismiss,
-      onClosed,
       onBeforeClose
     };
   },
@@ -92,8 +87,7 @@ const AppModalComponent = /* @__PURE__ */ 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/es/view-engine/edit-view.engine.d.ts

@@ -70,4 +70,11 @@ export declare class EditViewEngine extends ViewEngineBase {
      * @return {*}  {void}
      */
     initMarkOpenData(): void;
+    /**
+     * 刷新确认
+     * @author lxm
+     * @date 2024-02-06 11:40:36
+     * @return {*}  {Promise<boolean>}
+     */
+    reloadConfirm(): Promise<boolean>;
 }

package/es/view-engine/edit-view.engine.mjs

@@ -267,11 +267,12 @@ class EditViewEngine extends ViewEngineBase {
    * @return {*}  {void}
    */
   initMarkOpenData() {
-    if (isNil(this.view.modal.routeDepth)) {
+    if (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;
       }
@@ -292,44 +293,93 @@ class EditViewEngine extends 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/es/view-engine/pickup-tree-view.engine.d.ts

@@ -3,6 +3,13 @@ import { IAppDETreeView } from '@ibiz/model-core';
 import { TreeViewEngine } from './tree-view.engine';
 export declare class PickupTreeViewEngine extends TreeViewEngine {
     protected view: ViewController<IAppDETreeView, IPickupTreeViewState, IPickupTreeViewEvent>;
+    /**
+     * 选中数据
+     *
+     * @type {IData[]}
+     * @memberof PickupViewEngine
+     */
+    selectData: IData[];
     /**
      * 创建完成
      *
@@ -11,6 +18,14 @@ export declare class PickupTreeViewEngine extends TreeViewEngine {
      * @memberof PickupGridViewEngine
      */
     onCreated(): Promise<void>;
+    /**
+     * 根据key计算需要展开的节点标识
+     * @author lxm
+     * @date 2023-11-07 02:42:45
+     * @param {string} key
+     * @return {*}  {string[]}
+     */
+    calcExpandKeys(key: string): string[];
     /**
      * 挂载完成
      *