agilebuilder-ui 1.1.16-tmp1 → 1.1.16-tmp6

package/lib/{tab-content-iframe-index-5f22a3b1.js → tab-content-iframe-index-a43cac7b.js}

@@ -1,5 +1,5 @@
 import { openBlock as r, createElementBlock as t, createCommentVNode as o } from "vue";
-import { _ as s } from "./index-cd2cc1c6.js";
+import { _ as s } from "./index-2b8eabca.js";
 const u = ["src"], f = s({ data: () => ({ src: null }), watch: { $route(n, c) {
   this.src = this.$route.query.src;
 } }, mounted() {

package/lib/{tab-content-index-7b98f020.js → tab-content-index-133a2913.js}

@@ -1,4 +1,4 @@
-import { _ as v, c as $, g as x, b as P, s as h, m as M, M as O, i as I } from "./index-cd2cc1c6.js";
+import { _ as v, c as $, g as x, b as P, s as h, m as M, M as O, i as I } from "./index-2b8eabca.js";
 import { resolveComponent as m, openBlock as l, createBlock as b, withCtx as g, createVNode as w, TransitionGroup as L, createElementBlock as p, Fragment as T, renderList as C, createElementVNode as u, toDisplayString as y, createCommentVNode as f, normalizeClass as S } from "vue";
 const A = { class: "no-redirect" }, k = v({ name: "Breadcrumb", data: () => ({ levelList: null }), computed: { levelListWithTitle() {
   return this.levelList.filter((e) => e.meta.title !== void 0 && e.meta.title !== null);

package/lib/{tache-subprocess-history-a0cb4649.js → tache-subprocess-history-c7779e85.js}

@@ -1,5 +1,5 @@
 import { resolveComponent as t, openBlock as a, createElementBlock as s, createElementVNode as y, createVNode as l, withCtx as r, createTextVNode as n, toDisplayString as p, createCommentVNode as c, createBlock as h } from "vue";
-import { _ as I } from "./index-cd2cc1c6.js";
+import { _ as I } from "./index-2b8eabca.js";
 const g = { style: { "padding-bottom": "10px" } }, k = { key: 0, class: "graphDiv" }, N = I({ name: "TacheSubprocessHistory", data: () => ({ type: "graph", workflowId: null }), created() {
   const o = this.$route.query.workflowId;
   o && (this.workflowId = parseInt(o));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agilebuilder-ui",
-  "version": "1.1.16-tmp1",
+  "version": "1.1.16-tmp6",
   "type": "module",
   "private": false,
   "main": "./lib/super-ui.js",

package/packages/index.js

@@ -1,4 +1,3 @@
-import '../src/utils/insert_css' // 公共样式库
 // 依次导入组件库的各个组件
 import Breadcrumb from './breadcrumb'
 import DepartmentTree from './department-tree'

package/packages/super-grid/src/apis.js

@@ -22,7 +22,6 @@ import eventBus from './eventBus'
 import { isPromise } from '../../../src/utils/common-util'
 import { updateWithPageValue } from '../../../src/utils/jump-page-utils'
 import { getGuId } from '../../../src/utils/guid.js';
-import { ElMessageBox } from 'element-plus';
 
 const apis = {
   // 列表工具栏控件刷新列表数据。添加该方法解决工具栏值清空后，列表内容没有还原问题
@@ -136,6 +135,7 @@ const apis = {
   // 新建行
   createRow(listCode, row, options) {
     return new Promise((resolve, reject) => {
+      debugger;
       if (!listCode) {
         listCode = store.get('_list_code')
       }
@@ -420,58 +420,6 @@ const apis = {
       }
     }
   },
-  isLastEditRowSaveMessage(listCode) {
-    if (!listCode) {
-      listCode = store.get('_list_code')
-    }
-    const gridParams = store.get(listCode)
-    if (!isLastEditRowSave(listCode)) {
-      // 最后编辑的一行没有保存，则提示
-      window.$vueApp.config.globalProperties.$message({
-        showClose: true,
-        message: getI18n().t('superGrid.pleaseSaveLine', {
-          row: gridParams.$rowIndex + 1
-        }),
-        type: 'warning'
-      })
-    }
-  },
-  // 切换行编辑时候提示
-  confirmBeforeSwitchingRow(listCode, callback) {
-    if (!listCode) {
-      listCode = store.get('_list_code')
-    }
-    const { t } = getI18n()
-    const gridParams = store.get(listCode)
-    const rowIndex = gridParams.$rowIndex
-    if (!isLastEditRowSave(listCode)) {
-      ElMessageBox.confirm(
-        t('superGrid.rowEditMessageBox.content'), // 当前行有未保存的修改，你是否要切换编辑行？
-        t('superGrid.rowEditMessageBox.title'), // 操作确认
-        {
-          distinguishCancelAndClose: true,
-          confirmButtonText: t('superGrid.rowEditMessageBox.confirmButton'), // 提交修改
-          cancelButtonText: t('superGrid.rowEditMessageBox.cancelButton'), // 放弃修改
-          showClose: true,
-          beforeClose: (action, instance, done) => {
-            if (action === 'confirm') {
-              this.saveRow(rowIndex, listCode).then((res) => {
-                // this.editRow(rowIndex, listCode, true)
-                callback?.('confirm');
-                done();
-              })
-            } else if (action === 'cancel') {
-              this.restoreCurrentRow(rowIndex, listCode)
-              callback?.('cancel');
-              done();
-            } else if (action === 'close') {
-              done();
-            }
-          },
-        }
-      )
-    }
-  },
   // 编辑行
   editRow(rowIndex, listCode, isSaveCallback) {
     if (!listCode) {

package/packages/super-grid/src/dynamic-input.vue

@@ -517,7 +517,7 @@ import apis from './apis'
 import ViewImageDialog from './view-image-dialog'
 import { $emit } from '../../utils/gogocodeTransfer'
 import eventBus from './eventBus'
-import { isMobileBrowser } from '../../../src/utils/common-util'
+import { isMobileBrowser, getAuthSource } from '../../../src/utils/common-util'
 import { analysisScanValue, setScanAnalysisValue } from './scan-util.ts'
 import customFormatter from './custom-formatter'
 export default {
@@ -648,8 +648,10 @@ export default {
       userAgent = 'browser'
     }
     console.log('superGrid----window.location.protocol---', window.location.protocol)
+    const isDingTalk = getAuthSource() === 'dingtalk' ? true : false
     const isApk = isMobile && userAgent && userAgent === 'app' ? true : false
-    const isShowScanIcon = isApk || (isMobile && scanEnable && window.location.protocol === 'https:' ? true : false)
+    const isShowScanIcon =
+      isApk || isDingTalk || (isMobile && scanEnable && window.location.protocol === 'https:' ? true : false)
 
     let baseURL = gridParams.options.backendUrl
     if (!baseURL) {
@@ -725,6 +727,7 @@ export default {
       scanEnable,
       userAgent,
       isApk,
+      isDingTalk,
       isShowBrowserScan: false,
       isShowScanIcon,
       baseURL,
@@ -1912,7 +1915,7 @@ export default {
     },
     scanClick() {
       console.log('scanClick----userAgent=', this.userAgent)
-      if (this.isApk) {
+      if (this.isApk || this.isDingTalk) {
         // 表示是APK中
         const message = {
           type: 'scan',
@@ -1920,6 +1923,9 @@ export default {
           systemCode: this.pageContext.systemCode,
           listCode: this.listCode
         }
+        if (this.isDingTalk) {
+          message.type = 'dingTalkScan'
+        }
         window.parent.postMessage(JSON.stringify(message), '*')
       } else {
         // 表示是移动端浏览器中

package/packages/super-grid/src/normal-column-content.vue

@@ -2,8 +2,7 @@
   <div style="width: 100%">
     <!--添加:key="column.prop+'_'+rowIndex"是为了解决多行是行编辑状态时新建的记录的文本框内有值的问题-->
     <dynamic-input
-      v-if="isEditing || isShowForm"
-      ref="dynamicRef"
+      v-if="(lineEdit.editable && isEditable && row.$editing && !isContentViewText) || isShowForm"
       v-model:value="row[column.prop]"
       :class="requiredClass"
       :column="column"
@@ -21,7 +20,6 @@
       :row="row"
       :row-index="rowIndex"
       :type="column.componentType"
-      @keyup.enter="clearAllEditing"
       @findIndex="findIndex(rowIndex)"
       @focus="onFocus(rowIndex)"
       @prohibit-to-edit="prohibitToEdit"
@@ -34,11 +32,7 @@
       @change-required="changeRequired"
       @open-page="openPageEvent"
     />
-    <div v-else class="column-text-main">
-      <div v-if="lineEdit.editable && isEditable && !disabled && !isContentViewText" class="column-text-edit-main" @click="onEditing">
-        <el-icon :size="14" color="#409eff"><Edit /></el-icon>
-        <span v-if="!row[column.prop]" table-column-placeholder>请点击输入</span>
-      </div>
+    <span v-else>
       <span v-if="column.operations" class="grid-operation-buttons">
         <span
           v-for="(operation, operationIndex) in column.operations"
@@ -343,7 +337,7 @@
           $escapeHtml(getLabel(row, rowIndex))
         }}</span>
       </span>
-    </div>
+    </span>
     <view-image-dialog v-if="showSingleImgFlag" :file-list="fileList" @close="showSingleImgFlag = false" />
     <rich-editor-viewer
       v-if="showRichEditorViewer"
@@ -381,8 +375,6 @@ import FsPreview from '../../fs-preview'
 import RichEditorViewer from '../../rich-editor/viewer.vue'
 import GridIcon from './components/grid-icon.vue'
 import { formatScanRuleSets } from './scan-util.ts'
-import storeVuex from '../../../src/store';
-
 export default {
   components: {
     DynamicInput,
@@ -526,37 +518,6 @@ export default {
     }
   },
   computed: {
-    $rowGuId() {
-      return `${this.row.$rowDataGuId ?? this.row.id ?? this.rowIndex}`
-    },
-    // 字段唯一标识
-    $rowColumnDataGuId() {
-      return `${this.$rowGuId}_${this.column.prop}`
-    },
-    // 手动触发编辑状态
-    isEditing() {
-      try {
-        // 没权限
-        if (!this.hasEditPermission) return
-        // 检测到单选修改模式
-        if (storeVuex.getters.isEditing(this.$rowColumnDataGuId)) return true
-        // 判定不是子表情况
-        if (!this.isFormSubTable) {
-          if (this.row.$editing) {
-            // 检测是否是单元格同一行
-            if (storeVuex.getters.isRowEditing(this.$rowGuId)) return false
-            return true
-          }
-        }
-        return this.row.$editing;
-      } catch (error) {
-        return false
-      }
-    },
-    // 基础编辑权限
-    hasEditPermission() {
-      return this.lineEdit.editable && this.isEditable && !this.isContentViewText
-    },
     // lineEdit() {
     //   let isLineEdit = false
     //   if (this.listCode) {
@@ -573,15 +534,6 @@ export default {
     ...mapGetters(['preventReclick'])
   },
   watch: {
-    // 取消行时候
-    'row.$editing': {
-      deep: true,
-      handler(newValue) {
-        if([false].includes(newValue)) {
-          this.clearAllEditing()
-        }
-      }
-    },
     isSql: {
       deep: true,
 
@@ -758,79 +710,6 @@ export default {
   methods: {
     ...customFormatter,
     ...apis,
-    // 清理所有手动编辑
-    clearAllEditing() {
-      if (this.hasEditPermission) {
-        storeVuex?.dispatch?.('clearAllEditing')
-      }
-    },
-    // 手动编辑触发
-    onEditing(event) {
-      if (this.hasEditPermission && !this.isEditing) {
-        event.stopPropagation()
-
-        const onEditing = () => {
-          this.clearAllEditing()
-          storeVuex?.dispatch?.('setRowEditing', {
-            $rowDataGuId: this.$rowColumnDataGuId,
-            isEditing: true
-          })
-          setTimeout(this.focusBottomInput, 400)
-        }
-
-        if(!this.isFormSubTable) {
-          // 非子表
-          if (storeVuex.getters.isConfigEditing) {
-            if (storeVuex.getters.isRowEditing(this.$rowGuId)) {
-              onEditing()
-            } else {
-              this.isLastEditRowSaveMessage(this.listCode)
-              // this.confirmBeforeSwitchingRow(this.listCode, () => { })
-            }
-          } else {
-            // 如果不是子表 则 开启 编辑模式
-            this.editRow(this.rowIndex, this.listCode, true)
-            onEditing()
-          }
-        } else {
-          // 取消所有列编辑状态
-          this.restoreGridEdit(this.listCode)
-          // 子表
-          onEditing()
-        }
-      }
-    },
-    // 默认聚焦渲染组件
-    focusBottomInput() {
-      this.$nextTick(() => {
-        try {
-          const getOffsetParent = (selectorAll) => {
-            return selectorAll ? Array.from(this.$refs.dynamicRef.$el.querySelectorAll(selectorAll)).filter(control => !!control.offsetParent) : [];
-          }
-
-          let visibleFormControls = getOffsetParent('.el-select, .el-date-picker, .el-upload');
-          if (visibleFormControls.length) {
-            visibleFormControls[0].click()
-          } else {
-            visibleFormControls = getOffsetParent('input, textarea');
-            if (visibleFormControls.length > 0) {
-              const bottomControl = visibleFormControls.reduce((prev, current) => {
-                return current.getBoundingClientRect().bottom > prev.getBoundingClientRect().bottom
-                  ? current
-                  : prev;
-              });
-              if (['INPUT', 'TEXTAREA'].includes(bottomControl.tagName)) {
-                bottomControl.focus();
-                bottomControl.select();
-              }
-            }
-
-          }
-        } catch (error) {
-          console.error(error)
-        }
-      })
-    },
     getFileObj(fileSet) {
       if (fileSet) {
         return JSON.parse(fileSet)
@@ -1177,25 +1056,4 @@ export default {
   content: '*';
   color: #f56c6c;
 }
-.column-text-main {
-  display: flex;
-  align-items: center;
-  gap: 10px;
-
-  .column-text-edit-main {
-    display: flex;
-    align-items: center;
-    gap: 10px;
-
-    &::after {
-      content: ' ';
-      position: absolute;
-      left: 0;
-      top: 0;
-      right: 0;
-      bottom: 0;
-      cursor: pointer;
-    }
-  }
-}
 </style>

package/packages/super-grid/src/super-grid.vue

@@ -1,5 +1,5 @@
 <template>
-  <div data-v="1.0.0" :style="subTableStyle" @click="onClickTableMain">
+  <div data-v="1.0.0" :style="subTableStyle">
     <search-form
       v-if="!isFormSubTable && hasLoadedColumns && query && query.showType === 'embedded'"
       v-show="!isMobile || (isMobile && isShowMobileSearch)"
@@ -906,10 +906,6 @@ export default {
     ...publicMethods,
     ...superGridService,
     ...apis,
-    onClickMain() {
-      // 清理编辑选中
-      storeVuex?.dispatch?.('clearAllEditing')
-    },
     isDeleteChange(boole) {
       this.isDelete = boole
     },
@@ -1324,11 +1320,6 @@ export default {
     },
     changeRowStyle(param) {
       // param的格式：{row, rowIndex}
-
-      // 新增表格编辑背景颜色
-      if (param.row.$editing) {
-        return { background: `var(--el-table-row-hover-bg-color)` }
-      }
       const gridParams = store.get(this.code)
       if (this.lineEdit && this.lineEdit.editable) {
         if (param.rowIndex === gridParams.$rowIndex) {

package/src/i18n/langs/cn.js

@@ -88,12 +88,6 @@ const cn = {
     },
     // 列表组件
     superGrid: {
-        rowEditMessageBox: {
-            title: "操作确认",
-            content: "当前行有未保存的修改，是否进行保存修改切换？",
-            confirmButton: "保存修改",
-            cancelButton: "放弃修改"
-        },
         columnConfig: '字段配置',
         pleaseSaveOrCancelEditingLine: '请先保存或撤销编辑第 {row} 行数据',
         pleaseSaveLine: '请先保存第 {row} 行数据',

package/src/i18n/langs/en.js

@@ -89,12 +89,6 @@ const en = {
         mustFill: '{label} must fill'
     },
     superGrid: {
-        rowEditMessageBox: {
-            title: "Operation Confirmation",
-            content: "There are unsaved modifications in the current row. Do you want to save the modifications and switch?",
-            confirmButton: "Save edit",
-            cancelButton: "Discard edit"
-        },
         columnConfig: 'Column Config',
         pleaseSaveOrCancelEditingLine:
             'Please Save Or Cancel Editing Line {row} Data First',

package/src/store/getters.js

@@ -4,10 +4,6 @@ const getters = {
   windowWidth: (state) => state.app.windowWidth,
   windowHeight: (state) => state.app.windowHeight,
   isMobileResize: (state) => state.app.isMobileResize,
-  tableEditingDatas: (state) => state.table.tableEditingDatas,
-  isConfigEditing: (state) => state.table.tableEditingDatas.length > 0,
-  isEditing: (state) => ($rowDataGuId) => state.table.tableEditingDatas.includes($rowDataGuId),
-  isRowEditing: (state) => ($rowGuId) => state.table.tableEditingDatas.some(v => v.includes($rowGuId)),
   token: (state) => state.user.token,
   name: (state) => state.user.name,
   // routers: state => state.permission.routers,

package/src/store/index.js

@@ -1,7 +1,6 @@
 import * as Vue from 'vue'
 import * as Vuex from 'vuex'
 import app from './modules/app'
-import table from './modules/table'
 import user from './modules/user'
 import permission from './modules/permission'
 import tabContent from './modules/tab-content'
@@ -10,7 +9,6 @@ import getters from './getters'
 const store = Vuex.createStore({
   modules: {
     app,
-    table,
     user,
     permission,
     tabContent,

package/src/styles/display-layout.scss

@@ -38,10 +38,6 @@
   overflow-wrap: break-word;
 }
 
-[table-column-placeholder] {
-  color: var(--el-text-color-placeholder, #a8abb2);
-}
-
 .yx-flex-wrap {
   display: flex;
   justify-content: flex-start;
@@ -288,9 +284,3 @@
     }
   }
 }
-
-.el-descriptions {
-  .el-descriptions__content{
-    position: relative;
-  }
-}

package/src/styles/theme/tiffany-blue-mobile/card.scss

@@ -50,7 +50,8 @@
     font-size: 0.9rem;
     font-weight: bold;
     text-align: left;
-    padding: 9px 20px;
+    padding: 9px 0px 9px 20px;
+    display: flex;
     align-items: center;
   }
 

package/src/utils/common-util.js

@@ -676,16 +676,8 @@ export function getCurrentSystemCode() {
 
 export function isLogoutTimeout(event) {
   let isTimeout = false
-  if (
-    event &&
-    typeof event.data === 'string' &&
-    event.data.indexOf('loginTimeout') >= 0
-  ) {
-    if (
-      event &&
-      typeof event.data === 'string' &&
-      event.data.indexOf('loginTimeout') >= 0
-    ) {
+  if (event && typeof event.data === 'string' && event.data.indexOf('loginTimeout') >= 0) {
+    if (event && typeof event.data === 'string' && event.data.indexOf('loginTimeout') >= 0) {
       // removeToken()
       // this.$router.replace({
       //   path: '/login'
@@ -697,22 +689,25 @@ export function isLogoutTimeout(event) {
 }
 
 export function cacheSystemUrl() {
-    return new Promise((resolve, reject) => {
-      const systemUrls = window.$authApi.getSystemCacheUrl()
-      if(!systemUrls){
-        window.$vueApp.config.globalProperties.$http
-          .get(
-            window.$vueApp.config.globalProperties.baseAPI +
-            '/component/business-systems/without-plate'
-          )
-          .then((urlMap) => {
-            if (urlMap) {
-              window.$authApi.setSystemCacheUrl(urlMap)
-            }
-            resolve()
-          })
-        } else {
+  return new Promise((resolve, reject) => {
+    const systemUrls = window.$authApi.getSystemCacheUrl()
+    if (!systemUrls) {
+      window.$vueApp.config.globalProperties.$http
+        .get(window.$vueApp.config.globalProperties.baseAPI + '/component/business-systems/without-plate')
+        .then((urlMap) => {
+          if (urlMap) {
+            window.$authApi.setSystemCacheUrl(urlMap)
+          }
           resolve()
-        }
-      })
-}
+        })
+    } else {
+      resolve()
+    }
+  })
+}
+/**
+ * 登录源是哪种方式，例如：portal、dingtalk、weixin、mobile等
+ */
+export function getAuthSource() {
+  return window.localStorage.getItem('auth_source')
+}

package/src/store/modules/table.js

@@ -1,76 +0,0 @@
-const app = {
-  state: {
-    tableEditingDatas: [], // 开启编辑 表格$rowDataGuId
-  },
-  mutations: {
-    /**
-     * 切换行数据的编辑状态
-     * @param {Object} state - 当前状态对象
-     * @param {string} $rowDataGuId - 行数据的唯一标识
-     */
-    toggleRowEditing(state, $rowDataGuId) {
-      if (state.tableEditingDatas.includes($rowDataGuId)) {
-        state.tableEditingDatas = state.tableEditingDatas.filter(id => id !== $rowDataGuId)
-      } else {
-        state.tableEditingDatas = [...state.tableEditingDatas, $rowDataGuId]
-      }
-    },
-    /**
-     * 直接设置行数据的编辑状态
-     * @param {Object} state - 当前状态对象
-     * @param {Object} payload - 包含行数据唯一标识和编辑状态的对象
-     * @param {string} payload.$rowDataGuId - 行数据的唯一标识
-     * @param {boolean} payload.isEditing - 编辑状态
-     */
-    setRowEditing(state, { $rowDataGuId, isEditing = false }) {
-      if ($rowDataGuId) {
-        if (isEditing) {
-          if (!state.tableEditingDatas.includes($rowDataGuId)) {
-            state.tableEditingDatas = [...state.tableEditingDatas, $rowDataGuId];
-          }
-        } else {
-          state.tableEditingDatas = state.tableEditingDatas.filter(id => id!== $rowDataGuId);
-        }
-      }
-    },
-    /**
-     * 清理所有编辑状态
-     * @param {Object} state - 当前状态对象
-     */
-    clearAllEditing(state) {
-      state.tableEditingDatas = [];
-    }
-  },
-  actions: {
-    /**
-     * 触发切换行数据编辑状态的操作
-     * @param {Object} context - 上下文对象
-     * @param {string} $rowDataGuId - 行数据的唯一标识
-     */
-    toggleEditingData({ commit }, $rowDataGuId) {
-      commit('toggleRowEditing', $rowDataGuId)
-    },
-    /**
-     * 触发直接设置行数据编辑状态的操作
-     * @param {Object} context - 上下文对象
-     * @param {Object} payload - 包含行数据唯一标识和编辑状态的对象
-     * @param {string} payload.$rowDataGuId - 行数据的唯一标识
-     * @param {boolean} payload.isEditing - 编辑状态
-     */
-    setRowEditing({ commit }, payload) {
-      commit('setRowEditing', payload);
-    },
-    closeRowEditing({ commit }, payload) {
-      commit('setRowEditing', payload);
-    },
-    /**
-     * 触发清理所有编辑状态的操作
-     * @param {Object} context - 上下文对象
-     */
-    clearAllEditing({ commit }) {
-      commit('clearAllEditing');
-    }
-  },
-}
-
-export default app

package/src/utils/insert_css.js

@@ -1,33 +0,0 @@
-/**
- * 动态引入公共样式库
- */
-if (!window.insertedCssFiles) {
-    // 存储 已经动态加入 样式地址
-    window.insertedCssFiles = new Set();
-}
-
-if (!window.defaultCssUrl) {
-    window.defaultCssUrl = 'myapp-default-css/default.css';
-}
-
-if (!window.insertCssFile) {
-    window.insertCssFile = (cssUrl) => {
-        if (!cssUrl || window.insertedCssFiles.has(cssUrl)) {
-            return;
-        }
-        const link = document.createElement('link');
-        link.rel = 'stylesheet';
-        link.href = cssUrl;
-        link.onload = function () {
-            window.insertedCssFiles.add(cssUrl);
-        };
-        link.onerror = function () {
-            console.error(`无法加载公共 CSS 文件: ${cssUrl}`);
-        };
-        document.head.appendChild(link);
-    }
-}
-
-if (window.insertCssFile) {
-    window.insertCssFile(window.defaultCssUrl);
-}