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

app_Web/index.html

@@ -4,7 +4,9 @@
     <meta charset="UTF-8" />
     <link rel="icon" type="image/svg+xml" href="/vite.svg" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <link type="text/css" href="/css/app-loading.css" rel="stylesheet">
+    <link type="text/css" href="/assets/css/app-loading.css" rel="stylesheet">
+    <link type="text/css" href="/assets/fontawesome/css/fontawesome.min.css" rel="stylesheet" />
+    <link type="text/css" href="/assets/fontawesome/css/solid.min.css" rel="stylesheet" />
     <script src="/environments/environment.js"></script>
     <script type="module" src="/assets/ionicons/ionicons/ionicons.esm.js"></script>
     <script nomodule="" src="/assets/ionicons/ionicons/ionicons.js"></script>

app_Web/package.json

@@ -11,13 +11,13 @@
     "lint:style": "stylelint 'src/**/*.scss'"
   },
   "dependencies": {
-    "@ibiz-template/command": "^0.0.1-alpha.2",
-    "@ibiz-template/controller": "^0.0.1-alpha.12",
-    "@ibiz-template/core": "^0.0.1-alpha.10",
-    "@ibiz-template/model": "^0.0.1-alpha.12",
-    "@ibiz-template/runtime": "^0.0.1-alpha.12",
-    "@ibiz-template/service": "^0.0.1-alpha.12",
-    "@ibiz-template/vue-util": "^0.0.1-alpha.12",
+    "@ibiz-template/command": "^0.0.1-alpha.13",
+    "@ibiz-template/controller": "^0.0.1-alpha.13",
+    "@ibiz-template/core": "^0.0.1-alpha.13",
+    "@ibiz-template/model": "^0.0.1-alpha.13",
+    "@ibiz-template/runtime": "^0.0.1-alpha.13",
+    "@ibiz-template/service": "^0.0.1-alpha.13",
+    "@ibiz-template/vue-util": "^0.0.1-alpha.13",
     "ionicons": "^6.0.3",
     "lodash-es": "^4.17.21",
     "pinia": "^2.0.22",
@@ -25,52 +25,53 @@
     "qs": "^6.11.0",
     "qx-util": "^0.4.1",
     "ramda": "^0.28.0",
-    "systemjs": "^6.12.6",
+    "systemjs": "^6.13.0",
     "view-design": "^4.7.0",
     "vue": "^2.7.10",
-    "vue-router": "^3.6.4"
+    "vue-router": "^3.6.4",
+    "dayjs": "^1.11.5"
   },
   "devDependencies": {
     "@commitlint/cli": "^17.1.2",
     "@commitlint/config-conventional": "^17.1.0",
     "@types/lodash-es": "^4.17.6",
-    "@types/node": "^18.7.18",
+    "@types/node": "^18.8.3",
     "@types/qs": "^6.9.7",
     "@types/ramda": "^0.28.15",
     "@types/systemjs": "^6.1.1",
-    "@typescript-eslint/eslint-plugin": "^5.38.0",
-    "@typescript-eslint/parser": "^5.38.0",
+    "@typescript-eslint/eslint-plugin": "^5.39.0",
+    "@typescript-eslint/parser": "^5.39.0",
     "@vitejs/plugin-legacy": "^2.2.0",
     "@vitejs/plugin-vue2": "^2.0.0",
     "@vitejs/plugin-vue2-jsx": "^1.0.3",
     "@vue/babel-helper-vue-jsx-merge-props": "^1.4.0",
-    "eslint": "^8.23.1",
+    "eslint": "^8.25.0",
     "eslint-config-airbnb-base": "^15.0.0",
     "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-import": "^2.26.0",
     "eslint-plugin-prettier": "^4.2.1",
-    "eslint-plugin-vue": "^9.5.1",
+    "eslint-plugin-vue": "^9.6.0",
     "husky": "^8.0.1",
     "lint-staged": "^13.0.3",
-    "postcss": "^8.4.16",
+    "postcss": "^8.4.17",
     "prettier": "^2.7.1",
-    "rollup-plugin-visualizer": "^5.8.1",
+    "rollup-plugin-visualizer": "^5.8.2",
     "sass": "^1.55.0",
-    "stylelint": "^14.12.1",
+    "stylelint": "^14.13.0",
     "stylelint-config-prettier": "^9.0.3",
     "stylelint-config-recess-order": "^3.0.0",
     "stylelint-config-standard": "^28.0.0",
     "stylelint-config-standard-scss": "^5.0.0",
     "stylelint-scss": "^4.3.0",
-    "terser": "^5.15.0",
-    "typescript": "^4.8.3",
-    "vite": "^3.1.3",
+    "terser": "^5.15.1",
+    "typescript": "^4.8.4",
+    "vite": "^3.1.6",
     "vite-plugin-eslint": "^1.8.1",
     "vue-eslint-parser": "^9.1.0",
-    "vue-tsc": "^0.40.13"
+    "vue-tsc": "^1.0.0"
   },
   "lint-staged": {
     "*.{ts,vue}": "eslint --fix",
     "*.less": "stylelint --syntax=scss"
   }
-}
+}
\ No newline at end of file

app_Web/public/assets/css/app-loading.css

+@charset "utf-8";
+
+.app-loading-x {
+    position: absolute;
+    top: 0;
+    left: 0;
+    z-index: 10000;
+    width: 100%;
+    height: 100%;
+    overflow: hidden;
+    background: radial-gradient(#55A0FE, #1767CB);
+}
+
+.app-loading-x-container {
+    position: absolute;
+    top: 50%;
+    width: 100%;
+    color: #fff;
+    text-align: center;
+    transform: translateY(-50%);
+}
+
+.app-loading-x-container label {
+    display: inline-block;
+    font-size: 20px;
+    opacity: 0;
+}
+
+.app-loading-x-container label:nth-child(6) {
+    animation: loading 3s infinite ease-in-out
+}
+
+.app-loading-x-container label:nth-child(5) {
+    animation: loading 3s .1s infinite ease-in-out
+}
+
+.app-loading-x-container label:nth-child(4) {
+    animation: loading 3s .2s infinite ease-in-out
+}
+
+.app-loading-x-container label:nth-child(3) {
+    animation: loading 3s .3s infinite ease-in-out
+}
+
+.app-loading-x-container label:nth-child(2) {
+    animation: loading 3s .4s infinite ease-in-out
+}
+
+.app-loading-x-container label:nth-child(1) {
+    animation: loading 3s .5s infinite ease-in-out
+}
+@keyframes loading{
+    0% {
+        opacity:0;
+        transform:translateX(-300px)
+    }
+
+    33% {
+        opacity:1;
+        transform:translateX(0)
+    }
+
+    66% {
+        opacity:1;
+        transform:translateX(0)
+    }
+
+    100% {opacity:0;
+        transform:translateX(300px)
+    }
+}
\ No newline at end of file

app_Web/public/assets/fontawesome/css/solid.min.css

+/*!
+ * Font Awesome Free 6.2.0 by @fontawesome - https://fontawesome.com
+ * License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License)
+ * Copyright 2022 Fonticons, Inc.
+ */
+:host,:root{--fa-style-family-classic:"Font Awesome 6 Free";--fa-font-solid:normal 900 1em/1 "Font Awesome 6 Free"}@font-face{font-family:"Font Awesome 6 Free";font-style:normal;font-weight:900;font-display:block;src:url(../webfonts/fa-solid-900.woff2) format("woff2"),url(../webfonts/fa-solid-900.ttf) format("truetype")}.fa-solid,.fas{font-weight:900}
\ No newline at end of file

app_Web/src/app-register.ts

@@ -45,6 +45,7 @@ import {
   WFDynaActionView,
   WFDynaEditView3,
   WFDynaStartView,
+  WFStepTraceView,
 } from './components/views';
 import { IndexView } from './views';
 import AppKeepAlive from './components/common/app-keep-alive/app-keep-alive.vue';
@@ -59,6 +60,7 @@ import {
   ActionToolbar,
   AppUser,
   AppTransition,
+  WfVersionSelect,
 } from './components/common';
 
 // 编辑器组件
@@ -107,6 +109,7 @@ export const AppRegister = {
     v.component('WFDynaActionView', WFDynaActionView);
     v.component('WFDynaStartView', WFDynaStartView);
     v.component('WFDynaEditView3', WFDynaEditView3);
+    v.component('WFStepTraceView', WFStepTraceView);
     // 注册部件组件
     v.component('AppMenu', AppMenu);
     v.component('GridControl', GridControl);
@@ -140,6 +143,7 @@ export const AppRegister = {
     v.component('AppGridEditItem', AppGridEditItem);
     v.component('AppUser', AppUser);
     v.component('AppTransition', AppTransition);
+    v.component('WfVersionSelect', WfVersionSelect);
     // 注册编辑器组件
     v.component('IBizSpan', IBizSpan);
     v.component('IBizInputBox', IBizInputBox);

app_Web/src/components/common/index.ts

@@ -8,6 +8,7 @@ import AppGridEditItem from './app-grid-edit-item/app-grid-edit-item';
 import { ActionToolbar } from './action-toolbar/action-toolbar';
 import { AppUser } from './app-user/app-user';
 import AppTransition from './app-transition/app-transition.vue';
+import { WfVersionSelect } from './wf-version-select/wf-version-select';
 
 export {
   AppIcon,
@@ -20,4 +21,5 @@ export {
   ActionToolbar,
   AppUser,
   AppTransition,
+  WfVersionSelect,
 };

app_Web/src/components/common/wf-version-select/wf-version-select.tsx

+import { defineComponent, ref, Ref } from 'vue';
+import { useNamespace } from '@ibiz-template/vue-util';
+import '@/styles/components/common/wf-version-select/wf-version-select.scss';
+
+export const WfVersionSelect = defineComponent({
+  name: 'WfVersionSelect',
+  props: {
+    versions: {
+      type: Array<IData>,
+      required: true,
+    },
+  },
+  setup(props, { emit }) {
+    const ns = useNamespace('wf-version-select');
+
+    const items: Ref<readonly IData[]> = ref([]);
+
+    if (props.versions?.length > 0) {
+      items.value = props.versions;
+    }
+
+    // 当前值
+    const curValue: Ref<string | number> = ref('');
+
+    const onOkButtonClick = () => {
+      emit('closeSelect', { ok: true, data: curValue.value });
+    };
+    const onCancelButtonClick = () => {
+      emit('closeSelect');
+    };
+
+    return { ns, curValue, items, onOkButtonClick, onCancelButtonClick };
+  },
+  render() {
+    return (
+      <div class={this.ns.b()}>
+        <i-select
+          v-model={this.curValue}
+          allow-clear
+          clearable
+          class={this.ns.e('dropdown-list')}
+          placeholder='请选择版本'
+        >
+          {this.items.map(item => {
+            return <i-option value={item.value}>{item.text}</i-option>;
+          })}
+        </i-select>
+        <div class={this.ns.b('buttons')}>
+          <i-button
+            on-click={() => {
+              this.onOkButtonClick();
+            }}
+          >
+            确定
+          </i-button>
+          <i-button
+            on-click={() => {
+              this.onCancelButtonClick();
+            }}
+          >
+            取消
+          </i-button>
+        </div>
+      </div>
+    );
+  },
+});

app_Web/src/components/editor/app-image-upload/app-image-upload.tsx

@@ -336,18 +336,18 @@ export default defineComponent({
             <div key={item.id} class={this.ns.e('list-item')}>
               <img src={item.url} />
               <div class={this.ns.e('list-item-cover')}>
-                <icon
+                <i-icon
                   type='ios-eye-outline'
                   on-click={() => this.onPreview(item)}
-                ></icon>
-                <icon
+                ></i-icon>
+                <i-icon
                   type='ios-download-outline'
                   on-click={() => this.onDownload(item)}
-                ></icon>
-                <icon
+                ></i-icon>
+                <i-icon
                   type='ios-trash-outline'
                   on-click={() => this.onRemove(item, this.files)}
-                ></icon>
+                ></i-icon>
               </div>
             </div>
           ))}

app_Web/src/components/editor/ibiz-span/ibiz-span.tsx

-import { defineComponent } from 'vue';
+import { ref, defineComponent, Ref, watch } from 'vue';
 import type { PropType } from 'vue';
 import { SpanEditorController } from '@ibiz-template/controller';
 import { useNamespace } from '@ibiz-template/vue-util';
 import '@/styles/components/editor/ibiz-span/ibiz-span.scss';
+import dayjs from 'dayjs';
 
 export default defineComponent({
   props: {
@@ -16,14 +17,34 @@ export default defineComponent({
       required: true,
     },
   },
-  setup() {
+  setup(props) {
     const ns = useNamespace('span');
+    const c = props.controller;
+
+    const text: Ref<string> = ref('');
+
+    watch(
+      () => props.value,
+      (newVal, oldVal) => {
+        if (newVal && newVal !== oldVal) {
+          if (c.valueFormat) {
+            text.value = dayjs(newVal).format(c.valueFormat);
+          } else {
+            text.value = newVal || '';
+          }
+          if (c.unitName) {
+            text.value += c.unitName;
+          }
+        }
+      },
+    );
 
     return {
       ns,
+      text,
     };
   },
   render() {
-    return <span class={this.ns.b()}>{this.value}</span>;
+    return <span class={this.ns.b()}>{this.text}</span>;
   },
 });

app_Web/src/components/views/index.ts

@@ -8,3 +8,4 @@ export * from './opt-view/opt-view';
 export * from './wf-dyna-action-view/wf-dyna-action-view';
 export * from './wf-dyna-edit-view3/wf-dyna-edit-view3';
 export * from './wf-dyna-start-view/wf-dyna-start-view';
+export * from './wf-step-trace-view/wf-step-trace-view';

app_Web/src/components/views/wf-dyna-action-view/wf-dyna-action-view.tsx

+import { ViewType } from '@ibiz-template/model';
 import { IModal } from '@ibiz-template/runtime';
-import { useWFDynaActionViewController } from '@ibiz-template/vue-util';
+import {
+  useNamespace,
+  useWFDynaActionViewController,
+} from '@ibiz-template/vue-util';
 import { defineComponent, getCurrentInstance, PropType } from 'vue';
+import '@/styles/components/views/wf-dyna-action-view/wf-dyna-action-view.scss';
 
 export const WFDynaActionView = defineComponent({
   props: {
@@ -12,11 +17,38 @@ export const WFDynaActionView = defineComponent({
   setup(props) {
     const { proxy } = getCurrentInstance()!;
     const c = useWFDynaActionViewController(proxy, props.modelPath);
-    return { c };
+    const ns = useNamespace(
+      `view-${ViewType.DE_WF_DYNA_ACTION_VIEW}`.toLowerCase(),
+    );
+    return { c, ns };
   },
   render() {
     return (
-      <view-base controller={this.c}>
+      <view-base
+        controller={this.c}
+        scopedSlots={{
+          footer: () => {
+            return (
+              <div class={this.ns.b('footer')}>
+                <i-button
+                  on-click={() => {
+                    this.c.onOkButtonClick();
+                  }}
+                >
+                  确定
+                </i-button>
+                <i-button
+                  on-click={() => {
+                    this.c.onCancelButtonClick();
+                  }}
+                >
+                  取消
+                </i-button>
+              </div>
+            );
+          },
+        }}
+      >
         {this.c.complete && (
           <edit-form-control
             modelData={this.c.model.forms.get('form')}

app_Web/src/components/views/wf-dyna-edit-view3/wf-dyna-edit-view3.tsx

@@ -4,6 +4,7 @@ import {
   useNamespace,
 } from '@ibiz-template/vue-util';
 import { defineComponent, getCurrentInstance, PropType } from 'vue';
+import { ViewType } from '@ibiz-template/model';
 import { getViewComponentName } from '@/util';
 
 export const WFDynaEditView3 = defineComponent({
@@ -16,7 +17,9 @@ export const WFDynaEditView3 = defineComponent({
   setup(props) {
     const { proxy } = getCurrentInstance()!;
     const c = useWFDynaEditView3Controller(proxy, props.modelPath);
-    const ns = useNamespace('view-dewfdynaeditview3');
+    const ns = useNamespace(
+      `view-${ViewType.DE_WF_DYNA_EDIT_VIEW3}`.toLowerCase(),
+    );
     return { c, ns };
   },
   render(h) {
@@ -33,12 +36,15 @@ export const WFDynaEditView3 = defineComponent({
               label={this.c.model.drTab.source.editItemCaption}
               name={'mainForm'}
             >
-              <edit-form-control
-                modelData={this.c.model.forms.get('form')}
-                context={this.c.context}
-                params={this.c.params}
-                on-neuronInit={this.c.nerve.onNeuronInit('form')}
-              ></edit-form-control>
+              {this.c.activeForm && (
+                <edit-form-control
+                  key={this.c.activeForm.id}
+                  modelData={this.c.activeForm}
+                  context={this.c.context}
+                  params={this.c.params}
+                  on-neuronInit={this.c.nerve.onNeuronInit('form')}
+                ></edit-form-control>
+              )}
             </i-tab-pane>
             {[...this.c.model.drTab.pages.values()].map(page => {
               return (
@@ -56,6 +62,7 @@ export const WFDynaEditView3 = defineComponent({
                         params: this.c.drPages[page.source.name].params,
                         modal: this.modal,
                         modelPath: page.embedView.source.modelPath,
+                        deName: this.c.model.appEntity.source.codeName,
                       },
                       on: {
                         neuronInit: this.c.nerve.onNeuronInit(page.source.name),

app_Web/src/components/views/wf-dyna-start-view/wf-dyna-start-view.tsx

+import { ViewType } from '@ibiz-template/model';
 import { IModal } from '@ibiz-template/runtime';
-import { useWFDynaStartViewController } from '@ibiz-template/vue-util';
+import {
+  useNamespace,
+  useWFDynaStartViewController,
+} from '@ibiz-template/vue-util';
 import { defineComponent, getCurrentInstance, PropType } from 'vue';
+import '@/styles/components/views/wf-dyna-start-view/wf-dyna-start-view.scss';
 
 export const WFDynaStartView = defineComponent({
   props: {
@@ -12,11 +17,38 @@ export const WFDynaStartView = defineComponent({
   setup(props) {
     const { proxy } = getCurrentInstance()!;
     const c = useWFDynaStartViewController(proxy, props.modelPath);
-    return { c };
+    const ns = useNamespace(
+      `view-${ViewType.DE_WF_DYNA_START_VIEW}`.toLowerCase(),
+    );
+    return { c, ns };
   },
   render() {
     return (
-      <view-base controller={this.c}>
+      <view-base
+        controller={this.c}
+        scopedSlots={{
+          footer: () => {
+            return (
+              <div class={this.ns.b('footer')}>
+                <i-button
+                  on-click={() => {
+                    this.c.onOkButtonClick();
+                  }}
+                >
+                  确定
+                </i-button>
+                <i-button
+                  on-click={() => {
+                    this.c.onCancelButtonClick();
+                  }}
+                >
+                  取消
+                </i-button>
+              </div>
+            );
+          },
+        }}
+      >
         {this.c.complete && (
           <edit-form-control
             modelData={this.c.model.forms.get('form')}

app_Web/src/components/views/wf-step-trace-view/wf-step-trace-view.tsx

+import { IModal } from '@ibiz-template/runtime';
+import {
+  usePropsWatch,
+  useWFStepTraceViewController,
+} from '@ibiz-template/vue-util';
+import { defineComponent, getCurrentInstance, PropType } from 'vue';
+
+export const WFStepTraceView = defineComponent({
+  props: {
+    context: Object as PropType<IContext>,
+    params: { type: Object as PropType<IParams> },
+    modelPath: { type: String, required: true },
+    modal: { type: Object as PropType<IModal> },
+    deName: { type: String, required: true },
+  },
+  setup(props) {
+    const { proxy } = getCurrentInstance()!;
+    const c = useWFStepTraceViewController(proxy, props.modelPath);
+    // 监听prop，并响应式更新到controller
+    usePropsWatch(proxy, 'deName', c.setDeName.bind(c));
+
+    return { c };
+  },
+  render() {
+    return <view-base controller={this.c}>审批日志</view-base>;
+  },
+});

app_Web/src/components/widgets/form-control/form-button/form-button.tsx

@@ -25,7 +25,12 @@ export const FormButton = defineComponent({
       return null;
     }
     return (
-      <i-button class={this.ns.b()}>{this.modelData.source.caption}</i-button>
+      <i-button
+        onClick={this.controller.onClick.bind(this.controller)}
+        class={this.ns.b()}
+      >
+        {this.modelData.source.caption}
+      </i-button>
     );
   },
 });

app_Web/src/styles/components/common/wf-version-select/wf-version-select.scss

+@include b(wf-version-select) {
+  @include set-component-css-var('wf-version-select', $wf-version-select);
+
+  padding: getCssVar('wf-version-select', 'padding');
+  @include b(wf-version-select-buttons) {
+    @include flex(row, flex-end, center);
+    @include set-component-css-var(
+      'wf-version-select-buttons',
+      $wf-version-select-buttons
+    );
+
+    padding: getCssVar('wf-version-select-buttons', 'padding');
+    border-top: getCssVar('wf-version-select-buttons', 'border-top');
+
+    .ivu-btn:nth-child(1) {
+      color: getCssVar('wf-version-select-buttons', 'confirm-btn-color');
+      background-color: getCssVar(
+        'wf-version-select-buttons',
+        'confirm-btn-bg-color'
+      );
+    }
+
+    .ivu-btn:nth-child(2) {
+      margin: getCssVar('wf-version-select-buttons', 'btn-margin');
+    }
+  }
+}

app_Web/src/styles/components/editor/ibiz-date-picker/ibiz-date-picker.scss

 @include b('date-picker') {
+  .ivu-date-picker {
+    width: 100%;
+  }
+
   input {
     height: getCssVar('form-item', 'line-height');
     font-family: getCssVar('form-item', 'font-family');

app_Web/src/styles/components/util/modal/modal.scss

@@ -14,6 +14,7 @@
 
     .ivu-modal-body {
       flex-grow: 1;
+      height: 100%;
       padding: 0;
     }
   }

app_Web/src/styles/components/views/wf-dyna-action-view/wf-dyna-action-view.scss

+@include b(view-dewfdynaactionview-footer) {
+  @include set-component-css-var(
+    'wf-dyna-action-view-footer',
+    $wf-dyna-action-view-footer
+  );
+  @include flex(row, flex-end);
+
+  padding: getCssVar('wf-dyna-action-view-footer', 'padding');
+  border-top: getCssVar('wf-dyna-action-view-footer', 'border-top');
+
+  .ivu-btn:nth-child(1) {
+    color: getCssVar('wf-dyna-action-view-footer', 'confirm-btn-color');
+    background-color: getCssVar(
+      'wf-dyna-action-view-footer',
+      'confirm-btn-bg-color'
+    );
+  }
+
+  .ivu-btn:nth-child(2) {
+    margin: getCssVar('wf-dyna-action-view-footer', 'btn-margin');
+  }
+}

app_Web/src/styles/components/views/wf-dyna-start-view/wf-dyna-start-view.scss

+@include b(view-dewfdynastartview-footer) {
+  @include set-component-css-var('wf-dyna-start-view-footer', $wf-dyna-start-view-footer);
+  @include flex(row, flex-end);
+
+  padding: getCssVar('wf-dyna-start-view-footer', 'padding');
+  border-top: getCssVar('wf-dyna-start-view-footer', 'border-top');
+
+  .ivu-btn:nth-child(1) {
+    color: getCssVar('wf-dyna-start-view-footer', 'confirm-btn-color');
+    background-color: getCssVar('wf-dyna-start-view-footer', 'confirm-btn-bg-color');
+  }
+
+  .ivu-btn:nth-child(2) {
+    margin: getCssVar('wf-dyna-start-view-footer', 'btn-margin');
+  }
+}

app_Web/src/styles/settings/var.scss

@@ -277,9 +277,8 @@ $skeleton: map.merge(
   (
     'bg-color': rgb(190 190 190 / 20%),
     // 骨架屏元素背景颜色
-    'transition-color': rgb(
-        129 129 129 / 24%
-      ) // 骨架屏元素动画效果过渡颜色,,,,,
+    'transition-color': rgb(129 129 129 / 24%)
+      // 骨架屏元素动画效果过渡颜色,,,,,,,,,,,
   ),
   $skeleton
 );
@@ -752,3 +751,75 @@ $search-form-buttons: map.merge(
 );
 
 /* 搜索表单 end */
+
+/* 工作流动态启动视图 start */
+$wf-dyna-start-view-footer: () !default;
+$wf-dyna-start-view-footer: map.merge(
+  (
+    'padding': 12px 16px,
+    'border-top': 1px solid #e8eaec,
+    'btn-margin': 0 0 0 10px,
+    'confirm-btn-bg-color': #2e8cf0,
+    'confirm-btn-color': #fff,
+  ),
+  $wf-dyna-start-view-footer
+);
+
+/* 工作流动态启动视图 end */
+
+/* 工作流动态操作视图 start */
+$wf-dyna-action-view-footer: () !default;
+$wf-dyna-action-view-footer: map.merge(
+  (
+    'padding': 12px 16px,
+    'border-top': 1px solid #e8eaec,
+    'btn-margin': 0 0 0 10px,
+    'confirm-btn-bg-color': #2e8cf0,
+    'confirm-btn-color': #fff,
+  ),
+  $wf-dyna-action-view-footer
+);
+
+/* 工作流动态操作视图 end */
+
+// app-image-upload 图片上传备用
+// $app-image-upload: () !default;
+// $app-image-upload: map.merge(
+//   (
+//     'box-width': 120px,
+//     'box-height': 120px,
+//     'list-item-margin': 5px,
+//     'list-item-bg-color': getCssVar('bg-color'),
+//     'list-item-border': 1px solid getCssVar('border-color-light'),
+//     'list-item-border-radius': getCssVar('border-radius-base'),
+//     'list-item-box-shadow': getCssVar('box-shadow'),
+//     'list-item-cover-bg-color': rgb(0 0 0 / 60%),
+//     'list-item-cover-i-color': getCssVar('color-white'),
+//     'list-item-cover-i-size': getCssVar('font-size-extra-large'),
+//     'list-item-cover-i-margin': 0 2px,
+//   ),
+//   $app-image-upload
+// );
+
+/* 流程版本选择组件 start */
+$wf-version-select: () !default;
+$wf-version-select: map.merge(
+  (
+    'padding': 50px 16px 0,
+  ),
+  $wf-version-select
+);
+
+$wf-version-select-buttons: () !default;
+$wf-version-select-buttons: map.merge(
+  (
+    'padding': 12px 0,
+    'border-top': 1px solid #e8eaec,
+    'btn-margin': 0 0 0 10px,
+    'confirm-btn-bg-color': #2e8cf0,
+    'confirm-btn-color': #fff,
+  ),
+  $wf-version-select-buttons
+);
+
+/* 流程版本选择组件 end */

app_Web/src/util/component-name/view/get-view-component.ts

@@ -35,6 +35,8 @@ export function getViewComponentName(viewType: string) {
       return 'WFDynaStartView';
     case ViewType.DE_WF_DYNA_ACTION_VIEW:
       return 'WFDynaActionView';
+    case ViewType.APP_WF_STEP_TRACE_VIEW:
+      return 'WFStepTraceView';
     default:
       return '';
   }

app_Web/src/util/index.ts

@@ -5,3 +5,5 @@ export { NotificationUtil } from './notification-util/notification-util';
 export { OpenViewUtil } from './open-view-util/open-view-util';
 export { ErrorHandler } from './error-handler/error-handler';
 export * from './component-name';
+export { AppModal } from './open-view-util/app-modal/app-modal';
+export { AppDrawer } from './open-view-util/app-drawer/app-drawer';

app_Web/src/util/open-view-util/app-drawer/app-drawer-component.tsx

@@ -9,6 +9,7 @@ import {
 import { useNamespace } from '@ibiz-template/vue-util';
 import '@/styles/components/util/drawer/drawer.scss';
 import { ViewNeuron } from '@ibiz-template/controller';
+import { isNumber } from 'lodash-es';
 import { IModal, IModalData, ViewMode } from '@ibiz-template/runtime';
 import { AppDrawerOptions } from '@/interface';
 import { useUIStore } from '@/store';
@@ -34,9 +35,14 @@ export const AppDrawerComponent = defineComponent({
     const drawerZIndex = zIndex.increment();
 
     // 处理自定义样式
-    const customStyle = reactive<IData>({
-      [ns.cssVarBlockName('z-index')]: drawerZIndex,
-    });
+    const customStyle = reactive<IData>({});
+    const { width, height } = props.opts;
+    if (width) {
+      customStyle.width = isNumber(width) ? `${width}px` : width;
+    }
+    if (height) {
+      customStyle.height = isNumber(height) ? `${height}px` : height;
+    }
 
     // 执行抽屉关闭操作
     const doDrawerClose = () => {
@@ -80,6 +86,7 @@ export const AppDrawerComponent = defineComponent({
       ns,
       modal,
       isShow,
+      drawerZIndex,
       customStyle,
       drawerCaption,
       onNeuronInit,
@@ -96,7 +103,8 @@ export const AppDrawerComponent = defineComponent({
         width={this.opts.width}
         height={this.opts.height}
         class={[this.ns.b()]}
-        style={this.customStyle}
+        style={{ [this.ns.cssVarBlockName('z-index')]: this.drawerZIndex }}
+        styles={this.customStyle}
         placement={this.opts.placement || 'right'}
         on-on-visible-change={this.onVisibleChange}
       >

app_Web/src/util/open-view-util/app-modal/app-modal-component.tsx

@@ -44,6 +44,12 @@ export const AppModalComponent = defineComponent({
       customStyle.height = isNumber(height) ? `${height}px` : height;
     }
 
+    // 合并options
+    const options = ref({ footerHide: true });
+    if (props.opts) {
+      Object.assign(options.value, props.opts);
+    }
+
     // 执行模态关闭操作
     const doModalClose = () => {
       setTimeout(() => {
@@ -76,6 +82,11 @@ export const AppModalComponent = defineComponent({
       });
     };
 
+    const closeSelect = (res: IModalData) => {
+      props.resolve(res);
+      doModalClose();
+    };
+
     onMounted(() => {
       isShow.value = true;
     });
@@ -84,11 +95,13 @@ export const AppModalComponent = defineComponent({
       ns,
       modal,
       isShow,
+      options,
       modalZIndex,
       customStyle,
       modalCaption,
       onNeuronInit,
       onVisibleChange,
+      closeSelect,
     };
   },
   render(h) {
@@ -101,7 +114,7 @@ export const AppModalComponent = defineComponent({
         class={[this.ns.b()]}
         style={{ [this.ns.cssVarBlockName('z-index')]: this.modalZIndex }}
         styles={this.customStyle}
-        footer-hide={this.opts.footerHide}
+        footer-hide={this.options.footerHide}
         on-on-visible-change={this.onVisibleChange}
       >
         {h(this.componentName, {
@@ -111,6 +124,7 @@ export const AppModalComponent = defineComponent({
           },
           on: {
             neuronInit: this.onNeuronInit,
+            closeSelect: this.closeSelect,
           },
         })}
       </i-modal>

app_Web/src/views/app-redirect-view/app-redirect-view.tsx

-import { defineComponent } from 'vue';
+import { defineComponent, onMounted } from 'vue';
 import qs from 'qs';
 import { getModelService } from '@ibiz-template/model';
 import { IBizContext, RuntimeError } from '@ibiz-template/core';
@@ -71,6 +71,13 @@ export default defineComponent({
       );
     }
 
+    onMounted(() => {
+      const el = document.querySelector('.app-loading-x') as HTMLDivElement;
+      if (el) {
+        el.style.display = 'block';
+      }
+    });
+
     toRedirect();
   },
   render() {

app_Web/src/views/login-view/login-view.tsx

@@ -112,6 +112,7 @@ export default defineComponent({
                       const { value } = evt.target as HTMLInputElement;
                       loginData.username = value;
                     }}
+                    on-on-enter={onClick}
                     placeholder='请输入账号'
                     size='large'
                   >
@@ -126,6 +127,7 @@ export default defineComponent({
                       const { value } = evt.target as HTMLInputElement;
                       loginData.password = value;
                     }}
+                    on-on-enter={onClick}
                     placeholder='请输入密码'
                     size='large'
                     password

pom.xml

@@ -25,7 +25,7 @@
     </modules>
 
     <properties>
-        <ibiz.cloud.version>8.1.0.204</ibiz.cloud.version>
+        <ibiz.cloud.version>8.1.0.220</ibiz.cloud.version>
     </properties>
 
 

trainsys-core/src/main/resources/liquibase/h2_table.xml

@@ -50,7 +50,7 @@
     </changeSet>
 
     <!--输出实体[BOOK]数据结构 -->
-    <changeSet author="root" id="tab-book-265-3">
+    <changeSet author="root" id="tab-book-266-3">
         <createTable tableName="T_BOOK">
                 <column name="BOOKNAME" remarks="" type="VARCHAR(200)">
                 </column>

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Book/PSFORMS/EditorTest.json

@@ -1787,34 +1787,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" : {
@@ -2032,28 +2032,6 @@
                 "codeName" : "A046596b6afb50f9e5b",
                 "name" : "操作列",
                 "getPSUIActionGroupDetails" : [ {
-                  "detailType" : "DEUIACTION",
-                  "name" : "ua98d563",
-                  "getPSUIAction" : {
-                    "caption" : "行编辑",
-                    "codeName" : "ToggleRowEdit",
-                    "fullCodeName" : "ToggleRowEdit",
-                    "name" : "表格界面_行编辑开关操作",
-                    "getPSSysImage" : {
-                      "glyph" : "xf0ce@FontAwesome",
-                      "cssClass" : "fa fa-table"
-                    },
-                    "predefinedType" : "GRIDVIEW_ROWEDITACTION",
-                    "timeout" : 60000,
-                    "uIActionMode" : "SYS",
-                    "uIActionTag" : "ToggleRowEdit",
-                    "uIActionType" : "DEUIACTION",
-                    "enableToggleMode" : true
-                  },
-                  "addSeparator" : false,
-                  "showCaption" : true,
-                  "showIcon" : false
-                }, {
                   "detailType" : "DEUIACTION",
                   "name" : "u479f517",
                   "getPSUIAction" : {
@@ -2081,6 +2059,28 @@
                   "addSeparator" : true,
                   "showCaption" : true,
                   "showIcon" : true
+                }, {
+                  "detailType" : "DEUIACTION",
+                  "name" : "ua98d563",
+                  "getPSUIAction" : {
+                    "caption" : "行编辑",
+                    "codeName" : "ToggleRowEdit",
+                    "fullCodeName" : "ToggleRowEdit",
+                    "name" : "表格界面_行编辑开关操作",
+                    "getPSSysImage" : {
+                      "glyph" : "xf0ce@FontAwesome",
+                      "cssClass" : "fa fa-table"
+                    },
+                    "predefinedType" : "GRIDVIEW_ROWEDITACTION",
+                    "timeout" : 60000,
+                    "uIActionMode" : "SYS",
+                    "uIActionTag" : "ToggleRowEdit",
+                    "uIActionType" : "DEUIACTION",
+                    "enableToggleMode" : true
+                  },
+                  "addSeparator" : false,
+                  "showCaption" : true,
+                  "showIcon" : false
                 } ]
               },
               "width" : 100,

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo/PSGRIDS/Main.json

@@ -18,34 +18,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" : [ {
@@ -176,28 +176,6 @@
       "codeName" : "A046596b6afb50f9e5b",
       "name" : "操作列",
       "getPSUIActionGroupDetails" : [ {
-        "detailType" : "DEUIACTION",
-        "name" : "ua98d563",
-        "getPSUIAction" : {
-          "caption" : "行编辑",
-          "codeName" : "ToggleRowEdit",
-          "fullCodeName" : "ToggleRowEdit",
-          "name" : "表格界面_行编辑开关操作",
-          "getPSSysImage" : {
-            "glyph" : "xf0ce@FontAwesome",
-            "cssClass" : "fa fa-table"
-          },
-          "predefinedType" : "GRIDVIEW_ROWEDITACTION",
-          "timeout" : 60000,
-          "uIActionMode" : "SYS",
-          "uIActionTag" : "ToggleRowEdit",
-          "uIActionType" : "DEUIACTION",
-          "enableToggleMode" : true
-        },
-        "addSeparator" : false,
-        "showCaption" : true,
-        "showIcon" : false
-      }, {
         "detailType" : "DEUIACTION",
         "name" : "u479f517",
         "getPSUIAction" : {
@@ -225,6 +203,28 @@
         "addSeparator" : true,
         "showCaption" : true,
         "showIcon" : true
+      }, {
+        "detailType" : "DEUIACTION",
+        "name" : "ua98d563",
+        "getPSUIAction" : {
+          "caption" : "行编辑",
+          "codeName" : "ToggleRowEdit",
+          "fullCodeName" : "ToggleRowEdit",
+          "name" : "表格界面_行编辑开关操作",
+          "getPSSysImage" : {
+            "glyph" : "xf0ce@FontAwesome",
+            "cssClass" : "fa fa-table"
+          },
+          "predefinedType" : "GRIDVIEW_ROWEDITACTION",
+          "timeout" : 60000,
+          "uIActionMode" : "SYS",
+          "uIActionTag" : "ToggleRowEdit",
+          "uIActionType" : "DEUIACTION",
+          "enableToggleMode" : true
+        },
+        "addSeparator" : false,
+        "showCaption" : true,
+        "showIcon" : false
       } ]
     },
     "width" : 100,

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Student/PSFORMS/Main.json

@@ -580,34 +580,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" : {
@@ -825,28 +825,6 @@
               "codeName" : "A046596b6afb50f9e5b",
               "name" : "操作列",
               "getPSUIActionGroupDetails" : [ {
-                "detailType" : "DEUIACTION",
-                "name" : "ua98d563",
-                "getPSUIAction" : {
-                  "caption" : "行编辑",
-                  "codeName" : "ToggleRowEdit",
-                  "fullCodeName" : "ToggleRowEdit",
-                  "name" : "表格界面_行编辑开关操作",
-                  "getPSSysImage" : {
-                    "glyph" : "xf0ce@FontAwesome",
-                    "cssClass" : "fa fa-table"
-                  },
-                  "predefinedType" : "GRIDVIEW_ROWEDITACTION",
-                  "timeout" : 60000,
-                  "uIActionMode" : "SYS",
-                  "uIActionTag" : "ToggleRowEdit",
-                  "uIActionType" : "DEUIACTION",
-                  "enableToggleMode" : true
-                },
-                "addSeparator" : false,
-                "showCaption" : true,
-                "showIcon" : false
-              }, {
                 "detailType" : "DEUIACTION",
                 "name" : "u479f517",
                 "getPSUIAction" : {
@@ -874,6 +852,28 @@
                 "addSeparator" : true,
                 "showCaption" : true,
                 "showIcon" : true
+              }, {
+                "detailType" : "DEUIACTION",
+                "name" : "ua98d563",
+                "getPSUIAction" : {
+                  "caption" : "行编辑",
+                  "codeName" : "ToggleRowEdit",
+                  "fullCodeName" : "ToggleRowEdit",
+                  "name" : "表格界面_行编辑开关操作",
+                  "getPSSysImage" : {
+                    "glyph" : "xf0ce@FontAwesome",
+                    "cssClass" : "fa fa-table"
+                  },
+                  "predefinedType" : "GRIDVIEW_ROWEDITACTION",
+                  "timeout" : 60000,
+                  "uIActionMode" : "SYS",
+                  "uIActionTag" : "ToggleRowEdit",
+                  "uIActionType" : "DEUIACTION",
+                  "enableToggleMode" : true
+                },
+                "addSeparator" : false,
+                "showCaption" : true,
+                "showIcon" : false
               } ]
             },
             "width" : 100,

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/ReginfoGridView.json

@@ -373,34 +373,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" : {
@@ -618,28 +618,6 @@
         "codeName" : "A046596b6afb50f9e5b",
         "name" : "操作列",
         "getPSUIActionGroupDetails" : [ {
-          "detailType" : "DEUIACTION",
-          "name" : "ua98d563",
-          "getPSUIAction" : {
-            "caption" : "行编辑",
-            "codeName" : "ToggleRowEdit",
-            "fullCodeName" : "ToggleRowEdit",
-            "name" : "表格界面_行编辑开关操作",
-            "getPSSysImage" : {
-              "glyph" : "xf0ce@FontAwesome",
-              "cssClass" : "fa fa-table"
-            },
-            "predefinedType" : "GRIDVIEW_ROWEDITACTION",
-            "timeout" : 60000,
-            "uIActionMode" : "SYS",
-            "uIActionTag" : "ToggleRowEdit",
-            "uIActionType" : "DEUIACTION",
-            "enableToggleMode" : true
-          },
-          "addSeparator" : false,
-          "showCaption" : true,
-          "showIcon" : false
-        }, {
           "detailType" : "DEUIACTION",
           "name" : "u479f517",
           "getPSUIAction" : {
@@ -667,6 +645,28 @@
           "addSeparator" : true,
           "showCaption" : true,
           "showIcon" : true
+        }, {
+          "detailType" : "DEUIACTION",
+          "name" : "ua98d563",
+          "getPSUIAction" : {
+            "caption" : "行编辑",
+            "codeName" : "ToggleRowEdit",
+            "fullCodeName" : "ToggleRowEdit",
+            "name" : "表格界面_行编辑开关操作",
+            "getPSSysImage" : {
+              "glyph" : "xf0ce@FontAwesome",
+              "cssClass" : "fa fa-table"
+            },
+            "predefinedType" : "GRIDVIEW_ROWEDITACTION",
+            "timeout" : 60000,
+            "uIActionMode" : "SYS",
+            "uIActionTag" : "ToggleRowEdit",
+            "uIActionType" : "DEUIACTION",
+            "enableToggleMode" : true
+          },
+          "addSeparator" : false,
+          "showCaption" : true,
+          "showIcon" : false
         } ]
       },
       "width" : 100,

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/ReginfoStuInfoList.json

@@ -425,34 +425,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" : {
@@ -670,28 +670,6 @@
         "codeName" : "A046596b6afb50f9e5b",
         "name" : "操作列",
         "getPSUIActionGroupDetails" : [ {
-          "detailType" : "DEUIACTION",
-          "name" : "ua98d563",
-          "getPSUIAction" : {
-            "caption" : "行编辑",
-            "codeName" : "ToggleRowEdit",
-            "fullCodeName" : "ToggleRowEdit",
-            "name" : "表格界面_行编辑开关操作",
-            "getPSSysImage" : {
-              "glyph" : "xf0ce@FontAwesome",
-              "cssClass" : "fa fa-table"
-            },
-            "predefinedType" : "GRIDVIEW_ROWEDITACTION",
-            "timeout" : 60000,
-            "uIActionMode" : "SYS",
-            "uIActionTag" : "ToggleRowEdit",
-            "uIActionType" : "DEUIACTION",
-            "enableToggleMode" : true
-          },
-          "addSeparator" : false,
-          "showCaption" : true,
-          "showIcon" : false
-        }, {
           "detailType" : "DEUIACTION",
           "name" : "u479f517",
           "getPSUIAction" : {
@@ -719,6 +697,28 @@
           "addSeparator" : true,
           "showCaption" : true,
           "showIcon" : true
+        }, {
+          "detailType" : "DEUIACTION",
+          "name" : "ua98d563",
+          "getPSUIAction" : {
+            "caption" : "行编辑",
+            "codeName" : "ToggleRowEdit",
+            "fullCodeName" : "ToggleRowEdit",
+            "name" : "表格界面_行编辑开关操作",
+            "getPSSysImage" : {
+              "glyph" : "xf0ce@FontAwesome",
+              "cssClass" : "fa fa-table"
+            },
+            "predefinedType" : "GRIDVIEW_ROWEDITACTION",
+            "timeout" : 60000,
+            "uIActionMode" : "SYS",
+            "uIActionTag" : "ToggleRowEdit",
+            "uIActionType" : "DEUIACTION",
+            "enableToggleMode" : true
+          },
+          "addSeparator" : false,
+          "showCaption" : true,
+          "showIcon" : false
         } ]
       },
       "width" : 100,

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/bookBookEditViewEditorTest.json

@@ -1924,34 +1924,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" : {
@@ -2169,28 +2169,6 @@
                   "codeName" : "A046596b6afb50f9e5b",
                   "name" : "操作列",
                   "getPSUIActionGroupDetails" : [ {
-                    "detailType" : "DEUIACTION",
-                    "name" : "ua98d563",
-                    "getPSUIAction" : {
-                      "caption" : "行编辑",
-                      "codeName" : "ToggleRowEdit",
-                      "fullCodeName" : "ToggleRowEdit",
-                      "name" : "表格界面_行编辑开关操作",
-                      "getPSSysImage" : {
-                        "glyph" : "xf0ce@FontAwesome",
-                        "cssClass" : "fa fa-table"
-                      },
-                      "predefinedType" : "GRIDVIEW_ROWEDITACTION",
-                      "timeout" : 60000,
-                      "uIActionMode" : "SYS",
-                      "uIActionTag" : "ToggleRowEdit",
-                      "uIActionType" : "DEUIACTION",
-                      "enableToggleMode" : true
-                    },
-                    "addSeparator" : false,
-                    "showCaption" : true,
-                    "showIcon" : false
-                  }, {
                     "detailType" : "DEUIACTION",
                     "name" : "u479f517",
                     "getPSUIAction" : {
@@ -2218,6 +2196,28 @@
                     "addSeparator" : true,
                     "showCaption" : true,
                     "showIcon" : true
+                  }, {
+                    "detailType" : "DEUIACTION",
+                    "name" : "ua98d563",
+                    "getPSUIAction" : {
+                      "caption" : "行编辑",
+                      "codeName" : "ToggleRowEdit",
+                      "fullCodeName" : "ToggleRowEdit",
+                      "name" : "表格界面_行编辑开关操作",
+                      "getPSSysImage" : {
+                        "glyph" : "xf0ce@FontAwesome",
+                        "cssClass" : "fa fa-table"
+                      },
+                      "predefinedType" : "GRIDVIEW_ROWEDITACTION",
+                      "timeout" : 60000,
+                      "uIActionMode" : "SYS",
+                      "uIActionTag" : "ToggleRowEdit",
+                      "uIActionType" : "DEUIACTION",
+                      "enableToggleMode" : true
+                    },
+                    "addSeparator" : false,
+                    "showCaption" : true,
+                    "showIcon" : false
                   } ]
                 },
                 "width" : 100,

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/studentEditView.json

@@ -1566,34 +1566,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" : {
@@ -1811,28 +1811,6 @@
                 "codeName" : "A046596b6afb50f9e5b",
                 "name" : "操作列",
                 "getPSUIActionGroupDetails" : [ {
-                  "detailType" : "DEUIACTION",
-                  "name" : "ua98d563",
-                  "getPSUIAction" : {
-                    "caption" : "行编辑",
-                    "codeName" : "ToggleRowEdit",
-                    "fullCodeName" : "ToggleRowEdit",
-                    "name" : "表格界面_行编辑开关操作",
-                    "getPSSysImage" : {
-                      "glyph" : "xf0ce@FontAwesome",
-                      "cssClass" : "fa fa-table"
-                    },
-                    "predefinedType" : "GRIDVIEW_ROWEDITACTION",
-                    "timeout" : 60000,
-                    "uIActionMode" : "SYS",
-                    "uIActionTag" : "ToggleRowEdit",
-                    "uIActionType" : "DEUIACTION",
-                    "enableToggleMode" : true
-                  },
-                  "addSeparator" : false,
-                  "showCaption" : true,
-                  "showIcon" : false
-                }, {
                   "detailType" : "DEUIACTION",
                   "name" : "u479f517",
                   "getPSUIAction" : {
@@ -1860,6 +1838,28 @@
                   "addSeparator" : true,
                   "showCaption" : true,
                   "showIcon" : true
+                }, {
+                  "detailType" : "DEUIACTION",
+                  "name" : "ua98d563",
+                  "getPSUIAction" : {
+                    "caption" : "行编辑",
+                    "codeName" : "ToggleRowEdit",
+                    "fullCodeName" : "ToggleRowEdit",
+                    "name" : "表格界面_行编辑开关操作",
+                    "getPSSysImage" : {
+                      "glyph" : "xf0ce@FontAwesome",
+                      "cssClass" : "fa fa-table"
+                    },
+                    "predefinedType" : "GRIDVIEW_ROWEDITACTION",
+                    "timeout" : 60000,
+                    "uIActionMode" : "SYS",
+                    "uIActionTag" : "ToggleRowEdit",
+                    "uIActionType" : "DEUIACTION",
+                    "enableToggleMode" : true
+                  },
+                  "addSeparator" : false,
+                  "showCaption" : true,
+                  "showIcon" : false
                 } ]
               },
               "width" : 100,

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSSYSAPP.json

@@ -2158,34 +2158,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" : {
@@ -2403,28 +2403,6 @@
             "codeName" : "A046596b6afb50f9e5b",
             "name" : "操作列",
             "getPSUIActionGroupDetails" : [ {
-              "detailType" : "DEUIACTION",
-              "name" : "ua98d563",
-              "getPSUIAction" : {
-                "caption" : "行编辑",
-                "codeName" : "ToggleRowEdit",
-                "fullCodeName" : "ToggleRowEdit",
-                "name" : "表格界面_行编辑开关操作",
-                "getPSSysImage" : {
-                  "glyph" : "xf0ce@FontAwesome",
-                  "cssClass" : "fa fa-table"
-                },
-                "predefinedType" : "GRIDVIEW_ROWEDITACTION",
-                "timeout" : 60000,
-                "uIActionMode" : "SYS",
-                "uIActionTag" : "ToggleRowEdit",
-                "uIActionType" : "DEUIACTION",
-                "enableToggleMode" : true
-              },
-              "addSeparator" : false,
-              "showCaption" : true,
-              "showIcon" : false
-            }, {
               "detailType" : "DEUIACTION",
               "name" : "u479f517",
               "getPSUIAction" : {
@@ -2452,6 +2430,28 @@
               "addSeparator" : true,
               "showCaption" : true,
               "showIcon" : true
+            }, {
+              "detailType" : "DEUIACTION",
+              "name" : "ua98d563",
+              "getPSUIAction" : {
+                "caption" : "行编辑",
+                "codeName" : "ToggleRowEdit",
+                "fullCodeName" : "ToggleRowEdit",
+                "name" : "表格界面_行编辑开关操作",
+                "getPSSysImage" : {
+                  "glyph" : "xf0ce@FontAwesome",
+                  "cssClass" : "fa fa-table"
+                },
+                "predefinedType" : "GRIDVIEW_ROWEDITACTION",
+                "timeout" : 60000,
+                "uIActionMode" : "SYS",
+                "uIActionTag" : "ToggleRowEdit",
+                "uIActionType" : "DEUIACTION",
+                "enableToggleMode" : true
+              },
+              "addSeparator" : false,
+              "showCaption" : true,
+              "showIcon" : false
             } ]
           },
           "width" : 100,
@@ -6460,34 +6460,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" : {
@@ -6705,28 +6705,6 @@
                       "codeName" : "A046596b6afb50f9e5b",
                       "name" : "操作列",
                       "getPSUIActionGroupDetails" : [ {
-                        "detailType" : "DEUIACTION",
-                        "name" : "ua98d563",
-                        "getPSUIAction" : {
-                          "caption" : "行编辑",
-                          "codeName" : "ToggleRowEdit",
-                          "fullCodeName" : "ToggleRowEdit",
-                          "name" : "表格界面_行编辑开关操作",
-                          "getPSSysImage" : {
-                            "glyph" : "xf0ce@FontAwesome",
-                            "cssClass" : "fa fa-table"
-                          },
-                          "predefinedType" : "GRIDVIEW_ROWEDITACTION",
-                          "timeout" : 60000,
-                          "uIActionMode" : "SYS",
-                          "uIActionTag" : "ToggleRowEdit",
-                          "uIActionType" : "DEUIACTION",
-                          "enableToggleMode" : true
-                        },
-                        "addSeparator" : false,
-                        "showCaption" : true,
-                        "showIcon" : false
-                      }, {
                         "detailType" : "DEUIACTION",
                         "name" : "u479f517",
                         "getPSUIAction" : {
@@ -6754,6 +6732,28 @@
                         "addSeparator" : true,
                         "showCaption" : true,
                         "showIcon" : true
+                      }, {
+                        "detailType" : "DEUIACTION",
+                        "name" : "ua98d563",
+                        "getPSUIAction" : {
+                          "caption" : "行编辑",
+                          "codeName" : "ToggleRowEdit",
+                          "fullCodeName" : "ToggleRowEdit",
+                          "name" : "表格界面_行编辑开关操作",
+                          "getPSSysImage" : {
+                            "glyph" : "xf0ce@FontAwesome",
+                            "cssClass" : "fa fa-table"
+                          },
+                          "predefinedType" : "GRIDVIEW_ROWEDITACTION",
+                          "timeout" : 60000,
+                          "uIActionMode" : "SYS",
+                          "uIActionTag" : "ToggleRowEdit",
+                          "uIActionType" : "DEUIACTION",
+                          "enableToggleMode" : true
+                        },
+                        "addSeparator" : false,
+                        "showCaption" : true,
+                        "showIcon" : false
                       } ]
                     },
                     "width" : 100,

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

@@ -984,6 +984,5 @@
   } ],
   "serviceCodeName" : "TrainSys",
   "serviceType" : "DEFAULT",
-  "resetDefaultActionCodeName" : false,
   "userLevel" : true
 }
\ No newline at end of file