lxm1993 发布系统代码 [TrainSys，网页端]

aaf7fedf · ibizdev · d25f1b50 · aaf7fedf · aaf7fedf · aaf7fedf
--- a/app_Web/package.json
+++ b/app_Web/package.json
@@ -13,13 +13,13 @@
  "dependencies": {
    "@floating-ui/dom": "^1.0.11",
    "@ibiz-template/command": "^0.0.1-beta.1",
-    "@ibiz-template/controller": "^0.0.1-beta.15",
-    "@ibiz-template/core": "^0.0.1-beta.15",
-    "@ibiz-template/model": "^0.0.1-beta.15",
-    "@ibiz-template/runtime": "^0.0.1-beta.15",
-    "@ibiz-template/service": "^0.0.1-beta.15",
-    "@ibiz-template/theme": "^0.0.1-beta.15",
-    "@ibiz-template/vue-util": "^0.0.1-beta.15",
+    "@ibiz-template/controller": "^0.0.1-beta.30",
+    "@ibiz-template/core": "^0.0.1-beta.30",
+    "@ibiz-template/model": "^0.0.1-beta.30",
+    "@ibiz-template/runtime": "^0.0.1-beta.30",
+    "@ibiz-template/service": "^0.0.1-beta.30",
+    "@ibiz-template/theme": "^0.0.1-beta.30",
+    "@ibiz-template/vue-util": "^0.0.1-beta.30",
    "@ibiz/dynamic-model-api": "^2.1.5",
    "dayjs": "^1.11.7",
    "lodash-es": "^4.17.21",

--- a/app_Web/pnpm-lock.yaml
+++ b/app_Web/pnpm-lock.yaml
@@ -5,13 +5,13 @@ specifiers:
  '@commitlint/config-conventional': ^17.3.0
  '@floating-ui/dom': ^1.0.11
  '@ibiz-template/command': ^0.0.1-beta.1
-  '@ibiz-template/controller': ^0.0.1-beta.15
-  '@ibiz-template/core': ^0.0.1-beta.15
-  '@ibiz-template/model': ^0.0.1-beta.15
-  '@ibiz-template/runtime': ^0.0.1-beta.15
-  '@ibiz-template/service': ^0.0.1-beta.15
-  '@ibiz-template/theme': ^0.0.1-beta.15
-  '@ibiz-template/vue-util': ^0.0.1-beta.15
+  '@ibiz-template/controller': ^0.0.1-beta.30
+  '@ibiz-template/core': ^0.0.1-beta.30
+  '@ibiz-template/model': ^0.0.1-beta.30
+  '@ibiz-template/runtime': ^0.0.1-beta.30
+  '@ibiz-template/service': ^0.0.1-beta.30
+  '@ibiz-template/theme': ^0.0.1-beta.30
+  '@ibiz-template/vue-util': ^0.0.1-beta.30
  '@ibiz/dynamic-model-api': ^2.1.5
  '@types/lodash-es': ^4.17.6
  '@types/node': ^18.11.15
@@ -64,13 +64,13 @@ specifiers:
 dependencies:
  '@floating-ui/dom': 1.0.11
  '@ibiz-template/command': 0.0.1-beta.1
-  '@ibiz-template/controller': 0.0.1-beta.15_fau3qvdlyk6bgprv7ylb3iamz4
-  '@ibiz-template/core': 0.0.1-beta.15_qzytosuu5eg3bvoa74ldx6evva
-  '@ibiz-template/model': 0.0.1-beta.15_yslesr4iih24kokbsmhl36awki
-  '@ibiz-template/runtime': 0.0.1-beta.15_mmumo77i4evnmhxbqxr2t2e2ue
-  '@ibiz-template/service': 0.0.1-beta.15_ft4n7pytmi33hocoq5swxjufna
-  '@ibiz-template/theme': 0.0.1-beta.15
-  '@ibiz-template/vue-util': 0.0.1-beta.15_rdcnlivyzp4e4lnwrkiaggqz2a
+  '@ibiz-template/controller': 0.0.1-beta.30_rczvjvcak2f2drev4tzikkqduu
+  '@ibiz-template/core': 0.0.1-beta.30_qzytosuu5eg3bvoa74ldx6evva
+  '@ibiz-template/model': 0.0.1-beta.30_yslesr4iih24kokbsmhl36awki
+  '@ibiz-template/runtime': 0.0.1-beta.30_e7sbxoj4ameyxf7zsmn4d7pgou
+  '@ibiz-template/service': 0.0.1-beta.30_lott4eotzlae2bp22y5gd3by3a
+  '@ibiz-template/theme': 0.0.1-beta.30
+  '@ibiz-template/vue-util': 0.0.1-beta.30_irts63pzfi3q4gk2ioskh54fdi
  '@ibiz/dynamic-model-api': 2.1.5_qx-util@0.4.4
  dayjs: 1.11.7
  lodash-es: 4.17.21
@@ -897,21 +897,27 @@ packages:
      qx-util: 0.4.4
    dev: false

-  /@ibiz-template/controller/0.0.1-beta.15_fau3qvdlyk6bgprv7ylb3iamz4:
-    resolution: {integrity: sha512-TlHk+GkHHE3PLsEVOOMerq8m+6/JwMdgh1vxze+HEkQeDnML2hYjgITr4pP9JNlzO+wezCh9jDGYapyCQgeFig==}
+  /@ibiz-template/command/0.0.1-beta.30:
+    resolution: {integrity: sha512-muUOBLVTGvJtqL3AJFc5iMTNvTBrdEDLDIVIzZ4y7Im/24U7rVHLextJQVPKfIodRdWsbCrIvrFXgzgpjTs05g==}
+    dependencies:
+      qx-util: 0.4.4
+    dev: false
+
+  /@ibiz-template/controller/0.0.1-beta.30_rczvjvcak2f2drev4tzikkqduu:
+    resolution: {integrity: sha512-FkfyjSbtySadGdLJKfVYsvHyfEO0Sas7UtZGuLwEFlUOGzxYA4G1Fq6wfQpCtpRZcMwf31RT9ErbPjQmxlo/dQ==}
    peerDependencies:
-      '@ibiz-template/core': ^0.0.1-alpha.2
-      '@ibiz-template/model': ^0.0.1-alpha.2
-      '@ibiz-template/runtime': ^0.0.1-alpha.2
-      '@ibiz-template/service': ^0.0.1-alpha.2
+      '@ibiz-template/core': ^0.0.1-beta.30
+      '@ibiz-template/model': ^0.0.1-beta.30
+      '@ibiz-template/runtime': ^0.0.1-beta.30
+      '@ibiz-template/service': ^0.0.1-beta.30
      lodash-es: ^4.17.21
      qs: ^6.11.0
      qx-util: ^0.4.4
    dependencies:
-      '@ibiz-template/core': 0.0.1-beta.15_qzytosuu5eg3bvoa74ldx6evva
-      '@ibiz-template/model': 0.0.1-beta.15_yslesr4iih24kokbsmhl36awki
-      '@ibiz-template/runtime': 0.0.1-beta.15_mmumo77i4evnmhxbqxr2t2e2ue
-      '@ibiz-template/service': 0.0.1-beta.15_ft4n7pytmi33hocoq5swxjufna
+      '@ibiz-template/core': 0.0.1-beta.30_qzytosuu5eg3bvoa74ldx6evva
+      '@ibiz-template/model': 0.0.1-beta.30_yslesr4iih24kokbsmhl36awki
+      '@ibiz-template/runtime': 0.0.1-beta.30_e7sbxoj4ameyxf7zsmn4d7pgou
+      '@ibiz-template/service': 0.0.1-beta.30_lott4eotzlae2bp22y5gd3by3a
      async-validator: 4.2.5
      dayjs: 1.11.7
      lodash-es: 4.17.21
@@ -919,13 +925,13 @@ packages:
      qx-util: 0.4.4
    dev: false

-  /@ibiz-template/core/0.0.1-beta.15_qzytosuu5eg3bvoa74ldx6evva:
-    resolution: {integrity: sha512-p+Sjr+dD1I/V5z88N/d1CCc7vVlz7pb3WGqhz8vbqDO+MC0weW+PMYGpJDiAt+YC/+y3x3fABi2jdt+GzbnJdw==}
+  /@ibiz-template/core/0.0.1-beta.30_qzytosuu5eg3bvoa74ldx6evva:
+    resolution: {integrity: sha512-tSjg4CD0JYUNEcw83UrCAw2K30hECtI/9mo4wG44FumPLO5IW/OcsI15zbAeYJezL3AqyhoxQKfO1+qg0fH1cA==}
    peerDependencies:
      lodash-es: ^4.17.21
      qx-util: ^0.4.4
    dependencies:
-      axios: 1.1.3
+      axios: 1.2.2
      lodash-es: 4.17.21
      loglevel: 1.8.0
      pluralize: 8.0.0
@@ -935,8 +941,8 @@ packages:
      - debug
    dev: false

-  /@ibiz-template/model/0.0.1-beta.15_yslesr4iih24kokbsmhl36awki:
-    resolution: {integrity: sha512-9lgP8FnhhREa7Mnwi/9GvJYG/nsXCMiIaq2oGlbMucpzTzGViAtmW98EvSB0ASQ9B4rCYwWr0weJME96vVeX7w==}
+  /@ibiz-template/model/0.0.1-beta.30_yslesr4iih24kokbsmhl36awki:
+    resolution: {integrity: sha512-tBuhvW06addsWfags5AhQgkojQ6S70j9W2YguCw2FPEfKOoYggattMHF3hou8MPint5owr/2yzt3MJZSuR6zqA==}
    peerDependencies:
      '@ibiz/dynamic-model-api': ^2.1.5
      lodash-es: ^4.17.21
@@ -948,54 +954,54 @@ packages:
      qx-util: 0.4.4
    dev: false

-  /@ibiz-template/runtime/0.0.1-beta.15_mmumo77i4evnmhxbqxr2t2e2ue:
-    resolution: {integrity: sha512-NVaLw8bb9XbctTZMdKMwBpkewsjaXJrDQ3rx08Yq0GbD75dQfjKLRAtxhTK21tfaB/IJSlFdIe5K2ZqJjthStQ==}
+  /@ibiz-template/runtime/0.0.1-beta.30_e7sbxoj4ameyxf7zsmn4d7pgou:
+    resolution: {integrity: sha512-G6h44+g2cQQdQskv1xtOUxZtYv0bjkCnLnFzic07n43nA8VoOwmdY8Rj1Kj8qUm51QVppqeuVdn9dR5cFx8uBQ==}
    peerDependencies:
-      '@ibiz-template/core': ^0.0.1-alpha.2
-      '@ibiz-template/model': ^0.0.1-alpha.2
-      '@ibiz-template/service': ^0.0.1-alpha.2
+      '@ibiz-template/core': ^0.0.1-beta.30
+      '@ibiz-template/model': ^0.0.1-beta.30
+      '@ibiz-template/service': ^0.0.1-beta.30
      qx-util: ^0.4.4
    dependencies:
-      '@ibiz-template/command': 0.0.1-beta.1
-      '@ibiz-template/core': 0.0.1-beta.15_qzytosuu5eg3bvoa74ldx6evva
-      '@ibiz-template/model': 0.0.1-beta.15_yslesr4iih24kokbsmhl36awki
-      '@ibiz-template/service': 0.0.1-beta.15_ft4n7pytmi33hocoq5swxjufna
+      '@ibiz-template/command': 0.0.1-beta.30
+      '@ibiz-template/core': 0.0.1-beta.30_qzytosuu5eg3bvoa74ldx6evva
+      '@ibiz-template/model': 0.0.1-beta.30_yslesr4iih24kokbsmhl36awki
+      '@ibiz-template/service': 0.0.1-beta.30_lott4eotzlae2bp22y5gd3by3a
      qx-util: 0.4.4
    dev: false

-  /@ibiz-template/service/0.0.1-beta.15_ft4n7pytmi33hocoq5swxjufna:
-    resolution: {integrity: sha512-0jAuHxN3s+Z6gOh7onGgoyxm4eiDQo8FJpy1boH2gXUXjXWuOjzJhD5iKlz+ibt8wLMUpPfG2Zba02yy17lG2w==}
+  /@ibiz-template/service/0.0.1-beta.30_lott4eotzlae2bp22y5gd3by3a:
+    resolution: {integrity: sha512-RKL9w9PgB6JB51t5q0y0s8BkrQ5ME7E3otAbAPgXxLNaGyAdE9U2jV+iiPa6xFmNr6R5wShDA6do9v8Bg/TfDg==}
    peerDependencies:
-      '@ibiz-template/core': ^0.0.1-alpha.2
-      '@ibiz-template/model': ^0.0.1-alpha.2
+      '@ibiz-template/core': ^0.0.1-beta.30
+      '@ibiz-template/model': ^0.0.1-beta.30
      qx-util: ^0.4.4
      ramda: ^0.28.0
    dependencies:
-      '@ibiz-template/core': 0.0.1-beta.15_qzytosuu5eg3bvoa74ldx6evva
-      '@ibiz-template/model': 0.0.1-beta.15_yslesr4iih24kokbsmhl36awki
+      '@ibiz-template/core': 0.0.1-beta.30_qzytosuu5eg3bvoa74ldx6evva
+      '@ibiz-template/model': 0.0.1-beta.30_yslesr4iih24kokbsmhl36awki
      qx-util: 0.4.4
      ramda: 0.28.0
    dev: false

-  /@ibiz-template/theme/0.0.1-beta.15:
-    resolution: {integrity: sha512-RXSQXJNl59DUkG8KrBPBdjtcPt2uZPGMsCli8zPIjWvzV9ohLFCdTiKGBIOXtMEWwKWk68HaNrWL0WLPsCSjdQ==}
+  /@ibiz-template/theme/0.0.1-beta.30:
+    resolution: {integrity: sha512-O+t8B70Tqs8k2DBPkqyOz1ig3hx7HcCDDCn413gUl5d2+Rcn1cVVGvLUd55EW2PZxERc/j+cAuQOzELr7s3Z0w==}
    dev: false

-  /@ibiz-template/vue-util/0.0.1-beta.15_rdcnlivyzp4e4lnwrkiaggqz2a:
-    resolution: {integrity: sha512-KfJIAulIg4QM7eRGaTjIhEg3+fNwXDV7QLI2fcJs+7EfQomdQRy3UY970i3+Mx6KmMX/g6J/TjUucbW3YhEn8g==}
+  /@ibiz-template/vue-util/0.0.1-beta.30_irts63pzfi3q4gk2ioskh54fdi:
+    resolution: {integrity: sha512-7u1c1+XDGGK5ZDF5WEZPVHt0zbAqCnLueDZ+W8t0aCjo6ATTpSiOTUqf7/s5yVvU4x3pqc/pgMqVMzery7DolQ==}
    peerDependencies:
-      '@ibiz-template/controller': '>=0.0.1-alpha.2'
-      '@ibiz-template/core': '>=0.0.1-alpha.2'
-      '@ibiz-template/model': '>=0.0.1-alpha.2'
+      '@ibiz-template/controller': ^0.0.1-beta.30
+      '@ibiz-template/core': ^0.0.1-beta.30
+      '@ibiz-template/model': ^0.0.1-beta.30
      qs: ^6.11.0
      qx-util: ^0.4.4
      ramda: ^0.28.0
      vue: ^2.7.14
      vue-router: ^3.6.5
    dependencies:
-      '@ibiz-template/controller': 0.0.1-beta.15_fau3qvdlyk6bgprv7ylb3iamz4
-      '@ibiz-template/core': 0.0.1-beta.15_qzytosuu5eg3bvoa74ldx6evva
-      '@ibiz-template/model': 0.0.1-beta.15_yslesr4iih24kokbsmhl36awki
+      '@ibiz-template/controller': 0.0.1-beta.30_rczvjvcak2f2drev4tzikkqduu
+      '@ibiz-template/core': 0.0.1-beta.30_qzytosuu5eg3bvoa74ldx6evva
+      '@ibiz-template/model': 0.0.1-beta.30_yslesr4iih24kokbsmhl36awki
      qs: 6.11.0
      qx-util: 0.4.4
      ramda: 0.28.0
@@ -1734,8 +1740,8 @@ packages:
    resolution: {integrity: sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==}
    dev: false

-  /axios/1.1.3:
-    resolution: {integrity: sha512-00tXVRwKx/FZr/IDVFt4C+f9FYairX517WoGCL6dpOntqLkZofjhu43F/Xl44UOpqa+9sLFDrG/XAnFsUYgkDA==}
+  /axios/1.2.2:
+    resolution: {integrity: sha512-bz/J4gS2S3I7mpN/YZfGFTqhXTYzRho8Ay38w2otuuDR322KzFIWm/4W2K6gIwvWaws5n+mnb7D1lN9uD+QH6Q==}
    dependencies:
      follow-redirects: 1.15.2
      form-data: 4.0.0

--- a/app_Web/src/components/editor/data-picker/ibiz-mpicker/ibiz-mpicker.tsx
+++ b/app_Web/src/components/editor/data-picker/ibiz-mpicker/ibiz-mpicker.tsx
@@ -30,38 +30,6 @@ export const IBizMPicker = defineComponent({
    // 加载中
    const loading: Ref<boolean> = ref(false);

-    // 格式化值，把实体属性名格式化成srfkey和srfmajortext
-    const formatValue = (value: IData[]) => {
-      let result: IData[] = [];
-      if (c.keyName !== 'srfkey' || c.textName !== 'srfmajortext') {
-        value.forEach((item: IData) => {
-          result.push({
-            srfmajortext: item[c.textName] || item.srfmajortext,
-            srfkey: item[c.keyName],
-          });
-        });
-      } else {
-        result = value;
-      }
-      return result;
-    };
-
-    // 解析值,把srfkey和srfmajortext解析成实体属性名
-    const parseValue = (value: IData[]) => {
-      let result: IData[] = [];
-      if (c.keyName !== 'srfkey' || c.textName !== 'srfmajortext') {
-        value.forEach((item: IData) => {
-          result.push({
-            [c.textName]: item.srfmajortext,
-            [c.keyName]: item.srfkey,
-          });
-        });
-      } else {
-        result = value;
-      }
-      return result;
-    };
-
    // 监听传入值
    watch(
      () => props.value,
@@ -69,53 +37,21 @@ export const IBizMPicker = defineComponent({
        curValue.value = [];
        selectItems.value = [];
        if (newVal) {
-          try {
-            selectItems.value = parseValue(JSON.parse(newVal));
-            selectItems.value.forEach((item: IData) => {
-              curValue.value.push(item[c.keyName]);
-              const index = items.value.findIndex(i =>
-                Object.is(i[c.keyName], item[c.keyName]),
-              );
-              if (index < 0) {
-                items.value.push({
-                  [c.keyName]: item[c.keyName],
-                  [c.textName]: item[c.textName] || item.srfmajortext,
-                });
-              }
-            });
-          } catch (error) {
-            if ((error as IData).name === 'SyntaxError') {
-              const srfkeys: string[] = newVal.split(',');
-              let srfmajortexts: string[] = [];
-              if (c.valueItem && props.data![c.valueItem]) {
-                srfmajortexts = props.data![c.valueItem].split(',');
-              }
-              if (
-                srfkeys &&
-                srfkeys.length > 0 &&
-                srfmajortexts &&
-                srfmajortexts.length > 0 &&
-                srfkeys.length === srfmajortexts.length
-              ) {
-                srfkeys.forEach((id: string, index: number) => {
-                  curValue.value.push(id);
-                  selectItems.value.push({
-                    [c.keyName]: id,
-                    [c.textName]: srfmajortexts[index],
-                  });
-                  const _index = items.value.findIndex(i =>
-                    Object.is(i[c.keyName], id),
-                  );
-                  if (_index < 0) {
-                    items.value.push({
-                      [c.keyName]: id,
-                      [c.textName]: srfmajortexts[index],
-                    });
-                  }
-                });
-              }
+          selectItems.value = JSON.parse(newVal);
+          selectItems.value.forEach((item: IData) => {
+            curValue.value.push(item.srfkey);
+
+            // 选项没有的时候补充选项
+            const index = items.value.findIndex(i =>
+              Object.is(i.srfkey, item.srfkey),
+            );
+            if (index < 0) {
+              items.value.push({
+                srfkey: item.srfkey,
+                srfmajortext: item.srfmajortext,
+              });
            }
-          }
+          });
        }
      },
      { immediate: true, deep: true },
@@ -123,49 +59,37 @@ export const IBizMPicker = defineComponent({

    // 处理视图关闭，往外抛值
    const handleOpenViewClose = (result: IData[]) => {
-      const selects: IData[] = [];
+      // 抛出值集合
+      const valArr: IData[] = [];
      if (result && Array.isArray(result)) {
        result.forEach((select: IData) => {
-          selects.push({
-            [c.keyName]: select[c.keyName] || select.srfkey,
-            [c.textName]: select[c.textName] || select.srfmajortext,
-          });
+          // 回显并且回来的选中值只有srfkey和srfmajortext,所以||
+          const formattedItem = {
+            srfkey: select[c.keyName] || select.srfkey,
+            srfmajortext: select[c.textName] || select.srfmajortext,
+          };
+          valArr.push(formattedItem);
+
+          // 选项不存在的补充到选项里
          const index = items.value.findIndex(item =>
            Object.is(item[c.keyName], select[c.keyName]),
          );
          if (index < 0) {
-            items.value.push({
-              [c.textName]: select[c.textName] || select.srfmajortext,
-              [c.keyName]: select[c.keyName],
-            });
+            items.value.push(formattedItem);
          }
        });
      }
-      if (props.data) {
-        const value =
-          selects.length > 0 ? JSON.stringify(formatValue(selects)) : '';
-        emit('change', value);
-      }
+      const value = valArr.length > 0 ? JSON.stringify(valArr) : '';
+      emit('change', value);
    };

    // 打开数据选择视图
    const openPickUpView = async () => {
-      // TODO 后续参数
-      // const _selectItems: IData[] = JSON.parse(JSON.stringify(selectItems.value));
-      // if (!Object.is(c.keyName, 'srfkey')) {
-      //   _selectItems.forEach((item: IData, index: number) => {
-      //     _selectItems[index].srfkey = item[c.keyName];
-      //   });
-      // }
-      // if (!Object.is(c.textName, 'srfmajortext')) {
-      //   _selectItems.forEach((item: IData, index: number) => {
-      //     _selectItems[index].srfmajortext = item[c.textName] || item.srfmajortext;
-      //   });
-      // }
-      // Object.assign(c.context, {
-      //   srfparentdata: { srfparentkey: props.data[c.keyName] },
-      // });
-      // Object.assign(c.params, { selectedData: [..._selectItems] });
+      if (selectItems.value.length) {
+        Object.assign(c.params, {
+          selectedData: JSON.stringify(selectItems.value),
+        });
+      }
      const res = await c.openPickUpView(props.data!);
      if (res) {
        handleOpenViewClose(res);
@@ -174,29 +98,20 @@ export const IBizMPicker = defineComponent({

    // 下拉选中回调
    const onSelect = (selects: string[]) => {
-      const val: Array<IData> = [];
+      const valArr: Array<IData> = [];
      if (selects.length > 0) {
        selects.forEach((select: string) => {
-          let index = items.value.findIndex(item =>
-            Object.is(item[c.keyName], select),
+          const findItem = items.value.find(item =>
+            Object.is(item.srfkey, select),
          );
-          if (index >= 0) {
-            const item = items.value[index];
-            val.push({
-              [c.keyName]: item[c.keyName],
-              [c.textName]: item[c.textName] || item.srfmajortext,
+          if (findItem) {
+            valArr.push({
+              srfkey: findItem.srfkey,
+              srfmajortext: findItem.srfmajortext,
            });
-          } else {
-            index = selectItems.value.findIndex((item: IData) =>
-              Object.is(item[c.keyName], select),
-            );
-            if (index >= 0) {
-              const item = selectItems.value[index];
-              val.push(item);
-            }
          }
        });
-        const value = val.length > 0 ? JSON.stringify(formatValue(val)) : '';
+        const value = valArr.length > 0 ? JSON.stringify(valArr) : '';
        emit('change', value);
      } else {
        emit('change', '');
@@ -211,7 +126,10 @@ export const IBizMPicker = defineComponent({
          const res = await c.getServiceData(query, props.data!);
          loading.value = false;
          if (res) {
-            items.value = res.data as IData[];
+            items.value = res.data.map(item => ({
+              srfkey: item[c.keyName],
+              srfmajortext: item[c.textName],
+            }));
          }
        } catch (error) {
          loading.value = false;
@@ -229,13 +147,15 @@ export const IBizMPicker = defineComponent({
      }
    };

+    // 信息展示，只显示名称。
    const valueText = computed(() => {
      return selectItems.value
        .map(item => {
-          return item[c.textName] || item.srfmajortext;
+          return item.srfmajortext;
        })
        .join(',');
    });
+
    return {
      ns,
      c,
@@ -274,8 +194,8 @@ export const IBizMPicker = defineComponent({
          >
            {this.items.map((item, index) => {
              return (
-                <i-option key={index} value={item[this.c.keyName]}>
-                  {item[this.c.textName]}
+                <i-option key={index} value={item.srfkey}>
+                  {item.srfmajortext}
                </i-option>
              );
            })}

--- a/app_Web/src/components/editor/text-box/ibiz-input-number/ibiz-input-number.tsx
+++ b/app_Web/src/components/editor/text-box/ibiz-input-number/ibiz-input-number.tsx
@@ -4,6 +4,7 @@ import {
  getInputNumberProps,
  useNamespace,
 } from '@ibiz-template/vue-util';
+import '@ibiz-template/theme/style/components/editor/ibiz-input-number/ibiz-input-number.scss';

 export const IBizInputNumber = defineComponent({
  name: 'IBizInputNumber',
@@ -69,7 +70,13 @@ export const IBizInputNumber = defineComponent({
            precision={this.c.model.precision}
            disabled={this.disabled}
            on-on-change={this.handleChange}
-          ></i-input-number>
+          >
+            {this.c.model.unitName && (
+              <i class={this.ns.e('unit')} slot='suffix'>
+                {this.c.model.unitName}
+              </i>
+            )}
+          </i-input-number>
        )}
      </div>
    );

--- a/app_Web/src/components/editor/text-box/ibiz-input/ibiz-input.tsx
+++ b/app_Web/src/components/editor/text-box/ibiz-input/ibiz-input.tsx
@@ -127,7 +127,13 @@ export const IBizInput = defineComponent({
            nativeOnkeyup={this.handleKeyUp}
            class={this.ns.b('input')}
            disabled={this.disabled}
-          ></i-input>
+          >
+            {this.controller.model.unitName && (
+              <i class={this.ns.e('unit')} slot='suffix'>
+                {this.controller.model.unitName}
+              </i>
+            )}
+          </i-input>
        )}
      </div>
    );

--- a/app_Web/yarn.lock
+++ b/app_Web/yarn.lock
--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Book/PSFORMS/EditorTest.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Book/PSFORMS/EditorTest.json
@@ -1998,34 +1998,34 @@
            "getPSAppViewLogics" : [ {
              "logicTrigger" : "CUSTOM",
              "logicType" : "APPVIEWUIACTION",
-              "name" : "grid_uagridcolumn1_ua98d563_click",
+              "name" : "grid_uagridcolumn1_u479f517_click",
              "getPSAppViewUIAction" : {
                "modelref" : true,
-                "id" : "表格界面_行编辑开关操作"
+                "id" : "表格界面_编辑操作"
              }
            }, {
              "logicTrigger" : "CUSTOM",
              "logicType" : "APPVIEWUIACTION",
-              "name" : "grid_uagridcolumn1_u479f517_click",
+              "name" : "grid_uagridcolumn1_ua98d563_click",
              "getPSAppViewUIAction" : {
                "modelref" : true,
-                "id" : "表格界面_编辑操作"
+                "id" : "表格界面_行编辑开关操作"
              }
            } ],
            "getPSAppViewUIActions" : [ {
-              "name" : "表格界面_行编辑开关操作",
+              "name" : "表格界面_编辑操作",
              "getPSUIAction" : {
                "modelref" : true,
-                "id" : "ToggleRowEdit"
+                "id" : "Edit"
              },
+              "uIActionTarget" : "SINGLEKEY",
              "xDataControlName" : "grid"
            }, {
-              "name" : "表格界面_编辑操作",
+              "name" : "表格界面_行编辑开关操作",
              "getPSUIAction" : {
                "modelref" : true,
-                "id" : "Edit"
+                "id" : "ToggleRowEdit"
              },
-              "uIActionTarget" : "SINGLEKEY",
              "xDataControlName" : "grid"
            } ],
            "getPSControlHandler" : {
@@ -2257,30 +2257,6 @@
                "mOSFilePath" : "pssysapps/Web/psappdataentities/Reginfo/psappdeuagroups/A046596b6afb50f9e5b",
                "name" : "操作列",
                "getPSUIActionGroupDetails" : [ {
-                  "detailType" : "DEUIACTION",
-                  "name" : "ua98d563",
-                  "getPSUIAction" : {
-                    "caption" : "行编辑",
-                    "codeName" : "ToggleRowEdit",
-                    "fullCodeName" : "ToggleRowEdit",
-                    "mOSFilePath" : "pssysapps/Web/pssysappdeuiactions/ToggleRowEdit",
-                    "name" : "表格界面_行编辑开关操作",
-                    "getPSSysImage" : {
-                      "glyph" : "xf0ce@FontAwesome",
-                      "cssClass" : "fa fa-table"
-                    },
-                    "predefinedType" : "GRIDVIEW_ROWEDITACTION",
-                    "rTMOSFilePath" : "pssysapps/Web/pssysappdeuiactions/ToggleRowEdit",
-                    "timeout" : 60000,
-                    "uIActionMode" : "SYS",
-                    "uIActionTag" : "ToggleRowEdit",
-                    "uIActionType" : "DEUIACTION",
-                    "enableToggleMode" : true
-                  },
-                  "addSeparator" : true,
-                  "showCaption" : true,
-                  "showIcon" : false
-                }, {
                  "detailType" : "DEUIACTION",
                  "name" : "u479f517",
                  "getPSUIAction" : {
@@ -2314,6 +2290,30 @@
                  "addSeparator" : true,
                  "showCaption" : true,
                  "showIcon" : true
+                }, {
+                  "detailType" : "DEUIACTION",
+                  "name" : "ua98d563",
+                  "getPSUIAction" : {
+                    "caption" : "行编辑",
+                    "codeName" : "ToggleRowEdit",
+                    "fullCodeName" : "ToggleRowEdit",
+                    "mOSFilePath" : "pssysapps/Web/pssysappdeuiactions/ToggleRowEdit",
+                    "name" : "表格界面_行编辑开关操作",
+                    "getPSSysImage" : {
+                      "glyph" : "xf0ce@FontAwesome",
+                      "cssClass" : "fa fa-table"
+                    },
+                    "predefinedType" : "GRIDVIEW_ROWEDITACTION",
+                    "rTMOSFilePath" : "pssysapps/Web/pssysappdeuiactions/ToggleRowEdit",
+                    "timeout" : 60000,
+                    "uIActionMode" : "SYS",
+                    "uIActionTag" : "ToggleRowEdit",
+                    "uIActionType" : "DEUIACTION",
+                    "enableToggleMode" : true
+                  },
+                  "addSeparator" : true,
+                  "showCaption" : true,
+                  "showIcon" : false
                } ],
                "rTMOSFilePath" : "pssysapps/Web/psappdataentities/Reginfo/psappdeuagroups/A046596b6afb50f9e5b",
                "uniqueTag" : "Reginfo__A046596b6afb50f9e5b"

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo/PSGRIDS/Main.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo/PSGRIDS/Main.json
@@ -19,34 +19,34 @@
  "getPSAppViewLogics" : [ {
    "logicTrigger" : "CUSTOM",
    "logicType" : "APPVIEWUIACTION",
-    "name" : "grid_uagridcolumn1_ua98d563_click",
+    "name" : "grid_uagridcolumn1_u479f517_click",
    "getPSAppViewUIAction" : {
      "modelref" : true,
-      "id" : "表格界面_行编辑开关操作"
+      "id" : "表格界面_编辑操作"
    }
  }, {
    "logicTrigger" : "CUSTOM",
    "logicType" : "APPVIEWUIACTION",
-    "name" : "grid_uagridcolumn1_u479f517_click",
+    "name" : "grid_uagridcolumn1_ua98d563_click",
    "getPSAppViewUIAction" : {
      "modelref" : true,
-      "id" : "表格界面_编辑操作"
+      "id" : "表格界面_行编辑开关操作"
    }
  } ],
  "getPSAppViewUIActions" : [ {
-    "name" : "表格界面_行编辑开关操作",
+    "name" : "表格界面_编辑操作",
    "getPSUIAction" : {
      "modelref" : true,
-      "id" : "ToggleRowEdit"
+      "id" : "Edit"
    },
+    "uIActionTarget" : "SINGLEKEY",
    "xDataControlName" : "grid"
  }, {
-    "name" : "表格界面_编辑操作",
+    "name" : "表格界面_行编辑开关操作",
    "getPSUIAction" : {
      "modelref" : true,
-      "id" : "Edit"
+      "id" : "ToggleRowEdit"
    },
-    "uIActionTarget" : "SINGLEKEY",
    "xDataControlName" : "grid"
  } ],
  "getPSControlLogics" : [ {
@@ -191,30 +191,6 @@
      "mOSFilePath" : "pssysapps/Web/psappdataentities/Reginfo/psappdeuagroups/A046596b6afb50f9e5b",
      "name" : "操作列",
      "getPSUIActionGroupDetails" : [ {
-        "detailType" : "DEUIACTION",
-        "name" : "ua98d563",
-        "getPSUIAction" : {
-          "caption" : "行编辑",
-          "codeName" : "ToggleRowEdit",
-          "fullCodeName" : "ToggleRowEdit",
-          "mOSFilePath" : "pssysapps/Web/pssysappdeuiactions/ToggleRowEdit",
-          "name" : "表格界面_行编辑开关操作",
-          "getPSSysImage" : {
-            "glyph" : "xf0ce@FontAwesome",
-            "cssClass" : "fa fa-table"
-          },
-          "predefinedType" : "GRIDVIEW_ROWEDITACTION",
-          "rTMOSFilePath" : "pssysapps/Web/pssysappdeuiactions/ToggleRowEdit",
-          "timeout" : 60000,
-          "uIActionMode" : "SYS",
-          "uIActionTag" : "ToggleRowEdit",
-          "uIActionType" : "DEUIACTION",
-          "enableToggleMode" : true
-        },
-        "addSeparator" : true,
-        "showCaption" : true,
-        "showIcon" : false
-      }, {
        "detailType" : "DEUIACTION",
        "name" : "u479f517",
        "getPSUIAction" : {
@@ -248,6 +224,30 @@
        "addSeparator" : true,
        "showCaption" : true,
        "showIcon" : true
+      }, {
+        "detailType" : "DEUIACTION",
+        "name" : "ua98d563",
+        "getPSUIAction" : {
+          "caption" : "行编辑",
+          "codeName" : "ToggleRowEdit",
+          "fullCodeName" : "ToggleRowEdit",
+          "mOSFilePath" : "pssysapps/Web/pssysappdeuiactions/ToggleRowEdit",
+          "name" : "表格界面_行编辑开关操作",
+          "getPSSysImage" : {
+            "glyph" : "xf0ce@FontAwesome",
+            "cssClass" : "fa fa-table"
+          },
+          "predefinedType" : "GRIDVIEW_ROWEDITACTION",
+          "rTMOSFilePath" : "pssysapps/Web/pssysappdeuiactions/ToggleRowEdit",
+          "timeout" : 60000,
+          "uIActionMode" : "SYS",
+          "uIActionTag" : "ToggleRowEdit",
+          "uIActionType" : "DEUIACTION",
+          "enableToggleMode" : true
+        },
+        "addSeparator" : true,
+        "showCaption" : true,
+        "showIcon" : false
      } ],
      "rTMOSFilePath" : "pssysapps/Web/psappdataentities/Reginfo/psappdeuagroups/A046596b6afb50f9e5b",
      "uniqueTag" : "Reginfo__A046596b6afb50f9e5b"

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Student/PSFORMS/Main.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Student/PSFORMS/Main.json
@@ -609,34 +609,34 @@
          "getPSAppViewLogics" : [ {
            "logicTrigger" : "CUSTOM",
            "logicType" : "APPVIEWUIACTION",
-            "name" : "grid_uagridcolumn1_ua98d563_click",
+            "name" : "grid_uagridcolumn1_u479f517_click",
            "getPSAppViewUIAction" : {
              "modelref" : true,
-              "id" : "表格界面_行编辑开关操作"
+              "id" : "表格界面_编辑操作"
            }
          }, {
            "logicTrigger" : "CUSTOM",
            "logicType" : "APPVIEWUIACTION",
-            "name" : "grid_uagridcolumn1_u479f517_click",
+            "name" : "grid_uagridcolumn1_ua98d563_click",
            "getPSAppViewUIAction" : {
              "modelref" : true,
-              "id" : "表格界面_编辑操作"
+              "id" : "表格界面_行编辑开关操作"
            }
          } ],
          "getPSAppViewUIActions" : [ {
-            "name" : "表格界面_行编辑开关操作",
+            "name" : "表格界面_编辑操作",
            "getPSUIAction" : {
              "modelref" : true,
-              "id" : "ToggleRowEdit"
+              "id" : "Edit"
            },
+            "uIActionTarget" : "SINGLEKEY",
            "xDataControlName" : "grid"
          }, {
-            "name" : "表格界面_编辑操作",
+            "name" : "表格界面_行编辑开关操作",
            "getPSUIAction" : {
              "modelref" : true,
-              "id" : "Edit"
+              "id" : "ToggleRowEdit"
            },
-            "uIActionTarget" : "SINGLEKEY",
            "xDataControlName" : "grid"
          } ],
          "getPSControlHandler" : {
@@ -868,30 +868,6 @@
              "mOSFilePath" : "pssysapps/Web/psappdataentities/Reginfo/psappdeuagroups/A046596b6afb50f9e5b",
              "name" : "操作列",
              "getPSUIActionGroupDetails" : [ {
-                "detailType" : "DEUIACTION",
-                "name" : "ua98d563",
-                "getPSUIAction" : {
-                  "caption" : "行编辑",
-                  "codeName" : "ToggleRowEdit",
-                  "fullCodeName" : "ToggleRowEdit",
-                  "mOSFilePath" : "pssysapps/Web/pssysappdeuiactions/ToggleRowEdit",
-                  "name" : "表格界面_行编辑开关操作",
-                  "getPSSysImage" : {
-                    "glyph" : "xf0ce@FontAwesome",
-                    "cssClass" : "fa fa-table"
-                  },
-                  "predefinedType" : "GRIDVIEW_ROWEDITACTION",
-                  "rTMOSFilePath" : "pssysapps/Web/pssysappdeuiactions/ToggleRowEdit",
-                  "timeout" : 60000,
-                  "uIActionMode" : "SYS",
-                  "uIActionTag" : "ToggleRowEdit",
-                  "uIActionType" : "DEUIACTION",
-                  "enableToggleMode" : true
-                },
-                "addSeparator" : true,
-                "showCaption" : true,
-                "showIcon" : false
-              }, {
                "detailType" : "DEUIACTION",
                "name" : "u479f517",
                "getPSUIAction" : {
@@ -925,6 +901,30 @@
                "addSeparator" : true,
                "showCaption" : true,
                "showIcon" : true
+              }, {
+                "detailType" : "DEUIACTION",
+                "name" : "ua98d563",
+                "getPSUIAction" : {
+                  "caption" : "行编辑",
+                  "codeName" : "ToggleRowEdit",
+                  "fullCodeName" : "ToggleRowEdit",
+                  "mOSFilePath" : "pssysapps/Web/pssysappdeuiactions/ToggleRowEdit",
+                  "name" : "表格界面_行编辑开关操作",
+                  "getPSSysImage" : {
+                    "glyph" : "xf0ce@FontAwesome",
+                    "cssClass" : "fa fa-table"
+                  },
+                  "predefinedType" : "GRIDVIEW_ROWEDITACTION",
+                  "rTMOSFilePath" : "pssysapps/Web/pssysappdeuiactions/ToggleRowEdit",
+                  "timeout" : 60000,
+                  "uIActionMode" : "SYS",
+                  "uIActionTag" : "ToggleRowEdit",
+                  "uIActionType" : "DEUIACTION",
+                  "enableToggleMode" : true
+                },
+                "addSeparator" : true,
+                "showCaption" : true,
+                "showIcon" : false
              } ],
              "rTMOSFilePath" : "pssysapps/Web/psappdataentities/Reginfo/psappdeuagroups/A046596b6afb50f9e5b",
              "uniqueTag" : "Reginfo__A046596b6afb50f9e5b"

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/ReginfoGridView.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/ReginfoGridView.json
@@ -389,34 +389,34 @@
    "getPSAppViewLogics" : [ {
      "logicTrigger" : "CUSTOM",
      "logicType" : "APPVIEWUIACTION",
-      "name" : "grid_uagridcolumn1_ua98d563_click",
+      "name" : "grid_uagridcolumn1_u479f517_click",
      "getPSAppViewUIAction" : {
        "modelref" : true,
-        "id" : "表格界面_行编辑开关操作"
+        "id" : "表格界面_编辑操作"
      }
    }, {
      "logicTrigger" : "CUSTOM",
      "logicType" : "APPVIEWUIACTION",
-      "name" : "grid_uagridcolumn1_u479f517_click",
+      "name" : "grid_uagridcolumn1_ua98d563_click",
      "getPSAppViewUIAction" : {
        "modelref" : true,
-        "id" : "表格界面_编辑操作"
+        "id" : "表格界面_行编辑开关操作"
      }
    } ],
    "getPSAppViewUIActions" : [ {
-      "name" : "表格界面_行编辑开关操作",
+      "name" : "表格界面_编辑操作",
      "getPSUIAction" : {
        "modelref" : true,
-        "id" : "ToggleRowEdit"
+        "id" : "Edit"
      },
+      "uIActionTarget" : "SINGLEKEY",
      "xDataControlName" : "grid"
    }, {
-      "name" : "表格界面_编辑操作",
+      "name" : "表格界面_行编辑开关操作",
      "getPSUIAction" : {
        "modelref" : true,
-        "id" : "Edit"
+        "id" : "ToggleRowEdit"
      },
-      "uIActionTarget" : "SINGLEKEY",
      "xDataControlName" : "grid"
    } ],
    "getPSControlHandler" : {
@@ -648,30 +648,6 @@
        "mOSFilePath" : "pssysapps/Web/psappdataentities/Reginfo/psappdeuagroups/A046596b6afb50f9e5b",
        "name" : "操作列",
        "getPSUIActionGroupDetails" : [ {
-          "detailType" : "DEUIACTION",
-          "name" : "ua98d563",
-          "getPSUIAction" : {
-            "caption" : "行编辑",
-            "codeName" : "ToggleRowEdit",
-            "fullCodeName" : "ToggleRowEdit",
-            "mOSFilePath" : "pssysapps/Web/pssysappdeuiactions/ToggleRowEdit",
-            "name" : "表格界面_行编辑开关操作",
-            "getPSSysImage" : {
-              "glyph" : "xf0ce@FontAwesome",
-              "cssClass" : "fa fa-table"
-            },
-            "predefinedType" : "GRIDVIEW_ROWEDITACTION",
-            "rTMOSFilePath" : "pssysapps/Web/pssysappdeuiactions/ToggleRowEdit",
-            "timeout" : 60000,
-            "uIActionMode" : "SYS",
-            "uIActionTag" : "ToggleRowEdit",
-            "uIActionType" : "DEUIACTION",
-            "enableToggleMode" : true
-          },
-          "addSeparator" : true,
-          "showCaption" : true,
-          "showIcon" : false
-        }, {
          "detailType" : "DEUIACTION",
          "name" : "u479f517",
          "getPSUIAction" : {
@@ -705,6 +681,30 @@
          "addSeparator" : true,
          "showCaption" : true,
          "showIcon" : true
+        }, {
+          "detailType" : "DEUIACTION",
+          "name" : "ua98d563",
+          "getPSUIAction" : {
+            "caption" : "行编辑",
+            "codeName" : "ToggleRowEdit",
+            "fullCodeName" : "ToggleRowEdit",
+            "mOSFilePath" : "pssysapps/Web/pssysappdeuiactions/ToggleRowEdit",
+            "name" : "表格界面_行编辑开关操作",
+            "getPSSysImage" : {
+              "glyph" : "xf0ce@FontAwesome",
+              "cssClass" : "fa fa-table"
+            },
+            "predefinedType" : "GRIDVIEW_ROWEDITACTION",
+            "rTMOSFilePath" : "pssysapps/Web/pssysappdeuiactions/ToggleRowEdit",
+            "timeout" : 60000,
+            "uIActionMode" : "SYS",
+            "uIActionTag" : "ToggleRowEdit",
+            "uIActionType" : "DEUIACTION",
+            "enableToggleMode" : true
+          },
+          "addSeparator" : true,
+          "showCaption" : true,
+          "showIcon" : false
        } ],
        "rTMOSFilePath" : "pssysapps/Web/psappdataentities/Reginfo/psappdeuagroups/A046596b6afb50f9e5b",
        "uniqueTag" : "Reginfo__A046596b6afb50f9e5b"

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/ReginfoStuInfoList.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/ReginfoStuInfoList.json
@@ -440,34 +440,34 @@
    "getPSAppViewLogics" : [ {
      "logicTrigger" : "CUSTOM",
      "logicType" : "APPVIEWUIACTION",
-      "name" : "grid_uagridcolumn1_ua98d563_click",
+      "name" : "grid_uagridcolumn1_u479f517_click",
      "getPSAppViewUIAction" : {
        "modelref" : true,
-        "id" : "表格界面_行编辑开关操作"
+        "id" : "表格界面_编辑操作"
      }
    }, {
      "logicTrigger" : "CUSTOM",
      "logicType" : "APPVIEWUIACTION",
-      "name" : "grid_uagridcolumn1_u479f517_click",
+      "name" : "grid_uagridcolumn1_ua98d563_click",
      "getPSAppViewUIAction" : {
        "modelref" : true,
-        "id" : "表格界面_编辑操作"
+        "id" : "表格界面_行编辑开关操作"
      }
    } ],
    "getPSAppViewUIActions" : [ {
-      "name" : "表格界面_行编辑开关操作",
+      "name" : "表格界面_编辑操作",
      "getPSUIAction" : {
        "modelref" : true,
-        "id" : "ToggleRowEdit"
+        "id" : "Edit"
      },
+      "uIActionTarget" : "SINGLEKEY",
      "xDataControlName" : "grid"
    }, {
-      "name" : "表格界面_编辑操作",
+      "name" : "表格界面_行编辑开关操作",
      "getPSUIAction" : {
        "modelref" : true,
-        "id" : "Edit"
+        "id" : "ToggleRowEdit"
      },
-      "uIActionTarget" : "SINGLEKEY",
      "xDataControlName" : "grid"
    } ],
    "getPSControlHandler" : {
@@ -699,30 +699,6 @@
        "mOSFilePath" : "pssysapps/Web/psappdataentities/Reginfo/psappdeuagroups/A046596b6afb50f9e5b",
        "name" : "操作列",
        "getPSUIActionGroupDetails" : [ {
-          "detailType" : "DEUIACTION",
-          "name" : "ua98d563",
-          "getPSUIAction" : {
-            "caption" : "行编辑",
-            "codeName" : "ToggleRowEdit",
-            "fullCodeName" : "ToggleRowEdit",
-            "mOSFilePath" : "pssysapps/Web/pssysappdeuiactions/ToggleRowEdit",
-            "name" : "表格界面_行编辑开关操作",
-            "getPSSysImage" : {
-              "glyph" : "xf0ce@FontAwesome",
-              "cssClass" : "fa fa-table"
-            },
-            "predefinedType" : "GRIDVIEW_ROWEDITACTION",
-            "rTMOSFilePath" : "pssysapps/Web/pssysappdeuiactions/ToggleRowEdit",
-            "timeout" : 60000,
-            "uIActionMode" : "SYS",
-            "uIActionTag" : "ToggleRowEdit",
-            "uIActionType" : "DEUIACTION",
-            "enableToggleMode" : true
-          },
-          "addSeparator" : true,
-          "showCaption" : true,
-          "showIcon" : false
-        }, {
          "detailType" : "DEUIACTION",
          "name" : "u479f517",
          "getPSUIAction" : {
@@ -756,6 +732,30 @@
          "addSeparator" : true,
          "showCaption" : true,
          "showIcon" : true
+        }, {
+          "detailType" : "DEUIACTION",
+          "name" : "ua98d563",
+          "getPSUIAction" : {
+            "caption" : "行编辑",
+            "codeName" : "ToggleRowEdit",
+            "fullCodeName" : "ToggleRowEdit",
+            "mOSFilePath" : "pssysapps/Web/pssysappdeuiactions/ToggleRowEdit",
+            "name" : "表格界面_行编辑开关操作",
+            "getPSSysImage" : {
+              "glyph" : "xf0ce@FontAwesome",
+              "cssClass" : "fa fa-table"
+            },
+            "predefinedType" : "GRIDVIEW_ROWEDITACTION",
+            "rTMOSFilePath" : "pssysapps/Web/pssysappdeuiactions/ToggleRowEdit",
+            "timeout" : 60000,
+            "uIActionMode" : "SYS",
+            "uIActionTag" : "ToggleRowEdit",
+            "uIActionType" : "DEUIACTION",
+            "enableToggleMode" : true
+          },
+          "addSeparator" : true,
+          "showCaption" : true,
+          "showIcon" : false
        } ],
        "rTMOSFilePath" : "pssysapps/Web/psappdataentities/Reginfo/psappdeuagroups/A046596b6afb50f9e5b",
        "uniqueTag" : "Reginfo__A046596b6afb50f9e5b"

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/bookBookEditViewEditorTest.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/bookBookEditViewEditorTest.json
@@ -3198,34 +3198,34 @@
              "getPSAppViewLogics" : [ {
                "logicTrigger" : "CUSTOM",
                "logicType" : "APPVIEWUIACTION",
-                "name" : "grid_uagridcolumn1_ua98d563_click",
+                "name" : "grid_uagridcolumn1_u479f517_click",
                "getPSAppViewUIAction" : {
                  "modelref" : true,
-                  "id" : "表格界面_行编辑开关操作"
+                  "id" : "表格界面_编辑操作"
                }
              }, {
                "logicTrigger" : "CUSTOM",
                "logicType" : "APPVIEWUIACTION",
-                "name" : "grid_uagridcolumn1_u479f517_click",
+                "name" : "grid_uagridcolumn1_ua98d563_click",
                "getPSAppViewUIAction" : {
                  "modelref" : true,
-                  "id" : "表格界面_编辑操作"
+                  "id" : "表格界面_行编辑开关操作"
                }
              } ],
              "getPSAppViewUIActions" : [ {
-                "name" : "表格界面_行编辑开关操作",
+                "name" : "表格界面_编辑操作",
                "getPSUIAction" : {
                  "modelref" : true,
-                  "id" : "ToggleRowEdit"
+                  "id" : "Edit"
                },
+                "uIActionTarget" : "SINGLEKEY",
                "xDataControlName" : "grid"
              }, {
-                "name" : "表格界面_编辑操作",
+                "name" : "表格界面_行编辑开关操作",
                "getPSUIAction" : {
                  "modelref" : true,
-                  "id" : "Edit"
+                  "id" : "ToggleRowEdit"
                },
-                "uIActionTarget" : "SINGLEKEY",
                "xDataControlName" : "grid"
              } ],
              "getPSControlHandler" : {
@@ -3457,30 +3457,6 @@
                  "mOSFilePath" : "pssysapps/Web/psappdataentities/Reginfo/psappdeuagroups/A046596b6afb50f9e5b",
                  "name" : "操作列",
                  "getPSUIActionGroupDetails" : [ {
-                    "detailType" : "DEUIACTION",
-                    "name" : "ua98d563",
-                    "getPSUIAction" : {
-                      "caption" : "行编辑",
-                      "codeName" : "ToggleRowEdit",
-                      "fullCodeName" : "ToggleRowEdit",
-                      "mOSFilePath" : "pssysapps/Web/pssysappdeuiactions/ToggleRowEdit",
-                      "name" : "表格界面_行编辑开关操作",
-                      "getPSSysImage" : {
-                        "glyph" : "xf0ce@FontAwesome",
-                        "cssClass" : "fa fa-table"
-                      },
-                      "predefinedType" : "GRIDVIEW_ROWEDITACTION",
-                      "rTMOSFilePath" : "pssysapps/Web/pssysappdeuiactions/ToggleRowEdit",
-                      "timeout" : 60000,
-                      "uIActionMode" : "SYS",
-                      "uIActionTag" : "ToggleRowEdit",
-                      "uIActionType" : "DEUIACTION",
-                      "enableToggleMode" : true
-                    },
-                    "addSeparator" : true,
-                    "showCaption" : true,
-                    "showIcon" : false
-                  }, {
                    "detailType" : "DEUIACTION",
                    "name" : "u479f517",
                    "getPSUIAction" : {
@@ -3514,6 +3490,30 @@
                    "addSeparator" : true,
                    "showCaption" : true,
                    "showIcon" : true
+                  }, {
+                    "detailType" : "DEUIACTION",
+                    "name" : "ua98d563",
+                    "getPSUIAction" : {
+                      "caption" : "行编辑",
+                      "codeName" : "ToggleRowEdit",
+                      "fullCodeName" : "ToggleRowEdit",
+                      "mOSFilePath" : "pssysapps/Web/pssysappdeuiactions/ToggleRowEdit",
+                      "name" : "表格界面_行编辑开关操作",
+                      "getPSSysImage" : {
+                        "glyph" : "xf0ce@FontAwesome",
+                        "cssClass" : "fa fa-table"
+                      },
+                      "predefinedType" : "GRIDVIEW_ROWEDITACTION",
+                      "rTMOSFilePath" : "pssysapps/Web/pssysappdeuiactions/ToggleRowEdit",
+                      "timeout" : 60000,
+                      "uIActionMode" : "SYS",
+                      "uIActionTag" : "ToggleRowEdit",
+                      "uIActionType" : "DEUIACTION",
+                      "enableToggleMode" : true
+                    },
+                    "addSeparator" : true,
+                    "showCaption" : true,
+                    "showIcon" : false
                  } ],
                  "rTMOSFilePath" : "pssysapps/Web/psappdataentities/Reginfo/psappdeuagroups/A046596b6afb50f9e5b",
                  "uniqueTag" : "Reginfo__A046596b6afb50f9e5b"

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/studentEditView.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/studentEditView.json
@@ -1682,34 +1682,34 @@
            "getPSAppViewLogics" : [ {
              "logicTrigger" : "CUSTOM",
              "logicType" : "APPVIEWUIACTION",
-              "name" : "grid_uagridcolumn1_ua98d563_click",
+              "name" : "grid_uagridcolumn1_u479f517_click",
              "getPSAppViewUIAction" : {
                "modelref" : true,
-                "id" : "表格界面_行编辑开关操作"
+                "id" : "表格界面_编辑操作"
              }
            }, {
              "logicTrigger" : "CUSTOM",
              "logicType" : "APPVIEWUIACTION",
-              "name" : "grid_uagridcolumn1_u479f517_click",
+              "name" : "grid_uagridcolumn1_ua98d563_click",
              "getPSAppViewUIAction" : {
                "modelref" : true,
-                "id" : "表格界面_编辑操作"
+                "id" : "表格界面_行编辑开关操作"
              }
            } ],
            "getPSAppViewUIActions" : [ {
-              "name" : "表格界面_行编辑开关操作",
+              "name" : "表格界面_编辑操作",
              "getPSUIAction" : {
                "modelref" : true,
-                "id" : "ToggleRowEdit"
+                "id" : "Edit"
              },
+              "uIActionTarget" : "SINGLEKEY",
              "xDataControlName" : "grid"
            }, {
-              "name" : "表格界面_编辑操作",
+              "name" : "表格界面_行编辑开关操作",
              "getPSUIAction" : {
                "modelref" : true,
-                "id" : "Edit"
+                "id" : "ToggleRowEdit"
              },
-              "uIActionTarget" : "SINGLEKEY",
              "xDataControlName" : "grid"
            } ],
            "getPSControlHandler" : {
@@ -1941,30 +1941,6 @@
                "mOSFilePath" : "pssysapps/Web/psappdataentities/Reginfo/psappdeuagroups/A046596b6afb50f9e5b",
                "name" : "操作列",
                "getPSUIActionGroupDetails" : [ {
-                  "detailType" : "DEUIACTION",
-                  "name" : "ua98d563",
-                  "getPSUIAction" : {
-                    "caption" : "行编辑",
-                    "codeName" : "ToggleRowEdit",
-                    "fullCodeName" : "ToggleRowEdit",
-                    "mOSFilePath" : "pssysapps/Web/pssysappdeuiactions/ToggleRowEdit",
-                    "name" : "表格界面_行编辑开关操作",
-                    "getPSSysImage" : {
-                      "glyph" : "xf0ce@FontAwesome",
-                      "cssClass" : "fa fa-table"
-                    },
-                    "predefinedType" : "GRIDVIEW_ROWEDITACTION",
-                    "rTMOSFilePath" : "pssysapps/Web/pssysappdeuiactions/ToggleRowEdit",
-                    "timeout" : 60000,
-                    "uIActionMode" : "SYS",
-                    "uIActionTag" : "ToggleRowEdit",
-                    "uIActionType" : "DEUIACTION",
-                    "enableToggleMode" : true
-                  },
-                  "addSeparator" : true,
-                  "showCaption" : true,
-                  "showIcon" : false
-                }, {
                  "detailType" : "DEUIACTION",
                  "name" : "u479f517",
                  "getPSUIAction" : {
@@ -1998,6 +1974,30 @@
                  "addSeparator" : true,
                  "showCaption" : true,
                  "showIcon" : true
+                }, {
+                  "detailType" : "DEUIACTION",
+                  "name" : "ua98d563",
+                  "getPSUIAction" : {
+                    "caption" : "行编辑",
+                    "codeName" : "ToggleRowEdit",
+                    "fullCodeName" : "ToggleRowEdit",
+                    "mOSFilePath" : "pssysapps/Web/pssysappdeuiactions/ToggleRowEdit",
+                    "name" : "表格界面_行编辑开关操作",
+                    "getPSSysImage" : {
+                      "glyph" : "xf0ce@FontAwesome",
+                      "cssClass" : "fa fa-table"
+                    },
+                    "predefinedType" : "GRIDVIEW_ROWEDITACTION",
+                    "rTMOSFilePath" : "pssysapps/Web/pssysappdeuiactions/ToggleRowEdit",
+                    "timeout" : 60000,
+                    "uIActionMode" : "SYS",
+                    "uIActionTag" : "ToggleRowEdit",
+                    "uIActionType" : "DEUIACTION",
+                    "enableToggleMode" : true
+                  },
+                  "addSeparator" : true,
+                  "showCaption" : true,
+                  "showIcon" : false
                } ],
                "rTMOSFilePath" : "pssysapps/Web/psappdataentities/Reginfo/psappdeuagroups/A046596b6afb50f9e5b",
                "uniqueTag" : "Reginfo__A046596b6afb50f9e5b"

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSSYSAPP.hubsubapp.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSSYSAPP.hubsubapp.json
@@ -5,30 +5,6 @@
    "mOSFilePath" : "pssysapps/Web/psappdataentities/Reginfo/psappdeuagroups/A046596b6afb50f9e5b",
    "name" : "操作列",
    "getPSUIActionGroupDetails" : [ {
-      "detailType" : "DEUIACTION",
-      "name" : "ua98d563",
-      "getPSUIAction" : {
-        "caption" : "行编辑",
-        "codeName" : "ToggleRowEdit",
-        "fullCodeName" : "ToggleRowEdit",
-        "mOSFilePath" : "pssysapps/Web/pssysappdeuiactions/ToggleRowEdit",
-        "name" : "表格界面_行编辑开关操作",
-        "getPSSysImage" : {
-          "glyph" : "xf0ce@FontAwesome",
-          "cssClass" : "fa fa-table"
-        },
-        "predefinedType" : "GRIDVIEW_ROWEDITACTION",
-        "rTMOSFilePath" : "pssysapps/Web/pssysappdeuiactions/ToggleRowEdit",
-        "timeout" : 60000,
-        "uIActionMode" : "SYS",
-        "uIActionTag" : "ToggleRowEdit",
-        "uIActionType" : "DEUIACTION",
-        "enableToggleMode" : true
-      },
-      "addSeparator" : true,
-      "showCaption" : true,
-      "showIcon" : false
-    }, {
      "detailType" : "DEUIACTION",
      "name" : "u479f517",
      "getPSUIAction" : {
@@ -62,6 +38,30 @@
      "addSeparator" : true,
      "showCaption" : true,
      "showIcon" : true
+    }, {
+      "detailType" : "DEUIACTION",
+      "name" : "ua98d563",
+      "getPSUIAction" : {
+        "caption" : "行编辑",
+        "codeName" : "ToggleRowEdit",
+        "fullCodeName" : "ToggleRowEdit",
+        "mOSFilePath" : "pssysapps/Web/pssysappdeuiactions/ToggleRowEdit",
+        "name" : "表格界面_行编辑开关操作",
+        "getPSSysImage" : {
+          "glyph" : "xf0ce@FontAwesome",
+          "cssClass" : "fa fa-table"
+        },
+        "predefinedType" : "GRIDVIEW_ROWEDITACTION",
+        "rTMOSFilePath" : "pssysapps/Web/pssysappdeuiactions/ToggleRowEdit",
+        "timeout" : 60000,
+        "uIActionMode" : "SYS",
+        "uIActionTag" : "ToggleRowEdit",
+        "uIActionType" : "DEUIACTION",
+        "enableToggleMode" : true
+      },
+      "addSeparator" : true,
+      "showCaption" : true,
+      "showIcon" : false
    } ],
    "rTMOSFilePath" : "pssysapps/Web/psappdataentities/Reginfo/psappdeuagroups/A046596b6afb50f9e5b",
    "uniqueTag" : "Reginfo__A046596b6afb50f9e5b"

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSSYSAPP.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSSYSAPP.json
@@ -9296,34 +9296,34 @@
        "getPSAppViewLogics" : [ {
          "logicTrigger" : "CUSTOM",
          "logicType" : "APPVIEWUIACTION",
-          "name" : "grid_uagridcolumn1_ua98d563_click",
+          "name" : "grid_uagridcolumn1_u479f517_click",
          "getPSAppViewUIAction" : {
            "modelref" : true,
-            "id" : "表格界面_行编辑开关操作"
+            "id" : "表格界面_编辑操作"
          }
        }, {
          "logicTrigger" : "CUSTOM",
          "logicType" : "APPVIEWUIACTION",
-          "name" : "grid_uagridcolumn1_u479f517_click",
+          "name" : "grid_uagridcolumn1_ua98d563_click",
          "getPSAppViewUIAction" : {
            "modelref" : true,
-            "id" : "表格界面_编辑操作"
+            "id" : "表格界面_行编辑开关操作"
          }
        } ],
        "getPSAppViewUIActions" : [ {
-          "name" : "表格界面_行编辑开关操作",
+          "name" : "表格界面_编辑操作",
          "getPSUIAction" : {
            "modelref" : true,
-            "id" : "ToggleRowEdit"
+            "id" : "Edit"
          },
+          "uIActionTarget" : "SINGLEKEY",
          "xDataControlName" : "grid"
        }, {
-          "name" : "表格界面_编辑操作",
+          "name" : "表格界面_行编辑开关操作",
          "getPSUIAction" : {
            "modelref" : true,
-            "id" : "Edit"
+            "id" : "ToggleRowEdit"
          },
-          "uIActionTarget" : "SINGLEKEY",
          "xDataControlName" : "grid"
        } ],
        "getPSControlHandler" : {
@@ -9555,30 +9555,6 @@
            "mOSFilePath" : "pssysapps/Web/psappdataentities/Reginfo/psappdeuagroups/A046596b6afb50f9e5b",
            "name" : "操作列",
            "getPSUIActionGroupDetails" : [ {
-              "detailType" : "DEUIACTION",
-              "name" : "ua98d563",
-              "getPSUIAction" : {
-                "caption" : "行编辑",
-                "codeName" : "ToggleRowEdit",
-                "fullCodeName" : "ToggleRowEdit",
-                "mOSFilePath" : "pssysapps/Web/pssysappdeuiactions/ToggleRowEdit",
-                "name" : "表格界面_行编辑开关操作",
-                "getPSSysImage" : {
-                  "glyph" : "xf0ce@FontAwesome",
-                  "cssClass" : "fa fa-table"
-                },
-                "predefinedType" : "GRIDVIEW_ROWEDITACTION",
-                "rTMOSFilePath" : "pssysapps/Web/pssysappdeuiactions/ToggleRowEdit",
-                "timeout" : 60000,
-                "uIActionMode" : "SYS",
-                "uIActionTag" : "ToggleRowEdit",
-                "uIActionType" : "DEUIACTION",
-                "enableToggleMode" : true
-              },
-              "addSeparator" : true,
-              "showCaption" : true,
-              "showIcon" : false
-            }, {
              "detailType" : "DEUIACTION",
              "name" : "u479f517",
              "getPSUIAction" : {
@@ -9612,6 +9588,30 @@
              "addSeparator" : true,
              "showCaption" : true,
              "showIcon" : true
+            }, {
+              "detailType" : "DEUIACTION",
+              "name" : "ua98d563",
+              "getPSUIAction" : {
+                "caption" : "行编辑",
+                "codeName" : "ToggleRowEdit",
+                "fullCodeName" : "ToggleRowEdit",
+                "mOSFilePath" : "pssysapps/Web/pssysappdeuiactions/ToggleRowEdit",
+                "name" : "表格界面_行编辑开关操作",
+                "getPSSysImage" : {
+                  "glyph" : "xf0ce@FontAwesome",
+                  "cssClass" : "fa fa-table"
+                },
+                "predefinedType" : "GRIDVIEW_ROWEDITACTION",
+                "rTMOSFilePath" : "pssysapps/Web/pssysappdeuiactions/ToggleRowEdit",
+                "timeout" : 60000,
+                "uIActionMode" : "SYS",
+                "uIActionTag" : "ToggleRowEdit",
+                "uIActionType" : "DEUIACTION",
+                "enableToggleMode" : true
+              },
+              "addSeparator" : true,
+              "showCaption" : true,
+              "showIcon" : false
            } ],
            "rTMOSFilePath" : "pssysapps/Web/psappdataentities/Reginfo/psappdeuagroups/A046596b6afb50f9e5b",
            "uniqueTag" : "Reginfo__A046596b6afb50f9e5b"
@@ -15318,34 +15318,34 @@
                  "getPSAppViewLogics" : [ {
                    "logicTrigger" : "CUSTOM",
                    "logicType" : "APPVIEWUIACTION",
-                    "name" : "grid_uagridcolumn1_ua98d563_click",
+                    "name" : "grid_uagridcolumn1_u479f517_click",
                    "getPSAppViewUIAction" : {
                      "modelref" : true,
-                      "id" : "表格界面_行编辑开关操作"
+                      "id" : "表格界面_编辑操作"
                    }
                  }, {
                    "logicTrigger" : "CUSTOM",
                    "logicType" : "APPVIEWUIACTION",
-                    "name" : "grid_uagridcolumn1_u479f517_click",
+                    "name" : "grid_uagridcolumn1_ua98d563_click",
                    "getPSAppViewUIAction" : {
                      "modelref" : true,
-                      "id" : "表格界面_编辑操作"
+                      "id" : "表格界面_行编辑开关操作"
                    }
                  } ],
                  "getPSAppViewUIActions" : [ {
-                    "name" : "表格界面_行编辑开关操作",
+                    "name" : "表格界面_编辑操作",
                    "getPSUIAction" : {
                      "modelref" : true,
-                      "id" : "ToggleRowEdit"
+                      "id" : "Edit"
                    },
+                    "uIActionTarget" : "SINGLEKEY",
                    "xDataControlName" : "grid"
                  }, {
-                    "name" : "表格界面_编辑操作",
+                    "name" : "表格界面_行编辑开关操作",
                    "getPSUIAction" : {
                      "modelref" : true,
-                      "id" : "Edit"
+                      "id" : "ToggleRowEdit"
                    },
-                    "uIActionTarget" : "SINGLEKEY",
                    "xDataControlName" : "grid"
                  } ],
                  "getPSControlHandler" : {
@@ -15577,30 +15577,6 @@
                      "mOSFilePath" : "pssysapps/Web/psappdataentities/Reginfo/psappdeuagroups/A046596b6afb50f9e5b",
                      "name" : "操作列",
                      "getPSUIActionGroupDetails" : [ {
-                        "detailType" : "DEUIACTION",
-                        "name" : "ua98d563",
-                        "getPSUIAction" : {
-                          "caption" : "行编辑",
-                          "codeName" : "ToggleRowEdit",
-                          "fullCodeName" : "ToggleRowEdit",
-                          "mOSFilePath" : "pssysapps/Web/pssysappdeuiactions/ToggleRowEdit",
-                          "name" : "表格界面_行编辑开关操作",
-                          "getPSSysImage" : {
-                            "glyph" : "xf0ce@FontAwesome",
-                            "cssClass" : "fa fa-table"
-                          },
-                          "predefinedType" : "GRIDVIEW_ROWEDITACTION",
-                          "rTMOSFilePath" : "pssysapps/Web/pssysappdeuiactions/ToggleRowEdit",
-                          "timeout" : 60000,
-                          "uIActionMode" : "SYS",
-                          "uIActionTag" : "ToggleRowEdit",
-                          "uIActionType" : "DEUIACTION",
-                          "enableToggleMode" : true
-                        },
-                        "addSeparator" : true,
-                        "showCaption" : true,
-                        "showIcon" : false
-                      }, {
                        "detailType" : "DEUIACTION",
                        "name" : "u479f517",
                        "getPSUIAction" : {
@@ -15634,6 +15610,30 @@
                        "addSeparator" : true,
                        "showCaption" : true,
                        "showIcon" : true
+                      }, {
+                        "detailType" : "DEUIACTION",
+                        "name" : "ua98d563",
+                        "getPSUIAction" : {
+                          "caption" : "行编辑",
+                          "codeName" : "ToggleRowEdit",
+                          "fullCodeName" : "ToggleRowEdit",
+                          "mOSFilePath" : "pssysapps/Web/pssysappdeuiactions/ToggleRowEdit",
+                          "name" : "表格界面_行编辑开关操作",
+                          "getPSSysImage" : {
+                            "glyph" : "xf0ce@FontAwesome",
+                            "cssClass" : "fa fa-table"
+                          },
+                          "predefinedType" : "GRIDVIEW_ROWEDITACTION",
+                          "rTMOSFilePath" : "pssysapps/Web/pssysappdeuiactions/ToggleRowEdit",
+                          "timeout" : 60000,
+                          "uIActionMode" : "SYS",
+                          "uIActionTag" : "ToggleRowEdit",
+                          "uIActionType" : "DEUIACTION",
+                          "enableToggleMode" : true
+                        },
+                        "addSeparator" : true,
+                        "showCaption" : true,
+                        "showIcon" : false
                      } ],
                      "rTMOSFilePath" : "pssysapps/Web/psappdataentities/Reginfo/psappdeuagroups/A046596b6afb50f9e5b",
                      "uniqueTag" : "Reginfo__A046596b6afb50f9e5b"