@ibiz-template/mob-vue3-components 0.7.41-alpha.7 → 0.7.41-alpha.8

package/es/view-engine/mob-mpickup-view-engine.mjs

@@ -75,7 +75,6 @@ class MobMPickupViewEngine extends MobPickupViewEngine {
       this.view.layoutPanel.panelItems.simplelist.state.visible = false;
     }
   }
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/explicit-module-boundary-types
   async call(key, args) {
     if (key === SysUIActionTag.CANCEL) {
       this.cancel();
@@ -102,28 +101,11 @@ class MobMPickupViewEngine extends MobPickupViewEngine {
   /**
    * 选择面板激活数据
    *
-   * @param {IData[]} data
-   * @memberof MobMPickupViewEngine
-   */
-  pickupViewPanelDataActive(data) {
-    const allData = this.simpleList.getAllData();
-    const items = [...allData, ...data];
-    const uniqueItems = this.handleUniqueItems(items);
-    this.simpleList.setData(uniqueItems);
-  }
-  /**
-   * 去重数组
-   *
-   * @protected
-   * @param {IData[]} arr
-   * @return {*}  {IData[]}
    * @memberof MobMPickupViewEngine
    */
-  handleUniqueItems(arr) {
-    const res = /* @__PURE__ */ new Map();
-    return arr.filter(
-      (item) => !res.has(item.srfkey) && res.set(item.srfkey, 1)
-    );
+  async pickupViewPanelDataActive() {
+    const selectedData = await this.pickupViewPanel.getSelectedData();
+    await this.handlePushSimpleListItems(selectedData);
   }
   /**
    *  选则面板激活数据
@@ -167,10 +149,26 @@ class MobMPickupViewEngine extends MobPickupViewEngine {
    * @param {IData[]} data
    * @memberof MobMPickupViewEngine
    */
-  handlePushSimpleListItems(data) {
-    const allData = this.simpleList.getAllData();
-    const items = this.calcDuplicateData(allData, data);
-    this.simpleList.setData(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);
+  }
+  /**
+   * 去重数组
+   *
+   * @protected
+   * @param {IData[]} arr
+   * @return {*}  {IData[]}
+   * @memberof MobMPickupViewEngine
+   */
+  handleUniqueItems(arr) {
+    const res = /* @__PURE__ */ new Map();
+    return arr.filter(
+      (item) => !res.has(item.srfkey) && res.set(item.srfkey, 1)
+    );
   }
   /**
    * 添加所有
@@ -191,7 +189,7 @@ class MobMPickupViewEngine extends MobPickupViewEngine {
    * @memberof MobMPickupViewEngine
    */
   removeAll() {
-    this.simpleList.setData([]);
+    this.setSelectedData([]);
   }
   /**
    * 添加选中
@@ -221,6 +219,16 @@ class MobMPickupViewEngine extends MobPickupViewEngine {
         items.splice(index, 1);
       }
     });
+    this.setSelectedData(items);
+  }
+  /**
+   * @description 设置选中数据
+   * @protected
+   * @param {IData[]} items
+   * @memberof MPickupViewEngine
+   */
+  setSelectedData(items) {
+    super.setSelectedData(items);
     this.simpleList.setData(items);
   }
   /**

package/es/view-engine/mob-opt-view.engine.d.ts

@@ -1,4 +1,4 @@
-import { ViewController, IOptViewState, IOptViewEvent } from '@ibiz-template/runtime';
+import { ViewController, IOptViewState, IOptViewEvent, IApiMobOptViewCall } from '@ibiz-template/runtime';
 import { IAppDEEditView } from '@ibiz/model-core';
 import { MobEditViewEngine } from './mob-edit-view.engine';
 export declare class MobOptViewEngine extends MobEditViewEngine {
@@ -10,7 +10,7 @@ export declare class MobOptViewEngine extends MobEditViewEngine {
      * @memberof MobOptViewEngine
      */
     protected view: ViewController<IAppDEEditView, IOptViewState, IOptViewEvent>;
-    call(key: string, args: any): Promise<any>;
+    call(key: keyof IApiMobOptViewCall, args: any): Promise<any>;
     /**
      * 确认
      *

package/es/view-engine/mob-pickup-md-view.engine.d.ts

@@ -1,4 +1,4 @@
-import { ViewController, IPickupMDViewEvent, IPickupMDViewState, IMobMDCtrlController, MDViewEngine } from '@ibiz-template/runtime';
+import { ViewController, IPickupMDViewEvent, IPickupMDViewState, IMobMDCtrlController, MDViewEngine, IApiMobPickupMDViewCall } from '@ibiz-template/runtime';
 import { IAppDEDataView } from '@ibiz/model-core';
 export declare class PickupMDViewEngine extends MDViewEngine {
     protected view: ViewController<IAppDEDataView, IPickupMDViewState, IPickupMDViewEvent>;
@@ -13,5 +13,5 @@ export declare class PickupMDViewEngine extends MDViewEngine {
     get mdctrl(): IMobMDCtrlController;
     onCreated(): Promise<void>;
     onMounted(): Promise<void>;
-    call(key: string, args: any): Promise<IData | null | undefined>;
+    call(key: keyof IApiMobPickupMDViewCall, args: any): Promise<IData | null | undefined>;
 }

package/es/view-engine/mob-pickup-md-view.engine.mjs

@@ -35,7 +35,6 @@ class PickupMDViewEngine extends MDViewEngine {
       this.load();
     }
   }
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/explicit-module-boundary-types
   async call(key, args) {
     if (key === "GetAllData") {
       return this.mdctrl.state.items;

package/es/view-engine/mob-pickup-view.engine.d.ts

@@ -1,4 +1,4 @@
-import { ViewController, IPickupViewPanelController, IPickupViewState, IPickupViewEvent, ViewEngineBase } from '@ibiz-template/runtime';
+import { ViewController, IPickupViewPanelController, IPickupViewState, IPickupViewEvent, ViewEngineBase, IApiMobPickupViewCall } from '@ibiz-template/runtime';
 import { IAppDEMobPickupView } from '@ibiz/model-core';
 export declare class MobPickupViewEngine extends ViewEngineBase {
     /**
@@ -37,6 +37,13 @@ export declare class MobPickupViewEngine extends ViewEngineBase {
      * @memberof MobPickupViewEngine
      */
     onMounted(): Promise<void>;
+    /**
+     * @description 设置选中数据
+     * @protected
+     * @param {IData[]} items
+     * @memberof PickupViewEngine
+     */
+    protected setSelectedData(items: IData[]): void;
     /**
      *  选则面板激活数据
      *
@@ -46,7 +53,7 @@ export declare class MobPickupViewEngine extends ViewEngineBase {
      * @memberof MobPickupViewEngine
      */
     pickupViewPanelDataActive(data: IData[]): void;
-    call(key: string, args: any): Promise<IData | null | undefined>;
+    call(key: keyof IApiMobPickupViewCall, args: any): Promise<IData | null | undefined>;
     /**
      * 确认
      *

package/es/view-engine/mob-pickup-view.engine.mjs

@@ -43,6 +43,10 @@ class MobPickupViewEngine extends ViewEngineBase {
       this.view.slotProps.pickupviewpanel = {};
     }
     this.view.slotProps.pickupviewpanel.singleSelect = true;
+    if (this.view.params.selecteddata) {
+      this.selectedData = JSON.parse(this.view.params.selecteddata);
+      delete this.view.params.selecteddata;
+    }
   }
   /**
    * 视图mounted生命周期执行逻辑
@@ -58,6 +62,17 @@ class MobPickupViewEngine extends ViewEngineBase {
     this.pickupViewPanel.evt.on("onDataActive", (event) => {
       this.pickupViewPanelDataActive(event.data);
     });
+    this.setSelectedData(this.selectedData);
+  }
+  /**
+   * @description 设置选中数据
+   * @protected
+   * @param {IData[]} items
+   * @memberof PickupViewEngine
+   */
+  setSelectedData(items) {
+    this.selectedData = items;
+    this.pickupViewPanel.setSelectedData(items);
   }
   /**
    *  选则面板激活数据
@@ -71,7 +86,6 @@ class MobPickupViewEngine extends ViewEngineBase {
     this.selectedData = data;
     this.view.closeView({ ok: true, data: this.selectedData });
   }
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/explicit-module-boundary-types
   async call(key, args) {
     if (key === SysUIActionTag.CANCEL) {
       this.cancel();

package/es/view-engine/mob-tab-search-view.engine.d.ts

@@ -1,4 +1,4 @@
-import { ISearchBarController, ISearchFormController, ITabExpPanelController, ITabSearchViewEvent, ITabSearchViewState, ViewController } from '@ibiz-template/runtime';
+import { IApiMobTabSearchViewCall, ISearchBarController, ISearchFormController, ITabExpPanelController, ITabSearchViewEvent, ITabSearchViewState, ViewController } from '@ibiz-template/runtime';
 import { IAppDETabSearchView, IDETabViewPanel } from '@ibiz/model-core';
 import { MobTabExpViewEngine } from './mob-tab-exp-view.engine';
 /**
@@ -53,7 +53,7 @@ export declare class MobTabSearchViewEngine extends MobTabExpViewEngine {
      * @memberof MobTabSearchViewEngine
      */
     onQuickSearchPlaceHolder(tab: IDETabViewPanel): Promise<void>;
-    call(key: string, args: any): Promise<IData | null | undefined>;
+    call(key: keyof IApiMobTabSearchViewCall, args: any): Promise<IData | null | undefined>;
     /**
      * 获取搜索相关的查询参数
      * @author lxm

package/es/view-engine/mob-tab-search-view.engine.mjs

@@ -116,7 +116,6 @@ class MobTabSearchViewEngine extends MobTabExpViewEngine {
     this.searchBar.placeHolder = caption || "";
     this.searchBar.state.quickSearchPlaceHolder = caption || "";
   }
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/explicit-module-boundary-types
   async call(key, args) {
     if (key === SysUIActionTag.SEARCH) {
       await this.searchForm.search();

package/es/view-engine/mob-wf-dyna-action-view.engine.d.ts

@@ -1,4 +1,4 @@
-import { ViewController, IWFDynaActionViewState, IWFDynaActionViewEvent } from '@ibiz-template/runtime';
+import { ViewController, IWFDynaActionViewState, IWFDynaActionViewEvent, IApiMobWFDynaActionViewCall } from '@ibiz-template/runtime';
 import { IAppDEMobWFDynaActionView } from '@ibiz/model-core';
 import { MobWFDynaEditViewEngine } from './mob-wf-dyna-edit-view.engine';
 export declare class MobWFDynaActionViewEngine extends MobWFDynaEditViewEngine {
@@ -12,7 +12,7 @@ export declare class MobWFDynaActionViewEngine extends MobWFDynaEditViewEngine {
     protected view: ViewController<IAppDEMobWFDynaActionView, IWFDynaActionViewState, IWFDynaActionViewEvent>;
     isCalcWFToolbar: boolean;
     calcProcessFormName(): Promise<string>;
-    call(key: string, args: any): Promise<IData | null | undefined>;
+    call(key: keyof IApiMobWFDynaActionViewCall, args: any): Promise<IData | null | undefined>;
     /**
      * 确认按钮回调
      *

package/es/view-engine/mob-wf-dyna-action-view.engine.mjs

@@ -18,7 +18,6 @@ class MobWFDynaActionViewEngine extends MobWFDynaEditViewEngine {
     const processForm = this.view.context.processForm ? `wfform_${this.view.context.processForm}` : "form";
     return processForm;
   }
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/explicit-module-boundary-types
   async call(key, args) {
     if (key === SysUIActionTag.OK) {
       this.onOkButtonClick();

package/es/view-engine/mob-wf-dyna-edit-view.engine.d.ts

@@ -1,4 +1,4 @@
-import { ViewController, IEditFormController, IWFDynaEditViewEvent, IWFDynaEditViewState, WFLink, IAppDEService, IToolbarController } from '@ibiz-template/runtime';
+import { ViewController, IEditFormController, IWFDynaEditViewEvent, IWFDynaEditViewState, WFLink, IAppDEService, IToolbarController, IApiMobWFDynaEditViewCall } from '@ibiz-template/runtime';
 import { IAppDEMobWFDynaEditView, IDEEditForm } from '@ibiz/model-core';
 import { WFActionButtonController } from '../panel-component/wf-action-button';
 import { MobEditViewEngine } from './mob-edit-view.engine';
@@ -119,7 +119,7 @@ export declare class MobWFDynaEditViewEngine extends MobEditViewEngine {
      * @memberof WFDynaEditViewController
      */
     wfSubmitByLink(link: WFLink): Promise<void>;
-    call(key: string, args: any): Promise<IData | null | undefined>;
+    call(key: keyof IApiMobWFDynaEditViewCall, args: any): Promise<IData | null | undefined>;
     /**
      * 初始化工作流动态按钮
      *

package/es/view-engine/mob-wf-dyna-edit-view.engine.mjs

@@ -245,7 +245,6 @@ class MobWFDynaEditViewEngine extends MobEditViewEngine {
       await this.view.closeView();
     }
   }
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/explicit-module-boundary-types
   async call(key, args) {
     if (key === "WFAction") {
       this.onLinkClick(args.id);

package/es/view-engine/mob-wf-dyna-start-view.engine.d.ts

@@ -1,4 +1,4 @@
-import { ViewController, IWFDynaStartViewState, IWFDynaStartViewEvent } from '@ibiz-template/runtime';
+import { ViewController, IWFDynaStartViewState, IWFDynaStartViewEvent, IApiMobWFDynaStartViewCall } from '@ibiz-template/runtime';
 import { IAppDEMobWFDynaStartView } from '@ibiz/model-core';
 import { MobWFDynaEditViewEngine } from './mob-wf-dyna-edit-view.engine';
 export declare class MobWFDynaStartViewEngine extends MobWFDynaEditViewEngine {
@@ -12,7 +12,7 @@ export declare class MobWFDynaStartViewEngine extends MobWFDynaEditViewEngine {
     protected view: ViewController<IAppDEMobWFDynaStartView, IWFDynaStartViewState, IWFDynaStartViewEvent>;
     isCalcWFToolbar: boolean;
     calcProcessFormName(): Promise<string>;
-    call(key: string, args: any): Promise<IData | null | undefined>;
+    call(key: keyof IApiMobWFDynaStartViewCall, args: any): Promise<IData | null | undefined>;
     /**
      * 确认按钮回调
      *

package/es/view-engine/mob-wf-dyna-start-view.engine.mjs

@@ -18,7 +18,6 @@ class MobWFDynaStartViewEngine extends MobWFDynaEditViewEngine {
     const processForm = this.view.context.processForm ? `wfform_${this.view.context.processForm}` : "form";
     return processForm;
   }
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/explicit-module-boundary-types
   async call(key, args) {
     if (key === SysUIActionTag.OK) {
       this.onOkButtonClick();

package/lib/_virtual/index12.cjs

@@ -1,5 +1,5 @@
 'use strict';
 
-var middlewares = {};
+var frameTalkClientPc = {exports: {}};
 
-exports.__exports = middlewares;
+exports.__module = frameTalkClientPc;

package/lib/_virtual/index13.cjs

@@ -1,5 +1,5 @@
 'use strict';
 
-var frameTalkClientPc = {exports: {}};
+var middlewares = {};
 
-exports.__module = frameTalkClientPc;
+exports.__exports = middlewares;

package/lib/_virtual/index17.cjs

@@ -1,5 +1,5 @@
 'use strict';
 
-var lodash_clonedeep = {exports: {}};
+var lodash_isequal = {exports: {}};
 
-exports.__module = lodash_clonedeep;
+exports.__module = lodash_isequal;

package/lib/_virtual/index18.cjs

@@ -1,5 +1,5 @@
 'use strict';
 
-var lodash_isequal = {exports: {}};
+var lodash_clonedeep = {exports: {}};
 
-exports.__module = lodash_isequal;
+exports.__module = lodash_clonedeep;

package/lib/common/index.cjs

@@ -46,6 +46,7 @@ const IBizCommonComponents = {
     v.component(mdCtrlSetting.IBizMdCtrlSetting.name, mdCtrlSetting.IBizMdCtrlSetting);
     v.component(previewImage.IBizPreviewImage.name, previewImage.IBizPreviewImage);
     v.component(cropping.IBizCropping.name, cropping.IBizCropping);
+    v.component(vue3Util.IBizSignaturePad.name, vue3Util.IBizSignaturePad);
   }
 };
 

package/lib/control/dashboard/portlet/portlet-part/portlet-part.state.cjs

@@ -9,6 +9,7 @@ var __publicField = (obj, key, value) => {
 };
 class PortletPartState {
   constructor() {
+    __publicField(this, "hightLight", false);
     __publicField(this, "visible", true);
     __publicField(this, "keepAlive", false);
     __publicField(this, "layout", {

package/lib/control/data-view/data-view.cjs

@@ -91,11 +91,10 @@ const DataViewControl = /* @__PURE__ */ vue.defineComponent({
       }, null);
     };
     const renderItemAction = (item) => {
-      var _a;
       return vue.createVNode(vue.resolveComponent("iBizActionToolbar"), {
         "class": ns.bem("item-content", "bottom", "actions"),
-        "action-details": (_a = c.getOptItemModel().deuiactionGroup) == null ? void 0 : _a.uiactionGroupDetails,
-        "actions-state": c.getOptItemAction(item),
+        "action-details": c.getOptItemModel(),
+        "actions-state": c.state.uaState[item.srfkey],
         "onActionClick": (detail, event) => c.onActionClick(detail, item, event)
       }, null);
     };

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

@@ -27,6 +27,9 @@ class DRBarController extends runtime.ControlController {
      */
     __publicField(this, "router");
   }
+  setActive(_name) {
+    throw new Error("Method not implemented.");
+  }
   /**
    * 导航占位控制器
    *

package/lib/control/drtab/drtab.controller.cjs

@@ -28,6 +28,9 @@ class DRTabController extends runtime.ControlController {
      */
     __publicField(this, "router");
   }
+  setActive(_name) {
+    throw new Error("Method not implemented.");
+  }
   /**
    * 导航占位控制器
    *

package/lib/control/form/form-detail/form-group-panel/form-group-panel.css

@@ -1 +1 @@
-.ibiz-form-group{--ibiz-form-group-bg-color:var(--ibiz-color-bg-1);--ibiz-form-group-footer-padding:var(--ibiz-spacing-tight) var(--ibiz-spacing-base);--ibiz-form-group-show-more-color:var(--ibiz-color-primary);--ibiz-form-group-padding:var(--ibiz-spacing-extra-tight);--ibiz-form-group-header-bg-color:var(--ibiz-color-bg-1);--ibiz-form-group-header-padding:var(--ibiz-spacing-base) var(--ibiz-spacing-base) var(--ibiz-spacing-tight);--ibiz-form-group-header-border-color:var(--ibiz-color-border);--ibiz-form-group-caption-text-color:var(--ibiz-color-text-2);--ibiz-form-group-caption-font-size:var(--ibiz-font-size-header-6);--ibiz-form-group-caption-font-weight:var(--ibiz-font-weight-regular);--ibiz-form-group-content-bg-color:var(--ibiz-color-bg-1);--ibiz-form-group-content-padding:var(--ibiz-spacing-tight);--ibiz-form-group-content-margin:0}.ibiz-form-group{overflow:hidden;background-color:var(--ibiz-form-group-bg-color)}.ibiz-form-group__caption{overflow:hidden;text-overflow:ellipsis;white-space:nowrap;font-size:var(--ibiz-form-group-caption-font-size);font-weight:var(--ibiz-form-group-caption-font-weight);color:var(--ibiz-form-group-caption-text-color)}.ibiz-form-group__toolbar{text-align:right}.ibiz-form-group--style2{background-color:var(--ibiz-color-bg-0);padding:var(--ibiz-form-group-padding)}.ibiz-form-group--style2>.ibiz-form-group-header{border-radius:var(--ibiz-border-radius-large) var(--ibiz-border-radius-large) 0 0}.ibiz-form-group--style2 .ibiz-form-group__content{padding:var(--ibiz-border-radius-large) 0;border-radius:var(--ibiz-border-radius-large);background-color:var(--ibiz-form-group-content-bg-color)}.ibiz-form-group--style2>.ibiz-form-group-header+.ibiz-form-group__content{padding-top:0;border-radius:0 0 var(--ibiz-border-radius-large) var(--ibiz-border-radius-large)}.ibiz-form-group .ibiz-form-item-container{border-radius:0}.ibiz-form-group-collapse>.ibiz-form-group-content{display:block}.ibiz-form-group-collapse.is-collapse>.ibiz-form-group-content{display:none}.ibiz-form-group-header{display:flex;align-items:center;padding:var(--ibiz-form-group-header-padding);background-color:var(--ibiz-form-group-header-bg-color)}.ibiz-form-group-header__left,.ibiz-form-group-header__right{display:inline-block;width:50%}.ibiz-form-group-header__right{display:flex;align-items:center;justify-content:flex-end;height:100%}.ibiz-form-group-header__right .van-button{height:100%;color:var(--ibiz-color-link);background:0 0;border:none}.ibiz-form-group--show-header content,.ibiz-form-group--show-header>.ibiz-form-group{margin-bottom:var(--ibiz-form-group-content-margin);background-color:var(--ibiz-form-group-content-bg-color)}.ibiz-form-group-footer{padding:var(--ibiz-form-group-footer-padding)}.ibiz-form-group-footer__show-more-button{display:inline-block;color:var(--ibiz-form-group-show-more-color)}
+.ibiz-form-group{--ibiz-form-group-bg-color:var(--ibiz-color-bg-1);--ibiz-form-group-footer-padding:var(--ibiz-spacing-tight) var(--ibiz-spacing-base);--ibiz-form-group-show-more-color:var(--ibiz-color-primary);--ibiz-form-group-padding:var(--ibiz-spacing-extra-tight);--ibiz-form-group-header-bg-color:var(--ibiz-color-bg-1);--ibiz-form-group-header-padding:var(--ibiz-spacing-base) var(--ibiz-spacing-base) var(--ibiz-spacing-tight);--ibiz-form-group-header-border-color:var(--ibiz-color-border);--ibiz-form-group-caption-text-color:var(--ibiz-color-text-2);--ibiz-form-group-caption-font-size:var(--ibiz-font-size-header-6);--ibiz-form-group-caption-font-weight:var(--ibiz-font-weight-regular);--ibiz-form-group-content-bg-color:var(--ibiz-color-bg-1);--ibiz-form-group-content-padding:var(--ibiz-spacing-tight);--ibiz-form-group-content-margin:0}.ibiz-form-group{overflow:hidden;background-color:var(--ibiz-form-group-bg-color)}.ibiz-form-group__caption{overflow:hidden;text-overflow:ellipsis;white-space:nowrap;font-size:var(--ibiz-form-group-caption-font-size);font-weight:var(--ibiz-form-group-caption-font-weight);color:var(--ibiz-form-group-caption-text-color)}.ibiz-form-group__toolbar{text-align:right}.ibiz-form-group--style2{background-color:var(--ibiz-color-bg-0);padding:var(--ibiz-form-group-padding)}.ibiz-form-group--style2>.ibiz-form-group-header{border-radius:var(--ibiz-border-radius-large) var(--ibiz-border-radius-large) 0 0}.ibiz-form-group--style2 .ibiz-form-group__content{padding:var(--ibiz-border-radius-large) 0;border-radius:var(--ibiz-border-radius-large);background-color:var(--ibiz-form-group-content-bg-color)}.ibiz-form-group--style2>.ibiz-form-group-header+.ibiz-form-group__content{padding-top:0;border-radius:0 0 var(--ibiz-border-radius-large) var(--ibiz-border-radius-large)}.ibiz-form-group .ibiz-form-item-container{border-radius:0}.ibiz-form-group-collapse>.ibiz-form-group__content{display:block}.ibiz-form-group-collapse.is-collapse>.ibiz-form-group__content{display:none}.ibiz-form-group-header{display:flex;align-items:center;padding:var(--ibiz-form-group-header-padding);background-color:var(--ibiz-form-group-header-bg-color)}.ibiz-form-group-header__left,.ibiz-form-group-header__right{display:inline-block;width:50%}.ibiz-form-group-header__right{display:flex;align-items:center;justify-content:flex-end;height:100%}.ibiz-form-group-header__right .van-button{height:100%;color:var(--ibiz-color-link);background:0 0;border:none}.ibiz-form-group--show-header content,.ibiz-form-group--show-header>.ibiz-form-group{margin-bottom:var(--ibiz-form-group-content-margin);background-color:var(--ibiz-form-group-content-bg-color)}.ibiz-form-group-footer{padding:var(--ibiz-form-group-footer-padding)}.ibiz-form-group-footer__show-more-button{display:inline-block;color:var(--ibiz-form-group-show-more-color)}

package/lib/control/pickup-view-panel/pickup-view-panel.controller.cjs

@@ -20,6 +20,9 @@ class PickupViewPanelController extends runtime.ControlController {
      */
     __publicField(this, "embedView");
   }
+  setSelectedData(_items) {
+    throw new Error("Method not implemented.");
+  }
   /**
    * 生命周期-创建完成
    *

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

@@ -2,6 +2,7 @@
 
 var vue = require('vue');
 var vue3Util = require('@ibiz-template/vue3-util');
+var lodashEs = require('lodash-es');
 require('./ibiz-mpicker.css');
 var ibizDataMpicker = require('../../common/data-mpicker/ibiz-data-mpicker.cjs');
 var rightIcon = require('../../common/right-icon/right-icon.cjs');
@@ -26,39 +27,119 @@ const IBizMPicker = /* @__PURE__ */ vue.defineComponent({
         value: item[c.keyName] || item.srfkey,
         srfmajortext: item[c.textName] || item.srfmajortext,
         text: item[c.textName] || item.srfmajortext,
+        [c.keyName]: item[c.keyName] || item.srfkey,
+        [c.textName]: item[c.textName] || item.srfmajortext,
         ...item
       };
     };
-    vue.watch(() => props.value, (newVal) => {
+    const resetCurValue = () => {
       curValue.value = [];
       selectItems.value = [];
-      if (newVal) {
-        selectItems.value = JSON.parse(newVal).map(formatter);
+      if (props.value) {
+        if (c.model.valueType === "OBJECTS") {
+          props.value.forEach((item) => {
+            const _item = lodashEs.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]) {
+              selectItems.value.push(formatter(_item));
+            }
+          });
+        } else if (c.objectIdField && c.model.valueSeparator) {
+          const values = props.value.split(c.model.valueSeparator);
+          values.forEach((value) => {
+            selectItems.value.push(formatter({
+              [c.keyName]: value
+            }));
+          });
+        } else {
+          try {
+            selectItems.value = JSON.parse(props.value).map(formatter);
+          } catch (error) {
+            ibiz.log.error(ibiz.i18n.t("editor.mpicker.simpleErr", {
+              value: props.value
+            }));
+          }
+        }
         selectItems.value.forEach((item) => {
-          curValue.value.push(item.srfkey);
-          const index = items.value.findIndex((i) => Object.is(i.srfkey, item.srfkey));
+          curValue.value.push(item[c.keyName]);
+          const index = items.value.findIndex(
+            (i) => Object.is(i[c.keyName], item[c.keyName]) || Object.is(i.srfkey, item.srfkey)
+            // 兼容写法，适配移动端老逻辑
+          );
           if (index < 0) {
             items.value.push(formatter(item));
           }
         });
       }
+    };
+    vue.watch(() => props.value, () => {
+      resetCurValue();
     }, {
       immediate: true,
       deep: true
     });
-    const handleOpenViewClose = (result) => {
-      const valArr = [];
+    const handleOpenViewClose = async (result) => {
+      const selects = [];
       if (result && Array.isArray(result)) {
-        result.forEach((select) => {
-          const formattedItem = formatter(select);
-          valArr.push(formattedItem);
+        const calcPromises = result.map(async (select) => {
+          const item = formatter(select);
+          if (select.srfnodeid) {
+            Object.assign(item, select._deData);
+          }
+          const dataItems = await c.calcFillDataItems(item);
+          const res = {};
+          dataItems.forEach((dataItem) => {
+            Object.assign(res, {
+              [dataItem.id]: dataItem.value
+            });
+          });
+          return res;
+        });
+        const dataItemsList = await Promise.all(calcPromises);
+        result.forEach((select, _index) => {
+          Object.assign(select, {
+            ...formatter(select),
+            [c.keyName]: select[c.keyName] ? select[c.keyName] : select.srfkey,
+            [c.textName]: select[c.textName] ? select[c.textName] : select.srfmajortext
+          });
+          const data = dataItemsList[_index];
+          if (c.model.valueType === "OBJECTS") {
+            selects.push({
+              ...c.handleObjectParams(select),
+              ...data
+            });
+          } else if (c.objectIdField && c.model.valueSeparator) {
+            selects.push(select[c.keyName]);
+          } else {
+            selects.push({
+              [c.keyName]: select[c.keyName],
+              [c.textName]: select[c.textName],
+              ...data
+            });
+          }
           const index = items.value.findIndex((item) => Object.is(item[c.keyName], select[c.keyName]));
           if (index < 0) {
-            items.value.push(formattedItem);
+            items.value.push(select);
           }
         });
       }
-      const value = valArr.length > 0 ? JSON.stringify(valArr) : "";
+      let value = null;
+      if (selects.length > 0) {
+        if (c.model.valueType === "OBJECTS") {
+          value = selects;
+        } else {
+          value = c.objectIdField && c.model.valueSeparator ? selects.join(c.model.valueSeparator) : JSON.stringify(selects);
+        }
+      }
       emit("change", value);
     };
     const openPickUpView = async (event) => {
@@ -76,21 +157,58 @@ const IBizMPicker = /* @__PURE__ */ vue.defineComponent({
         handleOpenViewClose(res);
       }
     };
-    const onSelect = (selects) => {
-      const valArr = [];
-      if (selects.length > 0) {
-        selects.forEach((select) => {
-          const findItem = items.value.find((item) => Object.is(item.srfkey, select));
-          if (findItem) {
-            valArr.push(formatter(findItem));
+    const onSelect = async (selects) => {
+      const val = [];
+      let value = null;
+      const selections = selects.map((select) => {
+        let index = items.value.findIndex((item2) => Object.is(item2[c.keyName], select));
+        let item = {};
+        if (index >= 0) {
+          item = items.value[index];
+        } else {
+          index = selectItems.value.findIndex((selectItem) => Object.is(selectItem[c.keyName], select));
+          if (index >= 0) {
+            item = selectItems.value[index];
           }
+        }
+        return item;
+      });
+      const calcPromises = selections.map(async (select) => {
+        const dataItems = await c.calcFillDataItems(select);
+        const res = {};
+        dataItems.forEach((dataItem) => {
+          Object.assign(res, {
+            [dataItem.id]: dataItem.value
+          });
         });
-        const value = valArr.length > 0 ? JSON.stringify(valArr) : "";
-        selectItems.value = valArr;
-        emit("change", value);
-      } else {
-        emit("change", "");
+        return res;
+      });
+      const dataItemsList = await Promise.all(calcPromises);
+      selections.forEach((item, index) => {
+        const data = dataItemsList[index];
+        if (c.model.valueType === "OBJECTS") {
+          val.push({
+            ...c.handleObjectParams(item),
+            ...data
+          });
+        } else if (c.objectIdField && c.model.valueSeparator) {
+          val.push(item[c.keyName]);
+        } else {
+          val.push({
+            [c.keyName]: item[c.keyName],
+            [c.textName]: item[c.textName],
+            ...data
+          });
+        }
+      });
+      if (val.length > 0) {
+        if (c.model.valueType === "OBJECTS") {
+          value = val;
+        } else {
+          value = c.objectIdField && c.model.valueSeparator ? val.join(c.model.valueSeparator) : JSON.stringify(val);
+        }
       }
+      emit("change", value);
     };
     const onSearch = async (query = "") => {
       if (c.model.appDataEntityId) {
@@ -113,7 +231,7 @@ const IBizMPicker = /* @__PURE__ */ vue.defineComponent({
         selectItems.value.forEach((select) => {
           if (c.model.valueType === "OBJECTS") {
             val.push(c.handleObjectParams(select));
-          } else if (c.objectIdField) {
+          } else if (c.objectIdField && c.model.valueSeparator) {
             val.push(select[c.keyName]);
           } else {
             val.push({
@@ -126,7 +244,7 @@ const IBizMPicker = /* @__PURE__ */ vue.defineComponent({
           if (c.model.valueType === "OBJECTS") {
             value = val;
           } else {
-            value = c.objectIdField ? val.join(c.model.valueSeparator) : JSON.stringify(val);
+            value = c.objectIdField && c.model.valueSeparator ? val.join(c.model.valueSeparator) : JSON.stringify(val);
           }
         }
         emit("change", value);