vue2-client 1.7.4 → 1.7.5

package/package.json

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

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/src/services/api/common'
 
 export default {
   name: 'CreateQueryPage',
@@ -46,10 +74,21 @@ export default {
       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 +96,10 @@ export default {
     showSimpleFormQueryParamsDrawer () {
       this.createSimpleFormVisible = true
     },
+    openLiuLiConfigModalView (type) {
+      this.type = type
+      this.liuliModalVisible = true
+    },
     openImportView (type) {
       this.type = type
       this.importJsonVisible = true
@@ -75,6 +118,30 @@ export default {
       }
       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
+      }
+      this.liuliModalVisible = false
+    },
   }
 }
 </script>

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名称