vue2-client 1.7.4 → 1.7.6

package/.env

@@ -12,4 +12,5 @@ VUE_APP_DICTIONARY_KEY=admin.dictionary
 VUE_APP_BADGE_KEY=admin.badge
 VUE_APP_SINGLEVALUE_KEY=admin.singlevalue
 VUE_APP_DIVISIONSOHCHINA=admin.divisionsohchina
+VUE_APP_WEB_CONFIG_KEY=admin.webconfig
 VUE_APP_API_BASE_URL=http://123.60.214.109:8405

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.7.4",
+  "version": "1.7.6",
   "private": false,
   "scripts": {
     "serve": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve",

package/src/base-client/components/common/CreateQuery/CreateQueryItem.vue

@@ -255,25 +255,25 @@
                   </a-radio-button>
                 </a-radio-group>
               </a-form-model-item>
+              <a-form-model-item label="关联外键字段" prop="selectKeyName">
+                <a-input v-model="item.selectKeyName" placeholder="该列关联的外键字段">
+                  <a-popover slot="suffix" placement="bottom" title="关于关联外键字段">
+                    <template slot="content">
+                      <p><span style="font-weight: bold;"><span style="color: #FF0036">非必需的实验性功能：</span>设置该参数需开发岗指导</span></p>
+                      <p>当字段与主子表外键有关系时，你可以指定<span style="font-weight: bold">该列所关联的外键字段名</span>
+                      </p>
+                      <p>设置该参数是为了该字段用作表单查询时，系统可以通过设置的关联外键字段，而非字面值作为查询条件</p>
+                      <p>示例：</p>
+                      <p>主表为t_userfiles(表档案)表，别名为u，与t_gasbrand(气表品牌表)有关联关系，别名为g，为了显示表档案对应的气表品牌数据，我们将数据字段名设置为g.f_gasbrand</p>
+                      <p>这样我们就可以在table中看到气表品牌了，但是用户如果通过气表品牌下拉框进行筛选，我们指定的g.f_gasbrand只是气表品牌的值，而实际关联字段是u.f_gasbrand_id</p>
+                      <p>所以如果我们指定了关联外键字段u.f_gasbrand_id，系统则会使用u.f_gasbrand_id筛选数据，而不是g.f_gasbrand，从而优化了查询效率
+                      </p>
+                    </template>
+                    <a-icon style="color: rgba(0,0,0,.45)" type="info-circle"/>
+                  </a-popover>
+                </a-input>
+              </a-form-model-item>
             </template>
-            <a-form-model-item v-if="selectDataShow || item.groupIndexView" label="关联外键字段" prop="selectKeyName">
-              <a-input v-model="item.selectKeyName" placeholder="该列关联的外键字段">
-                <a-popover slot="suffix" placement="bottom" title="关于关联外键字段">
-                  <template slot="content">
-                    <p><span style="font-weight: bold;"><span style="color: #FF0036">非必需的实验性功能：</span>设置该参数需开发岗指导</span></p>
-                    <p>当字段与主子表外键有关系时，你可以指定<span style="font-weight: bold">该列所关联的外键字段名</span>
-                    </p>
-                    <p>设置该参数是为了该字段用作表单查询时，系统可以通过设置的关联外键字段，而非字面值作为查询条件</p>
-                    <p>示例：</p>
-                    <p>主表为t_userfiles(表档案)表，别名为u，与t_gasbrand(气表品牌表)有关联关系，别名为g，为了显示表档案对应的气表品牌数据，我们将数据字段名设置为g.f_gasbrand</p>
-                    <p>这样我们就可以在table中看到气表品牌了，但是用户如果通过气表品牌下拉框进行筛选，我们指定的g.f_gasbrand只是气表品牌的值，而实际关联字段是u.f_gasbrand_id</p>
-                    <p>所以如果我们指定了关联外键字段u.f_gasbrand_id，系统则会使用u.f_gasbrand_id筛选数据，而不是g.f_gasbrand，从而优化了查询效率
-                    </p>
-                  </template>
-                  <a-icon style="color: rgba(0,0,0,.45)" type="info-circle"/>
-                </a-popover>
-              </a-input>
-            </a-form-model-item>
             <template v-if="item.formType === 'file' || item.formType === 'image'">
               <a-divider style="font-size: 14px;margin-top: 0">文件上传相关</a-divider>
               <a-form-model-item label="允许上传文件数量" prop="accept" style="margin-bottom: 5px;">
@@ -456,7 +456,6 @@ export default {
         accept: undefined,
         acceptCount: 3,
         pathKey: undefined,
-        groupIndexView: undefined,
         selectType: undefined,
         selectKey: undefined,
         addOrEdit: 'all',
@@ -511,8 +510,6 @@ export default {
         pathKey: undefined,
         accept: undefined,
         selectType: undefined,
-        groupIndex: undefined,
-        groupIndexView: undefined,
         addOrEdit: 'all',
         selectKeyName: undefined,
         resUploadStock: undefined,

package/src/base-client/plugins/AppData.js

@@ -71,6 +71,11 @@ const GetAppDataService = {
   getSingleValues () {
     const str = localStorage.getItem(process.env.VUE_APP_BADGE_KEY)
     return JSON.parse(str)
+  },
+  getWebConfigByKey (key) {
+    const str = localStorage.getItem(process.env.VUE_APP_WEB_CONFIG_KEY)
+    const object = JSON.parse(str)
+    return object[key]
   }
 }
 export default GetAppDataService

package/src/pages/CreateQueryPage.vue

@@ -16,22 +16,50 @@
     >
       <a-textarea v-model="importEditJson" placeholder="输入现有的JSON配置"/>
     </a-modal>
-    <a-button style="margin-top: 10px;margin-left: 10px;" type="primary" @click="showDrawer">创建查询配置
-    </a-button>
-    <a-button style="margin-top: 10px;margin-left: 10px;" type="primary" @click="openImportView(1)">导入已有查询配置
-    </a-button>
-    <br/>
-    <a-button style="margin-top: 10px;margin-left: 10px;" type="primary" @click="showSimpleFormQueryParamsDrawer">
-      创建简易表单配置
-    </a-button>
-    <a-button style="margin-top: 10px;margin-left: 10px;" type="primary" @click="openImportView(2)">导入已有简易表单配置
-    </a-button>
+    <a-modal
+      :visible="liuliModalVisible"
+      title="从琉璃中心获取配置"
+      @cancel="liuliModalVisible = false"
+      @ok="getLiuLiConfigHandleOk"
+    >
+      <a-form-model :model="form" :rules="rules" ref="liuliModel">
+        <a-form-model-item label="命名空间" prop="namespaceName">
+          <a-input v-model="form.namespaceName" :placeholder="'默认值：' + this.defaultServiceName"/>
+        </a-form-model-item>
+        <a-form-model-item label="配置名称" prop="configName">
+          <a-input v-model="form.configName"/>
+        </a-form-model-item>
+      </a-form-model>
+    </a-modal>
+    <a-card title="查询配置管理">
+      <a-space>
+        <a-button type="primary" @click="showDrawer">创建新的配置
+        </a-button>
+        <a-button type="primary" @click="openImportView(1)">从JSON文本导入
+        </a-button>
+        <a-button type="primary" @click="openLiuLiConfigModalView(1)">从琉璃中心导入
+        </a-button>
+      </a-space>
+    </a-card>
+    <a-card title="简易表单配置管理" style="margin-top: 20px">
+      <a-space>
+        <a-button type="primary" @click="showSimpleFormQueryParamsDrawer">
+          创建新的配置
+        </a-button>
+        <a-button type="primary" @click="openImportView(2)">从JSON文本导入
+        </a-button>
+        <a-button type="primary" @click="openLiuLiConfigModalView(2)">从琉璃中心导入
+        </a-button>
+      </a-space>
+    </a-card>
   </div>
 </template>
 
 <script>
 import CreateQuery from '@vue2-client/base-client/components/common/CreateQuery'
 import CreateSimpleFormQuery from '@vue2-client/base-client/components/common/CreateSimpleFormQuery'
+import { mapState } from 'vuex'
+import { getNativeConfig } from '@vue2-client/services/api/common'
 
 export default {
   name: 'CreateQueryPage',
@@ -41,15 +69,27 @@ export default {
   },
   data () {
     return {
+      isLoaded: false,
       visible: false,
       createSimpleFormVisible: false,
       toEditJson: undefined,
       toEditSimpleFormJson: undefined,
       importJsonVisible: false,
+      liuliModalVisible: false,
       type: undefined,
-      importEditJson: ''
+      importEditJson: '',
+      form: {
+        namespaceName: undefined,
+        configName: undefined
+      },
+      rules: {
+        configName: [{ required: true, message: '请输入配置名称', trigger: 'blur' }]
+      }
     }
   },
+  computed: {
+    ...mapState('setting', ['defaultServiceName'])
+  },
   methods: {
     showDrawer () {
       this.visible = true
@@ -57,6 +97,10 @@ export default {
     showSimpleFormQueryParamsDrawer () {
       this.createSimpleFormVisible = true
     },
+    openLiuLiConfigModalView (type) {
+      this.type = type
+      this.liuliModalVisible = true
+    },
     openImportView (type) {
       this.type = type
       this.importJsonVisible = true
@@ -72,8 +116,34 @@ export default {
         }
       } catch (e) {
         this.$message.warn('操作失败，输入配置不是JSON格式')
+      } finally {
+        this.importJsonVisible = false
+      }
+    },
+    getLiuLiConfigHandleOk () {
+      try {
+        this.$refs.liuliModel.validate(valid => {
+          if (valid) {
+            getNativeConfig(this.form.configName, this.form.namespaceName).then(res => {
+              console.warn(res)
+              if (this.type === 1) {
+                this.toEditJson = res
+                this.showDrawer()
+              } else {
+                this.toEditSimpleFormJson = res
+                this.showSimpleFormQueryParamsDrawer()
+              }
+            })
+          } else {
+            return false
+          }
+        })
+      } catch (e) {
+        this.$message.error('操作失败：' + e)
+        throw e
+      } finally {
+        this.liuliModalVisible = false
       }
-      this.importJsonVisible = false
     },
   }
 }

package/src/pages/login/Login.vue

@@ -64,6 +64,7 @@ import { positions } from '@vue2-client/mock/common'
 import { timeFix } from '@vue2-client/utils/util'
 import { loginStart } from '@vue2-client/base-client/plugins/compatible/LoginServiceOA'
 import { indexedDB } from '@vue2-client/utils/indexedDB'
+import { getConfig } from '@vue2-client/services/api'
 
 export default {
   name: 'Login',
@@ -75,6 +76,14 @@ export default {
       form: this.$form.createForm(this)
     }
   },
+  async created () {
+    await getConfig('webConfig', undefined, res => {
+      localStorage.setItem(process.env.VUE_APP_WEB_CONFIG_KEY, JSON.stringify(res))
+      if (res.setting) {
+        this.$store.commit('setting/setSetting', res.setting)
+      }
+    })
+  },
   computed: {
     ...mapState('setting', ['systemName', 'systemDesc', 'homePage', 'ticketPage', 'compatible', 'routeName', 'defaultAvatarUrl'])
   },

package/src/services/api/common.js

@@ -8,8 +8,10 @@ import { post } from '@vue2-client/services/api/restTools'
 import setting from '@vue2-client/store/modules/setting'
 
 const commonApi = {
-  // 获取表格列配置
+  // 获取配置
   getConfig: 'logic/getLiuliConfiguration',
+  // 获取原生配置
+  getNativeConfig: 'logic/getLiuliNativeConfiguration',
   // 配置解析
   parseConfig: 'logic/parseConfig',
   // 通用查询
@@ -34,11 +36,15 @@ const commonApi = {
   getEmpTree: '/api/af-system/logic/getEmpTree',
 }
 
-export function getConfigUrl (serviceName = setting.state.state.defaultServiceName) {
+export function getConfigUrl (serviceName = setting.state.defaultServiceName) {
   return '/api/' + serviceName + '/' + commonApi.getConfig
 }
 
-export function parseConfigUrl (serviceName = setting.state.state.defaultServiceName) {
+export function getNativeConfigUrl (serviceName = setting.state.defaultServiceName) {
+  return '/api/' + serviceName + '/' + commonApi.getNativeConfig
+}
+
+export function parseConfigUrl (serviceName = setting.state.defaultServiceName) {
   return '/api/' + serviceName + '/' + commonApi.parseConfig
 }
 
@@ -59,6 +65,10 @@ export function getConfig (configName, serviceName = setting.state.defaultServic
   indexedDB.getByWeb(configName, getConfigUrl(serviceName), { configName: configName }, callback)
 }
 
+export function getNativeConfig (configName, serviceName = setting.state.defaultServiceName) {
+  return post(getNativeConfigUrl(serviceName), { configName: configName })
+}
+
 /**
  * 调用Logic获取配置内容
  * @param logicName Logic名称

package/src/store/modules/setting.js

@@ -109,6 +109,11 @@ export default {
         }
         sessionStorage.setItem(process.env.VUE_APP_TBAS_TITLES_KEY, JSON.stringify(state.customTitles))
       }
+    },
+    setSetting (state, setting) {
+      for (const key in setting) {
+        state[key] = setting[key]
+      }
     }
   }
 }