super-pages 0.0.29-up → 0.0.30-up

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "super-pages",
3
3
  "private": false,
4
- "version": "0.0.29-up",
4
+ "version": "0.0.30-up",
5
5
  "type": "module",
6
6
  "main": "./lib/super-pages.js",
7
7
  "scripts": {
@@ -14,10 +14,10 @@
14
14
  "@vitejs/plugin-vue": "^4.2.3",
15
15
  "axios": "^1.6.1",
16
16
  "element-plus": "^2.4.1",
17
- "imatrix-ui": "0.2.44-up",
17
+ "agilebuilder-ui": "1.0.0",
18
18
  "sass": "^1.69.4",
19
- "super-charts-new": "0.0.2-up",
20
- "super-form-editor": "0.0.5-up",
19
+ "super-charts-new": "0.0.29-up",
20
+ "super-form-editor": "0.0.28-up",
21
21
  "vite": "^4.4.5",
22
22
  "vue": "^3.3.4",
23
23
  "vue-i18n": "^9.5.0",
@@ -119,7 +119,7 @@ import eventBus from './util/eventBus'
119
119
  import {
120
120
  getSystemBackendUrl,
121
121
  isPromise,
122
- } from 'imatrix-ui/src/utils/common-util'
122
+ } from 'agilebuilder-ui/src/utils/common-util'
123
123
  export default {
124
124
  name: 'CommonFormPage',
125
125
  components: {
@@ -81,7 +81,7 @@ import { getStoreInfo, setStoreInfo } from './util/common-util'
81
81
  import {
82
82
  getSystemBackendUrl,
83
83
  isPromise,
84
- } from 'imatrix-ui/src/utils/common-util'
84
+ } from 'agilebuilder-ui/src/utils/common-util'
85
85
  export default {
86
86
  name: 'ListPage',
87
87
  components: {
@@ -1,5 +1,5 @@
1
1
  import { $on, $off, $once, $emit } from '../../../utils/gogocodeTransfer'
2
- import { updateWithPageValue } from 'imatrix-ui/src/utils/jump-page-utils'
2
+ import { updateWithPageValue } from 'agilebuilder-ui/src/utils/jump-page-utils'
3
3
  import { getStoreInfo, packageTemplateFiles, setStoreInfo } from './common-util'
4
4
  const buttonEvents = {
5
5
  // 按钮组中各按钮的操作
@@ -1,5 +1,5 @@
1
1
  import store from './store'
2
- import { getLanguageWithLocale } from 'imatrix-ui/src/utils/util'
2
+ import { getLanguageWithLocale } from 'agilebuilder-ui/src/utils/util'
3
3
  // 获得store中缓存的信息。返回的是Object对象,不是json字符串
4
4
  export function getStoreInfo(pageCode, key) {
5
5
  const pageCodeStoreInfo = store.get(pageCode)
@@ -1,4 +1,4 @@
1
- import { updateWithPageValue } from 'imatrix-ui/src/utils/jump-page-utils'
1
+ import { updateWithPageValue } from 'agilebuilder-ui/src/utils/jump-page-utils'
2
2
  import { packageTemplateFiles } from './common-util'
3
3
  const buttonEvents = {
4
4
  // 按钮组中各按钮的操作
@@ -5,14 +5,14 @@ import eventBus from './eventBus'
5
5
  import axios from 'axios'
6
6
  import Cookies from 'js-cookie'
7
7
  import { getStoreInfo, setStoreInfo } from './common-util'
8
- import { jumpToPage } from 'imatrix-ui/src/utils/jump-page-utils'
9
- import { analysisCondition } from 'imatrix-ui/src/utils/util'
10
- import { showWatermark } from 'imatrix-ui/src/utils/watermark'
8
+ import { jumpToPage } from 'agilebuilder-ui/src/utils/jump-page-utils'
9
+ import { analysisCondition } from 'agilebuilder-ui/src/utils/util'
10
+ import { showWatermark } from 'agilebuilder-ui/src/utils/watermark'
11
11
  import {
12
12
  getSystemBackendUrl,
13
13
  isPromise,
14
- } from 'imatrix-ui/src/utils/common-util'
15
- import { getToken } from 'imatrix-ui/src/utils/auth'
14
+ } from 'agilebuilder-ui/src/utils/common-util'
15
+ import { getToken } from 'agilebuilder-ui/src/utils/auth'
16
16
  const Util = {
17
17
  // 表示是全路径
18
18
  isFullPath(path) {
@@ -1167,7 +1167,10 @@ const Util = {
1167
1167
  },
1168
1168
  // 页面组件中点击按钮等组件关闭弹框调用
1169
1169
  closeInPageEvent(popEntity, popPageCode, successOperation, that) {
1170
- if (that.jumpPageSetting) {
1170
+ if(this.isShowContentPageDialog){
1171
+ // 关闭表单页面或列表页面内容中的弹框
1172
+ this.closeContentPageDialog(this, {entity:popEntity, pageCode: popPageCode})
1173
+ } else if (that.jumpPageSetting) {
1171
1174
  const pageEvents = getStoreInfo(that.pageCode, '_pageEvents')
1172
1175
  if (pageEvents) {
1173
1176
  // 调用关闭弹框事件
@@ -1,5 +1,5 @@
1
1
  import { setStoreInfo, packageTemplateFiles } from './common-util'
2
- import { updateWithPageValue } from 'imatrix-ui/src/utils/jump-page-utils'
2
+ import { updateWithPageValue } from 'agilebuilder-ui/src/utils/jump-page-utils'
3
3
  const buttonEvents = {
4
4
  // 流程表单页面点击扩展按钮
5
5
  clickWorkflowExtensionButton(
@@ -184,7 +184,7 @@ import { mapGetters } from 'vuex'
184
184
  import Util from './util/util'
185
185
  import myButtonBase from './my-button-base'
186
186
  import { getStoreInfo } from './util/common-util'
187
- import { getValueByField } from 'imatrix-ui/src/utils/util'
187
+ import { getValueByField } from 'agilebuilder-ui/src/utils/util'
188
188
  export default {
189
189
  name: 'MyWorkflowButtonGroup',
190
190
  components: {
@@ -123,7 +123,7 @@ import callEvents from './util/callEvents'
123
123
  import apis from './util/api'
124
124
  import { getStoreInfo, setStoreInfo } from './util/common-util'
125
125
  import eventBus from './util/eventBus'
126
- import { isPromise } from 'imatrix-ui/src/utils/common-util'
126
+ import { isPromise } from 'agilebuilder-ui/src/utils/common-util'
127
127
  export default {
128
128
  name: 'WorkflowFormPage',
129
129
  components: {