Report 报表二开

dist/yvan-ext.js

@@ -61119,6 +61119,23 @@ define(['exports'], function (exports) { 'use strict';
     });
 
     /**
+     * 弹出输入框，输入文字
+     * @param message 提示文字
+     * @param defaultValue 默认值
+     * @param multiLine 是否多行输入
+     */
+    function prompt(message, defaultValue, multiLine) {
+        if (defaultValue === void 0) { defaultValue = ""; }
+        if (multiLine === void 0) { multiLine = false; }
+        return new Promise(function (resolve) {
+            Ext.MessageBox.prompt('请输入', message, function (button, value) {
+                if (button === 'ok') {
+                    resolve(value);
+                }
+            }, null, multiLine, defaultValue);
+        });
+    }
+    /**
      * 显示错误异常信息
      * @param msg 错误内容
      * @param sender 发送者按钮（可以为空）
@@ -61622,7 +61639,7 @@ define(['exports'], function (exports) { 'use strict';
             this._dataOption = dataOption;
             var vmodel = lodash.defaultsDeep({
                 data: {}
-            }, that.model, dataOption);
+            }, dataOption, that.model);
             this.viewModel = new Ext.app.ViewModel(vmodel);
             this.viewModel.yvanScope = this;
             this._applyWatchList();
@@ -95271,6 +95288,16 @@ define(['exports'], function (exports) { 'use strict';
             getDataRows: function () {
                 return this.getStore().data.items.map(function (r) { return r.data; });
             },
+            /**
+             * 获取全部原始数据, 不带 id/ 不带 origin
+             */
+            getDataRowsOnlyData: function () {
+                return lodash.map(lodash.cloneDeep(this.getDataRows()), function (r) {
+                    delete r.id;
+                    delete r._origin;
+                    return r;
+                });
+            },
             getEditRecord: function () {
                 var _a, _b;
                 var me = this;
@@ -131946,9 +131973,10 @@ define(['exports'], function (exports) { 'use strict';
     exports.lookupScope = lookupScope;
     exports.mergeViewModel = mergeViewModel;
     exports.moment = moment;
-    exports.msg = msg$1;
+    exports.msg = msg;
     exports.msgError = msgError;
     exports.normId = normId;
+    exports.prompt = prompt;
     exports.qs = lib;
     exports.raiseClick = raiseClick;
     exports.recast = main$3;
@@ -131957,8 +131985,9 @@ define(['exports'], function (exports) { 'use strict';
     exports.serverInvokeUrlTransform = serverInvokeUrlTransform;
     exports.setComboStore = setComboStore;
     exports.setDesignMode = setDesignMode;
-    exports.showErrorDialog = showErrorDialog$1;
+    exports.showErrorDialog = showErrorDialog;
     exports.showInfoDialog = showInfoDialog;
+    exports.showInfoDialogSimple = showInfoDialogSimple;
     exports.showWidget = showWidget;
     exports.sqlUrlTransform = sqlUrlTransform;
     exports.stopEvent = stopEvent;