@ibiz-template/vue3-components 0.7.41-alpha.19 → 0.7.41-alpha.20

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

@@ -25,17 +25,17 @@ const IBizPickerEmbedView = /* @__PURE__ */ vue.defineComponent({
     });
     vue.watch(() => props.data, (newVal) => {
       const {
-        context: _context,
-        params: _params
+        context: tempContext,
+        params: tempParams
       } = c.handlePublicParams(newVal, c.context, c.params);
-      const newContext = Object.assign(c.context.clone(), _context);
+      const newContext = Object.assign(c.context.clone(), tempContext);
       const newParams = Object.assign({
         ...c.params
-      }, _params);
-      if (JSON.stringify(context.value) !== JSON.stringify(newContext) || JSON.stringify(params.value) !== JSON.stringify(newParams)) {
+      }, tempParams);
+      if (JSON.stringify(context.value) !== JSON.stringify(newContext))
         context.value = newContext;
+      if (JSON.stringify(params.value) !== JSON.stringify(newParams))
         params.value = newParams;
-      }
     }, {
       deep: true,
       immediate: true
@@ -110,11 +110,11 @@ const IBizPickerEmbedView = /* @__PURE__ */ vue.defineComponent({
       context,
       params,
       editorRef,
-      singleSelect,
-      checkStrictly,
       isShowText,
-      selectedData,
       cloneParams,
+      singleSelect,
+      selectedData,
+      checkStrictly,
       onSelectionChange
     };
   },

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

@@ -33,15 +33,29 @@ const IBizPickerSelectView = /* @__PURE__ */ vue.defineComponent({
     const queryValue = vue.ref("");
     const visible = vue.ref(false);
     const pickViewWidth = vue.ref("auto");
-    const context = vue.ref(c.context);
-    const params = vue.ref(c.params);
+    const context = vue.ref(c.context.clone());
+    const params = vue.ref({
+      ...c.params
+    });
+    const cloneParams = vue.computed(() => {
+      return {
+        ...params.value
+      };
+    });
     vue.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);
+      const newContext = Object.assign(c.context.clone(), tempContext);
+      const newParams = {
+        ...c.params,
+        ...tempParams
+      };
+      if (JSON.stringify(context.value) !== JSON.stringify(newContext))
+        context.value = newContext;
+      if (JSON.stringify(params.value) !== JSON.stringify(newParams))
+        params.value = newParams;
     }, {
       immediate: true,
       deep: true
@@ -87,16 +101,13 @@ const IBizPickerSelectView = /* @__PURE__ */ vue.defineComponent({
         } else {
           queryValue.value = newVal || "";
         }
-        if (!props.data || !c.valueItem || !props.data[c.valueItem]) {
-          if (!isDesignPreview) {
-            ibiz.log.error("\u503C\u9879\u5F02\u5E38");
-          }
+        if (!c.valueItem && !isDesignPreview) {
+          ibiz.log.error("\u503C\u9879\u5F02\u5E38");
         } else {
           selectedData.value = [{
             srfkey: props.data[c.valueItem],
             srfmajortext: props.value
           }];
-          params.value.selecteddata = selectedData.value;
         }
       } else {
         const selectItems = [];
@@ -122,7 +133,7 @@ const IBizPickerSelectView = /* @__PURE__ */ vue.defineComponent({
               }
             });
             selectItems.push(...newVal);
-          } else if (!props.data || !c.valueItem || !props.data[c.valueItem]) {
+          } else if (!c.valueItem) {
             ibiz.log.error("\u503C\u9879\u5F02\u5E38");
           } else {
             const tempValue = props.data[c.valueItem].split(",");
@@ -315,10 +326,10 @@ const IBizPickerSelectView = /* @__PURE__ */ vue.defineComponent({
     const remoteMethod = (e) => {
       queryValue.value = e;
     };
-    const onSelectionChange = (event) => {
+    const onSelectionChange = (event, isClose = false) => {
       if (event.data) {
         onViewDataChange(event.data);
-        if (singleSelect.value && editorRef.value) {
+        if (isClose && editorRef.value) {
           editorRef.value.handleClose();
         }
       }
@@ -327,7 +338,7 @@ const IBizPickerSelectView = /* @__PURE__ */ vue.defineComponent({
       mode: runtime.ViewMode.DRAWER,
       viewUsage: 2,
       dismiss: (_data) => {
-        onSelectionChange(_data);
+        onSelectionChange(_data, true);
       }
     });
     const onFocus = (e) => {
@@ -380,38 +391,39 @@ const IBizPickerSelectView = /* @__PURE__ */ vue.defineComponent({
       }, null)]);
     };
     return {
-      ns,
       c,
-      singleSelect,
-      keySet,
+      ns,
       items,
-      queryValue,
+      modal,
+      keySet,
+      params,
       visible,
-      pickViewWidth,
       context,
-      params,
+      showView,
       editorRef,
-      onInputChange,
-      triggerMenu,
-      onViewDataChange,
-      onClear,
-      openLinkView,
-      onSelectChange,
-      remoteMethod,
-      onSelectionChange,
-      modal,
-      onFocus,
-      onBlur,
-      handleKeyUp,
       valueText,
       isEditable,
-      setEditable,
+      queryValue,
+      cloneParams,
+      selectedData,
+      singleSelect,
+      pickViewWidth,
       showFormDefaultContent,
+      arrow,
+      onBlur,
+      onClear,
+      onFocus,
+      triggerMenu,
+      setEditable,
+      handleKeyUp,
+      openLinkView,
+      remoteMethod,
+      onInputChange,
+      onSelectChange,
       onVisibleChange,
-      showView,
-      selectedData,
-      handleDropDownKeyDown,
-      arrow
+      onViewDataChange,
+      onSelectionChange,
+      handleDropDownKeyDown
     };
   },
   render() {
@@ -477,13 +489,13 @@ const IBizPickerSelectView = /* @__PURE__ */ vue.defineComponent({
       },
       dropdown: () => {
         var _a, _b;
-        if (!this.showView) {
+        if (!this.showView)
           return;
-        }
         const viewShell = vue.resolveComponent("IBizViewShell");
         return this.c.pickupView && vue.h(viewShell, {
+          modal: this.modal,
           context: this.context,
-          params: this.params,
+          params: this.cloneParams,
           viewId: this.c.pickupView.id,
           style: {
             height: "".concat(((_a = this.c.editorParams) == null ? void 0 : _a.pickupViewHeight) || ((_b = this.c.editorParams) == null ? void 0 : _b.pickupviewheight) || 500, "px"),
@@ -493,8 +505,7 @@ const IBizPickerSelectView = /* @__PURE__ */ vue.defineComponent({
             singleSelect: this.singleSelect,
             selectedData: this.selectedData
           },
-          onSelectionChange: this.onSelectionChange,
-          modal: this.modal
+          onSelectionChange: (event) => this.onSelectionChange(event, this.singleSelect)
         });
       }
     });

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

@@ -359,10 +359,13 @@ class PickerEditorController extends runtime.EditorController {
       });
     }
     if (this.objectValueField) {
+      const data = {
+        ...select
+      };
+      delete data.srfkey;
+      delete data.srfmajortext;
       Object.assign(object, {
-        [this.objectValueField]: {
-          ...select
-        }
+        [this.objectValueField]: data
       });
     }
     if (select.srfnodeid) {
@@ -380,9 +383,6 @@ class PickerEditorController extends runtime.EditorController {
    * @memberof PickerEditorController
    */
   async onActionClick(detail, data, event) {
-    if (event) {
-      event.stopPropagation();
-    }
     const actionId = detail.uiactionId;
     await runtime.UIActionUtil.execAndResolved(
       actionId,

package/lib/panel-component/auth-sso/auth-sso.cjs

@@ -24,15 +24,30 @@ const AuthSso = /* @__PURE__ */ vue.defineComponent({
       required: true
     }
   },
-  setup() {
+  setup(props) {
+    var _a;
     const ns = vue3Util.useNamespace("auth-sso");
+    const model = props.controller.model;
+    const rawItemParams = (_a = model.rawItem) == null ? void 0 : _a.rawItemParams;
+    const items = rawItemParams == null ? void 0 : rawItemParams.map((item) => {
+      const params = item.value ? JSON.parse(item.value) : {};
+      return {
+        key: item.key,
+        sysImage: item.sysImage,
+        title: params.title,
+        params
+      };
+    });
     const dingtalkHandleClick = async () => {
       ibiz.thirdAuth.auth("DINGTALK", "THIRD");
     };
     const wxWorkHandleClick = async () => {
       ibiz.thirdAuth.auth("WXWORK", "THIRD");
     };
-    const handleThridLogin = (type) => {
+    const oauthHandleClick = async (params) => {
+      ibiz.thirdAuth.auth("OAUTH", "THIRD", params);
+    };
+    const handleThridLogin = (type, params) => {
       if (!type)
         return;
       switch (type) {
@@ -43,18 +58,75 @@ const AuthSso = /* @__PURE__ */ vue.defineComponent({
           wxWorkHandleClick();
           break;
         default:
-          console.log(ibiz.i18n.t("panelComponent.authSsO.noSupported", {
-            type
-          }));
+          oauthHandleClick(params);
           break;
       }
     };
     return {
       ns,
+      items,
       handleThridLogin
     };
   },
   render() {
+    if (this.items && this.items.length) {
+      return vue.createVNode("div", {
+        "class": this.ns.b()
+      }, [this.items.map((item) => {
+        var _a;
+        let icon;
+        if (item.sysImage) {
+          icon = vue.createVNode(vue.resolveComponent("iBizIcon"), {
+            "icon": item.sysImage
+          }, null);
+        } else if (item.key === "DINGDING") {
+          icon = vue.createVNode("svg", {
+            "class": "icon",
+            "viewBox": "0 0 1024 1024",
+            "version": "1.1",
+            "xmlns": "http://www.w3.org/2000/svg",
+            "p-id": "651",
+            "width": "48",
+            "height": "48"
+          }, [vue.createVNode("defs", null, [vue.createVNode("style", {
+            "type": "text/css"
+          }, null)]), vue.createVNode("path", {
+            "d": "M512 2C230.2 2 2 230.2 2 512s228.2 510 510 510 510-228.2 510-510S793.3 2 512 2z m235.9 442c-1 4.6-3.6 10.8-7.2 19.1l-0.5 0.5c-21.6 45.8-77.3 135.5-77.3 135.5l-0.5-0.5-16.5 28.3h78.8L574.3 826.8l34-136h-61.8l21.6-90.2c-17.5 4.1-38.1 9.8-62.3 18 0 0-33 19.1-94.8-37.1 0 0-41.7-37.1-17.5-45.8 10.3-4.1 50-8.8 81.4-12.9 42.2-5.7 68.5-8.8 68.5-8.8s-130.3 2.1-161.2-3.1c-30.9-4.6-70.1-56.7-78.3-102 0 0-12.9-24.7 27.8-12.9 40.2 11.8 209.2 45.8 209.2 45.8S321.4 375 307 358.5c-14.4-16.5-42.8-89.6-39.2-134.5 0 0 1.5-11.3 12.9-8.2 0 0 161.8 74.2 272.5 114.4C664.5 371.4 760.8 392 747.9 444z",
+            "fill": "#3296FA",
+            "p-id": "652"
+          }, null)]);
+        } else if (item.key === "WXWORK") {
+          icon = vue.createVNode("svg", {
+            "class": "icon",
+            "width": "200px",
+            "height": "200.00px",
+            "viewBox": "0 0 1024 1024",
+            "version": "1.1",
+            "xmlns": "http://www.w3.org/2000/svg"
+          }, [vue.createVNode("path", {
+            "fill": "#36ab60",
+            "d": "M352.814545 385.396364m-33.512727 0a33.512727 33.512727 0 1 0 67.025455 0 33.512727 33.512727 0 1 0-67.025455 0Z"
+          }, null), vue.createVNode("path", {
+            "fill": "#36ab60",
+            "d": "M502.690909 384.465455m-33.512727 0a33.512727 33.512727 0 1 0 67.025454 0 33.512727 33.512727 0 1 0-67.025454 0Z"
+          }, null), vue.createVNode("path", {
+            "fill": "#36ab60",
+            "d": "M576.232727 534.341818m-23.272727 0a23.272727 23.272727 0 1 0 46.545455 0 23.272727 23.272727 0 1 0-46.545455 0Z"
+          }, null), vue.createVNode("path", {
+            "fill": "#36ab60",
+            "d": "M694.458182 536.203636m-23.272727 0a23.272727 23.272727 0 1 0 46.545454 0 23.272727 23.272727 0 1 0-46.545454 0Z"
+          }, null), vue.createVNode("path", {
+            "fill": "#36ab60",
+            "d": "M512 0C229.003636 0 0 229.003636 0 512s229.003636 512 512 512 512-229.003636 512-512S794.996364 0 512 0z m-87.505455 630.225455c-26.996364 0-48.407273-5.585455-75.403636-11.17091l-75.403636 37.236364 21.410909-64.232727c-53.992727-37.236364-85.643636-85.643636-85.643637-145.221818 0-102.4 96.814545-182.458182 215.04-182.458182 105.192727 0 198.283636 64.232727 216.901819 150.807273-6.516364-0.930909-13.963636-0.930909-20.48-0.93091-102.4 0-182.458182 76.334545-182.458182 170.356364 0 15.825455 2.792727 30.72 6.516363 44.683636-7.447273 0-13.963636 0.930909-20.48 0.93091z m314.647273 75.403636l15.825455 53.992727-58.647273-32.581818c-21.410909 5.585455-42.821818 11.170909-64.232727 11.170909-102.4 0-182.458182-69.818182-182.458182-155.461818s80.058182-155.461818 182.458182-155.461818c96.814545 0 182.458182 69.818182 182.458182 155.461818 0 47.476364-31.650909 90.298182-75.403637 122.88z"
+          }, null)]);
+        }
+        return vue.createVNode("div", {
+          "class": [this.ns.e("sign-btn"), this.ns.m(item.key === "WXWORK" ? "wx" : (_a = item.key) == null ? void 0 : _a.toLowerCase())],
+          "title": item.title,
+          "onClick": () => this.handleThridLogin(item.key, item.params)
+        }, [icon]);
+      })]);
+    }
     return vue.createVNode("div", {
       "class": this.ns.b()
     }, [vue.createVNode("div", {

package/lib/panel-component/auth-sso/auth-sso.css

@@ -1 +1 @@
-.ibiz-auth-sso{--ibiz-auth-sso-icon-width:var(--ibiz-editor-default-line-height);--ibiz-auth-sso-icon-height:var(--ibiz-editor-default-line-height);--ibiz-auth-sso-gap:var(--ibiz-spacing-base);display:flex;gap:var(--ibiz-auth-sso-gap);justify-content:center;width:100%}.ibiz-auth-sso__sign-btn{width:var(--ibiz-auth-sso-icon-width);height:var(--ibiz-auth-sso-icon-height);cursor:pointer}.ibiz-auth-sso__sign-btn svg{width:100%;height:100%}
+.ibiz-auth-sso{--ibiz-auth-sso-icon-width:var(--ibiz-editor-default-line-height);--ibiz-auth-sso-icon-height:var(--ibiz-editor-default-line-height);--ibiz-auth-sso-gap:var(--ibiz-spacing-base);display:flex;gap:var(--ibiz-auth-sso-gap);justify-content:center;width:100%}.ibiz-auth-sso__sign-btn{width:var(--ibiz-auth-sso-icon-width);height:var(--ibiz-auth-sso-icon-height);cursor:pointer}.ibiz-auth-sso__sign-btn svg{width:100%;height:100%}.ibiz-auth-sso__sign-btn .ibiz-icon{display:flex;align-items:center;justify-content:center;width:100%;height:100%}

package/lib/panel-component/nav-pos-index/nav-pos-index.controller.cjs

@@ -67,7 +67,7 @@ class NavPosIndexController extends runtime.PanelItemController {
   }
   /**
    * @exposedoc
-   * @description 当前视图的路由层级，非路由模式不存在。
+   * @description 当前视图的路由层级，非路由模式不存在
    * @readonly
    * @type {(number | undefined)}
    * @memberof NavPosIndexController

package/lib/panel-component/panel-app-title/panel-app-title.controller.cjs

@@ -14,7 +14,7 @@ class PanelAppTitleController extends runtime.PanelItemController {
   constructor() {
     super(...arguments);
     /**
-     * @description 分隔符,将标题以`|`符分割，分隔符前面为caption，后面为caption2
+     * @description 分隔符，将标题以`\|`符分割，分隔符前面为caption，后面为caption2
      * @exposedoc
      * @return {*}
      * @memberof PanelAppTitleController

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

@@ -96,8 +96,8 @@ class MPickupViewEngine extends pickupView_engine.PickupViewEngine {
    * @param {*} data
    * @memberof PickupViewEngine
    */
-  pickupViewPanelDataActive(data) {
-    this.handlePushSimpleListItems(data);
+  async pickupViewPanelDataActive(data) {
+    await this.handlePushSimpleListItems(data);
   }
   /**
    * 列表激活
@@ -126,20 +126,19 @@ class MPickupViewEngine extends pickupView_engine.PickupViewEngine {
    */
   async addSelection() {
     const selectItem = await this.pickupViewPanel.getSelectedData();
-    this.handlePushSimpleListItems(selectItem);
+    await this.handlePushSimpleListItems(selectItem);
   }
   /**
-   * 处理添加简单列表数据
-   *
-   * @author zk
-   * @date 2023-05-26 02:05:41
+   * @description 处理添加简单列表数据
+   * @protected
    * @param {IData[]} data
    * @memberof MPickupViewEngine
    */
-  handlePushSimpleListItems(data) {
-    const allData = this.simpleList.getAllData();
-    const items = [...allData, ...data];
-    const uniqueItems = this.handleUniqueItems(items);
+  async handlePushSimpleListItems(data) {
+    const items = await this.pickupViewPanel.getAllData();
+    const selectItems = this.simpleList.getAllData().filter((selected) => !items.some((item) => item.srfkey === selected.srfkey));
+    selectItems.push(...data);
+    const uniqueItems = this.handleUniqueItems(selectItems);
     this.setSelectedData(uniqueItems);
   }
   /**
@@ -166,7 +165,7 @@ class MPickupViewEngine extends pickupView_engine.PickupViewEngine {
    */
   async addAll() {
     const allItems = await this.pickupViewPanel.getAllData();
-    this.handlePushSimpleListItems(allItems);
+    await this.handlePushSimpleListItems(allItems);
   }
   /**
    * 删除所有
@@ -192,9 +191,8 @@ class MPickupViewEngine extends pickupView_engine.PickupViewEngine {
       const index = items.findIndex(
         (item) => _item.srfkey === item.srfkey
       );
-      if (index !== -1) {
+      if (index !== -1)
         items.splice(index, 1);
-      }
     });
     this.setSelectedData(items);
   }

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

@@ -4,7 +4,22 @@ var runtime = require('@ibiz-template/runtime');
 var dataView_engine = require('./data-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 PickupDataViewEngine extends dataView_engine.DataViewEngine {
+  constructor() {
+    super(...arguments);
+    /**
+     * @description 选中数据
+     * @type {IData[]}
+     * @memberof PickupDataViewEngine
+     */
+    __publicField(this, "selectData", []);
+  }
   /**
    * 表格控制器
    *
@@ -19,6 +34,21 @@ class PickupDataViewEngine extends dataView_engine.DataViewEngine {
   async onCreated() {
     super.onCreated();
     this.view.slotProps.dataview.singleSelect = this.view.state.singleSelect;
+    this.initSelectData();
+  }
+  /**
+   * @description 初始化选中数据
+   * @protected
+   * @memberof PickupDataViewEngine
+   */
+  initSelectData() {
+    if (this.view.params.selecteddata) {
+      this.selectData = JSON.parse(this.view.params.selecteddata);
+      delete this.view.params.selecteddata;
+    }
+    if (this.view.state.selectedData) {
+      this.selectData = [...this.view.state.selectedData];
+    }
   }
   async onMounted() {
     await super.onMounted();
@@ -28,6 +58,7 @@ class PickupDataViewEngine extends dataView_engine.DataViewEngine {
     this.xdataControl.evt.on("onActive", async (event) => {
       this.view.evt.emit("onDataActive", { ...event });
     });
+    this.setSelectedData(this.selectData);
   }
   async call(key, args) {
     if (key === runtime.ViewCallTag.GET_ALL_DATA) {

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

@@ -4,7 +4,22 @@ var runtime = require('@ibiz-template/runtime');
 var gridView_engine = require('./grid-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 PickupGridViewEngine extends gridView_engine.GridViewEngine {
+  constructor() {
+    super(...arguments);
+    /**
+     * @description 选中数据
+     * @type {IData[]}
+     * @memberof PickupGridViewEngine
+     */
+    __publicField(this, "selectData", []);
+  }
   /**
    * 表格控制器
    *
@@ -24,6 +39,21 @@ class PickupGridViewEngine extends gridView_engine.GridViewEngine {
     }
     this.view.slotProps.grid.singleSelect = this.view.state.singleSelect;
     this.view.slotProps.grid.mdctrlActiveMode = model.gridRowActiveMode;
+    this.initSelectData();
+  }
+  /**
+   * @description 初始化选中数据
+   * @protected
+   * @memberof PickupGridViewEngine
+   */
+  initSelectData() {
+    if (this.view.params.selecteddata) {
+      this.selectData = JSON.parse(this.view.params.selecteddata);
+      delete this.view.params.selecteddata;
+    }
+    if (this.view.state.selectedData) {
+      this.selectData = [...this.view.state.selectedData];
+    }
   }
   async onMounted() {
     await super.onMounted();
@@ -33,6 +63,7 @@ class PickupGridViewEngine extends gridView_engine.GridViewEngine {
     this.xdataControl.evt.on("onActive", async (event) => {
       this.view.evt.emit("onDataActive", { ...event });
     });
+    this.setSelectedData(this.selectData);
   }
   async call(key, args) {
     if (key === runtime.ViewCallTag.GET_ALL_DATA) {

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

@@ -14,19 +14,11 @@ class PickupTreeViewEngine extends treeView_engine.TreeViewEngine {
   constructor() {
     super(...arguments);
     /**
-     * 选中数据
-     *
+     * @description 选中数据
      * @type {IData[]}
-     * @memberof PickupViewEngine
+     * @memberof PickupTreeViewEngine
      */
     __publicField(this, "selectData", []);
-    /**
-     * 通过srfkey选中数据
-     * @author lxm
-     * @date 2024-02-21 09:17:23
-     * @type {boolean}
-     */
-    __publicField(this, "selectBySrfkey", false);
   }
   /**
    * 创建完成
@@ -42,43 +34,21 @@ class PickupTreeViewEngine extends treeView_engine.TreeViewEngine {
     }
     this.view.slotProps.tree.singleSelect = this.view.state.singleSelect;
     this.view.slotProps.tree.checkStrictly = this.view.state.checkStrictly;
-    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));
-        } else {
-          this.selectBySrfkey = true;
-        }
-      });
-      this.view.slotProps.tree.defaultExpandedKeys = Array.from(set);
-    }
+    this.initSelectData();
   }
   /**
-   * 根据key计算需要展开的节点标识
-   * @author lxm
-   * @date 2023-11-07 02:42:45
-   * @param {string} key
-   * @return {*}  {string[]}
+   * @description 初始化选中数据
+   * @protected
+   * @memberof PickupTreeViewEngine
    */
-  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;
+  initSelectData() {
+    if (this.view.params.selecteddata) {
+      this.selectData = JSON.parse(this.view.params.selecteddata);
+      delete this.view.params.selecteddata;
+    }
+    if (this.view.state.selectedData) {
+      this.selectData = [...this.view.state.selectedData];
+    }
   }
   /**
    * 挂载完成
@@ -89,31 +59,16 @@ class PickupTreeViewEngine extends treeView_engine.TreeViewEngine {
    */
   async onMounted() {
     const { model } = this.view;
-    let forbiddenSelectionChange = false;
     this.xdataControl.evt.on("onSelectionChange", async (event) => {
-      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;
-      let selectData = this.selectData;
-      if (this.selectBySrfkey) {
-        const srfkeys = this.selectData.map((item) => item.srfkey);
-        selectData = this.tree.state.items.filter((item) => {
-          return srfkeys.includes(item.srfkey);
-        });
-      }
-      this.xdataControl.setSelection(selectData);
-      forbiddenSelectionChange = false;
-    });
     if (!this.view.state.noLoadDefault && model.loadDefault) {
       this.load();
     }
+    this.setSelectedData(this.selectData);
   }
   async call(key, args) {
     if (key === runtime.ViewCallTag.GET_ALL_DATA) {

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

@@ -41,10 +41,21 @@ class PickupViewEngine extends runtime.ViewEngineBase {
     await super.onCreated();
     const { childNames } = this.view;
     childNames.push("pickupviewpanel");
+    this.initSelectData();
+  }
+  /**
+   * @description 初始化选中数据
+   * @protected
+   * @memberof PickupViewEngine
+   */
+  initSelectData() {
     if (this.view.params.selecteddata) {
       this.selectData = JSON.parse(this.view.params.selecteddata);
       delete this.view.params.selecteddata;
     }
+    if (this.view.state.selectedData) {
+      this.selectData = [...this.view.state.selectedData];
+    }
   }
   /**
    * 视图mounted生命周期执行逻辑