@ibiz-template/vue3-components 0.7.25 → 0.7.26-alpha.0

package/lib/editor/text-box/ibiz-input-number/ibiz-input-number.cjs

@@ -15,6 +15,7 @@ const IBizInputNumber = /* @__PURE__ */ vue.defineComponent({
     emit
   }) {
     const ns = vue3Util.useNamespace("input-number");
+    const enablethousands = vue.ref(false);
     const c = props.controller;
     const editorModel = c.model;
     const currentVal = vue.ref(null);
@@ -27,6 +28,9 @@ const IBizInputNumber = /* @__PURE__ */ vue.defineComponent({
       if (editorModel.editorParams.minvalue) {
         min = lodashEs.toNumber(editorModel.editorParams.minvalue);
       }
+      if (editorModel.editorParams.enablethousands) {
+        enablethousands.value = JSON.parse(editorModel.editorParams.enablethousands);
+      }
     }
     const isEditable = vue.ref(false);
     const editorRef = vue.ref();
@@ -36,17 +40,37 @@ const IBizInputNumber = /* @__PURE__ */ vue.defineComponent({
       }
       return false;
     });
+    const numberconvertToStr = (num, decimalPlaces = 0) => {
+      const options = {
+        minimumFractionDigits: decimalPlaces,
+        maximumFractionDigits: decimalPlaces
+      };
+      return num.toLocaleString("en-US", options);
+    };
+    const convertToNumber = (str) => {
+      const stringWithoutCommas = str.replace(/,/g, "");
+      const originalNumber = parseFloat(stringWithoutCommas);
+      return originalNumber;
+    };
     vue.watch(() => props.value, (newVal, oldVal) => {
       if (newVal !== oldVal) {
         const number = newVal != null && !Object.is(newVal, "") ? Number(newVal) : null;
-        currentVal.value = Number.isNaN(number) ? null : number;
+        if (!enablethousands.value) {
+          currentVal.value = Number.isNaN(number) ? null : number;
+        } else {
+          currentVal.value = Number.isNaN(number) ? null : numberconvertToStr(number, c.precision ? c.precision : 0);
+        }
       }
     }, {
       immediate: true
     });
     const currentFormatVal = vue.computed(() => {
-      if (currentVal.value || currentVal.value === 0) {
-        return props.controller.formatValue(currentVal.value);
+      if (!enablethousands.value) {
+        if (currentVal.value || currentVal.value === 0) {
+          return props.controller.formatValue(currentVal.value);
+        }
+      } else if (currentVal.value || currentVal.value === 0) {
+        return numberconvertToStr(Number(currentVal.value), c.precision ? c.precision : 0);
       }
       return "";
     });
@@ -81,6 +105,24 @@ const IBizInputNumber = /* @__PURE__ */ vue.defineComponent({
         emit("enter", e);
       }
     };
+    const debounce = (func, wait) => {
+      let timeout;
+      return (...args) => {
+        clearTimeout(timeout);
+        timeout = setTimeout(() => func.apply(this, args), wait);
+      };
+    };
+    const debouncedOnInput = debounce((value) => {
+      let data = null;
+      if (typeof value === "string") {
+        data = convertToNumber(value);
+      }
+      emit("change", data);
+    }, 300);
+    const onInput = (value) => {
+      currentVal.value = value;
+      debouncedOnInput(value);
+    };
     return {
       ns,
       c,
@@ -95,7 +137,9 @@ const IBizInputNumber = /* @__PURE__ */ vue.defineComponent({
       showFormDefaultContent,
       max,
       min,
-      currentFormatVal
+      currentFormatVal,
+      enablethousands,
+      onInput
     };
   },
   render() {
@@ -109,7 +153,7 @@ const IBizInputNumber = /* @__PURE__ */ vue.defineComponent({
         content += unitName;
       }
     } else {
-      content = [vue.createVNode(vue.resolveComponent("el-input-number"), vue.mergeProps({
+      content = [!this.enablethousands ? vue.createVNode(vue.resolveComponent("el-input-number"), vue.mergeProps({
         "ref": "editorRef",
         "class": [this.ns.b("input")],
         "model-value": this.currentVal,
@@ -123,6 +167,16 @@ const IBizInputNumber = /* @__PURE__ */ vue.defineComponent({
         "onFocus": this.onFocus,
         "onBlur": this.onBlur,
         "onKeyup": this.handleKeyUp
+      }, this.$attrs), null) : vue.createVNode(vue.resolveComponent("el-input"), vue.mergeProps({
+        "ref": "editorRef",
+        "class": [this.ns.b("input")],
+        "model-value": this.currentVal,
+        "onInput": this.onInput,
+        "placeholder": this.c.placeHolder,
+        "disabled": this.disabled,
+        "onFocus": this.onFocus,
+        "onBlur": this.onBlur,
+        "onKeyup": this.handleKeyUp
       }, this.$attrs), null), unitName && vue.createVNode("i", {
         "class": this.ns.e("unit")
       }, [unitName])];

package/lib/index.cjs

@@ -2,10 +2,10 @@
 
 var index$1 = require('./common/index.cjs');
 require('./control/index.cjs');
-var index$V = require('./panel-component/index.cjs');
-var index$13 = require('./editor/index.cjs');
+var index$W = require('./panel-component/index.cjs');
+var index$14 = require('./editor/index.cjs');
 require('./view/index.cjs');
-var index$16 = require('./view-engine/index.cjs');
+var index$17 = require('./view-engine/index.cjs');
 require('./util/index.cjs');
 var index = require('./locale/index.cjs');
 require('./web-app/index.cjs');
@@ -77,35 +77,37 @@ var htmlPortlet = require('./control/dashboard/portlet/html-portlet/html-portlet
 var index$K = require('./control/dashboard/portlet/html-portlet/index.cjs');
 var actionbarPortlet = require('./control/dashboard/portlet/actionbar-portlet/actionbar-portlet.cjs');
 var index$L = require('./control/dashboard/portlet/actionbar-portlet/index.cjs');
+var reportPortlet = require('./control/dashboard/portlet/report-portlet/report-portlet.cjs');
+var index$M = require('./control/dashboard/portlet/report-portlet/index.cjs');
 var index$D = require('./control/dashboard/index.cjs');
-var index$M = require('./control/calendar/index.cjs');
-var index$N = require('./control/kanban/index.cjs');
-var index$O = require('./control/tree-grid-ex/index.cjs');
-var index$P = require('./control/tree-grid/index.cjs');
-var index$Q = require('./control/medit-view-panel/index.cjs');
-var index$R = require('./control/map/index.cjs');
-var index$S = require('./control/report-panel/index.cjs');
-var index$T = require('./control/gantt/index.cjs');
-var index$U = require('./control/context-menu/index.cjs');
-var index$W = require('./panel-component/auth-userinfo/index.cjs');
+var index$N = require('./control/calendar/index.cjs');
+var index$O = require('./control/kanban/index.cjs');
+var index$P = require('./control/tree-grid-ex/index.cjs');
+var index$Q = require('./control/tree-grid/index.cjs');
+var index$R = require('./control/medit-view-panel/index.cjs');
+var index$S = require('./control/map/index.cjs');
+var index$T = require('./control/report-panel/index.cjs');
+var index$U = require('./control/gantt/index.cjs');
+var index$V = require('./control/context-menu/index.cjs');
+var index$X = require('./panel-component/auth-userinfo/index.cjs');
 var navPosIndex_state = require('./panel-component/nav-pos-index/nav-pos-index.state.cjs');
 var navPosIndex_controller = require('./panel-component/nav-pos-index/nav-pos-index.controller.cjs');
-var index$X = require('./panel-component/nav-pos-index/index.cjs');
+var index$Y = require('./panel-component/nav-pos-index/index.cjs');
 var panelButton_controller = require('./panel-component/panel-button/panel-button.controller.cjs');
-var index$Y = require('./panel-component/panel-button/index.cjs');
+var index$Z = require('./panel-component/panel-button/index.cjs');
 var panelAppTitle_controller = require('./panel-component/panel-app-title/panel-app-title.controller.cjs');
-var index$Z = require('./panel-component/panel-app-title/index.cjs');
-var index$_ = require('./panel-component/panel-tab-panel/index.cjs');
+var index$_ = require('./panel-component/panel-app-title/index.cjs');
+var index$$ = require('./panel-component/panel-tab-panel/index.cjs');
 var splitContainer_controller = require('./panel-component/split-container/split-container.controller.cjs');
-var index$$ = require('./panel-component/split-container/index.cjs');
-var index$10 = require('./panel-component/panel-index-view-search/index.cjs');
-var index$11 = require('./panel-component/index-actions/index.cjs');
-var index$12 = require('./panel-component/user-action/index.cjs');
+var index$10 = require('./panel-component/split-container/index.cjs');
+var index$11 = require('./panel-component/panel-index-view-search/index.cjs');
+var index$12 = require('./panel-component/index-actions/index.cjs');
+var index$13 = require('./panel-component/user-action/index.cjs');
 var _404View = require('./view/404-view/404-view.cjs');
 var _403View = require('./view/403-view/403-view.cjs');
 var loginView = require('./view/login-view/login-view.cjs');
-var index$14 = require('./view/wf-step-trace-view/index.cjs');
-var index$15 = require('./view/sub-app-ref-view/index.cjs');
+var index$15 = require('./view/wf-step-trace-view/index.cjs');
+var index$16 = require('./view/sub-app-ref-view/index.cjs');
 var errorView = require('./view/error-view/error-view.cjs');
 var gridView_engine = require('./view-engine/grid-view.engine.cjs');
 var indexView_engine = require('./view-engine/index-view.engine.cjs');
@@ -126,14 +128,14 @@ var renderUtil = require('./util/render-util/render-util.cjs');
 var appUtil = require('./util/app-util/app-util.cjs');
 var authGuard = require('./web-app/guard/auth-guard/auth-guard.cjs');
 var main = require('./web-app/main.cjs');
-var index$17 = require('./web-app/router/index.cjs');
+var index$18 = require('./web-app/router/index.cjs');
 
 "use strict";
 
 exports.IBizCommonComponents = index$1.IBizCommonComponents;
-exports.IBizPanelComponents = index$V.IBizPanelComponents;
-exports.IBizEditor = index$13.IBizEditor;
-exports.IBizViewEngine = index$16.IBizViewEngine;
+exports.IBizPanelComponents = index$W.IBizPanelComponents;
+exports.IBizEditor = index$14.IBizEditor;
+exports.IBizViewEngine = index$17.IBizViewEngine;
 exports.i18n = index.i18n;
 exports.DoingNotice = doingNotice.DoingNotice;
 exports.IBizCol = col.IBizCol;
@@ -207,35 +209,37 @@ exports.HtmlPortlet = htmlPortlet.HtmlPortlet;
 exports.IBizHtmlPortlet = index$K.IBizHtmlPortlet;
 exports.ActionBarPortlet = actionbarPortlet.ActionBarPortlet;
 exports.IBizActionBarPortlet = index$L.IBizActionBarPortlet;
+exports.ReportPortlet = reportPortlet.ReportPortlet;
+exports.IBizReportPortlet = index$M.IBizReportPortlet;
 exports.IBizDashboardControl = index$D.IBizDashboardControl;
-exports.IBizCalendarControl = index$M.IBizCalendarControl;
-exports.IBizKanbanControl = index$N.IBizKanbanControl;
-exports.IBizTreeGridExControl = index$O.IBizTreeGridExControl;
-exports.IBizTreeGridControl = index$P.IBizTreeGridControl;
-exports.IBizMEditViewPanelControl = index$Q.IBizMEditViewPanelControl;
-exports.IBizMapControl = index$R.IBizMapControl;
-exports.IBizReportPanelControl = index$S.IBizReportPanelControl;
-exports.IBizGanttControl = index$T.IBizGanttControl;
-exports.IBizContextMenuControl = index$U.IBizContextMenuControl;
-exports.IBizAuthUserinfo = index$W.IBizAuthUserinfo;
+exports.IBizCalendarControl = index$N.IBizCalendarControl;
+exports.IBizKanbanControl = index$O.IBizKanbanControl;
+exports.IBizTreeGridExControl = index$P.IBizTreeGridExControl;
+exports.IBizTreeGridControl = index$Q.IBizTreeGridControl;
+exports.IBizMEditViewPanelControl = index$R.IBizMEditViewPanelControl;
+exports.IBizMapControl = index$S.IBizMapControl;
+exports.IBizReportPanelControl = index$T.IBizReportPanelControl;
+exports.IBizGanttControl = index$U.IBizGanttControl;
+exports.IBizContextMenuControl = index$V.IBizContextMenuControl;
+exports.IBizAuthUserinfo = index$X.IBizAuthUserinfo;
 exports.NavPosIndexState = navPosIndex_state.NavPosIndexState;
 exports.NavPosIndexController = navPosIndex_controller.NavPosIndexController;
-exports.IBizNavPosIndex = index$X.IBizNavPosIndex;
+exports.IBizNavPosIndex = index$Y.IBizNavPosIndex;
 exports.PanelButtonController = panelButton_controller.PanelButtonController;
-exports.IBizPanelButton = index$Y.IBizPanelButton;
+exports.IBizPanelButton = index$Z.IBizPanelButton;
 exports.PanelAppTitleController = panelAppTitle_controller.PanelAppTitleController;
-exports.IBizPanelAppTitle = index$Z.IBizPanelAppTitle;
-exports.IBizPanelTabPanel = index$_.IBizPanelTabPanel;
+exports.IBizPanelAppTitle = index$_.IBizPanelAppTitle;
+exports.IBizPanelTabPanel = index$$.IBizPanelTabPanel;
 exports.SplitContainerController = splitContainer_controller.SplitContainerController;
-exports.IBizSplitContainer = index$$.IBizSplitContainer;
-exports.IBizPanelIndexViewSearch = index$10.IBizPanelIndexViewSearch;
-exports.IBizIndexActions = index$11.IBizIndexActions;
-exports.IBizUserAction = index$12.IBizUserAction;
+exports.IBizSplitContainer = index$10.IBizSplitContainer;
+exports.IBizPanelIndexViewSearch = index$11.IBizPanelIndexViewSearch;
+exports.IBizIndexActions = index$12.IBizIndexActions;
+exports.IBizUserAction = index$13.IBizUserAction;
 exports.View404 = _404View.View404;
 exports.View403 = _403View.View403;
 exports.LoginView = loginView.LoginView;
-exports.IBizWFStepTraceView = index$14.IBizWFStepTraceView;
-exports.IBizSubAppRefView = index$15.IBizSubAppRefView;
+exports.IBizWFStepTraceView = index$15.IBizWFStepTraceView;
+exports.IBizSubAppRefView = index$16.IBizSubAppRefView;
 exports.ErrorView = errorView.ErrorView;
 exports.GridViewEngine = gridView_engine.GridViewEngine;
 exports.IndexViewEngine = indexView_engine.IndexViewEngine;
@@ -256,4 +260,4 @@ exports.RenderUtil = renderUtil.RenderUtil;
 exports.AppUtil = appUtil.AppUtil;
 exports.AuthGuard = authGuard.AuthGuard;
 exports.runApp = main.runApp;
-exports.AppRouter = index$17.AppRouter;
+exports.AppRouter = index$18.AppRouter;

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

@@ -65,7 +65,7 @@ class EditViewEngine extends runtime.ViewEngineBase {
     modal.hooks.shouldDismiss.tapPromise(async (context) => {
       const uiDomain = ibiz.uiDomainManager.get(this.view.context.srfsessionid);
       const isChange = (this.form.state.modified || uiDomain.dataModification) && this.view.model.enableDirtyChecking === true;
-      if (isChange && this.form.model.enableAutoSave) {
+      if (isChange && this.form.model.enableAutoSave && !uiDomain.dataModification) {
         await this.form.immediateAutoSave();
       } else if (isChange && context.allowClose == null) {
         const isAllow = await ibiz.confirm.error({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/vue3-components",
-  "version": "0.7.25",
+  "version": "0.7.26-alpha.0",
   "description": "使用 rollup 编译 vue 组件或者 jsx",
   "main": "lib/index.cjs",
   "module": "es/index.mjs",
@@ -30,13 +30,13 @@
     "@floating-ui/dom": "^1.5.3",
     "@ibiz-template-plugin/ai-chat": "^0.0.5",
     "@ibiz-template-plugin/gantt": "0.1.8-alpha.6",
-    "@ibiz-template-plugin/bi-report": "0.0.1",
+    "@ibiz-template-plugin/bi-report": "0.0.2",
     "@ibiz-template/core": "0.7.25",
     "@ibiz-template/devtool": "0.0.1-dev.6",
-    "@ibiz-template/model-helper": "0.7.25",
-    "@ibiz-template/runtime": "0.7.25",
+    "@ibiz-template/model-helper": "0.7.26-alpha.0",
+    "@ibiz-template/runtime": "0.7.26-alpha.0",
     "@ibiz-template/theme": "^0.7.0",
-    "@ibiz-template/vue3-util": "0.7.25",
+    "@ibiz-template/vue3-util": "0.7.26-alpha.0",
     "@ibiz-template/web-theme": "^1.1.18",
     "@ibiz/model-core": "^0.1.35",
     "@imengyu/vue3-context-menu": "^1.3.5",