eoss 0.1.0-alpha.45 → 0.1.0-alpha.46

package/lib/select.js

@@ -5571,7 +5571,7 @@ var doDecrypt = function doDecrypt(_ref2) {
 // ESM COMPAT FLAG
 __webpack_require__.r(__webpack_exports__);
 
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/select/src/select.vue?vue&type=template&id=f4dfce0a&
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/select/src/select.vue?vue&type=template&id=5f1334b0&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -6249,7 +6249,9 @@ var render = function () {
                                   : _vm._e(),
                               ]
                             }),
-                            _vm.lazyEnabled && _vm.lazyFinished
+                            _vm.lazyEnabled &&
+                            _vm.lazyFinished &&
+                            _vm.lazyPageNum > 1
                               ? _c(
                                   "div",
                                   {
@@ -6305,7 +6307,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/select/src/select.vue?vue&type=template&id=f4dfce0a&
+// CONCATENATED MODULE: ./packages/select/src/select.vue?vue&type=template&id=5f1334b0&
 
 // EXTERNAL MODULE: ./src/mixins/emitter.js
 var emitter = __webpack_require__(15);
@@ -7644,6 +7646,16 @@ var _this = undefined;
     pageSize: {
       type: Number,
       default: 20
+    },
+    /**
+     * ajax 配置
+     * @type {Object}
+     */
+    ajaxConfig: {
+      type: Object,
+      default: function _default() {
+        return {};
+      }
     }
   },
 
@@ -7744,7 +7756,8 @@ var _this = undefined;
       return this.remote ? 300 : 0;
     },
     emptyText: function emptyText() {
-      if (this.loading) {
+      // 懒加载首页请求中列表尚为空，展示加载中而非无数据
+      if (this.loading || this.isLoading && this.options.length === 0) {
         return this.loadingText || '加载中';
       }
 
@@ -7998,6 +8011,8 @@ var _this = undefined;
       // 懒加载分页状态：已加载到的页码 / 是否已加载完
       lazyPageNum: 1,
       lazyFinished: false,
+      // 懒加载重置时保存的基础参数（this.param + 搜索参数），续拉复用，保证远程搜索词不丢
+      lazyBaseParams: {},
       _propsCache: new Map(),
       // 是否请求中（驱动 es-scrollbar 上的 v-loading）
       isLoading: false
@@ -8151,10 +8166,11 @@ var _this = undefined;
       params = selectvue_type_script_lang_js_extends({}, this.param, params);
       if (!url) return;
       if (this.lazyEnabled) {
+        // 请求中禁用无限滚动，避免首页在途时空列表触底又发续拉请求
+        this.isLoading = true;
         if (append) {
-          // 续拉下一页
-          this.isLoading = true;
-          params = selectvue_type_script_lang_js_extends({}, params, {
+          // 续拉下一页：复用重置时保存的基础参数（含远程搜索词），避免续拉丢搜索条件
+          params = selectvue_type_script_lang_js_extends({}, this.lazyBaseParams, {
             pageNum: this.lazyPageNum + 1,
             pageSize: this.pageSize
           });
@@ -8162,25 +8178,30 @@ var _this = undefined;
           // 初始化/参数变化/远程搜索：重置分页请求第一页
           this.lazyPageNum = 1;
           this.lazyFinished = false;
+          this.lazyBaseParams = params;
           params = selectvue_type_script_lang_js_extends({}, params, { pageNum: 1, pageSize: this.pageSize });
         }
       }
-      Object(ajax["a" /* ajax */])({
+      Object(ajax["a" /* ajax */])(selectvue_type_script_lang_js_extends({
         url: url,
-        method: 'POST',
-        data: params
-      }).then(function (res) {
+        method: 'POST'
+      }, this.ajaxConfig, {
+        data: params,
+        params: params
+      })).then(function (res) {
         if (res.rCode === 0) {
-          var rows = res.results || [];
+          // 兼容分页包装对象（{ records }）与直接返回数组两种结构
+          var payload = res.results || [];
+          var rows = Array.isArray(payload) ? payload : payload.records || [];
           if (_this10.lazyEnabled && append) {
             _this10.results = _this10.results.concat(rows);
             _this10.lazyPageNum += 1;
           } else {
             _this10.results = rows;
           }
-          // 续拉时返回条数不足一页视为已加载完，停止触发并提示没有更多
-          // （首页不足一页属正常小数据量，不显示提示）
-          if (_this10.lazyEnabled && append && rows.length < _this10.pageSize) {
+          // 返回条数不足一页视为已加载完，停止触发续拉
+          // （没有更多提示需翻过页才显示，见模板 lazyPageNum > 1）
+          if (_this10.lazyEnabled && rows.length < _this10.pageSize) {
             _this10.lazyFinished = true;
           }
         }
@@ -8195,7 +8216,7 @@ var _this = undefined;
      * 本地懒加载为同步切片追加，url 懒加载为异步续拉请求
      */
     loadMoreOptions: function loadMoreOptions() {
-      if (!this.lazyEnabled || this.isLoading || this.lazyFinished) return;
+      if (!this.lazyEnabled || this.isLoading || this.lazyFinished || !this.results.length) return;
       if (this.localLazyEnabled) {
         this.lazyPageNum += 1;
         this.applyLocalLazySlice();

package/lib/selector.js

@@ -5007,7 +5007,7 @@ module.exports = require("axios");
 // ESM COMPAT FLAG
 __webpack_require__.r(__webpack_exports__);
 
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/selector/src/selector.vue?vue&type=template&id=72e3bae2&
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/selector/src/selector.vue?vue&type=template&id=015c6e04&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -5268,7 +5268,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/selector/src/selector.vue?vue&type=template&id=72e3bae2&
+// CONCATENATED MODULE: ./packages/selector/src/selector.vue?vue&type=template&id=015c6e04&
 
 // EXTERNAL MODULE: ./src/utils/util.js
 var util = __webpack_require__(0);
@@ -5326,6 +5326,8 @@ var resize_event = __webpack_require__(39);
 var scrollbar = __webpack_require__(24);
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/selector/src/selector.vue?vue&type=script&lang=js&
+var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
+
 //
 //
 //
@@ -5878,6 +5880,16 @@ var scrollbar = __webpack_require__(24);
     select: {
       type: Boolean,
       default: true
+    },
+    /**
+     * ajax 配置
+     * @type {Object}
+     */
+    ajaxConfig: {
+      type: Object,
+      default: function _default() {
+        return {};
+      }
     }
   },
   data: function data() {
@@ -6127,10 +6139,10 @@ var scrollbar = __webpack_require__(24);
       };
       params[this.keywords] = query;
       params = Object(util["q" /* extend */])({}, params, this.where);
-      Object(ajax["a" /* ajax */])({
+      Object(ajax["a" /* ajax */])(_extends({
         url: this.action,
         params: params
-      }).then(function (res) {
+      }, this.ajaxConfig)).then(function (res) {
         if (res.rCode === 0) {
           callback([].concat(options, res.results));
         }

package/lib/table-column.js

@@ -4187,8 +4187,10 @@ function isDefined(val) {
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "p", function() { return setColumnForcedProps; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "q", function() { return setColumnRenders; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "o", function() { return renderDom; });
-/* harmony import */ var eoss_src_utils_util__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(0);
-/* harmony import */ var _config__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(94);
+/* harmony import */ var vue__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(2);
+/* harmony import */ var vue__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(vue__WEBPACK_IMPORTED_MODULE_0__);
+/* harmony import */ var eoss_src_utils_util__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(0);
+/* harmony import */ var _config__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(94);
 var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
 
 var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
@@ -4197,6 +4199,7 @@ function _objectWithoutProperties(obj, keys) { var target = {}; for (var i in ob
 
 
 
+
 var getCell = function getCell(event) {
   var cell = event.target;
 
@@ -4230,7 +4233,7 @@ var orderBy = function orderBy(array, sortKey, reverse, sortMethod, sortBy) {
       }
       return sortBy.map(function (by) {
         if (typeof by === 'string') {
-          return Object(eoss_src_utils_util__WEBPACK_IMPORTED_MODULE_0__[/* getValueByPath */ "w"])(value, by);
+          return Object(eoss_src_utils_util__WEBPACK_IMPORTED_MODULE_1__[/* getValueByPath */ "w"])(value, by);
         } else {
           return by(value, index, array);
         }
@@ -4239,7 +4242,7 @@ var orderBy = function orderBy(array, sortKey, reverse, sortMethod, sortBy) {
     if (sortKey !== '$key') {
       if (isObject(value) && '$value' in value) value = value.$value;
     }
-    return [isObject(value) ? Object(eoss_src_utils_util__WEBPACK_IMPORTED_MODULE_0__[/* getValueByPath */ "w"])(value, sortKey) : value];
+    return [isObject(value) ? Object(eoss_src_utils_util__WEBPACK_IMPORTED_MODULE_1__[/* getValueByPath */ "w"])(value, sortKey) : value];
   };
   var compare = function compare(a, b) {
     if (sortMethod) {
@@ -4685,7 +4688,7 @@ function defaultRenderCell(h, _ref2) {
   if (property && row) {
     try {
       // 假设getPropByPath是一个外部函数，需要确保它存在
-      var result = typeof eoss_src_utils_util__WEBPACK_IMPORTED_MODULE_0__[/* getPropByPath */ "u"] === 'function' ? Object(eoss_src_utils_util__WEBPACK_IMPORTED_MODULE_0__[/* getPropByPath */ "u"])(row, property) : { v: undefined };
+      var result = typeof eoss_src_utils_util__WEBPACK_IMPORTED_MODULE_1__[/* getPropByPath */ "u"] === 'function' ? Object(eoss_src_utils_util__WEBPACK_IMPORTED_MODULE_1__[/* getPropByPath */ "u"])(row, property) : { v: undefined };
       value = result && result.v;
     } catch (error) {
       console.error('Error getting property value:', error);
@@ -4835,7 +4838,7 @@ function setColumnForcedProps(column) {
 
   // 对于特定类型的 column，某些属性不允许设置
   var type = column.type;
-  var source = _config__WEBPACK_IMPORTED_MODULE_1__[/* cellForced */ "a"][type] || {};
+  var source = _config__WEBPACK_IMPORTED_MODULE_2__[/* cellForced */ "a"][type] || {};
 
   Object.keys(source).forEach(function (prop) {
     var value = source[prop];
@@ -4857,7 +4860,7 @@ function setColumnRenders(column) {
 
   // 对于特殊类型列（selection/index/expand），使用config中定义的渲染函数
   var type = column.type;
-  var forcedConfig = _config__WEBPACK_IMPORTED_MODULE_1__[/* cellForced */ "a"][type];
+  var forcedConfig = _config__WEBPACK_IMPORTED_MODULE_2__[/* cellForced */ "a"][type];
 
   if (forcedConfig) {
     // 特殊类型列使用config中定义的渲染函数
@@ -4882,6 +4885,10 @@ function setColumnRenders(column) {
     column.renderHeader = function (h, _ref4) {
       var column = _ref4.column;
 
+      // 必填列：标题前渲染红色星号，与 es-form-item 必填星号样式一致
+      if (column.required) {
+        return h('span', [h('span', { class: 'es-table__required-star' }, '*'), column.label]);
+      }
       return h('span', column.label);
     };
   }
@@ -4930,7 +4937,13 @@ function renderDom(h, _ref5) {
 
   var className = config.className,
       configs = _objectWithoutProperties(config, ['className']);
+  // 回写统一入口：行对象可能初始不含该列键（如新增空行），直接赋值会新增非响应式键，
+  // 控件 value 与外部数据都感知不到回写，需用 Vue.set 补键
 
+
+  var setValue = function setValue(val) {
+    vue__WEBPACK_IMPORTED_MODULE_0___default.a.set(data.row, data.column.prop, val);
+  };
   switch (type) {
     case 'input':
       return h('es-input', {
@@ -4941,9 +4954,7 @@ function renderDom(h, _ref5) {
           value: data.row[data.column.prop]
         }),
         on: _extends({}, events, {
-          input: function input(val) {
-            data.row[data.column.prop] = val;
-          }
+          input: setValue
         })
       });
     case 'textarea':
@@ -4956,9 +4967,7 @@ function renderDom(h, _ref5) {
           value: data.row[data.column.prop]
         }),
         on: _extends({}, events, {
-          input: function input(val) {
-            data.row[data.column.prop] = val;
-          }
+          input: setValue
         })
       });
     case 'radio':
@@ -4971,9 +4980,7 @@ function renderDom(h, _ref5) {
           value: data.row[data.column.prop]
         }),
         on: _extends({}, events, {
-          input: function input(val) {
-            data.row[data.column.prop] = val;
-          }
+          input: setValue
         })
       });
     case 'checkbox':
@@ -4986,9 +4993,7 @@ function renderDom(h, _ref5) {
           value: data.row[data.column.prop]
         }),
         on: _extends({}, events, {
-          input: function input(val) {
-            data.row[data.column.prop] = val;
-          }
+          input: setValue
         })
       });
     case 'inputNumber':
@@ -5000,9 +5005,7 @@ function renderDom(h, _ref5) {
           value: data.row[data.column.prop]
         }),
         on: _extends({}, events, {
-          input: function input(val) {
-            data.row[data.column.prop] = val;
-          }
+          input: setValue
         })
       });
     case 'select':
@@ -5015,9 +5018,7 @@ function renderDom(h, _ref5) {
           value: data.row[data.column.prop]
         }),
         on: _extends({}, events, {
-          input: function input(val) {
-            data.row[data.column.prop] = val;
-          }
+          input: setValue
         })
       });
     case 'cascader':
@@ -5030,9 +5031,7 @@ function renderDom(h, _ref5) {
           value: data.row[data.column.prop]
         }),
         on: _extends({}, events, {
-          input: function input(val) {
-            data.row[data.column.prop] = val;
-          }
+          input: setValue
         })
       });
     case 'switch':
@@ -5045,9 +5044,7 @@ function renderDom(h, _ref5) {
           value: data.row[data.column.prop]
         }),
         on: _extends({}, events, {
-          input: function input(val) {
-            data.row[data.column.prop] = val;
-          }
+          input: setValue
         })
       });
     case 'slider':
@@ -5059,9 +5056,7 @@ function renderDom(h, _ref5) {
           value: data.row[data.column.prop]
         }),
         on: _extends({}, events, {
-          input: function input(val) {
-            data.row[data.column.prop] = val;
-          }
+          input: setValue
         })
       });
     case 'year':
@@ -5074,9 +5069,7 @@ function renderDom(h, _ref5) {
           value: data.row[data.column.prop]
         }),
         on: _extends({}, events, {
-          input: function input(val) {
-            data.row[data.column.prop] = val;
-          }
+          input: setValue
         })
       });
     case 'month':
@@ -5089,9 +5082,7 @@ function renderDom(h, _ref5) {
           value: data.row[data.column.prop]
         }),
         on: _extends({}, events, {
-          input: function input(val) {
-            data.row[data.column.prop] = val;
-          }
+          input: setValue
         })
       });
     case 'date':
@@ -5104,9 +5095,7 @@ function renderDom(h, _ref5) {
           value: data.row[data.column.prop]
         }),
         on: _extends({}, events, {
-          input: function input(val) {
-            data.row[data.column.prop] = val;
-          }
+          input: setValue
         })
       });
     case 'week':
@@ -5119,9 +5108,7 @@ function renderDom(h, _ref5) {
           value: data.row[data.column.prop]
         }),
         on: _extends({}, events, {
-          input: function input(val) {
-            data.row[data.column.prop] = val;
-          }
+          input: setValue
         })
       });
     case 'datetime':
@@ -5134,9 +5121,7 @@ function renderDom(h, _ref5) {
           value: data.row[data.column.prop]
         }),
         on: _extends({}, events, {
-          input: function input(val) {
-            data.row[data.column.prop] = val;
-          }
+          input: setValue
         })
       });
     case 'datetimerange':
@@ -5149,9 +5134,7 @@ function renderDom(h, _ref5) {
           value: data.row[data.column.prop]
         }),
         on: _extends({}, events, {
-          input: function input(val) {
-            data.row[data.column.prop] = val;
-          }
+          input: setValue
         })
       });
     case 'daterange':
@@ -5164,9 +5147,7 @@ function renderDom(h, _ref5) {
           value: data.row[data.column.prop]
         }),
         on: _extends({}, events, {
-          input: function input(val) {
-            data.row[data.column.prop] = val;
-          }
+          input: setValue
         })
       });
     case 'quarter':
@@ -5179,9 +5160,7 @@ function renderDom(h, _ref5) {
           value: data.row[data.column.prop]
         }),
         on: _extends({}, events, {
-          input: function input(val) {
-            data.row[data.column.prop] = val;
-          }
+          input: setValue
         })
       });
     case 'halfyear':
@@ -5194,9 +5173,7 @@ function renderDom(h, _ref5) {
           value: data.row[data.column.prop]
         }),
         on: _extends({}, events, {
-          input: function input(val) {
-            data.row[data.column.prop] = val;
-          }
+          input: setValue
         })
       });
     case 'time':
@@ -5209,9 +5186,7 @@ function renderDom(h, _ref5) {
           value: data.row[data.column.prop]
         }),
         on: _extends({}, events, {
-          input: function input(val) {
-            data.row[data.column.prop] = val;
-          }
+          input: setValue
         })
       });
     case 'selector':
@@ -5223,13 +5198,10 @@ function renderDom(h, _ref5) {
           value: data.row[data.column.prop]
         }),
         on: _extends({}, events, {
-          input: function input(val) {
-            data.row[data.column.prop] = val;
-          }
+          input: setValue
         })
       });
     case 'handle':
-      console.log('handle', data);
       // const contents = events.filter((item) => item.rules && typeof item.rules === 'function' ? item.rules(data.row) : true);
       return h('es-button-group', {
         class: className,