cloud-web-corejs 1.0.302 → 1.0.303

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/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "cloud-web-corejs",
3
3
  "private": false,
4
- "version": "1.0.302",
4
+ "version": "1.0.303",
5
5
  "scripts": {
6
6
  "dev": "vue-cli-service serve",
7
7
  "check:package-resources": "node build/check-package-resources.js",
@@ -6,7 +6,7 @@ import {
6
6
  runDataSourceRequest,
7
7
  getReportGlobalMap,
8
8
  getAccessUrl,
9
- generateId,
9
+ createXRowKey,
10
10
  trim,
11
11
  isArrayValueWidgetType,
12
12
  isAttachmentWidgetType,
@@ -689,7 +689,7 @@ modules = {
689
689
  if (this.tableParam && !this.designState) {
690
690
  let row = this.tableParam.row;
691
691
  if (!row._X_ROW_KEY) {
692
- row._X_ROW_KEY = "row_" + generateId();
692
+ row._X_ROW_KEY = createXRowKey();
693
693
  }
694
694
  let keyVal = row._X_ROW_KEY;
695
695
  e && delete this.refList[e + "_" + keyVal];
@@ -12,6 +12,7 @@ import {
12
12
  assembleAxiosConfig,
13
13
  getReportGlobalMap,
14
14
  generateId,
15
+ createXRowKey,
15
16
  deepClone,
16
17
  loopHandleWidget,
17
18
  columnFormatMap,
@@ -769,7 +770,7 @@ modules = {
769
770
  rows = this.normalizeTableRows(rows, false);
770
771
  // this.handleNullValue(rows);
771
772
  rows.forEach((row) => {
772
- row._X_ROW_KEY = "row_" + generateId();
773
+ row._X_ROW_KEY = createXRowKey();
773
774
  });
774
775
  this.registerTreeKeys(rows);
775
776
  this.formModel[this.fieldKeyName] = rows;
@@ -869,7 +870,7 @@ modules = {
869
870
  }
870
871
  });
871
872
  if (!nextRow._X_ROW_KEY) {
872
- nextRow._X_ROW_KEY = "row_" + generateId();
873
+ nextRow._X_ROW_KEY = createXRowKey();
873
874
  }
874
875
  return nextRow;
875
876
  });
@@ -5946,7 +5947,7 @@ modules = {
5946
5947
  let subFormModel = this.formModel[this.fieldKeyName];
5947
5948
  if (!!subFormModel && subFormModel.length > 0) {
5948
5949
  subFormModel.forEach((row) => {
5949
- if (!row._X_ROW_KEY) row._X_ROW_KEY = "row_" + generateId();
5950
+ if (!row._X_ROW_KEY) row._X_ROW_KEY = createXRowKey();
5950
5951
  this.rowIdData.push(row._X_ROW_KEY);
5951
5952
  });
5952
5953
 
@@ -6136,7 +6137,7 @@ modules = {
6136
6137
  initExportRows(rows) {
6137
6138
  if (!rows) return;
6138
6139
  for (let row of rows) {
6139
- if (!row._X_ROW_KEY) row._X_ROW_KEY = "row_" + generateId();
6140
+ if (!row._X_ROW_KEY) row._X_ROW_KEY = createXRowKey();
6140
6141
  row._X_EXPORT_ROW = true;
6141
6142
  }
6142
6143
  },
@@ -6146,7 +6147,7 @@ modules = {
6146
6147
  //初始化fieldSchemaData!!!
6147
6148
  let fieldSchemaMap = this.fieldSchemaMap;
6148
6149
  for (let row of rows) {
6149
- if (!row._X_ROW_KEY) row._X_ROW_KEY = "row_" + generateId();
6150
+ if (!row._X_ROW_KEY) row._X_ROW_KEY = createXRowKey();
6150
6151
  this.rowIdData.push(row._X_ROW_KEY);
6151
6152
  let fieldSchemaMap2 = this.createRowFieldSchemaMap();
6152
6153
  fieldSchemaMap[row._X_ROW_KEY] = fieldSchemaMap2;
@@ -161,6 +161,15 @@ export const generateId = function () {
161
161
  );
162
162
  };
163
163
 
164
+ // 表格 _X_ROW_KEY。不能用 generateId():取值大约只有 12 万种,千行以上几乎必撞,
165
+ // 树表新增时会报「_X_ROW_KEY 同时指向多个树节点」。
166
+ // 也不能用纯 row_ + 整数,那是 vxe uniqueId('row_') 的格式,插入新行时会撞上。
167
+ let xRowKeySeed = 0;
168
+ export function createXRowKey() {
169
+ xRowKeySeed += 1;
170
+ return `row_${Date.now().toString(36)}_${xRowKeySeed}`;
171
+ }
172
+
164
173
  // 审计字段:创建/修改人及时间,camelCase 与 snake_case 两种形式;后端保存时重新生成
165
174
  const AUDIT_FIELDS = [
166
175
  "createBy",