ls-pro-common 3.0.99 → 3.1.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/common.css +32 -0
- package/dist/common.js +1 -1
- package/dist/common.min.css +32 -0
- package/dist/common.min.js +1 -1
- package/es/components/InputTable.js +10 -9
- package/lib/components/InputTable.js +10 -9
- package/package.json +1 -1
|
@@ -244,22 +244,24 @@ var InputTable = /*#__PURE__*/React.forwardRef(function (prop, ref) {
|
|
|
244
244
|
};
|
|
245
245
|
}();
|
|
246
246
|
var initName = function initName(val) {
|
|
247
|
-
var _columns$find;
|
|
248
247
|
var updateTxt = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
|
|
249
248
|
if (!val) return;
|
|
250
|
-
|
|
249
|
+
// 当返回值列不在表格配置中不查询，因为有可能会导致查询别名问题报错。
|
|
250
|
+
var valueColumn = columns.find(function (o) {
|
|
251
251
|
return o.dataIndex === valueField;
|
|
252
|
-
})
|
|
252
|
+
});
|
|
253
|
+
if (!valueColumn) return;
|
|
254
|
+
var fieldName = valueColumn.searchField; //优先取开发人员配置的searchField,没有配置取valueField
|
|
255
|
+
if (!fieldName) {
|
|
256
|
+
fieldName = (isV2 ? 'search.' : '') + valueField;
|
|
257
|
+
}
|
|
253
258
|
var param = {
|
|
254
259
|
current: 1,
|
|
255
260
|
pageSize: 1000
|
|
256
261
|
};
|
|
257
262
|
if (Array.isArray(val)) val = val.join(',');
|
|
258
263
|
if (val.toString().includes(',')) {
|
|
259
|
-
fieldName
|
|
260
|
-
}
|
|
261
|
-
if (isV2) {
|
|
262
|
-
fieldName = 'search.' + fieldName;
|
|
264
|
+
fieldName = fieldName.split('_')[0] + '_in';
|
|
263
265
|
}
|
|
264
266
|
param[fieldName] = val;
|
|
265
267
|
loadData(param).then(function (result) {
|
|
@@ -290,11 +292,10 @@ var InputTable = /*#__PURE__*/React.forwardRef(function (prop, ref) {
|
|
|
290
292
|
if (!txt) {
|
|
291
293
|
formValue[textNameProp] = val;
|
|
292
294
|
setFormValue(formValue);
|
|
293
|
-
// 多值选择或选择的初始值不在第一页时显示有问题
|
|
294
295
|
if (textField !== valueField) {
|
|
295
296
|
initName(val);
|
|
296
297
|
}
|
|
297
|
-
} else {
|
|
298
|
+
} else if (multiple) {
|
|
298
299
|
initName(val, false);
|
|
299
300
|
}
|
|
300
301
|
}
|
|
@@ -244,22 +244,24 @@ var InputTable = /*#__PURE__*/React.forwardRef(function (prop, ref) {
|
|
|
244
244
|
};
|
|
245
245
|
}();
|
|
246
246
|
var initName = function initName(val) {
|
|
247
|
-
var _columns$find;
|
|
248
247
|
var updateTxt = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
|
|
249
248
|
if (!val) return;
|
|
250
|
-
|
|
249
|
+
// 当返回值列不在表格配置中不查询，因为有可能会导致查询别名问题报错。
|
|
250
|
+
var valueColumn = columns.find(function (o) {
|
|
251
251
|
return o.dataIndex === valueField;
|
|
252
|
-
})
|
|
252
|
+
});
|
|
253
|
+
if (!valueColumn) return;
|
|
254
|
+
var fieldName = valueColumn.searchField; //优先取开发人员配置的searchField,没有配置取valueField
|
|
255
|
+
if (!fieldName) {
|
|
256
|
+
fieldName = (isV2 ? 'search.' : '') + valueField;
|
|
257
|
+
}
|
|
253
258
|
var param = {
|
|
254
259
|
current: 1,
|
|
255
260
|
pageSize: 1000
|
|
256
261
|
};
|
|
257
262
|
if (Array.isArray(val)) val = val.join(',');
|
|
258
263
|
if (val.toString().includes(',')) {
|
|
259
|
-
fieldName
|
|
260
|
-
}
|
|
261
|
-
if (isV2) {
|
|
262
|
-
fieldName = 'search.' + fieldName;
|
|
264
|
+
fieldName = fieldName.split('_')[0] + '_in';
|
|
263
265
|
}
|
|
264
266
|
param[fieldName] = val;
|
|
265
267
|
loadData(param).then(function (result) {
|
|
@@ -290,11 +292,10 @@ var InputTable = /*#__PURE__*/React.forwardRef(function (prop, ref) {
|
|
|
290
292
|
if (!txt) {
|
|
291
293
|
formValue[textNameProp] = val;
|
|
292
294
|
setFormValue(formValue);
|
|
293
|
-
// 多值选择或选择的初始值不在第一页时显示有问题
|
|
294
295
|
if (textField !== valueField) {
|
|
295
296
|
initName(val);
|
|
296
297
|
}
|
|
297
|
-
} else {
|
|
298
|
+
} else if (multiple) {
|
|
298
299
|
initName(val, false);
|
|
299
300
|
}
|
|
300
301
|
}
|