@ibiz-template/vue3-components 0.7.34 → 0.7.37-alpha.5

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

@@ -49,8 +49,34 @@ class EditViewEngine extends runtime.ViewEngineBase {
       }
     }
   }
+  /**
+   * 模态事件钩子
+   *
+   * @param {{ allowClose?: boolean }} context
+   * @return {*}  {Promise<void>}
+   * @memberof EditViewEngine
+   */
+  async modalEventHook(context) {
+    var _a, _b;
+    const uiDomain = ibiz.uiDomainManager.get(this.view.context.srfsessionid);
+    const isChange = (((_a = this.form) == null ? void 0 : _a.state.modified) || uiDomain.dataModification) && this.view.model.enableDirtyChecking === true;
+    if (isChange && ((_b = this.form) == null ? void 0 : _b.model.enableAutoSave) && !uiDomain.dataModification) {
+      await this.form.immediateAutoSave();
+    } else if (isChange && context.allowClose == null) {
+      const isAllow = await ibiz.confirm.error({
+        title: ibiz.i18n.t("viewEngine.closeRemind"),
+        desc: ibiz.i18n.t("viewEngine.confirmClosePrompt")
+      });
+      if (!isAllow) {
+        context.allowClose = false;
+      } else {
+        context.allowClose = true;
+      }
+    }
+  }
   async onCreated() {
     await super.onCreated();
+    this.modalEventHook = this.modalEventHook.bind(this);
     const { childNames, modal } = this.view;
     childNames.push("form");
     this.deName = runtime.calcDeCodeNameById(this.view.model.appDataEntityId);
@@ -62,24 +88,7 @@ class EditViewEngine extends runtime.ViewEngineBase {
       this.view.slotProps.toolbar = {};
     }
     this.view.slotProps.toolbar.manualCalcButtonState = true;
-    modal.hooks.shouldDismiss.tapPromise(async (context) => {
-      var _a, _b;
-      const uiDomain = ibiz.uiDomainManager.get(this.view.context.srfsessionid);
-      const isChange = (((_a = this.form) == null ? void 0 : _a.state.modified) || uiDomain.dataModification) && this.view.model.enableDirtyChecking === true;
-      if (isChange && ((_b = this.form) == null ? void 0 : _b.model.enableAutoSave) && !uiDomain.dataModification) {
-        await this.form.immediateAutoSave();
-      } else if (isChange && context.allowClose == null) {
-        const isAllow = await ibiz.confirm.error({
-          title: ibiz.i18n.t("viewEngine.closeRemind"),
-          desc: ibiz.i18n.t("viewEngine.confirmClosePrompt")
-        });
-        if (!isAllow) {
-          context.allowClose = false;
-        } else {
-          context.allowClose = true;
-        }
-      }
-    });
+    modal.hooks.shouldDismiss.tapPromise(this.modalEventHook);
   }
   async onMounted() {
     await super.onMounted();
@@ -141,7 +150,7 @@ class EditViewEngine extends runtime.ViewEngineBase {
     return this.form.save();
   }
   async refresh() {
-    this.form.doNextActive(() => this.load(), { key: "load" });
+    this.form.refresh();
   }
   // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/explicit-module-boundary-types
   async call(key, args) {
@@ -296,11 +305,13 @@ class EditViewEngine extends runtime.ViewEngineBase {
    * @return {*}  {void}
    */
   initMarkOpenData() {
+    var _a;
     if (![runtime.ViewMode.ROUTE, runtime.ViewMode.ROUTE_MODAL].includes(this.view.modal.mode) || !this.view.model.markOpenDataMode) {
       return;
     }
     const modes = this.view.model.markOpenDataMode.split(";");
     let hasOpenConfirm = false;
+    (_a = this.coopPos) == null ? void 0 : _a.initMessageModes(modes);
     const callback = async (data) => {
       if (!this.view.state.activated) {
         return;
@@ -320,7 +331,7 @@ class EditViewEngine extends runtime.ViewEngineBase {
         default:
           break;
       }
-      const message = "".concat(modes.includes("DISPLAYOPPERSON") ? data.username : ibiz.i18n.t("viewEngine.someone"), " ").concat(actionMsg, " ").concat(this.view.state.caption, "-").concat(dataInfo);
+      const message = "".concat(data.username, " ").concat(actionMsg, " ").concat(this.view.state.caption, "-").concat(dataInfo);
       if (this.coopPos) {
         this.coopPos.updateMessage({
           title: message,
@@ -426,7 +437,6 @@ class EditViewEngine extends runtime.ViewEngineBase {
    * @param {string} type
    */
   async changeRecord(type) {
-    var _a;
     const controlId = "".concat(this.view.context.srfnavctrlid);
     if (!controlId) {
       throw new core.RuntimeError(ibiz.i18n.t("viewEngine.missingErr"));
@@ -457,24 +467,51 @@ class EditViewEngine extends runtime.ViewEngineBase {
         this.form.model.appDataEntityId,
         this.form.context.srfappid
       );
-      if (appDataEntity && appDataEntity.minorAppDERSs && appDataEntity.minorAppDERSs.length > 0) {
-        (_a = appDataEntity.minorAppDERSs) == null ? void 0 : _a.forEach((minorAppDERS) => {
-          if (minorAppDERS.majorAppDataEntityId && minorAppDERS.parentAppDEFieldId) {
-            const majorAppDataEntityCodeName = runtime.calcDeCodeNameById(
-              minorAppDERS.majorAppDataEntityId
-            );
-            if (majorAppDataEntityCodeName && targetItem[minorAppDERS.parentAppDEFieldId]) {
-              this.view.context[majorAppDataEntityCodeName] = targetItem[minorAppDERS.parentAppDEFieldId];
-              this.form.context[majorAppDataEntityCodeName] = targetItem[minorAppDERS.parentAppDEFieldId];
-            }
-          }
+      const { srfparentkey, srfparentdename } = await runtime.calcDynaSysParams(
+        this.form.model.appDataEntityId,
+        this.view.context,
+        {
+          viewParams: this.view.params
+        }
+      );
+      const typeFileName = appDataEntity.formTypeAppDEFieldId || appDataEntity.dataTypeAppDEFieldId;
+      const params = {
+        srfdatatype: typeFileName ? targetItem[typeFileName] : void 0
+      };
+      const context = await runtime.getDeDataMajorField(
+        targetItem,
+        this.view.context,
+        this.form.model.appDataEntityId
+      );
+      context[this.deName] = targetItem.srfkey;
+      Object.assign(this.view.context, context);
+      Object.assign(this.view.params, params);
+      if (srfparentdename && this.view.model.dynaSysMode === 1 && this.view.context[srfparentdename] !== srfparentkey) {
+        return this.view.redrawView({
+          params,
+          context,
+          data: [targetItem],
+          isReloadModel: true
         });
       }
-      this.view.context[this.deName] = targetItem.srfkey;
-      this.form.context[this.deName] = targetItem.srfkey;
-      this.load();
+      return this.view.redrawView({
+        params,
+        context,
+        data: [targetItem]
+      });
     }
   }
+  /**
+   * 视图destroyed生命周期执行逻辑
+   *
+   * @return {*}  {Promise<void>}
+   * @memberof EditViewEngine
+   */
+  async onDestroyed() {
+    super.onDestroyed();
+    const { modal } = this.view;
+    modal.hooks.shouldDismiss.removeTapPromise(this.modalEventHook);
+  }
 }
 
 exports.EditViewEngine = EditViewEngine;

package/lib/web-app/components/modal-router-shell/modal-router-shell.cjs

@@ -55,7 +55,7 @@ const ModalRouterShell = /* @__PURE__ */ vue.defineComponent({
       }
       const appViewId = route.params.modalView;
       const paramsStr = route.params.modalParams;
-      if (paramsStr) {
+      if (paramsStr && paramsStr !== "-") {
         const params = qs.parse(paramsStr, {
           strictNullHandling: true,
           delimiter: ";"

package/lib/web-app/create-vue-app.cjs

@@ -2,7 +2,7 @@
 
 var vue = require('vue');
 var ElementPlus = require('element-plus');
-var zhCn = require('../node_modules/.pnpm/element-plus@2.4.4_vue@3.4.34/node_modules/element-plus/dist/locale/zh-cn.cjs');
+var zhCn = require('../node_modules/.pnpm/element-plus@2.4.4_vue@3.3.8/node_modules/element-plus/dist/locale/zh-cn.cjs');
 var vue3Util = require('@ibiz-template/vue3-util');
 var ibizVue3 = require('../ibiz-vue3.cjs');
 var index = require('../locale/index.cjs');
@@ -26,6 +26,14 @@ function createVueApp(rootComponent, rootProps) {
       _app.use(biReport);
     });
   });
+  const importDataView = () => import('@ibiz-template-plugin/data-view');
+  importDataView().then((value) => {
+    const dataView = value.default;
+    vue3Util.AppHooks.useComponent.callSync(null, dataView);
+    vue3Util.AppHooks.createApp.tap((_, _app) => {
+      _app.use(dataView);
+    });
+  });
   if (rootProps) {
     const oldUnMounted = rootProps.unmounted;
     rootProps.unmounted = () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/vue3-components",
-  "version": "0.7.34",
+  "version": "0.7.37-alpha.5",
   "description": "使用 rollup 编译 vue 组件或者 jsx",
   "main": "lib/index.cjs",
   "module": "es/index.mjs",
@@ -31,15 +31,16 @@
     "@floating-ui/dom": "^1.5.3",
     "@ibiz-template-plugin/ai-chat": "^0.0.5",
     "@ibiz-template-plugin/gantt": "0.1.8-alpha.7",
-    "@ibiz-template-plugin/bi-report": "0.0.18",
-    "@ibiz-template/core": "0.7.32",
+    "@ibiz-template-plugin/bi-report": "0.0.24",
+    "@ibiz-template-plugin/data-view": "0.0.3",
+    "@ibiz-template/core": "0.7.35-alpha.1",
     "@ibiz-template/devtool": "0.0.1-dev.6",
-    "@ibiz-template/model-helper": "0.7.34",
-    "@ibiz-template/runtime": "0.7.34",
+    "@ibiz-template/model-helper": "0.7.37-alpha.3",
+    "@ibiz-template/runtime": "0.7.37-alpha.3",
     "@ibiz-template/theme": "^0.7.0",
-    "@ibiz-template/vue3-util": "0.7.34",
+    "@ibiz-template/vue3-util": "0.7.37-alpha.3",
     "@ibiz-template/web-theme": "^1.1.18",
-    "@ibiz/model-core": "^0.1.46",
+    "@ibiz/model-core": "^0.1.53",
     "@imengyu/vue3-context-menu": "^1.3.5",
     "@monaco-editor/loader": "^1.4.0",
     "@wangeditor/editor": "^5.1.23",
@@ -104,7 +105,7 @@
     "@ibiz-template/runtime": "^0.7.0",
     "@ibiz-template/theme": "^0.7.0",
     "@ibiz-template/vue3-util": "^0.7.0",
-    "@ibiz/model-core": "^0.1.40",
+    "@ibiz/model-core": "^0.1.53",
     "@imengyu/vue3-context-menu": "^1.3.3",
     "@monaco-editor/loader": "^1.3.3",
     "@wangeditor/editor": "^5.1.23",

package/dist/chart-C95ofGUJ.js

@@ -1 +0,0 @@
-System.register(["vue","@ibiz-template/vue3-util","echarts","qx-util","@ibiz-template/runtime"],(function(e){"use strict";var t,i,a,l,s,n,o,r,d,c,h,u,m,p;return{setters:[function(e){t=e.defineComponent,i=e.ref,a=e.watch,l=e.onMounted,s=e.onBeforeUnmount,n=e.createVNode,o=e.resolveComponent,r=e.nextTick,d=e.isVNode},function(e){c=e.useControlController,h=e.useNamespace},function(e){u=e.init},function(e){m=e.createUUID},function(e){p=e.ChartController}],execute:function(){e("default",t({name:"IBizChartControl",props:{modelData:{type:Object,required:!0},context:{type:Object,required:!0},params:{type:Object,default:()=>({})},provider:{type:Object},mdctrlActiveMode:{type:Number,default:void 0},loadDefault:{type:Boolean,default:!0},isSimple:{type:Boolean,required:!1},data:{type:Array,required:!1}},emits:["drillDetail"],setup(e,{emit:t}){const v=c(((...e)=>new p(...e))),f=h("control-".concat(v.model.controlType.toLowerCase())),w=i(),g=i(0),b=m(),D=i(!1),y=i({}),z=i();let C;const L=()=>{e.data&&(v.state.items=e.data,v.afterLoad({},v.state.items))};v.evt.on("onCreated",(async()=>{e.isSimple&&(L(),v.state.isSimple=!0,v.state.isLoaded=!0)})),a((()=>e.data),(()=>{e.isSimple&&L()}),{deep:!0});const x=async()=>{await r();const e=document.getElementById(b);e&&("bottom"===v.state.gridPosition||"top"===v.state.gridPosition?g.value=e.offsetHeight/2-8:g.value=e.offsetHeight-16)},P=()=>{D.value=!1},E=()=>{D.value||v.changeTooltipState(!0)};let S;l((()=>{var t,i;const a=u(w.value);v.initChart(a),window.addEventListener("resize",x),window.addEventListener("pointerdown",P),window.addEventListener("click",E),w.value&&ResizeObserver&&(S=new ResizeObserver((()=>{v.resizeChart()})),S.observe(w.value)),x();const l=null==(i=null==(t=e.modelData.controlParam)?void 0:t.ctrlParams)?void 0:i.ENABLEDRILLDETAIL;(null==l?void 0:l.length)&&a.on("click",(e=>{const t=v.computedClickSerieModel(e);if(!t)return;const i=l.find((e=>e.name===t.valueField));i&&i.isDrill&&(C=e,(e=>{if(e.event){const t=e.event.event,{offsetX:i,offsetY:a}=e.event,{clientWidth:l}=t.target;y.value=i+160>l?{top:"".concat(a-20,"px"),left:"".concat(i-160,"px")}:{top:"".concat(a,"px"),left:"".concat(i+16,"px")}}})(e),a.dispatchAction({type:"hideTip"}),v.changeTooltipState(!1),D.value=!0)}))}));a((()=>v.state.showGrid),(()=>{x()}),{immediate:!0});return s((()=>{window.removeEventListener("resize",x),window.removeEventListener("pointerdown",P),window.removeEventListener("click",E),null==S||S.disconnect()})),{c:v,ns:f,chartRef:w,uuid:b,showCheck:D,drillDetailPos:y,drillDetailRef:z,openDrillDetail:e=>{e.stopPropagation(),e.preventDefault(),D.value=!1,v.changeTooltipState(!0);const i=v.computedDrillDetailParam(C);t("drillDetail",i)},renderGrid:()=>{let e;return n(o("el-table"),{ref:"tableRef",data:v.state.gridData||[],border:!0,style:{width:"100%"},"max-height":g.value,"header-row-class-name":f.e("grid-header")},"function"==typeof(t=e=v.state.gridHeaders.map((e=>n(o("el-table-column"),{prop:e.id,align:"center",label:e.name},null))))||"[object Object]"===Object.prototype.toString.call(t)&&!d(t)?e:{default:()=>[e]});var t}}},render(){return n(o("iBizControlBase"),{controller:this.c},{default:()=>[n("div",{id:this.uuid,class:this.ns.b("chart-container")},[n(o("el-empty"),{class:[this.ns.e("empty"),this.ns.is("no-data",0===this.c.state.items.length)],description:ibiz.i18n.t("control.common.currentNoData")},null),n("div",{class:[this.ns.e("chart-grid"),this.ns.is("no-data",0===this.c.state.items.length),this.ns.is("show-grid",this.c.state.showGrid),{[this.ns.em("chart-grid",this.c.state.gridPosition)]:this.c.state.showGrid}]},[n("div",{class:[this.ns.e("chart-grid-container"),this.ns.is(this.c.state.gridPosition,this.c.state.showGrid),this.ns.is("no-grid",!this.c.state.showGrid)]},[n("div",{ref:"chartRef",class:[this.ns.e("chart")]},[ibiz.i18n.t("control.chart.chartPlaceholder")]),this.showCheck?n("div",{ref:"drillDetailRef",class:this.ns.e("drill-detail"),style:this.drillDetailPos,onPointerdown:this.openDrillDetail},[n("div",{class:this.ns.em("drill-detail","item")},[n("svg",{viewBox:"0 0 16 16",xmlns:"http://www.w3.org/2000/svg",height:"1em",width:"1em",focusable:"false",fill:"currentColor"},[n("g",{id:"aspnormal/preview","stroke-width":"1","fill-rule":"evenodd"},[n("path",{d:"M11.626 0c1.057 0 1.923.818 2 1.855l.005.15v3.411a.6.6 0 0 1-1.192.097l-.008-.097.001-1.348V2.005c0-.41-.31-.749-.705-.799l-.101-.006h-9.62c-.41 0-.75.308-.8.704l-.006.101v11.989c0 .41.308.75.705.8l.101.006h5.906l.017-.004.016-.003h2.074a.598.598 0 1 1 .107 1.187l-.095.01V16H2.006a2.006 2.006 0 0 1-2-1.856L0 13.994V2.005C0 .948.818.082 1.856.005L2.006 0h9.62zm-1.595 6.328a3.669 3.669 0 0 1 3.665 3.665c0 .79-.251 1.523-.678 2.123l2.412 2.412a.6.6 0 1 1-.848.85l-2.41-2.412a3.646 3.646 0 0 1-2.14.692 3.67 3.67 0 0 1-3.667-3.665 3.67 3.67 0 0 1 3.666-3.665zm-5.106 5.29a.6.6 0 0 1 .097 1.191l-.097.008H2.85a.6.6 0 0 1-.097-1.192l.097-.008h2.074zm5.106-4.09a2.468 2.468 0 0 0-2.466 2.465 2.468 2.468 0 0 0 2.466 2.466 2.47 2.47 0 0 0 2.466-2.466 2.469 2.469 0 0 0-2.466-2.465zm-4.815-.126a.6.6 0 0 1 .097 1.193l-.097.007h-2.35A.6.6 0 0 1 2.77 7.41l.098-.008h2.349zm5.58-4a.6.6 0 0 1 .097 1.192l-.097.008H2.867A.6.6 0 0 1 2.77 3.41l.097-.008h7.929z",id:"asp合并形状"},null)])]),n("div",{class:this.ns.em("drill-detail","item-text")},[ibiz.i18n.t("control.chart.drillDetail")])])]):null]),this.c.state.showGrid?n("div",{class:this.ns.e("grid")},[this.renderGrid()]):null])])]})}}))}}}));