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

package/es/common/data-import2/data-import2.mjs

@@ -452,7 +452,9 @@ const DataImport2 = /* @__PURE__ */ defineComponent({
     }), this.previewinfo[0] && this.previewinfo[0].length ? createVNode("div", {
       "class": "ibiz-control-toolbar__item"
     }, [createVNode(resolveComponent("el-button"), {
-      "onClick": this.onButtonImportClick
+      "onClick": this.onButtonImportClick,
+      "disabled": !this.selectValues.join(""),
+      "title": !this.selectValues.join("") ? "\u8BF7\u9009\u62E9\u5217\u5BFC\u5165\u5C5E\u6027!" : ""
     }, _isSlot(_slot2 = ibiz.i18n.t("component.dataImport2.import")) ? _slot2 : {
       default: () => [_slot2]
     })]) : ""])])])]), createVNode(resolveComponent("data-import2-table"), {

package/es/control/drbar/drbar.controller.mjs

@@ -250,6 +250,9 @@ class DRBarController extends ControlController {
    */
   handleSelectChange(key, isRoutePushed = false) {
     var _a;
+    if (this.state.selectedItem === key) {
+      return;
+    }
     const drBarItem = (_a = this.model.dedrctrlItems) == null ? void 0 : _a.find((item) => item.id === key);
     if (drBarItem) {
       this.setVisible("navPos");

package/es/control/form/form-detail/form-item/form-item.mjs

@@ -65,6 +65,7 @@ const FormItem = /* @__PURE__ */ defineComponent({
     }
     return createVNode(resolveComponent("iBizFormItemContainer"), {
       "class": [this.ns.b(), this.ns.m(this.modelData.id), ...this.controller.containerClass],
+      "style": this.modelData.cssStyle,
       "required": this.c.state.required,
       "error": this.c.state.error,
       "label": this.c.labelCaption,

package/es/control/tab-exp-panel/tab-exp-panel.mjs

@@ -1,5 +1,5 @@
 import { isVNode, watch, resolveComponent, createVNode, defineComponent } from 'vue';
-import { useControlController, useNamespace } from '@ibiz-template/vue3-util';
+import { useControlController, useNamespace, route2routePath } from '@ibiz-template/vue3-util';
 import './tab-exp-panel.css';
 import { TabExpPanelController } from '@ibiz-template/runtime';
 import { useRoute } from 'vue-router';
@@ -42,28 +42,16 @@ const TabExpPanelControl = /* @__PURE__ */ defineComponent({
     const route = useRoute();
     watch(() => route.fullPath, (newVal, oldVal) => {
       if (newVal !== oldVal) {
-        const viewCodeName = c.view.model.codeName.toLowerCase();
-        const viewRouteKey = Object.keys(route.params).find((key) => {
-          return route.params[key] === viewCodeName;
-        });
-        if (!viewRouteKey) {
-          return;
-        }
-        const nextKeyNumber = (parseInt(viewRouteKey[viewRouteKey.length - 1], 10) + 2) * 2;
-        const tempFullPath = route.fullPath.split("/").slice(0, nextKeyNumber).join("/");
-        c.state.tabPages.forEach((page) => {
-          if (page.fullPath === tempFullPath) {
-            c.state.activeName = page.tabTag;
+        const depth = c.view.modal.routeDepth;
+        if (depth) {
+          const routePath = route2routePath(route);
+          const {
+            srfnav
+          } = routePath.pathNodes[depth - 1];
+          if (srfnav && c.state.activeName && c.state.activeName !== srfnav) {
+            c.state.activeName = srfnav;
             c.handleTabChange();
           }
-        });
-        if (c.state.activeName) {
-          const currentPage = c.state.tabPages.find((page) => {
-            return page.tabTag === c.state.activeName;
-          });
-          if (currentPage) {
-            currentPage.fullPath = tempFullPath;
-          }
         }
       }
     }, {

package/es/control/toolbar/toolbar.mjs

@@ -70,6 +70,7 @@ const ToolbarControl = /* @__PURE__ */ defineComponent({
       return createVNode(resolveComponent("el-sub-menu"), {
         "class": ns.b("submenu"),
         "index": item.id,
+        "title": item.tooltip,
         "popper-class": ns.b("submenu-popper")
       }, {
         default: () => {

package/es/control/tree/tree.css

@@ -1 +1 @@
-.ibiz-control-treeview{--ibiz-control-treeview-padding:var(--ibiz-spacing-tight) var(--ibiz-spacing-base);--ibiz-control-treeview-icon-height:var(--ibiz-spacing-base);--ibiz-control-treeview-icon-width:var(--ibiz-spacing-base);height:100%;padding:var(--ibiz-control-treeview-padding)}.ibiz-control-treeview-node{display:flex;flex-grow:1;flex-shrink:1;align-items:center;min-width:1px;height:100%}.ibiz-control-treeview-node__icon{width:var(--ibiz-control-treeview-icon-width);height:var(--ibiz-control-treeview-icon-height);margin-right:var(--ibiz-spacing-tight)}.ibiz-control-treeview-node__label{flex-grow:1;flex-shrink:1;min-width:1px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.ibiz-control-treeview-node:hover .ibiz-control-treeview-context-menu-trigger{display:inline-block}.ibiz-control-treeview-context-menu-trigger{display:none;flex-shrink:0;width:30px;text-align:center;cursor:pointer}.ibiz-control-treeview-context-menu-trigger__caption-icon{vertical-align:middle}.ibiz-control-treeview-context-menu.mx-context-menu{padding:var(--ibiz-spacing-extra-tight) 0}.ibiz-control-treeview-context-menu.mx-context-menu .mx-context-menu-item{padding:var(--ibiz-spacing-tight) var(--ibiz-spacing-base)}.ibiz-control-treeview-quick-search{margin-bottom:var(--ibiz-spacing-tight)}
+.ibiz-control-treeview{--ibiz-control-treeview-padding:var(--ibiz-spacing-tight) var(--ibiz-spacing-base);--ibiz-control-treeview-icon-height:var(--ibiz-spacing-base);--ibiz-control-treeview-icon-width:var(--ibiz-spacing-base);height:100%;padding:var(--ibiz-control-treeview-padding)}.ibiz-control-treeview-node{display:flex;flex-grow:1;flex-shrink:1;align-items:center;min-width:1px;height:100%}.ibiz-control-treeview-node__icon{width:var(--ibiz-control-treeview-icon-width);height:var(--ibiz-control-treeview-icon-height);margin-right:var(--ibiz-spacing-tight)}.ibiz-control-treeview-node__label{flex-grow:1;flex-shrink:1;min-width:1px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.ibiz-control-treeview-node:hover .ibiz-control-treeview-context-menu-trigger{display:inline-block}.ibiz-control-treeview-node--disabled{color:var(--ibiz-color-disabled-text);cursor:not-allowed}.ibiz-control-treeview-context-menu-trigger{display:none;flex-shrink:0;width:30px;text-align:center;cursor:pointer}.ibiz-control-treeview-context-menu-trigger__caption-icon{vertical-align:middle}.ibiz-control-treeview-context-menu.mx-context-menu{padding:var(--ibiz-spacing-extra-tight) 0}.ibiz-control-treeview-context-menu.mx-context-menu .mx-context-menu-item{padding:var(--ibiz-spacing-tight) var(--ibiz-spacing-base)}.ibiz-control-treeview-quick-search{margin-bottom:var(--ibiz-spacing-tight)}

package/es/control/tree/tree.mjs

@@ -120,7 +120,8 @@ const TreeControl = /* @__PURE__ */ defineComponent({
         _id: node._id,
         _uuid: node._uuid,
         _leaf: node._leaf,
-        _text: node._text
+        _text: node._text,
+        _disableSelect: node._disableSelect
       }));
     };
     c.evt.on("onAfterRefreshParent", (event) => {
@@ -457,7 +458,8 @@ const TreeControl = /* @__PURE__ */ defineComponent({
           "props": {
             label: "_text",
             children: "_children",
-            isLeaf: "_leaf"
+            isLeaf: "_leaf",
+            disabled: "_disableSelect"
           },
           "lazy": true,
           "load": this.loadData,
@@ -525,7 +527,7 @@ const TreeControl = /* @__PURE__ */ defineComponent({
               "onDblclick": (evt) => this.onNodeDbClick(nodeData, evt),
               "onClick": (evt) => this.onNodeClick(nodeData, evt),
               "onContextmenu": (evt) => this.onNodeContextmenu(nodeData, evt),
-              "class": [this.ns.b("node"), (_b = nodeModel.sysCss) == null ? void 0 : _b.cssName]
+              "class": [this.ns.b("node"), nodeData._disableSelect ? this.ns.bm("node", "disabled") : "", (_b = nodeModel.sysCss) == null ? void 0 : _b.cssName]
             }, [content, this.renderCounter(nodeModel), this.renderContextMenu(nodeModel, nodeData)]);
           }
         });

package/es/control/tree-grid-ex/index.d.ts

@@ -20,6 +20,7 @@ export declare const IBizTreeGridExControl: import("@ibiz-template/vue3-util").T
     tableRef: import("vue").Ref<IData | undefined>;
     elTableData: import("vue").ComputedRef<IData[]>;
     renderColumns: import("vue").ComputedRef<import("@ibiz/model-core").IDETreeColumn[]>;
+    tableRefreshKey: import("vue").Ref<string>;
     renderNoData: () => false | import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
         [key: string]: any;
     }>;

package/es/control/tree-grid-ex/tree-grid-ex.d.ts

@@ -24,6 +24,7 @@ export declare const TreeGridExControl: import("vue").DefineComponent<{
     tableRef: import("vue").Ref<IData | undefined>;
     elTableData: import("vue").ComputedRef<IData[]>;
     renderColumns: import("vue").ComputedRef<IDETreeColumn[]>;
+    tableRefreshKey: import("vue").Ref<string>;
     renderNoData: () => VNode | false;
     loadData: (item: IData, treeNode: unknown, callback: (nodes: IData[]) => void) => Promise<void>;
     onRowClick: (data: IData, _column: IData, event: MouseEvent) => Promise<void>;

package/es/control/tree-grid-ex/tree-grid-ex.mjs

@@ -3,6 +3,7 @@ import { useControlController, useNamespace } from '@ibiz-template/vue3-util';
 import { TreeGridExController } from '@ibiz-template/runtime';
 import './tree-grid-ex.css';
 import { RuntimeError } from '@ibiz-template/core';
+import { createUUID } from 'qx-util';
 import { useRowEditPopover } from './use-row-edit-popover.mjs';
 
 "use strict";
@@ -64,6 +65,7 @@ const TreeGridExControl = /* @__PURE__ */ defineComponent({
         return temp;
       });
     };
+    const tableRefreshKey = ref(createUUID());
     const treeRootData = computed(() => {
       if (!c.state.isLoaded) {
         return [];
@@ -76,11 +78,15 @@ const TreeGridExControl = /* @__PURE__ */ defineComponent({
       }, []);
     });
     const elTableData = computed(() => {
+      tableRefreshKey.value = createUUID();
       if (treeRootData.value.length === 0) {
         return [];
       }
       return toElNodes(treeRootData.value, true);
     });
+    c.evt.on("onAfterRefreshParent", () => {
+      tableRefreshKey.value = createUUID();
+    });
     const loadData = async (item, treeNode, callback) => {
       let nodes;
       const nodeData = c.getNodeData(item.id);
@@ -155,6 +161,7 @@ const TreeGridExControl = /* @__PURE__ */ defineComponent({
       tableRef,
       elTableData,
       renderColumns,
+      tableRefreshKey,
       renderNoData,
       loadData,
       onRowClick,
@@ -207,6 +214,7 @@ const TreeGridExControl = /* @__PURE__ */ defineComponent({
     }, {
       default: () => [this.c.state.isLoaded && createVNode(resolveComponent("el-table"), {
         "ref": "tableRef",
+        "key": this.tableRefreshKey,
         "class": this.ns.e("table"),
         "border": true,
         "row-key": "id",

package/es/editor/color-picker/ibiz-color-picker/ibiz-color-picker.d.ts

@@ -27,6 +27,7 @@ export declare const IBizColorPicker: import("vue").DefineComponent<{
     ns: import("@ibiz-template/core").Namespace;
     c: ColorPickerEditorController;
     currentVal: Ref<string | null>;
+    predefineColors: Ref<string[]>;
     contentStyle: import("vue").ComputedRef<IData | null>;
     colorPicker: Ref<IData | null>;
     handleChange: (e: string | null) => void;

package/es/editor/color-picker/ibiz-color-picker/ibiz-color-picker.mjs

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

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

@@ -1,6 +1,6 @@
 import { ref, computed, watch, onMounted, resolveComponent, createVNode, defineComponent } from 'vue';
 import { getDataPickerProps, getEditorEmits, useNamespace, renderString } from '@ibiz-template/vue3-util';
-import { isEmpty } from 'ramda';
+import { isEmpty, isNil } from 'ramda';
 import './ibiz-picker.css';
 
 "use strict";
@@ -161,7 +161,7 @@ const IBizPicker = /* @__PURE__ */ defineComponent({
     onMounted(() => {
       watch(() => props.data[c.valueItem], async (newVal, oldVal) => {
         if (newVal !== oldVal) {
-          if (!isLoaded.value && editorRef.value) {
+          if (!isLoaded.value && editorRef.value && isNil(props.value)) {
             await onSearch("");
           }
           const curItem = items.value.find((item) => Object.is(item[c.keyName], newVal));

package/es/editor/data-picker/ibiz-picker-dropdown/ibiz-picker-dropdown.mjs

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

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/lib/common/data-import2/data-import2.cjs

@@ -454,7 +454,9 @@ const DataImport2 = /* @__PURE__ */ vue.defineComponent({
     }), this.previewinfo[0] && this.previewinfo[0].length ? vue.createVNode("div", {
       "class": "ibiz-control-toolbar__item"
     }, [vue.createVNode(vue.resolveComponent("el-button"), {
-      "onClick": this.onButtonImportClick
+      "onClick": this.onButtonImportClick,
+      "disabled": !this.selectValues.join(""),
+      "title": !this.selectValues.join("") ? "\u8BF7\u9009\u62E9\u5217\u5BFC\u5165\u5C5E\u6027!" : ""
     }, _isSlot(_slot2 = ibiz.i18n.t("component.dataImport2.import")) ? _slot2 : {
       default: () => [_slot2]
     })]) : ""])])])]), vue.createVNode(vue.resolveComponent("data-import2-table"), {

package/lib/control/drbar/drbar.controller.cjs

@@ -252,6 +252,9 @@ class DRBarController extends runtime.ControlController {
    */
   handleSelectChange(key, isRoutePushed = false) {
     var _a;
+    if (this.state.selectedItem === key) {
+      return;
+    }
     const drBarItem = (_a = this.model.dedrctrlItems) == null ? void 0 : _a.find((item) => item.id === key);
     if (drBarItem) {
       this.setVisible("navPos");

package/lib/control/form/form-detail/form-item/form-item.cjs

@@ -69,6 +69,7 @@ const FormItem = /* @__PURE__ */ vue.defineComponent({
     }
     return vue.createVNode(vue.resolveComponent("iBizFormItemContainer"), {
       "class": [this.ns.b(), this.ns.m(this.modelData.id), ...this.controller.containerClass],
+      "style": this.modelData.cssStyle,
       "required": this.c.state.required,
       "error": this.c.state.error,
       "label": this.c.labelCaption,

package/lib/control/tab-exp-panel/tab-exp-panel.cjs

@@ -44,28 +44,16 @@ const TabExpPanelControl = /* @__PURE__ */ vue.defineComponent({
     const route = vueRouter.useRoute();
     vue.watch(() => route.fullPath, (newVal, oldVal) => {
       if (newVal !== oldVal) {
-        const viewCodeName = c.view.model.codeName.toLowerCase();
-        const viewRouteKey = Object.keys(route.params).find((key) => {
-          return route.params[key] === viewCodeName;
-        });
-        if (!viewRouteKey) {
-          return;
-        }
-        const nextKeyNumber = (parseInt(viewRouteKey[viewRouteKey.length - 1], 10) + 2) * 2;
-        const tempFullPath = route.fullPath.split("/").slice(0, nextKeyNumber).join("/");
-        c.state.tabPages.forEach((page) => {
-          if (page.fullPath === tempFullPath) {
-            c.state.activeName = page.tabTag;
+        const depth = c.view.modal.routeDepth;
+        if (depth) {
+          const routePath = vue3Util.route2routePath(route);
+          const {
+            srfnav
+          } = routePath.pathNodes[depth - 1];
+          if (srfnav && c.state.activeName && c.state.activeName !== srfnav) {
+            c.state.activeName = srfnav;
             c.handleTabChange();
           }
-        });
-        if (c.state.activeName) {
-          const currentPage = c.state.tabPages.find((page) => {
-            return page.tabTag === c.state.activeName;
-          });
-          if (currentPage) {
-            currentPage.fullPath = tempFullPath;
-          }
         }
       }
     }, {

package/lib/control/toolbar/toolbar.cjs

@@ -72,6 +72,7 @@ const ToolbarControl = /* @__PURE__ */ vue.defineComponent({
       return vue.createVNode(vue.resolveComponent("el-sub-menu"), {
         "class": ns.b("submenu"),
         "index": item.id,
+        "title": item.tooltip,
         "popper-class": ns.b("submenu-popper")
       }, {
         default: () => {

package/lib/control/tree/tree.cjs

@@ -122,7 +122,8 @@ const TreeControl = /* @__PURE__ */ vue.defineComponent({
         _id: node._id,
         _uuid: node._uuid,
         _leaf: node._leaf,
-        _text: node._text
+        _text: node._text,
+        _disableSelect: node._disableSelect
       }));
     };
     c.evt.on("onAfterRefreshParent", (event) => {
@@ -459,7 +460,8 @@ const TreeControl = /* @__PURE__ */ vue.defineComponent({
           "props": {
             label: "_text",
             children: "_children",
-            isLeaf: "_leaf"
+            isLeaf: "_leaf",
+            disabled: "_disableSelect"
           },
           "lazy": true,
           "load": this.loadData,
@@ -527,7 +529,7 @@ const TreeControl = /* @__PURE__ */ vue.defineComponent({
               "onDblclick": (evt) => this.onNodeDbClick(nodeData, evt),
               "onClick": (evt) => this.onNodeClick(nodeData, evt),
               "onContextmenu": (evt) => this.onNodeContextmenu(nodeData, evt),
-              "class": [this.ns.b("node"), (_b = nodeModel.sysCss) == null ? void 0 : _b.cssName]
+              "class": [this.ns.b("node"), nodeData._disableSelect ? this.ns.bm("node", "disabled") : "", (_b = nodeModel.sysCss) == null ? void 0 : _b.cssName]
             }, [content, this.renderCounter(nodeModel), this.renderContextMenu(nodeModel, nodeData)]);
           }
         });

package/lib/control/tree/tree.css

@@ -1 +1 @@
-.ibiz-control-treeview{--ibiz-control-treeview-padding:var(--ibiz-spacing-tight) var(--ibiz-spacing-base);--ibiz-control-treeview-icon-height:var(--ibiz-spacing-base);--ibiz-control-treeview-icon-width:var(--ibiz-spacing-base);height:100%;padding:var(--ibiz-control-treeview-padding)}.ibiz-control-treeview-node{display:flex;flex-grow:1;flex-shrink:1;align-items:center;min-width:1px;height:100%}.ibiz-control-treeview-node__icon{width:var(--ibiz-control-treeview-icon-width);height:var(--ibiz-control-treeview-icon-height);margin-right:var(--ibiz-spacing-tight)}.ibiz-control-treeview-node__label{flex-grow:1;flex-shrink:1;min-width:1px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.ibiz-control-treeview-node:hover .ibiz-control-treeview-context-menu-trigger{display:inline-block}.ibiz-control-treeview-context-menu-trigger{display:none;flex-shrink:0;width:30px;text-align:center;cursor:pointer}.ibiz-control-treeview-context-menu-trigger__caption-icon{vertical-align:middle}.ibiz-control-treeview-context-menu.mx-context-menu{padding:var(--ibiz-spacing-extra-tight) 0}.ibiz-control-treeview-context-menu.mx-context-menu .mx-context-menu-item{padding:var(--ibiz-spacing-tight) var(--ibiz-spacing-base)}.ibiz-control-treeview-quick-search{margin-bottom:var(--ibiz-spacing-tight)}
+.ibiz-control-treeview{--ibiz-control-treeview-padding:var(--ibiz-spacing-tight) var(--ibiz-spacing-base);--ibiz-control-treeview-icon-height:var(--ibiz-spacing-base);--ibiz-control-treeview-icon-width:var(--ibiz-spacing-base);height:100%;padding:var(--ibiz-control-treeview-padding)}.ibiz-control-treeview-node{display:flex;flex-grow:1;flex-shrink:1;align-items:center;min-width:1px;height:100%}.ibiz-control-treeview-node__icon{width:var(--ibiz-control-treeview-icon-width);height:var(--ibiz-control-treeview-icon-height);margin-right:var(--ibiz-spacing-tight)}.ibiz-control-treeview-node__label{flex-grow:1;flex-shrink:1;min-width:1px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.ibiz-control-treeview-node:hover .ibiz-control-treeview-context-menu-trigger{display:inline-block}.ibiz-control-treeview-node--disabled{color:var(--ibiz-color-disabled-text);cursor:not-allowed}.ibiz-control-treeview-context-menu-trigger{display:none;flex-shrink:0;width:30px;text-align:center;cursor:pointer}.ibiz-control-treeview-context-menu-trigger__caption-icon{vertical-align:middle}.ibiz-control-treeview-context-menu.mx-context-menu{padding:var(--ibiz-spacing-extra-tight) 0}.ibiz-control-treeview-context-menu.mx-context-menu .mx-context-menu-item{padding:var(--ibiz-spacing-tight) var(--ibiz-spacing-base)}.ibiz-control-treeview-quick-search{margin-bottom:var(--ibiz-spacing-tight)}