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

app_Web/src/app-register.ts

@@ -76,6 +76,7 @@ import {
   DataImport,
   DataExport,
   ImagePreview,
+  CodeList,
 } from './components/common';
 // 编辑器组件
 import {
@@ -180,6 +181,7 @@ export const AppRegister = {
     v.component('DataImport', DataImport);
     v.component('DataExport', DataExport);
     v.component('ImagePreview', ImagePreview);
+    v.component('CodeList', CodeList);
     // 注册编辑器组件
     v.component('GridEditor', GridEditor);
     v.component('IBizSpan', IBizSpan);

app_Web/src/components/common/code-list/code-list.scss

+@include b(code-list) {
+  @include e(item){
+    color: getCssVar('code-list','item-color');
+  }
+}
\ No newline at end of file

app_Web/src/components/common/code-list/code-list.tsx

+import { ref, watch, defineComponent } from 'vue';
+import { useNamespace } from '@ibiz-template/vue-util';
+import { isNil } from 'ramda';
+import './code-list.scss';
+
+export const CodeList = defineComponent({
+  props: {
+    codeListItems: {
+      type: Array<IData>,
+    },
+    codeList: {
+      type: Object,
+      required: true,
+    },
+    value: {
+      type: [String, Number],
+    },
+  },
+  setup(props) {
+    const ns = useNamespace('code-list');
+    const items = ref<IData[]>([]);
+
+    watch(
+      () => props.value,
+      (newVal, oldVal) => {
+        if (newVal !== oldVal) {
+          if (isNil(newVal) || newVal === '') {
+            // 空值置空
+            items.value = [];
+          } else {
+            // 非空值解析代码表
+            let values: string[] | number[];
+            if (typeof newVal === 'string') {
+              values = newVal.split(',');
+            } else {
+              values = [newVal];
+            }
+            items.value = values.map(val => {
+              const findItem = props.codeListItems?.find(
+                item => item.value === val,
+              );
+              return {
+                text: findItem?.text || val,
+                color: findItem?.color,
+              };
+            });
+          }
+        }
+      },
+      { immediate: true },
+    );
+
+    return { items, ns };
+  },
+  render() {
+    if (this.items.length === 0) {
+      return this.codeList.emptyText;
+    }
+    return (
+      <span class={this.ns.b()}>
+        {this.items.map((item, index) => {
+          return [
+            index !== 0 ? this.codeList?.textSeparator : null,
+            <span
+              class={this.ns.e('item')}
+              style={this.ns.cssVarBlock({
+                'item-color': `${item.color}`,
+              })}
+            >
+              {item.text}
+            </span>,
+          ];
+        })}
+      </span>
+    );
+  },
+});

app_Web/src/components/common/index.ts

@@ -17,6 +17,7 @@ export { ImagePreview } from './image-preview/image-preview';
 export { DataImport } from './data-import/data-import';
 export { DataExport } from './data-export/data-export';
 export { AppSelectTree } from '../common/app-select-tree/app-select-tree';
+export { CodeList } from '../common/code-list/code-list';
 
 export {
   AppIcon,

app_Web/src/components/widgets/grid-control/grid-field-column/grid-field-column.tsx

 import {
-  formatToCodeListText,
   GridFieldColumnController,
   GridRowController,
 } from '@ibiz-template/controller';
@@ -22,21 +21,7 @@ export const GridFieldColumn = defineComponent({
   setup(props) {
     const ns = useNamespace('grid-field-column');
 
-    // 代码表转换文本，如果不转换则为null
-    const codeListText = computed(() => {
-      // 非前台处理，不做值转换
-      if (props.controller.model.source.cLConvertMode !== 'FRONT') {
-        return null;
-      }
-      const fieldValue = props.row.data[props.controller.model.codeName];
-      if (props.controller.codeListItems?.length && fieldValue) {
-        return formatToCodeListText(
-          fieldValue,
-          props.controller.codeListItems!,
-        );
-      }
-      return null;
-    });
+    const codeList = props.controller.model.source.getPSAppCodeList();
 
     /**
      * 单元格点击事件
@@ -73,26 +58,30 @@ export const GridFieldColumn = defineComponent({
       return ns.cssVarBlock({ 'justify-content': justContent });
     });
 
-    const showText = computed(() => {
-      return (
-        codeListText.value || props.row.data[props.controller.model.codeName]
-      );
-    });
-
-    return { ns, alignStyle, showText, onCellClick };
+    return { ns, alignStyle, codeList, onCellClick };
   },
   render() {
     const c = this.controller;
+    const fieldValue = this.row.data[this.controller.model.codeName];
     return (
       <div
         class={[this.ns.b(), c.clickable && this.ns.m('clickable')]}
         style={this.alignStyle}
         onClick={this.onCellClick}
       >
+        {this.codeList ? (
+          <code-list
+            class={this.ns.e('text')}
+            codeListItems={c.codeListItems}
+            codeList={this.codeList}
+            value={fieldValue}
+          ></code-list>
+        ) : (
           <span class={this.ns.e('text')}>
-          {this.showText}
-          {this.showText && c.model.unitName}
+            {fieldValue}
+            {fieldValue && c.model.unitName}
           </span>
+        )}
       </div>
     );
   },

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSTEM.json

@@ -690,6 +690,13 @@
     "name" : "预置处理1",
     "rTMOSFilePath" : "pssysdelogicnodes/preLogic1"
   } ],
+  "getAllPSSysModelGroups" : [ {
+    "codeName" : "load",
+    "dynaModelFilePath" : "PSSYSMODELGROUPS/load.json",
+    "mOSFilePath" : "pssysmodelgroups/load",
+    "name" : "入驻",
+    "rTMOSFilePath" : "pssysmodelgroups/load"
+  } ],
   "getAllPSSysPDTViews" : [ {
     "caption" : "流程回退操作视图",
     "codeName" : "Auto6",